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 [2/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/MavenIT0030Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0030Test.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/MavenIT0030Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0030Test.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 MavenIT0030Test
extends AbstractMavenIntegrationTestCase
{
@@ -16,8 +15,8 @@
public void testit0030()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0030" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0030" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.it", "maven-it-it0030", "1.0-SNAPSHOT", "jar" );
verifier.deleteArtifact( "org.apache.maven.it", "maven-it-it0030-child-hierarchy", "1.0-SNAPSHOT", "jar" );
verifier.deleteArtifact( "org.apache.maven.it", "maven-it-it0030-child-project1", "1.0-SNAPSHOT", "jar" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0031Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0031Test.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/MavenIT0031Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0031Test.java Sun Jul 27 14:49:43 2008
@@ -1,15 +1,13 @@
package org.apache.maven.integrationtests;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.it.DefaultInvocationRequest;
+import org.apache.maven.it.IntegrationTestRunner;
import org.apache.maven.it.InvocationRequest;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-import java.util.Properties;
-import java.util.List;
-import java.util.ArrayList;
public class MavenIT0031Test
extends AbstractMavenIntegrationTestCase
@@ -28,8 +26,8 @@
public void testit0031()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0031" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0031" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "--settings settings.xml" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0032Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0032Test.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/MavenIT0032Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0032Test.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 MavenIT0032Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0032()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0032" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0032" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "package" );
verifier.assertFilePresent( "target/classes/org/apache/maven/it0032/Person.class" );
verifier.assertFilePresent( "target/test-classes/org/apache/maven/it0032/PersonTest.class" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0033Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0033Test.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/MavenIT0033Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0033Test.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 MavenIT0033Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0033()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0033" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0033" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "package" );
verifier.assertFilePresent( "target/maven-it-it0033-1.0.ear" );
verifier.assertFilePresent( "target/maven-it-it0033-1.0.ear!/META-INF/application.xml" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0034Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0034Test.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/MavenIT0034Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0034Test.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 MavenIT0034Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0034()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0034" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0034" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.4", "jar" );
verifier.deleteArtifact( "junit", "junit", "3.8", "jar" );
verifier.executeGoal( "package" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0035Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0035Test.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/MavenIT0035Test.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0035Test.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 MavenIT0035Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0035()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0035" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0035" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.1", "jar" );
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.1", "pom" );
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support-old-location", "1.1", "pom" );
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=680197&r1=680196&r2=680197&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 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 MavenIT0036Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0036()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0036" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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();
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=680197&r1=680196&r2=680197&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 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 MavenIT0037Test
extends AbstractMavenIntegrationTestCase
{
@@ -17,8 +16,8 @@
public void testit0037()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0037" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0037" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-f pom2.xml" );
verifier.executeGoal( "package", cliOptions );
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=680197&r1=680196&r2=680197&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 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 MavenIT0038Test
extends AbstractMavenIntegrationTestCase
{
@@ -18,8 +17,8 @@
public void testit0038()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0038" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0038" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-f project/pom2.xml" );
verifier.executeGoal( "package", cliOptions);
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=680197&r1=680196&r2=680197&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 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 MavenIT0039Test
extends AbstractMavenIntegrationTestCase
{
@@ -19,8 +18,8 @@
public void testit0039()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0039" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0039" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-r" );
verifier.executeGoal( "package", cliOptions );
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=680197&r1=680196&r2=680197&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 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 MavenIT0040Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0040()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0040" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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();
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=680197&r1=680196&r2=680197&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 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 MavenIT0041Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0041()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0041" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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" );
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=680197&r1=680196&r2=680197&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 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 MavenIT0042Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0042()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0042" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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" );
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=680197&r1=680196&r2=680197&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 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 MavenIT0043Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,10 +14,10 @@
public void testit0043()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0043" );
+ File testDir = extractTestResources( getClass(), "/it0043" );
File child1 = new File( testDir, "child1" );
- Verifier verifier = new Verifier( child1.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( child1.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.plugins", "maven-help-plugin", "2.0.2", "jar" );
@@ -27,7 +26,7 @@
verifier.resetStreams();
File child2 = new File( testDir, "child2" );
- verifier = new Verifier( child2.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( child2.getAbsolutePath() );
verifier.executeGoal( "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom" );
verifier.verifyErrorFreeLog();
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=680197&r1=680196&r2=680197&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 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 MavenIT0044Test
extends AbstractMavenIntegrationTestCase
{
@@ -17,8 +16,8 @@
public void testit0044()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0044" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0044" );
+ IntegrationTestRunner verifier = 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 );
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=680197&r1=680196&r2=680197&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 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 MavenIT0045Test
extends AbstractMavenIntegrationTestCase
{
@@ -17,8 +16,8 @@
public void testit0045()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0045" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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" );
List cliOptions = new ArrayList();
cliOptions.add( "--no-plugin-registry" );
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=680197&r1=680196&r2=680197&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 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 MavenIT0046Test
extends AbstractMavenIntegrationTestCase
{
@@ -18,8 +17,8 @@
public void testit0046()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0046" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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" );
List cliOptions = new ArrayList();
cliOptions.add( "--no-plugin-registry --fail-never" );
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=680197&r1=680196&r2=680197&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 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 MavenIT0047Test
extends AbstractMavenIntegrationTestCase
{
@@ -16,8 +15,8 @@
public void testit0047()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0047" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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();
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=680197&r1=680196&r2=680197&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 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 MavenIT0048Test
extends AbstractMavenIntegrationTestCase
{
@@ -16,8 +15,8 @@
public void testit0048()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0048" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0048" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "test" );
verifier.assertFilePresent( "target/testFileOutput.txt" );
verifier.verifyErrorFreeLog();
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=680197&r1=680196&r2=680197&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 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 MavenIT0049Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0049()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0049" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0049" );
+ IntegrationTestRunner verifier = 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" );
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=680197&r1=680196&r2=680197&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 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 MavenIT0050Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0050()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0050" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0050" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "package" );
verifier.assertFilePresent( "target/testTouchFile.txt" );
verifier.assertFilePresent( "target/defaultTestTouchFile.txt" );
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=680197&r1=680196&r2=680197&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 14:49:43 2008
@@ -1,13 +1,12 @@
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.ArrayList;
import java.util.List;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0051Test
extends AbstractMavenIntegrationTestCase
{
@@ -23,8 +22,8 @@
public void testit0051()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0051" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0051" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "--no-plugin-registry -DperformRelease=true" );
verifier.executeGoal( "package", cliOptions );
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=680197&r1=680196&r2=680197&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 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 MavenIT0052Test
extends AbstractMavenIntegrationTestCase
{
@@ -18,8 +17,8 @@
public void testit0052()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0052" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0052" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "--no-plugin-registry" );
verifier.executeGoal( "package", cliOptions );
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=680197&r1=680196&r2=680197&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 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 MavenIT0053Test
extends AbstractMavenIntegrationTestCase
{
@@ -19,8 +18,8 @@
public void testit0053()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0053" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0053" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "--no-plugin-registry" );
verifier.executeGoal( "package", cliOptions );
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=680197&r1=680196&r2=680197&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 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 MavenIT0054Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0054()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0054" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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" );
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=680197&r1=680196&r2=680197&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 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 MavenIT0055Test
extends AbstractMavenIntegrationTestCase
{
@@ -16,8 +15,8 @@
public void testit0055()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0055" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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" );
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=680197&r1=680196&r2=680197&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 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 MavenIT0056Test
extends AbstractMavenIntegrationTestCase
{
@@ -16,8 +15,8 @@
public void testit0056()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0056" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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" );
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=680197&r1=680196&r2=680197&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 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 MavenIT0057Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0057()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0057" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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" );
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=680197&r1=680196&r2=680197&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 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 MavenIT0058Test
extends AbstractMavenIntegrationTestCase
{
@@ -18,8 +17,8 @@
public void testit0058()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0058" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0058" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "--settings ./settings.xml" );
verifier.executeGoal( "package", cliOptions );
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=680197&r1=680196&r2=680197&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 14:49:43 2008
@@ -1,12 +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.ArrayList;
-import java.util.List;
-import java.util.Properties;
+
+import org.apache.maven.it.IntegrationTestRunner;
public class MavenIT0059Test
extends AbstractMavenIntegrationTestCase
@@ -19,8 +15,8 @@
public void testit0059()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0059" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0059" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "package" );
verifier.assertFilePresent( "target/maven-it-it0059-1.0.jar" );
// don't verify error free log
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=680197&r1=680196&r2=680197&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 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 MavenIT0060Test
extends AbstractMavenIntegrationTestCase
{
@@ -17,8 +16,8 @@
public void testit0060()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0060" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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" );
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=680197&r1=680196&r2=680197&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 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 MavenIT0061Test
extends AbstractMavenIntegrationTestCase
{
@@ -17,8 +16,8 @@
public void testit0061()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0061" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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" );
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=680197&r1=680196&r2=680197&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 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 MavenIT0062Test
extends AbstractMavenIntegrationTestCase
{
@@ -16,8 +15,8 @@
public void testit0062()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0062" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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" );
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=680197&r1=680196&r2=680197&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 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 MavenIT0063Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0063()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0063" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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" );
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=680197&r1=680196&r2=680197&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 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 MavenIT0064Test
extends AbstractMavenIntegrationTestCase
{
@@ -16,8 +15,8 @@
public void testit0064()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0064" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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" );
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=680197&r1=680196&r2=680197&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 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 MavenIT0065Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0065()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0065" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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" );
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=680197&r1=680196&r2=680197&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 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 MavenIT0066Test
extends AbstractMavenIntegrationTestCase
{
@@ -17,8 +16,8 @@
public void testit0066()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0066" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0066" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-f other-pom.xml" );
verifier.executeGoal( "install", cliOptions);
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=680197&r1=680196&r2=680197&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 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 MavenIT0067Test
extends AbstractMavenIntegrationTestCase
{
@@ -17,8 +16,8 @@
public void testit0067()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0067" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0067" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.0", "jar" );
List cliOptions = new ArrayList();
cliOptions.add( "-P test-profile" );
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=680197&r1=680196&r2=680197&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 14:49:43 2008
@@ -1,10 +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.Properties;
+
+import org.apache.maven.it.IntegrationTestRunner;
public class MavenIT0068Test
extends AbstractMavenIntegrationTestCase
@@ -16,8 +14,8 @@
public void testit0068()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0068" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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" );
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=680197&r1=680196&r2=680197&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 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 MavenIT0069Test
extends AbstractMavenIntegrationTestCase
{
@@ -17,8 +16,8 @@
public void testit0069()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0069" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0069" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-o" );
verifier.executeGoal( "compile", cliOptions );
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=680197&r1=680196&r2=680197&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 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 MavenIT0070Test
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0070()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0070" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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" );
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=680197&r1=680196&r2=680197&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 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 MavenIT0071Test
extends AbstractMavenIntegrationTestCase
{
@@ -16,8 +15,8 @@
public void testit0071()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0071" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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" );
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=680197&r1=680196&r2=680197&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 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 MavenIT0072Test
extends AbstractMavenIntegrationTestCase
{
@@ -16,8 +15,8 @@
public void testit0072()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0072" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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();
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=680197&r1=680196&r2=680197&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 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.Arrays;
-import java.util.List;
+
+import org.apache.maven.it.IntegrationTestRunner;
public class MavenIT0073Test
extends AbstractMavenIntegrationTestCase
@@ -17,8 +14,8 @@
public void testit0073()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0073" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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" );
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=680197&r1=680196&r2=680197&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 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 MavenIT0074Test
extends AbstractMavenIntegrationTestCase
{
@@ -16,8 +15,8 @@
public void testit0074()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0074" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0074" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "eclipse:eclipse" );
verifier.assertFilePresent( ".classpath" );
verifier.verifyErrorFreeLog();
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=680197&r1=680196&r2=680197&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 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 java.io.File;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenIT0075Test
extends AbstractMavenIntegrationTestCase
{
@@ -19,8 +17,8 @@
public void testit0075()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0075" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0075" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Dactivate=anything" );
verifier.executeGoal( "help:active-profiles, package, eclipse:eclipse, clean:clean", cliOptions );
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=680197&r1=680196&r2=680197&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 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 MavenIT0076Test
extends AbstractMavenIntegrationTestCase
{
@@ -17,8 +16,8 @@
public void testit0076()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0076" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0076" );
+ 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/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=680197&r1=680196&r2=680197&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 14:49:43 2008
@@ -1,12 +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.ArrayList;
-import java.util.List;
-import java.util.Properties;
+
+import org.apache.maven.it.IntegrationTestRunner;
public class MavenIT0077Test
extends AbstractMavenIntegrationTestCase
@@ -17,8 +13,8 @@
public void testit0077()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0077" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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" );
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=680197&r1=680196&r2=680197&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 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 MavenIT0078Test
extends AbstractMavenIntegrationTestCase
{
@@ -17,8 +16,8 @@
public void testit0078()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0078" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0078" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "compile" );
verifier.assertFileNotPresent( "target/classes/Test.class" );
verifier.verifyErrorFreeLog();
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=680197&r1=680196&r2=680197&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 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 MavenIT0079Test
extends AbstractMavenIntegrationTestCase
{
@@ -16,8 +15,8 @@
public void testit0079()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0079" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0079" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "deploy" );
verifier.assertFilePresent(
"target/test-repo/org/apache/maven/its/it0079/maven-it-it0079/SNAPSHOT/maven-it-it0079-*-1.jar" );
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=680197&r1=680196&r2=680197&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 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 MavenIT0080Test
extends AbstractMavenIntegrationTestCase
{
@@ -16,8 +15,8 @@
public void testit0080()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0080" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ 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" );