JUnit5 support (#51)

* First preparation for JUnit5 Signed-off-by: Dominic Schabel <dominic.schabel@bosch.io> * Migrated all tests to JUnit5 Signed-off-by: Dominic Schabel <dominic.schabel@bosch.io>
eclipse · Feb 16, 2021 · 3b86c25 · 3b86c25
1 parent efcac9b
commit 3b86c25
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/hawkbit-device-simulator/pom.xml b/hawkbit-device-simulator/pom.xml
@@ -135,7 +135,7 @@
       </dependency>
       <dependency>
          <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit4</artifactId>
+         <artifactId>allure-junit5</artifactId>
          <scope>test</scope>
       </dependency>
    </dependencies>

diff --git a/...device-simulator/src/test/java/org/eclipse/hawkbit/simulator/AllowAllWebSecurityTest.java b/...device-simulator/src/test/java/org/eclipse/hawkbit/simulator/AllowAllWebSecurityTest.java
@@ -15,7 +15,7 @@
 import io.qameta.allure.Feature;
 import io.qameta.allure.Story;
 import org.eclipse.hawkbit.simulator.http.BasicAuthProperties;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.test.context.TestPropertySource;
 
 @Feature("Component Tests - Hawkbit Device Simulator")

diff --git a/...e-simulator/src/test/java/org/eclipse/hawkbit/simulator/AuthenticatedWebSecurityTest.java b/...e-simulator/src/test/java/org/eclipse/hawkbit/simulator/AuthenticatedWebSecurityTest.java
@@ -16,7 +16,7 @@
 import io.qameta.allure.Feature;
 import io.qameta.allure.Story;
 import org.eclipse.hawkbit.simulator.http.BasicAuthProperties;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.TestPropertySource;
 

diff --git a/hawkbit-device-simulator/src/test/java/org/eclipse/hawkbit/simulator/DdiWebSecurityTest.java b/hawkbit-device-simulator/src/test/java/org/eclipse/hawkbit/simulator/DdiWebSecurityTest.java
@@ -9,19 +9,18 @@
 package org.eclipse.hawkbit.simulator;
 
 import org.eclipse.hawkbit.simulator.amqp.AmqpProperties;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 
 @SpringBootTest
 @AutoConfigureMockMvc
-@RunWith(SpringRunner.class)
 @TestPropertySource(properties = {AmqpProperties.CONFIGURATION_ENABLED_PROPERTY + " = false"})
-public abstract class DdiWebSecurityTest {
+public class DdiWebSecurityTest {
 
     @Autowired
     protected MockMvc mockMvc;