0.13.4 - Improve unit test coverage.

TeamworkGuy2 · TeamworkGuy2 · commit 554e062d642d · 2020-04-25T14:02:59.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,14 @@ This project does its best to adhere to [Semantic Versioning](http://semver.org/
 
 
 --------
-### [0.13.3](N/A) - 2019-10-03
+### [0.13.4](N/A) - 2020-04-25
+#### Changed
+* Improve unit tests
+* Remove `DataUnescapePartialQuoted.inputsNoClosingQuote` and `expectedNoClosingQuote` test data in favor of embedding it directly in test methods for readability.
+
+
+--------
+### [0.13.3](https://github.com/TeamworkGuy2/JTextUtil/commit/ad33795962590e43f7e8ce0fc52dbf459abf95f8) - 2019-10-03
 #### Changed
 * Fix accidental test class property name change in previous commit
 * First `twg2.text.benchmark` tests added
diff --git a/README.md b/README.md
@@ -4,10 +4,10 @@ JTextUtil
 Dependencies: none
 
 ### twg2.text.stringEscape
-Escape and unescape methods for JSON (`StringEscapeJson`), XML (`StringEscapeXml`), and strings with non-ASCII characters, quotes, or `\t \b \f \r` characters (`StringEscape` and `StringEscapePartial`).
+Escape and unescape methods for JSON (`StringEscapeJson`), XML (`StringEscapeXml`), and strings with non-ASCII characters, quotes, or escape `\t \b \f \r` characters (`StringEscape` and `StringEscapePartial`).
 
 ### twg2.text.stringSearch
-String search methods for indexOf/lastIndexOf (`StringIndex`), endsWith, startsWith, compare, contains (`StringCompare`), and common prefix/suffix (`StringCommonality`).
+String search methods for indexOf()/lastIndexOf() (`StringIndex`), endsWith(), startsWith(), compare(), contains() (`StringCompare`), and common prefix/suffix (`StringCommonality`).
 
 ### twg2.text.stringUtils
 String utility methods for join and repeat (`StringJoin`), pad (`StringPad`), split, substring, and Nth match (`StringSplit`), trim (`StringTrim`), replace (`StringReplace`), hex conversion (`StringHex`), empty/whitespace checking (`StringCheck`), code identifier case checking for camelCase, TitleCase, snake_case, etc (`StringCase`), and conversion to and from java.util.Properties format (`StringToProperties`).
diff --git a/bin/jtext_util-with-tests.jar b/bin/jtext_util-with-tests.jar
diff --git a/bin/jtext_util.jar b/bin/jtext_util.jar
diff --git a/package-lib.json b/package-lib.json
@@ -1,5 +1,5 @@
 {
-	"version" : "0.13.3",
+	"version" : "0.13.4",
 	"name" : "jtext-util",
 	"description" : "String search, replace, and transform functions that provide more control, at the trade-off of verbosity, than those already in the Java API",
 	"homepage" : "https://github.com/TeamworkGuy2/JTextUtil",
diff --git a/src/twg2/text/stringUtils/ArrayUtilCopy.java b/src/twg2/text/stringUtils/ArrayUtilCopy.java
@@ -1,6 +1,6 @@
 package twg2.text.stringUtils;
 
-/** Copy of methods from JCollectionUtility arrayUtils.ArrayUtil
+/** Copy of methods from JArrays twg2.arrays.ArrayUtil
  * @author TeamworkGuy2
  * @since 2015-1-24
  */
@@ -13,19 +13,7 @@ class ArrayUtilCopy {
 	 * @return the index of the matching value, or -1 if the {@code value} could not be found
 	 */
 	public static final int indexOf(char[] ary, char value) {
-		return indexOf(ary, 0, ary.length, value);
-	}
-
-
-	/** Search for a matching char in an array of chars
-	 * @param ary the array of values to search
-	 * @param off the offset into {@code ary} at which to start searching for values
-	 * @param len the number of values to search for starting at {@code off} in {@code ary}
-	 * @param value the value to search for
-	 * @return the index of the matching value, or -1 if the {@code value} could not be found
-	 */
-	public static final int indexOf(char[] ary, int off, int len, char value) {
-		for(int i = off, size = off + len; i < size; i++) {
+		for(int i = 0, size = ary.length; i < size; i++) {
 			if(ary[i] == (value)) { return i; }
 		}
 		return -1;
diff --git a/test/twg2/text/benchmark/StringIndexPerf.java b/test/twg2/text/benchmark/StringIndexPerf.java
@@ -33,7 +33,7 @@ public void indexOfTwg2() {
 			}
 		}
 
-		System.out.println(res);
+		System.out.println(this.getClass().getSimpleName() + "-" + res);
 	}
 
 
@@ -51,7 +51,7 @@ public void indexOfJava() {
 			}
 		}
 
-		System.out.println(res);
+		System.out.println(this.getClass().getSimpleName() + "-" + res);
 	}
 
 }
