You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by st...@apache.org on 2011/06/16 00:59:23 UTC
svn commit: r1136236 - in /maven/sandbox/trunk/plexus-utils-commons-bridge:
plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java
plexus-utils-tck/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java
Author: stephenc
Date: Wed Jun 15 22:59:22 2011
New Revision: 1136236
URL: http://svn.apache.org/viewvc?rev=1136236&view=rev
Log:
adding some tests
Modified:
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java
Modified: maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java?rev=1136236&r1=1136235&r2=1136236&view=diff
==============================================================================
--- maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java (original)
+++ maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java Wed Jun 15 22:59:22 2011
@@ -26,7 +26,6 @@ import org.codehaus.plexus.util.io.Input
import java.io.File;
import java.io.IOException;
import java.io.Reader;
-import java.net.FileNameMap;
import java.util.Arrays;
import java.util.List;
@@ -51,6 +50,7 @@ public class FileUtils
{
throw new UnsupportedOperationException( "TODO: Implement" );
}
+
private static final String[] DEFAULT_EXCLUDES = {
// Miscellaneous typical temporary files
"**/*~", "**/#*#", "**/.#*", "**/%*%", "**/._*",
@@ -105,12 +105,12 @@ public class FileUtils
public static List getDefaultExcludesAsList()
{
- return Arrays.asList(getDefaultExcludes());
+ return Arrays.asList( getDefaultExcludes() );
}
public static String getDefaultExcludesAsString()
{
- return new StrBuilder().appendWithSeparators(getDefaultExcludes(), ",").toString();
+ return new StrBuilder().appendWithSeparators( getDefaultExcludes(), "," ).toString();
}
public static String byteCountToDisplaySize( int byteCount )
@@ -121,12 +121,13 @@ public class FileUtils
public static String dirname( String name )
{
name.getClass();
- return FilenameUtils.getPathNoEndSeparator(name);
+ return FilenameUtils.getPathNoEndSeparator( name );
}
public static String filename( String name )
{
- throw new UnsupportedOperationException( "TODO: Implement" );
+ name.getClass();
+ return FilenameUtils.getName( name );
}
public static String basename( String name )
Modified: maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java?rev=1136236&r1=1136235&r2=1136236&view=diff
==============================================================================
--- maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java (original)
+++ maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java Wed Jun 15 22:59:22 2011
@@ -1312,7 +1312,7 @@ public class FileUtilsTest
public void dirnameWindowsRootPathOnUnix()
throws Exception
{
- assumeThat( File.separatorChar, is('/') );
+ assumeThat( File.separatorChar, is( '/' ) );
assertThat( FileUtils.dirname( "C:\\foo.bar.txt" ), is( "" ) );
}
@@ -1321,7 +1321,7 @@ public class FileUtilsTest
public void dirnameWindowsNonRootPathOnUnix()
throws Exception
{
- assumeThat( File.separatorChar, is('/') );
+ assumeThat( File.separatorChar, is( '/' ) );
assertThat( FileUtils.dirname( "C:\\test\\foo.bar.txt" ), is( "" ) );
}
@@ -1330,7 +1330,7 @@ public class FileUtilsTest
public void dirnameUnixRootPathOnWindows()
throws Exception
{
- assumeThat( File.separatorChar, is('\\') );
+ assumeThat( File.separatorChar, is( '\\' ) );
assertThat( FileUtils.dirname( "/foo.bar.txt" ), is( "" ) );
}
@@ -1339,7 +1339,7 @@ public class FileUtilsTest
public void dirnameUnixNonRootPathOnWindows()
throws Exception
{
- assumeThat( File.separatorChar, is('\\') );
+ assumeThat( File.separatorChar, is( '\\' ) );
assertThat( FileUtils.dirname( "/test/foo.bar.txt" ), is( "" ) );
}
@@ -1347,7 +1347,7 @@ public class FileUtilsTest
public void dirnameWindowsRootPathOnWindows()
throws Exception
{
- assumeThat( File.separatorChar, is('\\') );
+ assumeThat( File.separatorChar, is( '\\' ) );
assertThat( FileUtils.dirname( "C:\\foo.bar.txt" ), is( "C:" ) );
}
@@ -1355,7 +1355,7 @@ public class FileUtilsTest
public void dirnameWindowsNonRootPathOnWindows()
throws Exception
{
- assumeThat( File.separatorChar, is('\\') );
+ assumeThat( File.separatorChar, is( '\\' ) );
assertThat( FileUtils.dirname( "C:\\test\\foo.bar.txt" ), is( "C:\\test" ) );
}
@@ -1363,7 +1363,7 @@ public class FileUtilsTest
public void dirnameUnixRootPathOnUnix()
throws Exception
{
- assumeThat( File.separatorChar, is('/') );
+ assumeThat( File.separatorChar, is( '/' ) );
assertThat( FileUtils.dirname( "/foo.bar.txt" ), is( "" ) );
}
@@ -1371,10 +1371,101 @@ public class FileUtilsTest
public void dirnameUnixNonRootPathOnUnix()
throws Exception
{
- assumeThat( File.separatorChar, is('/') );
+ assumeThat( File.separatorChar, is( '/' ) );
assertThat( FileUtils.dirname( "/test/foo.bar.txt" ), is( "/test" ) );
}
+ //// filename(String)
+
+ @Test( expected = NullPointerException.class )
+ public void filenameNull()
+ throws Exception
+ {
+ FileUtils.filename( null );
+ }
+
+ @Test
+ public void filenameEmpty()
+ throws Exception
+ {
+ assertThat( FileUtils.filename( "" ), is( "" ) );
+ }
+
+ @Test
+ public void filenameFilename()
+ throws Exception
+ {
+ assertThat( FileUtils.filename( "foo.bar.txt" ), is( "foo.bar.txt" ) );
+ }
+
+ @Test
+ @ReproducesPlexusBug( "assumes that the path is a local path" )
+ public void filenameWindowsRootPathOnUnix()
+ throws Exception
+ {
+ assumeThat( File.separatorChar, is( '/' ) );
+ assertThat( FileUtils.filename( "C:\\foo.bar.txt" ), is( "C:\\foo.bar.txt" ) );
+ }
+
+ @Test
+ @ReproducesPlexusBug( "assumes that the path is a local path" )
+ public void filenameWindowsNonRootPathOnUnix()
+ throws Exception
+ {
+ assumeThat( File.separatorChar, is( '/' ) );
+ assertThat( FileUtils.filename( "C:\\test\\foo.bar.txt" ), is( "C:\\test\\foo.bar.txt" ) );
+ }
+
+ @Test
+ @ReproducesPlexusBug( "assumes that the path is a local path" )
+ public void filenameUnixRootPathOnWindows()
+ throws Exception
+ {
+ assumeThat( File.separatorChar, is( '\\' ) );
+ assertThat( FileUtils.filename( "/foo.bar.txt" ), is( "/foo.bar.txt" ) );
+ }
+
+ @Test
+ @ReproducesPlexusBug( "assumes that the path is a local path" )
+ public void filenameUnixNonRootPathOnWindows()
+ throws Exception
+ {
+ assumeThat( File.separatorChar, is( '\\' ) );
+ assertThat( FileUtils.filename( "/test/foo.bar.txt" ), is( "/test/foo.bar.txt" ) );
+ }
+
+ @Test
+ public void filenameWindowsRootPathOnWindows()
+ throws Exception
+ {
+ assumeThat( File.separatorChar, is( '\\' ) );
+ assertThat( FileUtils.filename( "C:\\foo.bar.txt" ), is( "foo.bar.txt" ) );
+ }
+
+ @Test
+ public void filenameWindowsNonRootPathOnWindows()
+ throws Exception
+ {
+ assumeThat( File.separatorChar, is( '\\' ) );
+ assertThat( FileUtils.filename( "C:\\test\\foo.bar.txt" ), is( "foo.bar.txt" ) );
+ }
+
+ @Test
+ public void filenameUnixRootPathOnUnix()
+ throws Exception
+ {
+ assumeThat( File.separatorChar, is( '/' ) );
+ assertThat( FileUtils.filename( "/foo.bar.txt" ), is( "foo.bar.txt" ) );
+ }
+
+ @Test
+ public void filenameUnixNonRootPathOnUnix()
+ throws Exception
+ {
+ assumeThat( File.separatorChar, is( '/' ) );
+ assertThat( FileUtils.filename( "/test/foo.bar.txt" ), is( "foo.bar.txt" ) );
+ }
+
//// constants for testing
private static final String[] MINIMUM_DEFAULT_EXCLUDES = {