Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JUnit5 support #1063

Merged
merged 3 commits into from
Feb 12, 2021
Merged

JUnit5 support #1063

merged 3 commits into from
Feb 12, 2021

Conversation

schabdo
Copy link
Contributor

@schabdo schabdo commented Dec 16, 2020

Finally paving the way for JUnit5. In order to proof that we are not forced to migrate all tests at once I updated only two tests showcasing that JUnit5 support works. All the other tests remain on JUnit4 for now and will be migrated over time while new tests can already be written based on JUnit5.

Since JUnit5 became the default in Spring Boot 2.2.x (cf. #14736) I decided to wait for the Spring Boot 2.3.x migration (#1018) to be finished. This simplify required changes and we don't have to remove handcrafted switch from JUnit4 to JUnit5 later on. However as a expected consequence CircleCI will fail and PR is blocked until Spring Boot 2.3.x is available on master

Signed-off-by: Dominic Schabel <[email protected]>
@schabdo schabdo added the task label Dec 16, 2020
@schabdo schabdo added this to the 0.3.0M7 milestone Dec 16, 2020
@schabdo schabdo requested a review from stefbehl December 16, 2020 14:20
@schabdo
Copy link
Contributor Author

schabdo commented Dec 16, 2020

... afterwards we can safely remove dependency exclusions introduced by the Spring Boot migration (cf. pom.xml)

<dependency>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-starter-test</artifactId>	            
    <exclusions>
        <exclusion>
            <groupId>org.junit.jupiter</groupId>
            <artifactId>junit-jupiter</artifactId>
        </exclusion>
        <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>

EDIT: done => 8db0f86

@singrob
Copy link
Contributor

singrob commented Jan 11, 2021

Looks good, thanks @schabdo 👍

@schabdo schabdo removed the request for review from stefbehl February 11, 2021 16:16
# Conflicts:
#	hawkbit-core/src/test/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandlerTest.java
Signed-off-by: Dominic Schabel <[email protected]>
@schabdo schabdo merged commit 9c5360e into eclipse-hawkbit:master Feb 12, 2021
@schabdo schabdo deleted the feature-junit5 branch February 12, 2021 07:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants