test/tools/jlink/JLinkNegativeTest.java

@@ -189,11 +189,11 @@
         try {
             JImageGenerator.getJLinkTask()
                     .output(imageFile)
                     .addMods("not_zip")
                     .modulePath(helper.defaultModulePath())
-                    .call().assertFailure("Error: java.util.zip.ZipException: zip file is empty");
+                    .call().assertFailure("Error: java.io.IOException: Invalid jmod file");
         } finally {
             deleteDirectory(jmod);
         }
     }
 

@@ -234,38 +234,32 @@
         String moduleName = "hacked3";
         Path module = helper.generateDefaultJModule(moduleName).assertSuccess();
         JImageGenerator.addFiles(module, new InMemoryFile("unknown/A.class", new byte[0]));
         try {
             Result result = helper.generateDefaultImage(moduleName);
-            if (result.getExitCode() != 4) {
-                throw new AssertionError("Crash expected");
-            }
-            if (!result.getMessage().contains("java.lang.InternalError: unexpected entry: unknown")) {
                 System.err.println(result.getMessage());
-                throw new AssertionError("InternalError expected");
+            if (result.getExitCode() == 0) {
+                throw new AssertionError("Crash expected");
             }
         } finally {
             deleteDirectory(module);
         }
     }
 
     @Test(enabled = true)
     public void testSectionsAreFiles() throws IOException {
-        String moduleName = "module";
+        String moduleName = "hacked4";
         Path jmod = helper.generateDefaultJModule(moduleName).assertSuccess();
         JImageGenerator.addFiles(jmod,
                 new InMemoryFile("/native", new byte[0]),
                 new InMemoryFile("/conf", new byte[0]),
                 new InMemoryFile("/bin", new byte[0]));
         try {
             Result result = helper.generateDefaultImage(moduleName);
-            if (result.getExitCode() != 4) {
-                throw new AssertionError("Crash expected");
-            }
-            if (!result.getMessage().contains("java.lang.InternalError: unexpected entry: ")) {
                 System.err.println(result.getMessage());
-                throw new AssertionError("InternalError expected");
+            if (result.getExitCode() == 0) {
+                throw new AssertionError("Crash expected");
             }
         } finally {
             deleteDirectory(jmod);
         }
     }