FC-329 - Support JUnit 5
diff --git a/pom.xml b/pom.xml
index ae26536..3c3e256 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
<java.version>11</java.version>
<additionalparam>-Xdoclint:none</additionalparam>
<version.ldap.api>2.1.4</version.ldap.api>
- <version.apacheds>2.0.0.AM26</version.apacheds>
+ <version.apacheds>2.0.0.AM27</version.apacheds>
<version.accelerator.api>1.0-RC41</version.accelerator.api>
<version.accelerator.impl>1.0-RC41</version.accelerator.impl>
<version.ant>1.10.14</version.ant>
@@ -76,7 +76,7 @@
<version.jgrapht-core>1.5.2</version.jgrapht-core>
<version.jmeter.core>5.6.2</version.jmeter.core>
<version.jmeter.java>5.6.2</version.jmeter.java>
- <version.junit>4.13.2</version.junit>
+ <junit-jupiter.version>5.1.0</junit-jupiter.version>
<slf4j.api.version>2.0.7</slf4j.api.version>
<version.opencsv>2.3</version.opencsv>
<version.jackson-annotations>2.15.2</version.jackson-annotations>
@@ -241,13 +241,6 @@
</dependency>
<dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-interceptor-kerberos</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.directory.jdbm</groupId>
<artifactId>apacheds-jdbm1</artifactId>
<version>${version.apache.jdbm1}</version>
@@ -263,13 +256,6 @@
<dependency>
<groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-kerberos-codec</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-ldif-partition</artifactId>
<version>${version.apacheds}</version>
<scope>test</scope>
@@ -291,13 +277,6 @@
<dependency>
<groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-protocol-kerberos</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-ldap</artifactId>
<version>${version.apacheds}</version>
<scope>test</scope>
@@ -374,12 +353,19 @@
<scope>test</scope>
</dependency>
+ <!--JUnit Jupiter Engine to depend on the JUnit5 engine and JUnit 5 API -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
+ <!--JUnit Jupiter Engine to depend on the JUnit4 engine and JUnit 4 API -->
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit-jupiter.version}</version>
+ </dependency>
<dependency>
<groupId>net.sf.opencsv</groupId>
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/apacheds/AdminManagerTest.java b/src/test/java/org/apache/directory/fortress/core/impl/apacheds/AdminManagerTest.java
index 90583e7..eb04ec3 100644
--- a/src/test/java/org/apache/directory/fortress/core/impl/apacheds/AdminManagerTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/apacheds/AdminManagerTest.java
@@ -30,11 +30,11 @@
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.annotations.CreatePartition;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
-import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.server.core.integ.ApacheDSTestExtension;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,7 +55,7 @@
import org.apache.directory.fortress.core.util.cache.CacheMgr;
-@RunWith(FrameworkRunner.class)
+@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "classDS", partitions =
{ @CreatePartition(name = "example", suffix = "dc=example,dc=com") })
@CreateLdapServer(
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/apacheds/FortressJUnitApachedsTest.java b/src/test/java/org/apache/directory/fortress/core/impl/apacheds/FortressJUnitApachedsTest.java
index 74ed098..bfc4daf 100644
--- a/src/test/java/org/apache/directory/fortress/core/impl/apacheds/FortressJUnitApachedsTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/apacheds/FortressJUnitApachedsTest.java
@@ -26,11 +26,11 @@
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.annotations.CreatePartition;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
-import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.server.core.integ.ApacheDSTestExtension;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,7 +55,7 @@
import org.apache.directory.fortress.core.util.cache.CacheMgr;
-@RunWith(FrameworkRunner.class)
+@ExtendWith( { ApacheDSTestExtension.class } )
@CreateDS(name = "classDS", partitions =
{ @CreatePartition(name = "example", suffix = "dc=example,dc=com") })
@CreateLdapServer(
