changeset 14418:5a2605c6b1a0

8156781: change to jlink has result in test failure Reviewed-by: redestad
author jlaskey
date Wed, 11 May 2016 16:17:45 -0300
parents 53be425cbb83
children 77f87ce87d2f
files test/ProblemList.txt test/tools/jlink/JLinkTest.java test/tools/jlink/plugins/OrderResourcesPluginTest.java test/tools/jlink/plugins/SorterPluginTest.java
diffstat 4 files changed, 145 insertions(+), 142 deletions(-) [+]
line wrap: on
line diff
--- a/test/ProblemList.txt	Wed May 11 14:01:29 2016 -0400
+++ b/test/ProblemList.txt	Wed May 11 16:17:45 2016 -0300
@@ -386,7 +386,6 @@
 # core_tools
 
 tools/jimage/JImageTest.java                                    8150975 linux-i586,windows-i586
-tools/jlink/plugins/SorterPluginTest.java                       generic-all
 
 ############################################################################
 
--- a/test/tools/jlink/JLinkTest.java	Wed May 11 14:01:29 2016 -0400
+++ b/test/tools/jlink/JLinkTest.java	Wed May 11 16:17:45 2016 -0300
@@ -162,7 +162,7 @@
         {
             String[] userOptions2 = {"--compress=2:compress-filter=^/java.base/*",
                 "--strip-debug", "--exclude-resources",
-                "*.jcov, */META-INF/*", "--sort-resources",
+                "*.jcov, */META-INF/*", "--order-resources",
                 "*/module-info.class,/sortcomposite2/*,*/javax/management/*"};
             String moduleName = "excludezipfilterskipdebugcomposite2";
             helper.generateDefaultJModule(moduleName, "composite2");
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/jlink/plugins/OrderResourcesPluginTest.java	Wed May 11 16:17:45 2016 -0300
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 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.
+ */
+
+/*
+ * @test
+ * @summary Test sorter plugin
+ * @author Jean-Francois Denise
+ * @modules jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.internal.plugins
+ * @run main OrderResourcesPluginTest
+ */
+
+import java.io.File;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import jdk.tools.jlink.internal.PoolImpl;
+
+import jdk.tools.jlink.internal.plugins.OrderResourcesPlugin;
+import jdk.tools.jlink.plugin.Pool;
+import jdk.tools.jlink.plugin.Pool.ModuleData;
+import jdk.tools.jlink.plugin.TransformerPlugin;
+
+public class OrderResourcesPluginTest {
+
+    public static void main(String[] args) throws Exception {
+        new OrderResourcesPluginTest().test();
+    }
+
+    public void test() throws Exception {
+        ModuleData[] array = {
+                Pool.newResource("/module1/toto1.class", new byte[0]),
+                Pool.newResource("/module2/toto2.class", new byte[0]),
+                Pool.newResource("/module3/toto3.class", new byte[0]),
+                Pool.newResource("/module3/toto3/module-info.class", new byte[0]),
+                Pool.newResource("/zazou/toto.class", new byte[0]),
+                Pool.newResource("/module4/zazou.class", new byte[0]),
+                Pool.newResource("/module5/toto5.class", new byte[0]),
+                Pool.newResource("/module6/toto6/module-info.class", new byte[0])
+        };
+
+        ModuleData[] sorted = {
+                Pool.newResource("/zazou/toto.class", new byte[0]),
+                Pool.newResource("/module3/toto3/module-info.class", new byte[0]),
+                Pool.newResource("/module6/toto6/module-info.class", new byte[0]),
+                Pool.newResource("/module1/toto1.class", new byte[0]),
+                Pool.newResource("/module2/toto2.class", new byte[0]),
+                Pool.newResource("/module3/toto3.class", new byte[0]),
+                Pool.newResource("/module4/zazou.class", new byte[0]),
+                Pool.newResource("/module5/toto5.class", new byte[0])
+        };
+
+        ModuleData[] sorted2 = {
+            Pool.newResource("/module5/toto5.class", new byte[0]),
+            Pool.newResource("/module6/toto6/module-info.class", new byte[0]),
+            Pool.newResource("/module4/zazou.class", new byte[0]),
+            Pool.newResource("/module3/toto3.class", new byte[0]),
+            Pool.newResource("/module3/toto3/module-info.class", new byte[0]),
+            Pool.newResource("/module1/toto1.class", new byte[0]),
+            Pool.newResource("/module2/toto2.class", new byte[0]),
+            Pool.newResource("/zazou/toto.class", new byte[0])
+        };
+
+        Pool resources = new PoolImpl();
+        for (ModuleData r : array) {
+            resources.add(r);
+        }
+
+        {
+            Pool out = new PoolImpl();
+            Map<String, String> config = new HashMap<>();
+            config.put(OrderResourcesPlugin.NAME, "/zazou/*,*/module-info.class");
+            TransformerPlugin p = new OrderResourcesPlugin();
+            p.configure(config);
+            p.visit(resources, out);
+            check(out.getContent(), sorted);
+        }
+
+        {
+            // Order of resources in the file, then un-ordered resources.
+            File order = new File("resources.order");
+            order.createNewFile();
+            StringBuilder builder = new StringBuilder();
+            // 5 first resources come from file
+            for (int i = 0; i < 5; i++) {
+                String path = sorted2[i].getPath();
+                int index = path.indexOf('/', 1);
+                path = path.substring(index + 1, path.length() - ".class".length());
+                builder.append(path).append("\n");
+            }
+            Files.write(order.toPath(), builder.toString().getBytes());
+
+            Pool out = new PoolImpl();
+            Map<String, String> config = new HashMap<>();
+            config.put(OrderResourcesPlugin.NAME, "@" + order.getAbsolutePath());
+            TransformerPlugin p = new OrderResourcesPlugin();
+            p.configure(config);
+            p.visit(resources, out);
+            check(out.getContent(), sorted2);
+
+        }
+    }
+
+    private void check(Collection<ModuleData> outResources,
+            ModuleData[] sorted) {
+        if (outResources.size() != sorted.length) {
+            throw new AssertionError("Wrong number of resources:\n"
+                    + "expected: " + Arrays.toString(sorted) + ",\n"
+                    + "     got: " + outResources);
+        }
+        int i = 0;
+        for (ModuleData r : outResources) {
+            System.err.println("Resource: " + r);
+            if (!sorted[i].getPath().equals(r.getPath())) {
+                throw new AssertionError("Resource not properly sorted, difference at: " + i + "\n"
+                        + "expected: " + Arrays.toString(sorted) + ",\n"
+                        + "     got: " + outResources);
+            }
+            i++;
+        }
+    }
+}
--- a/test/tools/jlink/plugins/SorterPluginTest.java	Wed May 11 14:01:29 2016 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-/*
- * @test
- * @summary Test sorter plugin
- * @author Jean-Francois Denise
- * @modules jdk.jlink/jdk.tools.jlink.internal
- *          jdk.jlink/jdk.tools.jlink.internal.plugins
- * @run main SorterPluginTest
- */
-
-import java.io.File;
-import java.nio.file.Files;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import jdk.tools.jlink.internal.PoolImpl;
-
-import jdk.tools.jlink.internal.plugins.SortResourcesPlugin;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
-import jdk.tools.jlink.plugin.TransformerPlugin;
-
-public class SorterPluginTest {
-
-    public static void main(String[] args) throws Exception {
-        new SorterPluginTest().test();
-    }
-
-    public void test() throws Exception {
-        ModuleData[] array = {
-                Pool.newResource("/module1/toto1", new byte[0]),
-                Pool.newResource("/module2/toto1", new byte[0]),
-                Pool.newResource("/module3/toto1", new byte[0]),
-                Pool.newResource("/module3/toto1/module-info.class", new byte[0]),
-                Pool.newResource("/zazou/toto1", new byte[0]),
-                Pool.newResource("/module4/zazou", new byte[0]),
-                Pool.newResource("/module5/toto1", new byte[0]),
-                Pool.newResource("/module6/toto1/module-info.class", new byte[0])
-        };
-
-        ModuleData[] sorted = {
-                Pool.newResource("/zazou/toto1", new byte[0]),
-                Pool.newResource("/module3/toto1/module-info.class", new byte[0]),
-                Pool.newResource("/module6/toto1/module-info.class", new byte[0]),
-                Pool.newResource("/module1/toto1", new byte[0]),
-                Pool.newResource("/module2/toto1", new byte[0]),
-                Pool.newResource("/module3/toto1", new byte[0]),
-                Pool.newResource("/module4/zazou", new byte[0]),
-                Pool.newResource("/module5/toto1", new byte[0]),
-};
-
-        ModuleData[] sorted2 = {
-            Pool.newResource("/module5/toto1", new byte[0]),
-            Pool.newResource("/module6/toto1/module-info.class", new byte[0]),
-            Pool.newResource("/module4/zazou", new byte[0]),
-            Pool.newResource("/module3/toto1", new byte[0]),
-            Pool.newResource("/module3/toto1/module-info.class", new byte[0]),
-            Pool.newResource("/module1/toto1", new byte[0]),
-            Pool.newResource("/module2/toto1", new byte[0]),
-            Pool.newResource("/zazou/toto1", new byte[0]),};
-
-        Pool resources = new PoolImpl();
-        for (ModuleData r : array) {
-            resources.add(r);
-        }
-
-        {
-            Pool out = new PoolImpl();
-            Map<String, String> config = new HashMap<>();
-            config.put(SortResourcesPlugin.NAME, "/zazou/*,*/module-info.class");
-            TransformerPlugin p = new SortResourcesPlugin();
-            p.configure(config);
-            p.visit(resources, out);
-            check(out.getContent(), sorted);
-        }
-
-        {
-            // Order of resources in the file, then un-ordered resources.
-            File order = new File("resources.order");
-            order.createNewFile();
-            StringBuilder builder = new StringBuilder();
-            // 5 first resources come from file
-            for (int i = 0; i < 5; i++) {
-                builder.append(sorted2[i].getPath()).append("\n");
-            }
-            Files.write(order.toPath(), builder.toString().getBytes());
-
-            Pool out = new PoolImpl();
-            Map<String, String> config = new HashMap<>();
-            config.put(SortResourcesPlugin.NAME, order.getAbsolutePath());
-            TransformerPlugin p = new SortResourcesPlugin();
-            p.configure(config);
-            p.visit(resources, out);
-            check(out.getContent(), sorted2);
-
-        }
-    }
-
-    private void check(Collection<ModuleData> outResources,
-            ModuleData[] sorted) {
-        if (outResources.size() != sorted.length) {
-            throw new AssertionError("Wrong number of resources:\n"
-                    + "expected: " + Arrays.toString(sorted) + ",\n"
-                    + "     got: " + outResources);
-        }
-        int i = 0;
-        for (ModuleData r : outResources) {
-            System.err.println("Resource: " + r);
-            if (!sorted[i].getPath().equals(r.getPath())) {
-                throw new AssertionError("Resource not properly sorted, difference at: " + i + "\n"
-                        + "expected: " + Arrays.toString(sorted) + ",\n"
-                        + "     got: " + outResources);
-            }
-            i++;
-        }
-    }
-}