Skip to content

Remove timing from source compilation test #45

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
DanielThomas merged 1 commit into from
Sep 25, 2026
+9 −29
Merged

Remove timing from source compilation test #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 9 additions & 29 deletions ...ols.jig.test/com/netflix/tools/jig/test/module/SourceModuleResolutionIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,10 @@
import java.io.IOException;
import java.lang.classfile.ClassFile;
import java.lang.module.ResolutionException;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.tools.Diagnostic.Kind;

import com.netflix.module.ModuleRuntimeAccessAttribute;
import com.netflix.module.compile.ModuleCompiler;
Expand Down Expand Up @@ -292,33 +286,16 @@ public class Example {
}

@Test
void compilesIndependentSourceModulesConcurrently(@TempDir Path tempDir) throws Exception {
void compilesIndependentSourceModules(@TempDir Path tempDir) throws Exception {
var sourceRoot = tempDir.resolve("src");
for (var moduleName : List.of("first.mod", "second.mod")) {
var module = Files.createDirectories(sourceRoot.resolve(moduleName));
Files.writeString(module.resolve("module-info.java"), "module " + moduleName + " {}\n");
var packageDirectory = Files.createDirectories(module.resolve("p"));
Files.writeString(packageDirectory.resolve("Broken.java"), "package p; class Broken { Missing type; }\n");
Files.writeString(packageDirectory.resolve("Example.java"), "package p; public class Example {}\n");
}

var diagnostics = ConcurrentHashMap.<URI>newKeySet();
var entered = new CountDownLatch(2);
var concurrent = new AtomicBoolean(true);
var compiler = new ModuleCompiler(tempDir.resolve("cache"),
diagnostic -> {
if (diagnostic.getKind() != Kind.ERROR || diagnostic.getSource() == null || !diagnostics.add(diagnostic.getSource().toUri())) {
return;
}
entered.countDown();
try {
if (!entered.await(30, TimeUnit.SECONDS)) {
concurrent.set(false);
}
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
concurrent.set(false);
}
});
var compiler = new ModuleCompiler(tempDir.resolve("cache"));
var finder = SourceModuleFinder.of(sourceRoot);
var references = List.of("first.mod", "second.mod").stream()
.map(name -> (SourceModuleReference) finder.find(name).orElseThrow())
Expand All @@ -329,9 +306,12 @@ void compilesIndependentSourceModulesConcurrently(@TempDir Path tempDir) throws
null, null);
references.forEach(reference -> reference.bind(environment));

assertThrows(IOException.class, () -> SourceModuleReference.compileAll(references));
assertTrue(concurrent.get());
assertEquals(0, entered.getCount());
SourceModuleReference.compileAll(references);
for (var reference : references) {
try (var reader = reference.open()) {
assertTrue(reader.find("p/Example.class").isPresent());
}
}
}

@Test
Expand Down
Loading