changeset 7773:eeb8252d3fed

[test only] RT-37439: Install packaged JDK and JRE on Mac Build Servers Summary: three more missed values
author shemnon
date Fri, 22 Aug 2014 10:03:12 -0600
parents afa6d979fcca
children 9ec1f60df809
files modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacAppBundlerTest.java
diffstat 1 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacAppBundlerTest.java	Fri Aug 22 10:47:52 2014 -0400
+++ b/modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacAppBundlerTest.java	Fri Aug 22 10:03:12 2014 -0600
@@ -159,6 +159,10 @@
                 params.put(BUILD_ROOT.getID(), tmpBase);
                 params.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
 
+                if (runtimeJdk != null) {
+                    params.put(MAC_RUNTIME.getID(), runtimeJdk);
+                }
+
                 params.put(MAC_CF_BUNDLE_VERSION.getID(), v);
                 b.validate(params);
             } catch (ConfigException ce) {
@@ -176,6 +180,10 @@
                 params.put(BUILD_ROOT.getID(), tmpBase);
                 params.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
 
+                if (runtimeJdk != null) {
+                    params.put(MAC_RUNTIME.getID(), runtimeJdk);
+                }
+
                 params.put(VERSION.getID(), v);
                 b.validate(params);
                 assertFalse("Invalid appVersion is not the mac.CFBundleVersion", MAC_CF_BUNDLE_VERSION.fetchFrom(params).equals(VERSION.fetchFrom(params)));
@@ -190,6 +198,10 @@
                 params.put(BUILD_ROOT.getID(), tmpBase);
                 params.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
 
+                if (runtimeJdk != null) {
+                    params.put(MAC_RUNTIME.getID(), runtimeJdk);
+                }
+
                 params.put(MAC_CF_BUNDLE_VERSION.getID(), v);
                 b.validate(params);
                 assertTrue("Expect to be invalid via '" + VERSION.getID() + "' ["+v+"]",