JUnit5 support (#1063)

* First preparation for JUnit5 Signed-off-by: Dominic Schabel <dominic.schabel@bosch.io> * Exclusion of JUnit5 removed Signed-off-by: Dominic Schabel <dominic.schabel@bosch.io>
eclipse-hawkbit · Feb 12, 2021 · 9c5360e · 9c5360e
1 parent 3422781
commit 9c5360e
Show file tree

Hide file tree

Showing 20 changed files with 29 additions and 64 deletions.
diff --git a/hawkbit-artifact-repository-filesystem/pom.xml b/hawkbit-artifact-repository-filesystem/pom.xml
@@ -47,7 +47,7 @@
       </dependency>
       <dependency>
          <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit4</artifactId>
+         <artifactId>allure-junit5</artifactId>
          <scope>test</scope>
       </dependency>
    </dependencies>

diff --git a/hawkbit-core/pom.xml b/hawkbit-core/pom.xml
@@ -45,7 +45,7 @@
       </dependency>
       <dependency>
          <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit4</artifactId>
+         <artifactId>allure-junit5</artifactId>
          <scope>test</scope>
       </dependency>
    </dependencies>

diff --git a/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/Base62UtilTest.java b/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/Base62UtilTest.java
@@ -10,7 +10,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import io.qameta.allure.Description;
 import io.qameta.allure.Feature;

diff --git a/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandlerTest.java b/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandlerTest.java
@@ -17,21 +17,21 @@
 
 import org.eclipse.hawkbit.api.ArtifactUrlHandlerProperties.UrlProtocol;
 import org.eclipse.hawkbit.api.URLPlaceholder.SoftwareData;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import io.qameta.allure.Description;
 import io.qameta.allure.Feature;
 import io.qameta.allure.Story;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 /**
  * Tests for creating urls to download artifacts.
  */
 @Feature("Unit Tests - Artifact URL Handler")
 @Story("Test to generate the artifact download URL")
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class PropertyBasedArtifactUrlHandlerTest {
 
     private static final String TEST_PROTO = "coap";
@@ -58,7 +58,7 @@ public class PropertyBasedArtifactUrlHandlerTest {
     private static URLPlaceholder placeholder = new URLPlaceholder(TENANT, TENANT_ID, CONTROLLER_ID, TARGETID,
             new SoftwareData(SOFTWAREMODULEID, FILENAME_DECODE, ARTIFACTID, SHA1HASH));
 
-    @Before
+    @BeforeEach
     public void setup() {
         properties = new ArtifactUrlHandlerProperties();
         urlHandlerUnderTest = new PropertyBasedArtifactUrlHandler(properties);

diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/pom.xml b/hawkbit-dmf/hawkbit-dmf-amqp/pom.xml
@@ -84,7 +84,7 @@
       </dependency>
       <dependency>
          <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit4</artifactId>
+         <artifactId>allure-junit5</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>

diff --git a/hawkbit-http-security/pom.xml b/hawkbit-http-security/pom.xml
@@ -53,7 +53,7 @@
       </dependency>
       <dependency>
          <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit4</artifactId>
+         <artifactId>allure-junit5</artifactId>
          <scope>test</scope>
       </dependency>
    </dependencies>

diff --git a/hawkbit-repository/hawkbit-repository-api/pom.xml b/hawkbit-repository/hawkbit-repository-api/pom.xml
@@ -71,7 +71,7 @@
       <!-- TEST -->
       <dependency>
          <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit4</artifactId>
+         <artifactId>allure-junit5</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>

diff --git a/hawkbit-repository/hawkbit-repository-core/pom.xml b/hawkbit-repository/hawkbit-repository-core/pom.xml
@@ -59,7 +59,7 @@
       </dependency>
       <dependency>
          <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit4</artifactId>
+         <artifactId>allure-junit5</artifactId>
          <scope>test</scope>
       </dependency>
    </dependencies>

diff --git a/hawkbit-repository/hawkbit-repository-jpa/pom.xml b/hawkbit-repository/hawkbit-repository-jpa/pom.xml
@@ -85,7 +85,7 @@
       </dependency>
       <dependency>
          <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit4</artifactId>
+         <artifactId>allure-junit5</artifactId>
          <scope>test</scope>
       </dependency>
    </dependencies>

diff --git a/hawkbit-rest/hawkbit-ddi-api/pom.xml b/hawkbit-rest/hawkbit-ddi-api/pom.xml
@@ -40,23 +40,13 @@
 
       <!-- TEST -->
       <dependency>
-         <groupId>com.fasterxml.jackson.core</groupId>
-         <artifactId>jackson-databind</artifactId>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>junit</groupId>
-         <artifactId>junit</artifactId>
+         <groupId>org.springframework.boot</groupId>
+         <artifactId>spring-boot-starter-test</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>
          <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit4</artifactId>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.assertj</groupId>
-         <artifactId>assertj-core</artifactId>
+         <artifactId>allure-junit5</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>

diff --git a/hawkbit-rest/hawkbit-ddi-resource/pom.xml b/hawkbit-rest/hawkbit-ddi-resource/pom.xml
@@ -104,7 +104,7 @@
       </dependency>
       <dependency>
          <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit4</artifactId>
+         <artifactId>allure-junit5</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>

diff --git a/hawkbit-rest/hawkbit-mgmt-api/pom.xml b/hawkbit-rest/hawkbit-mgmt-api/pom.xml
@@ -46,7 +46,7 @@
       </dependency>
       <dependency>
          <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit4</artifactId>
+         <artifactId>allure-junit5</artifactId>
          <scope>test</scope>
       </dependency>
    </dependencies>

diff --git a/hawkbit-rest/hawkbit-mgmt-resource/pom.xml b/hawkbit-rest/hawkbit-mgmt-resource/pom.xml
@@ -108,7 +108,7 @@
       </dependency>
       <dependency>
          <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit4</artifactId>
+         <artifactId>allure-junit5</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>

diff --git a/hawkbit-rest/hawkbit-rest-core/pom.xml b/hawkbit-rest/hawkbit-rest-core/pom.xml
@@ -71,7 +71,7 @@
       </dependency>
       <dependency>
          <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit4</artifactId>
+         <artifactId>allure-junit5</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>

diff --git a/hawkbit-rest/hawkbit-rest-docs/pom.xml b/hawkbit-rest/hawkbit-rest-docs/pom.xml
@@ -96,7 +96,7 @@
       </dependency>
       <dependency>
          <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit4</artifactId>
+         <artifactId>allure-junit5</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>

diff --git a/hawkbit-runtime/hawkbit-update-server/pom.xml b/hawkbit-runtime/hawkbit-update-server/pom.xml
@@ -67,7 +67,7 @@
       <!-- Test -->
       <dependency>
          <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit4</artifactId>
+         <artifactId>allure-junit5</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>

diff --git a/hawkbit-security-core/pom.xml b/hawkbit-security-core/pom.xml
@@ -64,7 +64,7 @@
       </dependency>
       <dependency>
          <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit4</artifactId>
+         <artifactId>allure-junit5</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>

diff --git a/hawkbit-security-integration/pom.xml b/hawkbit-security-integration/pom.xml
@@ -50,7 +50,7 @@
       </dependency>
       <dependency>
          <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit4</artifactId>
+         <artifactId>allure-junit5</artifactId>
          <scope>test</scope>
       </dependency>
    </dependencies>

diff --git a/hawkbit-ui/pom.xml b/hawkbit-ui/pom.xml
@@ -226,7 +226,7 @@
       </dependency>
       <dependency>
          <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit4</artifactId>
+         <artifactId>allure-junit5</artifactId>
          <scope>test</scope>
       </dependency>
    </dependencies>

diff --git a/pom.xml b/pom.xml
@@ -423,7 +423,7 @@
                   <properties>
                      <property>
                         <name>listener</name>
-                        <value>io.qameta.allure.junit4.AllureJunit4</value>
+                        <value>io.qameta.allure.junit5.AllureJunit5</value>
                      </property>
                   </properties>
                   <includes>
@@ -446,7 +446,7 @@
                   <properties>
                      <property>
                         <name>listener</name>
-                        <value>io.qameta.allure.junit4.AllureJunit4</value>
+                        <value>io.qameta.allure.junit5.AllureJunit5</value>
                      </property>
                   </properties>
                </configuration>
@@ -763,34 +763,9 @@
             <artifactId>commons-io</artifactId>
             <version>${commons-io.version}</version>
          </dependency>
-         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <version>${spring.boot.version}</version>
-            <exclusions>
-               <exclusion>
-                  <groupId>org.springframework.boot</groupId>
-                  <artifactId>spring-boot-starter-logging</artifactId>
-               </exclusion>
-               <!-- As long as JUnit 5 is not used, these dependencies can be excluded -->
-               <exclusion>
-                  <groupId>org.junit.jupiter</groupId>
-                  <artifactId>junit-jupiter</artifactId>
-               </exclusion>
-               <!-- Allure JUnit4 does not work with junit-vintage-engine -->
-               <exclusion>
-                  <groupId>org.junit.vintage</groupId>
-                  <artifactId>junit-vintage-engine</artifactId>
-               </exclusion>
-               <exclusion>
-                  <groupId>org.mockito</groupId>
-                  <artifactId>mockito-junit-jupiter</artifactId>
-               </exclusion>
-            </exclusions>
-         </dependency>
          <dependency>
             <groupId>io.qameta.allure</groupId>
-            <artifactId>allure-junit4</artifactId>
+            <artifactId>allure-junit5</artifactId>
             <version>${allure.version}</version>
             <scope>test</scope>
          </dependency>