General update

Testing, plus some reorganization

2 files changed, 121 insertions, 10 deletions

diff --git a/src/test/java/bjc/inflexion/InflectPair.java b/src/test/java/bjc/inflexion/InflectPair.java
new file mode 100644
index 0000000..d2f076a
--- /dev/null
+++ b/src/test/java/bjc/inflexion/InflectPair.java
@@ -0,0 +1,30 @@
+/**
+ * (C) Copyright 2018 Benjamin Culkin.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package bjc.inflexion;
+
+class InflectPair {
+	public String exp;
+	public Object[] pars;
+	
+	public InflectPair(String str, Object... pars) {
+		this.exp = str;
+		this.pars = pars;
+	}
+	
+	public static InflectPair pair(String str, Object... pars) {
+		return new InflectPair(str, pars);
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/bjc/inflexion/InflectionMLTest.java b/src/test/java/bjc/inflexion/InflectionMLTest.java
index 8c44881..d94407f 100644
--- a/src/test/java/bjc/inflexion/InflectionMLTest.java
+++ b/src/test/java/bjc/inflexion/InflectionMLTest.java
@@ -3,28 +3,109 @@ package bjc.inflexion;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
+import static bjc.inflexion.InflectPair.pair;
 
 import static bjc.inflexion.InflectionML.inflect;
 
+/**
+ * Tests for inflection markup.
+ * 
+ * @author bjculkin
+ *
+ */
 public class InflectionMLTest {
+	/**
+	 * Test inflection markup.
+	 */
 	@Test
 	public void testML() {
-		assertEquals("no results", inflect("<#n:0> <N:results>"));
-		assertEquals("7 results",  inflect("<#n:7> <N:results>"));
+		//////////////////////
+		// Check # command   //
+		//////////////////////
+
+		// Check general inflection
+		assertInflects("<#:%s> <N:indexes> %s found", pair("0 indexes were found", 0, "were"),
+				pair("1 index was found", 1, "was"), pair("99 indexes were found", 99, "were"));
+
+		// Check fancier inflection
+		assertInflects("<#wnc:%d> <Noun:indexes> %s found", pair("no indexes were found", 0, "were"),
+				pair("one index was found", 1, "was"), pair("99 indexes were found", 99, "were"));
+
+		// Check count inflection
+		assertInflects("<#w20:%d> <N:indexes> were found", pair("six indexes were found", 6),
+				pair("nineteen indexes were found", 19), pair("20 indexes were found", 20));
+
+		// Check 'n' option
+		assertInflects("<#n:%d> <N:results>", pair("no results", 0), pair("7 results", 7));
 
 		// FIXME
 		//
 		// Adjust this to use <V> for were/was when it is implemented
-		assertEquals("no items were found", inflect("<#n:0> <N:item> were found"));
-		assertEquals("no item was found", inflect("<#s:0> <N:item> was found"));
+		// Check general inflection
+		assertInflects("<#%s:%d> <N:item> %s found", pair("no items were found", "n", 0, "were"),
+				pair("no item was found", "s", 0, "was"));
+
+		// Check article picking
+		assertInflects("<#a:%d> <N:%s>", pair("a result", 1, "results"), pair("3 results", 3, "results"),
+				pair("an outcome", 1, "outcomes"), pair("7 outcomes", 7, "outcomes"));
+
+		// Check 'w' option
+		assertInflects("<#w:%d> <N:results>", pair("six results", 6), pair("ten results", 10),
+				pair("11 results", 11));
+		// Check 'o' option
+		assertInflects("<#o:%d> <N:results>", pair("6th result", 6), pair("11th result", 11),
+				pair("22nd result", 22));
+		assertInflects("<#ow:%d> <N:results>", pair("first result", 1), pair("sixth result", 6),
+				pair("22nd result", 22));
+		assertInflects("<#o15:%d> <N:results>", pair("6th result", 6), pair("11th result", 11),
+				pair("22 results", 22));
+
+		// Check 'f' option
+		assertInflects("Found <#f:%d> <N:matches>", pair("Found no matches", 0), pair("Found one match", 1),
+				pair("Found a couple of matches", 2), pair("Found a few matches", 4),
+				pair("Found several matches", 8), pair("Found many matches", 11));
+
+		assertInflects("Searching for <Np:items>....found <#f1:%d>",
+				pair("Searching for items....found none", 0),
+				pair("Searching for items....found one", 1),
+				pair("Searching for items....found a couple", 2),
+				pair("Searching for items....found a few", 4),
+				pair("Searching for items....found several", 8),
+				pair("Searching for items....found many", 11));
 
-		assertEquals("a result", inflect("<#a:1> <N:results>"));
-		assertEquals("3 results", inflect("<#a:3> <N:results>"));
+		assertInflects("Found <#fs:%d> <N:matches>", pair("Found no match", 0),
+				pair("Found several matches", 7));
+		assertInflects("Found <#fa:%d> <N:matches>", pair("Found a match", 1),
+				pair("Found several matches", 7));
 
-		assertEquals("an outcome", inflect("<#a:1> <N:outcomes>"));
-		assertEquals("3 outcomes", inflect("<#a:3> <N:outcomes>"));
+		// Check 'e' option
+		assertInflects("Found <#e:%d> <N:matches>", pair("Found no match", 0), pair("Found a match", 1),
+				pair("Found ten matches", 10), pair("Found 12 matches", 12));
+
+		// Check 'd' option
+		assertInflects("<#d:%d><N:Match> found", pair("Match found", 1), pair("Matches found", 2));
+
+		////////////////////////
+		// Check N command      //
+		///////////////////////
+
+		// Check 'c' option
+		assertInflects("<#:%d> <N:%s> found", pair("7 maximums found", 7, "maximum"),
+				pair("7 formulas found", 7, "formula"), pair("7 corpuses found", 7, "corpuses"),
+				pair("7 brothers found", 7, "brothers"));
+
+		assertInflects("<#:%d> <Nc:%s> found", pair("7 maxima found", 7, "maximum"),
+				pair("7 formulae found", 7, "formula"), pair("7 corpora found", 7, "corpus"),
+				pair("7 brethren found", 7, "brother"));
+	}
+
+	private static void assertInflects(String exp, String real) {
+		assertEquals(exp, inflect(real));
+	}
 
-		assertEquals("5 things", inflect("<#a:5> <Noun:things>"));
-		assertEquals("a thing", inflect("<#An:1> <Noun:things>"));
+	private static void assertInflects(String real, InflectPair... pairs) {
+		for (InflectPair pair : pairs) {
+			assertEquals(pair.exp, inflect(String.format(real, pair.pars)));
+		}
 	}
 }