< prev index next >
modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacAppBundlerTest.java
Print this page
rev 9619 : imported patch 9-jake-fxpackager.patch
*** 201,211 ****
Map<String, Object> params = new HashMap<>();
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);
} catch (ConfigException ce) {
--- 201,211 ----
Map<String, Object> params = new HashMap<>();
params.put(BUILD_ROOT.getID(), tmpBase);
params.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
if (runtimeJdk != null) {
! //FIXME params.put(MAC_RUNTIME.getID(), runtimeJdk);
}
params.put(VERSION.getID(), v);
b.validate(params);
} catch (ConfigException ce) {
*** 218,228 ****
Map<String, Object> params = new HashMap<>();
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) {
--- 218,228 ----
Map<String, Object> params = new HashMap<>();
params.put(BUILD_ROOT.getID(), tmpBase);
params.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
if (runtimeJdk != null) {
! //FIXME params.put(MAC_RUNTIME.getID(), runtimeJdk);
}
params.put(MAC_CF_BUNDLE_VERSION.getID(), v);
b.validate(params);
} catch (ConfigException ce) {
*** 239,249 ****
Map<String, Object> params = new HashMap<>();
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)));
--- 239,249 ----
Map<String, Object> params = new HashMap<>();
params.put(BUILD_ROOT.getID(), tmpBase);
params.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
if (runtimeJdk != null) {
! //FIXME 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)));
*** 257,267 ****
Map<String, Object> params = new HashMap<>();
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+"]",
--- 257,267 ----
Map<String, Object> params = new HashMap<>();
params.put(BUILD_ROOT.getID(), tmpBase);
params.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
if (runtimeJdk != null) {
! //FIXME 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+"]",
*** 300,310 ****
bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
bundleParams.put(VERBOSE.getID(), true);
bundleParams.put(SIGN_BUNDLE.getID(), false);
if (runtimeJdk != null) {
! bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
}
boolean valid = bundler.validate(bundleParams);
assertTrue(valid);
--- 300,310 ----
bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
bundleParams.put(VERBOSE.getID(), true);
bundleParams.put(SIGN_BUNDLE.getID(), false);
if (runtimeJdk != null) {
! //FIXME bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
}
boolean valid = bundler.validate(bundleParams);
assertTrue(valid);
*** 400,410 ****
Map<String, Object> bundleParams = new HashMap<>();
bundleParams.put(BUILD_ROOT.getID(), tmpBase);
if (runtimeJdk != null) {
! bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
}
bundleParams.put(APP_NAME.getID(), appName);
bundleParams.put(MAIN_CLASS.getID(), "hello.HelloRectangle");
bundleParams.put(MAIN_JAR.getID(),
--- 400,410 ----
Map<String, Object> bundleParams = new HashMap<>();
bundleParams.put(BUILD_ROOT.getID(), tmpBase);
if (runtimeJdk != null) {
! //FIXME bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
}
bundleParams.put(APP_NAME.getID(), appName);
bundleParams.put(MAIN_CLASS.getID(), "hello.HelloRectangle");
bundleParams.put(MAIN_JAR.getID(),
*** 461,471 ****
bundleParams.put(PREFERENCES_ID.getID(), "the/really/long/preferences/id");
bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
bundleParams.put(VERBOSE.getID(), true);
if (runtimeJdk != null) {
! bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
}
if (!signingKeysPresent) {
String keychain = createFakeCerts(bundleParams);
Assume.assumeNotNull(keychain);
--- 461,471 ----
bundleParams.put(PREFERENCES_ID.getID(), "the/really/long/preferences/id");
bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
bundleParams.put(VERBOSE.getID(), true);
if (runtimeJdk != null) {
! //FIXME bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
}
if (!signingKeysPresent) {
String keychain = createFakeCerts(bundleParams);
Assume.assumeNotNull(keychain);
*** 508,518 ****
bundleParams.put(BUILD_ROOT.getID(), tmpBase);
bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
if (runtimeJdk != null) {
! bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
}
String keychain = null;
if (!signingKeysPresent) {
keychain = createFakeCerts(bundleParams);
--- 508,518 ----
bundleParams.put(BUILD_ROOT.getID(), tmpBase);
bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
if (runtimeJdk != null) {
! //FIXME bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
}
String keychain = null;
if (!signingKeysPresent) {
keychain = createFakeCerts(bundleParams);
*** 547,557 ****
bundleParams.put(TITLE.getID(), "ХеллоВорлд аппликейшн");
bundleParams.put(VENDOR.getID(), "Оракл девелопмент");
bundleParams.put(DESCRIPTION.getID(), "крайне большое описание со странными символами");
if (runtimeJdk != null) {
! bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
}
String keychain = null;
if (!signingKeysPresent) {
keychain = createFakeCerts(bundleParams);
--- 547,557 ----
bundleParams.put(TITLE.getID(), "ХеллоВорлд аппликейшн");
bundleParams.put(VENDOR.getID(), "Оракл девелопмент");
bundleParams.put(DESCRIPTION.getID(), "крайне большое описание со странными символами");
if (runtimeJdk != null) {
! //FIXME bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
}
String keychain = null;
if (!signingKeysPresent) {
keychain = createFakeCerts(bundleParams);
*** 582,592 ****
bundleParams.put(BUILD_ROOT.getID(), tmpBase);
bundleParams.put(VERBOSE.getID(), true);
bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
! bundleParams.put(MAC_RUNTIME.getID(), APP_RESOURCES.fetchFrom(bundleParams));
bundler.validate(bundleParams);
}
/**
--- 582,592 ----
bundleParams.put(BUILD_ROOT.getID(), tmpBase);
bundleParams.put(VERBOSE.getID(), true);
bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
! //FIXME bundleParams.put(MAC_RUNTIME.getID(), APP_RESOURCES.fetchFrom(bundleParams));
bundler.validate(bundleParams);
}
/**
*** 627,637 ****
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_CF_BUNDLE_VERSION.getID(), "8.2.0");
! 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(SIGNING_KEYCHAIN.getID(), "");
--- 627,637 ----
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_CF_BUNDLE_VERSION.getID(), "8.2.0");
! //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(SIGNING_KEYCHAIN.getID(), "");
*** 705,715 ****
bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
bundleParams.put(VERBOSE.getID(), true);
bundleParams.put(SIGN_BUNDLE.getID(), false); // force no signing
if (runtimeJdk != null) {
! bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
}
boolean valid = bundler.validate(bundleParams);
assertTrue(valid);
--- 705,715 ----
bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
bundleParams.put(VERBOSE.getID(), true);
bundleParams.put(SIGN_BUNDLE.getID(), false); // force no signing
if (runtimeJdk != null) {
! //FIXME bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
}
boolean valid = bundler.validate(bundleParams);
assertTrue(valid);
*** 735,745 ****
// not part of the typical setup, for testing
bundleParams.put(BUILD_ROOT.getID(), tmpBase);
bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
! bundleParams.put(MAC_RUNTIME.getID(), jre);
String keychain = null;
if (!signingKeysPresent) {
keychain = createFakeCerts(bundleParams);
if (keychain != null) {
--- 735,745 ----
// not part of the typical setup, for testing
bundleParams.put(BUILD_ROOT.getID(), tmpBase);
bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
! //FIXME bundleParams.put(MAC_RUNTIME.getID(), jre);
String keychain = null;
if (!signingKeysPresent) {
keychain = createFakeCerts(bundleParams);
if (keychain != null) {
*** 777,787 ****
bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
bundleParams.put(UNLOCK_COMMERCIAL_FEATURES.getID(), true);
bundleParams.put(ENABLE_APP_CDS.getID(), true);
if (runtimeJdk != null) {
! bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
}
boolean valid = bundler.validate(bundleParams);
assertTrue(valid);
--- 777,787 ----
bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
bundleParams.put(UNLOCK_COMMERCIAL_FEATURES.getID(), true);
bundleParams.put(ENABLE_APP_CDS.getID(), true);
if (runtimeJdk != null) {
! //FIXME bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
}
boolean valid = bundler.validate(bundleParams);
assertTrue(valid);
< prev index next >