diff --git a/test/twg2/text/benchmark/StringReplacePerf.java b/test/twg2/text/benchmark/StringReplacePerf.java
@@ -26,14 +26,14 @@ public void replaceTwg2() {
 		for(int i = 0; i < loops; i++) {
 			int sub = 0;
 			for(int j = 0, size = strs.size(); j < size; j++) {
-				sub += StringReplace.replace(StringReplace.replace(strs.get(j), "-a", "-A"), "A", "B").hashCode() - (j < size - 1 ? StringReplace.replace(strs.get(j + 1), "A", "B").hashCode() : 0);
+				sub += StringReplace.replace(StringReplace.replace(strs.get(j), "-a", "-A"), "A", "B").length() - (j < size - 1 ? StringReplace.replace(strs.get(j + 1), "A", "B").length() : 0);
 			}
 			if(i % 3 == 0 || i % 5 == 0) {
 				res += sub;
 			}
 		}
 
-		System.out.println(res);
+		System.out.println(this.getClass().getSimpleName() + "-" + res);
 	}
 
 
@@ -44,14 +44,14 @@ public void replaceJava() {
 		for(int i = 0; i < loops; i++) {
 			int sub = 0;
 			for(int j = 0, size = strs.size(); j < size; j++) {
-				sub += strs.get(j).replace("-a", "-A").replace("A", "B").hashCode() - (j < size - 1 ? strs.get(j + 1).replace("A", "B").hashCode() : 0);
+				sub += strs.get(j).replace("-a", "-A").replace("A", "B").length() - (j < size - 1 ? strs.get(j + 1).replace("A", "B").length() : 0);
 			}
 			if(i % 3 == 0 || i % 5 == 0) {
 				res += sub;
 			}
 		}
 
-		System.out.println(res);
+		System.out.println(this.getClass().getSimpleName() + "-" + res);
 	}
 
 }
diff --git a/test/twg2/text/benchmark/StringSplitPerf.java b/test/twg2/text/benchmark/StringSplitPerf.java
@@ -33,7 +33,7 @@ public void splitTwg2() {
 			}
 		}
 
-		System.out.println(res);
+		System.out.println(this.getClass().getSimpleName() + "-" + res);
 	}
 
 
@@ -51,7 +51,7 @@ public void splitJava() {
 			}
 		}
 
-		System.out.println(res);
+		System.out.println(this.getClass().getSimpleName() + "-" + res);
 	}
 
 }
