Author: evenisse
Date: Mon Feb 26 06:05:24 2007
New Revision: 511809
URL: http://svn.apache.org/viewvc?view=rev&rev=511809
Log:
Fix tests for windows
Modified:
maven/archiva/trunk/archiva-common/src/test/java/org/apache/maven/archiva/common/consumers/FileProblemsTracker.java
maven/archiva/trunk/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/BaseFileTest.java
Modified:
maven/archiva/trunk/archiva-common/src/test/java/org/apache/maven/archiva/common/consumers/FileProblemsTracker.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-common/src/test/java/org/apache/maven/archiva/common/consumers/FileProblemsTracker.java?view=diff&rev=511809&r1=511808&r2=511809
==============================================================================
---
maven/archiva/trunk/archiva-common/src/test/java/org/apache/maven/archiva/common/consumers/FileProblemsTracker.java
(original)
+++
maven/archiva/trunk/archiva-common/src/test/java/org/apache/maven/archiva/common/consumers/FileProblemsTracker.java
Mon Feb 26 06:05:24 2007
@@ -20,6 +20,7 @@
*/
import org.apache.maven.archiva.common.utils.BaseFile;
+import org.codehaus.plexus.util.StringUtils;
import java.util.ArrayList;
import java.util.HashMap;
@@ -29,7 +30,7 @@
import java.util.Set;
/**
- * FileProblemsTracker
+ * FileProblemsTracker
*
* @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a>
* @version $Id$
@@ -46,6 +47,7 @@
private void addProblem( String path, String message )
{
+ path = StringUtils.replace( path, "\\", "/" );
List problems = getProblems( path );
problems.add( message );
problemMap.put( path, problems );
Modified:
maven/archiva/trunk/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/BaseFileTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/BaseFileTest.java?view=diff&rev=511809&r1=511808&r2=511809
==============================================================================
---
maven/archiva/trunk/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/BaseFileTest.java
(original)
+++
maven/archiva/trunk/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/BaseFileTest.java
Mon Feb 26 06:05:24 2007
@@ -19,12 +19,13 @@
* under the License.
*/
-import java.io.File;
-
import junit.framework.TestCase;
+import org.codehaus.plexus.util.StringUtils;
+
+import java.io.File;
/**
- * BaseFileTest
+ * BaseFileTest
*
* @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a>
* @version $Id$
@@ -38,9 +39,9 @@
String pathFile = "path/to/resource.xml";
BaseFile file = new BaseFile( repoDir, pathFile );
- assertEquals( "/home/user/foo/repository/path/to/resource.xml",
file.getAbsolutePath() );
- assertEquals( "path/to/resource.xml", file.getRelativePath() );
- assertEquals( new File( "/home/user/foo/repository" ),
file.getBaseDir() );
+ assertAbsolutePath( "/home/user/foo/repository/path/to/resource.xml",
file );
+ assertRelativePath( "path/to/resource.xml", file );
+ assertBasedir( "/home/user/foo/repository", file );
}
public void testFileFile()
@@ -49,9 +50,9 @@
File pathFile = new File(
"/home/user/foo/repository/path/to/resource.xml" );
BaseFile file = new BaseFile( repoDir, pathFile );
- assertEquals( "/home/user/foo/repository/path/to/resource.xml",
file.getAbsolutePath() );
- assertEquals( "path/to/resource.xml", file.getRelativePath() );
- assertEquals( new File( "/home/user/foo/repository" ),
file.getBaseDir() );
+ assertAbsolutePath( "/home/user/foo/repository/path/to/resource.xml",
file );
+ assertRelativePath( "path/to/resource.xml", file );
+ assertBasedir( "/home/user/foo/repository", file );
}
public void testStringFile()
@@ -60,9 +61,9 @@
File pathFile = new File(
"/home/user/foo/repository/path/to/resource.xml" );
BaseFile file = new BaseFile( repoDir, pathFile );
- assertEquals( "/home/user/foo/repository/path/to/resource.xml",
file.getAbsolutePath() );
- assertEquals( "path/to/resource.xml", file.getRelativePath() );
- assertEquals( new File( "/home/user/foo/repository" ),
file.getBaseDir() );
+ assertAbsolutePath( "/home/user/foo/repository/path/to/resource.xml",
file );
+ assertRelativePath( "path/to/resource.xml", file );
+ assertBasedir( "/home/user/foo/repository", file );
}
public void testFileThenSetBaseString()
@@ -72,9 +73,9 @@
BaseFile file = new BaseFile( pathFile );
file.setBaseDir( repoDir );
- assertEquals( "/home/user/foo/repository/path/to/resource.xml",
file.getAbsolutePath() );
- assertEquals( "path/to/resource.xml", file.getRelativePath() );
- assertEquals( new File( "/home/user/foo/repository" ),
file.getBaseDir() );
+ assertAbsolutePath( "/home/user/foo/repository/path/to/resource.xml",
file );
+ assertRelativePath( "path/to/resource.xml", file );
+ assertBasedir( "/home/user/foo/repository", file );
}
public void testFileThenSetBaseFile()
@@ -84,11 +85,11 @@
BaseFile file = new BaseFile( pathFile );
file.setBaseDir( repoDir );
- assertEquals( "/home/user/foo/repository/path/to/resource.xml",
file.getAbsolutePath() );
- assertEquals( "path/to/resource.xml", file.getRelativePath() );
- assertEquals( new File( "/home/user/foo/repository" ),
file.getBaseDir() );
+ assertAbsolutePath( "/home/user/foo/repository/path/to/resource.xml",
file );
+ assertRelativePath( "path/to/resource.xml", file );
+ assertBasedir( "/home/user/foo/repository", file );
}
-
+
public void testStringThenSetBaseString()
{
String repoDir = "/home/user/foo/repository";
@@ -96,9 +97,9 @@
BaseFile file = new BaseFile( pathFile );
file.setBaseDir( repoDir );
- assertEquals( "/home/user/foo/repository/path/to/resource.xml",
file.getAbsolutePath() );
- assertEquals( "path/to/resource.xml", file.getRelativePath() );
- assertEquals( new File( "/home/user/foo/repository" ),
file.getBaseDir() );
+ assertAbsolutePath( "/home/user/foo/repository/path/to/resource.xml",
file );
+ assertRelativePath( "path/to/resource.xml", file );
+ assertBasedir( "/home/user/foo/repository", file );
}
public void testStringThenSetBaseFile()
@@ -108,8 +109,23 @@
BaseFile file = new BaseFile( pathFile );
file.setBaseDir( repoDir );
- assertEquals( "/home/user/foo/repository/path/to/resource.xml",
file.getAbsolutePath() );
- assertEquals( "path/to/resource.xml", file.getRelativePath() );
- assertEquals( new File( "/home/user/foo/repository" ),
file.getBaseDir() );
- }
+ assertAbsolutePath( "/home/user/foo/repository/path/to/resource.xml",
file );
+ assertRelativePath( "path/to/resource.xml", file );
+ assertBasedir( "/home/user/foo/repository", file );
+ }
+
+ private void assertAbsolutePath( String expectedPath, BaseFile actualFile )
+ {
+ assertEquals( new File( expectedPath ).getAbsolutePath(),
actualFile.getAbsolutePath() );
+ }
+
+ private void assertRelativePath( String expectedPath, BaseFile actualFile )
+ {
+ assertEquals( expectedPath, StringUtils.replace(
actualFile.getRelativePath(), "\\", "/" ) );
+ }
+
+ private void assertBasedir( String expectedPath, BaseFile actualFile )
+ {
+ assertEquals( new File( expectedPath ), actualFile.getBaseDir() );
+ }
}
