< prev index next >
functional/appBundlerTestsJDK9/appBundlerTestsJDK9/test/com/oracle/appbundlers/tests/functionality/jdk9test/JmodExplodedModuleAndModularJarDependencyTest.java
Print this page
@@ -44,11 +44,10 @@
* 3. Exploded Modules
* here is the different permutations for test case
*
* SERVICE_INTERFACE is module which exposes API for service provider.
* CIRCLE and RECTANGLE are modules which provides service for SERVICE_INTERFACE
- * Each row is a module path directory where each column says what is containing in directory.
*
* ==============================================================
* ModularJar | Jmods | ExplodedMods
* ==============================================================
* | SERVICE_INTERFACE |CIRCLE | RECTANGLE |
@@ -77,17 +76,17 @@
{ SI, RECTANGLE, CIRCLE } };
private List<Path> modulePathList = new ArrayList<Path>();
public AppWrapper getApp() throws IOException {
- Map<String, String> classNameToTemplate = new HashMap<String, String>();
- classNameToTemplate.put(COM_SHAPE_SERVICEINTERFACE_SHAPEMAINCLASS,
- COM_SHAPE_SERVICEINTERFACE_SHAPEMAINCLASS_TEMPLATE);
+ Map<String, String> hashMap = new HashMap<String, String>();
+ hashMap.put(COM_SHAPE_SERVICEINTERFACE_SHAPEMAINCLASS_TEMPLATE,
+ COM_SHAPE_SERVICEINTERFACE_SHAPEMAINCLASS);
return new AppWrapper(Utils.getTempSubDir(WORK_DIRECTORY),
COM_SHAPE_SERVICEINTERFACE_SHAPEMAINCLASS,
- SourceFactory.get_com_shape_serviceinterface_module(classNameToTemplate,
+ SourceFactory.get_com_shape_serviceinterface_module(hashMap,
Collections.emptyMap(),
COM_SHAPE_SERVICEINTERFACE_SHAPEMAINCLASS),
SourceFactory.get_com_shape_serviceprovider_circle_module(),
SourceFactory.get_com_shape_serviceprovider_rectangle_module());
}
@@ -230,12 +229,12 @@
}
}
}
private void uninstallApp(Path modulepath) throws Exception {
- if (this.bundlingManager != null) {
- String appName = this.bundlingManager.getAppName(getAllParams(modulepath));
- this.bundlingManager.uninstall(this.intermediateToParametersMap
+ if (bundlingManager != null) {
+ String appName = bundlingManager.getAppName(getAllParams(modulepath));
+ bundlingManager.uninstall(this.intermediateToParametersMap
.get(ExtensionType.NormalJar).getApp(), appName);
}
}
}
< prev index next >