This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
commit e742aa9bf28b748e053f55c420f832428d4a1bd8 Author: Gary Gregory <[email protected]> AuthorDate: Sat Aug 10 09:22:12 2024 -0400 Sort members --- .../commons/vfs2/provider/UriParserTest.java | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/UriParserTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/UriParserTest.java index 1290625d..6fe44f16 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/UriParserTest.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/UriParserTest.java @@ -28,6 +28,13 @@ public class UriParserTest { private static final String[] schemes = {"ftp", "file"}; + private void checkNormalizedPath(String path, String normalized) throws FileSystemException { + final StringBuilder pathBuilder = new StringBuilder(path); + UriParser.fixSeparators(pathBuilder); + UriParser.normalisePath(pathBuilder); + assertEquals(normalized, pathBuilder.toString()); + } + @Test public void testColonInFileName() { assertNull(UriParser.extractScheme("some/path/some:file")); @@ -69,13 +76,23 @@ public class UriParserTest { public void testOneSlashScheme() { assertEquals("file", UriParser.extractScheme(schemes, "file:/user:pass@host/some/path/some:file")); } - @Test public void testOneSlashSchemeWithBuffer() { final StringBuilder buffer = new StringBuilder(); UriParser.extractScheme(schemes, "file:/user:pass@host/some/path/some:file", buffer); assertEquals("/user:pass@host/some/path/some:file", buffer.toString()); } + + @Test + public void testPathOfNormalizedPath() throws FileSystemException { + checkNormalizedPath("./Sub Folder/", "Sub Folder"); + checkNormalizedPath("./Sub Folder/../", ""); + checkNormalizedPath("./Sub Folder%2f..%2f", ""); + checkNormalizedPath("File.txt", "File.txt"); + checkNormalizedPath("./Sub Folder/./File.txt", "Sub Folder/File.txt"); + checkNormalizedPath("./Sub Folder%2F.%2FFile.txt", "Sub Folder/File.txt"); + } + @Test public void testTypeOfNormalizedPath() { try { @@ -99,21 +116,4 @@ public class UriParserTest { fail(e); } } - - @Test - public void testPathOfNormalizedPath() throws FileSystemException { - checkNormalizedPath("./Sub Folder/", "Sub Folder"); - checkNormalizedPath("./Sub Folder/../", ""); - checkNormalizedPath("./Sub Folder%2f..%2f", ""); - checkNormalizedPath("File.txt", "File.txt"); - checkNormalizedPath("./Sub Folder/./File.txt", "Sub Folder/File.txt"); - checkNormalizedPath("./Sub Folder%2F.%2FFile.txt", "Sub Folder/File.txt"); - } - - private void checkNormalizedPath(String path, String normalized) throws FileSystemException { - final StringBuilder pathBuilder = new StringBuilder(path); - UriParser.fixSeparators(pathBuilder); - UriParser.normalisePath(pathBuilder); - assertEquals(normalized, pathBuilder.toString()); - } }
