Skip to content

Commit 44c57b5

Browse files
committed
shitty module system
1 parent 582e065 commit 44c57b5

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

junit-jupiter-api/src/main/java/module-info.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,11 @@
3030
exports org.junit.jupiter.api.function;
3131
exports org.junit.jupiter.api.io;
3232
exports org.junit.jupiter.api.parallel;
33-
exports org.junit.jupiter.api.locale to org.junit.platform.commons;
3433
exports org.junit.jupiter.api.timeout to org.junit.jupiter.engine;
35-
exports org.junit.jupiter.api.timezone to org.junit.platform.commons;
34+
exports org.junit.jupiter.api.locale to org.junit.platform.engine;
35+
exports org.junit.jupiter.api.timezone to org.junit.platform.engine;
3636

3737
opens org.junit.jupiter.api.condition to org.junit.platform.commons;
3838
opens org.junit.jupiter.api.locale to org.junit.platform.commons;
39-
opens org.junit.jupiter.api.timeout to org.junit.platform.commons;
4039
opens org.junit.jupiter.api.timezone to org.junit.platform.commons;
4140
}

platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,24 +47,26 @@ class ModularUserGuideTests {
4747
@SuppressWarnings("removal")
4848
open module documentation {
4949
exports example.testkit; // just here to ensure documentation example sources are compiled
50-
50+
5151
requires org.junit.jupiter.api;
52+
requires org.junit.jupiter.api.locale;
53+
requires org.junit.jupiter.api.timezone;
5254
requires org.junit.jupiter.migrationsupport;
5355
requires org.junit.jupiter.params;
54-
56+
5557
requires org.junit.platform.engine;
5658
requires org.junit.platform.reporting;
5759
requires org.junit.platform.suite;
5860
requires org.junit.platform.testkit;
59-
61+
6062
// Byte Buddy is used by AssertJ's soft assertions which are used by the Engine Test Kit
6163
requires net.bytebuddy;
62-
64+
6365
requires java.desktop;
6466
requires java.logging;
6567
requires java.scripting;
6668
requires jdk.httpserver;
67-
69+
6870
provides org.junit.platform.launcher.LauncherSessionListener
6971
with example.session.GlobalSetupTeardownListener;
7072
}
@@ -90,8 +92,8 @@ private static List<String> compile(Path temp, Writer out, Writer err) throws Ex
9092
args.add(lib.toString());
9193

9294
args.add("--patch-module");
93-
args.add("documentation=" + Path.of("../documentation/src/main/java") + File.pathSeparator
94-
+ Path.of("../documentation/src/test/java"));
95+
args.add("documentation=" + Path.of("../documentation/src/main/java") + File.pathSeparator + Path.of(
96+
"../documentation/src/test/java"));
9597

9698
args.add("--module-source-path");
9799
args.add(temp.resolve("src").toString());
@@ -122,8 +124,8 @@ private static void junit(Path temp, OutputFiles outputFiles) throws Exception {
122124
.addArguments("-XX:StartFlightRecording:filename=" + temp.resolve("user-guide.jfr")) //
123125
.addArguments("--show-version", "--show-module-resolution") //
124126
.addArguments("--module-path", String.join(File.pathSeparator, //
125-
temp.resolve("destination").toString(), //
126-
temp.resolve("lib").toString() //
127+
temp.resolve("destination").toString(), //
128+
temp.resolve("lib").toString() //
127129
)) //
128130
.addArguments("--add-modules", "documentation") //
129131
.addArguments("--patch-module", "documentation=" + projectDir.resolve("src/test/resources")) //
@@ -155,11 +157,11 @@ void runTestsFromUserGuideWithinModularBoundaries(@TempDir Path temp,
155157
assertTrue(err.toString().isBlank(), () -> err + "\n\n" + String.join("\n", args));
156158
var listing = treeWalk(temp);
157159
assertLinesMatch(List.of( //
158-
"destination", //
159-
">> CLASSES AND JARS >>", //
160-
"src", //
161-
"src/documentation", //
162-
"src/documentation/module-info.java" //
160+
"destination", //
161+
">> CLASSES AND JARS >>", //
162+
"src", //
163+
"src/documentation", //
164+
"src/documentation/module-info.java" //
163165
), listing);
164166

165167
junit(temp, outputFiles);

0 commit comments

Comments
 (0)