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.

Sign up for GitHub

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

Jump to bottom

Bump org.junit-pioneer:junit-pioneer from 1.3.8 to 2.2.0 #242

Merged
merged 2 commits into from
Feb 17, 2024
Merged

Bump org.junit-pioneer:junit-pioneer from 1.3.8 to 2.2.0 #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d9c236
Bump org.junit-pioneer:junit-pioneer from 1.3.8 to 2.2.0
dependabot[bot] Feb 17, 2024
2991895
Update code inline with dependency change
big-andy-coates Feb 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies {
testImplementation 'com.google.guava:guava-io:r03'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.2'
testImplementation 'org.junit-pioneer:junit-pioneer:1.3.8'
testImplementation 'org.junit-pioneer:junit-pioneer:2.2.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.2' // required when testing in Eclipse
}
Expand Down
57 changes: 27 additions & 30 deletions src/test/java/org/javamodularity/moduleplugin/ModulePluginSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
import org.gradle.testkit.runner.GradleRunner;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junitpioneer.jupiter.CartesianEnumSource;
import org.junitpioneer.jupiter.CartesianProductTest;
import org.junitpioneer.jupiter.CartesianValueSource;
import org.junitpioneer.jupiter.cartesian.CartesianTest;

import java.io.File;
import java.io.IOException;
Expand Down Expand Up @@ -60,10 +58,10 @@ void before() throws IOException {
.collect(Collectors.toList());
}

@CartesianProductTest(name = "smokeTest({arguments})")
@CartesianValueSource(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"})
@CartesianEnumSource(GradleVersion.class)
void smokeTest(String projectName, GradleVersion gradleVersion) {
@CartesianTest(name = "smokeTest({arguments})")
void smokeTest(
@CartesianTest.Values(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"}) String projectName,
@CartesianTest.Enum GradleVersion gradleVersion) {
LOGGER.lifecycle("Executing smokeTest of {} with Gradle {}", projectName, gradleVersion);
if(!checkCombination(projectName, gradleVersion)) return;
var result = GradleRunner.create()
Expand All @@ -84,10 +82,10 @@ void smokeTest(String projectName, GradleVersion gradleVersion) {
assertOutputDoesNotContain(result, "warning: [options] --add-opens has no effect at compile time");
}

@CartesianProductTest(name = "smokeTestRun({arguments})")
@CartesianValueSource(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"})
@CartesianEnumSource(GradleVersion.class)
void smokeTestRun(String projectName, GradleVersion gradleVersion) {
@CartesianTest(name = "smokeTestRun({arguments})")
void smokeTestRun(
@CartesianTest.Values(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"}) String projectName,
@CartesianTest.Enum GradleVersion gradleVersion) {
LOGGER.lifecycle("Executing smokeTestRun of {} with Gradle {}", projectName, gradleVersion);
if(!checkCombination(projectName, gradleVersion)) return;
var writer = new StringWriter(256);
Expand All @@ -108,10 +106,10 @@ void smokeTestRun(String projectName, GradleVersion gradleVersion) {
assertEquals("welcome", lines.get(2));
}

@CartesianProductTest(name = "smokeTestJunit5({arguments})")
@CartesianValueSource(strings = {"5.4.2/1.4.2", "5.5.2/1.5.2", "5.7.1/1.7.1"})
@CartesianEnumSource(GradleVersion.class)
void smokeTestJunit5(String junitVersionPair, GradleVersion gradleVersion) {
@CartesianTest(name = "smokeTestJunit5({arguments})")
void smokeTestJunit5(
@CartesianTest.Values(strings = {"5.4.2/1.4.2", "5.5.2/1.5.2", "5.7.1/1.7.1"}) String junitVersionPair,
@CartesianTest.Enum GradleVersion gradleVersion) {
LOGGER.lifecycle("Executing smokeTestJunit5 with junitVersionPair {} and Gradle {}", junitVersionPair, gradleVersion);
var junitVersionParts = junitVersionPair.split("/");
var junitVersionProperty = String.format("-PjUnitVersion=%s", junitVersionParts[0]);
Expand All @@ -130,9 +128,8 @@ void smokeTestJunit5(String junitVersionPair, GradleVersion gradleVersion) {
assertTasksSuccessful(result, "greeter.runner", "build", "run");
}

@CartesianProductTest(name = "smokeTestMixed({arguments})")
@CartesianEnumSource(GradleVersion.class)
void smokeTestMixed(GradleVersion gradleVersion) {
@CartesianTest(name = "smokeTestMixed({arguments})")
void smokeTestMixed(@CartesianTest.Enum GradleVersion gradleVersion) {
LOGGER.lifecycle("Executing smokeTestMixed with Gradle {}", gradleVersion);
var result = GradleRunner.create()
.withProjectDir(new File("test-project-mixed"))
Expand Down Expand Up @@ -181,10 +178,10 @@ private static void assertExpectedClassFileFormats(
}
}

@CartesianProductTest(name = "smokeTestDist({arguments})")
@CartesianValueSource(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"})
@CartesianEnumSource(GradleVersion.class)
void smokeTestDist(String projectName, GradleVersion gradleVersion) {
@CartesianTest(name = "smokeTestDist({arguments})")
void smokeTestDist(
@CartesianTest.Values(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"}) String projectName,
@CartesianTest.Enum GradleVersion gradleVersion) {
LOGGER.lifecycle("Executing smokeTestDist of {} with Gradle {}", projectName, gradleVersion);
if(!checkCombination(projectName, gradleVersion)) return;
var result = GradleRunner.create()
Expand Down Expand Up @@ -222,10 +219,10 @@ void smokeTestDist(String projectName, GradleVersion gradleVersion) {
assertTrue(ctx.getAppOutput("greeter.runner").contains("welcome"));
}

@CartesianProductTest(name = "smokeTestRunDemo({arguments})")
@CartesianValueSource(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"})
@CartesianEnumSource(GradleVersion.class)
void smokeTestRunDemo(String projectName, GradleVersion gradleVersion) {
@CartesianTest(name = "smokeTestRunDemo({arguments})")
void smokeTestRunDemo(
@CartesianTest.Values(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"}) String projectName,
@CartesianTest.Enum GradleVersion gradleVersion) {
LOGGER.lifecycle("Executing smokeTestRunDemo of {} with Gradle {}", projectName, gradleVersion);
if(!checkCombination(projectName, gradleVersion)) return;
var result = GradleRunner.create()
Expand All @@ -241,10 +238,10 @@ void smokeTestRunDemo(String projectName, GradleVersion gradleVersion) {
assertFalse(result.getOutput().contains("Using Java lambdas is not supported as task inputs"));
}

@CartesianProductTest(name = "smokeTestRunStartScripts({arguments})")
@CartesianValueSource(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"})
@CartesianEnumSource(GradleVersion.class)
void smokeTestRunStartScripts(String projectName, GradleVersion gradleVersion) {
@CartesianTest(name = "smokeTestRunStartScripts({arguments})")
void smokeTestRunStartScripts(
@CartesianTest.Values(strings = {"test-project", "test-project-kotlin-pre-1-7", "test-project-kotlin", "test-project-groovy"}) String projectName,
@CartesianTest.Enum GradleVersion gradleVersion) {
LOGGER.lifecycle("Executing smokeTestRunScripts of {} with Gradle {}", projectName, gradleVersion);
if(!checkCombination(projectName, gradleVersion)) return;
var result = GradleRunner.create()
Expand Down