Skip to content

Issue#140 #182

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

Merged
siordache merged 13 commits into from
Mar 29, 2021
Merged

Issue#140 #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
32d5fe6
Set next dev version to 1.7.1-SNAPSHOT
siordache Aug 21, 2020
9c0e278
Merge remote-tracking branch 'upstream/master'
siordache Aug 21, 2020
7beddc6
replace modularity.version with modularity.moduleVersion in README
siordache Aug 21, 2020
d6268ca
Merge remote-tracking branch 'upstream/master'
siordache Aug 21, 2020
1b62b58
Merge remote-tracking branch 'upstream/master'
siordache Dec 6, 2020
c20ed06
Merge remote-tracking branch 'upstream/master'
siordache Mar 18, 2021
ed92fe6
Merge remote-tracking branch 'upstream/master'
siordache Mar 18, 2021
612201b
issue #140: Support gradle test fixtures
siordache Mar 21, 2021
2db6b1f
issue #140: Support gradle test fixtures
siordache Mar 21, 2021
c412621
issue #71: Consider transitive dependencies when resolving TestEngine
siordache Mar 21, 2021
aa520cc
issue #172: TestNG has the wrong module name for versions 7.0.0 and a…
siordache Mar 21, 2021
9ae8fcf
fix CompileTestTask
siordache Mar 22, 2021
4ea3bc3
Test Gradle 7.0 compatibility
siordache Mar 29, 2021
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
1 change: 0 additions & 1 deletion src/main/java/org/javamodularity/moduleplugin/TestEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

public enum TestEngine {
JUNIT_4("junit", "junit", "junit", "junit"),
<<<<<<< HEAD
JUNIT_5_API("org.junit.jupiter", ".*", "org.junit.jupiter.api", "org.junit.platform.commons"),
JUNIT_5("org.junit.jupiter", ".*", "org.junit.jupiter.api", "org.junit.jupiter.api"),
JUNIT_5_PARAMS("org.junit.jupiter", "junit-jupiter-params", "org.junit.jupiter.params", "org.junit.platform.commons"),
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/javamodularity/moduleplugin/tasks/ModuleInfoTestHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ static void mutateArgs(Project project, Consumer<String> consumer) {

var files = testSourceSet.getAllSource().matching(f -> f.include("module-info.test"));
if (files.isEmpty()) {
LOGGER.debug("File 'module-info.test' is not present in {}", project);
LOGGER.info("File 'module-info.test' is not present in {}", project);
return;
}

var moduleInfoTestPath = files.getSingleFile().toPath();
LOGGER.debug("Using lines of '{}' to patch module {}...", moduleInfoTestPath, moduleName);
LOGGER.info("Using lines of '{}' to patch module {}...", moduleInfoTestPath, moduleName);
try (var lines = Files.lines(moduleInfoTestPath)) {
lines.map(String::trim)
.filter(line -> !line.isEmpty())
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/javamodularity/moduleplugin/tasks/TestTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public void execute(Task task) {

List<String> args = buildJvmArgs(testJava, testModuleOptions);
testJava.setJvmArgs(args);
LOGGER.info("jvmArgs for task {}: {}", task.getName(), args);
testJava.setClasspath(project.files());
}
});
Expand Down
14 changes: 7 additions & 7 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 @@ -38,7 +38,7 @@ void before() throws IOException {

@CartesianProductTest(name = "smokeTest({arguments})")
@CartesianValueSource(strings = {"test-project", "test-project-kotlin", "test-project-groovy"})
@CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0-milestone-3"})
@CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0-rc-1"})
void smokeTest(String projectName, String gradleVersion) {
LOGGER.info("Executing smokeTest with Gradle {}", gradleVersion);
var result = GradleRunner.create()
Expand All @@ -61,7 +61,7 @@ void smokeTest(String projectName, String gradleVersion) {
@CartesianProductTest(name = "smokeTestRun({arguments})")
@CartesianValueSource(strings = {"test-project", "test-project-kotlin", "test-project-groovy"})
// Fails with Gradle versions >= 6.6. See https://github.com/java9-modularity/gradle-modules-plugin/issues/165
@CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1"/*, "6.8.3", "7.0-milestone-3"*/})
@CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1"/*, "6.8.3", "7.0-rc-1"*/})
void smokeTestRun(String projectName, String gradleVersion) {
LOGGER.info("Executing smokeTestRun with Gradle {}", gradleVersion);
var writer = new StringWriter(256);
Expand All @@ -85,7 +85,7 @@ void smokeTestRun(String projectName, String gradleVersion) {

@CartesianProductTest(name = "smokeTestJunit5({arguments})")
@CartesianValueSource(strings = {"5.4.2/1.4.2", "5.5.2/1.5.2", "5.7.1/1.7.1"})
@CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0-milestone-3"})
@CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0-rc-1"})
void smokeTestJunit5(String junitVersionPair, String gradleVersion) {
LOGGER.info("Executing smokeTestJunit5 with Gradle {}", gradleVersion);
var junitVersionParts = junitVersionPair.split("/");
Expand All @@ -107,7 +107,7 @@ void smokeTestJunit5(String junitVersionPair, String gradleVersion) {

@CartesianProductTest(name = "smokeTestMixed({arguments})")
// It currently fails with Gradle 7.0
@CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3"/*, "7.0-milestone-3"*/})
@CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3"/*, "7.0-rc-1"*/})
void smokeTestMixed(String gradleVersion) {
LOGGER.info("Executing smokeTestMixed with Gradle {}", gradleVersion);
var result = GradleRunner.create()
Expand Down Expand Up @@ -159,7 +159,7 @@ private static void assertExpectedClassFileFormats(

@CartesianProductTest(name = "smokeTestDist({arguments})")
@CartesianValueSource(strings = {"test-project", "test-project-kotlin", "test-project-groovy"})
@CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0-milestone-3"})
@CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0-rc-1"})
void smokeTestDist(String projectName, String gradleVersion) {
LOGGER.info("Executing smokeTestDist with Gradle {}", gradleVersion);
var result = GradleRunner.create()
Expand Down Expand Up @@ -199,7 +199,7 @@ void smokeTestDist(String projectName, String gradleVersion) {

@CartesianProductTest(name = "smokeTestRunDemo({arguments})")
@CartesianValueSource(strings = {"test-project", "test-project-kotlin", "test-project-groovy"})
@CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0-milestone-3"})
@CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0-rc-1"})
void smokeTestRunDemo(String projectName, String gradleVersion) {
LOGGER.info("Executing smokeTestRunDemo with Gradle {}", gradleVersion);
var result = GradleRunner.create()
Expand All @@ -217,7 +217,7 @@ void smokeTestRunDemo(String projectName, String gradleVersion) {
@CartesianProductTest(name = "smokeTestRunStartScripts({arguments})")
@CartesianValueSource(strings = {"test-project", "test-project-kotlin", "test-project-groovy"})
// Fails with Gradle versions >= 6.6. See https://github.com/java9-modularity/gradle-modules-plugin/issues/165
@CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1"/*, "6.8.3", "7.0-milestone-3"*/})
@CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1"/*, "6.8.3", "7.0-rc-1"*/})
void smokeTestRunStartScripts(String projectName, String gradleVersion) {
LOGGER.info("Executing smokeTestRunScripts with Gradle {}", gradleVersion);
var result = GradleRunner.create()
Expand Down