functional/appBundlerTestsJDK9/appBundlerTestsJDK9/test/com/oracle/appbundlers/tests/functionality/InstallDirTest.java

@@ -7,21 +7,25 @@
 
 import static com.oracle.appbundlers.utils.BundlerUtils.EXE;
 import static com.oracle.appbundlers.utils.BundlerUtils.MSI;
 import static com.oracle.appbundlers.utils.Config.CONFIG_INSTANCE;
 import static com.oracle.appbundlers.utils.Config.LICENSE_FILE_NAME;
+import static java.util.stream.Collectors.toSet;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
 
 import com.oracle.appbundlers.tests.functionality.functionalinterface.AdditionalParams;
+import com.oracle.appbundlers.tests.functionality.functionalinterface.BasicParams;
+import com.oracle.appbundlers.utils.AppWrapper;
 import com.oracle.appbundlers.utils.BundlerUtils;
 import com.oracle.appbundlers.utils.ExtensionType;
 import com.oracle.tools.packager.RelativeFileSet;
+import com.oracle.tools.packager.StandardBundlerParam;
 
 /**
  * @author Dmitriy Ermashov <dmitriy.ermashov@oracle.com>
  */
 

@@ -42,16 +46,34 @@
     @Override
     protected BundlerUtils[] getBundlerUtils() {
         return new BundlerUtils[] { EXE, MSI };
     }
 
+    public BasicParams getBasicParams() {
+        return (AppWrapper app) -> {
+
+            Map<String, Object> basicParams = new HashMap<String, Object>();
+            basicParams
+                    .put(APP_RESOURCES,
+                            new RelativeFileSet(app.getJarDir().toFile(),
+                                    app.getJarFilesList().stream()
+                                            .map(Path::toFile)
+                                            .collect(toSet())));
+            String mainClass = StandardBundlerParam.MAIN_CLASS
+                    .fetchFrom(basicParams);
+            basicParams.put(APPLICATION_CLASS, mainClass);
+
+            RelativeFileSet appResources = (RelativeFileSet) basicParams
+                    .get(APP_RESOURCES);
+            appResources.getIncludedFiles().add(LICENSE_FILE_NAME);
+            return basicParams;
+        };
+    }
+
     public AdditionalParams getAdditionalParams() {
         return () -> {
             Map<String, Object> additionalParams = new HashMap<>();
-            RelativeFileSet appResources = (RelativeFileSet) additionalParams
-                    .get(APP_RESOURCES);
-            appResources.getIncludedFiles().add(LICENSE_FILE_NAME);
             additionalParams.put(INSTALLDIR_CHOOSER, "true");
             additionalParams.put(LICENSE_FILE, LICENSE_FILE_NAME);
             return additionalParams;
         };
     }

@@ -68,7 +90,8 @@
 
     @Override
     public void overrideParameters(ExtensionType intermediate)
             throws IOException {
         this.currentParameter.setAdditionalParams(getAdditionalParams());
+        this.currentParameter.setBasicParams(getBasicParams());
     }
 }