You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/11/04 20:55:49 UTC
svn commit: r711366 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
resources/mng-3052/bar/pom.xml resources/mng-3052/foo/pom.xml
resources/mng-3052/wombat/pom.xml
Author: bentmann
Date: Tue Nov 4 11:55:49 2008
New Revision: 711366
URL: http://svn.apache.org/viewvc?rev=711366&view=rev
Log:
o Simplified filtering and avoided usage of platform encoding for robustness
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3052/bar/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3052/foo/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3052/wombat/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java?rev=711366&r1=711365&r2=711366&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java Tue Nov 4 11:55:49 2008
@@ -21,16 +21,12 @@
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.FileUtils;
-import org.apache.maven.it.util.IOUtil;
import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.util.StringUtils;
import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Properties;
/**
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3052">MNG-3052</a>.
@@ -57,9 +53,7 @@
public void testitMNG3052 ()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
- "/mng-3052" )
- .getCanonicalFile();
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3052" ).getCanonicalFile();
File foo = new File( testDir, "foo" );
File bar = new File( testDir, "bar" );
@@ -74,15 +68,16 @@
// commands below substitute the current testDir location into the
// repository declarations, to make them absolute file references on the
// local filesystem.
- rewritePom( new File( foo, "pom.xml" ), testDir );
- rewritePom( new File( bar, "pom.xml" ), testDir );
- rewritePom( new File( wombat, "pom.xml" ), testDir );
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Properties filterProps = verifier.newDefaultFilterProperties();
+ verifier.filterFile( "foo/pom.xml", "foo/pom.xml", "UTF-8", filterProps );
+ verifier.filterFile( "bar/pom.xml", "bar/pom.xml", "UTF-8", filterProps );
+ verifier.filterFile( "wombat/pom.xml", "wombat/pom.xml", "UTF-8", filterProps );
+ verifier.resetStreams();
List cliOptions = new ArrayList();
cliOptions.add( "-X" );
- Verifier verifier;
-
// First, build the two levels of dependencies that will be resolved.
// This one is a transitive dependency, and will be deployed to a
@@ -120,33 +115,4 @@
verifier.resetStreams();
}
- private void rewritePom( File pomFile,
- File testDir )
- throws IOException
- {
- FileReader reader = null;
- String pomContent = null;
- try
- {
- reader = new FileReader( pomFile );
- pomContent = IOUtil.toString( reader );
- }
- finally
- {
- IOUtil.close( reader );
- }
-
- pomContent = StringUtils.replace( pomContent, "@testDir@", testDir.getAbsolutePath() );
-
- FileWriter writer = null;
- try
- {
- writer = new FileWriter( pomFile );
- writer.write( pomContent );
- }
- finally
- {
- IOUtil.close( writer );
- }
- }
}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3052/bar/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3052/bar/pom.xml?rev=711366&r1=711365&r2=711366&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3052/bar/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3052/bar/pom.xml Tue Nov 4 11:55:49 2008
@@ -17,14 +17,14 @@
<repository>
<id>example-repo</id>
<name>Example Repo</name>
- <url>file://@testDir@/target/repo</url>
+ <url>@baseurl@/target/repo</url>
</repository>
</repositories>
<distributionManagement>
<repository>
<id>example2-repo</id>
<name>Example Repo</name>
- <url>file://@testDir@/target/repo2</url>
+ <url>@baseurl@/target/repo2</url>
</repository>
</distributionManagement>
</project>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3052/foo/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3052/foo/pom.xml?rev=711366&r1=711365&r2=711366&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3052/foo/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3052/foo/pom.xml Tue Nov 4 11:55:49 2008
@@ -26,7 +26,7 @@
<repository>
<id>example-repo</id>
<name>Example Repo</name>
- <url>file://@testDir@/target/repo</url>
+ <url>@baseurl@/target/repo</url>
</repository>
</distributionManagement>
</project>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3052/wombat/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3052/wombat/pom.xml?rev=711366&r1=711365&r2=711366&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3052/wombat/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3052/wombat/pom.xml Tue Nov 4 11:55:49 2008
@@ -17,7 +17,7 @@
<repository>
<id>example2-repo</id>
<name>Example Repo</name>
- <url>file://@testDir@/target/repo2</url>
+ <url>@baseurl@/target/repo2</url>
</repository>
</repositories>
</project>