You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/07/26 06:56:05 UTC
svn commit: r679955 - in
/maven/core-integration-testing/branches/embedder/core-integration-tests:
./ src/test/java/org/apache/maven/integrationtests/
Author: jvanzyl
Date: Fri Jul 25 21:56:05 2008
New Revision: 679955
URL: http://svn.apache.org/viewvc?rev=679955&view=rev
Log: (empty)
Modified:
maven/core-integration-testing/branches/embedder/core-integration-tests/pom.xml
maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3380ManagedRelocatedTransdepsTest.java
maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3535SelfReferentialProperties.java
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/pom.xml?rev=679955&r1=679954&r2=679955&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/pom.xml (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/pom.xml Fri Jul 25 21:56:05 2008
@@ -75,9 +75,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
<configuration>
<includes>
+ <include>**/MavenITmng3380ManagedRelocatedTransdepsTest.java</include>
+ <!--
<include>**/MavenIT0102Test.java</include>
+ -->
</includes>
</configuration>
</plugin>
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java?rev=679955&r1=679954&r2=679955&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java Fri Jul 25 21:56:05 2008
@@ -71,7 +71,7 @@
suite.addTestSuite( MavenITmng3581PluginUsesWagonDependency.class );
suite.addTestSuite( MavenITmng3545ProfileDeactivation.class );
suite.addTestSuite( MavenITmng3536AppendedAbsolutePaths.class );
- suite.addTestSuite( MavenITmng3535SelfReferentialProperties.class );
+ //suite.addTestSuite( MavenITmng3535SelfReferentialProperties.class );
suite.addTestSuite( MavenITmng3503Xpp3ShadingTest.class );
suite.addTestSuite( MavenITmng3498ForkToOtherMojoTest.class );
suite.addTestSuite( MavenITmng3485OverrideWagonExtensionTest.class );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3380ManagedRelocatedTransdepsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3380ManagedRelocatedTransdepsTest.java?rev=679955&r1=679954&r2=679955&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3380ManagedRelocatedTransdepsTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3380ManagedRelocatedTransdepsTest.java Fri Jul 25 21:56:05 2008
@@ -8,40 +8,42 @@
/**
* expected project.getArtifacts() results:
- *
+ *
* direct-dependency-groupId:direct-dependency-artifactId:jar:1:compile
* transitive-dependency-new-groupId:transitive-dependency-artifactId:jar:2:compile
- * other-groupId:other-artifactId-a:jar:1:compile
- * other-groupId:other-artifactId-b:jar:1:compile
- *
+ * other-groupId:other-artifactId-a:jar:1:compile other-groupId:other-artifactId-b:jar:1:compile
+ *
* org.apache.maven.project.MavenProject#.getArtifacts() is called with goal:
* org.apache.maven.its:mng3380.plugin:mng-3380-test
- *
+ *
*/
public class MavenITmng3380ManagedRelocatedTransdepsTest
- extends AbstractMavenIntegrationTestCase {
+ extends AbstractMavenIntegrationTestCase
+{
public MavenITmng3380ManagedRelocatedTransdepsTest()
- throws InvalidVersionSpecificationException {
- super("(2.0.9,)");
+ throws InvalidVersionSpecificationException
+ {
+ super( "(2.0.9,)" );
}
- public void testitMNG3380() throws Exception {
+ public void testitMNG3380()
+ throws Exception
+ {
// compute test directory
- File testDir = ResourceExtractor.simpleExtractResources(getClass(),
- "/mng-3380-managedRelocatedTransdeps");
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3380-managedRelocatedTransdeps" );
- Verifier verifier = new Verifier(testDir.getAbsolutePath());
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
deleteArtifacts( verifier );
- installDependencies( testDir );
+ installDependencies( testDir );
String path = testDir.getAbsolutePath() //
- + "/consumer";
+ + "/consumer";
- verifier = new Verifier(path);
- verifier.executeGoal("package");
+ verifier = new Verifier( path );
+ verifier.executeGoal( "package" );
// verify no errors so far
verifier.verifyErrorFreeLog();
@@ -53,39 +55,39 @@
{
// install projects
String path = testDir.getAbsolutePath() //
- + "/other-c";
- Verifier verifier = new Verifier(path);
- verifier.executeGoal("install");
+ + "/other-c";
+ Verifier verifier = new Verifier( path );
+ verifier.executeGoal( "install" );
path = testDir.getAbsolutePath() //
- + "/other-b";
- verifier = new Verifier(path);
- verifier.executeGoal("install");
+ + "/other-b";
+ verifier = new Verifier( path );
+ verifier.executeGoal( "install" );
path = testDir.getAbsolutePath() //
- + "/other-a";
- verifier = new Verifier(path);
- verifier.executeGoal("install");
+ + "/other-a";
+ verifier = new Verifier( path );
+ verifier.executeGoal( "install" );
path = testDir.getAbsolutePath() //
- + "/transdep-old";
- verifier = new Verifier(path);
- verifier.executeGoal("install");
+ + "/transdep-old";
+ verifier = new Verifier( path );
+ verifier.executeGoal( "install" );
path = testDir.getAbsolutePath() //
- + "/transdep-new-1";
- verifier = new Verifier(path);
- verifier.executeGoal("install");
+ + "/transdep-new-1";
+ verifier = new Verifier( path );
+ verifier.executeGoal( "install" );
path = testDir.getAbsolutePath() //
- + "/transdep-new-2";
- verifier = new Verifier(path);
- verifier.executeGoal("install");
+ + "/transdep-new-2";
+ verifier = new Verifier( path );
+ verifier.executeGoal( "install" );
path = testDir.getAbsolutePath() //
- + "/direct-dep";
- verifier = new Verifier(path);
- verifier.executeGoal("install");
+ + "/direct-dep";
+ verifier = new Verifier( path );
+ verifier.executeGoal( "install" );
}
private void deleteArtifacts( Verifier verifier )
@@ -93,171 +95,171 @@
{
// delete projects
verifier.deleteArtifact( //
- "other-groupId", //
- "other-artifactId-c", //
- "1", //
- "jar");
- verifier.deleteArtifact( //
- "other-groupId", //
- "other-artifactId-c", //
- "1", //
- "pom");
- verifier.assertArtifactNotPresent( //
- "other-groupId", //
- "other-artifactId-c", //
- "1", //
- "jar");
- verifier.assertArtifactNotPresent( //
- "other-groupId", //
- "other-artifactId-c", //
- "1", //
- "pom");
-
- verifier.deleteArtifact( //
- "other-groupId", //
- "other-artifactId-b", //
- "1", //
- "jar");
- verifier.deleteArtifact( //
- "other-groupId", //
- "other-artifactId-b", //
- "1", //
- "pom");
- verifier.assertArtifactNotPresent( //
- "other-groupId", //
- "other-artifactId-b", //
- "1", //
- "jar");
- verifier.assertArtifactNotPresent( //
- "other-groupId", //
- "other-artifactId-b", //
- "1", //
- "pom");
-
- verifier.deleteArtifact( //
- "other-groupId", //
- "other-artifactId-a", //
- "1", //
- "jar");
- verifier.deleteArtifact( //
- "other-groupId", //
- "other-artifactId-a", //
- "1", //
- "pom");
- verifier.assertArtifactNotPresent( //
- "other-groupId", //
- "other-artifactId-a", //
- "1", //
- "jar");
- verifier.assertArtifactNotPresent( //
- "other-groupId", //
- "other-artifactId-a", //
- "1", //
- "pom");
-
- verifier.deleteArtifact( //
- "transitive-dependency-old-groupId", //
- "transitive-dependency-artifactId", //
- "1", //
- "jar");
- verifier.deleteArtifact( //
- "transitive-dependency-old-groupId", //
- "transitive-dependency-artifactId", //
- "1", //
- "pom");
- verifier.assertArtifactNotPresent( //
- "transitive-dependency-old-groupId", //
- "transitive-dependency-artifactId", //
- "1", //
- "jar");
- verifier.assertArtifactNotPresent( //
- "transitive-dependency-old-groupId", //
- "transitive-dependency-artifactId", //
- "1", //
- "pom");
-
- verifier.deleteArtifact( //
- "transitive-dependency-new-groupId", //
- "transitive-dependency-artifactId", //
- "1", //
- "jar");
- verifier.deleteArtifact( //
- "transitive-dependency-new-groupId", //
- "transitive-dependency-artifactId", //
- "1", //
- "pom");
- verifier.assertArtifactNotPresent( //
- "transitive-dependency-new-groupId", //
- "transitive-dependency-artifactId", //
- "1", //
- "jar");
- verifier.assertArtifactNotPresent( //
- "transitive-dependency-new-groupId", //
- "transitive-dependency-artifactId", //
- "1", //
- "pom");
-
- verifier.deleteArtifact( //
- "transitive-dependency-new-groupId", //
- "transitive-dependency-artifactId", //
- "2", //
- "jar");
- verifier.deleteArtifact( //
- "transitive-dependency-new-groupId", //
- "transitive-dependency-artifactId", //
- "2", //
- "pom");
- verifier.assertArtifactNotPresent( //
- "transitive-dependency-new-groupId", //
- "transitive-dependency-artifactId", //
- "2", //
- "jar");
- verifier.assertArtifactNotPresent( //
- "transitive-dependency-new-groupId", //
- "transitive-dependency-artifactId", //
- "2", //
- "pom");
-
- verifier.deleteArtifact( //
- "direct-dependency-groupId", //
- "direct-dependency-artifactId", //
- "1", //
- "jar");
- verifier.deleteArtifact( //
- "direct-dependency-groupId", //
- "direct-dependency-artifactId", //
- "1", //
- "pom");
- verifier.assertArtifactNotPresent( //
- "direct-dependency-groupId", //
- "direct-dependency-artifactId", //
- "1", //
- "jar");
- verifier.assertArtifactNotPresent( //
- "direct-dependency-groupId", //
- "direct-dependency-artifactId", //
- "1", //
- "pom");
-
- verifier.deleteArtifact( //
- "root-groupId", //
- "root-artifactId", //
- "1", //
- "jar");
- verifier.deleteArtifact( //
- "root-groupId", //
- "root-artifactId", //
- "1", //
- "pom");
- verifier.assertArtifactNotPresent( //
- "root-groupId", //
- "root-artifactId", //
- "1", //
- "jar");
- verifier.assertArtifactNotPresent( //
- "root-groupId", //
- "root-artifactId", //
- "1", //
- "pom");
+ "other-groupId", //
+ "other-artifactId-c", //
+ "1", //
+ "jar" );
+ verifier.deleteArtifact( //
+ "other-groupId", //
+ "other-artifactId-c", //
+ "1", //
+ "pom" );
+ verifier.assertArtifactNotPresent( //
+ "other-groupId", //
+ "other-artifactId-c", //
+ "1", //
+ "jar" );
+ verifier.assertArtifactNotPresent( //
+ "other-groupId", //
+ "other-artifactId-c", //
+ "1", //
+ "pom" );
+
+ verifier.deleteArtifact( //
+ "other-groupId", //
+ "other-artifactId-b", //
+ "1", //
+ "jar" );
+ verifier.deleteArtifact( //
+ "other-groupId", //
+ "other-artifactId-b", //
+ "1", //
+ "pom" );
+ verifier.assertArtifactNotPresent( //
+ "other-groupId", //
+ "other-artifactId-b", //
+ "1", //
+ "jar" );
+ verifier.assertArtifactNotPresent( //
+ "other-groupId", //
+ "other-artifactId-b", //
+ "1", //
+ "pom" );
+
+ verifier.deleteArtifact( //
+ "other-groupId", //
+ "other-artifactId-a", //
+ "1", //
+ "jar" );
+ verifier.deleteArtifact( //
+ "other-groupId", //
+ "other-artifactId-a", //
+ "1", //
+ "pom" );
+ verifier.assertArtifactNotPresent( //
+ "other-groupId", //
+ "other-artifactId-a", //
+ "1", //
+ "jar" );
+ verifier.assertArtifactNotPresent( //
+ "other-groupId", //
+ "other-artifactId-a", //
+ "1", //
+ "pom" );
+
+ verifier.deleteArtifact( //
+ "transitive-dependency-old-groupId", //
+ "transitive-dependency-artifactId", //
+ "1", //
+ "jar" );
+ verifier.deleteArtifact( //
+ "transitive-dependency-old-groupId", //
+ "transitive-dependency-artifactId", //
+ "1", //
+ "pom" );
+ verifier.assertArtifactNotPresent( //
+ "transitive-dependency-old-groupId", //
+ "transitive-dependency-artifactId", //
+ "1", //
+ "jar" );
+ verifier.assertArtifactNotPresent( //
+ "transitive-dependency-old-groupId", //
+ "transitive-dependency-artifactId", //
+ "1", //
+ "pom" );
+
+ verifier.deleteArtifact( //
+ "transitive-dependency-new-groupId", //
+ "transitive-dependency-artifactId", //
+ "1", //
+ "jar" );
+ verifier.deleteArtifact( //
+ "transitive-dependency-new-groupId", //
+ "transitive-dependency-artifactId", //
+ "1", //
+ "pom" );
+ verifier.assertArtifactNotPresent( //
+ "transitive-dependency-new-groupId", //
+ "transitive-dependency-artifactId", //
+ "1", //
+ "jar" );
+ verifier.assertArtifactNotPresent( //
+ "transitive-dependency-new-groupId", //
+ "transitive-dependency-artifactId", //
+ "1", //
+ "pom" );
+
+ verifier.deleteArtifact( //
+ "transitive-dependency-new-groupId", //
+ "transitive-dependency-artifactId", //
+ "2", //
+ "jar" );
+ verifier.deleteArtifact( //
+ "transitive-dependency-new-groupId", //
+ "transitive-dependency-artifactId", //
+ "2", //
+ "pom" );
+ verifier.assertArtifactNotPresent( //
+ "transitive-dependency-new-groupId", //
+ "transitive-dependency-artifactId", //
+ "2", //
+ "jar" );
+ verifier.assertArtifactNotPresent( //
+ "transitive-dependency-new-groupId", //
+ "transitive-dependency-artifactId", //
+ "2", //
+ "pom" );
+
+ verifier.deleteArtifact( //
+ "direct-dependency-groupId", //
+ "direct-dependency-artifactId", //
+ "1", //
+ "jar" );
+ verifier.deleteArtifact( //
+ "direct-dependency-groupId", //
+ "direct-dependency-artifactId", //
+ "1", //
+ "pom" );
+ verifier.assertArtifactNotPresent( //
+ "direct-dependency-groupId", //
+ "direct-dependency-artifactId", //
+ "1", //
+ "jar" );
+ verifier.assertArtifactNotPresent( //
+ "direct-dependency-groupId", //
+ "direct-dependency-artifactId", //
+ "1", //
+ "pom" );
+
+ verifier.deleteArtifact( //
+ "root-groupId", //
+ "root-artifactId", //
+ "1", //
+ "jar" );
+ verifier.deleteArtifact( //
+ "root-groupId", //
+ "root-artifactId", //
+ "1", //
+ "pom" );
+ verifier.assertArtifactNotPresent( //
+ "root-groupId", //
+ "root-artifactId", //
+ "1", //
+ "jar" );
+ verifier.assertArtifactNotPresent( //
+ "root-groupId", //
+ "root-artifactId", //
+ "1", //
+ "pom" );
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3535SelfReferentialProperties.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3535SelfReferentialProperties.java?rev=679955&r1=679954&r2=679955&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3535SelfReferentialProperties.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3535SelfReferentialProperties.java Fri Jul 25 21:56:05 2008
@@ -10,26 +10,30 @@
import java.util.ArrayList;
import java.util.List;
-public class MavenITmng3535SelfReferentialProperties extends AbstractMavenIntegrationTestCase {
+public class MavenITmng3535SelfReferentialProperties
+ extends AbstractMavenIntegrationTestCase
+{
- public MavenITmng3535SelfReferentialProperties()
- throws InvalidVersionSpecificationException
- {
- super( "(2.0.9,)");
- }
+ public MavenITmng3535SelfReferentialProperties()
+ throws InvalidVersionSpecificationException
+ {
+ super( "(2.0.9,)" );
+ }
- public void testitMNG3535() throws Exception {
- File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-3535-selfReferentialProperties");
- Verifier verifier = new Verifier(testDir.getAbsolutePath());
+ public void testitMNG3535()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3535-selfReferentialProperties" );
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
List opts = new ArrayList();
opts.add( "-X" );
-
+
InvocationRequest r = new DefaultInvocationRequest()
.setGoals( "verify" )
.setCliOptions( opts )
.setAutoclean( false );
-
- verifier.invoke( r );
+
+ verifier.invoke( r );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}