From 63524d0fe212609cc4af93807753a47eae09979b Mon Sep 17 00:00:00 2001
From: Ben Culkin <scorpress@gmail.com>
Date: Wed, 20 May 2020 19:16:55 -0400
Subject: Rename test files

Renamed the test files so that their name gives a hint as to what it is
that they are testing, without having to open the file
---
 data/test/test1-empty.rp                   |  1 +
 data/test/test1.rp                         |  1 -
 data/test/test10-guard.rp                  |  3 +++
 data/test/test10.rp                        |  3 ---
 data/test/test11-bodyinlinemulti.rp        | 20 ++++++++++++++++++++
 data/test/test11.rp                        | 20 --------------------
 data/test/test2-singlereplace.rp           |  3 +++
 data/test/test2.rp                         |  3 ---
 data/test/test3-multireplace.rp            |  9 +++++++++
 data/test/test3.rp                         |  9 ---------
 data/test/test4-implicitorder.rp           | 12 ++++++++++++
 data/test/test4.rp                         | 12 ------------
 data/test/test5-explicitorder.rp           | 12 ++++++++++++
 data/test/test5.rp                         | 12 ------------
 data/test/test6-staging.rp                 | 16 ++++++++++++++++
 data/test/test6.rp                         | 16 ----------------
 data/test/test7-error.rp                   |  2 ++
 data/test/test7.rp                         |  2 --
 data/test/test8-globals.rp                 | 12 ++++++++++++
 data/test/test8.rp                         | 12 ------------
 src/test/java/bjc/everge/ReplPairTest.java | 20 ++++++++++----------
 21 files changed, 100 insertions(+), 100 deletions(-)
 create mode 100644 data/test/test1-empty.rp
 delete mode 100644 data/test/test1.rp
 create mode 100644 data/test/test10-guard.rp
 delete mode 100644 data/test/test10.rp
 create mode 100644 data/test/test11-bodyinlinemulti.rp
 delete mode 100644 data/test/test11.rp
 create mode 100644 data/test/test2-singlereplace.rp
 delete mode 100644 data/test/test2.rp
 create mode 100644 data/test/test3-multireplace.rp
 delete mode 100644 data/test/test3.rp
 create mode 100644 data/test/test4-implicitorder.rp
 delete mode 100644 data/test/test4.rp
 create mode 100644 data/test/test5-explicitorder.rp
 delete mode 100644 data/test/test5.rp
 create mode 100644 data/test/test6-staging.rp
 delete mode 100644 data/test/test6.rp
 create mode 100644 data/test/test7-error.rp
 delete mode 100644 data/test/test7.rp
 create mode 100644 data/test/test8-globals.rp
 delete mode 100644 data/test/test8.rp