diff --git a/test/twg2/text/test/DataUnescapePartialQuoted.java b/test/twg2/text/test/DataUnescapePartialQuoted.java
@@ -7,7 +7,6 @@
  * @author TeamworkGuy2
  */
 public class DataUnescapePartialQuoted {
-
 	public static int inputsOffset = 3;
 
 	public static List<String> inputs = Arrays.asList(
@@ -53,19 +52,4 @@ public class DataUnescapePartialQuoted {
 		inputs.get(6).lastIndexOf(',')
 	);
 
-
-	/** inputs which contain one quote char (i.e. are missing an end quote) */
-	public static List<String> inputsNoClosingQuote = Arrays.asList(
-		"un\"closed",
-		"\"abc,",
-		"\""
-	);
-
-	/** expected parse results for {@link #inputsNoClosingQuote} */
-	public static List<String> expectedNoClosingQuote = Arrays.asList(
-		"un\"closed",
-		"\"abc,",
-		"\""
-	);
-
 }
diff --git a/test/twg2/text/test/StringCaseTest.java b/test/twg2/text/test/StringCaseTest.java
@@ -29,11 +29,11 @@ public StringCases(List<String> shouldPass, List<String> shouldFail) {
 
 	@Test
 	public void stringCaseCheck() {
-		StringCases camelCase = new StringCases(list("abc"), list("a_c", "Abc"));
-		StringCases titleCase = new StringCases(list("AlphaChar"), list("alphaChar", "Alpha_Char", "Alpha-Char"));
-		StringCases dashCase = new StringCases(list("alpha-char", "-b"), list("alphaChar", "Alpha-char", "Alpha-Char"));
-		StringCases underscoreLowerCase = new StringCases(list("moon_base", "_b"), list("moon_Base", "Moon_base", "Moon_Base"));
-		StringCases underscoreTitleCase = new StringCases(list("Nanite_Cloud", "_B"), list("nanite_cloud", "Nanite_clound", "nanite_Cloud"));
+		StringCases camelCase = new StringCases(list("abc"), list("", "a_c", "Abc"));
+		StringCases titleCase = new StringCases(list("AlphaChar"), list("", "alphaChar", "Alpha_Char", "Alpha-Char"));
+		StringCases dashCase = new StringCases(list("alpha-char", "-b"), list("", "alphaChar", "Alpha-char", "Alpha-Char"));
+		StringCases underscoreLowerCase = new StringCases(list("moon_base", "_b"), list("", "moon_Base", "Moon_base", "Moon_Base"));
+		StringCases underscoreTitleCase = new StringCases(list("Nanite_Cloud", "_B"), list("", "nanite_cloud", "Nanite_clound", "nanite_Cloud"));
 
 		toStringCases(camelCase, "camelCase", StringCase::isCamelCase);
 		toStringCases(titleCase, "TitleCase", StringCase::isTitleCase);
@@ -59,12 +59,13 @@ private static <T> void convertTest(List<String> cases, String converterName, Fu
 
 	@Test
 	public void stringToCase() {
-		String[] strs = new String[]                { "abc", "Alpha", "Subpar", "SupPar",  "Al_Cid", "a-b", "at-b-", "-c", "var_val_byte", "A_", "_A", "a", "_" };
-		String[] camelCase = new String[]           { "abc", "alpha", "subpar", "supPar",  "alCid",  "aB",  "atB",   "C",  "varValByte",   "a",  "a",  "a", "_" };
-		String[] titleCase = new String[]           { "Abc", "Alpha", "Subpar", "SupPar",  "AlCid",  "AB",  "AtB",   "C",  "VarValByte",   "A",  "A",  "A", "_" };
-		String[] dashCase = new String[]            { "abc", "alpha", "subpar", "sup-par", "al-cid", "a-b", "at-b-", "-c", "var-val-byte", "a-", "-a", "a", "-" };
-		String[] underscoreLowerCase = new String[] { "abc", "alpha", "subpar", "sup_par", "al_cid", "a_b", "at_b_", "_c", "var_val_byte", "a_", "_a", "a", "_" };
-		String[] underscoreTitleCase = new String[] { "Abc", "Alpha", "Subpar", "Sup_Par", "Al_Cid", "A_B", "At_B_", "_C", "Var_Val_Byte", "A_", "_A", "A", "_" };
+		String[] strs =                { "abc", "Alpha", "subPar",  "Subpar", "SupPar",  "Al_Cid", "a-b", "at-b-", "-c", "var_val_byte", "A_", "_A", "a", "_" };
+
+		String[] camelCase =           { "abc", "alpha", "subPar",  "subpar", "supPar",  "alCid",  "aB",  "atB",   "C",  "varValByte",   "a",  "a",  "a", "_" };
+		String[] titleCase =           { "Abc", "Alpha", "SubPar",  "Subpar", "SupPar",  "AlCid",  "AB",  "AtB",   "C",  "VarValByte",   "A",  "A",  "A", "_" };
+		String[] dashCase =            { "abc", "alpha", "sub-par", "subpar", "sup-par", "al-cid", "a-b", "at-b-", "-c", "var-val-byte", "a-", "-a", "a", "-" };
+		String[] underscoreLowerCase = { "abc", "alpha", "sub_par", "subpar", "sup_par", "al_cid", "a_b", "at_b_", "_c", "var_val_byte", "a_", "_a", "a", "_" };
+		String[] underscoreTitleCase = { "Abc", "Alpha", "Sub_Par", "Subpar", "Sup_Par", "Al_Cid", "A_B", "At_B_", "_C", "Var_Val_Byte", "A_", "_A", "A", "_" };
 
 		for(int i = 0, size = strs.length; i < size; i++) {
 			Assert.assertEquals("camelCase " + i, camelCase[i], StringCase.toCamelCase(strs[i]));
diff --git a/test/twg2/text/test/StringEscapePartialTest.java b/test/twg2/text/test/StringEscapePartialTest.java
@@ -1,5 +1,6 @@
 package twg2.text.test;
 
+import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Assert;
@@ -24,7 +25,7 @@ public void unescapePartialQuotedTest() {
 
 		for(int i = 0, size = inputs.size(); i < size; i++) {
 			int index = StringEscapePartial.unescapePartialQuoted(inputs.get(i), offset, inputs.get(i).length() - offset, '\\', '"', ',', ']', false, dst);
-			Assert.assertEquals(expect.get(i), dst.toString());
+			Assert.assertEquals("#" + i + ".", expect.get(i), dst.toString());
 			Assert.assertEquals(i + ". expect (" + expectIdxs.get(i) + "): " + expect.get(i) + ", result (" + index + "): " + dst.toString(), (int)expectIdxs.get(i), index);
 			dst.setLength(0);
 		}
@@ -48,10 +49,15 @@ public void unescapePartialQuotedTest() {
 
 	@Test
 	public void unescapePartialQuotedFailureTest() {
+		List<String> inputs = Arrays.asList(
+			"un\"closed",
+			"\"abc,",
+			"\""
+		);
 		StringBuilder dst = new StringBuilder();
 
 		int i = 0;
-		for(String errInput : DataUnescapePartialQuoted.inputsNoClosingQuote) {
+		for(String errInput : inputs) {
 			CheckTask.assertException("(" + i + ") " + errInput, () -> {
 				StringEscapePartial.unescapePartialQuoted(errInput, 0, errInput.length(), '\\', '"', ',', ']', true, dst);
 			});
diff --git a/test/twg2/text/test/StringHexTest.java b/test/twg2/text/test/StringHexTest.java
@@ -26,15 +26,15 @@ public void testEncodeDecodeHex() throws IOException {
 		byte[] hexBytes = bytes(154, 240, 224);
 		byte[] hexBytesOff1Len2 = bytes(175);
 
-		List<String> hexChunks = Arrays.asList("5B06", "3", "4412", "E8");
-		byte[] hexByteChunks = bytes(91, 6, 52/*3", "4*/, 65, 46, 128);
+		List<String> hexChunks = Arrays.asList("5B06", "4D5A", "3", "09", "4412", "0504B0304504B0304", "E8");
+		byte[] hexByteChunks = bytes(91, 6, 77, 90, 48/*3", "0*/, (byte)148, 65, 32, 80, 75, 3, 4, 80, 75, 3, 4, (byte)232);
 
 		StringReader hexStrReader = new StringReader(hexStr);
 		byte[] bytes = StringHex.decodeHexStream(hexStrReader);
 		Assert.assertArrayEquals(hexBytes, bytes);
 
 		StringChunkReader hexChunkReader = new StringChunkReader(hexChunks);
-		bytes = StringHex.decodeHexStream(hexChunkReader, 1024);
+		bytes = StringHex.decodeHexStream(hexChunkReader, 16);
 		Assert.assertArrayEquals(hexByteChunks, bytes);
 
 		bytes = StringHex.decodeHexString(hexStr);
diff --git a/test/twg2/text/test/StringIndexTest.java b/test/twg2/text/test/StringIndexTest.java
@@ -179,6 +179,9 @@ public void indexOf_StringOrCharAryOrCharSeq_Char() {
 		Assert.assertEquals(10, StringIndex.indexOf(        fromStringsAndCodePoints("Aa Bb Ccc ", 0x1F3B8),  3, 9, (int)0x1F3B8));
 		Assert.assertEquals(10, StringIndex.indexOf(  chars(fromStringsAndCodePoints("Aa Bb Ccc ", 0x1F3B8)), 3, 9, (int)0x1F3B8));
 		Assert.assertEquals(10, StringIndex.indexOf(charSeq(fromStringsAndCodePoints("Aa Bb Ccc ", 0x1F3B8)), 3, 9, (int)0x1F3B8));
+
+		CheckTask.assertException(() -> fromStringsAndCodePoints("A", 50, String.class));
+		CheckTask.assertException(() -> fromStringsAndCodePoints("A", 50, null));
 	}
 
 
diff --git a/test/twg2/text/test/StringReplaceTest.java b/test/twg2/text/test/StringReplaceTest.java
@@ -174,6 +174,9 @@ public void stringReplaceMiscellaneous() {
 
 		str = StringReplace.replaceEscapeLiterals("\\t\\n\\\\\'");
 		Assert.assertEquals("\t\n\\\'", str);
+
+		str = StringReplace.replaceEscapeLiterals("[\\]");
+		Assert.assertEquals("[\\]", str);
 	}
 
 
diff --git a/test/twg2/text/test/utils/StringChunkReader.java b/test/twg2/text/test/utils/StringChunkReader.java
@@ -29,7 +29,7 @@ public int read(char[] cbuf, int off, int len) throws IOException {
 				String remaining = chunk.substring(len);
 				chunks.set(0, remaining);
 			}
-			else if(chunk.length() <= len) {
+			else /*if(chunk.length() <= len)*/ {
 				len = chunk.length();
 				chunks.remove(0);
 			}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version" : "0.13.3",`
	`2`	`+ "version" : "0.13.4",`
`3`	`3`	`"name" : "jtext-util",`
`4`	`4`	`"description" : "String search, replace, and transform functions that provide more control, at the trade-off of verbosity, than those already in the Java API",`
`5`	`5`	`"homepage" : "https://github.com/TeamworkGuy2/JTextUtil",`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public void indexOfTwg2() {`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`- System.out.println(res);`
	`36`	`+ System.out.println(this.getClass().getSimpleName() + "-" + res);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`
`@@ -51,7 +51,7 @@ public void indexOfJava() {`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`- System.out.println(res);`
	`54`	`+ System.out.println(this.getClass().getSimpleName() + "-" + res);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,14 +26,14 @@ public void replaceTwg2() {`
`26`	`26`	`for(int i = 0; i < loops; i++) {`
`27`	`27`	`int sub = 0;`
`28`	`28`	`for(int j = 0, size = strs.size(); j < size; j++) {`
`29`		`- sub += StringReplace.replace(StringReplace.replace(strs.get(j), "-a", "-A"), "A", "B").hashCode() - (j < size - 1 ? StringReplace.replace(strs.get(j + 1), "A", "B").hashCode() : 0);`
	`29`	`+ sub += StringReplace.replace(StringReplace.replace(strs.get(j), "-a", "-A"), "A", "B").length() - (j < size - 1 ? StringReplace.replace(strs.get(j + 1), "A", "B").length() : 0);`
`30`	`30`	`}`
`31`	`31`	`if(i % 3 == 0 \|\| i % 5 == 0) {`
`32`	`32`	`res += sub;`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`- System.out.println(res);`
	`36`	`+ System.out.println(this.getClass().getSimpleName() + "-" + res);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`
`@@ -44,14 +44,14 @@ public void replaceJava() {`
`44`	`44`	`for(int i = 0; i < loops; i++) {`
`45`	`45`	`int sub = 0;`
`46`	`46`	`for(int j = 0, size = strs.size(); j < size; j++) {`
`47`		`- sub += strs.get(j).replace("-a", "-A").replace("A", "B").hashCode() - (j < size - 1 ? strs.get(j + 1).replace("A", "B").hashCode() : 0);`
	`47`	`+ sub += strs.get(j).replace("-a", "-A").replace("A", "B").length() - (j < size - 1 ? strs.get(j + 1).replace("A", "B").length() : 0);`
`48`	`48`	`}`
`49`	`49`	`if(i % 3 == 0 \|\| i % 5 == 0) {`
`50`	`50`	`res += sub;`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`- System.out.println(res);`
	`54`	`+ System.out.println(this.getClass().getSimpleName() + "-" + res);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public void splitTwg2() {`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`- System.out.println(res);`
	`36`	`+ System.out.println(this.getClass().getSimpleName() + "-" + res);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`
`@@ -51,7 +51,7 @@ public void splitJava() {`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`- System.out.println(res);`
	`54`	`+ System.out.println(this.getClass().getSimpleName() + "-" + res);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`}`