Additional tests for Path.isAbsolute()

shghatge · Apr 7, 2015 · 23fe006 · 23fe006
1 parent 2f683af
commit 23fe006
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/Path.java b/flink-core/src/main/java/org/apache/flink/core/fs/Path.java
@@ -312,10 +312,7 @@ public FileSystem getFileSystem() throws IOException {
 	 */
 	public boolean isAbsolute() {
 		final int start = hasWindowsDrive(uri.getPath(), true) ? 3 : 0;
-		if (uri.getPath().length() > start) {
-			return uri.getPath().startsWith(SEPARATOR, start);
-		}
-		return true;
+		return uri.getPath().startsWith(SEPARATOR, start);
 	}
 
 	/**

diff --git a/flink-core/src/test/java/org/apache/flink/core/fs/PathTest.java b/flink-core/src/test/java/org/apache/flink/core/fs/PathTest.java
@@ -69,9 +69,6 @@ public void testPathFromString() {
 		p = new Path("file:/C:/my/windows/path");
 		assertEquals("/C:/my/windows/path", p.toUri().getPath());
 
-		p = new Path("C:");
-		assertEquals("/C:", p.toUri().getPath());
-
 		try {
 			new Path((String)null);
 			fail();
@@ -98,21 +95,51 @@ public void testPathFromString() {
 	@Test
 	public void testIsAbsolute() {
 
+		// UNIX
+
 		Path p = new Path("/my/abs/path");
 		assertTrue(p.isAbsolute());
 
+		p = new Path("/");
+		assertTrue(p.isAbsolute());
+
 		p = new Path("./my/rel/path");
 		assertFalse(p.isAbsolute());
 
+		p = new Path("my/rel/path");
+		assertFalse(p.isAbsolute());
+
+		// WINDOWS
+
 		p = new Path("C:/my/abs/windows/path");
 		assertTrue(p.isAbsolute());
 
-		p = new Path("file:/C:");
+		p = new Path("y:/my/abs/windows/path");
+		assertTrue(p.isAbsolute());
+
+		p = new Path("b:\\my\\abs\\windows\\path");
 		assertTrue(p.isAbsolute());
 
 		p = new Path("C:");
+		assertFalse(p.isAbsolute());
+
+		p = new Path("C:my\\relative\\path");
+		assertFalse(p.isAbsolute());
+
+		p = new Path("\\my\\dir");
+		assertTrue(p.isAbsolute());
+
+		p = new Path("\\");
 		assertTrue(p.isAbsolute());
 
+		p = new Path(".\\my\\relative\\path");
+		assertFalse(p.isAbsolute());
+
+		p = new Path("my\\relative\\path");
+		assertFalse(p.isAbsolute());
+
+		p = new Path("\\\\myServer\\myDir");
+		assertTrue(p.isAbsolute());
 	}
 
 	@Test