Skip to content

Commit bd763e2

Browse files
committed
Streamline test setups
1 parent 0c1329d commit bd763e2

File tree

3 files changed

+34
-23
lines changed

3 files changed

+34
-23
lines changed

src/test/groovy/org/gradlex/javamodule/testing/test/CustomizationTest.groovy

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class CustomizationTest extends Specification {
2020
}
2121
'''
2222
appModuleInfoFile << '''
23-
module org.gradlex.test.app {
23+
module org.example.app {
2424
}
2525
'''
2626

@@ -38,11 +38,13 @@ class CustomizationTest extends Specification {
3838
javaModuleTesting.blackbox(testing.suites["test"])
3939
'''
4040
appModuleInfoFile << '''
41-
module org.gradlex.test.app {
41+
module org.example.app {
42+
exports org.example.app;
4243
}
4344
'''
4445
appTestModuleInfoFile << '''
45-
module org.gradlex.test.app.test {
46+
open module org.example.app.test {
47+
requires org.example.app;
4648
requires org.junit.jupiter.api;
4749
}
4850
'''

src/test/groovy/org/gradlex/javamodule/testing/test/JavaModuleDependenciesBridgeTest.groovy

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package org.gradlex.javamodule.testing.test
22

33
import org.gradle.testkit.runner.TaskOutcome
44
import org.gradlex.javamodule.testing.test.fixture.GradleBuild
5-
import spock.lang.Ignore
65
import spock.lang.Specification
76

87
class JavaModuleDependenciesBridgeTest extends Specification {
@@ -14,20 +13,20 @@ class JavaModuleDependenciesBridgeTest extends Specification {
1413
given:
1514
appBuildFile << '''
1615
javaModuleDependencies {
17-
moduleNameToGA.put("com.example.lib", "com.example:lib")
16+
moduleNameToGA.put("org.example.lib", "org.example:lib")
1817
}
1918
javaModuleTesting.whitebox(testing.suites["test"]) {
2019
requires.add("org.junit.jupiter.api")
21-
requires.add("com.example.lib")
20+
requires.add("org.example.lib")
2221
opensTo.add("org.junit.platform.commons")
2322
}
2423
'''
2524
appModuleInfoFile << '''
26-
module com.example.app {
25+
module org.example.app {
2726
}
2827
'''
2928
libModuleInfoFile << '''
30-
module com.example.lib {
29+
module org.example.lib {
3130
}
3231
'''
3332

@@ -42,20 +41,20 @@ class JavaModuleDependenciesBridgeTest extends Specification {
4241
given:
4342
appBuildFile << '''
4443
javaModuleDependencies {
45-
moduleNamePrefixToGroup.put("com.example.", "com.example")
44+
moduleNamePrefixToGroup.put("org.example.", "org.example")
4645
}
4746
javaModuleTesting.whitebox(testing.suites["test"]) {
4847
requires.add("org.junit.jupiter.api")
49-
requires.add("com.example.lib")
48+
requires.add("org.example.lib")
5049
opensTo.add("org.junit.platform.commons")
5150
}
5251
'''
5352
appModuleInfoFile << '''
54-
module com.example.app {
53+
module org.example.app {
5554
}
5655
'''
5756
libModuleInfoFile << '''
58-
module com.example.lib {
57+
module org.example.lib {
5958
}
6059
'''
6160

@@ -76,22 +75,22 @@ class JavaModuleDependenciesBridgeTest extends Specification {
7675
}
7776
}
7877
javaModuleDependencies {
79-
moduleNameToGA.put("com.example.lib", "com.example:lib")
78+
moduleNameToGA.put("org.example.lib", "org.example:lib")
8079
}
8180
javaModuleTesting.whitebox(testing.suites["test"]) {
8281
requires.add("org.junit.jupiter.api")
83-
requires.add("com.example.lib")
82+
requires.add("org.example.lib")
8483
opensTo.add("org.junit.platform.commons")
8584
}
8685
'''
8786
appModuleInfoFile << '''
88-
module com.example.app {
87+
module org.example.app {
8988
requires org.slf4j;
9089
requires /*runtime*/ org.slf4j.simple;
9190
}
9291
'''
9392
libModuleInfoFile << '''
94-
module com.example.lib {
93+
module org.example.lib {
9594
}
9695
'''
9796

src/test/groovy/org/gradlex/javamodule/testing/test/fixture/GradleBuild.groovy

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,24 +42,34 @@ class GradleBuild {
4242
id("org.gradlex.java-module-testing")
4343
id("application")
4444
}
45-
group = "com.example"
45+
group = "org.example"
4646
dependencies {
4747
testImplementation(platform("org.junit:junit-bom:5.9.0"))
4848
}
4949
application {
50-
mainModule.set("org.gradlex.test.app")
51-
mainClass.set("org.gradlex.test.app.Main")
50+
mainModule.set("org.example.app")
51+
mainClass.set("org.example.app.Main")
5252
}
5353
'''
54-
file("app/src/test/java/com/example/AppTest.java") << '''
55-
package com.example;
54+
file("app/src/main/java/org/example/app/Main.java") << '''
55+
package org.example.app;
56+
57+
public class Main {
58+
public void main(String... args) {
59+
}
60+
}
61+
'''
62+
file("app/src/test/java/org/example/app/test/MainTest.java") << '''
63+
package org.example.app.test;
5664
5765
import org.junit.jupiter.api.Test;
66+
import org.example.app.Main;
5867
59-
public class AppTest {
68+
public class MainTest {
6069
6170
@Test
6271
void testApp() {
72+
new Main();
6373
}
6474
}
6575
'''
@@ -70,7 +80,7 @@ class GradleBuild {
7080
id("org.gradlex.java-module-testing")
7181
id("java-library")
7282
}
73-
group = "com.example"
83+
group = "org.example"
7484
'''
7585
}
7686

0 commit comments

Comments
 (0)