You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2023/10/19 12:23:38 UTC
[directory-fortress-core] branch junit5 created (now 9f532d6a)
This is an automated email from the ASF dual-hosted git repository.
smckinney pushed a change to branch junit5
in repository https://gitbox.apache.org/repos/asf/directory-fortress-core.git
at 9f532d6a FC-329 - Support JUnit 5
This branch includes the following new commits:
new 9f532d6a FC-329 - Support JUnit 5
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[directory-fortress-core] 01/01: FC-329 - Support JUnit 5
Posted by sm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
smckinney pushed a commit to branch junit5
in repository https://gitbox.apache.org/repos/asf/directory-fortress-core.git
commit 9f532d6a4b8fed2f9fd48b6f6ada83995933b7fb
Author: Shawn McKinney <sm...@symas.com>
AuthorDate: Thu Oct 19 07:18:48 2023 -0500
FC-329 - Support JUnit 5
---
pom.xml | 38 +++++++---------------
.../core/impl/apacheds/AdminManagerTest.java | 6 ++--
.../impl/apacheds/FortressJUnitApachedsTest.java | 6 ++--
3 files changed, 18 insertions(+), 32 deletions(-)
diff --git a/pom.xml b/pom.xml
index ae265362..3c3e2562 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>
@@ -240,13 +240,6 @@
<scope>test</scope>
</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>
@@ -261,13 +254,6 @@
<scope>test</scope>
</dependency>
- <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>
@@ -289,13 +275,6 @@
<scope>test</scope>
</dependency>
- <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>
@@ -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 90583e75..eb04ec3d 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.ApplyLdifFiles;
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.LogUtil;
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 74ed0981..bfc4daf6 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.ApplyLdifFiles;
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.impl.UserTestData;
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(