From 3b86c2524545f8e053d944f3598062e07dd64098 Mon Sep 17 00:00:00 2001
From: Dominic Schabel <dominic.schabel@bosch.io>
Date: Tue, 16 Feb 2021 09:21:08 +0100
Subject: [PATCH] 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>
---
 hawkbit-device-simulator/pom.xml                           | 2 +-
 .../eclipse/hawkbit/simulator/AllowAllWebSecurityTest.java | 2 +-
 .../hawkbit/simulator/AuthenticatedWebSecurityTest.java    | 2 +-
 .../org/eclipse/hawkbit/simulator/DdiWebSecurityTest.java  | 7 +++----
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/hawkbit-device-simulator/pom.xml b/hawkbit-device-simulator/pom.xml
index 772275c..44d995a 100644
--- 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/hawkbit-device-simulator/src/test/java/org/eclipse/hawkbit/simulator/AllowAllWebSecurityTest.java b/hawkbit-device-simulator/src/test/java/org/eclipse/hawkbit/simulator/AllowAllWebSecurityTest.java
index bb4e884..a15897a 100644
--- a/hawkbit-device-simulator/src/test/java/org/eclipse/hawkbit/simulator/AllowAllWebSecurityTest.java
+++ b/hawkbit-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/hawkbit-device-simulator/src/test/java/org/eclipse/hawkbit/simulator/AuthenticatedWebSecurityTest.java b/hawkbit-device-simulator/src/test/java/org/eclipse/hawkbit/simulator/AuthenticatedWebSecurityTest.java
index 3b2c5f9..93f64f8 100644
--- a/hawkbit-device-simulator/src/test/java/org/eclipse/hawkbit/simulator/AuthenticatedWebSecurityTest.java
+++ b/hawkbit-device-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
index 969f7aa..c514714 100644
--- 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;