chore: Upgrade test framework.

Signed-off-by: Markus Sabadello <markus@danubetech.com>
WebOfTrustInfo · Apr 6, 2020 · 6825a0c · 6825a0c
1 parent c173913
commit 6825a0c
Show file tree

Hide file tree

Showing 13 changed files with 100 additions and 29 deletions.
diff --git a/pom.xml b/pom.xml
@@ -98,9 +98,27 @@
 	<dependencies>
 
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.10</version>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<version>5.6.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>5.6.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>3.2.4</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-junit-jupiter</artifactId>
+			<version>3.2.4</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/src/test/java/info/weboftrust/ldsignatures/BasicSignTest.java b/src/test/java/info/weboftrust/ldsignatures/BasicSignTest.java
@@ -1,18 +1,21 @@
 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;
 import com.nimbusds.jose.JWSSigner;
 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
@@ -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
@@ -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<String, Object> jsonLdObject = (LinkedHashMap<String, Object>) 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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";