You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/01/15 23:55:10 UTC
svn commit: r369274 -
/maven/repository-manager/trunk/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
Author: brett
Date: Sun Jan 15 14:55:09 2006
New Revision: 369274
URL: http://svn.apache.org/viewcvs?rev=369274&view=rev
Log:
[MRM-9] remove issues on windows
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
Modified: maven/repository-manager/trunk/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java?rev=369274&r1=369273&r2=369274&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java (original)
+++ maven/repository-manager/trunk/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java Sun Jan 15 14:55:09 2006
@@ -49,6 +49,8 @@
private ArtifactFactory artifactFactory;
+ private static final int SLEEP_MILLIS = 100;
+
protected void setUp()
throws Exception
{
@@ -114,13 +116,24 @@
File expectedPomFile = getTestFile( "src/test/expected-files/converted-v3.pom" );
assertTrue( "Check POM created", pomFile.exists() );
- String expectedContent = FileUtils.fileRead( expectedPomFile ).trim();
- String targetContent = FileUtils.fileRead( pomFile ).trim();
- assertEquals( "Check POM was converted", expectedContent, targetContent );
+ compareFiles( expectedPomFile, pomFile );
// TODO: test warnings (separate test?)
}
+ private static void compareFiles( File expectedPomFile, File pomFile )
+ throws IOException
+ {
+ String expectedContent = normalizeString( FileUtils.fileRead( expectedPomFile ) );
+ String targetContent = normalizeString( FileUtils.fileRead( pomFile ) );
+ assertEquals( "Check POM was converted", expectedContent, targetContent );
+ }
+
+ private static String normalizeString( String path )
+ {
+ return path.trim().replace( "\r\n", "\n" ).replace( '\r', '\n' );
+ }
+
public void testNoPomConvert()
throws IOException, RepositoryConversionException
{
@@ -174,7 +187,7 @@
}
public void testUnmodifiedArtifact()
- throws RepositoryConversionException, IOException
+ throws RepositoryConversionException, IOException, InterruptedException
{
// test the unmodified artifact is untouched
@@ -195,6 +208,9 @@
long origTime = targetFile.lastModified();
long origPomTime = targetPomFile.lastModified();
+ // Need to guarantee last modified is not equal
+ Thread.sleep( SLEEP_MILLIS );
+
repositoryConverter.convert( artifact, targetRepository );
String expectedContent = FileUtils.fileRead( sourceFile ).trim();
@@ -238,6 +254,9 @@
sourceFile.setLastModified( System.currentTimeMillis() );
sourcePomFile.setLastModified( System.currentTimeMillis() );
+ // Need to guarantee last modified is not equal
+ Thread.sleep( SLEEP_MILLIS );
+
repositoryConverter.convert( artifact, targetRepository );
String expectedContent = FileUtils.fileRead( sourceFile ).trim();
@@ -336,9 +355,7 @@
getTestFile( "src/test/expected-files/converted-" + artifact.getArtifactId() + ".pom" );
assertTrue( "Check POM created", pomFile.exists() );
- String expectedContent = FileUtils.fileRead( expectedPomFile ).trim();
- String targetContent = FileUtils.fileRead( pomFile ).trim();
- assertEquals( "Check POM was converted", expectedContent, targetContent );
+ compareFiles( expectedPomFile, pomFile );
}
}