Cleanup part 2

Some more cleanup of things

2 files changed, 14 insertions, 14 deletions

diff --git a/src/test/java/bjc/everge/EvergeTest.java b/src/test/java/bjc/everge/EvergeTest.java
index b70fd26..3f4e113 100644
--- a/src/test/java/bjc/everge/EvergeTest.java
+++ b/src/test/java/bjc/everge/EvergeTest.java
@@ -47,8 +47,8 @@ public class EvergeTest {
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		ByteArrayOutputStream errBaos = new ByteArrayOutputStream();
 
-		OutputStream normOut = new MirrorOutputStream(baos, System.out);
-		OutputStream normErr = new MirrorOutputStream(errBaos, System.err);
+		OutputStream normOut = new MirrorOutputStream(baos/*, System.out*/);
+		OutputStream normErr = new MirrorOutputStream(errBaos/*, System.err*/);
 
 		Everge evg = new Everge();
 		evg.setOutput(normOut);
@@ -57,7 +57,7 @@ public class EvergeTest {
 		evg.processArgs("--verbosity", "4");
 		List<String> errs = new ArrayList<>();
 		boolean stat = evg.processArgs(errs, "--input-status", "line", "--file",
-				"data/test/evg-test1.rp", "data/test/evg-test1.inp");
+				"data/test/evg-test1.evg", "data/test/evg-test1.inp");
 		if (!stat) {
 			System.err.println("[ERROR] Did not succesfully process args");
 			for (String err : errs) {
diff --git a/src/test/java/bjc/everge/ReplPairTest.java b/src/test/java/bjc/everge/ReplPairTest.java
index 860a420..650ee14 100644
--- a/src/test/java/bjc/everge/ReplPairTest.java
+++ b/src/test/java/bjc/everge/ReplPairTest.java
@@ -22,7 +22,7 @@ public class ReplPairTest {
 	@Test
 	public void testLoadFile() {
 		List<ReplPair> lrp = null;
-		String fName = "data/test/test1-empty.rp";
+		String fName = "data/test/test1-empty.evg";
 
 		try (FileInputStream fis = new FileInputStream(fName);
 				Scanner scn = new Scanner(fis)) {
@@ -38,28 +38,28 @@ public class ReplPairTest {
 
 	@Test
 	public void testSingleReplace() {
-		assertMultiReplace("data/test/test2-singlereplace.rp", "test2", "test1", "test2", "test2");
+		assertMultiReplace("data/test/test2-singlereplace.evg", "test2", "test1", "test2", "test2");
 	}
 
 	@Test
 	public void testMultiReplace() {
-		assertMultiReplace("data/test/test3-multireplace.rp", "A B C", "a b c", "A A B", "a a b",
+		assertMultiReplace("data/test/test3-multireplace.evg", "A B C", "a b c", "A A B", "a a b",
 				"AAB", "aab");
 	}
 
 	@Test
 	public void testReplaceOrder() {
-		assertMultiReplace("data/test/test4-implicitorder.rp", "a", "a", "d", "ab");
+		assertMultiReplace("data/test/test4-implicitorder.evg", "a", "a", "d", "ab");
 	}
 
 	@Test
 	public void testReplaceExpOrder() {
-		assertMultiReplace(false, "data/test/test5-explicitorder.rp", "a", "a", "aa", "ab");
+		assertMultiReplace(false, "data/test/test5-explicitorder.evg", "a", "a", "aa", "ab");
 	}
 
 	@Test
 	public void testStaging() {
-		assertMultiReplace("data/test/test6-staging.rp", "c", "a", "y2", "x");
+		assertMultiReplace("data/test/test6-staging.evg", "c", "a", "y2", "x");
 	}
 
 	@Test
@@ -69,7 +69,7 @@ public class ReplPairTest {
 				+ " replacement body for raw name 'a'"
 				+ "\n\t\tContext: No associated line";
 
-		assertThrownMessage(msg, "data/test/test7-error.rp");
+		assertThrownMessage(msg, "data/test/test7-error.evg");
 	}
 
 	@Test
@@ -85,19 +85,19 @@ public class ReplPairTest {
 
 	@Test
 	public void testGlobals() {
-		assertMultiReplace("data/test/test8-globals.rp", "b1d\n1d\n1b1", "acca");
+		assertMultiReplace("data/test/test8-globals.evg", "b1d\n1d\n1b1", "acca");
 	}
 
 	@Test
 	public void testGuards() {
-		assertMultiReplace("data/test/test10-guard.rp", "a", "a", "bbb", "aaa");
+		assertMultiReplace("data/test/test10-guard.evg", "a", "a", "bbb", "aaa");
 	}
 	
 	@Test
 	public void testMultiControl() {
-		assertMultiReplace("data/test/test11-bodyinlinemulti.rp", "bc", "a", "z\na", "d", "m", "po");
+		assertMultiReplace("data/test/test11-bodyinlinemulti.evg", "bc", "a", "z\na", "d", "m", "po");
 		
 		// NOTE Uncomment when :EndingSlash is fixed 
-		//assertMultiReplace("data/test/test11.rp", "q\\", "FG");
+		//assertMultiReplace("data/test/test11-bodyinlinemulti.evg", "q\\", "FG");
 	}
 }