You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2009/02/19 19:11:45 UTC
svn commit: r745951 -
/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformations.java
Author: jdcasey
Date: Thu Feb 19 18:11:43 2009
New Revision: 745951
URL: http://svn.apache.org/viewvc?rev=745951&view=rev
Log:
[MNG-3057] finally got IT for 3057 fixed.
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformations.java
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformations.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformations.java?rev=745951&r1=745950&r2=745951&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformations.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformations.java Thu Feb 19 18:11:43 2009
@@ -23,9 +23,12 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.net.URI;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
@@ -70,23 +73,26 @@
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3057" );
- String remoteRepo = new File( testDir, "target/deployment" ).toURL().toExternalForm();
+ URI remoteRepo = new File( testDir, "target/deployment" ).toURI();
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.mng3057", "mng-3057", "1", "pom" );
- verifier.deleteArtifact( "org.apache.maven.its.mng3057", "level2", "1", "pom" );
- verifier.deleteArtifact( "org.apache.maven.its.mng3057", "level3", "1", "pom" );
- verifier.deleteArtifact( "org.apache.maven.its.mng3057", "level3", "1", "jar" );
-
+ verifier.deleteArtifacts( "org.apache.maven.its.mng3057" );
+
Properties properties = verifier.newDefaultFilterProperties();
- properties.setProperty( "@deployTo@", remoteRepo );
+ properties.setProperty( "@deployTo@", remoteRepo.toURL().toExternalForm() );
verifier.filterFile( "pom.xml", "pom.xml", "UTF-8", properties );
List cliOptions = new ArrayList();
+ cliOptions.add( "-V" );
cliOptions.add( "-DtestVersion=1" );
verifier.setCliOptions( cliOptions );
+
+// Map envars = new HashMap();
+// envars.put( "MAVEN_OPTS", "-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=5005 -Djava.compiler=NONE" );
+// verifier.executeGoal( "deploy", envars );
+
verifier.executeGoal( "deploy" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -95,9 +101,9 @@
assertVersionExpressions( new File( verifier.getArtifactPath( "org.apache.maven.its.mng3057", "level2", "1", "pom" ) ) );
assertVersionExpressions( new File( verifier.getArtifactPath( "org.apache.maven.its.mng3057", "level3", "1", "pom" ) ) );
- assertVersionExpressions( new File( remoteRepo, "org/apache/maven/its/mng3057/mng-3057/1/mng-3057-1.pom" ) );
- assertVersionExpressions( new File( remoteRepo, "org/apache/maven/its/mng3057/level2/1/level2-1.pom" ) );
- assertVersionExpressions( new File( remoteRepo, "org/apache/maven/its/mng3057/level3/1/level3-1.pom" ) );
+ assertVersionExpressions( new File( remoteRepo.getPath(), "org/apache/maven/its/mng3057/mng-3057/1/mng-3057-1.pom" ) );
+ assertVersionExpressions( new File( remoteRepo.getPath(), "org/apache/maven/its/mng3057/level2/1/level2-1.pom" ) );
+ assertVersionExpressions( new File( remoteRepo.getPath(), "org/apache/maven/its/mng3057/level3/1/level3-1.pom" ) );
}
private void assertVersionExpressions( File pomFile )
@@ -106,13 +112,17 @@
Verifier verifier = new Verifier( pomFile.getParentFile().getAbsolutePath() );
List cliOptions = new ArrayList();
- cliOptions.add( "-f" );
+ cliOptions.add( "-V" );
+ cliOptions.add( "-N" );
cliOptions.add( "-Dexpression.outputFile=expressions.properties" );
cliOptions.add( "-Dexpression.expressions=" + StringUtils.join( VERIFICATION_EXPRESSIONS.iterator(), "," ) );
+ cliOptions.add( "-f" );
cliOptions.add( pomFile.getName() );
+
verifier.setCliOptions( cliOptions );
+ verifier.setAutoclean( false );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:eval" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();