feat(test): New data provider.

build.gradle

@@ -12,7 +12,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2', 'org.junit.jupiter:junit-jupiter-params:5.9.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2', 'org.junit.jupiter:junit-jupiter-params:5.9.2', 'org.json:json:20220924'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
 
     implementation 'dev.personnummer:personnummer:3.3.3'

src/main/java/dev/organisationsnummer/Organisationsnummer.java

@@ -158,8 +158,11 @@ private void innerParse(String input) throws OrganisationsnummerException {
                 throw new OrganisationsnummerException();
             }
 
-            if (matches.group(1) != null && Integer.parseInt(matches.group(1)) != 16) {
-                throw new OrganisationsnummerException();
+            if (matches.group(1) != null) {
+                if (Integer.parseInt(matches.group(1)) != 16) {
+                    throw new OrganisationsnummerException();
+                }
+                input = input.substring(2);
             }
 
             input = input.replace("-", "");

src/test/java/DataProvider.java

@@ -1,2 +1,53 @@
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 public class DataProvider {
+
+    private static final List<OrgNrData> data = new ArrayList<>();
+
+    public static void initialize() throws IOException {
+        InputStream in = new URL("https://raw.githubusercontent.com/organisationsnummer/meta/main/testdata/list.json").openStream();
+        BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+
+        String json = "", line = "";
+        while ((line = reader.readLine()) != null) {
+            json = json.concat(line);
+        }
+
+        JSONArray rootObject = new JSONArray(json);
+        for (int i = 0; i < rootObject.length(); i++) {
+            JSONObject current = rootObject.getJSONObject(i);
+            data.add(new OrgNrData(
+                    current.getString("input"),
+                    current.getString("long_format"),
+                    current.getString("short_format"),
+                    current.getBoolean("valid"),
+                    current.getString("type"),
+                    current.getString("vat_number")
+
+            ));
+        }
+    }
+
+    public static List<OrgNrData> getValid() {
+        return data.stream().filter(o -> o.valid).collect(Collectors.toList());
+    }
+
+    public static List<OrgNrData> getInvalid() {
+        return data.stream().filter(o -> !o.valid).collect(Collectors.toList());
+    }
+
+    public static List<OrgNrData> getAll() {
+        return data;
+    }
+
 }

src/test/java/OrgNrData.java

@@ -0,0 +1,17 @@
+public class OrgNrData {
+    public OrgNrData(String input, String longFormat, String shortFormat, boolean valid, String type, String vatNumber) {
+        this.input = input;
+        this.longFormat = longFormat;
+        this.shortFormat = shortFormat;
+        this.valid = valid;
+        this.type = type;
+        this.vatNumber = vatNumber;
+    }
+
+    public String input;
+    public String longFormat;
+    public String shortFormat;
+    public boolean valid;
+    public String type;
+    public String vatNumber;
+}

src/test/java/OrganisationsnummerTest.java

@@ -1,73 +1,66 @@
 import dev.organisationsnummer.Organisationsnummer;
 import dev.organisationsnummer.OrganisationsnummerException;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
 
+import java.io.IOException;
+
 import static org.junit.jupiter.api.Assertions.*;
 
 public class OrganisationsnummerTest {
 
+    @BeforeAll
+    public static void setup() throws IOException {
+        DataProvider.initialize();
+    }
+
     @ParameterizedTest
-    @CsvSource({
-            "556016-0680,true",
-            "556103-4249,true",
-            "5561034249,true",
-            "556016-0681,false",
-            "556103-4250,false",
-            "5561034250,false",
-            "5592440001,true",
-    })
-    public void testValidateOrgNumbers(String number, boolean valid) {
-        assertEquals(valid, Organisationsnummer.valid(number));
+    @MethodSource("DataProvider#getInvalid")
+    public void testThrowOnInvalid(OrgNrData input) {
+        assertThrows(OrganisationsnummerException.class, () -> {
+            Organisationsnummer.parse(input.shortFormat);
+        });
+
+        assertThrows(OrganisationsnummerException.class, () -> {
+            Organisationsnummer.parse(input.longFormat);
+        });
     }
 
     @ParameterizedTest
-    @CsvSource({
-            "556016-0680,5560160680",
-            "556103-4249,5561034249",
-            "5561034249,5561034249",
-            "901211-9948,9012119948",
-            "9012119948,9012119948",
-    })
-    public void testFormatWithoutSeparator(String number, String expected) throws OrganisationsnummerException {
-        assertEquals(expected, Organisationsnummer.parse(number).format(false));
+    @MethodSource("DataProvider#getAll")
+    public void testValidateOrgNumbers(OrgNrData input) {
+        assertEquals(input.valid, Organisationsnummer.valid(input.longFormat));
+        assertEquals(input.valid, Organisationsnummer.valid(input.shortFormat));
+    }
 
+    @ParameterizedTest
+    @MethodSource("DataProvider#getValid")
+    public void testFormatWithoutSeparator(OrgNrData input) throws OrganisationsnummerException {
+        assertEquals(input.shortFormat, Organisationsnummer.parse(input.shortFormat).format(false));
+        assertEquals(input.shortFormat, Organisationsnummer.parse(input.longFormat).format(false));
     }
 
     @ParameterizedTest
-    @CsvSource({
-            "556016-0680,556016-0680",
-            "556103-4249,556103-4249",
-            "5561034249,556103-4249",
-            "9012119948,901211-9948",
-            "901211-9948,901211-9948",
-    })
-    public void testFormatWithSeparator(String number, String expected) throws OrganisationsnummerException {
-        assertEquals(expected, Organisationsnummer.parse(number).format(true));
+    @MethodSource("DataProvider#getValid")
+    public void testFormatWithSeparator(OrgNrData input) throws OrganisationsnummerException {
+        assertEquals(input.longFormat, Organisationsnummer.parse(input.shortFormat).format(true));
+        assertEquals(input.longFormat, Organisationsnummer.parse(input.longFormat).format(true));
     }
 
     @ParameterizedTest
-    @CsvSource({
-            "556016-0680,Aktiebolag",
-            "556103-4249,Aktiebolag",
-            "5561034249,Aktiebolag",
-            "8510033999,Enskild firma",
-    })
-    public void testType(String number, String expected) throws OrganisationsnummerException {
-        assertEquals(expected, Organisationsnummer.parse(number).type());
+    @MethodSource("DataProvider#getValid")
+    public void testType(OrgNrData input) throws OrganisationsnummerException {
+        assertEquals(input.type, Organisationsnummer.parse(input.shortFormat).type());
+        assertEquals(input.type, Organisationsnummer.parse(input.longFormat).type());
     }
 
     @ParameterizedTest
-    @CsvSource({
-            "556016-0680,SE556016068001",
-            "556103-4249,SE556103424901",
-            "5561034249,SE556103424901",
-            "9012119948,SE901211994801",
-            "19901211-9948,SE901211994801",
-    })
-    public void testVat(String number, String expected) throws OrganisationsnummerException {
-        assertEquals(expected, Organisationsnummer.parse(number).vatNumber());
+    @MethodSource("DataProvider#getValid")
+    public void testVat(OrgNrData input) throws OrganisationsnummerException {
+        assertEquals(input.vatNumber, Organisationsnummer.parse(input.shortFormat).vatNumber());
+        assertEquals(input.vatNumber, Organisationsnummer.parse(input.longFormat).vatNumber());
     }
 
     @ParameterizedTest