Add Android wrapper, remove plain Java Maven wrapper.

Fix some overrides in Makefiles.

1 files changed, 0 insertions, 77 deletions

diff --git a/wrappers/java/src/test/java/nl/eduvpn/common/VerifyTests.java b/wrappers/java/src/test/java/nl/eduvpn/common/VerifyTests.java
deleted file mode 100644
index a82c019..0000000
--- a/wrappers/java/src/test/java/nl/eduvpn/common/VerifyTests.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package nl.eduvpn.common;
-
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.time.Instant;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class VerifyTests {
-    private static final Path testDataDir = Paths.get("../../test_data");
-
-    @SuppressWarnings("OptionalGetWithoutIsPresent")
-    @BeforeAll
-    static void oneTimeSetup() throws IOException {
-        Discovery.insecureTestingSetExtraKey(Files.lines(testDataDir.resolve("public.key")).reduce((a, b) -> b).get());
-    }
-
-    @Test
-    void testValid() {
-        assertDoesNotThrow(() ->
-                Discovery.verify(
-                        Files.readAllBytes(testDataDir.resolve("server_list.json.minisig")),
-                        Files.readAllBytes(testDataDir.resolve("server_list.json")),
-                        "server_list.json",
-                        Instant.EPOCH
-                ));
-    }
-
-    @Test
-    void testInvalidSignature() {
-        assertThrows(InvalidSignatureException.class, () ->
-                Discovery.verify(
-                        Files.readAllBytes(testDataDir.resolve("random.txt")),
-                        Files.readAllBytes(testDataDir.resolve("server_list.json")),
-                        "server_list.json",
-                        Instant.EPOCH
-                ));
-    }
-
-    @Test
-    void testWrongKey() {
-        assertThrows(InvalidSignatureUnknownKeyException.class, () ->
-                Discovery.verify(
-                        Files.readAllBytes(testDataDir.resolve("server_list.json.wrong_key.minisig")),
-                        Files.readAllBytes(testDataDir.resolve("server_list.json")),
-                        "server_list.json",
-                        Instant.EPOCH
-                ));
-    }
-
-    @Test
-    void testOldSignature() {
-        assertThrows(SignatureTooOldException.class, () ->
-                Discovery.verify(
-                        Files.readAllBytes(testDataDir.resolve("server_list.json.minisig")),
-                        Files.readAllBytes(testDataDir.resolve("server_list.json")),
-                        "server_list.json",
-                        Instant.MAX
-                ));
-    }
-
-    @Test
-    void testUnknownExpectedFile() {
-        assertThrows(IllegalArgumentException.class, () ->
-                Discovery.verify(
-                        Files.readAllBytes(testDataDir.resolve("other_list.json.minisig")),
-                        Files.readAllBytes(testDataDir.resolve("other_list.json")),
-                        "other_list.json",
-                        Instant.EPOCH
-                ));
-    }
-}