ConfigurableDoubleParser: Fix check for NumberFormatSymbols containing a format character. Add unit tests.

Author: wrandelshofer

fastdoubleparser-dev/src/main/java/ch.randelshofer.fastdoubleparser/ch/randelshofer/fastdoubleparser/NumberFormatSymbolsInfo.java

@@ -76,13 +76,13 @@ static boolean isAsciiCharCollection(Collection<Character> collection) {
     static boolean containsFormatChars(NumberFormatSymbols symbols) {
         FormatCharSet formatCharSet = new FormatCharSet();
         return containsChars(symbols.decimalSeparator(), formatCharSet)
-                && containsChars(symbols.groupingSeparator(), formatCharSet)
-                && containsChars(symbols.exponentSeparator(), formatCharSet)
-                && containsChars(symbols.minusSign(), formatCharSet)
-                && containsChars(symbols.plusSign(), formatCharSet)
-                && containsChars(symbols.infinity(), formatCharSet)
-                && containsChars(symbols.nan(), formatCharSet)
-                && containsChars(symbols.digits(), formatCharSet)
+                || containsChars(symbols.groupingSeparator(), formatCharSet)
+                || containsChars(symbols.exponentSeparator(), formatCharSet)
+                || containsChars(symbols.minusSign(), formatCharSet)
+                || containsChars(symbols.plusSign(), formatCharSet)
+                || containsChars(symbols.infinity(), formatCharSet)
+                || containsChars(symbols.nan(), formatCharSet)
+                || containsChars(symbols.digits(), formatCharSet)
                 ;
     }
 

fastdoubleparser-dev/src/test/java/ch.randelshofer.fastdoubleparser/ch/randelshofer/fastdoubleparser/ConfigurableDoubleParserTest.java

@@ -154,6 +154,13 @@ private void test(NumberTestData d, ToDoubleFunction<NumberTestData> f) {
                     }
                     assertEquals(d.expectedThrowableClass(), e.getClass());
                 }
+            } else if (d.expectedValue() == null) {
+                try {
+                    double actual = f.applyAsDouble(d);
+                    fail("should throw an exception but returned " + actual);
+                } catch (Exception e) {
+                    //success
+                }
             } else {
                 double actual = f.applyAsDouble(d);
                 assertEquals(d.expectedValue().doubleValue(), actual);

fastdoubleparser-dev/src/test/java/ch.randelshofer.fastdoubleparser/ch/randelshofer/fastdoubleparser/ConfigurableDoubleParserTestDataFactory.java

@@ -187,14 +187,16 @@ public static List<NumberTestData> createCustomArabianNumberFormatSymbolsTestDat
                 locale
         );
         NumberFormatSymbols symbols = NumberFormatSymbols.fromDecimalFormatSymbols(dfs);
-        symbols.withMinusSign(new LinkedHashSet<>(Arrays.asList('-', '\u061C')));
 
         DecimalFormat fmt = new DecimalFormat("#00.0####E0", dfs);
         for (double n : new double[]{3e-9, -7e8, Double.NaN, Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY}) {
             list.add(new NumberTestData(locale + " " + fmt.format(n), locale, symbols, fmt.format(n), n));
         }
-        list.add(new NumberTestData(locale + " customized locale, U+061C followed by - sign", locale, symbols, true, "\u061C-١٢٣٬٤٥٦٫٧٨٩", -123_456.789));
-        // list.add(new NumberTestData(locale+" customized locale, U+061C not followed by - sign", locale, symbols, true, "\u061C١٢٣٬٤٥٦٫٧٨٩", -123_456.789));
+        list.add(new NumberTestData(locale + " locale, U+061C followed by '-' sign", locale, symbols, true, "\u061C-١٢٣٬٤٥٦٫٧٨٩", -123_456.789));
+
+        NumberFormatSymbols symbols2 = symbols.withMinusSign(new LinkedHashSet<>(Arrays.asList('-', '\u061C')));
+        list.add(new NumberTestData(locale + " customized locale, U+061C followed by '-' sign, with U+061C as a format symbol", locale, symbols2, true, "\u061C-١٢٣٬٤٥٦٫٧٨٩", null));
+        list.add(new NumberTestData(locale + " customized locale, U+061C not followed by '-' sign, with U+061C as a format symbol", locale, symbols2, true, "\u061C١٢٣٬٤٥٦٫٧٨٩", -123_456.789));
 
         return list;
     }