modules/fxpackager/src/test/java/com/oracle/bundlers/linux/LinuxAppBundlerTest.java

*** 24,34 ****
   */
  
  package com.oracle.bundlers.linux;
  
  import com.oracle.bundlers.Bundler;
- import com.oracle.bundlers.StandardBundlerParam;

  import com.sun.javafx.tools.packager.Log;
  import com.sun.javafx.tools.packager.bundlers.ConfigException;
  import com.sun.javafx.tools.packager.bundlers.LinuxAppBundler;
  import com.sun.javafx.tools.packager.bundlers.RelativeFileSet;
  import com.sun.javafx.tools.packager.bundlers.UnsupportedPlatformException;
--- 24,33 ----
*** 42,51 ****
--- 41,51 ----
  import java.io.FileInputStream;
  import java.io.IOException;
  import java.nio.file.Files;
  import java.util.*;
  
+ import static com.oracle.bundlers.StandardBundlerParam.*;

  import static org.junit.Assert.assertFalse;
  import static org.junit.Assert.assertNotNull;
  import static org.junit.Assert.assertTrue;
  
  public class LinuxAppBundlerTest {
*** 114,137 ****
       * See if smoke comes out
       */
      @Test
      public void smokeTest() throws IOException, ConfigException, UnsupportedPlatformException {
          Bundler bundler = new LinuxAppBundler();
-         ((LinuxAppBundler)bundler).setVerbose(true);

          
          assertNotNull(bundler.getName());
          assertNotNull(bundler.getID());
          assertNotNull(bundler.getDescription());
          //assertNotNull(bundler.getBundleParameters());
  
          Map<String, Object> bundleParams = new HashMap<>();
  
!         bundleParams.put(StandardBundlerParam.BUILD_ROOT.getID(), tmpBase);

  
!         bundleParams.put(StandardBundlerParam.NAME.getID(), "Smoke");

!         bundleParams.put(StandardBundlerParam.MAIN_CLASS.getID(), "hello.TestPackager");

!         bundleParams.put(StandardBundlerParam.APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));

          
          File output = bundler.execute(bundleParams, new File(workDir, "smoke"));
          validatePackageCfg(output);
      }
  
--- 114,137 ----
       * See if smoke comes out
       */
      @Test
      public void smokeTest() throws IOException, ConfigException, UnsupportedPlatformException {
          Bundler bundler = new LinuxAppBundler();
  
          assertNotNull(bundler.getName());
          assertNotNull(bundler.getID());
          assertNotNull(bundler.getDescription());
          //assertNotNull(bundler.getBundleParameters());
  
          Map<String, Object> bundleParams = new HashMap<>();
  
!         bundleParams.put(BUILD_ROOT.getID(), tmpBase);

  
!         bundleParams.put(APP_NAME.getID(), "Smoke");

!         bundleParams.put(MAIN_CLASS.getID(), "hello.TestPackager");

!         bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));

!         bundleParams.put(VERBOSE.getID(), true);

          
          File output = bundler.execute(bundleParams, new File(workDir, "smoke"));
          validatePackageCfg(output);
      }
  
*** 145,161 ****
       * All other values will be driven off of those two values.
       */
      @Test
      public void minimumConfig() throws IOException, ConfigException, UnsupportedPlatformException {
          Bundler bundler = new LinuxAppBundler();
-         ((LinuxAppBundler)bundler).setVerbose(true);

  
          Map<String, Object> bundleParams = new HashMap<>();
  
!         bundleParams.put(StandardBundlerParam.BUILD_ROOT.getID(), tmpBase);

  
!         bundleParams.put(StandardBundlerParam.APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));

  
          File output = bundler.execute(bundleParams, new File(workDir, "BareMinimum"));
          validatePackageCfg(output);
          assertTrue(output.isDirectory());
      }
--- 145,160 ----
       * All other values will be driven off of those two values.
       */
      @Test
      public void minimumConfig() throws IOException, ConfigException, UnsupportedPlatformException {
          Bundler bundler = new LinuxAppBundler();
  
          Map<String, Object> bundleParams = new HashMap<>();
  
!         bundleParams.put(BUILD_ROOT.getID(), tmpBase);

  
!         bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));

  
          File output = bundler.execute(bundleParams, new File(workDir, "BareMinimum"));
          validatePackageCfg(output);
          assertTrue(output.isDirectory());
      }