see https://github.com/arturmkrtchyan/iban4j/releases/tag/3.2.10-RELEASE

bastie · Sep 3, 2024 · 21de2fd · 21de2fd
1 parent caa8425
commit 21de2fd
Show file tree

Hide file tree

Showing 5 changed files with 102 additions and 71 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 # Swift
 .build
 .swiftpm
+Package.resolved
 
+#eof
diff --git a/Package.resolved b/Package.resolved
diff --git a/Sources/iban4j2JavApi/org/iban4j/bban/BbanStructure.swift b/Sources/iban4j2JavApi/org/iban4j/bban/BbanStructure.swift
@@ -297,35 +297,12 @@ extension org.iban4j.bban {
       structures[org.iban4j.CountryCode.LU()] =
         BbanStructure(
           BbanStructureEntry.bankCode(3, "n"), BbanStructureEntry.accountNumber(13, "c"))
-
-      structures[org.iban4j.CountryCode.MK()] =
-        BbanStructure(
-          BbanStructureEntry.bankCode(3, "n"),
-          BbanStructureEntry.accountNumber(10, "c"),
-          BbanStructureEntry.nationalCheckDigit(2, "n"))
-
-      structures[org.iban4j.CountryCode.MT()] =
-        BbanStructure(
-          BbanStructureEntry.bankCode(4, "a"),
-          BbanStructureEntry.branchCode(5, "n"),
-          BbanStructureEntry.accountNumber(18, "c"))
-
-      structures[org.iban4j.CountryCode.MR()] =
-        BbanStructure(
-          BbanStructureEntry.bankCode(5, "n"),
-          BbanStructureEntry.branchCode(5, "n"),
-          BbanStructureEntry.accountNumber(11, "n"),
-          BbanStructureEntry.nationalCheckDigit(2, "n"))
-
-      structures[org.iban4j.CountryCode.MU()] =
-        BbanStructure(
-          BbanStructureEntry.bankCode(6, "c"),
-          BbanStructureEntry.branchCode(2, "n"),
-          BbanStructureEntry.accountNumber(18, "c"))
-
-      structures[org.iban4j.CountryCode.MD()] =
-        BbanStructure(
-          BbanStructureEntry.bankCode(2, "c"), BbanStructureEntry.accountNumber(18, "c"))
+
+      structures[org.iban4j.CountryCode.MA()] =
+      BbanStructure(
+        BbanStructureEntry.bankCode(3, "n"),
+        BbanStructureEntry.branchCode(5, "n"),
+        BbanStructureEntry.accountNumber(16, "n"))
 
       structures[org.iban4j.CountryCode.MC()] =
         BbanStructure(
@@ -334,12 +311,49 @@ extension org.iban4j.bban {
           BbanStructureEntry.accountNumber(11, "c"),
           BbanStructureEntry.nationalCheckDigit(2, "n"))
 
+      structures[org.iban4j.CountryCode.MD()] =
+      BbanStructure(
+        BbanStructureEntry.bankCode(2, "c"), BbanStructureEntry.accountNumber(18, "c"))
+
       structures[org.iban4j.CountryCode.ME()] =
         BbanStructure(
           BbanStructureEntry.bankCode(3, "n"),
           BbanStructureEntry.accountNumber(13, "n"),
           BbanStructureEntry.nationalCheckDigit(2, "n"))
 
+      structures[org.iban4j.CountryCode.MK()] =
+      BbanStructure(
+        BbanStructureEntry.bankCode(3, "n"),
+        BbanStructureEntry.accountNumber(10, "c"),
+        BbanStructureEntry.nationalCheckDigit(2, "n"))
+
+      structures[org.iban4j.CountryCode.MR()] =
+      BbanStructure(
+        BbanStructureEntry.bankCode(5, "n"),
+        BbanStructureEntry.branchCode(5, "n"),
+        BbanStructureEntry.accountNumber(11, "n"),
+        BbanStructureEntry.nationalCheckDigit(2, "n"))
+
+      structures[org.iban4j.CountryCode.MT()] =
+      BbanStructure(
+        BbanStructureEntry.bankCode(4, "a"),
+        BbanStructureEntry.branchCode(5, "n"),
+        BbanStructureEntry.accountNumber(18, "c"))
+
+      structures[org.iban4j.CountryCode.MU()] =
+      BbanStructure(
+        BbanStructureEntry.bankCode(6, "c"),
+        BbanStructureEntry.branchCode(2, "n"),
+        BbanStructureEntry.accountNumber(18, "c"))
+
+      structures[org.iban4j.CountryCode.MZ()] =
+      BbanStructure(
+        BbanStructureEntry.bankCode(4, "n"),
+        BbanStructureEntry.branchCode(4, "n"),
+        BbanStructureEntry.accountNumber(11, "n"),
+        BbanStructureEntry.nationalCheckDigit(2, "n"))
+
+
       structures[org.iban4j.CountryCode.NL()] =
         BbanStructure(
           BbanStructureEntry.bankCode(4, "a"), BbanStructureEntry.accountNumber(10, "n"))

diff --git a/Tests/iban4j2JavApiTests/IbanTest.swift b/Tests/iban4j2JavApiTests/IbanTest.swift
@@ -103,18 +103,40 @@ extension org.iban4j {
       )
     }
   }
