From e544c6fa9e15e7277da79e2464243e90b2706b8c Mon Sep 17 00:00:00 2001
From: StevenWdV <stevenwdv@gmail.com>
Date: Mon, 24 Jan 2022 14:59:25 +0100
Subject: Cleanup Added variables to Makefiles to specify custom exports/
 directory; Split exception classes in Java & C#; Added more comments; Renamed
 library and Go package; Removed real (pure) tests; Added generate_lib.ps1 to
 generate import .lib for Windows (Swift); Moved built Go libraries to
 exports/lib/; Switch to hopefully faster Swift GitHub Action.

---
 .../test/java/nl/eduvpn/common/VerifyTests.java    | 37 +++++++++++-----------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'wrappers/java/src/test')

diff --git a/wrappers/java/src/test/java/nl/eduvpn/common/VerifyTests.java b/wrappers/java/src/test/java/nl/eduvpn/common/VerifyTests.java
index b4767a5..a82c019 100644
--- a/wrappers/java/src/test/java/nl/eduvpn/common/VerifyTests.java
+++ b/wrappers/java/src/test/java/nl/eduvpn/common/VerifyTests.java
@@ -1,6 +1,5 @@
 package nl.eduvpn.common;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -18,15 +17,15 @@ class VerifyTests {
     @SuppressWarnings("OptionalGetWithoutIsPresent")
     @BeforeAll
     static void oneTimeSetup() throws IOException {
-        Discovery.insecureTestingSetExtraKey(Files.lines(testDataDir.resolve("dummy/public.key")).reduce((a, b) -> b).get());
+        Discovery.insecureTestingSetExtraKey(Files.lines(testDataDir.resolve("public.key")).reduce((a, b) -> b).get());
     }
 
     @Test
     void testValid() {
         assertDoesNotThrow(() ->
                 Discovery.verify(
-                        Files.readAllBytes(testDataDir.resolve("dummy/server_list.json.minisig")),
-                        Files.readAllBytes(testDataDir.resolve("dummy/server_list.json")),
+                        Files.readAllBytes(testDataDir.resolve("server_list.json.minisig")),
+                        Files.readAllBytes(testDataDir.resolve("server_list.json")),
                         "server_list.json",
                         Instant.EPOCH
                 ));
@@ -34,45 +33,45 @@ class VerifyTests {
 
     @Test
     void testInvalidSignature() {
-        Assertions.assertEquals(2, assertThrows(VerifyException.class, () ->
+        assertThrows(InvalidSignatureException.class, () ->
                 Discovery.verify(
-                        Files.readAllBytes(testDataDir.resolve("dummy/random.txt")),
-                        Files.readAllBytes(testDataDir.resolve("dummy/server_list.json")),
+                        Files.readAllBytes(testDataDir.resolve("random.txt")),
+                        Files.readAllBytes(testDataDir.resolve("server_list.json")),
                         "server_list.json",
                         Instant.EPOCH
-                )).code);
+                ));
     }
 
     @Test
     void testWrongKey() {
-        assertEquals(3, assertThrows(VerifyException.class, () ->
+        assertThrows(InvalidSignatureUnknownKeyException.class, () ->
                 Discovery.verify(
-                        Files.readAllBytes(testDataDir.resolve("dummy/server_list.json.wrong_key.minisig")),
-                        Files.readAllBytes(testDataDir.resolve("dummy/server_list.json")),
+                        Files.readAllBytes(testDataDir.resolve("server_list.json.wrong_key.minisig")),
+                        Files.readAllBytes(testDataDir.resolve("server_list.json")),
                         "server_list.json",
                         Instant.EPOCH
-                )).code);
+                ));
     }
 
     @Test
     void testOldSignature() {
-        assertEquals(4, assertThrows(VerifyException.class, () ->
+        assertThrows(SignatureTooOldException.class, () ->
                 Discovery.verify(
-                        Files.readAllBytes(testDataDir.resolve("dummy/server_list.json.minisig")),
-                        Files.readAllBytes(testDataDir.resolve("dummy/server_list.json")),
+                        Files.readAllBytes(testDataDir.resolve("server_list.json.minisig")),
+                        Files.readAllBytes(testDataDir.resolve("server_list.json")),
                         "server_list.json",
                         Instant.MAX
-                )).code);
+                ));
     }
 
     @Test
     void testUnknownExpectedFile() {
         assertThrows(IllegalArgumentException.class, () ->
                 Discovery.verify(
-                        Files.readAllBytes(testDataDir.resolve("dummy/other_list.json.minisig")),
-                        Files.readAllBytes(testDataDir.resolve("dummy/other_list.json")),
+                        Files.readAllBytes(testDataDir.resolve("other_list.json.minisig")),
+                        Files.readAllBytes(testDataDir.resolve("other_list.json")),
                         "other_list.json",
                         Instant.EPOCH
                 ));
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3