test/jdk/jdk/internal/jrtfs/Basic.java

rev 55068 : 8224908: Revert: 8216553: JrtFileSystemProvider getPath(URI) omits /modules element from file path
Reviewed-by:

@@ -26,11 +26,10 @@
  * @summary Basic test of jrt file system provider
  * @run testng Basic
  */
 
 import java.io.InputStream;
-import java.io.IOError;
 import java.io.IOException;
 import java.io.DataInputStream;
 import java.nio.file.DirectoryStream;
 import java.nio.file.InvalidPathException;
 import java.nio.file.Files;

@@ -270,64 +269,21 @@
     public void testToAndFromUri() throws Exception {
         FileSystem fs = FileSystems.getFileSystem(URI.create("jrt:/"));
         Path top = fs.getPath("/");
         try (Stream<Path> stream = Files.walk(top)) {
             stream.forEach(path -> {
-                String pathStr = path.toAbsolutePath().toString();
-                URI u = null;
-                try {
-                    u = path.toUri();
-                } catch (IOError e) {
-                    assertFalse(pathStr.startsWith("/modules"));
-                    return;
-                }
-
+                URI u = path.toUri();
                 assertTrue(u.getScheme().equalsIgnoreCase("jrt"));
                 assertFalse(u.isOpaque());
                 assertTrue(u.getAuthority() == null);
-
-                pathStr = pathStr.substring("/modules".length());
-                if (pathStr.isEmpty()) {
-                    pathStr = "/";
-                }
-                assertEquals(u.getPath(), pathStr);
+                assertEquals(u.getPath(), path.toAbsolutePath().toString());
                 Path p = Paths.get(u);
                 assertEquals(p, path);
             });
         }
     }
 
-    // @bug 8216553: JrtFIleSystemProvider getPath(URI) omits /modules element from file path
-    @Test
-    public void testPathToURIConversion() throws Exception {
-        var uri = URI.create("jrt:/java.base/module-info.class");
-        var path = Path.of(uri);
-        assertTrue(Files.exists(path));
-
-        uri = URI.create("jrt:/java.base/../java.base/module-info.class");
-        boolean seenIAE = false;
-        try {
-            Path.of(uri);
-        } catch (IllegalArgumentException iaExp) {
-            seenIAE = true;
-        }
-        assertTrue(seenIAE);
-
-        // check round-trip
-        var jrtfs = FileSystems.getFileSystem(URI.create("jrt:/"));
-        assertTrue(Files.exists(jrtfs.getPath(path.toString())));
-
-        path = jrtfs.getPath("/modules/../modules/java.base/");
-        boolean seenIOError = false;
-        try {
-            path.toUri();
-        } catch (IOError ioError) {
-            seenIOError = true;
-        }
-        assertTrue(seenIOError);
-    }
-
     @Test
     public void testDirectoryNames() throws Exception {
         FileSystem fs = FileSystems.getFileSystem(URI.create("jrt:/"));
         Path top = fs.getPath("/");
         // check that directory names do not have trailing '/' char