7 files changed, 31 insertions, 46 deletions
diff --git a/data/test/test1.rp b/data/test/test1.rp
index e69de29..f736b8e 100644
--- a/data/test/test1.rp
+++ b/data/test/test1.rp
@@ -0,0 +1 @@
+# Blank file test
diff --git a/data/test/test2.rp b/data/test/test2.rp
index bae42c5..ea05d12 100644
--- a/data/test/test2.rp
+++ b/data/test/test2.rp
@@ -1,2 +1,3 @@
+# Basic single pair test
 test1
 test2
diff --git a/data/test/test3.rp b/data/test/test3.rp
index cfddebb..8121c8c 100644
--- a/data/test/test3.rp
+++ b/data/test/test3.rp
@@ -1,3 +1,4 @@
+# Basic multi-pair test
 a
 A
 
diff --git a/data/test/test4.rp b/data/test/test4.rp
index 58ffbf1..28b14d5 100644
--- a/data/test/test4.rp
+++ b/data/test/test4.rp
@@ -1,3 +1,4 @@
+# Basic priority test
 ab
 d
 
diff --git a/data/test/test5.rp b/data/test/test5.rp
index 72abd4a..f2c4dc8 100644
--- a/data/test/test5.rp
+++ b/data/test/test5.rp
@@ -1,3 +1,4 @@
+# Basic explicit priority test
 //p/-1//ab
 d
 
diff --git a/data/test/test6.rp b/data/test/test6.rp
index b28ccab..07a7923 100644
--- a/data/test/test6.rp
+++ b/data/test/test6.rp
@@ -1,4 +1,5 @@
-|//df
+# Basic staging test
+|//tf;df
 //s/1//a
 b
 
diff --git a/src/test/java/bjc/everge/ReplPairTest.java b/src/test/java/bjc/everge/ReplPairTest.java
index b054fde..7c87160 100644
--- a/src/test/java/bjc/everge/ReplPairTest.java
+++ b/src/test/java/bjc/everge/ReplPairTest.java
@@ -1,11 +1,16 @@
 package bjc.everge;
 
+import bjc.everge.TestUtils;
+
 import java.io.FileInputStream;
 import java.io.IOException;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Scanner;
 
+import static bjc.everge.TestUtils.*;
+
 import static org.junit.Assert.*;
 
 import org.junit.Test;
@@ -55,56 +60,30 @@ public class ReplPairTest {
 		assertMultiReplace("data/test/test6.rp", "c", "a", "y2", "x");
 	}
 
-	private void assertMultiReplace(String fle, String... inps) {
-		assertMultiReplace(false, fle, inps);
+	@Test
+	public void testErrorException() {
+			String msg = 
+				"[ERROR] An error occured parsing replacement pairs:"
+				+ "\n\t[ERROR] line 2, pair 1: Ran out of input looking for"
+				+ " replacement body for raw name 'a'"
+				+ "\n\t\tContext: No associated line";
+
+			assertThrownMessage(msg, "data/test/test7.rp");
 	}
 
-	private void assertMultiReplace(boolean logRep, String fle, String... inps) {
-		if (inps.length < 2) throw new IllegalArgumentException("ERROR: Must provide at least two strings to assertMultiReplace");
-		if (inps.length % 2 != 0) throw new IllegalArgumentException("ERROR: Odd number of strings passed to assertMultiReplace");
-
-		List<ReplPair> lrp = null;
-
-		try (FileInputStream fis = new FileInputStream(fle); Scanner scn = new Scanner(fis)) {
-			lrp = ReplPair.readList(scn);
-		} catch (Exception ex) {
-			System.err.println("EXCEPTION");
-			ex.printStackTrace();
-
-			assertTrue(false);
-
-			return;
-		}
-
-		for (int i = 0; i < inps.length; i += 2) {
-			String right = inps[i];
-			String inp   = inps[i + 1];
-
-			assertReplacesTo(logRep, right, lrp, inp);
-		}
-	}
+	@Test
+	public void testPairs() {
+		ReplPair rp1 = new ReplPair();
+		ReplPair rp2 = new ReplPair("", "");
 
-	private void assertReplacesFrom(String right, String inp, String fle) {
-		assertMultiReplace(fle, right, inp);
-	}
+		rp1.name = rp1.find;
 
-	private void assertReplacesTo(String right, List<ReplPair> rps, String inp) {
-		assertReplacesTo(false, right, rps, inp);
+		assertEquals(rp2, rp1);
+		assertEquals(rp2.toString(), rp1.toString());
 	}
 
-	private void assertReplacesTo(boolean logRep, String right, List<ReplPair> rps, String inp) {
-		if (logRep) System.err.printf("\t[LOG] Checking '%s' -> '%s'\n", inp, right);
-
-		String tmp = inp;
-
-		for (ReplPair rp : rps) {
-			String oldTmp = tmp;
-
-			tmp = rp.apply(tmp);
-
-			if (logRep) System.err.printf("\t[LOG] '%s' -> '%s'\t%s\n", oldTmp, tmp, rp);
-		}
-
-		assertEquals(right, tmp);
+	@Test
+	public void testGlobals() {
+		assertMultiReplace("data/test/test8.rp", "b1d\n1d\n1b1", "acca");
 	}
 }