svn commit: r1158747 - /maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/PathToolTest.java

[st...@apache.org]

Author: struberg
Date: Wed Aug 17 14:42:02 2011
New Revision: 1158747

URL: http://svn.apache.org/viewvc?rev=1158747&view=rev
Log:
MSANDBOX-51 PathTool tests finished

Modified:
    maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/PathToolTest.java

Modified: maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/PathToolTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/PathToolTest.java?rev=1158747&r1=1158746&r2=1158747&view=diff
==============================================================================
--- maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/PathToolTest.java (original)
+++ maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/PathToolTest.java Wed Aug 17 14:42:02 2011
@@ -20,11 +20,15 @@ package org.codehaus.plexus.util;
  */
 
 import org.apache.maven.tck.FixPlexusBugs;
+import org.hamcrest.CoreMatchers;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.Assert;
+import org.junit.rules.TemporaryFolder;
 
 
+import java.io.File;
+
 import static org.hamcrest.CoreMatchers.is;
 
 
@@ -40,6 +44,9 @@ public class PathToolTest extends Assert
     @Rule
     public FixPlexusBugs fixPlexusBugs = new FixPlexusBugs();
 
+    @Rule
+    public TemporaryFolder tempFolder = new TemporaryFolder();
+
     @Test
     public void testCalculateLink()
     {
@@ -137,11 +144,15 @@ public class PathToolTest extends Assert
         assertThat( PathTool.getRelativePath( null )
                   , is( "" ) );
 
-/*X TODO create temp dir structure and set user.dir to it
-        assertThat( PathTool.getRelativePath("/usr/local/java/bin" )
-                  , is( "" ) );
-*/
+        File baseFolder = tempFolder.newFolder( "pathtooltest" );
 
+        String folderName = "anotherFolders";
+        File newDir = new File( baseFolder, folderName );
+        newDir.mkdirs();
+
+
+        assertThat( PathTool.getRelativePath( folderName )
+                  , is( "." ) );
     }
 
     @Test
@@ -165,4 +176,20 @@ public class PathToolTest extends Assert
                   , is( "../../" ) );
     }
 
+    @Test
+    public void testUppercaseDrive()
+    {
+        assertThat( PathTool.uppercaseDrive( null )
+                , CoreMatchers.<Object>nullValue() );
+
+        assertThat( PathTool.uppercaseDrive( "d:" )
+                , is( "D:" ) );
+
+        assertThat( PathTool.uppercaseDrive( "D:" )
+                , is( "D:" ) );
+
+        assertThat( PathTool.uppercaseDrive( "/notadrive" )
+                , is( "/notadrive" ) );
+    }
+
 }