diff --git a/data/test/test1-empty.rp b/data/test/test1-empty.rp
new file mode 100644
index 0000000..f736b8e
--- /dev/null
+++ b/data/test/test1-empty.rp
@@ -0,0 +1 @@
+# Blank file test
diff --git a/data/test/test1.rp b/data/test/test1.rp
deleted file mode 100644
index f736b8e..0000000
--- a/data/test/test1.rp
+++ /dev/null
@@ -1 +0,0 @@
-# Blank file test
diff --git a/data/test/test10-guard.rp b/data/test/test10-guard.rp
new file mode 100644
index 0000000..a647a3a
--- /dev/null
+++ b/data/test/test10-guard.rp
@@ -0,0 +1,3 @@
+# Test pair guards
+//G/aaa//a
+b
diff --git a/data/test/test10.rp b/data/test/test10.rp
deleted file mode 100644
index a647a3a..0000000
--- a/data/test/test10.rp
+++ /dev/null
@@ -1,3 +0,0 @@
-# Test pair guards
-//G/aaa//a
-b
diff --git a/data/test/test11-bodyinlinemulti.rp b/data/test/test11-bodyinlinemulti.rp
new file mode 100644
index 0000000..35eb329
--- /dev/null
+++ b/data/test/test11-bodyinlinemulti.rp
@@ -0,0 +1,20 @@
+# Test of inline multi-line controls on the body
+#|//tt
+a
+//MT//b\
+c
+
+d
+//M/true//z|\
+a
+
+
+
+|//MT
+
+F\
+G
+//MF//q\
+p\
+o
+m
\ No newline at end of file
diff --git a/data/test/test11.rp b/data/test/test11.rp
deleted file mode 100644
index 35eb329..0000000
--- a/data/test/test11.rp
+++ /dev/null
@@ -1,20 +0,0 @@
-# Test of inline multi-line controls on the body
-#|//tt
-a
-//MT//b\
-c
-
-d
-//M/true//z|\
-a
-
-
-
-|//MT
-
-F\
-G
-//MF//q\
-p\
-o
-m
\ No newline at end of file
diff --git a/data/test/test2-singlereplace.rp b/data/test/test2-singlereplace.rp
new file mode 100644
index 0000000..ea05d12
--- /dev/null
+++ b/data/test/test2-singlereplace.rp
@@ -0,0 +1,3 @@
+# Basic single pair test
+test1
+test2
diff --git a/data/test/test2.rp b/data/test/test2.rp
deleted file mode 100644
index ea05d12..0000000
--- a/data/test/test2.rp
+++ /dev/null
@@ -1,3 +0,0 @@
-# Basic single pair test
-test1
-test2
diff --git a/data/test/test3-multireplace.rp b/data/test/test3-multireplace.rp
new file mode 100644
index 0000000..8121c8c
--- /dev/null
+++ b/data/test/test3-multireplace.rp
@@ -0,0 +1,9 @@
+# Basic multi-pair test
+a
+A
+
+b
+B
+
+c
+C
diff --git a/data/test/test3.rp b/data/test/test3.rp
deleted file mode 100644
index 8121c8c..0000000
--- a/data/test/test3.rp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Basic multi-pair test
-a
-A
-
-b
-B
-
-c
-C
diff --git a/data/test/test4-implicitorder.rp b/data/test/test4-implicitorder.rp
new file mode 100644
index 0000000..28b14d5
--- /dev/null
+++ b/data/test/test4-implicitorder.rp
@@ -0,0 +1,12 @@
+# Basic priority test
+ab
+d
+
+a
+b
+
+b
+c
+
+c
+a
diff --git a/data/test/test4.rp b/data/test/test4.rp
deleted file mode 100644
index 28b14d5..0000000
--- a/data/test/test4.rp
+++ /dev/null
@@ -1,12 +0,0 @@
-# Basic priority test
-ab
-d
-
-a
-b
-
-b
-c
-
-c
-a
diff --git a/data/test/test5-explicitorder.rp b/data/test/test5-explicitorder.rp
new file mode 100644
index 0000000..2ee18ce
--- /dev/null
+++ b/data/test/test5-explicitorder.rp
@@ -0,0 +1,12 @@
+# Basic explicit priority test
+//P/-1//ab
+d
+
+a
+b
+
+b
+c
+
+c
+a
diff --git a/data/test/test5.rp b/data/test/test5.rp
deleted file mode 100644
index 2ee18ce..0000000
--- a/data/test/test5.rp
+++ /dev/null
@@ -1,12 +0,0 @@
-# Basic explicit priority test
-//P/-1//ab
-d
-
-a
-b
-
-b
-c
-
-c
-a
diff --git a/data/test/test6-staging.rp b/data/test/test6-staging.rp
new file mode 100644
index 0000000..34fd9dd
--- /dev/null
+++ b/data/test/test6-staging.rp
@@ -0,0 +1,16 @@
+# Basic staging test
+|//tf;df
+//S/1//a
+b
+
+b
+c
+
+//S/2//x
+y1
+
+//S/1;I//1
+2
+
+//E;P/2//y1
+z
diff --git a/data/test/test6.rp b/data/test/test6.rp
deleted file mode 100644
index 34fd9dd..0000000
--- a/data/test/test6.rp
+++ /dev/null
@@ -1,16 +0,0 @@
-# Basic staging test
-|//tf;df
-//S/1//a
-b
-
-b
-c
-
-//S/2//x
-y1
-
-//S/1;I//1
-2
-
-//E;P/2//y1
-z
diff --git a/data/test/test7-error.rp b/data/test/test7-error.rp
new file mode 100644
index 0000000..3a8f995
--- /dev/null
+++ b/data/test/test7-error.rp
@@ -0,0 +1,2 @@
+# Basic error test
+a
diff --git a/data/test/test7.rp b/data/test/test7.rp
deleted file mode 100644
index 3a8f995..0000000
--- a/data/test/test7.rp
+++ /dev/null
@@ -1,2 +0,0 @@
-# Basic error test
-a
diff --git a/data/test/test8-globals.rp b/data/test/test8-globals.rp
new file mode 100644
index 0000000..8fd2165
--- /dev/null
+++ b/data/test/test8-globals.rp
@@ -0,0 +1,12 @@
+# Global flag/multi-line test
+|//TRACEf
+|//P/0;S/0;M/true;Df
+
+a
+b\
+# a comment
+1
+
+c
+d|\
+1
diff --git a/data/test/test8.rp b/data/test/test8.rp
deleted file mode 100644
index 8fd2165..0000000
--- a/data/test/test8.rp
+++ /dev/null
@@ -1,12 +0,0 @@
-# Global flag/multi-line test
-|//TRACEf
-|//P/0;S/0;M/true;Df
-
-a
-b\
-# a comment
-1
-
-c
-d|\
-1
diff --git a/src/test/java/bjc/everge/ReplPairTest.java b/src/test/java/bjc/everge/ReplPairTest.java
index 43ae68a..f88279b 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.rp";
+		String fName = "data/test/test1-empty.rp";
 
 		try (FileInputStream fis = new FileInputStream(fName);
 				Scanner scn = new Scanner(fis)) {
@@ -36,28 +36,28 @@ public class ReplPairTest {
 
 	@Test
 	public void testSingleReplace() {
-		assertMultiReplace("data/test/test2.rp", "test2", "test1", "test2", "test2");
+		assertMultiReplace("data/test/test2-singlereplace.rp", "test2", "test1", "test2", "test2");
 	}
 
 	@Test
 	public void testMultiReplace() {
-		assertMultiReplace("data/test/test3.rp", "A B C", "a b c", "A A B", "a a b",
+		assertMultiReplace("data/test/test3-multireplace.rp", "A B C", "a b c", "A A B", "a a b",
 				"AAB", "aab");
 	}
 
 	@Test
 	public void testReplaceOrder() {
-		assertMultiReplace("data/test/test4.rp", "a", "a", "d", "ab");
+		assertMultiReplace("data/test/test4-implicitorder.rp", "a", "a", "d", "ab");
 	}
 
 	@Test
 	public void testReplaceExpOrder() {
-		assertMultiReplace(false, "data/test/test5.rp", "a", "a", "aa", "ab");
+		assertMultiReplace(false, "data/test/test5-explicitorder.rp", "a", "a", "aa", "ab");
 	}
 
 	@Test
 	public void testStaging() {
-		assertMultiReplace("data/test/test6.rp", "c", "a", "y2", "x");
+		assertMultiReplace("data/test/test6-staging.rp", "c", "a", "y2", "x");
 	}
 
 	@Test
@@ -67,7 +67,7 @@ public class ReplPairTest {
 				+ " replacement body for raw name 'a'"
 				+ "\n\t\tContext: No associated line";
 
-		assertThrownMessage(msg, "data/test/test7.rp");
+		assertThrownMessage(msg, "data/test/test7-error.rp");
 	}
 
 	@Test
@@ -83,17 +83,17 @@ public class ReplPairTest {
 
 	@Test
 	public void testGlobals() {
-		assertMultiReplace("data/test/test8.rp", "b1d\n1d\n1b1", "acca");
+		assertMultiReplace("data/test/test8-globals.rp", "b1d\n1d\n1b1", "acca");
 	}
 
 	@Test
 	public void testGuards() {
-		assertMultiReplace("data/test/test10.rp", "a", "a", "bbb", "aaa");
+		assertMultiReplace("data/test/test10-guard.rp", "a", "a", "bbb", "aaa");
 	}
 	
 	@Test
 	public void testMultiControl() {
-		assertMultiReplace("data/test/test11.rp", "bc", "a", "z\na", "d", "m", "po");
+		assertMultiReplace("data/test/test11-bodyinlinemulti.rp", "bc", "a", "z\na", "d", "m", "po");
 		
 		// NOTE Uncomment when :EndingSlash is fixed 
 		//assertMultiReplace("data/test/test11.rp", "q\\", "FG");
-- 
cgit v1.2.3