lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

JUnit5 support (#1063)

Browse Source 
* 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>
This commit is contained in:
Dominic Schabel
2021-02-12 08:22:26 +01:00
committed by GitHub
parent 3422781125
commit 9c5360e59d
20 changed files with 29 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hawkbit-artifact-repository-filesystem/pom.xml
View File

@@ -47,7 +47,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.qameta.allure</groupId> <groupId>io.qameta.allure</groupId>
<artifactId>allure-junit4</artifactId> <artifactId>allure-junit5</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

2
hawkbit-core/pom.xml
View File

@@ -45,7 +45,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.qameta.allure</groupId> <groupId>io.qameta.allure</groupId>
<artifactId>allure-junit4</artifactId> <artifactId>allure-junit5</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

2
hawkbit-core/src/test/java/org/eclipse/hawkbit/api/Base62UtilTest.java
View File

@@ -10,7 +10,7 @@ package org.eclipse.hawkbit.api;
import static org.assertj.core.api.Assertions.assertThat; 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.Description;
import io.qameta.allure.Feature; import io.qameta.allure.Feature;

12
hawkbit-core/src/test/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandlerTest.java
View File

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

2
hawkbit-dmf/hawkbit-dmf-amqp/pom.xml
View File

@@ -84,7 +84,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.qameta.allure</groupId> <groupId>io.qameta.allure</groupId>
<artifactId>allure-junit4</artifactId> <artifactId>allure-junit5</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

2
hawkbit-http-security/pom.xml
View File

@@ -53,7 +53,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.qameta.allure</groupId> <groupId>io.qameta.allure</groupId>
<artifactId>allure-junit4</artifactId> <artifactId>allure-junit5</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

2
hawkbit-repository/hawkbit-repository-api/pom.xml
View File

@@ -71,7 +71,7 @@
<!-- TEST --> <!-- TEST -->
<dependency> <dependency>
<groupId>io.qameta.allure</groupId> <groupId>io.qameta.allure</groupId>
<artifactId>allure-junit4</artifactId> <artifactId>allure-junit5</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

2
hawkbit-repository/hawkbit-repository-core/pom.xml
View File

@@ -59,7 +59,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.qameta.allure</groupId> <groupId>io.qameta.allure</groupId>
<artifactId>allure-junit4</artifactId> <artifactId>allure-junit5</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

2
hawkbit-repository/hawkbit-repository-jpa/pom.xml
View File

@@ -85,7 +85,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.qameta.allure</groupId> <groupId>io.qameta.allure</groupId>
<artifactId>allure-junit4</artifactId> <artifactId>allure-junit5</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

16
hawkbit-rest/hawkbit-ddi-api/pom.xml
View File

@@ -40,23 +40,13 @@
<!-- TEST --> <!-- TEST -->
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.qameta.allure</groupId> <groupId>io.qameta.allure</groupId>
<artifactId>allure-junit4</artifactId> <artifactId>allure-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

2
hawkbit-rest/hawkbit-ddi-resource/pom.xml
View File

@@ -104,7 +104,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.qameta.allure</groupId> <groupId>io.qameta.allure</groupId>
<artifactId>allure-junit4</artifactId> <artifactId>allure-junit5</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

2
hawkbit-rest/hawkbit-mgmt-api/pom.xml
View File

@@ -46,7 +46,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.qameta.allure</groupId> <groupId>io.qameta.allure</groupId>
<artifactId>allure-junit4</artifactId> <artifactId>allure-junit5</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

2
hawkbit-rest/hawkbit-mgmt-resource/pom.xml
View File

@@ -108,7 +108,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.qameta.allure</groupId> <groupId>io.qameta.allure</groupId>
<artifactId>allure-junit4</artifactId> <artifactId>allure-junit5</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

2
hawkbit-rest/hawkbit-rest-core/pom.xml
View File

@@ -71,7 +71,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.qameta.allure</groupId> <groupId>io.qameta.allure</groupId>
<artifactId>allure-junit4</artifactId> <artifactId>allure-junit5</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

2
hawkbit-rest/hawkbit-rest-docs/pom.xml
View File

@@ -96,7 +96,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.qameta.allure</groupId> <groupId>io.qameta.allure</groupId>
<artifactId>allure-junit4</artifactId> <artifactId>allure-junit5</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

2
hawkbit-runtime/hawkbit-update-server/pom.xml
View File

@@ -67,7 +67,7 @@
<!-- Test --> <!-- Test -->
<dependency> <dependency>
<groupId>io.qameta.allure</groupId> <groupId>io.qameta.allure</groupId>
<artifactId>allure-junit4</artifactId> <artifactId>allure-junit5</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

2
hawkbit-security-core/pom.xml
View File

@@ -64,7 +64,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.qameta.allure</groupId> <groupId>io.qameta.allure</groupId>
<artifactId>allure-junit4</artifactId> <artifactId>allure-junit5</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

2
hawkbit-security-integration/pom.xml
View File

@@ -50,7 +50,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.qameta.allure</groupId> <groupId>io.qameta.allure</groupId>
<artifactId>allure-junit4</artifactId> <artifactId>allure-junit5</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

2
hawkbit-ui/pom.xml
View File

@@ -226,7 +226,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.qameta.allure</groupId> <groupId>io.qameta.allure</groupId>
<artifactId>allure-junit4</artifactId> <artifactId>allure-junit5</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

31
pom.xml
View File

@@ -423,7 +423,7 @@
<properties> <properties>
<property> <property>
<name>listener</name> <name>listener</name>
<value>io.qameta.allure.junit4.AllureJunit4</value> <value>io.qameta.allure.junit5.AllureJunit5</value>
</property> </property>
</properties> </properties>
<includes> <includes>
@@ -446,7 +446,7 @@
<properties> <properties>
<property> <property>
<name>listener</name> <name>listener</name>
<value>io.qameta.allure.junit4.AllureJunit4</value> <value>io.qameta.allure.junit5.AllureJunit5</value>
</property> </property>
</properties> </properties>
</configuration> </configuration>
@@ -763,34 +763,9 @@
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>${commons-io.version}</version> <version>${commons-io.version}</version>
</dependency> </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> <dependency>
<groupId>io.qameta.allure</groupId> <groupId>io.qameta.allure</groupId>
<artifactId>allure-junit4</artifactId> <artifactId>allure-junit5</artifactId>
<version>${allure.version}</version> <version>${allure.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>