test/jdk/jdk/internal/jimage/ImageReaderTest.java

*** 107,11 ***
              "/modules",
              "/modules/modfoo",
              "/modules/modbar",
              "/modules/modfoo/com",
              "/modules/modfoo/com/foo",
!             "/modules/modfoo/com/foo/bar"})
      public void testModuleDirectories_expected(String name) throws IOException {
          try (ImageReader reader = ImageReader.open(image, PreviewMode.DISABLED)) {
              assertDir(reader, name);
          }
      }
--- 107,12 ---
              "/modules",
              "/modules/modfoo",
              "/modules/modbar",
              "/modules/modfoo/com",
              "/modules/modfoo/com/foo",
!             "/modules/modfoo/com/foo/bar",
+     })
      public void testModuleDirectories_expected(String name) throws IOException {
          try (ImageReader reader = ImageReader.open(image, PreviewMode.DISABLED)) {
              assertDir(reader, name);
          }
      }

*** 122,11 ***
              "//",
              "/modules/",
              "/modules/unknown",
              "/modules/modbar/",
              "/modules/modfoo//com",
!             "/modules/modfoo/com/"})
      public void testModuleNodes_absent(String name) throws IOException {
          try (ImageReader reader = ImageReader.open(image, PreviewMode.DISABLED)) {
              assertAbsent(reader, name);
          }
      }
--- 123,12 ---
              "//",
              "/modules/",
              "/modules/unknown",
              "/modules/modbar/",
              "/modules/modfoo//com",
!             "/modules/modfoo/com/",
+     })
      public void testModuleNodes_absent(String name) throws IOException {
          try (ImageReader reader = ImageReader.open(image, PreviewMode.DISABLED)) {
              assertAbsent(reader, name);
          }
      }

*** 220,13 ***
              "modfoo/com/bar:One.class",
              "modfoo/com:bar/One.class",
              "modules/modfoo/com:foo/HasPreviewVersion.class",
      })
      public void testResource_invalid(String modName, String resPath) throws IOException {
!         try (ImageReader reader = ImageReader.open(image, PreviewMode.DISABLED)) {
!             assertThrows(IllegalArgumentException.class, () -> reader.containsResource(modName, resPath));
!             assertThrows(IllegalArgumentException.class, () -> reader.findResourceNode(modName, resPath));
          }
      }
  
      @Test
      public void testPackageDirectories() throws IOException {
--- 222,15 ---
              "modfoo/com/bar:One.class",
              "modfoo/com:bar/One.class",
              "modules/modfoo/com:foo/HasPreviewVersion.class",
      })
      public void testResource_invalid(String modName, String resPath) throws IOException {
!         for (PreviewMode mode : List.of(PreviewMode.ENABLED, PreviewMode.DISABLED)) {
!             try (ImageReader reader = ImageReader.open(image, mode)) {
!                 assertThrows(IllegalArgumentException.class, () -> reader.containsResource(modName, resPath));
+                 assertThrows(IllegalArgumentException.class, () -> reader.findResourceNode(modName, resPath));
+             }
          }
      }
  
      @Test
      public void testPackageDirectories() throws IOException {