modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacDmgBundlerTest.java

rev 9619 : imported patch 9-jake-fxpackager.patch

@@ -166,11 +166,11 @@
         bundleParams.put(VERBOSE.getID(), true);
         bundleParams.put(SYSTEM_WIDE.getID(), false);
         bundleParams.put(SIMPLE_DMG.getID(), simple_dmg);
 
         if (runtimeJdk != null) {
-            bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
+//FIXME            bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
         }
 
         boolean valid = bundler.validate(bundleParams);
         assertTrue(valid);
 

@@ -203,11 +203,11 @@
 
         bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
         bundleParams.put(SIMPLE_DMG.getID(), simple_dmg);
 
         if (runtimeJdk != null) {
-            bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
+//FIXME            bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
         }
 
         boolean valid = bundler.validate(bundleParams);
         assertTrue(valid);
 

@@ -235,11 +235,11 @@
         bundleParams.put(TITLE.getID(), "ХеллоВорлд аппликейшн");
         bundleParams.put(VENDOR.getID(), "Оракл девелопмент");
         bundleParams.put(DESCRIPTION.getID(), "крайне большое описание со странными символами");
 
         if (runtimeJdk != null) {
-            bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
+//FIXME            bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
         }
 
         bundler.validate(bundleParams);
 
         File output = bundler.execute(bundleParams, new File(workDir, "Unicode"));

@@ -267,11 +267,11 @@
         appBundleParams.put(APP_NAME.getID(), "External APP DMG Test");
         appBundleParams.put(IDENTIFIER.getID(), "com.example.dmg.external");
         appBundleParams.put(VERBOSE.getID(), true);
 
         if (runtimeJdk != null) {
-            appBundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
+//FIXME            appBundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
         }
 
         boolean valid = appBundler.validate(appBundleParams);
         assertTrue(valid);
 

@@ -293,11 +293,11 @@
 
         dmgBundleParams.put(SIMPLE_DMG.getID(), simple_dmg);
         dmgBundleParams.put(VERBOSE.getID(), true);
 
         if (runtimeJdk != null) {
-            dmgBundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
+//FIXME            dmgBundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
         }
 
         valid = dmgBundler.validate(dmgBundleParams);
         assertTrue(valid);
 

@@ -324,11 +324,11 @@
         appBundleParams.put(APP_NAME.getID(), "External APP DMG Test");
         appBundleParams.put(IDENTIFIER.getID(), "com.example.dmg.external");
         appBundleParams.put(VERBOSE.getID(), true);
 
         if (runtimeJdk != null) {
-            appBundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
+//FIXME            appBundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
         }
 
         boolean valid = appBundler.validate(appBundleParams);
         assertTrue(valid);
 

@@ -351,11 +351,11 @@
 
         dmgBundleParams.put(SIMPLE_DMG.getID(), simple_dmg);
         dmgBundleParams.put(VERBOSE.getID(), true);
 
         if (runtimeJdk != null) {
-            dmgBundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
+//FIXME            dmgBundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
         }
 
         valid = dmgBundler.validate(dmgBundleParams);
         assertTrue(valid);
 

@@ -427,11 +427,11 @@
         bundleParams.put(JVM_OPTIONS.getID(), "-Xms128M");
         bundleParams.put(JVM_PROPERTIES.getID(), "everything.jvm.property=everything.jvm.property.value");
         bundleParams.put(MAC_CATEGORY.getID(), "public.app-category.developer-tools");
         bundleParams.put(MAC_CF_BUNDLE_IDENTIFIER.getID(), "com.example.everything.cf-bundle-identifier");
         bundleParams.put(MAC_CF_BUNDLE_NAME.getID(), "Everything CF Bundle Name");
-        bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk == null ? System.getProperty("java.home") : runtimeJdk);
+//FIXME        bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk == null ? System.getProperty("java.home") : runtimeJdk);
         bundleParams.put(MAIN_CLASS.getID(), "hello.HelloRectangle");
         bundleParams.put(MAIN_JAR.getID(), "mainApp.jar");
         bundleParams.put(PREFERENCES_ID.getID(), "everything/preferences/id");
         bundleParams.put(PRELOADER_CLASS.getID(), "hello.HelloPreloader");
         bundleParams.put(USER_JVM_OPTIONS.getID(), "-Xmx=256M\n");