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 2007/09/02 22:58:09 UTC
svn commit: r572151 - in
/maven/core-integration-testing/trunk/core-integration-tests/src/test:
java/org/apache/maven/integrationtests/
resources/it0020/src/main/scripts/org/apache/maven/it0020/
Author: jvanzyl
Date: Sun Sep 2 13:58:08 2007
New Revision: 572151
URL: http://svn.apache.org/viewvc?rev=572151&view=rev
Log:
MNG-2397: The plugins must be installed first before they are executed, and clean is built in so we have to make sure the
target/ directory is created in the bsh script.
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0013Test.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0020Test.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0020/src/main/scripts/org/apache/maven/it0020/it0020.bsh
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0013Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0013Test.java?rev=572151&r1=572150&r2=572151&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0013Test.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0013Test.java Sun Sep 2 13:58:08 2007
@@ -22,13 +22,16 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0013" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-it0013", "1.0-SNAPSHOT", "maven-plugin" );
- List goals = Arrays.asList( new String[]{"install", "org.apache.maven.its.it0013:maven-it-it0013:it0013"} );
+ List goals = Arrays.asList( new String[]{"install" } );
verifier.executeGoals( goals );
verifier.assertFilePresent( "target/maven-it-it0013-1.0-SNAPSHOT.jar" );
+
+ verifier = new Verifier( testDir.getAbsolutePath() );
+ goals = Arrays.asList( new String[]{"org.apache.maven.its.it0013:maven-it-it0013:it0013"} );
+ verifier.executeGoals( goals );
verifier.assertFilePresent( "target/it0013-verify" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
}
}
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0020Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0020Test.java?rev=572151&r1=572150&r2=572151&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0020Test.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0020Test.java Sun Sep 2 13:58:08 2007
@@ -20,12 +20,15 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0020" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-it0020", "1.0-SNAPSHOT", "maven-plugin" );
- List goals = Arrays.asList( new String[]{"install", "org.apache.maven.its.it0020:maven-it-it0020:it0020"} );
+ List goals = Arrays.asList( new String[]{"install"} );
+ verifier.executeGoals( goals );
+
+ verifier = new Verifier( testDir.getAbsolutePath() );
+ goals = Arrays.asList( new String[]{"org.apache.maven.its.it0020:maven-it-it0020:it0020"} );
verifier.executeGoals( goals );
verifier.assertFilePresent( "target/out.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
}
}
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java?rev=572151&r1=572150&r2=572151&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java Sun Sep 2 13:58:08 2007
@@ -2,6 +2,7 @@
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import java.io.File;
import java.util.ArrayList;
@@ -10,6 +11,11 @@
public class MavenIT0051Test
extends AbstractMavenIntegrationTestCase
{
+ public MavenIT0051Test()
+ throws InvalidVersionSpecificationException
+ {
+ super( "[,2.1-SNAPSHOT)" );
+ }
/**
* Test source attachment when -DperformRelease=true is specified.
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0020/src/main/scripts/org/apache/maven/it0020/it0020.bsh
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0020/src/main/scripts/org/apache/maven/it0020/it0020.bsh?rev=572151&r1=572150&r2=572151&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0020/src/main/scripts/org/apache/maven/it0020/it0020.bsh (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0020/src/main/scripts/org/apache/maven/it0020/it0020.bsh Sun Sep 2 13:58:08 2007
@@ -10,6 +10,7 @@
{
logger.info( "Executing it0020..." );
print( "info level?" );
+ outDir.mkdirs();
org.codehaus.plexus.util.FileUtils.fileWrite( outDir.getAbsolutePath() + "/out.txt", "This is a Beanshell test" );
}