OpenJDK / jigsaw / jake / langtools

--- a/test/tools/javac/modules/ModuleTestBase.java	Fri Oct 23 15:11:57 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.lang.annotation.Annotation;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
-/**
- * Base class for module tests.
- */
-class ModuleTestBase {
-    protected ToolBox tb;
-    protected PrintStream out;
-    private int errors;
-
-    /** Marker annotation for test methods to be invoked by runTests. */
-    @Retention(RetentionPolicy.RUNTIME)
-    @interface Test { }
-
-    /**
-     * Run all methods annotated with @Test, and throw an exception if any
-     * errors are reported..
-     * @throws Exception if any errors occurred
-     */
-    void runTests() throws Exception {
-        if (tb == null)
-            tb = new ToolBox();
-        out = System.err;
-
-        for (Method m: getClass().getDeclaredMethods()) {
-            Annotation a = m.getAnnotation(Test.class);
-            if (a != null) {
-                try {
-                    out.println("Running test " + m.getName());
-                    Path baseDir = Paths.get(m.getName());
-                    m.invoke(this, new Object[] { baseDir });
-                } catch (InvocationTargetException e) {
-                    Throwable cause = e.getCause();
-                    error("Exception: " + e.getCause());
-                    cause.printStackTrace(out);
-                }
-                out.println();
-            }
-        }
-        if (errors > 0)
-            throw new Exception(errors + " errors occurred");
-    }
-
-    // move to ToolBox?
-    // change returntyp to List<Path> -- means updating ToolBox methods
-    Path[] findJavaFiles(Path p) throws IOException {
-        Set<Path> files = new TreeSet<>();
-        Files.walkFileTree(p, new SimpleFileVisitor<Path>() {
-            @Override
-            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
-                    throws IOException {
-                if (file.getFileName().toString().endsWith(".java")) {
-                    files.add(file);
-                }
-                return FileVisitResult.CONTINUE;
-            }
-
-        });
-        return files.toArray(new Path[files.size()]);
-    }
-
-    void error(String message) {
-        out.println("Error: " + message);
-        errors++;
-    }
-
-    public class ModuleBuilder {
-
-        private final String name;
-        private String requires = "";
-        private String exports = "";
-        private String modulePath = "";
-        private List<String> content = new ArrayList<>();
-
-        public ModuleBuilder(String name) {
-            this.name = name;
-        }
-
-        public ModuleBuilder requires(String requires, Path modulePath) {
-            this.requires += "    requires " + requires + ";\n";
-            this.modulePath += File.pathSeparator + modulePath;
-            return this;
-        }
-
-        public ModuleBuilder exports(String exports) {
-            this.exports += "    exports " + exports + ";\n";
-            return this;
-        }
-
-        public ModuleBuilder classes(String... content) {
-            this.content.addAll(Arrays.asList(content));
-            return this;
-        }
-
-        public void build(Path where) throws IOException {
-            Files.createDirectories(where);
-            List<String> sources = new ArrayList<>();
-            sources.add("module " + name + "{"
-                    + requires
-                    + exports
-                    + "}");
-            sources.addAll(content);
-            tb.writeJavaFiles(where.resolve(name), sources.toArray(new String[]{}));
-
-            tb.new JavacTask()
-                    .outdir(where)
-                    .options("-modulesourcepath", where.toString(),
-                            "-mp", modulePath)
-                    .files(findJavaFiles(where))
-                    .run()
-                    .writeAll();
-        }
-    }
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/lib/ModuleTestBase.java	Fri Oct 23 18:02:42 2015 -0700
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+/**
+ * Base class for module tests.
+ */
+public class ModuleTestBase {
+    protected ToolBox tb;
+    protected PrintStream out;
+    private int errors;
+
+    /** Marker annotation for test methods to be invoked by runTests. */
+    @Retention(RetentionPolicy.RUNTIME)
+    @interface Test { }
+
+    /**
+     * Run all methods annotated with @Test, and throw an exception if any
+     * errors are reported..
+     * @throws Exception if any errors occurred
+     */
+    void runTests() throws Exception {
+        if (tb == null)
+            tb = new ToolBox();
+        out = System.err;
+
+        for (Method m: getClass().getDeclaredMethods()) {
+            Annotation a = m.getAnnotation(Test.class);
+            if (a != null) {
+                try {
+                    out.println("Running test " + m.getName());
+                    Path baseDir = Paths.get(m.getName());
+                    m.invoke(this, new Object[] { baseDir });
+                } catch (InvocationTargetException e) {
+                    Throwable cause = e.getCause();
+                    error("Exception: " + e.getCause());
+                    cause.printStackTrace(out);
+                }
+                out.println();
+            }
+        }
+        if (errors > 0)
+            throw new Exception(errors + " errors occurred");
+    }
+
+    // move to ToolBox?
+    // change returntyp to List<Path> -- means updating ToolBox methods
+    Path[] findJavaFiles(Path p) throws IOException {
+        Set<Path> files = new TreeSet<>();
+        Files.walkFileTree(p, new SimpleFileVisitor<Path>() {
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
+                    throws IOException {
+                if (file.getFileName().toString().endsWith(".java")) {
+                    files.add(file);
+                }
+                return FileVisitResult.CONTINUE;
+            }
+
+        });
+        return files.toArray(new Path[files.size()]);
+    }
+
+    void error(String message) {
+        out.println("Error: " + message);
+        errors++;
+    }
+
+    public class ModuleBuilder {
+
+        private final String name;
+        private String requires = "";
+        private String exports = "";
+        private String modulePath = "";
+        private List<String> content = new ArrayList<>();
+
+        public ModuleBuilder(String name) {
+            this.name = name;
+        }
+
+        public ModuleBuilder requires(String requires, Path modulePath) {
+            this.requires += "    requires " + requires + ";\n";
+            this.modulePath += File.pathSeparator + modulePath;
+            return this;
+        }
+
+        public ModuleBuilder exports(String exports) {
+            this.exports += "    exports " + exports + ";\n";
+            return this;
+        }
+
+        public ModuleBuilder classes(String... content) {
+            this.content.addAll(Arrays.asList(content));
+            return this;
+        }
+
+        public void build(Path where) throws IOException {
+            Files.createDirectories(where);
+            List<String> sources = new ArrayList<>();
+            sources.add("module " + name + "{"
+                    + requires
+                    + exports
+                    + "}");
+            sources.addAll(content);
+            tb.writeJavaFiles(where.resolve(name), sources.toArray(new String[]{}));
+
+            tb.new JavacTask()
+                    .outdir(where)
+                    .options("-modulesourcepath", where.toString(),
+                            "-mp", modulePath)
+                    .files(findJavaFiles(where))
+                    .run()
+                    .writeAll();
+        }
+    }
+}