You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2021/01/10 16:33:42 UTC
[directory-server] branch master updated: switched to Junit5
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git
The following commit(s) were added to refs/heads/master by this push:
new fd94856 switched to Junit5
new 2432443 Merge branch 'master' of https://gitbox.apache.org/repos/asf/directory-server
fd94856 is described below
commit fd94856c52f64a07f6c767f2aaf69078b8a08bfb
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Sun Jan 10 17:32:41 2021 +0100
switched to Junit5
---
core-annotations/pom.xml | 11 -----------
.../server/core/factory/DirectoryServiceFactoryTest.java | 8 +-------
2 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/core-annotations/pom.xml b/core-annotations/pom.xml
index d61876c..c388df7 100644
--- a/core-annotations/pom.xml
+++ b/core-annotations/pom.xml
@@ -33,17 +33,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.directory.junit</groupId>
- <artifactId>junit-addons</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
diff --git a/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryTest.java b/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryTest.java
index f91f379..7d82b91 100644
--- a/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryTest.java
+++ b/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryTest.java
@@ -23,13 +23,9 @@ package org.apache.directory.server.core.factory;
import static org.junit.Assert.assertTrue;
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-
import org.apache.directory.api.util.FileUtils;
import org.apache.directory.server.core.api.DirectoryService;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
/**
@@ -37,8 +33,6 @@ import org.junit.runner.RunWith;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-@RunWith(ConcurrentJunitRunner.class)
-@Concurrency()
public class DirectoryServiceFactoryTest
{
@Test