--- a/test/jdk/tools/jpackage/share/AdditionalLaunchersTest.java	Thu Oct 31 11:11:42 2019 -0400
+++ b/test/jdk/tools/jpackage/share/AdditionalLaunchersTest.java	Thu Oct 31 11:18:41 2019 -0400
@@ -58,22 +58,19 @@
 
     @Test
     public void test() {
-        FileAssociations fa = new FileAssociations(
-                MethodHandles.lookup().lookupClass().getSimpleName());
-
         // Configure a bunch of additional launchers and also setup
         // file association to make sure it will be linked only to the main
         // launcher.
 
-        PackageTest packageTest = new PackageTest().configureHelloApp()
-        .addInitializer(cmd -> {
-            fa.createFile();
-            cmd.addArguments("--file-associations", fa.getPropertiesFile());
+        PackageTest packageTest = new PackageTest().configureHelloApp();
+        packageTest.addInitializer(cmd -> {
             cmd.addArguments("--arguments", "Duke", "--arguments", "is",
                     "--arguments", "the", "--arguments", "King");
         });
 
-        packageTest.addHelloAppFileAssociationsVerifier(fa);
+        new FileAssociations(
+                MethodHandles.lookup().lookupClass().getSimpleName()).applyTo(
+                packageTest);
 
         new AdditionalLauncher("Baz2").setArguments().applyTo(packageTest);
         new AdditionalLauncher("foo").setArguments("yep!").applyTo(packageTest);
@@ -93,6 +90,8 @@
         int lastDotIndex = fname.lastIndexOf(".");
         if (lastDotIndex != -1) {
             fname = newFileName + fname.substring(lastDotIndex);
+        } else {
+            fname = newFileName;
         }
         return path.getParent().resolve(fname);
     }
@@ -156,4 +155,4 @@
         private Path icon;
         private final String name;
     }
-}
+}
\ No newline at end of file