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/28 03:34:29 UTC
svn commit: r680222 [2/6] -
/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0036Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0036Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0036Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0036Test.java Sun Jul 27 18:34:23 2008
@@ -15,11 +15,11 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0036" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
- verifier.assertFilePresent( "target/maven-it-it0036-1.0.jar" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "package" );
+ itr.assertFilePresent( "target/maven-it-it0036-1.0.jar" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0037Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0037Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0037Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0037Test.java Sun Jul 27 18:34:23 2008
@@ -17,13 +17,13 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0037" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-f pom2.xml" );
- verifier.executeGoal( "package", cliOptions );
- verifier.assertFilePresent( "target/maven-it-it0037-1.0-build2.jar" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "package", cliOptions );
+ itr.assertFilePresent( "target/maven-it-it0037-1.0-build2.jar" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0038Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0038Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0038Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0038Test.java Sun Jul 27 18:34:23 2008
@@ -18,13 +18,13 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0038" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-f project/pom2.xml" );
- verifier.executeGoal( "package", cliOptions);
- verifier.assertFilePresent( "project/target/maven-it-it0038-1.0-build2.jar" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "package", cliOptions);
+ itr.assertFilePresent( "project/target/maven-it-it0038-1.0-build2.jar" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0039Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0039Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0039Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0039Test.java Sun Jul 27 18:34:23 2008
@@ -19,14 +19,14 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0039" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-r" );
- verifier.executeGoal( "package", cliOptions );
- verifier.assertFilePresent( "project/target/maven-it-it0039-p1-1.0.jar" );
- verifier.assertFilePresent( "project2/target/maven-it-it0039-p2-1.0.jar" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "package", cliOptions );
+ itr.assertFilePresent( "project/target/maven-it-it0039-p1-1.0.jar" );
+ itr.assertFilePresent( "project2/target/maven-it-it0039-p2-1.0.jar" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0040Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0040Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0040Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0040Test.java Sun Jul 27 18:34:23 2008
@@ -15,11 +15,11 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0040" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
- verifier.assertFilePresent( "target/maven-it-it0040-1.0-it.jar" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "package" );
+ itr.assertFilePresent( "target/maven-it-it0040-1.0-it.jar" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0041Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0041Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0041Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0041Test.java Sun Jul 27 18:34:23 2008
@@ -15,14 +15,14 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0041" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.2", "coreit-artifact" );
- verifier.executeGoal( "package" );
- verifier.assertFilePresent( "target/maven-it-it0041-1.0-SNAPSHOT.jar" );
- verifier.assertArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.2", "coreit-artifact" );
- verifier.assertArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.2", "pom" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.2", "coreit-artifact" );
+ itr.executeGoal( "package" );
+ itr.assertFilePresent( "target/maven-it-it0041-1.0-SNAPSHOT.jar" );
+ itr.assertArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.2", "coreit-artifact" );
+ itr.assertArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.2", "pom" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0042Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0042Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0042Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0042Test.java Sun Jul 27 18:34:23 2008
@@ -15,18 +15,18 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0042" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
- verifier.assertFilePresent( "test-component-a/target/test-component-a-0.1.jar" );
- verifier.assertFilePresent( "test-component-b/target/test-component-b-0.1.jar" );
- verifier.assertFilePresent( "test-component-c/target/test-component-c-0.1.war" );
- verifier.assertFilePresent(
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "package" );
+ itr.assertFilePresent( "test-component-a/target/test-component-a-0.1.jar" );
+ itr.assertFilePresent( "test-component-b/target/test-component-b-0.1.jar" );
+ itr.assertFilePresent( "test-component-c/target/test-component-c-0.1.war" );
+ itr.assertFilePresent(
"test-component-c/target/test-component-c-0.1.war!/WEB-INF/lib/test-component-a-0.1.jar" );
- verifier.assertFilePresent(
+ itr.assertFilePresent(
"test-component-c/target/test-component-c-0.1.war!/WEB-INF/lib/test-component-b-0.1.jar" );
- verifier.assertFilePresent( "test-component-c/target/my-test" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.assertFilePresent( "test-component-c/target/my-test" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0043Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0043Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0043Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0043Test.java Sun Jul 27 18:34:23 2008
@@ -17,20 +17,20 @@
File testDir = extractTestResources( getClass(), "/it0043" );
File child1 = new File( testDir, "child1" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( child1.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( child1.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.plugins", "maven-help-plugin", "2.0.2", "jar" );
+ itr.deleteArtifact( "org.apache.maven.plugins", "maven-help-plugin", "2.0.2", "jar" );
- verifier.executeGoal( "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
File child2 = new File( testDir, "child2" );
- verifier = new IntegrationTestRunner( child2.getAbsolutePath() );
+ itr = new IntegrationTestRunner( child2.getAbsolutePath() );
- verifier.executeGoal( "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0044Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0044Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0044Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0044Test.java Sun Jul 27 18:34:23 2008
@@ -17,13 +17,13 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0044" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "--settings settings.xml" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch", cliOptions );
- verifier.assertFilePresent( "target/test.txt" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch", cliOptions );
+ itr.assertFilePresent( "target/test.txt" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0045Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0045Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0045Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0045Test.java Sun Jul 27 18:34:23 2008
@@ -17,15 +17,15 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0045" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-plugin-no-project", "1.0", "maven-plugin" );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-plugin-no-project", "1.0", "maven-plugin" );
List cliOptions = new ArrayList();
cliOptions.add( "--no-plugin-registry" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-no-project:light-touch", cliOptions );
- verifier.assertFilePresent( "target/touch.txt" );
- verifier.assertFileNotPresent( "subproject/target/touch.txt" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-no-project:light-touch", cliOptions );
+ itr.assertFilePresent( "target/touch.txt" );
+ itr.assertFileNotPresent( "subproject/target/touch.txt" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0046Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0046Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0046Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0046Test.java Sun Jul 27 18:34:23 2008
@@ -18,16 +18,16 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0046" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.plugins", "maven-it-it-plugin", "1.0", "maven-plugin" );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.deleteArtifact( "org.apache.maven.plugins", "maven-it-it-plugin", "1.0", "maven-plugin" );
List cliOptions = new ArrayList();
cliOptions.add( "--no-plugin-registry --fail-never" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch", cliOptions );
- verifier.assertFilePresent( "target/touch.txt" );
- verifier.assertFileNotPresent( "subproject/target/touch.txt" );
- verifier.assertFilePresent( "subproject2/target/touch.txt" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch", cliOptions );
+ itr.assertFilePresent( "target/touch.txt" );
+ itr.assertFileNotPresent( "subproject/target/touch.txt" );
+ itr.assertFilePresent( "subproject2/target/touch.txt" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0047Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0047Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0047Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0047Test.java Sun Jul 27 18:34:23 2008
@@ -16,11 +16,11 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0047" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "compile" );
- verifier.assertFilePresent( "target/classes/org/apache/maven/it0047/Person.class" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "compile" );
+ itr.assertFilePresent( "target/classes/org/apache/maven/it0047/Person.class" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0048Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0048Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0048Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0048Test.java Sun Jul 27 18:34:23 2008
@@ -16,11 +16,11 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0048" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "test" );
- verifier.assertFilePresent( "target/testFileOutput.txt" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "test" );
+ itr.assertFilePresent( "target/testFileOutput.txt" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0049Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0049Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0049Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0049Test.java Sun Jul 27 18:34:23 2008
@@ -15,13 +15,13 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0049" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
//todo: i don't think we need to delete this plugin
- //verifier.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-plugin-touch", "1.0", "maven-plugin" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
- verifier.assertFilePresent( "target/touchFile.txt" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ //itr.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-plugin-touch", "1.0", "maven-plugin" );
+ itr.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ itr.assertFilePresent( "target/touchFile.txt" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0050Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0050Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0050Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0050Test.java Sun Jul 27 18:34:23 2008
@@ -15,12 +15,12 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0050" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
- verifier.assertFilePresent( "target/testTouchFile.txt" );
- verifier.assertFilePresent( "target/defaultTestTouchFile.txt" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "package" );
+ itr.assertFilePresent( "target/testTouchFile.txt" );
+ itr.assertFilePresent( "target/defaultTestTouchFile.txt" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java Sun Jul 27 18:34:23 2008
@@ -23,14 +23,14 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0051" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "--no-plugin-registry -DperformRelease=true" );
- verifier.executeGoal( "package", cliOptions );
- verifier.assertFilePresent( "target/maven-it-it0051-1.0.jar" );
- verifier.assertFilePresent( "target/maven-it-it0051-1.0-sources.jar" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "package", cliOptions );
+ itr.assertFilePresent( "target/maven-it-it0051-1.0.jar" );
+ itr.assertFilePresent( "target/maven-it-it0051-1.0-sources.jar" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0052Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0052Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0052Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0052Test.java Sun Jul 27 18:34:23 2008
@@ -18,14 +18,14 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0052" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "--no-plugin-registry" );
- verifier.executeGoal( "package", cliOptions );
- verifier.assertFilePresent( "target/maven-it-it0052-1.0.jar" );
- verifier.assertFileNotPresent( "target/maven-it-it0052-1.0-sources.jar" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "package", cliOptions );
+ itr.assertFilePresent( "target/maven-it-it0052-1.0.jar" );
+ itr.assertFileNotPresent( "target/maven-it-it0052-1.0-sources.jar" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0053Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0053Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0053Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0053Test.java Sun Jul 27 18:34:23 2008
@@ -19,14 +19,14 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0053" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "--no-plugin-registry" );
- verifier.executeGoal( "package", cliOptions );
- verifier.assertFilePresent( "target/maven-it-it0053-1.0-SNAPSHOT.jar" );
- verifier.assertFileNotPresent( "target/maven-it-it0053-1.0-SNAPSHOT-sources.jar" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "package", cliOptions );
+ itr.assertFilePresent( "target/maven-it-it0053-1.0-SNAPSHOT.jar" );
+ itr.assertFileNotPresent( "target/maven-it-it0053-1.0-SNAPSHOT-sources.jar" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0054Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0054Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0054Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0054Test.java Sun Jul 27 18:34:23 2008
@@ -15,14 +15,14 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0054" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
- verifier.assertFilePresent( "target/classes/org/apache/maven/it0054/Person.class" );
- verifier.assertFilePresent( "target/test-classes/org/apache/maven/it0054/PersonTest.class" );
- verifier.assertFilePresent( "target/maven-it-it0054-1.0.jar" );
- verifier.assertFilePresent( "target/maven-it-it0054-1.0.jar!/it0054.properties" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "package" );
+ itr.assertFilePresent( "target/classes/org/apache/maven/it0054/Person.class" );
+ itr.assertFilePresent( "target/test-classes/org/apache/maven/it0054/PersonTest.class" );
+ itr.assertFilePresent( "target/maven-it-it0054-1.0.jar" );
+ itr.assertFilePresent( "target/maven-it-it0054-1.0.jar!/it0054.properties" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0055Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0055Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0055Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0055Test.java Sun Jul 27 18:34:23 2008
@@ -16,14 +16,14 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0055" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "test-compile" );
- verifier.assertFilePresent( "target/classes/org/apache/maven/it0055/Person.class" );
- verifier.assertFilePresent( "target/test-classes/org/apache/maven/it0055/PersonTest.class" );
- verifier.assertFileNotPresent( "target/classes/org/apache/maven/it0055/PersonTwo.class" );
- verifier.assertFileNotPresent( "target/test-classes/org/apache/maven/it0055/PersonTwoTest.class" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "test-compile" );
+ itr.assertFilePresent( "target/classes/org/apache/maven/it0055/Person.class" );
+ itr.assertFilePresent( "target/test-classes/org/apache/maven/it0055/PersonTest.class" );
+ itr.assertFileNotPresent( "target/classes/org/apache/maven/it0055/PersonTwo.class" );
+ itr.assertFileNotPresent( "target/test-classes/org/apache/maven/it0055/PersonTwoTest.class" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0056Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0056Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0056Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0056Test.java Sun Jul 27 18:34:23 2008
@@ -16,16 +16,16 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0056" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "test-compile" );
- verifier.assertFilePresent( "target/classes/org/apache/maven/it0056/Person.class" );
- verifier.assertFilePresent( "target/classes/org/apache/maven/it0056/PersonTwo.class" );
- verifier.assertFilePresent( "target/classes/org/apache/maven/it0056/PersonThree.class" );
- verifier.assertFilePresent( "target/test-classes/org/apache/maven/it0056/PersonTest.class" );
- verifier.assertFilePresent( "target/test-classes/org/apache/maven/it0056/PersonTwoTest.class" );
- verifier.assertFilePresent( "target/test-classes/org/apache/maven/it0056/PersonThreeTest.class" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "test-compile" );
+ itr.assertFilePresent( "target/classes/org/apache/maven/it0056/Person.class" );
+ itr.assertFilePresent( "target/classes/org/apache/maven/it0056/PersonTwo.class" );
+ itr.assertFilePresent( "target/classes/org/apache/maven/it0056/PersonThree.class" );
+ itr.assertFilePresent( "target/test-classes/org/apache/maven/it0056/PersonTest.class" );
+ itr.assertFilePresent( "target/test-classes/org/apache/maven/it0056/PersonTwoTest.class" );
+ itr.assertFilePresent( "target/test-classes/org/apache/maven/it0056/PersonThreeTest.class" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0057Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0057Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0057Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0057Test.java Sun Jul 27 18:34:23 2008
@@ -15,14 +15,14 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0057" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
- verifier.assertFilePresent( "target/classes/org/apache/maven/it0057/Person.class" );
- verifier.assertFilePresent( "target/test-classes/org/apache/maven/it0057/PersonTest.class" );
- verifier.assertFilePresent( "target/maven-it-it0057-1.0.jar" );
- verifier.assertFilePresent( "target/maven-it-it0057-1.0.jar!/it0057.properties" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "package" );
+ itr.assertFilePresent( "target/classes/org/apache/maven/it0057/Person.class" );
+ itr.assertFilePresent( "target/test-classes/org/apache/maven/it0057/PersonTest.class" );
+ itr.assertFilePresent( "target/maven-it-it0057-1.0.jar" );
+ itr.assertFilePresent( "target/maven-it-it0057-1.0.jar!/it0057.properties" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0058Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0058Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0058Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0058Test.java Sun Jul 27 18:34:23 2008
@@ -18,13 +18,13 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0058" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "--settings ./settings.xml" );
- verifier.executeGoal( "package", cliOptions );
- verifier.assertFilePresent( "subproject/target/subproject-1.0.jar" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "package", cliOptions );
+ itr.assertFilePresent( "subproject/target/subproject-1.0.jar" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0059Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0059Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0059Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0059Test.java Sun Jul 27 18:34:23 2008
@@ -16,11 +16,11 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0059" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
- verifier.assertFilePresent( "target/maven-it-it0059-1.0.jar" );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "package" );
+ itr.assertFilePresent( "target/maven-it-it0059-1.0.jar" );
// don't verify error free log
- verifier.resetStreams();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0060Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0060Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0060Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0060Test.java Sun Jul 27 18:34:23 2008
@@ -17,14 +17,14 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0060" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "test" );
- verifier.assertFilePresent( "subproject/target/classes/org/apache/maven/it0060/Person.class" );
- verifier.assertFilePresent( "subproject/target/test-classes/org/apache/maven/it0060/PersonTest.class" );
- verifier.assertFileNotPresent( "subproject/target/test-classes/org/apache/maven/it0060/PersonTwoTest.class" );
- verifier.assertFileNotPresent( "subproject/target/test-classes/org/apache/maven/it0060/PersonThreeTest.class" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "test" );
+ itr.assertFilePresent( "subproject/target/classes/org/apache/maven/it0060/Person.class" );
+ itr.assertFilePresent( "subproject/target/test-classes/org/apache/maven/it0060/PersonTest.class" );
+ itr.assertFileNotPresent( "subproject/target/test-classes/org/apache/maven/it0060/PersonTwoTest.class" );
+ itr.assertFileNotPresent( "subproject/target/test-classes/org/apache/maven/it0060/PersonThreeTest.class" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0061Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0061Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0061Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0061Test.java Sun Jul 27 18:34:23 2008
@@ -17,12 +17,12 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0061" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "deploy" );
- verifier.assertFilePresent( "target/test-repo/org.apache.maven.its.it0061/jars/maven-it-it0061-1.0.jar" );
- verifier.assertFilePresent( "target/test-repo/org.apache.maven.its.it0061/poms/maven-it-it0061-1.0.pom" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "deploy" );
+ itr.assertFilePresent( "target/test-repo/org.apache.maven.its.it0061/jars/maven-it-it0061-1.0.jar" );
+ itr.assertFilePresent( "target/test-repo/org.apache.maven.its.it0061/poms/maven-it-it0061-1.0.pom" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0062Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0062Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0062Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0062Test.java Sun Jul 27 18:34:23 2008
@@ -16,13 +16,13 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0062" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven", "maven-it-it0062-SNAPSHOT", "1.0", "jar" );
- verifier.executeGoal( "deploy" );
- verifier.assertFilePresent( "target/classes/org/apache/maven/it0062/Person.class" );
- verifier.assertFilePresent( "target/maven-it-it0062-1.0-SNAPSHOT.jar" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.deleteArtifact( "org.apache.maven", "maven-it-it0062-SNAPSHOT", "1.0", "jar" );
+ itr.executeGoal( "deploy" );
+ itr.assertFilePresent( "target/classes/org/apache/maven/it0062/Person.class" );
+ itr.assertFilePresent( "target/maven-it-it0062-1.0-SNAPSHOT.jar" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0063Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0063Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0063Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0063Test.java Sun Jul 27 18:34:23 2008
@@ -15,14 +15,14 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0063" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
- verifier.assertFilePresent( "target/classes/org/apache/maven/it0063/Person.class" );
- verifier.assertFilePresent( "target/test-classes/org/apache/maven/it0063/PersonTest.class" );
- verifier.assertFilePresent( "target/maven-it-it0063-1.0.jar" );
- verifier.assertFilePresent( "target/maven-it-it0063-1.0.jar!/it0063.properties" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "package" );
+ itr.assertFilePresent( "target/classes/org/apache/maven/it0063/Person.class" );
+ itr.assertFilePresent( "target/test-classes/org/apache/maven/it0063/PersonTest.class" );
+ itr.assertFilePresent( "target/maven-it-it0063-1.0.jar" );
+ itr.assertFilePresent( "target/maven-it-it0063-1.0.jar!/it0063.properties" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0064Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0064Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0064Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0064Test.java Sun Jul 27 18:34:23 2008
@@ -16,13 +16,13 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0064" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-plugin-setter", "1.0", "maven-plugin" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-setter:setter-touch" );
- verifier.assertFilePresent( "target/fooValue" );
- verifier.assertFilePresent( "target/barValue.baz" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-plugin-setter", "1.0", "maven-plugin" );
+ itr.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-setter:setter-touch" );
+ itr.assertFilePresent( "target/fooValue" );
+ itr.assertFilePresent( "target/barValue.baz" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0065Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0065Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0065Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0065Test.java Sun Jul 27 18:34:23 2008
@@ -15,13 +15,13 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0065" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.it0065", "plugin", "1.0", "maven-plugin" );
- verifier.executeGoal( "install" );
- verifier.assertFilePresent( "subproject/target/child-basedir" );
- verifier.assertFilePresent( "parent-basedir" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.deleteArtifact( "org.apache.maven.its.it0065", "plugin", "1.0", "maven-plugin" );
+ itr.executeGoal( "install" );
+ itr.assertFilePresent( "subproject/target/child-basedir" );
+ itr.assertFilePresent( "parent-basedir" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0066Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0066Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0066Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0066Test.java Sun Jul 27 18:34:23 2008
@@ -17,13 +17,13 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0066" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-f other-pom.xml" );
- verifier.executeGoal( "install", cliOptions);
- verifier.assertFilePresent( "" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "install", cliOptions);
+ itr.assertFilePresent( "" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0067Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0067Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0067Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0067Test.java Sun Jul 27 18:34:23 2008
@@ -17,14 +17,14 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0067" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.0", "jar" );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.0", "jar" );
List cliOptions = new ArrayList();
cliOptions.add( "-P test-profile" );
- verifier.executeGoal( "compile", cliOptions );
- verifier.assertFilePresent( "target/classes/org/apache/maven/it0067/Person.class" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "compile", cliOptions );
+ itr.assertFilePresent( "target/classes/org/apache/maven/it0067/Person.class" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0068Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0068Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0068Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0068Test.java Sun Jul 27 18:34:23 2008
@@ -15,11 +15,11 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0068" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.codehaus.modello", "modello-core", "1.0-alpha-3", "jar" );
- verifier.executeGoal( "generate-sources" );
- verifier.assertFilePresent( "target/generated-sources/modello/org/apache/maven/settings/Settings.java" );
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.deleteArtifact( "org.codehaus.modello", "modello-core", "1.0-alpha-3", "jar" );
+ itr.executeGoal( "generate-sources" );
+ itr.assertFilePresent( "target/generated-sources/modello/org/apache/maven/settings/Settings.java" );
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0069Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0069Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0069Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0069Test.java Sun Jul 27 18:34:23 2008
@@ -17,13 +17,13 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0069" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-o" );
- verifier.executeGoal( "compile", cliOptions );
- verifier.assertFilePresent( "target/classes/org/apache/maven/it0069/ClassworldBasedThing.class" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "compile", cliOptions );
+ itr.assertFilePresent( "target/classes/org/apache/maven/it0069/ClassworldBasedThing.class" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0070Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0070Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0070Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0070Test.java Sun Jul 27 18:34:23 2008
@@ -15,13 +15,13 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0070" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
- verifier.assertFilePresent( "target/maven-it-it0070-1.0.rar" );
- verifier.assertFilePresent( "target/maven-it-it0070-1.0.rar!/META-INF/ra.xml" );
- verifier.assertFilePresent( "target/maven-it-it0070-1.0.rar!/SomeResource.txt" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "package" );
+ itr.assertFilePresent( "target/maven-it-it0070-1.0.rar" );
+ itr.assertFilePresent( "target/maven-it-it0070-1.0.rar!/META-INF/ra.xml" );
+ itr.assertFilePresent( "target/maven-it-it0070-1.0.rar!/SomeResource.txt" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0071Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0071Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0071Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0071Test.java Sun Jul 27 18:34:23 2008
@@ -16,12 +16,12 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0071" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.plugins", "maven-it-it-plugin", "1.0", "maven-plugin" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
- verifier.assertFilePresent( "target/foo2" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.deleteArtifact( "org.apache.maven.plugins", "maven-it-it-plugin", "1.0", "maven-plugin" );
+ itr.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ itr.assertFilePresent( "target/foo2" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0072Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0072Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0072Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0072Test.java Sun Jul 27 18:34:23 2008
@@ -16,11 +16,11 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0072" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
- verifier.assertFilePresent( "target/maven-it-it0072-1.0-SNAPSHOT.jar" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "package" );
+ itr.assertFilePresent( "target/maven-it-it0072-1.0-SNAPSHOT.jar" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0073Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0073Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0073Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0073Test.java Sun Jul 27 18:34:23 2008
@@ -15,11 +15,11 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0073" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-plugin-context-passing", "1.0", "maven-plugin" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-context-passing:throw, org.apache.maven.its.plugins:maven-it-plugin-context-passing:catch" );
- verifier.assertFilePresent( "target/thrown-value" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-plugin-context-passing", "1.0", "maven-plugin" );
+ itr.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-context-passing:throw, org.apache.maven.its.plugins:maven-it-plugin-context-passing:catch" );
+ itr.assertFilePresent( "target/thrown-value" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0074Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0074Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0074Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0074Test.java Sun Jul 27 18:34:23 2008
@@ -16,11 +16,11 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0074" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "eclipse:eclipse" );
- verifier.assertFilePresent( ".classpath" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "eclipse:eclipse" );
+ itr.assertFilePresent( ".classpath" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0075Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0075Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0075Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0075Test.java Sun Jul 27 18:34:23 2008
@@ -18,14 +18,14 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0075" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Dactivate=anything" );
- verifier.executeGoal( "help:active-profiles, package, eclipse:eclipse, clean:clean", cliOptions );
- verifier.assertFileNotPresent( "sub1/target/maven-it-it0075-sub1-1.0.jar" );
- verifier.assertFileNotPresent( "sub2/target/maven-it-it0075-sub2-1.0.jar" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.executeGoal( "help:active-profiles, package, eclipse:eclipse, clean:clean", cliOptions );
+ itr.assertFileNotPresent( "sub1/target/maven-it-it0075-sub1-1.0.jar" );
+ itr.assertFileNotPresent( "sub2/target/maven-it-it0075-sub2-1.0.jar" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0076Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0076Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0076Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0076Test.java Sun Jul 27 18:34:23 2008
@@ -17,10 +17,10 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0076" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "install" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0077Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0077Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0077Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0077Test.java Sun Jul 27 18:34:23 2008
@@ -14,12 +14,12 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0077" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.it0077", "sub1", "1.0", "test-jar" );
- verifier.executeGoal( "install" );
- verifier.assertArtifactPresent( "org.apache.maven.its.it0077", "sub1", "1.0", "test-jar" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.deleteArtifact( "org.apache.maven.its.it0077", "sub1", "1.0", "test-jar" );
+ itr.executeGoal( "install" );
+ itr.assertArtifactPresent( "org.apache.maven.its.it0077", "sub1", "1.0", "test-jar" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0078Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0078Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0078Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0078Test.java Sun Jul 27 18:34:23 2008
@@ -17,11 +17,11 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0078" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "compile" );
- verifier.assertFileNotPresent( "target/classes/Test.class" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "compile" );
+ itr.assertFileNotPresent( "target/classes/Test.class" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0079Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0079Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0079Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0079Test.java Sun Jul 27 18:34:23 2008
@@ -16,14 +16,14 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0079" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "deploy" );
- verifier.assertFilePresent(
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "deploy" );
+ itr.assertFilePresent(
"target/test-repo/org/apache/maven/its/it0079/maven-it-it0079/SNAPSHOT/maven-it-it0079-*-1.jar" );
- verifier.assertFilePresent(
+ itr.assertFilePresent(
"target/test-repo/org/apache/maven/its/it0079/maven-it-it0079/SNAPSHOT/maven-it-it0079-*-1-sources.jar" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0080Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0080Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0080Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0080Test.java Sun Jul 27 18:34:23 2008
@@ -16,18 +16,18 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0080" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
- verifier.assertFilePresent( "test-component-a/target/test-component-a-0.1.jar" );
- verifier.assertFilePresent( "test-component-b/target/test-component-b-0.1.war" );
- verifier.assertFilePresent(
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "package" );
+ itr.assertFilePresent( "test-component-a/target/test-component-a-0.1.jar" );
+ itr.assertFilePresent( "test-component-b/target/test-component-b-0.1.war" );
+ itr.assertFilePresent(
"test-component-b/target/test-component-b-0.1.war!/WEB-INF/lib/test-component-a-0.1.jar" );
- verifier.assertFilePresent( "test-component-c/target/test-component-c-0.1.ear" );
- verifier.assertFilePresent( "test-component-c/target/test-component-c-0.1.ear!/test-component-b-0.1.war" );
- verifier.assertFilePresent( "test-component-c/target/test-component-c-0.1/test-component-b-0.1.war" );
- verifier.assertFileNotPresent( "test-component-c/target/test-component-c-0.1/test-component-a-0.1.jar" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.assertFilePresent( "test-component-c/target/test-component-c-0.1.ear" );
+ itr.assertFilePresent( "test-component-c/target/test-component-c-0.1.ear!/test-component-b-0.1.war" );
+ itr.assertFilePresent( "test-component-c/target/test-component-c-0.1/test-component-b-0.1.war" );
+ itr.assertFileNotPresent( "test-component-c/target/test-component-c-0.1/test-component-a-0.1.jar" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0081Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0081Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0081Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0081Test.java Sun Jul 27 18:34:23 2008
@@ -15,12 +15,12 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0081" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.it0081", "test-plugin", "0.1", "maven-plugin" );
- verifier.executeGoal( "install" );
- verifier.assertFilePresent( "test-component-c/target/org.apache.maven.wagon.providers.ftp.FtpWagon" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.deleteArtifact( "org.apache.maven.its.it0081", "test-plugin", "0.1", "maven-plugin" );
+ itr.executeGoal( "install" );
+ itr.assertFilePresent( "test-component-c/target/org.apache.maven.wagon.providers.ftp.FtpWagon" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0082Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0082Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0082Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0082Test.java Sun Jul 27 18:34:23 2008
@@ -16,11 +16,11 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0082" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "process-sources" );
- verifier.assertFilePresent( "test-component-c/target/my-test" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "process-sources" );
+ itr.assertFilePresent( "test-component-c/target/my-test" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0083Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0083Test.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0083Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0083Test.java Sun Jul 27 18:34:23 2008
@@ -15,19 +15,19 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/it0083" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
- verifier.assertFilePresent( "test-component-a/target/test-component-a-0.1.jar" );
- verifier.assertFilePresent( "test-component-b/target/test-component-b-0.1.jar" );
- verifier.assertFilePresent( "test-component-c/target/test-component-c-0.1.war" );
- verifier.assertFilePresent(
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "package" );
+ itr.assertFilePresent( "test-component-a/target/test-component-a-0.1.jar" );
+ itr.assertFilePresent( "test-component-b/target/test-component-b-0.1.jar" );
+ itr.assertFilePresent( "test-component-c/target/test-component-c-0.1.war" );
+ itr.assertFilePresent(
"test-component-c/target/test-component-c-0.1.war!/WEB-INF/lib/test-component-b-0.1.jar" );
- verifier.assertFileNotPresent(
+ itr.assertFileNotPresent(
"test-component-c/target/test-component-c-0.1/WEB-INF/lib/test-component-a-0.1.jar" );
- verifier.assertFilePresent(
+ itr.assertFilePresent(
"test-component-c/target/test-component-c-0.1/WEB-INF/lib/test-component-b-0.1.jar" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}