Added more tests, refactored code to reduce method length.

jdereg · Feb 4, 2024 · 2369c2b · 2369c2b
1 parent 6e2e37f
commit 2369c2b
Showing 1 changed file with 21 additions and 15 deletions.
diff --git a/src/test/java/com/cedarsoftware/util/convert/ConverterEverythingTest.java b/src/test/java/com/cedarsoftware/util/convert/ConverterEverythingTest.java
@@ -218,6 +218,9 @@ class ConverterEverythingTest
                 { "", (byte)0 },
                 { "crapola", new IllegalArgumentException("Value: crapola not parseable as a byte value or outside -128 to 127")},
                 { "54 crapola", new IllegalArgumentException("Value: 54 crapola not parseable as a byte value or outside -128 to 127")},
+                { "54crapola", new IllegalArgumentException("Value: 54crapola not parseable as a byte value or outside -128 to 127")},
+                { "crapola 54", new IllegalArgumentException("Value: crapola 54 not parseable as a byte value or outside -128 to 127")},
+                { "crapola54", new IllegalArgumentException("Value: crapola54 not parseable as a byte value or outside -128 to 127")},
                 { "-129", new IllegalArgumentException("-129 not parseable as a byte value or outside -128 to 127") },
                 { "128", new IllegalArgumentException("128 not parseable as a byte value or outside -128 to 127") },
         });
@@ -250,21 +253,7 @@ void testEverything() {
                 for (int i=0; i < testData.length; i++) {
                     Object[] testPair = testData[i];
                     try {
-                        if (testPair.length != 2) {
-                            throw new IllegalArgumentException("Test cases must have two values : { source instance, target instance }");
-                        }
-                        if (testPair[1] instanceof Throwable) {
-                            Throwable t = (Throwable) testPair[1];
-                            assertThatExceptionOfType(t.getClass())
-                                    .isThrownBy(() ->  converter.convert(testPair[0], targetClass))
-                                    .withMessageContaining(((Throwable) testPair[1]).getMessage());
-
-                        } else {
-                            if (testPair[0] != null) {
-                                assertThat(testPair[0]).isInstanceOf(sourceClass);
-                            }
-                            assertEquals(testPair[1], converter.convert(testPair[0], targetClass));
-                        }
+                        verifyTestPair(sourceClass, targetClass, testPair);
                     } catch (Throwable e) {
                         System.err.println();
                         System.err.println("{ " + getShortName(sourceClass) + ".class ==> " + getShortName(targetClass) + ".class }");
@@ -285,4 +274,21 @@ void testEverything() {
             throw new RuntimeException("One or more tests failed.");
         }
     }
+
+    private void verifyTestPair(Class<?> sourceClass, Class<?> targetClass, Object[] testPair) {
+        if (testPair.length != 2) {
+            throw new IllegalArgumentException("Test cases must have two values : { source instance, target instance }");
+        }
+        if (testPair[1] instanceof Throwable) {
+            Throwable t = (Throwable) testPair[1];
+            assertThatExceptionOfType(t.getClass())
+                    .isThrownBy(() ->  converter.convert(testPair[0], targetClass))
+                    .withMessageContaining(((Throwable) testPair[1]).getMessage());
+        } else {
+            if (testPair[0] != null) {
+                assertThat(testPair[0]).isInstanceOf(sourceClass);
+            }
+            assertEquals(testPair[1], converter.convert(testPair[0], targetClass));
+        }
+    }
 }