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/27 23:49:48 UTC
svn commit: r680197 [3/5] -
/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/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=680197&r1=680196&r2=680197&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 14:49:43 2008
@@ -1,10 +1,9 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0081Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0081()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0081" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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" );
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=680197&r1=680196&r2=680197&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 14:49:43 2008
@@ -1,10 +1,9 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0082Test
extends AbstractMavenIntegrationTestCase
{
@@ -16,8 +15,8 @@
public void testit0082()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0082" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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();
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=680197&r1=680196&r2=680197&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 14:49:43 2008
@@ -1,10 +1,9 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0083Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0083()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0083" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0084Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0084Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0084Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0084Test.java Sun Jul 27 14:49:43 2008
@@ -1,10 +1,9 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0084Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0084()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0084" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0084" );
+ 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" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0085Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0085Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0085Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0085Test.java Sun Jul 27 14:49:43 2008
@@ -1,10 +1,9 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0085Test
extends AbstractMavenIntegrationTestCase
{
@@ -18,8 +17,8 @@
public void testit0085()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0085" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0085" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "package" );
verifier.assertFileNotPresent( "war/target/war-1.0/WEB-INF/lib/pom.xml" );
verifier.assertFileNotPresent( "war/target/war-1.0/WEB-INF/lib/it0085-dep-1.0.jar" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0086Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0086Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0086Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0086Test.java Sun Jul 27 14:49:43 2008
@@ -1,10 +1,9 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0086Test
extends AbstractMavenIntegrationTestCase
{
@@ -16,8 +15,8 @@
public void testit0086()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0086" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0086" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.plugins", "maven-it-it-plugin", "1.0", "maven-plugin" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0087Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0087Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0087Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0087Test.java Sun Jul 27 14:49:43 2008
@@ -1,10 +1,9 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0087Test
extends AbstractMavenIntegrationTestCase
{
@@ -16,8 +15,8 @@
public void testit0087()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0087" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0087" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.plugins", "maven-it-it-plugin", "1.0", "maven-plugin" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0088Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0088Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0088Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0088Test.java Sun Jul 27 14:49:43 2008
@@ -1,10 +1,9 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0088Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0088()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0088" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0088" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "test" );
verifier.assertFilePresent( "target/classes/test.properties" );
verifier.assertFilePresent( "target/mojo-generated.properties" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0089Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0089Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0089Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0089Test.java Sun Jul 27 14:49:43 2008
@@ -1,10 +1,9 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0089Test
extends AbstractMavenIntegrationTestCase
{
@@ -16,8 +15,8 @@
public void testit0089()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0089" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0089" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.plugins", "maven-it-it-plugin", "1.0", "maven-plugin" );
verifier.executeGoal( "install" );
verifier.assertFilePresent( "project/target/output.txt" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0090Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0090Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0090Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0090Test.java Sun Jul 27 14:49:43 2008
@@ -1,13 +1,11 @@
package org.apache.maven.integrationtests;
-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.HashMap;
import java.util.Map;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0090Test
extends AbstractMavenIntegrationTestCase
{
@@ -18,15 +16,14 @@
public void testit0090()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0090" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath(), true );
+ File testDir = extractTestResources( getClass(), "/it0090" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
Map envVars = new HashMap();
envVars.put( "MAVEN_TEST_ENVAR", "MAVEN_TEST_ENVAR_VALUE" );
verifier.executeGoal( "test", envVars );
verifier.assertFilePresent( "target/mojo-generated.properties" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0091Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0091Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0091Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0091Test.java Sun Jul 27 14:49:43 2008
@@ -1,10 +1,9 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestRunner;
+
/**
* # it0091 currrently fails. Not sure if there is an associated JIRA.
*/
@@ -20,8 +19,8 @@
public void testit0091()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0091" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0091" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "test" );
verifier.assertFilePresent( "target/classes/test.properties" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java Sun Jul 27 14:49:43 2008
@@ -1,12 +1,9 @@
package org.apache.maven.integrationtests;
-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.List;
-import java.util.ArrayList;
+
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.IntegrationTestRunner;
public class MavenIT0092Test
extends AbstractMavenIntegrationTestCase
@@ -23,8 +20,8 @@
public void testit0092()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0092" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0092" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.0-SNAPSHOT", "jar" );
verifier.executeGoal( "compile" );
verifier.assertArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.0-SNAPSHOT", "jar" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0094Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0094Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0094Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0094Test.java Sun Jul 27 14:49:43 2008
@@ -1,10 +1,9 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0094Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0094()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0094" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0094" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0095Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0095Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0095Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0095Test.java Sun Jul 27 14:49:43 2008
@@ -1,12 +1,11 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0095Test
extends AbstractMavenIntegrationTestCase
{
@@ -18,9 +17,9 @@
throws Exception
{
// TODO: This is WRONG! Need to run only sub1 to effective-pom, then run all to verify.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0095" );
+ File testDir = extractTestResources( getClass(), "/it0095" );
File sub1 = new File( testDir, "sub1" );
- Verifier verifier = new Verifier( sub1.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( sub1.getAbsolutePath() );
List options = new ArrayList();
options.add( "-Doutput=\"" + new File( sub1, "target/effective-pom.xml" ).getAbsolutePath() + "\"" );
verifier.executeGoal( "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom, verify", options );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0096Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0096Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0096Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0096Test.java Sun Jul 27 14:49:43 2008
@@ -1,10 +1,9 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0096Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0096()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0096" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0096" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0097Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0097Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0097Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0097Test.java Sun Jul 27 14:49:43 2008
@@ -1,10 +1,9 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0097Test
extends AbstractMavenIntegrationTestCase
{
@@ -16,8 +15,8 @@
public void testit0097()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0097" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0097" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "package" );
verifier.assertFilePresent( "project/project-level2/project-level3/target/it0097.txt" );
verifier.assertFilePresent( "project/project-sibling-level2/target/it0097.txt" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0098Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0098Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0098Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0098Test.java Sun Jul 27 14:49:43 2008
@@ -1,12 +1,11 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.it.IntegrationTestRunner;
+
/**
* # it0098 - something started failing here, not yet identified. MNG-2322
*/
@@ -20,8 +19,8 @@
public void testit0098()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0098" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0098" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Dtest.property=\"Test Property\"" );
verifier.executeGoal( "test", cliOptions );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0099Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0099Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0099Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0099Test.java Sun Jul 27 14:49:43 2008
@@ -1,10 +1,9 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0099Test
extends AbstractMavenIntegrationTestCase
{
@@ -16,8 +15,8 @@
public void testit0099()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0099" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0099" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.it0099", "maven-it-it0099-parent", "1", "pom" );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0100Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0100Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0100Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0100Test.java Sun Jul 27 14:49:43 2008
@@ -1,12 +1,11 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0100Test
extends AbstractMavenIntegrationTestCase
{
@@ -17,9 +16,9 @@
public void testit0100()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0100" );
+ File testDir = extractTestResources( getClass(), "/it0100" );
File child = new File( testDir, "parent/child" );
- Verifier verifier = new Verifier( child.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( child.getAbsolutePath() );
List options = new ArrayList();
options.add( "-Doutput=\"" + new File( child, "target/effective-pom.txt" ).getAbsolutePath() + "\"" );
verifier.executeGoal( "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom, verify", options );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0101Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0101Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0101Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0101Test.java Sun Jul 27 14:49:43 2008
@@ -1,12 +1,11 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0101Test
extends AbstractMavenIntegrationTestCase
{
@@ -19,8 +18,8 @@
public void testit0101()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0101" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0101" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "--settings settings.xml" );
verifier.executeGoal( "compile", cliOptions );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0102Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0102Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0102Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0102Test.java Sun Jul 27 14:49:43 2008
@@ -1,12 +1,11 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0102Test
extends AbstractMavenIntegrationTestCase
{
@@ -18,8 +17,8 @@
public void testit0102()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0102" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0102" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List options = new ArrayList();
options.add( "-Doutput=" + new File( testDir, "target/effective-pom.txt" ).getAbsolutePath() );
verifier.executeGoal( "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom, verify", options );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0103Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0103Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0103Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0103Test.java Sun Jul 27 14:49:43 2008
@@ -1,10 +1,9 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0103Test
extends AbstractMavenIntegrationTestCase
{
@@ -17,8 +16,8 @@
public void testit0103()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0103" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0103" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0104Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0104Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0104Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0104Test.java Sun Jul 27 14:49:43 2008
@@ -1,10 +1,9 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0104Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0104()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0104" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0104" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "test" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0105Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0105Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0105Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0105Test.java Sun Jul 27 14:49:43 2008
@@ -1,12 +1,11 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0105Test
extends AbstractMavenIntegrationTestCase
{
@@ -17,8 +16,8 @@
public void testit0105()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0105" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0105" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Dparam=PARAM" );
verifier.executeGoal( "test", cliOptions );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0106Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0106Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0106Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0106Test.java Sun Jul 27 14:49:43 2008
@@ -1,10 +1,9 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestRunner;
+
/**
* #it0106 MNG-2318 not yet fixed
*/
@@ -18,8 +17,8 @@
public void testit0106()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0106" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0106" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "clean" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0107Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0107Test.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0107Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0107Test.java Sun Jul 27 14:49:43 2008
@@ -1,12 +1,11 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.it.IntegrationTestRunner;
+
/**
* #it0107 requires a snapshot version of maven-plugin-plugin, which indicates it doesn't belong here
*/
@@ -20,8 +19,8 @@
public void testit0107()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0107" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0107" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
verifier.executeGoal( "validate", cliOptions );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0108SnapshotUpdateTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0108SnapshotUpdateTest.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0108SnapshotUpdateTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0108SnapshotUpdateTest.java Sun Jul 27 14:49:43 2008
@@ -16,10 +16,6 @@
* limitations under the License.
*/
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.FileUtils;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
import java.io.IOException;
import java.text.SimpleDateFormat;
@@ -27,6 +23,9 @@
import java.util.Date;
import java.util.Locale;
+import org.apache.maven.it.IntegrationTestRunner;
+import org.codehaus.plexus.util.FileUtils;
+
/**
* Downloads a snapshot dependency that was deployed with uniqueVersion = false, and checks it can be
* updated. See MNG-1908.
@@ -34,7 +33,7 @@
public class MavenIT0108SnapshotUpdateTest
extends AbstractMavenIntegrationTestCase
{
- private Verifier verifier;
+ private IntegrationTestRunner verifier;
private File artifact;
@@ -49,8 +48,8 @@
{
super.setUp();
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0108-snapshotUpdate" );
- verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0108-snapshotUpdate" );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
localRepoFile = getLocalRepoFile( verifier );
deleteLocalArtifact( verifier, localRepoFile );
@@ -255,7 +254,7 @@
verifier.assertArtifactContents( "org.apache.maven", "maven-core-it-support", "1.0-SNAPSHOT", "jar", s );
}
- private static File deleteLocalArtifact( Verifier verifier, File localRepoFile )
+ private static File deleteLocalArtifact( IntegrationTestRunner verifier, File localRepoFile )
throws IOException
{
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.0-SNAPSHOT", "jar" );
@@ -264,7 +263,7 @@
return localRepoFile;
}
- private static File getLocalRepoFile( Verifier verifier )
+ private static File getLocalRepoFile( IntegrationTestRunner verifier )
{
return new File(
verifier.getArtifactPath( "org.apache.maven", "maven-core-it-support", "1.0-SNAPSHOT", "jar" ) );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0109ReleaseUpdateTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0109ReleaseUpdateTest.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0109ReleaseUpdateTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0109ReleaseUpdateTest.java Sun Jul 27 14:49:43 2008
@@ -19,14 +19,11 @@
* under the License.
*/
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.FileUtils;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
+
+import org.apache.maven.it.IntegrationTestRunner;
+import org.codehaus.plexus.util.FileUtils;
/**
* Test to verify that a release can be updated.
@@ -49,8 +46,8 @@
public void testReleaseUpdated()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0109-releaseUpdate" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0109-releaseUpdate" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( GROUPID, ARTIFACTID, OLD_VERSION, TYPE );
verifier.deleteArtifact( GROUPID, ARTIFACTID, OLD_VERSION, POM_TYPE );
verifier.deleteArtifact( GROUPID, ARTIFACTID, NEW_VERSION, TYPE );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0110PluginDependenciesComeFromPluginReposTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0110PluginDependenciesComeFromPluginReposTest.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0110PluginDependenciesComeFromPluginReposTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0110PluginDependenciesComeFromPluginReposTest.java Sun Jul 27 14:49:43 2008
@@ -1,11 +1,8 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
-import java.util.List;
-import java.util.ArrayList;
+
+import org.apache.maven.it.IntegrationTestRunner;
public class MavenIT0110PluginDependenciesComeFromPluginReposTest
extends AbstractMavenIntegrationTestCase
@@ -14,8 +11,8 @@
throws Exception
{
File testDir =
- ResourceExtractor.simpleExtractResources( getClass(), "/it0110-pluginDependenciesComeFromPluginRepos" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ extractTestResources( getClass(), "/it0110-pluginDependenciesComeFromPluginRepos" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.it", "mail", "1.3.2", "jar" );
verifier.executeGoal( "clean" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java Sun Jul 27 14:49:43 2008
@@ -1,12 +1,11 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import java.io.File;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.IntegrationTestRunner;
public class MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest
extends AbstractMavenIntegrationTestCase
@@ -21,12 +20,12 @@
throws Exception
{
File testDir =
- ResourceExtractor.simpleExtractResources( getClass(), "/it0111-pluginThatRequiresResourceFromAnExtension" );
+ extractTestResources( getClass(), "/it0111-pluginThatRequiresResourceFromAnExtension" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
// Install the parent POM
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.it0111", "parent", "1.0", "pom" );
verifier.deleteArtifact( "org.apache.maven.its.it0111", "checkstyle-test", "1.0", "jar" );
verifier.deleteArtifact( "org.apache.maven.its.it0111", "checkstyle-assembly", "1.0", "jar" );
@@ -37,13 +36,13 @@
verifier.resetStreams();
// Install the extension with the resources required for the test
- verifier = new Verifier( new File( testDir.getAbsolutePath(), "checkstyle-assembly" ).getAbsolutePath() );
+ verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "checkstyle-assembly" ).getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
// Run the whole test
- verifier = new Verifier( new File( testDir.getAbsolutePath(), "checkstyle-test" ).getAbsolutePath() );
+ verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "checkstyle-test" ).getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0112ExtensionsThatDragDependencies.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0112ExtensionsThatDragDependencies.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0112ExtensionsThatDragDependencies.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0112ExtensionsThatDragDependencies.java Sun Jul 27 14:49:43 2008
@@ -19,34 +19,33 @@
* under the License.
*/
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0112ExtensionsThatDragDependencies
extends AbstractMavenIntegrationTestCase
{
public void testit0112()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0112-extensionsThatDragDependencies" );
+ File testDir = extractTestResources( getClass(), "/it0112-extensionsThatDragDependencies" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
// Install the parent POM
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.it0112", "test-extension", "1.0-SNAPSHOT", "jar" );
verifier.deleteArtifact( "org.apache.maven.its.it0112", "test-project", "1.0-SNAPSHOT", "jar" );
// Install the extension with the resources required for the test
- verifier = new Verifier( new File( testDir.getAbsolutePath(), "test-extension" ).getAbsolutePath() );
+ verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "test-extension" ).getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
// Run the whole test
- verifier = new Verifier( new File( testDir.getAbsolutePath(), "test-project" ).getAbsolutePath() );
+ verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "test-project" ).getAbsolutePath() );
verifier.executeGoal( "org.apache.maven.plugins:maven-project-info-reports-plugin:2.0.1:scm" );
// ommitted because we always get velocity errors that aren't covered by the verifier
// verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0113ServerAuthzAvailableToWagonMgrInPlugin.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0113ServerAuthzAvailableToWagonMgrInPlugin.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0113ServerAuthzAvailableToWagonMgrInPlugin.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0113ServerAuthzAvailableToWagonMgrInPlugin.java Sun Jul 27 14:49:43 2008
@@ -19,36 +19,35 @@
* under the License.
*/
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0113ServerAuthzAvailableToWagonMgrInPlugin
extends AbstractMavenIntegrationTestCase
{
public void testit0113()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0113-serverAuthzAvailableToWagonMgrInPlugin" );
+ File testDir = extractTestResources( getClass(), "/it0113-serverAuthzAvailableToWagonMgrInPlugin" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
// Install the parent POM
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.it0113", "maven-it0113-plugin", "1.0-SNAPSHOT", "jar" );
verifier.deleteArtifact( "org.apache.maven.its.it0113", "test-project", "1.0-SNAPSHOT", "jar" );
// Install the plugin to test for Authz info in the WagonManager
- verifier = new Verifier( new File( testDir.getAbsolutePath(), "maven-it0113-plugin" ).getAbsolutePath() );
+ verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "maven-it0113-plugin" ).getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
// Build the test project that uses the plugin.
- verifier = new Verifier( new File( testDir.getAbsolutePath(), "test-project" ).getAbsolutePath() );
+ verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "test-project" ).getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "--settings" );
cliOptions.add( "settings.xml" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java Sun Jul 27 14:49:43 2008
@@ -1,13 +1,12 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0114ExtensionThatProvidesResources
extends AbstractMavenIntegrationTestCase
{
@@ -21,12 +20,12 @@
throws Exception
{
File testDir =
- ResourceExtractor.simpleExtractResources( getClass(), "/it0114-extensionThatProvidesResources" );
+ extractTestResources( getClass(), "/it0114-extensionThatProvidesResources" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
// Install the parent POM, extension and the plugin
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.it0114", "it0114-plugin-runner", "1.0", "pom" );
verifier.deleteArtifact( "org.apache.maven.its.it0114", "it0114-extension", "1.0", "jar" );
verifier.deleteArtifact( "org.apache.maven.its.it0114", "it0114-plugin", "1.0", "jar" );
@@ -39,8 +38,8 @@
//now run the test
testDir =
- ResourceExtractor.simpleExtractResources( getClass(), "/it0114-extensionThatProvidesResources/test-project" );
- verifier = new Verifier( testDir.getAbsolutePath() );
+ extractTestResources( getClass(), "/it0114-extensionThatProvidesResources/test-project" );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
cliOptions = new ArrayList();
verifier.executeGoal( "verify" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java Sun Jul 27 14:49:43 2008
@@ -19,12 +19,9 @@
* under the License.
*/
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
+
+import org.apache.maven.it.IntegrationTestRunner;
public class MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest
extends AbstractMavenIntegrationTestCase
@@ -32,24 +29,24 @@
public void testit0115()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0115-customArtifactHandlerAndCustomLifecycle" );
+ File testDir = extractTestResources( getClass(), "/it0115-customArtifactHandlerAndCustomLifecycle" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
// Install the parent POM
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.it0115", "test-extension", "1.0-SNAPSHOT", "jar" );
verifier.deleteArtifact( "org.apache.maven.its.it0115", "test-project", "1.0-SNAPSHOT", "jar" );
// Install the plugin to test for Authz info in the WagonManager
- verifier = new Verifier( new File( testDir.getAbsolutePath(), "test-extension" ).getAbsolutePath() );
+ verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "test-extension" ).getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
// Build the test project that uses the plugin.
File testProject = new File( testDir.getAbsolutePath(), "test-project" );
- verifier = new Verifier( testProject.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testProject.getAbsolutePath() );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0118AttachedArtifactsInReactor.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0118AttachedArtifactsInReactor.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0118AttachedArtifactsInReactor.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0118AttachedArtifactsInReactor.java Sun Jul 27 14:49:43 2008
@@ -1,11 +1,8 @@
package org.apache.maven.integrationtests;
import java.io.File;
-import java.util.List;
-import java.util.ArrayList;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.IntegrationTestRunner;
public class MavenIT0118AttachedArtifactsInReactor
extends AbstractMavenIntegrationTestCase
@@ -13,8 +10,8 @@
public void testit0118()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0118-attachedartifactinreactor" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0118-attachedartifactinreactor" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.it0118", "parent", "1.0", "pom" );
verifier.deleteArtifact( "org.apache.maven.its.it0118", "one", "1.0", "jar" );
verifier.deleteArtifact( "org.apache.maven.its.it0118", "two", "1.0", "pom" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java Sun Jul 27 14:49:43 2008
@@ -3,8 +3,7 @@
import java.io.File;
import java.util.ArrayList;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.IntegrationTestRunner;
public class MavenIT0119PluginPrefixOrder
extends AbstractMavenIntegrationTestCase
@@ -12,12 +11,12 @@
public void testit0119()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0119-pluginprefixorder" );
+ File testDir = extractTestResources( getClass(), "/it0119-pluginprefixorder" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
// Install the parent POM, extension and the plugin
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
@@ -25,15 +24,15 @@
// now run the test. Since we have apache and codehaus, i should get the apache one first
- testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0119-pluginprefixorder/test-project" );
- verifier = new Verifier( testDir.getAbsolutePath() );
+ testDir = extractTestResources( getClass(), "/it0119-pluginprefixorder/test-project" );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "it0119:apache" );
verifier.verifyErrorFreeLog();
// now run the test. Since we have apache and codehaus and a prefix in my settings, i should get the custom one first
- testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0119-pluginprefixorder/test-project" );
- verifier = new Verifier( testDir.getAbsolutePath() );
+ testDir = extractTestResources( getClass(), "/it0119-pluginprefixorder/test-project" );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
//use my custom settings upon invocation.
ArrayList cli = new ArrayList();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0120EjbClientDependency.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0120EjbClientDependency.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0120EjbClientDependency.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0120EjbClientDependency.java Sun Jul 27 14:49:43 2008
@@ -21,8 +21,7 @@
import java.io.File;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.IntegrationTestRunner;
public class MavenIT0120EjbClientDependency
extends AbstractMavenIntegrationTestCase
@@ -30,9 +29,9 @@
public void testit0120()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0120-ejbClientDependency" );
+ File testDir = extractTestResources( getClass(), "/it0120-ejbClientDependency" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.it0120", "parent", "1.0-SNAPSHOT", "pom" );
verifier.deleteArtifact( "org.apache.maven.its.it0120", "client", "1.0-SNAPSHOT", "jar" );
verifier.deleteArtifact( "org.apache.maven.its.it0120", "model", "1.0-SNAPSHOT", "ejb" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0121TransitiveDepManVersion.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0121TransitiveDepManVersion.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0121TransitiveDepManVersion.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0121TransitiveDepManVersion.java Sun Jul 27 14:49:43 2008
@@ -22,9 +22,8 @@
import java.io.File;
import java.io.IOException;
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.IntegrationTestException;
+import org.apache.maven.it.IntegrationTestRunner;
public class MavenIT0121TransitiveDepManVersion
extends AbstractMavenIntegrationTestCase
@@ -32,14 +31,14 @@
public void testit0121()
throws Exception
{
- File testDirBase = ResourceExtractor.simpleExtractResources( getClass(), "/it0121-transitiveDepManVersion" );
+ File testDirBase = extractTestResources( getClass(), "/it0121-transitiveDepManVersion" );
compileDDep( testDirBase, "D1", "1.0" );
compileDDep( testDirBase, "D2", "2.0" );
File testProjectDir = new File( testDirBase, "test-project" );
- Verifier verifier = new Verifier( testProjectDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testProjectDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.it0121", "A", "1.0", "pom" );
verifier.deleteArtifact( "org.apache.maven.its.it0121", "A", "1.0", "jar" );
verifier.deleteArtifact( "org.apache.maven.its.it0121", "B", "1.0", "pom" );
@@ -52,10 +51,10 @@
}
private void compileDDep( File testDirBase, String projectDDepDir, String version )
- throws VerificationException, IOException
+ throws IntegrationTestException, IOException
{
File testOtherDepDir = new File( testDirBase, "test-other-deps/" + projectDDepDir );
- Verifier verifierOtherDep = new Verifier( testOtherDepDir.getAbsolutePath() );
+ IntegrationTestRunner verifierOtherDep = new IntegrationTestRunner( testOtherDepDir.getAbsolutePath() );
verifierOtherDep.deleteArtifact( "org.apache.maven.its.it0121", "D", version, "jar" );
verifierOtherDep.deleteArtifact( "org.apache.maven.its.it0121", "D", version, "pom" );
verifierOtherDep.executeGoal( "install" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0122ReactorDependencyResolutionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0122ReactorDependencyResolutionTest.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0122ReactorDependencyResolutionTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0122ReactorDependencyResolutionTest.java Sun Jul 27 14:49:43 2008
@@ -1,10 +1,9 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0122ReactorDependencyResolutionTest
extends AbstractMavenIntegrationTestCase
{
@@ -15,14 +14,14 @@
*/
public void testit0122() throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0122-reactorDependencyResolution/plugin" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0122-reactorDependencyResolution/plugin" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0122-reactorDependencyResolution/project" );
- verifier = new Verifier( testDir.getAbsolutePath() );
+ testDir = extractTestResources( getClass(), "/it0122-reactorDependencyResolution/project" );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "org.apache.maven.its.it0122:maven-it-it0122-plugin:1.0:test" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0123SnapshotRangeRepositoryTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0123SnapshotRangeRepositoryTest.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0123SnapshotRangeRepositoryTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0123SnapshotRangeRepositoryTest.java Sun Jul 27 14:49:43 2008
@@ -1,10 +1,9 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0123SnapshotRangeRepositoryTest
extends AbstractMavenIntegrationTestCase
{
@@ -16,8 +15,8 @@
*/
public void testit0123() throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0123-snapshotRangeRepository" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0123-snapshotRangeRepository" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "compile" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0124PomExtensionComponentOverrideTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0124PomExtensionComponentOverrideTest.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0124PomExtensionComponentOverrideTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0124PomExtensionComponentOverrideTest.java Sun Jul 27 14:49:43 2008
@@ -1,10 +1,9 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0124PomExtensionComponentOverrideTest
extends AbstractMavenIntegrationTestCase
{
@@ -16,20 +15,20 @@
*/
public void testit0124() throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0124-pomExtensionComponentOverride/extension" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0124-pomExtensionComponentOverride/extension" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0124-pomExtensionComponentOverride/plugin" );
- verifier = new Verifier( testDir.getAbsolutePath() );
+ testDir = extractTestResources( getClass(), "/it0124-pomExtensionComponentOverride/plugin" );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0124-pomExtensionComponentOverride/project" );
- verifier = new Verifier( testDir.getAbsolutePath() );
+ testDir = extractTestResources( getClass(), "/it0124-pomExtensionComponentOverride/project" );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "verify" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0125NewestConflictResolverTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0125NewestConflictResolverTest.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0125NewestConflictResolverTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0125NewestConflictResolverTest.java Sun Jul 27 14:49:43 2008
@@ -1,10 +1,9 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0125NewestConflictResolverTest
extends AbstractMavenIntegrationTestCase
{
@@ -16,20 +15,20 @@
*/
public void testit0125() throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0125-newestConflictResolver/dependency" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0125-newestConflictResolver/dependency" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0125-newestConflictResolver/plugin" );
- verifier = new Verifier( testDir.getAbsolutePath() );
+ testDir = extractTestResources( getClass(), "/it0125-newestConflictResolver/plugin" );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0125-newestConflictResolver/project" );
- verifier = new Verifier( testDir.getAbsolutePath() );
+ testDir = extractTestResources( getClass(), "/it0125-newestConflictResolver/project" );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "verify" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0126TestJarDependency.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0126TestJarDependency.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0126TestJarDependency.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0126TestJarDependency.java Sun Jul 27 14:49:43 2008
@@ -21,8 +21,7 @@
import java.io.File;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.IntegrationTestRunner;
public class MavenIT0126TestJarDependency
extends AbstractMavenIntegrationTestCase
@@ -34,9 +33,9 @@
public void testit0126()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0126-testJarDependency" );
+ File testDir = extractTestResources( getClass(), "/it0126-testJarDependency" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
/* It is important to start from empty repository*/
verifier.deleteArtifact( "org.apache.maven.its.it0126", "parent", "1.0-SNAPSHOT", "pom" );
verifier.deleteArtifact( "org.apache.maven.its.it0126", "client", "1.0-SNAPSHOT", "jar" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0127AntrunDependencies.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0127AntrunDependencies.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0127AntrunDependencies.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0127AntrunDependencies.java Sun Jul 27 14:49:43 2008
@@ -21,8 +21,7 @@
import java.io.File;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.IntegrationTestRunner;
public class MavenIT0127AntrunDependencies
extends AbstractMavenIntegrationTestCase
@@ -34,9 +33,9 @@
public void testit0127()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0127-antrunDependencies" );
+ File testDir = extractTestResources( getClass(), "/it0127-antrunDependencies" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.it0127", "parent", "1.0-SNAPSHOT", "pom" );
verifier.deleteArtifact( "org.apache.maven.its.it0127", "a", "1.0-SNAPSHOT", "jar" );
verifier.deleteArtifact( "org.apache.maven.its.it0127", "b", "1.0-SNAPSHOT", "jar" );