Run JUnit 4 based tests using junit-vintage-engine #1452
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -161,6 +161,14 @@ final class ServiceTalkLibraryPlugin extends ServiceTalkCorePlugin { | |||
| private static void configureTests(Project project) { | |||
| project.configure(project) { | |||
| test { | |||
| useJUnitPlatform() | |||
| // expected format for timeout: <number>[ns|μs|ms|s|m|h|d]) | |||
| def junit5DefaultTimeout = System.getProperty("CI") ? "30s" : "10s" | |||
There was a problem hiding this comment.
Not sure System.getProperty("CI") will give us what we need, should we use Boolean.getBoolean("CI")?
There was a problem hiding this comment.
Actually, the CI is not a system property, it's env variable.
There was a problem hiding this comment.
servicetalk/docker/docker-compose.yaml
Lines 35 to 36 in 35b4293
There was a problem hiding this comment.
using System.getenv("CI") instead
There was a problem hiding this comment.
perhaps def junit5DefaultTimeout = Boolean.valueOf(System.getenv("CI") ?: "false") ? "30s" : "10s"
There was a problem hiding this comment.
Yes, that looks better
idelpivnitskiy
approved these changes
Mar 23, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation:
Let developers to create new JUnit 5 tests in modules not yet converted to JUnit5
Modifications:
added dependency on
org.junit.vintage:junit-vintage-engineResult:
JUnit 4 and JUnit 5 tests can be mixed in one module
To add new JUnit 5 tests to non converted test module, the following dependencies news to be present:
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit5Version"testImplementation "org.junit.jupiter:junit-jupiter-params:$junit5Version"(optional if using parameterized tests)testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit5Version"