functional/appBundlerTestsJDK9/appBundlerTestsJDK9/test/com/oracle/appbundlers/tests/functionality/jdk9test/ListServiceProvidersTest.java

*** 8,18 ****
  import java.util.Arrays;
  import java.util.Collections;
  import java.util.HashMap;
  import java.util.Map;
  
- import com.oracle.appbundlers.tests.functionality.functionalinterface.AdditionalParams;
  import com.oracle.appbundlers.tests.functionality.functionalinterface.VerifiedOptions;
  import com.oracle.appbundlers.utils.AppWrapper;
  import com.oracle.appbundlers.utils.ExtensionType;
  import com.oracle.appbundlers.utils.SourceFactory;
  import com.oracle.appbundlers.utils.Utils;
--- 8,17 ----
*** 24,40 ****
   */
  public class ListServiceProvidersTest extends ModuleTestBase {
  
      public AppWrapper getApp() throws IOException {
  
!         Map<String, String> classToTemplateMap = new HashMap<String, String>();
!         classToTemplateMap.put(COM_SHAPE_SERVICEINTERFACE_SHAPEMAINCLASS,
!                 COM_SHAPE_SERVICEINTERFACE_SHAPEMAINCLASS_TEMPLATE);
  
          return new AppWrapper(Utils.getTempSubDir(WORK_DIRECTORY),
                  COM_SHAPE_SERVICEINTERFACE_SHAPEMAINCLASS,
!                 SourceFactory.get_com_shape_serviceinterface_module(classToTemplateMap,
                          Collections.emptyMap(),
                          COM_SHAPE_SERVICEINTERFACE_SHAPEMAINCLASS),
                  SourceFactory.get_com_shape_serviceprovider_circle_module(),
                  SourceFactory
                          .get_com_shape_serviceprovider_rectangle_module());
--- 23,39 ----
   */
  public class ListServiceProvidersTest extends ModuleTestBase {
  
      public AppWrapper getApp() throws IOException {
  
!         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(hashMap,
                          Collections.emptyMap(),
                          COM_SHAPE_SERVICEINTERFACE_SHAPEMAINCLASS),
                  SourceFactory.get_com_shape_serviceprovider_circle_module(),
                  SourceFactory
                          .get_com_shape_serviceprovider_rectangle_module());
*** 52,69 ****
      @Override
      public void overrideParameters(ExtensionType intermediate)
              throws IOException {
          if (intermediate != ExtensionType.NormalJar) {
              this.currentParameter.setApp(getApp());
-             this.currentParameter.setAdditionalParams(getAdditionalParams());
              this.currentParameter.setVerifiedOptions(getVerifiedOptions());
          }
      }
- 
-     private AdditionalParams getAdditionalParams() {
-         return () -> {
-             Map<String, Object> additionalParams = new HashMap<String, Object>();
-             additionalParams.put(ADD_MODS, this.currentParameter.getApp().getAllModuleNamesSeparatedByComma());
-             return additionalParams;
-         };
-     }
  }
\ No newline at end of file
--- 51,59 ----