Parsen von Eurozeichen verbessert

oboehm · Feb 9, 2019 · 680e9ac · 680e9ac
1 parent 7dafd1c
commit 680e9ac
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/src/main/java/de/jfachwert/bank/Geldbetrag.java b/src/main/java/de/jfachwert/bank/Geldbetrag.java
@@ -236,11 +236,7 @@ public static Geldbetrag valueOf(String other) {
         try {
             return DEFAULT_FORMATTER.parse(other);
         } catch (MonetaryParseException ex) {
-            if (other.endsWith("\u20AC")) {
-                return valueOf(other.substring(0, other.length() - 1) + " EUR");
-            } else {
-                throw new IllegalArgumentException(other, ex);
-            }
+            throw new IllegalArgumentException(other, ex);
         }
     }
 

diff --git a/src/main/java/de/jfachwert/bank/Waehrung.java b/src/main/java/de/jfachwert/bank/Waehrung.java
@@ -123,14 +123,22 @@ public static Currency toCurrency(String name) {
                     }
                 }
             }
-            throw new IllegalArgumentException("cannot get currency for '" + name + "'", iae);
+            return toFallbackCurrency(name, iae);
         }
     }
 
     private static boolean matchesCurrency(String name, Currency c) {
         return name.equalsIgnoreCase(c.getCurrencyCode()) || name.equalsIgnoreCase(c.getSymbol());
     }
 
+    private static Currency toFallbackCurrency(String name, IllegalArgumentException iae) {
+        if (name.equals("\u20ac")) {
+            return Currency.getInstance("EUR");
+        } else {
+            throw new IllegalArgumentException("cannot get currency for '" + name + "'", iae);
+        }
+    }
+
     /**
      * Validiert den uebergebenen Waehrungscode.
      *

diff --git a/src/test/java/de/jfachwert/bank/GeldbetragFormatterTest.java b/src/test/java/de/jfachwert/bank/GeldbetragFormatterTest.java
@@ -44,6 +44,11 @@ public void testParse() {
         assertEquals(Geldbetrag.of(100, "CHF"), parsed);
     }
 
+    @Test
+    public void testParseEurozeichen() {
+        assertEquals(formatter.parse("11 EUR"), formatter.parse("11\u20ac"));
+    }
+
     @Test
     public void testParseCurrencyNumber() {
         Geldbetrag parsed = formatter.parse("BRL 123.45");

diff --git a/src/test/java/de/jfachwert/bank/GeldbetragTest.java b/src/test/java/de/jfachwert/bank/GeldbetragTest.java
@@ -544,4 +544,9 @@ public void testValidate() {
         }
     }
 
+    @Test
+    public void testValueOf() {
+        assertEquals(Geldbetrag.of("11 EUR"), Geldbetrag.of("11\u20ac"));
+    }
+
 }