From 6825a0c9c87baaf4e31ed9ff3eb009bc1e3713f1 Mon Sep 17 00:00:00 2001 From: Markus Sabadello Date: Mon, 6 Apr 2020 15:51:39 +0200 Subject: [PATCH] chore: Upgrade test framework. Signed-off-by: Markus Sabadello --- pom.xml | 24 ++++++++++++++++--- .../ldsignatures/BasicSignTest.java | 9 ++++--- .../ldsignatures/BasicVerifyTest.java | 8 +++++-- .../ldsignatures/CanonicalizationTest.java | 13 +++++++--- ...LdSignEcdsaSecp256k1Signature2019Test.java | 9 +++++-- .../JsonLdSignEd25519Signature2018Test.java | 9 +++++-- .../JsonLdSignRsaSignature2018Test.java | 9 +++++-- ...VerifyEcdsaSecp256k1Signature2019Test.java | 9 +++++-- .../JsonLdVerifyEd25519Signature2018Test.java | 7 ++++-- .../JsonLdVerifyRsaSignature2018Test.java | 9 +++++-- .../ldsignatures/LdSignersTest.java | 8 +++++-- .../ldsignatures/LdVerifiersTest.java | 8 +++++-- .../info/weboftrust/ldsignatures/SHATest.java | 7 ++++-- 13 files changed, 100 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index 19a26db..dcdda82 100644 --- a/pom.xml +++ b/pom.xml @@ -98,9 +98,27 @@ - junit - junit - 4.10 + org.junit.jupiter + junit-jupiter-engine + 5.6.0 + test + + + org.junit.jupiter + junit-jupiter + 5.6.0 + test + + + org.mockito + mockito-core + 3.2.4 + test + + + org.mockito + mockito-junit-jupiter + 3.2.4 test diff --git a/src/test/java/info/weboftrust/ldsignatures/BasicSignTest.java b/src/test/java/info/weboftrust/ldsignatures/BasicSignTest.java index 0014ed9..83cb43e 100644 --- a/src/test/java/info/weboftrust/ldsignatures/BasicSignTest.java +++ b/src/test/java/info/weboftrust/ldsignatures/BasicSignTest.java @@ -1,7 +1,11 @@ package info.weboftrust.ldsignatures; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.Collections; +import org.junit.jupiter.api.Test; + import com.nimbusds.jose.JWSAlgorithm; import com.nimbusds.jose.JWSHeader; import com.nimbusds.jose.JWSObject; @@ -9,10 +13,9 @@ import com.nimbusds.jose.Payload; import com.nimbusds.jose.crypto.RSASSASigner; -import junit.framework.TestCase; - -public class BasicSignTest extends TestCase { +public class BasicSignTest { + @Test public void testSign() throws Exception { // build the payload diff --git a/src/test/java/info/weboftrust/ldsignatures/BasicVerifyTest.java b/src/test/java/info/weboftrust/ldsignatures/BasicVerifyTest.java index f58a7f2..4515316 100644 --- a/src/test/java/info/weboftrust/ldsignatures/BasicVerifyTest.java +++ b/src/test/java/info/weboftrust/ldsignatures/BasicVerifyTest.java @@ -1,16 +1,20 @@ package info.weboftrust.ldsignatures; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Collections; +import org.junit.jupiter.api.Test; + import com.nimbusds.jose.JWSVerifier; import com.nimbusds.jose.Payload; import com.nimbusds.jose.crypto.RSASSAVerifier; import info.weboftrust.ldsignatures.util.DetachedJWSObject; -import junit.framework.TestCase; -public class BasicVerifyTest extends TestCase { +public class BasicVerifyTest { + @Test public void testVerify() throws Exception { // build the payload diff --git a/src/test/java/info/weboftrust/ldsignatures/CanonicalizationTest.java b/src/test/java/info/weboftrust/ldsignatures/CanonicalizationTest.java index 15fcbfd..61c4322 100644 --- a/src/test/java/info/weboftrust/ldsignatures/CanonicalizationTest.java +++ b/src/test/java/info/weboftrust/ldsignatures/CanonicalizationTest.java @@ -1,14 +1,18 @@ package info.weboftrust.ldsignatures; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.LinkedHashMap; +import org.junit.jupiter.api.Test; + import com.github.jsonldjava.utils.JsonUtils; import info.weboftrust.ldsignatures.util.CanonicalizationUtil; -import junit.framework.TestCase; -public class CanonicalizationTest extends TestCase { +public class CanonicalizationTest { + @Test @SuppressWarnings("unchecked") public void testCanonicalizationInput() throws Exception { @@ -18,7 +22,9 @@ public void testCanonicalizationInput() throws Exception { assertEquals(CanonicalizationUtil.buildCanonicalizedDocument(jsonLdObject), canonicalizedDocument); } - /* @SuppressWarnings("unchecked") + /* + @Test + @SuppressWarnings("unchecked") public void testCanonicalizationFixImplicitGraph() throws Exception { LinkedHashMap jsonLdObject = (LinkedHashMap) JsonUtils.fromInputStream(CanonicalizationTest.class.getResourceAsStream("input.vc.jsonld")); @@ -29,6 +35,7 @@ public void testCanonicalizationFixImplicitGraph() throws Exception { assertEquals(CanonicalizationUtil.buildCanonicalizedDocument(jsonLdObject), canonicalizedDocument); }*/ + @Test @SuppressWarnings("unchecked") public void testCanonicalizationSigned() throws Exception { diff --git a/src/test/java/info/weboftrust/ldsignatures/JsonLdSignEcdsaSecp256k1Signature2019Test.java b/src/test/java/info/weboftrust/ldsignatures/JsonLdSignEcdsaSecp256k1Signature2019Test.java index 6bf4ff4..78d0cc2 100644 --- a/src/test/java/info/weboftrust/ldsignatures/JsonLdSignEcdsaSecp256k1Signature2019Test.java +++ b/src/test/java/info/weboftrust/ldsignatures/JsonLdSignEcdsaSecp256k1Signature2019Test.java @@ -1,18 +1,23 @@ package info.weboftrust.ldsignatures; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.net.URI; import java.util.Date; import java.util.LinkedHashMap; +import org.junit.jupiter.api.Test; + import com.github.jsonldjava.utils.JsonUtils; import info.weboftrust.ldsignatures.signer.EcdsaSecp256k1Signature2019LdSigner; import info.weboftrust.ldsignatures.suites.SignatureSuites; import info.weboftrust.ldsignatures.verifier.EcdsaSecp256k1Signature2019LdVerifier; -import junit.framework.TestCase; -public class JsonLdSignEcdsaSecp256k1Signature2019Test extends TestCase { +public class JsonLdSignEcdsaSecp256k1Signature2019Test { + @Test @SuppressWarnings("unchecked") public void testSignEcdsaSecp256k1Signature2019() throws Exception { diff --git a/src/test/java/info/weboftrust/ldsignatures/JsonLdSignEd25519Signature2018Test.java b/src/test/java/info/weboftrust/ldsignatures/JsonLdSignEd25519Signature2018Test.java index 1f3f296..47b1e90 100644 --- a/src/test/java/info/weboftrust/ldsignatures/JsonLdSignEd25519Signature2018Test.java +++ b/src/test/java/info/weboftrust/ldsignatures/JsonLdSignEd25519Signature2018Test.java @@ -1,18 +1,23 @@ package info.weboftrust.ldsignatures; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.net.URI; import java.util.Date; import java.util.LinkedHashMap; +import org.junit.jupiter.api.Test; + import com.github.jsonldjava.utils.JsonUtils; import info.weboftrust.ldsignatures.signer.Ed25519Signature2018LdSigner; import info.weboftrust.ldsignatures.suites.SignatureSuites; import info.weboftrust.ldsignatures.verifier.Ed25519Signature2018LdVerifier; -import junit.framework.TestCase; -public class JsonLdSignEd25519Signature2018Test extends TestCase { +public class JsonLdSignEd25519Signature2018Test { + @Test @SuppressWarnings("unchecked") public void testSignEd25519Signature2018() throws Exception { diff --git a/src/test/java/info/weboftrust/ldsignatures/JsonLdSignRsaSignature2018Test.java b/src/test/java/info/weboftrust/ldsignatures/JsonLdSignRsaSignature2018Test.java index 49f115e..59d6b8f 100644 --- a/src/test/java/info/weboftrust/ldsignatures/JsonLdSignRsaSignature2018Test.java +++ b/src/test/java/info/weboftrust/ldsignatures/JsonLdSignRsaSignature2018Test.java @@ -1,18 +1,23 @@ package info.weboftrust.ldsignatures; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.net.URI; import java.util.Date; import java.util.LinkedHashMap; +import org.junit.jupiter.api.Test; + import com.github.jsonldjava.utils.JsonUtils; import info.weboftrust.ldsignatures.signer.RsaSignature2018LdSigner; import info.weboftrust.ldsignatures.suites.SignatureSuites; import info.weboftrust.ldsignatures.verifier.RsaSignature2018LdVerifier; -import junit.framework.TestCase; -public class JsonLdSignRsaSignature2018Test extends TestCase { +public class JsonLdSignRsaSignature2018Test { + @Test @SuppressWarnings("unchecked") public void testSignEd25519Signature2018() throws Exception { diff --git a/src/test/java/info/weboftrust/ldsignatures/JsonLdVerifyEcdsaSecp256k1Signature2019Test.java b/src/test/java/info/weboftrust/ldsignatures/JsonLdVerifyEcdsaSecp256k1Signature2019Test.java index 893f715..37919c9 100644 --- a/src/test/java/info/weboftrust/ldsignatures/JsonLdVerifyEcdsaSecp256k1Signature2019Test.java +++ b/src/test/java/info/weboftrust/ldsignatures/JsonLdVerifyEcdsaSecp256k1Signature2019Test.java @@ -1,14 +1,19 @@ package info.weboftrust.ldsignatures; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.LinkedHashMap; +import org.junit.jupiter.api.Test; + import com.github.jsonldjava.utils.JsonUtils; import info.weboftrust.ldsignatures.verifier.EcdsaSecp256k1Signature2019LdVerifier; -import junit.framework.TestCase; -public class JsonLdVerifyEcdsaSecp256k1Signature2019Test extends TestCase { +public class JsonLdVerifyEcdsaSecp256k1Signature2019Test { + @Test @SuppressWarnings("unchecked") public void testVerify() throws Exception { diff --git a/src/test/java/info/weboftrust/ldsignatures/JsonLdVerifyEd25519Signature2018Test.java b/src/test/java/info/weboftrust/ldsignatures/JsonLdVerifyEd25519Signature2018Test.java index 7e0760c..725cf85 100644 --- a/src/test/java/info/weboftrust/ldsignatures/JsonLdVerifyEd25519Signature2018Test.java +++ b/src/test/java/info/weboftrust/ldsignatures/JsonLdVerifyEd25519Signature2018Test.java @@ -2,13 +2,16 @@ import java.util.LinkedHashMap; +import org.junit.jupiter.api.Test; + import com.github.jsonldjava.utils.JsonUtils; import info.weboftrust.ldsignatures.verifier.Ed25519Signature2018LdVerifier; -import junit.framework.TestCase; +import static org.junit.jupiter.api.Assertions.*; -public class JsonLdVerifyEd25519Signature2018Test extends TestCase { +public class JsonLdVerifyEd25519Signature2018Test { + @Test @SuppressWarnings("unchecked") public void testVerify() throws Exception { diff --git a/src/test/java/info/weboftrust/ldsignatures/JsonLdVerifyRsaSignature2018Test.java b/src/test/java/info/weboftrust/ldsignatures/JsonLdVerifyRsaSignature2018Test.java index 3f386e8..37bc356 100644 --- a/src/test/java/info/weboftrust/ldsignatures/JsonLdVerifyRsaSignature2018Test.java +++ b/src/test/java/info/weboftrust/ldsignatures/JsonLdVerifyRsaSignature2018Test.java @@ -1,14 +1,19 @@ package info.weboftrust.ldsignatures; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.LinkedHashMap; +import org.junit.jupiter.api.Test; + import com.github.jsonldjava.utils.JsonUtils; import info.weboftrust.ldsignatures.verifier.RsaSignature2018LdVerifier; -import junit.framework.TestCase; -public class JsonLdVerifyRsaSignature2018Test extends TestCase { +public class JsonLdVerifyRsaSignature2018Test { + @Test @SuppressWarnings("unchecked") public void testVerify() throws Exception { diff --git a/src/test/java/info/weboftrust/ldsignatures/LdSignersTest.java b/src/test/java/info/weboftrust/ldsignatures/LdSignersTest.java index b50f3db..14c7e3b 100644 --- a/src/test/java/info/weboftrust/ldsignatures/LdSignersTest.java +++ b/src/test/java/info/weboftrust/ldsignatures/LdSignersTest.java @@ -1,13 +1,17 @@ package info.weboftrust.ldsignatures; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + import info.weboftrust.ldsignatures.signer.EcdsaKoblitzSignature2016LdSigner; import info.weboftrust.ldsignatures.signer.Ed25519Signature2018LdSigner; import info.weboftrust.ldsignatures.signer.LdSigner; import info.weboftrust.ldsignatures.signer.RsaSignature2018LdSigner; -import junit.framework.TestCase; -public class LdSignersTest extends TestCase { +public class LdSignersTest { + @Test public void testLdSigners() throws Exception { assertEquals(LdSigner.ldSignerForSignatureSuite("Ed25519Signature2018").getClass(), Ed25519Signature2018LdSigner.class); diff --git a/src/test/java/info/weboftrust/ldsignatures/LdVerifiersTest.java b/src/test/java/info/weboftrust/ldsignatures/LdVerifiersTest.java index 9edcb8d..15c988d 100644 --- a/src/test/java/info/weboftrust/ldsignatures/LdVerifiersTest.java +++ b/src/test/java/info/weboftrust/ldsignatures/LdVerifiersTest.java @@ -1,13 +1,17 @@ package info.weboftrust.ldsignatures; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + import info.weboftrust.ldsignatures.verifier.EcdsaKoblitzSignature2016LdVerifier; import info.weboftrust.ldsignatures.verifier.Ed25519Signature2018LdVerifier; import info.weboftrust.ldsignatures.verifier.LdVerifier; import info.weboftrust.ldsignatures.verifier.RsaSignature2018LdVerifier; -import junit.framework.TestCase; -public class LdVerifiersTest extends TestCase { +public class LdVerifiersTest { + @Test public void testLdVerifiers() throws Exception { assertEquals(LdVerifier.ldVerifierForSignatureSuite("Ed25519Signature2018").getClass(), Ed25519Signature2018LdVerifier.class); diff --git a/src/test/java/info/weboftrust/ldsignatures/SHATest.java b/src/test/java/info/weboftrust/ldsignatures/SHATest.java index 3943112..399597d 100644 --- a/src/test/java/info/weboftrust/ldsignatures/SHATest.java +++ b/src/test/java/info/weboftrust/ldsignatures/SHATest.java @@ -1,12 +1,15 @@ package info.weboftrust.ldsignatures; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.commons.codec.binary.Hex; +import org.junit.jupiter.api.Test; import info.weboftrust.ldsignatures.util.SHAUtil; -import junit.framework.TestCase; -public class SHATest extends TestCase { +public class SHATest { + @Test public void testSHA() throws Exception { String input = "$.02";