+
+  private func assertIbanUtilRandomWithSeedEquals(_ expected : String, _ seed : Int) {
+    let generated : Iban = try! Iban.random(java.util.Random(seed));
+    XCTAssertEqual(expected, generated.toFormattedString(),
+      "expect that creating an IBAN with seed '\(seed)' is deterministic"
+    )
+  }
+
+  public func testIbanConstructionSeeded() {
+      assertIbanUtilRandomWithSeedEquals("FR46 1918 2083 691H JENI SJS3 364", 1)
+      assertIbanUtilRandomWithSeedEquals("LC94 QKBB C1OY WHST MPQA 7GVB 4WBX VTP0", 2)
+      assertIbanUtilRandomWithSeedEquals("DK23 0882 2804 1804 23", 3)
+  }
+  private static func assertIbanBuilderRandomWithSeedEquals(_ expected : String, _ seed : Int) {
+    let generated : Iban = try! Builder(java.util.Random(seed)).buildRandom()
+    let actual : String = generated.toFormattedString()
+    XCTAssertEqual(expected, actual, "expect that creating an IBAN with seed '\(seed)' is deterministic")
+  }
 
+
+  public func testIbanBuilderConstructionSeeded() {
+    org.iban4j.assertIbanBuilderRandomWithSeedEquals("FR46 1918 2083 691H JENI SJS3 364", 1)
+    org.iban4j.assertIbanBuilderRandomWithSeedEquals("LC94 QKBB C1OY WHST MPQA 7GVB 4WBX VTP0", 2)
+    org.iban4j.assertIbanBuilderRandomWithSeedEquals("DK23 0882 2804 1804 23", 3)
+    org.iban4j.assertIbanBuilderRandomWithSeedEquals("BY38 LPL2 0836 1HJE NISJ S339 QZGT", 1)
+    org.iban4j.assertIbanBuilderRandomWithSeedEquals("IE70 QKBB 0988 8722 1186 81", 2)
+    org.iban4j.assertIbanBuilderRandomWithSeedEquals("MC38 0882 8280 41ER G8WO UQNL Y52", 3)
+  }
+
+
   /*
    @DisplayName("Iban general test")
    final class IbanTest {
 
-   private static void assertIbanBuilderRandomWithSeedEquals(final String expected, final int seed) {
-   final Iban generated = new Iban.Builder(new Random(seed)).buildRandom();
-   final String actual = generated.toFormattedString();
-   assertEquals(
-   expected, actual, "expect that creating an IBAN with seed '" + seed + "' is deterministic");
-   }
-
    @Test
    @DisplayName("IBANs With Same Data Should Be Equal")
    public void ibansWithSameDataShouldBeEqual() {
@@ -372,26 +394,6 @@ extension org.iban4j {
    }
    }
 
-   @Test
-   public void ibanConstructionSeeded() {
-   assertAll(
-   () -> assertIbanUtilRandomWithSeedEquals("FR46 1918 2083 691H JENI SJS3 364", 1),
-   () -> assertIbanUtilRandomWithSeedEquals("LC94 QKBB C1OY WHST MPQA 7GVB 4WBX VTP0", 2),
-   () -> assertIbanUtilRandomWithSeedEquals("DK23 0882 2804 1804 23", 3));
-   }
-
-   private void assertIbanUtilRandomWithSeedEquals(
-   final String expected,
-   final int seed
-   ) {
-   final Iban generated = Iban.random(new Random(seed));
-   assertEquals(
-   expected,
-   generated.toFormattedString(),
-   "expect that creating an IBAN with seed '" + seed + "' is deterministic"
-   );
-   }
-
    @Test
    public void ibanBuilderConstructionSeeded() {
    assertAll(

diff --git a/Tests/iban4j2JavApiTests/TestDataHelper.swift b/Tests/iban4j2JavApiTests/TestDataHelper.swift
@@ -637,6 +637,20 @@ extension org.iban4j {
         result.insert(elem, at: result.count)
       }
 
+      do {
+        var elem : (Iban, String)
+        elem.0 =
+        try! Builder()
+          .setCountryCode(CountryCode.MA())
+          .setBankCode("011")
+          .setBranchCode("51900")
+          .setAccountNumber("0001205000534921")
+          .build()
+        elem.1 =
+        "MA64011519000001205000534921"
+        result.insert(elem, at: result.count)
+      }
+
       do {
         var elem : (Iban, String)
         elem.0 =
@@ -781,6 +795,20 @@ extension org.iban4j {
         result.insert(elem, at: result.count)
       }
 
+      do {
+        var elem : (Iban, String)
+        elem.0 = try! Builder()
+          .setCountryCode(CountryCode.MZ())
+          .setBankCode("0003")
+          .setBranchCode("0108")
+          .setAccountNumber("00163671023")
+          .setNationalCheckDigit("71")
+          .build()
+        elem.1 =
+        "MZ59000301080016367102371"
+        result.insert(elem, at: result.count)
+      }
+
       do {
         var elem : (Iban, String)
         elem.0 =