--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/tools/jlink/JLink2Test.java	Tue Sep 12 19:03:39 2017 +0200
@@ -0,0 +1,105 @@
+/*
+ * 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 image creation
+ * @author Jean-Francois Denise
+ * @library ../lib
+ * @modules java.base/jdk.internal.jimage
+ *          jdk.jdeps/com.sun.tools.classfile
+ *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
+ *          jdk.jlink/jdk.tools.jmod
+ *          jdk.jlink/jdk.tools.jimage
+ *          jdk.compiler
+ * @build tests.*
+ * @run main/othervm -verbose:gc -Xmx1g JLink2Test
+ */
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+import jdk.tools.jlink.internal.PluginRepository;
+import jdk.tools.jlink.plugin.Plugin;
+
+import tests.Helper;
+import tests.JImageGenerator;
+import tests.JImageValidator;
+
+public class JLink2Test {
+
+    public static void main(String[] args) throws Exception {
+        Helper helper = Helper.newHelper();
+        if (helper == null) {
+            System.err.println("Test not run");
+            return;
+        }
+        helper.generateDefaultModules();
+
+        // This test case must be first one, the JlinkTask is clean
+        // and reveals possible bug related to plugin options in defaults
+        testSameNames(helper);
+        testOptions();
+    }
+
+    private static void testSameNames(Helper helper) throws Exception {
+        // Multiple modules with the same name in modulepath, take the first one in the path.
+        // First jmods then jars. So jmods are found, jars are hidden.
+        String[] jarClasses = {"amodule.jar.Main"};
+        String[] jmodsClasses = {"amodule.jmods.Main"};
+        helper.generateDefaultJarModule("amodule", Arrays.asList(jarClasses));
+        helper.generateDefaultJModule("amodule", Arrays.asList(jmodsClasses));
+        List<String> okLocations = new ArrayList<>();
+        okLocations.addAll(Helper.toLocation("amodule", Arrays.asList(jmodsClasses)));
+        Path image = helper.generateDefaultImage(new String[0], "amodule").assertSuccess();
+        JImageValidator validator = new JImageValidator("amodule", okLocations,
+                image.toFile(), Collections.emptyList(), Collections.emptyList());
+        validator.validate();
+    }
+
+    private static void testOptions() throws Exception {
+        List<Plugin> builtInPlugins = new ArrayList<>();
+        builtInPlugins.addAll(PluginRepository.getPlugins(ModuleLayer.boot()));
+        if(builtInPlugins.isEmpty()) {
+            throw new Exception("No builtin plugins");
+        }
+        List<String> options = new ArrayList<>();
+        for (Plugin p : builtInPlugins) {
+            if (p.getOption() == null) {
+                throw new Exception("Null option for " + p.getName());
+            }
+            if (options.contains(p.getName())) {
+                throw new Exception("Option " + p.getOption() + " used more than once");
+            }
+            options.add(p.getName());
+        }
+    }
+}