test/tools/javac/modules/ModuleFinderTest.java

@@ -36,11 +36,10 @@
 import java.nio.file.Path;
 
 import toolbox.JarTask;
 import toolbox.JavacTask;
 import toolbox.Task;
-import toolbox.ToolBox;
 
 public class ModuleFinderTest extends ModuleTestBase {
 
     public static void main(String... args) throws Exception {
         ModuleFinderTest t = new ModuleFinderTest();

@@ -48,11 +47,11 @@
     }
 
     @Test
     public void testDuplicateModulesOnPath(Path base) throws Exception {
         Path src = base.resolve("src");
-        tb.writeJavaFiles(src, "module m1 { }");
+        tb.writeJavaFiles(src, "module m1x { }");
 
         Path classes = base.resolve("classes");
         Files.createDirectories(classes);
         Path modules = base.resolve("modules");
         Files.createDirectories(modules);

@@ -61,31 +60,31 @@
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run()
                 .writeAll();
 
-        new JarTask(tb, modules.resolve("m1-1.jar"))
+        new JarTask(tb, modules.resolve("m1x-1.jar"))
                 .baseDir(classes)
                 .files(".")
                 .run();
 
-        new JarTask(tb, modules.resolve("m1-2.jar"))
+        new JarTask(tb, modules.resolve("m1x-2.jar"))
                 .baseDir(classes)
                 .files(".")
                 .run();
 
         Path src2 = base.resolve("src2");
-        tb.writeJavaFiles(src2, "module m2 { requires m1; }");
+        tb.writeJavaFiles(src2, "module m2x { requires m1x; }");
 
 
         String log = new JavacTask(tb, Task.Mode.CMDLINE)
                 .options("-XDrawDiagnostics", "--module-path", modules.toString())
                 .outdir(classes)
                 .files(findJavaFiles(src2))
                 .run(Task.Expect.FAIL)
                 .writeAll()
                 .getOutput(Task.OutputKind.DIRECT);
 
-        if (!log.contains("- compiler.err.duplicate.module.on.path: (compiler.misc.locn.module_path), m1"))
+        if (!log.contains("- compiler.err.duplicate.module.on.path: (compiler.misc.locn.module_path), m1x"))
             throw new Exception("expected output not found");
     }
 }