diff --git a/kerby-backend/json-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/JsonBackendTest.java b/kerby-backend/json-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/JsonBackendTest.java index 1f579f48a..b3ee60247 100644 --- a/kerby-backend/json-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/JsonBackendTest.java +++ b/kerby-backend/json-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/JsonBackendTest.java @@ -23,8 +23,8 @@ import org.apache.kerby.config.Config; import org.apache.kerby.kerberos.kdc.identitybackend.JsonIdentityBackend; import org.apache.kerby.kerberos.kerb.KrbException; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import java.io.File; @@ -34,7 +34,7 @@ public class JsonBackendTest extends BackendTestBase { private static File jsonBackendFile; - @BeforeClass + @BeforeAll public static void setup() throws KrbException { File testDir = new File(System.getProperty("test.dir", "target")); jsonBackendFile = new File(testDir, "json-identity-backend-file"); @@ -47,7 +47,7 @@ public static void setup() throws KrbException { backend.initialize(); } - @AfterClass + @AfterAll public static void cleanJsonBackendFile() { if (jsonBackendFile.exists()) { jsonBackendFile.delete(); diff --git a/kerby-backend/ldap-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/AbstractLdapIdentityBackendTest.java b/kerby-backend/ldap-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/AbstractLdapIdentityBackendTest.java index e65d50685..9df9c7abc 100644 --- a/kerby-backend/ldap-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/AbstractLdapIdentityBackendTest.java +++ b/kerby-backend/ldap-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/AbstractLdapIdentityBackendTest.java @@ -23,8 +23,8 @@ import org.apache.directory.server.ldap.LdapServer; import org.apache.kerby.kerberos.kdc.identitybackend.LdapIdentityBackend; import org.apache.kerby.kerberos.kerb.KrbException; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.After; +import org.junit.jupiter.api.Test; public abstract class AbstractLdapIdentityBackendTest extends BackendTest { protected LdapIdentityBackend backend; diff --git a/kerby-backend/ldap-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/DirectoryLdapIdentityBackendTest.java b/kerby-backend/ldap-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/DirectoryLdapIdentityBackendTest.java index 86960febd..215de09cb 100644 --- a/kerby-backend/ldap-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/DirectoryLdapIdentityBackendTest.java +++ b/kerby-backend/ldap-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/DirectoryLdapIdentityBackendTest.java @@ -29,8 +29,8 @@ import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.kerby.config.Conf; import org.apache.kerby.kerberos.kdc.identitybackend.LdapIdentityBackend; -import org.junit.Before; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Before; +import org.junit.jupiter.api.runner.RunWith; @RunWith(FrameworkRunner.class) @CreateDS(name = "KerberosKRBProtocolTest-class", diff --git a/kerby-backend/ldap-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/LdapBackendKdcTest.java b/kerby-backend/ldap-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/LdapBackendKdcTest.java index d9dd25544..36ac8c2a5 100644 --- a/kerby-backend/ldap-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/LdapBackendKdcTest.java +++ b/kerby-backend/ldap-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/LdapBackendKdcTest.java @@ -31,11 +31,11 @@ import org.apache.kerby.kerberos.kerb.server.KdcConfigKey; import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket; import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.After; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Before; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.runner.RunWith; import static org.assertj.core.api.Assertions.assertThat; @@ -115,7 +115,7 @@ public void testKdc() throws Exception { tkt = getKrbClient().requestSgt(tgt, getServerPrincipal()); assertThat(tkt).isNotNull(); } catch (Exception e) { - Assert.fail("Exception occurred with good password. " + Assertions.fail("Exception occurred with good password. " + e.toString()); } } diff --git a/kerby-backend/ldap-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/LdapIdentityBackendTest.java b/kerby-backend/ldap-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/LdapIdentityBackendTest.java index 21551fdd7..0739acddb 100644 --- a/kerby-backend/ldap-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/LdapIdentityBackendTest.java +++ b/kerby-backend/ldap-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/LdapIdentityBackendTest.java @@ -27,8 +27,8 @@ import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.kerby.config.Conf; import org.apache.kerby.kerberos.kdc.identitybackend.LdapIdentityBackend; -import org.junit.Before; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Before; +import org.junit.jupiter.api.runner.RunWith; @RunWith(FrameworkRunner.class) @CreateDS(name = "KerberosKRBProtocolTest-class", diff --git a/kerby-backend/mavibot-backend/pom.xml b/kerby-backend/mavibot-backend/pom.xml index 49316390c..c323a1145 100644 --- a/kerby-backend/mavibot-backend/pom.xml +++ b/kerby-backend/mavibot-backend/pom.xml @@ -62,5 +62,12 @@ ${slf4j.version} test + + + org.junit.jupiter + junit-jupiter-params + ${junit.version} + test + diff --git a/kerby-backend/mavibot-backend/src/test/java/org/apache/kerby/KrbIdentitySerializerTest.java b/kerby-backend/mavibot-backend/src/test/java/org/apache/kerby/KrbIdentitySerializerTest.java index 62483554d..a89e35bad 100644 --- a/kerby-backend/mavibot-backend/src/test/java/org/apache/kerby/KrbIdentitySerializerTest.java +++ b/kerby-backend/mavibot-backend/src/test/java/org/apache/kerby/KrbIdentitySerializerTest.java @@ -23,16 +23,16 @@ import org.apache.kerby.kerberos.kerb.type.KerberosTime; import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey; import org.apache.kerby.kerberos.kerb.type.base.EncryptionType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Tests for KrbIdentity serializer. diff --git a/kerby-backend/mavibot-backend/src/test/java/org/apache/kerby/MavibotBackendTest.java b/kerby-backend/mavibot-backend/src/test/java/org/apache/kerby/MavibotBackendTest.java index 14cf8df9f..8ee96b936 100644 --- a/kerby-backend/mavibot-backend/src/test/java/org/apache/kerby/MavibotBackendTest.java +++ b/kerby-backend/mavibot-backend/src/test/java/org/apache/kerby/MavibotBackendTest.java @@ -25,17 +25,17 @@ import org.apache.kerby.kerberos.kerb.identity.backend.BackendTestUtil; import org.apache.kerby.kerberos.kerb.identity.backend.IdentityBackend; import org.apache.kerby.kerberos.kerb.request.KrbIdentity; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.io.TempDir; import java.io.File; +import java.nio.file.Path; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Tests for MavibotBackend. @@ -43,21 +43,16 @@ * @author Apache Kerby Project */ public class MavibotBackendTest extends BackendTestBase { - private static TemporaryFolder tmpFolder = new TemporaryFolder(); - @BeforeClass + @TempDir + static Path tmpFolder; + + @BeforeAll public static void setup() throws Exception { - tmpFolder.create(); - - File dbFile = tmpFolder.newFile(); + File dbFile = tmpFolder.toFile(); backend = new MavibotBackend(dbFile); backend.initialize(); } - - @AfterClass - public static void tearDown() throws KrbException { - tmpFolder.delete(); - } // overriding this cause MavibotBackend doesn't support range search @Override diff --git a/kerby-backend/mysql-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/MySQLBackendKdcTest.java b/kerby-backend/mysql-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/MySQLBackendKdcTest.java index 565a0ee1e..23721ccea 100644 --- a/kerby-backend/mysql-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/MySQLBackendKdcTest.java +++ b/kerby-backend/mysql-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/MySQLBackendKdcTest.java @@ -25,9 +25,9 @@ import org.apache.kerby.kerberos.kerb.server.KdcTestBase; import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket; import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket; -import org.junit.After; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.File; @@ -37,7 +37,7 @@ public class MySQLBackendKdcTest extends KdcTestBase { private static File testDir = new File(System.getProperty("test.dir", "target")); private static File dbFile = new File(testDir, "mysqlbackend.mv.db"); - @After + @AfterEach public void tearDown() { if (dbFile.exists() && !dbFile.delete()) { System.err.println("Failed to delete the test database file."); @@ -71,7 +71,7 @@ public void testKdc() { tkt = getKrbClient().requestSgt(tgt, getServerPrincipal()); assertThat(tkt).isNotNull(); } catch (Exception e) { - Assert.fail("Exception occurred with good password. " + Assertions.fail("Exception occurred with good password. " + e.toString()); } } diff --git a/kerby-backend/mysql-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/MySQLBackendTest.java b/kerby-backend/mysql-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/MySQLBackendTest.java index 59f350050..abebea530 100644 --- a/kerby-backend/mysql-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/MySQLBackendTest.java +++ b/kerby-backend/mysql-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/MySQLBackendTest.java @@ -23,8 +23,8 @@ import org.apache.kerby.kerberos.kdc.identitybackend.MySQLConfKey; import org.apache.kerby.kerberos.kdc.identitybackend.MySQLIdentityBackend; import org.apache.kerby.kerberos.kerb.KrbException; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import java.io.File; import java.io.IOException; @@ -33,7 +33,7 @@ public class MySQLBackendTest extends BackendTestBase { private static File testDir = new File(System.getProperty("test.dir", "target")); private static File dbFile = new File(testDir, "mysqlbackend.mv.db"); - @BeforeClass + @BeforeAll public static void setup() throws KrbException, IOException { Conf config = new Conf(); config.setString(MySQLConfKey.MYSQL_DRIVER, "org.h2.Driver"); @@ -45,7 +45,7 @@ public static void setup() throws KrbException, IOException { backend.initialize(); } - @AfterClass + @AfterAll public static void tearDown() throws KrbException { if (backend != null) { backend.stop(); diff --git a/kerby-backend/pom.xml b/kerby-backend/pom.xml index 7f79dbbad..7c044f09d 100644 --- a/kerby-backend/pom.xml +++ b/kerby-backend/pom.xml @@ -51,7 +51,7 @@ json-backend - ldap-backend + mavibot-backend zookeeper-backend mysql-backend diff --git a/kerby-backend/zookeeper-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/ZookeeperBackendKdcTest.java b/kerby-backend/zookeeper-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/ZookeeperBackendKdcTest.java index c5b8e1b34..eb39d1e92 100644 --- a/kerby-backend/zookeeper-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/ZookeeperBackendKdcTest.java +++ b/kerby-backend/zookeeper-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/ZookeeperBackendKdcTest.java @@ -25,8 +25,8 @@ import org.apache.kerby.kerberos.kerb.server.KdcTestBase; import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket; import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.File; @@ -63,7 +63,7 @@ public void testKdc() throws Exception { tkt = getKrbClient().requestSgt(tgt, getServerPrincipal()); assertThat(tkt).isNotNull(); } catch (Exception e) { - Assert.fail("Exception occurred with good password. " + Assertions.fail("Exception occurred with good password. " + e.toString()); } } diff --git a/kerby-backend/zookeeper-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/ZookeeperBackendTest.java b/kerby-backend/zookeeper-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/ZookeeperBackendTest.java index 8f34123a0..a59804948 100644 --- a/kerby-backend/zookeeper-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/ZookeeperBackendTest.java +++ b/kerby-backend/zookeeper-backend/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/ZookeeperBackendTest.java @@ -23,8 +23,8 @@ import org.apache.kerby.kerberos.kdc.identitybackend.ZKConfKey; import org.apache.kerby.kerberos.kdc.identitybackend.ZookeeperIdentityBackend; import org.apache.kerby.kerberos.kerb.KrbException; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import java.io.File; @@ -35,7 +35,7 @@ public class ZookeeperBackendTest extends BackendTestBase { private static File instanceDir; private static File dataDir; - @BeforeClass + @BeforeAll public static void setup() throws KrbException { Conf config = new Conf(); File testdir = new File(System.getProperty("test.dir", "target")); @@ -50,7 +50,7 @@ public static void setup() throws KrbException { backend.start(); } - @AfterClass + @AfterAll public static void tearDown() throws KrbException { if (dataDir.exists()) { dataDir.delete(); diff --git a/kerby-common/kerby-asn1/pom.xml b/kerby-common/kerby-asn1/pom.xml index 4c7f03ae9..0f92c783a 100644 --- a/kerby-common/kerby-asn1/pom.xml +++ b/kerby-common/kerby-asn1/pom.xml @@ -28,8 +28,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter-engine org.assertj diff --git a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1BooleanTest.java b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1BooleanTest.java index 555797555..800971f57 100644 --- a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1BooleanTest.java +++ b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1BooleanTest.java @@ -21,7 +21,7 @@ import org.apache.kerby.asn1.type.Asn1Boolean; import org.apache.kerby.asn1.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1CollectionTest.java b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1CollectionTest.java index 50d51af36..8f91cc89b 100644 --- a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1CollectionTest.java +++ b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1CollectionTest.java @@ -23,7 +23,7 @@ import org.apache.kerby.asn1.type.Asn1IA5String; import org.apache.kerby.asn1.type.Asn1Sequence; import org.apache.kerby.asn1.type.Asn1String; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1ConstructedOctetStringTest.java b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1ConstructedOctetStringTest.java index 7b110a945..3b9c5d427 100644 --- a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1ConstructedOctetStringTest.java +++ b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1ConstructedOctetStringTest.java @@ -20,7 +20,7 @@ package org.apache.kerby.asn1; import org.apache.kerby.asn1.type.Asn1OctetString; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1DumpTest.java b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1DumpTest.java index ef1969cdc..1fcb60e4c 100644 --- a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1DumpTest.java +++ b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1DumpTest.java @@ -19,8 +19,8 @@ */ package org.apache.kerby.asn1; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; @@ -36,7 +36,7 @@ public void testDumpWithPersonnelRecord() throws IOException { Asn1.parseAndDump(data); Asn1.decodeAndDump(data); } catch (Exception e) { - Assert.fail("Test dump with personnel record failed. " + Assertions.fail("Test dump with personnel record failed. " + e.toString()); } } @@ -48,7 +48,7 @@ public void testDumpWithCompressedData() throws IOException { Asn1.parseAndDump(hexStr); Asn1.decodeAndDump(hexStr); } catch (Exception e) { - Assert.fail("Test dump with compressed data failed. " + Assertions.fail("Test dump with compressed data failed. " + e.toString()); } } @@ -60,7 +60,7 @@ public void testDumpWithSignedData() throws IOException { Asn1.parseAndDump(hexStr); Asn1.decodeAndDump(hexStr); } catch (Exception e) { - Assert.fail("test dump with signed data from file: " + Assertions.fail("test dump with signed data from file: " + "signed-data.txt failed. " + e.toString()); } } @@ -72,7 +72,7 @@ public void testDumpWithDerData() throws IOException { Asn1.parseAndDump(data); Asn1.decodeAndDump(data); } catch (Exception e) { - Assert.fail("test dump with derData from file: " + Assertions.fail("test dump with derData from file: " + "der-data.dat failed. " + e.toString()); } } @@ -84,7 +84,7 @@ public void testDumpWithEmptyContainer() throws IOException { Asn1.parseAndDump(data); Asn1.decodeAndDump(data); } catch (Exception e) { - Assert.fail("test dump with empty container from file: " + Assertions.fail("test dump with empty container from file: " + "empty-container.txt failed. " + e.toString()); } } diff --git a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1FlagsTest.java b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1FlagsTest.java index d20a84326..3d408a9aa 100644 --- a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1FlagsTest.java +++ b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1FlagsTest.java @@ -20,16 +20,14 @@ package org.apache.kerby.asn1; import org.apache.kerby.asn1.type.Asn1Flags; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class Asn1FlagsTest { @@ -65,13 +63,10 @@ public String getName() { return name(); } } - - @Rule - public ExpectedException thrown = ExpectedException.none(); - + private Asn1Flags flags; - @Before + @BeforeEach public void setUp() { flags = new Asn1Flags(FLAG_5 | FLAG_3 | FLAG_1); } diff --git a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1GeneralizedTimeTest.java b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1GeneralizedTimeTest.java index 8e7bc227c..6d55b3a40 100644 --- a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1GeneralizedTimeTest.java +++ b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1GeneralizedTimeTest.java @@ -21,7 +21,7 @@ import org.apache.kerby.asn1.type.Asn1GeneralizedTime; import org.apache.kerby.asn1.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.text.SimpleDateFormat; diff --git a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1IntegerTest.java b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1IntegerTest.java index 04bb11f7a..a41cbf447 100644 --- a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1IntegerTest.java +++ b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1IntegerTest.java @@ -21,7 +21,7 @@ import org.apache.kerby.asn1.type.Asn1Integer; import org.apache.kerby.asn1.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1ObjectIdentifierTest.java b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1ObjectIdentifierTest.java index 9106dc7ca..fba444e89 100644 --- a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1ObjectIdentifierTest.java +++ b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1ObjectIdentifierTest.java @@ -21,7 +21,7 @@ import org.apache.kerby.asn1.type.Asn1ObjectIdentifier; import org.apache.kerby.asn1.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1UtcTimeTest.java b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1UtcTimeTest.java index abede6d96..838182eda 100644 --- a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1UtcTimeTest.java +++ b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1UtcTimeTest.java @@ -21,7 +21,7 @@ import org.apache.kerby.asn1.type.Asn1UtcTime; import org.apache.kerby.asn1.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.text.SimpleDateFormat; diff --git a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1Utf8StringTest.java b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1Utf8StringTest.java index c5924ae46..0272c1969 100644 --- a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1Utf8StringTest.java +++ b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/Asn1Utf8StringTest.java @@ -22,7 +22,7 @@ import java.nio.charset.StandardCharsets; import org.apache.kerby.asn1.type.Asn1Utf8String; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/PersonnelRecordTest.java b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/PersonnelRecordTest.java index 514b82b5e..a39bbabef 100644 --- a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/PersonnelRecordTest.java +++ b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/PersonnelRecordTest.java @@ -20,7 +20,7 @@ package org.apache.kerby.asn1; import org.apache.kerby.asn1.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/TaggingEncodingTest.java b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/TaggingEncodingTest.java index ad9be016c..4dfb0cb2a 100644 --- a/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/TaggingEncodingTest.java +++ b/kerby-common/kerby-asn1/src/test/java/org/apache/kerby/asn1/TaggingEncodingTest.java @@ -21,7 +21,7 @@ import org.apache.kerby.asn1.type.Asn1Tagging; import org.apache.kerby.asn1.type.Asn1VisibleString; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/kerby-common/kerby-config/pom.xml b/kerby-common/kerby-config/pom.xml index bb759a566..a4a688cdd 100644 --- a/kerby-common/kerby-config/pom.xml +++ b/kerby-common/kerby-config/pom.xml @@ -39,8 +39,8 @@ test - junit - junit + org.junit.jupiter + junit-jupiter-engine org.assertj diff --git a/kerby-common/kerby-config/src/test/java/org/apache/kerby/config/ConfTest.java b/kerby-common/kerby-config/src/test/java/org/apache/kerby/config/ConfTest.java index c0830e319..3a0f40575 100644 --- a/kerby-common/kerby-config/src/test/java/org/apache/kerby/config/ConfTest.java +++ b/kerby-common/kerby-config/src/test/java/org/apache/kerby/config/ConfTest.java @@ -19,7 +19,7 @@ */ package org.apache.kerby.config; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; diff --git a/kerby-common/kerby-config/src/test/java/org/apache/kerby/config/ConfigImplTest.java b/kerby-common/kerby-config/src/test/java/org/apache/kerby/config/ConfigImplTest.java index f8c927f50..b851bab05 100644 --- a/kerby-common/kerby-config/src/test/java/org/apache/kerby/config/ConfigImplTest.java +++ b/kerby-common/kerby-config/src/test/java/org/apache/kerby/config/ConfigImplTest.java @@ -19,7 +19,7 @@ */ package org.apache.kerby.config; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/kerby-common/kerby-config/src/test/java/org/apache/kerby/config/IniConfigTest.java b/kerby-common/kerby-config/src/test/java/org/apache/kerby/config/IniConfigTest.java index 419856055..2ccd7713e 100644 --- a/kerby-common/kerby-config/src/test/java/org/apache/kerby/config/IniConfigTest.java +++ b/kerby-common/kerby-config/src/test/java/org/apache/kerby/config/IniConfigTest.java @@ -19,9 +19,9 @@ */ package org.apache.kerby.config; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.FileWriter; @@ -35,7 +35,7 @@ public class IniConfigTest { private static final File TEST_DIR = new File(System.getProperty("test.dir", "target")); private static final File TEST_FILE = new File(TEST_DIR, "test-ini-config"); - @Before + @BeforeEach public void setUp() throws IOException { if (TEST_FILE.exists()) { TEST_FILE.delete(); @@ -81,7 +81,7 @@ public void testIniConfig() throws IOException { assertThat(config1.getBoolean("dns_lookup_realm")).isTrue(); } - @After + @AfterEach public void tearDown() { TEST_FILE.delete(); } diff --git a/kerby-common/kerby-util/pom.xml b/kerby-common/kerby-util/pom.xml index 23e56fdf7..6116d9092 100644 --- a/kerby-common/kerby-util/pom.xml +++ b/kerby-common/kerby-util/pom.xml @@ -28,8 +28,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter-engine org.assertj diff --git a/kerby-common/kerby-util/src/test/java/org/apache/kerby/util/Base64Test.java b/kerby-common/kerby-util/src/test/java/org/apache/kerby/util/Base64Test.java index 1ae3d8250..e2a2be997 100644 --- a/kerby-common/kerby-util/src/test/java/org/apache/kerby/util/Base64Test.java +++ b/kerby-common/kerby-util/src/test/java/org/apache/kerby/util/Base64Test.java @@ -19,13 +19,13 @@ */ package org.apache.kerby.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.util.Arrays; import java.util.Random; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class Base64Test { diff --git a/kerby-common/kerby-util/src/test/java/org/apache/kerby/util/IPAddressParserTest.java b/kerby-common/kerby-util/src/test/java/org/apache/kerby/util/IPAddressParserTest.java index d196886c4..b2511e12a 100644 --- a/kerby-common/kerby-util/src/test/java/org/apache/kerby/util/IPAddressParserTest.java +++ b/kerby-common/kerby-util/src/test/java/org/apache/kerby/util/IPAddressParserTest.java @@ -19,12 +19,12 @@ */ package org.apache.kerby.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.kerby.util.IPAddressParser.parseIPv4Literal; import static org.apache.kerby.util.IPAddressParser.parseIPv6Literal; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class IPAddressParserTest { @@ -32,32 +32,32 @@ public class IPAddressParserTest { public void theTest() { // bad ones - assertNull("ip6 invalid", parseIPv6Literal(":::")); - assertNull("ip6 too many zero-expanders", parseIPv6Literal("1::1::")); - assertNull("ip6 .256 invalid", parseIPv6Literal("1::1:255.254.253.256")); - assertNull("ip6 too small", parseIPv6Literal("1:2:3:4")); - assertNull("ip6 no zero-expander after ip4", parseIPv6Literal("1:255.254.253.252::")); - assertNull("ip6 no zero-expander if 7 colons (end)", parseIPv6Literal("1:2:3:4:5:6:7:8::")); - assertNull("ip6 no zero-expander if 7 colons (begin)", parseIPv6Literal("::1:2:3:4:5:6:7:8")); - assertNull("ip6 88888 too many digits", parseIPv6Literal("1:2:3:4:5:6:7:88888")); - assertNull("ip6 missing colons", parseIPv6Literal("abcd")); - assertNull("ip6 umm, no", parseIPv6Literal("cookie monster")); - assertNull("ip6 empty string is invalid", parseIPv6Literal("")); - assertNull("ip6 null is invalid", parseIPv6Literal(null)); - - assertNull("ip4 not enough dots", parseIPv4Literal("abcd")); - assertNull("ip4 umm, no", parseIPv4Literal("cookie monster")); - assertNull("ip4 empty string is invalid", parseIPv4Literal("")); - assertNull("ip4 null is invalid", parseIPv4Literal(null)); - assertNull("ip4 not enough dots 0", parseIPv4Literal("1")); - assertNull("ip4 not enough dots 1", parseIPv4Literal("1.2")); - assertNull("ip4 not enough dots 2", parseIPv4Literal("1.2.3")); - assertNull("ip4 needs digit after final dot", parseIPv4Literal("1.2.3.")); - assertNull("ip4 [0-9] digits only", parseIPv4Literal("1.2.3.a")); - assertNull("ip4 too many dots", parseIPv4Literal("1.2.3.4.5")); - assertNull("ip4 0-255 range", parseIPv4Literal("1.2.3.444")); - assertNull("ip4 no negatives", parseIPv4Literal("1.2.-3.4")); - assertNull("ip4 no brackets", parseIPv4Literal("[1.2.3.4]")); + assertNull(parseIPv6Literal(":::"), "ip6 invalid"); + assertNull(parseIPv6Literal("1::1::"), "ip6 too many zero-expanders"); + assertNull(parseIPv6Literal("1::1:255.254.253.256"), "ip6 .256 invalid"); + assertNull(parseIPv6Literal("1:2:3:4"), "ip6 too small"); + assertNull(parseIPv6Literal("1:255.254.253.252::"), "ip6 no zero-expander after ip4"); + assertNull(parseIPv6Literal("1:2:3:4:5:6:7:8::"), "ip6 no zero-expander if 7 colons (end)"); + assertNull(parseIPv6Literal("::1:2:3:4:5:6:7:8"), "ip6 no zero-expander if 7 colons (begin)"); + assertNull(parseIPv6Literal("1:2:3:4:5:6:7:88888"), "ip6 88888 too many digits"); + assertNull(parseIPv6Literal("abcd"), "ip6 missing colons"); + assertNull(parseIPv6Literal("cookie monster"), "ip6 umm, no"); + assertNull(parseIPv6Literal(""), "ip6 empty string is invalid"); + assertNull(parseIPv6Literal(null), "ip6 null is invalid"); + + assertNull(parseIPv4Literal("abcd"), "ip4 not enough dots"); + assertNull(parseIPv4Literal("cookie monster"), "ip4 umm, no"); + assertNull(parseIPv4Literal(""), "ip4 empty string is invalid"); + assertNull(parseIPv4Literal(null), "ip4 null is invalid"); + assertNull(parseIPv4Literal("1"), "ip4 not enough dots 0"); + assertNull(parseIPv4Literal("1.2"), "ip4 not enough dots 1"); + assertNull(parseIPv4Literal("1.2.3"), "ip4 not enough dots 2"); + assertNull(parseIPv4Literal("1.2.3."), "ip4 needs digit after final dot"); + assertNull(parseIPv4Literal("1.2.3.a"), "ip4 [0-9] digits only"); + assertNull(parseIPv4Literal("1.2.3.4.5"), "ip4 too many dots"); + assertNull(parseIPv4Literal("1.2.3.444"), "ip4 0-255 range"); + assertNull(parseIPv4Literal("1.2.-3.4"), "ip4 no negatives"); + assertNull(parseIPv4Literal("[1.2.3.4]"), "ip4 no brackets"); // good ones assertArrayEquals(new byte[]{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, parseIPv6Literal("::")); diff --git a/kerby-common/kerby-xdr/pom.xml b/kerby-common/kerby-xdr/pom.xml index a4691468a..e305d5f6d 100644 --- a/kerby-common/kerby-xdr/pom.xml +++ b/kerby-common/kerby-xdr/pom.xml @@ -28,8 +28,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter-engine org.assertj diff --git a/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrBooleanTest.java b/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrBooleanTest.java index 0d7b0f2a4..20ef9f44e 100644 --- a/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrBooleanTest.java +++ b/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrBooleanTest.java @@ -21,7 +21,7 @@ import org.apache.kerby.xdr.type.XdrBoolean; import org.apache.kerby.xdr.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrEnumeratedTest.java b/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrEnumeratedTest.java index 2a3096a8e..b98143bd1 100644 --- a/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrEnumeratedTest.java +++ b/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrEnumeratedTest.java @@ -21,7 +21,7 @@ import org.apache.kerby.xdr.type.XdrEnumerated; import org.apache.kerby.xdr.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import static org.assertj.core.api.Assertions.assertThat; diff --git a/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrIntegerTest.java b/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrIntegerTest.java index 9246f12d1..5a284d211 100644 --- a/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrIntegerTest.java +++ b/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrIntegerTest.java @@ -21,7 +21,7 @@ import org.apache.kerby.xdr.type.XdrInteger; import org.apache.kerby.xdr.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrLongTest.java b/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrLongTest.java index 6fa049917..69273b93b 100644 --- a/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrLongTest.java +++ b/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrLongTest.java @@ -21,7 +21,7 @@ import org.apache.kerby.xdr.type.XdrLong; import org.apache.kerby.xdr.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrStringTest.java b/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrStringTest.java index 8bb30a452..bd5943bb4 100644 --- a/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrStringTest.java +++ b/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrStringTest.java @@ -21,7 +21,7 @@ import org.apache.kerby.xdr.type.XdrString; import org.apache.kerby.xdr.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrStructTypeTest.java b/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrStructTypeTest.java index c41a20b8a..f2fd22fa4 100644 --- a/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrStructTypeTest.java +++ b/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrStructTypeTest.java @@ -22,7 +22,7 @@ import org.apache.kerby.xdr.type.XdrStructType; import org.apache.kerby.xdr.type.XdrUnion; import org.apache.kerby.xdr.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrUnionTest.java b/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrUnionTest.java index e9b927513..634f0b02e 100644 --- a/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrUnionTest.java +++ b/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrUnionTest.java @@ -21,7 +21,7 @@ import org.apache.kerby.xdr.type.XdrUnion; import org.apache.kerby.xdr.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrUnsignedIntegerTest.java b/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrUnsignedIntegerTest.java index 118f094c3..e2b2c9e8c 100644 --- a/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrUnsignedIntegerTest.java +++ b/kerby-common/kerby-xdr/src/test/java/org/apache/kerby/xdr/XdrUnsignedIntegerTest.java @@ -21,7 +21,7 @@ import org.apache.kerby.xdr.type.XdrUnsignedInteger; import org.apache.kerby.xdr.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/kerby-kdc-test/pom.xml b/kerby-kdc-test/pom.xml index 9655a9e72..c4cab5d9b 100644 --- a/kerby-kdc-test/pom.xml +++ b/kerby-kdc-test/pom.xml @@ -64,8 +64,8 @@ test - junit - junit + org.junit.jupiter + junit-jupiter-engine org.assertj diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/AccessTokenKdcTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/AccessTokenKdcTest.java index 96762d8e6..e6343691c 100644 --- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/AccessTokenKdcTest.java +++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/AccessTokenKdcTest.java @@ -31,8 +31,8 @@ import org.apache.kerby.kerberos.kerb.common.PublicKeyReader; import org.apache.kerby.kerberos.kerb.server.TestKdcServer; import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class AccessTokenKdcTest extends TokenKdcTestBase { @@ -53,10 +53,10 @@ public void testBadIssuer() throws Exception { try { performTest(); - Assert.fail("Failure expected on a bad issuer value"); + Assertions.fail("Failure expected on a bad issuer value"); } catch (Exception ex) { // expected - Assert.assertTrue(ex instanceof KrbException); + Assertions.assertTrue(ex instanceof KrbException); } } @@ -72,10 +72,10 @@ public void testBadAudienceRestriction() throws Exception { try { performTest(); - Assert.fail("Failure expected on a bad audience restriction value"); + Assertions.fail("Failure expected on a bad audience restriction value"); } catch (Exception ex) { // expected - Assert.assertTrue(ex instanceof KrbException); + Assertions.assertTrue(ex instanceof KrbException); } } @@ -85,10 +85,10 @@ public void testUnsignedToken() throws Exception { try { performTest(); - Assert.fail("Failure expected on an unsigned token"); + Assertions.fail("Failure expected on an unsigned token"); } catch (Exception ex) { // expected - Assert.assertTrue(ex instanceof KrbException); + Assertions.assertTrue(ex instanceof KrbException); } } @@ -101,10 +101,10 @@ public void testSignedTokenWithABadKey() throws Exception { try { performTest(); - Assert.fail("Failure expected on a bad key"); + Assertions.fail("Failure expected on a bad key"); } catch (Exception ex) { // expected - Assert.assertTrue(ex instanceof KrbException); + Assertions.assertTrue(ex instanceof KrbException); } } @@ -139,10 +139,10 @@ public void testSignedEncryptedTokenBadSigningKey() throws Exception { try { performTest(); - Assert.fail("Failure expected on a bad key"); + Assertions.fail("Failure expected on a bad key"); } catch (Exception ex) { // expected - Assert.assertTrue(ex instanceof KrbException); + Assertions.assertTrue(ex instanceof KrbException); } } diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/AnonymousPkinitKdcTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/AnonymousPkinitKdcTest.java index 215d8b01d..d61deb145 100644 --- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/AnonymousPkinitKdcTest.java +++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/AnonymousPkinitKdcTest.java @@ -27,9 +27,9 @@ import org.apache.kerby.kerberos.kerb.server.KdcTestBase; import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket; import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -40,7 +40,7 @@ public class AnonymousPkinitKdcTest extends KdcTestBase { private String serverPrincipal; private KrbPkinitClient pkinitClient; - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); @@ -75,7 +75,7 @@ public void testAnonymity() throws Exception { tgt = pkinitClient.requestTgt(); } catch (KrbException te) { te.printStackTrace(); - Assert.fail(); + Assertions.fail(); return; } assertThat(tgt).isNotNull(); diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/CrossRealmKdcTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/CrossRealmKdcTest.java index 4800ff298..0942b9bb5 100644 --- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/CrossRealmKdcTest.java +++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/CrossRealmKdcTest.java @@ -34,10 +34,10 @@ import org.apache.kerby.kerberos.kerb.server.TestKdcServer; import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket; import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** * A test for a cross-realm KDC call. @@ -53,7 +53,7 @@ public class CrossRealmKdcTest { private KerbyCrossRealmKdc kdc1; private KerbyCrossRealmKdc kdc2; - @BeforeClass + @BeforeAll public static void createTestDirs() throws IOException { String basedir = System.getProperty("basedir"); if (basedir == null) { @@ -68,7 +68,7 @@ public static void createTestDirs() throws IOException { testDir2.mkdirs(); } - @AfterClass + @AfterAll public static void deleteTestDir() throws IOException { testDir1.delete(); testDir2.delete(); @@ -114,7 +114,7 @@ public void testCrossRealm() throws Exception { tkt = kdc1.getKrbClient().requestSgt(tgt, kdc2.getServerPrincipal()); assertThat(tkt).isNotNull(); } catch (Exception e) { - Assert.fail("Exception occurred with good password. " + Assertions.fail("Exception occurred with good password. " + e.toString()); } } diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/EncryptionTypeKdcTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/EncryptionTypeKdcTest.java index e327f1f3d..921185d56 100644 --- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/EncryptionTypeKdcTest.java +++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/EncryptionTypeKdcTest.java @@ -25,8 +25,8 @@ import org.apache.kerby.kerberos.kerb.client.KrbConfigKey; import org.apache.kerby.kerberos.kerb.identity.backend.BackendConfig; import org.apache.kerby.kerberos.kerb.server.KdcConfigKey; -import org.junit.AfterClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import java.io.File; @@ -63,7 +63,7 @@ public void testKdc() throws Exception { performKdcTest(); } - @AfterClass + @AfterAll public static void rmJsonBackendFile() { if (jsonBackendFile.exists()) { jsonBackendFile.delete(); diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/IdentityTokenKdcTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/IdentityTokenKdcTest.java index 57e76279e..fda254630 100644 --- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/IdentityTokenKdcTest.java +++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/IdentityTokenKdcTest.java @@ -26,8 +26,8 @@ import org.apache.kerby.kerberos.kerb.server.TestKdcServer; import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket; import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.InputStream; import java.security.KeyPair; @@ -54,10 +54,10 @@ public void testBadIssuer() throws Exception { try { performTest(); - Assert.fail("Failure expected on a bad issuer value"); + Assertions.fail("Failure expected on a bad issuer value"); } catch (Exception ex) { // expected - Assert.assertTrue(ex instanceof KrbException); + Assertions.assertTrue(ex instanceof KrbException); } } @@ -72,10 +72,10 @@ public void testBadAudienceRestriction() throws Exception { try { performTest(); - Assert.fail("Failure expected on a bad audience restriction value"); + Assertions.fail("Failure expected on a bad audience restriction value"); } catch (Exception ex) { // expected - Assert.assertTrue(ex instanceof KrbException); + Assertions.assertTrue(ex instanceof KrbException); } } @@ -84,10 +84,10 @@ public void testUnsignedToken() throws Exception { prepareToken(getAudience("krbtgt2"), ISSUER, null, null); try { performTest(); - Assert.fail("Failure expected on an unsigned token"); + Assertions.fail("Failure expected on an unsigned token"); } catch (Exception ex) { // expected - Assert.assertTrue(ex instanceof KrbException); + Assertions.assertTrue(ex instanceof KrbException); } } @@ -100,10 +100,10 @@ public void testSignedTokenWithABadKey() throws Exception { try { performTest(); - Assert.fail("Failure expected on a bad key"); + Assertions.fail("Failure expected on a bad key"); } catch (Exception ex) { // expected - Assert.assertTrue(ex instanceof KrbException); + Assertions.assertTrue(ex instanceof KrbException); } } @@ -139,10 +139,10 @@ public void testSignedEncryptedTokenBadSigningKey() throws Exception { try { performTest(); - Assert.fail("Failure expected on a bad key"); + Assertions.fail("Failure expected on a bad key"); } catch (Exception ex) { // expected - Assert.assertTrue(ex instanceof KrbException); + Assertions.assertTrue(ex instanceof KrbException); } } diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/JsonBackendKdcTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/JsonBackendKdcTest.java index 9247e3efe..58c3ef2a1 100644 --- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/JsonBackendKdcTest.java +++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/JsonBackendKdcTest.java @@ -23,8 +23,8 @@ import org.apache.kerby.kerberos.kerb.KrbException; import org.apache.kerby.kerberos.kerb.identity.backend.BackendConfig; import org.apache.kerby.kerberos.kerb.server.KdcConfigKey; -import org.junit.AfterClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import java.io.File; @@ -51,7 +51,7 @@ public void testKdc() throws Exception { performKdcTest(); } - @AfterClass + @AfterAll public static void rmJsonBackendFile() { if (jsonBackendFile.exists()) { jsonBackendFile.delete(); diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/KerbyKdcTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/KerbyKdcTest.java index 2f869dc37..094f687d8 100644 --- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/KerbyKdcTest.java +++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/KerbyKdcTest.java @@ -24,7 +24,7 @@ import org.apache.kerby.kerberos.kerb.server.KdcTestBase; import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket; import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import static org.assertj.core.api.Assertions.assertThat; @@ -49,7 +49,7 @@ protected void performKdcTest() throws Exception { tkt = getKrbClient().requestSgt(tgt, getServerPrincipal()); assertThat(tkt).isNotNull(); } catch (Exception e) { - Assert.fail("Exception occurred with good password. " + Assertions.fail("Exception occurred with good password. " + e.toString()); } } diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/MultiKdcsTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/MultiKdcsTest.java index 6a61e498c..1ac6bc906 100644 --- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/MultiKdcsTest.java +++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/MultiKdcsTest.java @@ -22,7 +22,7 @@ import org.apache.kerby.kerberos.kerb.client.KrbConfig; import org.apache.kerby.kerberos.kerb.server.SimpleKdcServer; import org.apache.kerby.kerberos.kerb.server.TestKdcServer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.net.URL; diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/OnlyTcpForNettyKdcNetworkTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/OnlyTcpForNettyKdcNetworkTest.java index fcc372220..7aa7db4a3 100644 --- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/OnlyTcpForNettyKdcNetworkTest.java +++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/OnlyTcpForNettyKdcNetworkTest.java @@ -22,15 +22,15 @@ import org.apache.kerby.kerberos.kdc.identitybackend.JsonIdentityBackend; import org.apache.kerby.kerberos.kerb.KrbException; import org.apache.kerby.kerberos.kerb.identity.backend.BackendConfig; -import org.junit.AfterClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import java.io.File; public class OnlyTcpForNettyKdcNetworkTest extends KerbyKdcTest { private static File jsonBackendFile; - @AfterClass + @AfterAll public static void rmJsonBackendFile() { if (jsonBackendFile.exists()) { jsonBackendFile.delete(); diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/OnlyUdpForNettyKdcNetworkTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/OnlyUdpForNettyKdcNetworkTest.java index 6662897c6..f4a086ebf 100644 --- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/OnlyUdpForNettyKdcNetworkTest.java +++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/OnlyUdpForNettyKdcNetworkTest.java @@ -22,15 +22,15 @@ import org.apache.kerby.kerberos.kdc.identitybackend.JsonIdentityBackend; import org.apache.kerby.kerberos.kerb.KrbException; import org.apache.kerby.kerberos.kerb.identity.backend.BackendConfig; -import org.junit.AfterClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import java.io.File; public class OnlyUdpForNettyKdcNetworkTest extends KerbyKdcTest { private static File jsonBackendFile; - @AfterClass + @AfterAll public static void rmJsonBackendFile() { if (jsonBackendFile.exists()) { jsonBackendFile.delete(); diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/TokenWithAnonymousPkinitKdcTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/TokenWithAnonymousPkinitKdcTest.java index 68a024e3a..d7b47544a 100644 --- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/TokenWithAnonymousPkinitKdcTest.java +++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/TokenWithAnonymousPkinitKdcTest.java @@ -27,8 +27,8 @@ import org.apache.kerby.kerberos.kerb.server.TestKdcServer; import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket; import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class TokenWithAnonymousPkinitKdcTest extends TokenKdcTestBase { @@ -89,7 +89,7 @@ private TgtTicket createAnonymousTgt() { tgt = getPkinitClient().requestTgt(); } catch (KrbException te) { te.printStackTrace(); - Assert.fail(); + Assertions.fail(); } return tgt; } diff --git a/kerby-kerb/integration-test/pom.xml b/kerby-kerb/integration-test/pom.xml index 3442e19a7..6184d97bf 100644 --- a/kerby-kerb/integration-test/pom.xml +++ b/kerby-kerb/integration-test/pom.xml @@ -53,8 +53,8 @@ test - junit - junit + org.junit.jupiter + junit-jupiter-engine org.assertj diff --git a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/AppTest.java b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/AppTest.java index 82186b9f4..14484fe38 100644 --- a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/AppTest.java +++ b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/AppTest.java @@ -21,8 +21,8 @@ import org.apache.kerby.kerberos.kerb.server.LoginTestBase; import org.apache.kerby.util.NetworkUtil; -import org.junit.Assert; -import org.junit.Before; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +35,7 @@ public abstract class AppTest extends LoginTestBase { private int serverPort; protected AppServer appServer; - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); @@ -82,8 +82,7 @@ public Object run() { } }); - Assert.assertTrue("Client successfully connected and authenticated to server", - appClient.isTestOK()); + Assertions.assertTrue(appClient.isTestOK(), "Client successfully connected and authenticated to server"); } } diff --git a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/GssAppTest.java b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/GssAppTest.java index d8b891ae2..d59b79fd5 100644 --- a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/GssAppTest.java +++ b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/GssAppTest.java @@ -27,8 +27,8 @@ import org.apache.kerby.kerberos.kerb.integration.test.gss.GssAppClient; import org.apache.kerby.kerberos.kerb.integration.test.gss.GssAppServer; import org.apache.kerby.util.NetworkUtil; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,7 +41,7 @@ public class GssAppTest extends AppTest { private AppServer appServer2; private AppServer appServer3; - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); diff --git a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/JWTTokenTest.java b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/JWTTokenTest.java index 4b20a45bd..6a08f9e0f 100644 --- a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/JWTTokenTest.java +++ b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/JWTTokenTest.java @@ -19,8 +19,6 @@ */ package org.apache.kerby.kerberos.kerb.integration.test; -import static org.junit.Assert.*; - import java.io.File; import java.io.InputStream; import java.nio.file.Files; @@ -54,12 +52,14 @@ import org.apache.kerby.kerberos.kerb.type.ticket.Ticket; import org.apache.kerby.kerberos.provider.token.JwtTokenEncoder; +import static org.junit.jupiter.api.Assertions.*; + /** * Some tests for JWT tokens using the Kerby client API */ public class JWTTokenTest extends TokenLoginTestBase { - @org.junit.Test + @org.junit.jupiter.api.Test public void accessToken() throws Exception { KrbClient client = getKrbClient(); @@ -123,7 +123,7 @@ public void accessToken() throws Exception { cCacheFile.delete(); } - @org.junit.Test(expected = KrbException.class) + @org.junit.jupiter.api.Test public void accessTokenInvalidAudience() throws Exception { KrbClient client = getKrbClient(); @@ -162,15 +162,16 @@ public void accessTokenInvalidAudience() throws Exception { } krbToken.setTokenValue(signToken(authToken, signKey)); - // Now get a SGT using the JWT - try { - tokenClient.requestSgt(krbToken, getServerPrincipal(), cCacheFile.getPath()); - } finally { - cCacheFile.delete(); - } + assertThrows(KrbException.class, () -> { + try { + tokenClient.requestSgt(krbToken, getServerPrincipal(), cCacheFile.getPath()); + } finally { + cCacheFile.delete(); + } + }); } - @org.junit.Test(expected = KrbException.class) + @org.junit.jupiter.api.Test public void accessTokenInvalidSignature() throws Exception { KrbClient client = getKrbClient(); @@ -209,15 +210,16 @@ public void accessTokenInvalidSignature() throws Exception { krbToken.setTokenValue(signToken(authToken, keyPair.getPrivate())); - // Now get a SGT using the JWT - try { - tokenClient.requestSgt(krbToken, getServerPrincipal(), cCacheFile.getPath()); - } finally { - cCacheFile.delete(); - } + assertThrows(KrbException.class, () -> { + try { + tokenClient.requestSgt(krbToken, getServerPrincipal(), cCacheFile.getPath()); + } finally { + cCacheFile.delete(); + } + }); } - @org.junit.Test + @org.junit.jupiter.api.Test public void accessTokenNoSignature() throws Exception { KrbClient client = getKrbClient(); @@ -266,7 +268,7 @@ public void accessTokenNoSignature() throws Exception { } } - @org.junit.Test(expected = KrbException.class) + @org.junit.jupiter.api.Test public void accessTokenUnknownIssuer() throws Exception { KrbClient client = getKrbClient(); @@ -307,15 +309,17 @@ public void accessTokenUnknownIssuer() throws Exception { krbToken.setTokenValue(signToken(authToken, signKey)); // Now get a SGT using the JWT - try { - tokenClient.requestSgt(krbToken, getServerPrincipal(), cCacheFile.getPath()); - } finally { - cCacheFile.delete(); - } + assertThrows(KrbException.class, () -> { + try { + tokenClient.requestSgt(krbToken, getServerPrincipal(), cCacheFile.getPath()); + } finally { + cCacheFile.delete(); + } + }); } // Use the TGT here instead of an armor cache - @org.junit.Test + @org.junit.jupiter.api.Test public void accessTokenUsingTicket() throws Exception { KrbClient client = getKrbClient(); @@ -368,7 +372,7 @@ public void accessTokenUsingTicket() throws Exception { assertEquals(getServerPrincipal(), decodedKrbToken.getAudiences().get(0)); } - @org.junit.Test + @org.junit.jupiter.api.Test public void identityToken() throws Exception { KrbClient client = getKrbClient(); @@ -427,7 +431,7 @@ public void identityToken() throws Exception { cCacheFile.delete(); } - @org.junit.Test(expected = KrbException.class) + @org.junit.jupiter.api.Test public void identityTokenInvalidAudience() throws Exception { KrbClient client = getKrbClient(); @@ -465,15 +469,16 @@ public void identityTokenInvalidAudience() throws Exception { krbToken.setTokenValue(signToken(authToken, signKey)); // Now get a TGT using the JWT token - try { - tokenClient.requestTgt(krbToken, cCacheFile.getPath()); - fail("Failure expected on an invalid audience"); - } finally { - cCacheFile.delete(); - } + assertThrows(KrbException.class, () -> { + try { + tokenClient.requestTgt(krbToken, cCacheFile.getPath()); + } finally { + cCacheFile.delete(); + } + }); } - @org.junit.Test(expected = KrbException.class) + @org.junit.jupiter.api.Test public void identityTokenInvalidSignature() throws Exception { KrbClient client = getKrbClient(); @@ -509,15 +514,16 @@ public void identityTokenInvalidSignature() throws Exception { krbToken.setTokenValue(signToken(authToken, keyPair.getPrivate())); // Now get a TGT using the JWT token - try { - tokenClient.requestTgt(krbToken, cCacheFile.getPath()); - fail("Failure expected on an invalid signature"); - } finally { - cCacheFile.delete(); - } + assertThrows(KrbException.class, () -> { + try { + tokenClient.requestTgt(krbToken, cCacheFile.getPath()); + } finally { + cCacheFile.delete(); + } + }); } - @org.junit.Test + @org.junit.jupiter.api.Test public void identityTokenNoSignature() throws Exception { KrbClient client = getKrbClient(); @@ -563,7 +569,7 @@ public void identityTokenNoSignature() throws Exception { } } - @org.junit.Test(expected = KrbException.class) + @org.junit.jupiter.api.Test public void identityTokenUnknownIssuer() throws Exception { KrbClient client = getKrbClient(); @@ -601,11 +607,13 @@ public void identityTokenUnknownIssuer() throws Exception { krbToken.setTokenValue(signToken(authToken, signKey)); // Now get a TGT using the JWT token - try { - tokenClient.requestTgt(krbToken, cCacheFile.getPath()); - } finally { - cCacheFile.delete(); - } + assertThrows(KrbException.class, () -> { + try { + tokenClient.requestTgt(krbToken, cCacheFile.getPath()); + } finally { + cCacheFile.delete(); + } + }); } private byte[] signToken(AuthToken authToken, PrivateKey signKey) throws Exception { diff --git a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/KerbyGssAppTest.java b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/KerbyGssAppTest.java index 7488d51fe..b7eb2ea08 100644 --- a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/KerbyGssAppTest.java +++ b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/KerbyGssAppTest.java @@ -20,14 +20,14 @@ package org.apache.kerby.kerberos.kerb.integration.test; import org.apache.kerby.kerberos.kerb.gss.KerbyGssProvider; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.security.Provider; public class KerbyGssAppTest extends GssAppTest { - @Before + @BeforeEach @Override public void setUp() throws Exception { Provider provider = new KerbyGssProvider(); diff --git a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/KerbyTokenAppTest.java b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/KerbyTokenAppTest.java index ee2ad64c4..ddb4d2e1d 100644 --- a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/KerbyTokenAppTest.java +++ b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/KerbyTokenAppTest.java @@ -38,21 +38,21 @@ import org.apache.kerby.kerberos.kerb.type.base.KrbToken; import org.apache.kerby.kerberos.kerb.type.base.TokenFormat; import org.apache.kerby.kerberos.provider.token.JwtTokenEncoder; -import org.junit.Assume; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assumptions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class KerbyTokenAppTest extends TokenAppTest { private static final Logger LOG = LoggerFactory.getLogger(KerbyGssAppTest.class); - @Before + @BeforeEach @Override public void setUp() throws Exception { Provider provider = new KerbyGssProvider(); @@ -71,7 +71,7 @@ public void testJwtAccessToken() throws Exception { if (version.contains(".")) { version = version.substring(0, version.indexOf('.')); } - Assume.assumeFalse(Integer.parseInt(version) >= 9); + Assumptions.assumeFalse(Integer.parseInt(version) >= 9); } runAppClientWithToken(createAppClient()); @@ -113,8 +113,7 @@ public Object run() { } }); - assertTrue("Client successfully connected and authenticated to server", - appClient.isTestOK()); + assertTrue(appClient.isTestOK(), "Client successfully connected and authenticated to server"); } private byte[] signToken(AuthToken authToken, PrivateKey signKey) throws Exception { diff --git a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/SaslAppTest.java b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/SaslAppTest.java index b85ea3643..564d092a7 100644 --- a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/SaslAppTest.java +++ b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/SaslAppTest.java @@ -21,7 +21,7 @@ import org.apache.kerby.kerberos.kerb.integration.test.sasl.SaslAppClient; import org.apache.kerby.kerberos.kerb.integration.test.sasl.SaslAppServer; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SaslAppTest extends AppTest { diff --git a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenAppTest.java b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenAppTest.java index 55298f9e7..c898eb0f9 100644 --- a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenAppTest.java +++ b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenAppTest.java @@ -20,8 +20,8 @@ package org.apache.kerby.kerberos.kerb.integration.test; import org.apache.kerby.util.NetworkUtil; -import org.junit.Assert; -import org.junit.Before; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +34,7 @@ public abstract class TokenAppTest extends TokenLoginTestBase { private int serverPort; protected AppServer appServer; - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); @@ -81,8 +81,8 @@ public Object run() { } }); - Assert.assertTrue("Client successfully connected and authenticated to server", - appClient.isTestOK()); + Assertions.assertTrue(appClient.isTestOK(), + "Client successfully connected and authenticated to server"); } } diff --git a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginTestBase.java b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginTestBase.java index 5e74d2f73..37feb1f95 100644 --- a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginTestBase.java +++ b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginTestBase.java @@ -29,8 +29,8 @@ import org.apache.kerby.kerberos.kerb.server.TestKdcServer; import org.apache.kerby.kerberos.kerb.type.base.AuthToken; import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,7 +52,7 @@ public class TokenLoginTestBase extends LoginTestBase { static final String GROUP = "sales-group"; static final String ROLE = "ADMIN"; - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); @@ -62,7 +62,7 @@ public void setUp() throws Exception { tokenCache = Files.createTempFile("tokencache", null).toFile(); } - @After + @AfterEach public void cleanup() throws Exception { tokenCache.delete(); } diff --git a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginWithTokenPreauthDisabledTest.java b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginWithTokenPreauthDisabledTest.java index 0c98ec791..8312dbff1 100644 --- a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginWithTokenPreauthDisabledTest.java +++ b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginWithTokenPreauthDisabledTest.java @@ -21,8 +21,8 @@ import javax.security.auth.login.LoginException; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * Test login with token when token preauth is not allowed by kdc. @@ -34,15 +34,17 @@ protected Boolean isTokenPreauthAllowed() { return false; } - @Test(expected = LoginException.class) + @Test public void testLoginWithTokenStr() throws Exception { - super.testLoginWithTokenStr(); - Assert.fail("Exception should have been thrown"); + Assertions.assertThrows(LoginException.class, () -> { + super.testLoginWithTokenStr(); + }); } - @Test(expected = LoginException.class) + @Test public void testLoginWithTokenCache() throws Exception { - super.testLoginWithTokenCache(); - Assert.fail("Exception should have been thrown"); + Assertions.assertThrows(LoginException.class, () -> { + super.testLoginWithTokenCache(); + }); } } \ No newline at end of file diff --git a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginWithTokenPreauthEnabledTest.java b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginWithTokenPreauthEnabledTest.java index 9ca9aa7f5..ddbffd845 100644 --- a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginWithTokenPreauthEnabledTest.java +++ b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginWithTokenPreauthEnabledTest.java @@ -20,8 +20,8 @@ package org.apache.kerby.kerberos.kerb.integration.test; import org.apache.kerby.kerberos.kerb.server.KerberosClientExceptionAction; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import javax.security.auth.Subject; import javax.security.auth.login.LoginException; @@ -61,7 +61,7 @@ public void testLoginWithTokenCacheGSS() throws Exception { getServerPrincipal()); byte[] kerberosToken = (byte[]) Subject.doAs(subject, action); - Assert.assertNotNull(kerberosToken); + Assertions.assertNotNull(kerberosToken); } @Test @@ -70,7 +70,7 @@ public void testUntrustedSignature() throws Exception { File signKeyFile = new File(this.getClass().getResource("/kdckeytest.pem").getPath()); try { loginClientUsingTokenStr(tokenStr, getArmorCache(), getTGTCache(), signKeyFile); - Assert.fail("Failure expected on a signature that is not trusted"); + Assertions.fail("Failure expected on a signature that is not trusted"); } catch (LoginException ex) { //NOPMD // expected } @@ -81,7 +81,7 @@ public void testUnsignedToken() throws Exception { String tokenStr = createTokenAndArmorCache(); try { loginClientUsingTokenStr(tokenStr, getArmorCache(), getTGTCache(), null); - Assert.fail("Failure expected on an unsigned token"); + Assertions.fail("Failure expected on an unsigned token"); } catch (LoginException ex) { //NOPMD // expected } diff --git a/kerby-kerb/kerb-admin-server/pom.xml b/kerby-kerb/kerb-admin-server/pom.xml index f4fce9170..1a915df2f 100644 --- a/kerby-kerb/kerb-admin-server/pom.xml +++ b/kerby-kerb/kerb-admin-server/pom.xml @@ -59,8 +59,8 @@ test - junit - junit + org.junit.jupiter + junit-jupiter-engine test diff --git a/kerby-kerb/kerb-admin-server/src/test/java/org/apache/kerby/kerberos/kerb/admin/server/RemoteKadminTest.java b/kerby-kerb/kerb-admin-server/src/test/java/org/apache/kerby/kerberos/kerb/admin/server/RemoteKadminTest.java index 1f8570800..9591814c9 100644 --- a/kerby-kerb/kerb-admin-server/src/test/java/org/apache/kerby/kerberos/kerb/admin/server/RemoteKadminTest.java +++ b/kerby-kerb/kerb-admin-server/src/test/java/org/apache/kerby/kerberos/kerb/admin/server/RemoteKadminTest.java @@ -34,10 +34,10 @@ import org.apache.kerby.kerberos.kerb.server.SimpleKdcServer; import org.apache.kerby.kerberos.kerb.type.base.PrincipalName; import org.apache.kerby.util.NetworkUtil; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,9 +47,9 @@ import java.util.List; import java.util.stream.Collectors; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; public class RemoteKadminTest { private static final Logger LOG = LoggerFactory.getLogger(RemoteKadminTest.class); @@ -118,8 +118,8 @@ private AdminClient buildKadminRemoteClient() throws Exception { return adminClient; } - @BeforeClass - public static void setUpBeforeClass() throws Exception { + @BeforeAll + public static void setUpBeforeAll() throws Exception { workDir.mkdirs(); kdcServer = buildMiniKdc(); @@ -131,8 +131,8 @@ public static void setUpBeforeClass() throws Exception { adminServer.start(); } - @AfterClass - public static void tearDownAfterClass() throws Exception { + @AfterAll + public static void tearDownAfterAll() throws Exception { adminServer.stop(); kdcServer.stop(); FileUtils.deleteDirectory(workDir); @@ -158,18 +158,18 @@ public void remoteModifyPrincipalTest() throws Exception { String testPrincipal = "test/EXAMPLE.COM"; String renamePrincipal = "test_rename/EXAMPLE.COM"; adminClient.requestAddPrincipal(testPrincipal); - assertTrue("Remote kadmin add principal test failed.", - localKadmin.getPrincipals().contains(testPrincipal + "@EXAMPLE.COM")); + assertTrue(localKadmin.getPrincipals().contains(testPrincipal + "@EXAMPLE.COM"), + "Remote kadmin add principal test failed."); adminClient.requestRenamePrincipal(testPrincipal, renamePrincipal); - assertTrue("Remote kadmin rename principal test failed, the renamed principal does not exist.", - localKadmin.getPrincipals().contains(renamePrincipal + "@EXAMPLE.COM")); - assertFalse("Remote kadmin rename principal test failed, the old principal still exists.", - localKadmin.getPrincipals().contains(testPrincipal + "@EXAMPLE.COM")); + assertTrue(localKadmin.getPrincipals().contains(renamePrincipal + "@EXAMPLE.COM"), + "Remote kadmin rename principal test failed, the renamed principal does not exist."); + assertFalse(localKadmin.getPrincipals().contains(testPrincipal + "@EXAMPLE.COM"), + "Remote kadmin rename principal test failed, the old principal still exists."); adminClient.requestDeletePrincipal(renamePrincipal); - assertFalse("Remote kadmin delete principal test failed.", - localKadmin.getPrincipals().contains(renamePrincipal + "@EXAMPLE.COM")); + assertFalse(localKadmin.getPrincipals().contains(renamePrincipal + "@EXAMPLE.COM"), + "Remote kadmin delete principal test failed."); } @Test @@ -196,7 +196,7 @@ public void remoteChangePasswordTest() throws Exception { try { AuthUtil.loginUsingPassword(testPrincipal, new PasswordCallbackHandler(newPassword)); } catch (LoginException e) { - Assert.fail("Login using new password failed: " + e.toString()); + Assertions.fail("Login using new password failed: " + e.toString()); } } diff --git a/kerby-kerb/kerb-client/pom.xml b/kerby-kerb/kerb-client/pom.xml index 2de2cc5d1..d6f30b407 100644 --- a/kerby-kerb/kerb-client/pom.xml +++ b/kerby-kerb/kerb-client/pom.xml @@ -53,8 +53,8 @@ test - junit - junit + org.junit.jupiter + junit-jupiter-engine org.assertj diff --git a/kerby-kerb/kerb-client/src/test/java/org/apache/kerby/kerberos/kerb/client/KrbClientSettingTest.java b/kerby-kerb/kerb-client/src/test/java/org/apache/kerby/kerberos/kerb/client/KrbClientSettingTest.java index 731e2e314..3b8020bc8 100644 --- a/kerby-kerb/kerb-client/src/test/java/org/apache/kerby/kerberos/kerb/client/KrbClientSettingTest.java +++ b/kerby-kerb/kerb-client/src/test/java/org/apache/kerby/kerberos/kerb/client/KrbClientSettingTest.java @@ -19,7 +19,7 @@ */ package org.apache.kerby.kerberos.kerb.client; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.net.URL; diff --git a/kerby-kerb/kerb-client/src/test/java/org/apache/kerby/kerberos/kerb/client/KrbConfigLoadForSpecialsTest.java b/kerby-kerb/kerb-client/src/test/java/org/apache/kerby/kerberos/kerb/client/KrbConfigLoadForSpecialsTest.java index 51d72e159..99fd7615d 100644 --- a/kerby-kerb/kerb-client/src/test/java/org/apache/kerby/kerberos/kerb/client/KrbConfigLoadForSpecialsTest.java +++ b/kerby-kerb/kerb-client/src/test/java/org/apache/kerby/kerberos/kerb/client/KrbConfigLoadForSpecialsTest.java @@ -19,7 +19,7 @@ */ package org.apache.kerby.kerberos.kerb.client; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.net.URL; diff --git a/kerby-kerb/kerb-client/src/test/java/org/apache/kerby/kerberos/kerb/client/KrbConfigLoadTest.java b/kerby-kerb/kerb-client/src/test/java/org/apache/kerby/kerberos/kerb/client/KrbConfigLoadTest.java index 881c746ae..342b51b89 100644 --- a/kerby-kerb/kerb-client/src/test/java/org/apache/kerby/kerberos/kerb/client/KrbConfigLoadTest.java +++ b/kerby-kerb/kerb-client/src/test/java/org/apache/kerby/kerberos/kerb/client/KrbConfigLoadTest.java @@ -20,7 +20,7 @@ package org.apache.kerby.kerberos.kerb.client; import org.apache.kerby.kerberos.kerb.type.base.EncryptionType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.net.URL; diff --git a/kerby-kerb/kerb-common/pom.xml b/kerby-kerb/kerb-common/pom.xml index db7779902..4fa13e1a0 100644 --- a/kerby-kerb/kerb-common/pom.xml +++ b/kerby-kerb/kerb-common/pom.xml @@ -41,8 +41,8 @@ compile - junit - junit + org.junit.jupiter + junit-jupiter-engine org.assertj diff --git a/kerby-kerb/kerb-common/src/test/java/org/apache/kerby/kerberos/kerb/CryptoTest.java b/kerby-kerb/kerb-common/src/test/java/org/apache/kerby/kerberos/kerb/CryptoTest.java index af6d7a245..99716a3c4 100644 --- a/kerby-kerb/kerb-common/src/test/java/org/apache/kerby/kerberos/kerb/CryptoTest.java +++ b/kerby-kerb/kerb-common/src/test/java/org/apache/kerby/kerberos/kerb/CryptoTest.java @@ -31,8 +31,8 @@ import java.util.List; import org.apache.kerby.kerberos.kerb.preauth.pkinit.CertificateHelper; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class CryptoTest { @@ -40,23 +40,23 @@ public class CryptoTest { public void testCertificateLoading() throws Exception { // Load cert List certs = CertificateHelper.loadCerts("kdccerttest.pem"); - Assert.assertEquals(1, certs.size()); + Assertions.assertEquals(1, certs.size()); // Now convert to a Kerby Certificate type org.apache.kerby.x509.type.Certificate certificate = new org.apache.kerby.x509.type.Certificate(); byte[] encodedBytes = certs.get(0).getEncoded(); certificate.decode(encodedBytes); - Assert.assertNotNull(certificate); + Assertions.assertNotNull(certificate); // Now convert back to an X.509 Certificate byte[] certBytes = certificate.encode(); // Test for equality - Assert.assertArrayEquals(certBytes, encodedBytes); + Assertions.assertArrayEquals(certBytes, encodedBytes); // Convert back into an X.509 Certificate List certs2 = CertificateHelper.loadCerts(new java.io.ByteArrayInputStream(certBytes)); - Assert.assertEquals(1, certs2.size()); + Assertions.assertEquals(1, certs2.size()); // Now validate the certificate chain diff --git a/kerby-kerb/kerb-common/src/test/java/org/apache/kerby/kerberos/kerb/Krb5ParserTest.java b/kerby-kerb/kerb-common/src/test/java/org/apache/kerby/kerberos/kerb/Krb5ParserTest.java index 0bfba1595..712d979e0 100644 --- a/kerby-kerb/kerb-common/src/test/java/org/apache/kerby/kerberos/kerb/Krb5ParserTest.java +++ b/kerby-kerb/kerb-common/src/test/java/org/apache/kerby/kerberos/kerb/Krb5ParserTest.java @@ -20,7 +20,7 @@ package org.apache.kerby.kerberos.kerb; import org.apache.kerby.kerberos.kerb.common.Krb5Parser; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.IOException; diff --git a/kerby-kerb/kerb-core/pom.xml b/kerby-kerb/kerb-core/pom.xml index f6bb4a8e0..52d75ec6d 100644 --- a/kerby-kerb/kerb-core/pom.xml +++ b/kerby-kerb/kerb-core/pom.xml @@ -32,8 +32,8 @@ kerby-pkix - junit - junit + org.junit.jupiter + junit-jupiter-engine org.assertj diff --git a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/ADTest.java b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/ADTest.java index 21cb16f6e..f25f39f6f 100644 --- a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/ADTest.java +++ b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/ADTest.java @@ -19,7 +19,7 @@ */ package org.apache.kerby.kerberos.kerb.codec; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; @@ -30,7 +30,7 @@ import org.apache.kerby.kerberos.kerb.type.ad.AuthorizationDataEntry; import org.apache.kerby.kerberos.kerb.type.ad.AuthorizationDataWrapper; import org.apache.kerby.kerberos.kerb.type.ad.AuthorizationDataWrapper.WrapperType; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test class for Authorization data codec. diff --git a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/AsRepCodecTest.java b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/AsRepCodecTest.java index fcf131abc..95d8078c5 100644 --- a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/AsRepCodecTest.java +++ b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/AsRepCodecTest.java @@ -24,7 +24,7 @@ import org.apache.kerby.kerberos.kerb.type.base.PrincipalName; import org.apache.kerby.kerberos.kerb.type.kdc.AsRep; import org.apache.kerby.kerberos.kerb.type.ticket.Ticket; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/AsReqCodecTest.java b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/AsReqCodecTest.java index 182ab9036..174dab68f 100644 --- a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/AsReqCodecTest.java +++ b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/AsReqCodecTest.java @@ -31,7 +31,7 @@ import org.apache.kerby.kerberos.kerb.type.pa.PaData; import org.apache.kerby.kerberos.kerb.type.pa.PaDataEntry; import org.apache.kerby.kerberos.kerb.type.pa.PaDataType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/CodecTest.java b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/CodecTest.java index df77c88c1..8213e236d 100644 --- a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/CodecTest.java +++ b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/CodecTest.java @@ -23,7 +23,7 @@ import org.apache.kerby.kerberos.kerb.KrbException; import org.apache.kerby.kerberos.kerb.type.base.CheckSum; import org.apache.kerby.kerberos.kerb.type.base.CheckSumType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/KerberosTimeTest.java b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/KerberosTimeTest.java index 5732d57fa..1c891c975 100644 --- a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/KerberosTimeTest.java +++ b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/KerberosTimeTest.java @@ -19,12 +19,12 @@ */ package org.apache.kerby.kerberos.kerb.codec; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.kerby.kerberos.kerb.type.KerberosTime; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Testing the KerberosTime class diff --git a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/PaPkAsRepTest.java b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/PaPkAsRepTest.java index a35485e86..e693e3e4a 100644 --- a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/PaPkAsRepTest.java +++ b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/PaPkAsRepTest.java @@ -25,7 +25,7 @@ import org.apache.kerby.kerberos.kerb.KrbException; import org.apache.kerby.kerberos.kerb.type.pa.pkinit.DhRepInfo; import org.apache.kerby.kerberos.kerb.type.pa.pkinit.PaPkAsRep; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/PkinitAnonymousAsRepCodecTest.java b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/PkinitAnonymousAsRepCodecTest.java index c2a46dc11..353b7af45 100644 --- a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/PkinitAnonymousAsRepCodecTest.java +++ b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/PkinitAnonymousAsRepCodecTest.java @@ -35,7 +35,7 @@ import org.apache.kerby.kerberos.kerb.type.pa.pkinit.KdcDhKeyInfo; import org.apache.kerby.kerberos.kerb.type.pa.pkinit.PaPkAsRep; import org.apache.kerby.kerberos.kerb.type.ticket.Ticket; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/PkinitAnonymousAsReqCodecTest.java b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/PkinitAnonymousAsReqCodecTest.java index 7138ca051..1eb739611 100644 --- a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/PkinitAnonymousAsReqCodecTest.java +++ b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/PkinitAnonymousAsReqCodecTest.java @@ -38,7 +38,7 @@ import org.apache.kerby.kerberos.kerb.type.pa.pkinit.PaPkAsReq; import org.apache.kerby.x509.type.DhParameter; import org.apache.kerby.x509.type.SubjectPublicKeyInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.math.BigInteger; diff --git a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/PkinitRsaAsRepCodecTest.java b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/PkinitRsaAsRepCodecTest.java index 6590d9ca0..7f9f6ca93 100644 --- a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/PkinitRsaAsRepCodecTest.java +++ b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/PkinitRsaAsRepCodecTest.java @@ -28,7 +28,7 @@ import org.apache.kerby.kerberos.kerb.type.pa.PaDataEntry; import org.apache.kerby.kerberos.kerb.type.pa.PaDataType; import org.apache.kerby.kerberos.kerb.type.pa.pkinit.PaPkAsRep; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/PkinitRsaAsReqCodecTest.java b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/PkinitRsaAsReqCodecTest.java index 10666f57c..5775d9291 100644 --- a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/PkinitRsaAsReqCodecTest.java +++ b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/PkinitRsaAsReqCodecTest.java @@ -32,7 +32,7 @@ import org.apache.kerby.kerberos.kerb.type.pa.PaDataEntry; import org.apache.kerby.kerberos.kerb.type.pa.PaDataType; import org.apache.kerby.kerberos.kerb.type.pa.pkinit.PaPkAsReq; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/TgsRepCodecTest.java b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/TgsRepCodecTest.java index 4e618d56a..34233e91e 100644 --- a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/TgsRepCodecTest.java +++ b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/TgsRepCodecTest.java @@ -24,7 +24,7 @@ import org.apache.kerby.kerberos.kerb.type.base.PrincipalName; import org.apache.kerby.kerberos.kerb.type.kdc.TgsRep; import org.apache.kerby.kerberos.kerb.type.ticket.Ticket; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/TgsReqCodecTest.java b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/TgsReqCodecTest.java index 902e6dd1c..2b062390d 100644 --- a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/TgsReqCodecTest.java +++ b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/TgsReqCodecTest.java @@ -28,7 +28,7 @@ import org.apache.kerby.kerberos.kerb.type.pa.PaData; import org.apache.kerby.kerberos.kerb.type.pa.PaDataEntry; import org.apache.kerby.kerberos.kerb.type.pa.PaDataType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.text.ParseException; diff --git a/kerby-kerb/kerb-crypto/pom.xml b/kerby-kerb/kerb-crypto/pom.xml index f53e9b54c..14b2f243b 100644 --- a/kerby-kerb/kerb-crypto/pom.xml +++ b/kerby-kerb/kerb-crypto/pom.xml @@ -36,8 +36,8 @@ kerb-core - junit - junit + org.junit.jupiter + junit-jupiter-engine org.assertj diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CamelliaEncTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CamelliaEncTest.java index a07f17923..d4e250e20 100644 --- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CamelliaEncTest.java +++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CamelliaEncTest.java @@ -24,7 +24,7 @@ import org.apache.kerby.kerberos.kerb.crypto.enc.provider.Camellia128Provider; import org.apache.kerby.kerberos.kerb.crypto.enc.provider.Camellia256Provider; import org.apache.kerby.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.BufferedReader; import java.io.IOException; diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumTest.java index a57e887db..f0d0560a0 100644 --- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumTest.java +++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumTest.java @@ -25,7 +25,7 @@ import org.apache.kerby.kerberos.kerb.type.base.EncryptionType; import org.apache.kerby.kerberos.kerb.type.base.KeyUsage; import org.apache.kerby.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.fail; diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumsTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumsTest.java index ef25663ea..8bf093d5d 100644 --- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumsTest.java +++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumsTest.java @@ -25,10 +25,10 @@ import org.apache.kerby.kerberos.kerb.type.base.KeyUsage; import org.apache.kerby.util.CryptoUtil; import org.apache.kerby.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.fail; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Ref. t_cksums.c in MIT krb5 project. diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CmacTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CmacTest.java index 35dd3896d..c7ef33804 100644 --- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CmacTest.java +++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CmacTest.java @@ -24,7 +24,7 @@ import org.apache.kerby.kerberos.kerb.crypto.enc.provider.Camellia128Provider; import org.apache.kerby.kerberos.kerb.crypto.util.Cmac; import org.apache.kerby.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/Crc32Test.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/Crc32Test.java index 841f1e568..b2af6753b 100644 --- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/Crc32Test.java +++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/Crc32Test.java @@ -21,7 +21,7 @@ import org.apache.kerby.kerberos.kerb.crypto.util.Crc32; import org.apache.kerby.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DecryptionTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DecryptionTest.java index 52e0129e4..4c9651292 100644 --- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DecryptionTest.java +++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DecryptionTest.java @@ -24,11 +24,11 @@ import org.apache.kerby.kerberos.kerb.type.base.KeyUsage; import org.apache.kerby.util.CryptoUtil; import org.apache.kerby.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Ref. t_decrypt.c test in MIT krb5 project. diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DesKeyMakerTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DesKeyMakerTest.java index ac5492730..77ce7131b 100644 --- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DesKeyMakerTest.java +++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DesKeyMakerTest.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * This is just for my experimental tweaking, so pleas bear it. @@ -76,7 +76,7 @@ private void test(TestCase tc) { * This is just for my experimental tweaking, so pleas bear it. */ @Test - @org.junit.Ignore + @org.junit.jupiter.api.Disabled public void testCase1() { TestCase tc = new TestCase("ATHENA.MIT.EDUraeburn", "password", "70617373776f7264415448454e412e4d49542e4544557261656275726e", diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/FastUtilTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/FastUtilTest.java index 7b18ec923..df44e9cc4 100644 --- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/FastUtilTest.java +++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/FastUtilTest.java @@ -24,12 +24,12 @@ import org.apache.kerby.kerberos.kerb.type.base.EncryptionType; import org.apache.kerby.util.CryptoUtil; import org.apache.kerby.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import static org.assertj.core.api.Assertions.fail; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Ref. fast util test codes in MIT krb5 project. diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/KeyDeriveTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/KeyDeriveTest.java index 1fcb242a6..b9409237b 100644 --- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/KeyDeriveTest.java +++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/KeyDeriveTest.java @@ -31,12 +31,12 @@ import org.apache.kerby.kerberos.kerb.type.base.EncryptionType; import org.apache.kerby.util.CryptoUtil; import org.apache.kerby.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import static org.assertj.core.api.Assertions.fail; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Ref. t_derive.c test in MIT krb5 project. diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/PrfTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/PrfTest.java index 833dd912b..560603c03 100644 --- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/PrfTest.java +++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/PrfTest.java @@ -22,12 +22,12 @@ import org.apache.kerby.kerberos.kerb.type.base.EncryptionType; import org.apache.kerby.util.CryptoUtil; import org.apache.kerby.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import static org.assertj.core.api.Assertions.fail; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Ref. t_prf.c test in MIT krb5 project. diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/String2keyTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/String2keyTest.java index e9871ef61..edace24ec 100644 --- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/String2keyTest.java +++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/String2keyTest.java @@ -23,14 +23,14 @@ import org.apache.kerby.kerberos.kerb.type.base.EncryptionType; import org.apache.kerby.util.CryptoUtil; import org.apache.kerby.util.HexUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; import java.util.Arrays; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * By ref. MIT krb5 t_str2key.c and RFC3961 test vectors diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/dh/DhGroupTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/dh/DhGroupTest.java index 11b396545..42289d06f 100644 --- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/dh/DhGroupTest.java +++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/dh/DhGroupTest.java @@ -19,7 +19,7 @@ */ package org.apache.kerby.kerberos.kerb.crypto.dh; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * "When using the Diffie-Hellman key agreement method, implementations MUST @@ -30,7 +30,7 @@ * @author Apache Directory Project * @version $Rev$, $Date$ */ -public class DhGroupTest extends org.junit.Assert { +public class DhGroupTest extends org.junit.jupiter.api.Assertions { /** * Tests that the translation of the hex representation of the prime modulus * resulted in the expected bit length. diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/dh/DhKeyAgreementTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/dh/DhKeyAgreementTest.java index a9cae2bab..65153f0af 100644 --- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/dh/DhKeyAgreementTest.java +++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/dh/DhKeyAgreementTest.java @@ -22,8 +22,8 @@ import org.apache.kerby.kerberos.kerb.type.base.EncryptionType; import org.apache.kerby.kerberos.kerb.type.base.KeyUsage; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import javax.crypto.interfaces.DHPublicKey; import javax.crypto.spec.DHParameterSpec; @@ -75,7 +75,7 @@ public void testPreGeneratedDhParams() throws Exception { byte[] cipherText = server.encrypt(clearText, KeyUsage.UNKNOWN); byte[] recovered = client.decrypt(cipherText, KeyUsage.UNKNOWN); - Assert.assertTrue(Arrays.equals(clearText, recovered)); + Assertions.assertTrue(Arrays.equals(clearText, recovered)); } @@ -113,7 +113,7 @@ public void testPreGeneratedDhParamsWithNonce() throws Exception { byte[] cipherText = server.encrypt(clearText, KeyUsage.UNKNOWN); byte[] recovered = client.decrypt(cipherText, KeyUsage.UNKNOWN); - Assert.assertTrue(Arrays.equals(clearText, recovered)); + Assertions.assertTrue(Arrays.equals(clearText, recovered)); } @Test @@ -145,6 +145,6 @@ public void testGeneratedDhParams() throws Exception { byte[] cipherText = server.encrypt(clearText, KeyUsage.UNKNOWN); byte[] recovered = client.decrypt(cipherText, KeyUsage.UNKNOWN); - Assert.assertTrue(Arrays.equals(clearText, recovered)); + Assertions.assertTrue(Arrays.equals(clearText, recovered)); } } diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/dh/OctetString2KeyTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/dh/OctetString2KeyTest.java index d47996dc7..c0f0ff0b3 100644 --- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/dh/OctetString2KeyTest.java +++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/dh/OctetString2KeyTest.java @@ -21,7 +21,7 @@ import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** @@ -35,7 +35,7 @@ * @author Apache Directory Project * @version $Rev$, $Date$ */ -public class OctetString2KeyTest extends org.junit.Assert { +public class OctetString2KeyTest extends org.junit.jupiter.api.Assertions { /** * Set 1: * ===== diff --git a/kerby-kerb/kerb-identity-test/pom.xml b/kerby-kerb/kerb-identity-test/pom.xml index aefa7b37c..711e19cc4 100644 --- a/kerby-kerb/kerb-identity-test/pom.xml +++ b/kerby-kerb/kerb-identity-test/pom.xml @@ -49,8 +49,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter-engine ${junit.version} compile diff --git a/kerby-kerb/kerb-identity-test/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/BackendTestBase.java b/kerby-kerb/kerb-identity-test/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/BackendTestBase.java index 28f3a2d1e..05d45e8fc 100644 --- a/kerby-kerb/kerb-identity-test/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/BackendTestBase.java +++ b/kerby-kerb/kerb-identity-test/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/BackendTestBase.java @@ -20,9 +20,9 @@ package org.apache.kerby.kerberos.kerb.identity.backend; import org.apache.kerby.kerberos.kerb.KrbException; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** * Json backend test @@ -34,7 +34,7 @@ public abstract class BackendTestBase extends BackendTest { * Create and prepare an identity backend for the tests. Must override. * @throws Exception e */ - @BeforeClass + @BeforeAll public static void setup() throws Exception { backend = null; } @@ -64,7 +64,7 @@ public void testGetIdentities() throws KrbException { testGetIdentities(backend); } - @AfterClass + @AfterAll public static void tearDown() throws KrbException { if (backend != null) { backend.stop(); diff --git a/kerby-kerb/kerb-kdc-test/pom.xml b/kerby-kerb/kerb-kdc-test/pom.xml index 10dd16a29..78bab003c 100644 --- a/kerby-kerb/kerb-kdc-test/pom.xml +++ b/kerby-kerb/kerb-kdc-test/pom.xml @@ -63,8 +63,8 @@ test - junit - junit + org.junit.jupiter + junit-jupiter-engine org.assertj diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/ApRequestTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/ApRequestTest.java index ec07d9316..407dc9674 100644 --- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/ApRequestTest.java +++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/ApRequestTest.java @@ -29,8 +29,8 @@ import org.apache.kerby.kerberos.kerb.type.base.PrincipalName; import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket; import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; @@ -53,7 +53,7 @@ public void test() throws IOException, KrbException { tkt = getKrbClient().requestSgt(tgt, getServerPrincipal()); assertThat(tkt).isNotNull(); } catch (Exception e) { - Assert.fail("Exception occurred with good password. " + Assertions.fail("Exception occurred with good password. " + e.toString()); } diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/BadCredentialsTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/BadCredentialsTest.java index e741f4cce..d41058a6f 100644 --- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/BadCredentialsTest.java +++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/BadCredentialsTest.java @@ -22,8 +22,8 @@ import org.apache.kerby.kerberos.kerb.KrbErrorCode; import org.apache.kerby.kerberos.kerb.KrbException; import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * Send some unknown principals, bad passwords etc. to the KDC to check that it is handled correctly. @@ -36,7 +36,7 @@ public void testUnknownClientPrincipal() { try { getKrbClient().requestTgt(principal, getClientPassword()); } catch (KrbException ex) { - Assert.assertEquals(KrbErrorCode.KDC_ERR_C_PRINCIPAL_UNKNOWN, ex.getKrbErrorCode()); + Assertions.assertEquals(KrbErrorCode.KDC_ERR_C_PRINCIPAL_UNKNOWN, ex.getKrbErrorCode()); } } @@ -45,7 +45,7 @@ public void testUnknownClientPassword() { try { getKrbClient().requestTgt(getClientPrincipal(), "badpass"); } catch (KrbException ex) { - Assert.assertEquals(KrbErrorCode.KRB_AP_ERR_BAD_INTEGRITY, ex.getKrbErrorCode()); + Assertions.assertEquals(KrbErrorCode.KRB_AP_ERR_BAD_INTEGRITY, ex.getKrbErrorCode()); } } @@ -58,7 +58,7 @@ public void testUnknownServicePrincipal() { String serverPrincipal = "unknown/" + getHostname() + "@" + TestKdcServer.KDC_REALM; getKrbClient().requestSgt(tgtTicket, serverPrincipal); } catch (KrbException ex) { - Assert.assertEquals(KrbErrorCode.KDC_ERR_S_PRINCIPAL_UNKNOWN, ex.getKrbErrorCode()); + Assertions.assertEquals(KrbErrorCode.KDC_ERR_S_PRINCIPAL_UNKNOWN, ex.getKrbErrorCode()); } } diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/CacheFileTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/CacheFileTest.java index d73d959b4..4cd6ede81 100644 --- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/CacheFileTest.java +++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/CacheFileTest.java @@ -25,7 +25,7 @@ import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket; import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CacheFileTest extends KdcTestBase { diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/GssInteropTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/GssInteropTest.java index 4787dac56..70940001e 100644 --- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/GssInteropTest.java +++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/GssInteropTest.java @@ -32,8 +32,8 @@ import org.ietf.jgss.GSSManager; import org.ietf.jgss.GSSName; import org.ietf.jgss.Oid; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * This is an interop test using the Java GSS APIs against the Kerby KDC @@ -44,14 +44,14 @@ public class GssInteropTest extends LoginTestBase { public void testGss() throws Exception { Subject clientSubject = loginClientUsingTicketCache(); Set clientPrincipals = clientSubject.getPrincipals(); - Assert.assertFalse(clientPrincipals.isEmpty()); + Assertions.assertFalse(clientPrincipals.isEmpty()); // Get the TGT Set privateCredentials = clientSubject.getPrivateCredentials(KerberosTicket.class); - Assert.assertFalse(privateCredentials.isEmpty()); + Assertions.assertFalse(privateCredentials.isEmpty()); KerberosTicket tgt = privateCredentials.iterator().next(); - Assert.assertNotNull(tgt); + Assertions.assertNotNull(tgt); // Get the service ticket KerberosClientExceptionAction action = @@ -59,7 +59,7 @@ public void testGss() throws Exception { getServerPrincipal()); byte[] kerberosToken = (byte[]) Subject.doAs(clientSubject, action); - Assert.assertNotNull(kerberosToken); + Assertions.assertNotNull(kerberosToken); validateServiceTicket(kerberosToken); } @@ -67,7 +67,7 @@ public void testGss() throws Exception { private void validateServiceTicket(byte[] ticket) throws Exception { Subject serviceSubject = loginServiceUsingKeytab(); Set servicePrincipals = serviceSubject.getPrincipals(); - Assert.assertFalse(servicePrincipals.isEmpty()); + Assertions.assertFalse(servicePrincipals.isEmpty()); // Handle the service ticket KerberosServiceExceptionAction serviceAction = diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcSettingTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcSettingTest.java index a48a20e1c..9b2f3f0d2 100644 --- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcSettingTest.java +++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcSettingTest.java @@ -20,7 +20,7 @@ package org.apache.kerby.kerberos.kerb.server; import org.apache.kerby.kerberos.kerb.KrbException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTest.java index 7f23c3bdd..11ff000c1 100644 --- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTest.java +++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTest.java @@ -21,7 +21,7 @@ import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket; import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import static org.assertj.core.api.Assertions.assertThat; @@ -39,7 +39,7 @@ protected void performKdcTest() throws Exception { tkt = getKrbClient().requestSgt(tgt, getServerPrincipal()); assertThat(tkt).isNotNull(); } catch (Exception e) { - Assert.fail("Exception occurred with good password. " + Assertions.fail("Exception occurred with good password. " + e.toString()); } } diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTestBase.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTestBase.java index 547db27cf..fb36789c8 100644 --- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTestBase.java +++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcTestBase.java @@ -23,10 +23,10 @@ import org.apache.kerby.kerberos.kerb.client.KrbClient; import org.apache.kerby.kerberos.kerb.client.KrbPkinitClient; import org.apache.kerby.kerberos.kerb.client.KrbTokenClient; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import java.io.File; import java.io.IOException; @@ -57,7 +57,7 @@ public KdcTestBase() { serverPrincipalName + "/" + hostname + "@" + TestKdcServer.KDC_REALM; } - @BeforeClass + @BeforeAll public static void createTestDir() throws IOException { String basedir = System.getProperty("basedir"); if (basedir == null) { @@ -68,7 +68,7 @@ public static void createTestDir() throws IOException { testDir.mkdirs(); } - @AfterClass + @AfterAll public static void deleteTestDir() throws IOException { testDir.delete(); } @@ -133,7 +133,7 @@ protected boolean allowTcp() { return true; } - @Before + @BeforeEach public void setUp() throws Exception { setUpKdcServer(); @@ -174,7 +174,7 @@ protected void deletePrincipals() throws KrbException { kdcServer.deletePrincipal(clientPrincipal); } - @After + @AfterEach public void tearDown() throws Exception { deletePrincipals(); kdcServer.stop(); diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KeytabArcFourMd5LoginTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KeytabArcFourMd5LoginTest.java index dd05de1b9..874c48b3e 100644 --- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KeytabArcFourMd5LoginTest.java +++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KeytabArcFourMd5LoginTest.java @@ -30,7 +30,7 @@ import org.apache.kerby.kerberos.kerb.identity.backend.BackendConfig; import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket; import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class KeytabArcFourMd5LoginTest extends LoginTestBase { diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KeytabLoginTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KeytabLoginTest.java index 3210e8b03..65bdb19b3 100644 --- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KeytabLoginTest.java +++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/KeytabLoginTest.java @@ -19,7 +19,7 @@ */ package org.apache.kerby.kerberos.kerb.server; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class KeytabLoginTest extends LoginTestBase { diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/LoginTestBase.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/LoginTestBase.java index 1f83d572f..418c5093a 100644 --- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/LoginTestBase.java +++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/LoginTestBase.java @@ -21,8 +21,8 @@ import org.apache.kerby.kerberos.kerb.client.JaasKrbUtil; import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import javax.security.auth.Subject; import javax.security.auth.login.LoginException; @@ -38,7 +38,7 @@ public class LoginTestBase extends KdcTestBase { protected File ticketCacheFile; protected File serviceKeytabFile; - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); @@ -72,7 +72,7 @@ protected void checkSubject(Subject subject) { assertThat(clientPrincipals).isNotEmpty(); } - @After + @AfterEach @Override public void tearDown() throws Exception { ticketCacheFile.delete(); diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/MultiRequestsKdcTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/MultiRequestsKdcTest.java index e924099e1..ec90c9462 100644 --- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/MultiRequestsKdcTest.java +++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/MultiRequestsKdcTest.java @@ -21,8 +21,8 @@ import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket; import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -43,7 +43,7 @@ public void multiRequestsTest() throws Exception { tkt = getKrbClient().requestSgt(tgt, serverPrincipal); assertThat(tkt).isNotNull(); } catch (Exception e) { - Assert.fail("Exception occurred with good password. " + Assertions.fail("Exception occurred with good password. " + e.toString()); } @@ -63,7 +63,7 @@ public void multiRequestsTest() throws Exception { tkt = getKrbClient().requestSgt(tgt, serverPrincipal); assertThat(tkt).isNotNull(); } catch (Exception e) { - Assert.fail("Exception occurred with good password again. " + Assertions.fail("Exception occurred with good password again. " + e.toString()); } } diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/OnlyTcpKdcTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/OnlyTcpKdcTest.java index 57f1f8dda..28533550a 100644 --- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/OnlyTcpKdcTest.java +++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/OnlyTcpKdcTest.java @@ -19,7 +19,7 @@ */ package org.apache.kerby.kerberos.kerb.server; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class OnlyTcpKdcTest extends KdcTest { diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/OnlyUdpKdcTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/OnlyUdpKdcTest.java index 4cbcb2a56..8d40f089a 100644 --- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/OnlyUdpKdcTest.java +++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/OnlyUdpKdcTest.java @@ -19,7 +19,7 @@ */ package org.apache.kerby.kerberos.kerb.server; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class OnlyUdpKdcTest extends KdcTest { diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/PasswordLoginTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/PasswordLoginTest.java index 8eb00d3cb..8c49c503d 100644 --- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/PasswordLoginTest.java +++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/PasswordLoginTest.java @@ -19,7 +19,7 @@ */ package org.apache.kerby.kerberos.kerb.server; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PasswordLoginTest extends LoginTestBase { diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/PreAuthNotRequiredTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/PreAuthNotRequiredTest.java index bf534583d..bc230379c 100644 --- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/PreAuthNotRequiredTest.java +++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/PreAuthNotRequiredTest.java @@ -30,7 +30,7 @@ import org.apache.kerby.kerberos.kerb.identity.backend.BackendConfig; import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket; import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test client connection when pre-auth is not required by the AS diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/PrincipalNameTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/PrincipalNameTest.java index 552d52f63..bc873c7f1 100644 --- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/PrincipalNameTest.java +++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/PrincipalNameTest.java @@ -25,7 +25,7 @@ import org.apache.kerby.kerberos.kerb.KrbException; import org.apache.kerby.kerberos.kerb.client.KrbOption; import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -44,7 +44,7 @@ public void testNTPrincipal() throws IOException, KrbException { } @Test - @org.junit.Ignore // See https://issues.apache.org/jira/browse/DIRKRB-659 + @org.junit.jupiter.api.Disabled // See https://issues.apache.org/jira/browse/DIRKRB-659 public void testNTEnterprisePrincipal() throws IOException, KrbException { KOptions options = new KOptions(); diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/RepeatLoginWithDefaultKdcNetworkTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/RepeatLoginWithDefaultKdcNetworkTest.java index 8ce8e710c..a95140bc1 100644 --- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/RepeatLoginWithDefaultKdcNetworkTest.java +++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/RepeatLoginWithDefaultKdcNetworkTest.java @@ -19,7 +19,7 @@ */ package org.apache.kerby.kerberos.kerb.server; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class RepeatLoginWithDefaultKdcNetworkTest extends LoginTestBase { @Test diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/RepeatLoginWithNettyKdcNetworkTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/RepeatLoginWithNettyKdcNetworkTest.java index e82db7b53..13100c0f4 100644 --- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/RepeatLoginWithNettyKdcNetworkTest.java +++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/RepeatLoginWithNettyKdcNetworkTest.java @@ -21,7 +21,7 @@ import org.apache.kerby.kerberos.kdc.impl.NettyKdcServerImpl; import org.apache.kerby.kerberos.kerb.KrbException; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class RepeatLoginWithNettyKdcNetworkTest extends LoginTestBase { @Override diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/TcpAndUdpKdcTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/TcpAndUdpKdcTest.java index 2e25fbbe9..88c7055d6 100644 --- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/TcpAndUdpKdcTest.java +++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/TcpAndUdpKdcTest.java @@ -19,7 +19,7 @@ */ package org.apache.kerby.kerberos.kerb.server; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TcpAndUdpKdcTest extends KdcTest { diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/TicketCacheLoginTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/TicketCacheLoginTest.java index 0da370593..b779af438 100644 --- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/TicketCacheLoginTest.java +++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/TicketCacheLoginTest.java @@ -19,7 +19,7 @@ */ package org.apache.kerby.kerberos.kerb.server; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TicketCacheLoginTest extends LoginTestBase { diff --git a/kerby-kerb/kerb-server/pom.xml b/kerby-kerb/kerb-server/pom.xml index 7594887c7..17de85c7c 100644 --- a/kerby-kerb/kerb-server/pom.xml +++ b/kerby-kerb/kerb-server/pom.xml @@ -42,8 +42,8 @@ test - junit - junit + org.junit.jupiter + junit-jupiter-engine org.assertj diff --git a/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcConfigLoadTest.java b/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcConfigLoadTest.java index 94919a7fe..d343117b2 100644 --- a/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcConfigLoadTest.java +++ b/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcConfigLoadTest.java @@ -19,7 +19,7 @@ */ package org.apache.kerby.kerberos.kerb.server; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.IOException; diff --git a/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcServerTest.java b/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcServerTest.java index 84755a421..d9e63a418 100644 --- a/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcServerTest.java +++ b/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcServerTest.java @@ -20,10 +20,10 @@ package org.apache.kerby.kerberos.kerb.server; import org.apache.kerby.util.NetworkUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.InetSocketAddress; @@ -36,7 +36,7 @@ public class KdcServerTest { private KdcServer kdcServer; - @Before + @BeforeEach public void setUp() throws Exception { kdcServer = new KdcServer(); kdcServer.setKdcHost(serverHost); @@ -57,11 +57,11 @@ public void testKdc() throws IOException, InterruptedException { SocketAddress sa = new InetSocketAddress(serverHost, serverPort); socketChannel.connect(sa); - Assert.assertTrue(socketChannel.isConnected()); + Assertions.assertTrue(socketChannel.isConnected()); } } - @After + @AfterEach public void tearDown() throws Exception { kdcServer.stop(); } diff --git a/kerby-kerb/kerb-simplekdc/pom.xml b/kerby-kerb/kerb-simplekdc/pom.xml index 113d67c41..b14edb96f 100644 --- a/kerby-kerb/kerb-simplekdc/pom.xml +++ b/kerby-kerb/kerb-simplekdc/pom.xml @@ -36,8 +36,8 @@ kerb-admin - junit - junit + org.junit.jupiter + junit-jupiter-engine diff --git a/kerby-kerb/kerb-simplekdc/src/test/java/org/apache/kerby/kerberos/kerb/SimpleKdcServerTest.java b/kerby-kerb/kerb-simplekdc/src/test/java/org/apache/kerby/kerberos/kerb/SimpleKdcServerTest.java index b4f21aa84..ae86d421d 100644 --- a/kerby-kerb/kerb-simplekdc/src/test/java/org/apache/kerby/kerberos/kerb/SimpleKdcServerTest.java +++ b/kerby-kerb/kerb-simplekdc/src/test/java/org/apache/kerby/kerberos/kerb/SimpleKdcServerTest.java @@ -22,9 +22,9 @@ import org.apache.kerby.kerberos.kerb.server.KdcServer; import org.apache.kerby.kerberos.kerb.server.SimpleKdcServer; import org.apache.kerby.util.NetworkUtil; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.InetSocketAddress; @@ -38,7 +38,7 @@ public class SimpleKdcServerTest { private KdcServer kdcServer; - @Before + @BeforeEach public void setUp() throws Exception { kdcServer = new SimpleKdcServer(); kdcServer.setKdcHost(serverHost); @@ -69,7 +69,7 @@ public void testKdc() throws IOException, InterruptedException { } } - @After + @AfterEach public void tearDown() throws Exception { kdcServer.stop(); } diff --git a/kerby-kerb/kerb-util/pom.xml b/kerby-kerb/kerb-util/pom.xml index 076ccae2e..12463463b 100644 --- a/kerby-kerb/kerb-util/pom.xml +++ b/kerby-kerb/kerb-util/pom.xml @@ -46,8 +46,8 @@ test - junit - junit + org.junit.jupiter + junit-jupiter-engine org.assertj diff --git a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/keytab/KeytabEntryTest.java b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/keytab/KeytabEntryTest.java index 4ced37200..969686082 100644 --- a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/keytab/KeytabEntryTest.java +++ b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/keytab/KeytabEntryTest.java @@ -20,47 +20,46 @@ package org.apache.kerby.kerberos.kerb.keytab; import org.apache.kerby.kerberos.kerb.type.KerberosTime; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.assertj.core.api.Assumptions; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.invocation.InvocationOnMock; -import org.mockito.junit.MockitoJUnitRunner; import org.mockito.stubbing.Answer; import java.io.ByteArrayInputStream; -import java.io.IOException; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; -@RunWith(MockitoJUnitRunner.class) public class KeytabEntryTest { - @Test(expected = IOException.class) + @Test public void exceptionThrownWhenLoadingInvalidKeytabEntry() throws Exception { + KeytabInputStream mockKeytabInputStream = spy( new KeytabInputStream( new ByteArrayInputStream(new String("randomtestarray").getBytes()))); - doAnswer(new Answer() { - private boolean isFirstCall = true; + private boolean isFirstCall = true; - @Override - public Integer answer(InvocationOnMock invocationOnMock) throws Throwable { - if (isFirstCall) { - isFirstCall = false; - return 200; - } - return 20; - } - }).when(mockKeytabInputStream).available(); + @Override + public Integer answer(InvocationOnMock invocationOnMock) throws Throwable { + if (isFirstCall) { + isFirstCall = false; + return 200; + } + return 20; + } + }).when(mockKeytabInputStream).available(); //doReturn(120).when(mockKeytabInputStream).readOctetsCount(); doReturn(new byte[]{}).when(mockKeytabInputStream).readCountedOctets(); doReturn(null).when(mockKeytabInputStream).readPrincipal(ArgumentMatchers.any(Integer.class)); doReturn(new KerberosTime()).when(mockKeytabInputStream).readTime(); KeytabEntry keytabEntry = new KeytabEntry(); - keytabEntry.load(mockKeytabInputStream, 0x502, 100); + Assumptions.assumeThatIOException().isThrownBy(() -> { + keytabEntry.load(mockKeytabInputStream, 0x502, 100); + }); } diff --git a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/CcacheTest.java b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/CcacheTest.java index 32fbf1769..6f57acfc4 100644 --- a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/CcacheTest.java +++ b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/CcacheTest.java @@ -21,8 +21,8 @@ import org.apache.kerby.kerberos.kerb.ccache.CredentialCache; import org.apache.kerby.kerberos.kerb.type.base.PrincipalName; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.InputStream; @@ -40,7 +40,7 @@ public class CcacheTest { private CredentialCache cc; - @Before + @BeforeEach public void setUp() throws IOException { try (InputStream cis = CcacheTest.class.getResourceAsStream("/test.cc")) { cc = new CredentialCache(); diff --git a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/EncryptionTest.java b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/EncryptionTest.java index 8a3ea96cb..9f5e20141 100644 --- a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/EncryptionTest.java +++ b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/EncryptionTest.java @@ -32,8 +32,8 @@ import org.apache.kerby.kerberos.kerb.type.ticket.EncTicketPart; import org.apache.kerby.kerberos.kerb.type.ticket.Ticket; import org.apache.kerby.util.CryptoUtil; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.InputStream; @@ -41,7 +41,7 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /* The principal keys for krbtgt/SH.INTEL.COM@SH.INTEL.COM @@ -62,7 +62,7 @@ public class EncryptionTest { private Keytab keytab; private CredentialCache cc; - @Before + @BeforeEach public void setUp() throws IOException { try (InputStream kis = EncryptionTest.class.getResourceAsStream("/krbtgt.keytab")) { keytab = Keytab.loadKeytab(kis); diff --git a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeysTest.java b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeysTest.java index c53cc0a55..c0db8fe1a 100644 --- a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeysTest.java +++ b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeysTest.java @@ -26,8 +26,8 @@ import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey; import org.apache.kerby.kerberos.kerb.type.base.EncryptionType; import org.apache.kerby.kerberos.kerb.type.base.PrincipalName; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.InputStream; @@ -53,7 +53,7 @@ public class KeysTest { private Keytab keytab; - @Before + @BeforeEach public void setUp() throws IOException { try (InputStream kis = KeysTest.class.getResourceAsStream("/test.keytab")) { keytab = Keytab.loadKeytab(kis); diff --git a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeytabTest.java b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeytabTest.java index bf9d59714..563adf4a3 100644 --- a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeytabTest.java +++ b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/KeytabTest.java @@ -22,14 +22,14 @@ import org.apache.kerby.kerberos.kerb.keytab.Keytab; import org.apache.kerby.kerberos.kerb.keytab.KeytabEntry; import org.apache.kerby.kerberos.kerb.type.base.PrincipalName; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.InputStream; import java.util.List; -import static junit.framework.TestCase.assertEquals; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; public class KeytabTest { @Test diff --git a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/NewEncryptionTest.java b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/NewEncryptionTest.java index 3238cbfcd..69fd1d42e 100644 --- a/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/NewEncryptionTest.java +++ b/kerby-kerb/kerb-util/src/test/java/org/apache/kerby/kerberos/kerb/util/NewEncryptionTest.java @@ -26,13 +26,13 @@ import org.apache.kerby.kerberos.kerb.type.base.EncryptionType; import org.apache.kerby.kerberos.kerb.type.base.KeyUsage; import org.apache.kerby.util.CryptoUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Arrays; import static org.assertj.core.api.Assertions.fail; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; public class NewEncryptionTest { diff --git a/kerby-pkix/pom.xml b/kerby-pkix/pom.xml index f3e94da1b..da72ace5b 100644 --- a/kerby-pkix/pom.xml +++ b/kerby-pkix/pom.xml @@ -59,8 +59,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter-engine org.assertj diff --git a/kerby-pkix/src/test/java/org/apache/kerby/cms/CertificateTest.java b/kerby-pkix/src/test/java/org/apache/kerby/cms/CertificateTest.java index 0a2ef5904..d0f34265d 100644 --- a/kerby-pkix/src/test/java/org/apache/kerby/cms/CertificateTest.java +++ b/kerby-pkix/src/test/java/org/apache/kerby/cms/CertificateTest.java @@ -22,8 +22,8 @@ import org.apache.kerby.asn1.Asn1; import org.apache.kerby.x500.type.Name; import org.apache.kerby.x509.type.Certificate; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; @@ -38,7 +38,7 @@ public void testDecodingCertificate() throws IOException { Asn1.dump(certificate); } catch (Exception e) { - Assert.fail("Failed to decode certificate from file:" + Assertions.fail("Failed to decode certificate from file:" + " certificate1.txt. " + e.toString()); } } @@ -55,7 +55,7 @@ public void testEncodingCertificate() throws IOException { Asn1.parseAndDump(encodedData); } catch (Exception e) { - Assert.fail("Failed to encode certificate from file:" + Assertions.fail("Failed to encode certificate from file:" + " certificate1.txt. " + e.toString()); } } @@ -69,7 +69,7 @@ public void testDecodingName() throws IOException { name.decode(data); Asn1.dump(name.getName()); } catch (Exception e) { - Assert.fail("Failed to decode name from file:" + Assertions.fail("Failed to decode name from file:" + " name.txt. " + e.toString()); } } diff --git a/kerby-pkix/src/test/java/org/apache/kerby/cms/CompressedDataTest.java b/kerby-pkix/src/test/java/org/apache/kerby/cms/CompressedDataTest.java index 99eb8d8be..480d3b587 100644 --- a/kerby-pkix/src/test/java/org/apache/kerby/cms/CompressedDataTest.java +++ b/kerby-pkix/src/test/java/org/apache/kerby/cms/CompressedDataTest.java @@ -22,8 +22,8 @@ import org.apache.kerby.asn1.Asn1; import org.apache.kerby.cms.type.CompressedContentInfo; import org.apache.kerby.cms.type.CompressedData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; @@ -45,7 +45,7 @@ public void testDump1WithCompressedData() throws IOException { CompressedData compressedData = contentInfo.getCompressedData(); Asn1.dump(compressedData); } catch (Exception e) { - Assert.fail("Failed to dump the compressed data from file: " + Assertions.fail("Failed to dump the compressed data from file: " + "compressed-data.txt. " + e.toString()); } } diff --git a/kerby-pkix/src/test/java/org/apache/kerby/cms/EnvelopedDataTest.java b/kerby-pkix/src/test/java/org/apache/kerby/cms/EnvelopedDataTest.java index 3413d8f45..b30a51925 100644 --- a/kerby-pkix/src/test/java/org/apache/kerby/cms/EnvelopedDataTest.java +++ b/kerby-pkix/src/test/java/org/apache/kerby/cms/EnvelopedDataTest.java @@ -22,8 +22,8 @@ import org.apache.kerby.asn1.Asn1; import org.apache.kerby.cms.type.EnvelopedContentInfo; import org.apache.kerby.cms.type.EnvelopedData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; @@ -45,7 +45,7 @@ public void testDecodingKeyTrns() throws IOException { EnvelopedData envelopedData = contentInfo.getEnvelopedData(); Asn1.dump(envelopedData); } catch (Exception e) { - Assert.fail("Failed to decode keyTrn from file:" + Assertions.fail("Failed to decode keyTrn from file:" + " enveloped-keytrns.txt. " + e.toString()); } } @@ -63,7 +63,7 @@ public void testDecodingKek() throws IOException { EnvelopedData envelopedData = contentInfo.getEnvelopedData(); Asn1.dump(envelopedData); } catch (Exception e) { - Assert.fail("Failed to decode kek from file: enveloped-kek.txt. " + Assertions.fail("Failed to decode kek from file: enveloped-kek.txt. " + e.toString()); } } @@ -81,7 +81,7 @@ public void testDecodingNestedNDEF() throws IOException { EnvelopedData envelopedData = contentInfo.getEnvelopedData(); Asn1.dump(envelopedData); } catch (Exception e) { - Assert.fail("Failed to decode nestedNDEF from file:" + Assertions.fail("Failed to decode nestedNDEF from file:" + " enveloped-nested-ndef.txt. " + e.toString()); } } diff --git a/kerby-pkix/src/test/java/org/apache/kerby/cms/ExtensionTest.java b/kerby-pkix/src/test/java/org/apache/kerby/cms/ExtensionTest.java index 7857dccad..52b3844df 100644 --- a/kerby-pkix/src/test/java/org/apache/kerby/cms/ExtensionTest.java +++ b/kerby-pkix/src/test/java/org/apache/kerby/cms/ExtensionTest.java @@ -21,7 +21,7 @@ import org.apache.kerby.asn1.type.Asn1ObjectIdentifier; import org.apache.kerby.x509.type.Extension; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/kerby-pkix/src/test/java/org/apache/kerby/cms/GeneralNameTest.java b/kerby-pkix/src/test/java/org/apache/kerby/cms/GeneralNameTest.java index a0e11b36f..a7163db38 100644 --- a/kerby-pkix/src/test/java/org/apache/kerby/cms/GeneralNameTest.java +++ b/kerby-pkix/src/test/java/org/apache/kerby/cms/GeneralNameTest.java @@ -22,12 +22,12 @@ import org.apache.kerby.asn1.Asn1; import org.apache.kerby.asn1.util.HexUtil; import org.apache.kerby.x509.type.GeneralName; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; /** * Ref. GeneralNameTest test in BouncyCastle library. @@ -46,7 +46,7 @@ public void testIpAddress() throws IOException { // "10.9.8.0" assertThat(addressBytes).isEqualTo(new byte[] {0x0a, 0x09, 0x08, 0x00}); } catch (Exception e) { - Assert.fail("Failed to test IpAddress. " + e.toString()); + Assertions.fail("Failed to test IpAddress. " + e.toString()); } } } diff --git a/kerby-pkix/src/test/java/org/apache/kerby/cms/SignedDataTest.java b/kerby-pkix/src/test/java/org/apache/kerby/cms/SignedDataTest.java index 67bc1f6bb..5aba2cb87 100644 --- a/kerby-pkix/src/test/java/org/apache/kerby/cms/SignedDataTest.java +++ b/kerby-pkix/src/test/java/org/apache/kerby/cms/SignedDataTest.java @@ -27,8 +27,8 @@ import org.apache.kerby.cms.type.SignedContentInfo; import org.apache.kerby.cms.type.SignedData; import org.apache.kerby.x509.type.Certificate; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; @@ -55,7 +55,7 @@ public void testDecoding() throws IOException { byte[] encodedData = contentInfo.encode(); Asn1.parseAndDump(encodedData); } catch (Exception e) { - Assert.fail("Failed to test decode from file: signed-data.txt. " + Assertions.fail("Failed to test decode from file: signed-data.txt. " + e.toString()); } } @@ -107,7 +107,7 @@ public void testContentInfo() throws IOException { contentInfo.getContentAs(SignedData.class); Asn1.dump(signedData); } catch (Exception e) { - Assert.fail("Failed to test content info from file: anonymous.txt. " + Assertions.fail("Failed to test content info from file: anonymous.txt. " + e.toString()); } } diff --git a/kerby-provider/token-provider/pom.xml b/kerby-provider/token-provider/pom.xml index a1a63bdda..51a923c0b 100644 --- a/kerby-provider/token-provider/pom.xml +++ b/kerby-provider/token-provider/pom.xml @@ -35,8 +35,8 @@ ${nimbus.jose.version} - junit - junit + org.junit.jupiter + junit-jupiter-engine org.assertj diff --git a/kerby-provider/token-provider/src/test/java/org/apache/kerby/kerberos/provider/token/TokenTest.java b/kerby-provider/token-provider/src/test/java/org/apache/kerby/kerberos/provider/token/TokenTest.java index bb7341d67..8ec78f87e 100644 --- a/kerby-provider/token-provider/src/test/java/org/apache/kerby/kerberos/provider/token/TokenTest.java +++ b/kerby-provider/token-provider/src/test/java/org/apache/kerby/kerberos/provider/token/TokenTest.java @@ -27,8 +27,8 @@ import org.apache.kerby.kerberos.kerb.provider.TokenEncoder; import org.apache.kerby.kerberos.kerb.type.base.AuthToken; import org.assertj.core.api.Assertions; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.crypto.KeyGenerator; import java.io.IOException; @@ -53,7 +53,7 @@ public class TokenTest { private List auds = new ArrayList<>(); private EncryptionMethod encryptionMethod = EncryptionMethod.A128GCM; - @Before + @BeforeEach public void setUp() { authToken = KrbRuntime.getTokenProvider("JWT").createTokenFactory().createToken(); @@ -220,7 +220,7 @@ public void testTokenWithHMACSignedJWT() throws Exception { } @Test - @org.junit.Ignore + @org.junit.jupiter.api.Disabled // TODO: building error with openjdk8: NoSuchAlgorithm EC KeyPairGenerato.. public void testTokenWithECDSASignedJWT() throws Exception { TokenEncoder tokenEncoder = KrbRuntime.getTokenProvider("JWT").createTokenEncoder(); diff --git a/parent/pom.xml b/parent/pom.xml index 8f699cc5a..fad6ce253 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -34,7 +34,7 @@ 2.10.1 2.2.224 2.1.4 - 4.13.2 + 5.10.0 9.37 1.7.36 3.24.2 @@ -68,8 +68,8 @@ ${slf4j.version} - junit - junit + org.junit.jupiter + junit-jupiter-engine ${junit.version} test