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 [4/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/MavenIT0128DistMgmtSiteUrlParentCalculationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0128DistMgmtSiteUrlParentCalculationTest.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/MavenIT0128DistMgmtSiteUrlParentCalculationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0128DistMgmtSiteUrlParentCalculationTest.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 MavenIT0128DistMgmtSiteUrlParentCalculationTest
extends AbstractMavenIntegrationTestCase
{
@@ -15,8 +14,8 @@
public void testit0128()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0128-distMgmtSiteUrlParentCalc" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/it0128-distMgmtSiteUrlParentCalc" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "integration-test" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.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/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java Sun Jul 27 14:49:43 2008
@@ -1,11 +1,10 @@
package org.apache.maven.integrationtests;
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.it.IntegrationTestRunner;
public class MavenIT0129ResourceProvidedToAPluginAsAPluginDependency
extends AbstractMavenIntegrationTestCase
@@ -14,12 +13,12 @@
throws Exception
{
File testDir =
- ResourceExtractor.simpleExtractResources( getClass(), "/it0129-resourcesForAPluginProvidedAsAPluginDependency" );
+ extractTestResources( getClass(), "/it0129-resourcesForAPluginProvidedAsAPluginDependency" );
- 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.it0129", "it0129-plugin-runner", "1.0", "pom" );
verifier.deleteArtifact( "org.apache.maven.its.it0129", "it0129-extension", "1.0", "jar" );
verifier.deleteArtifact( "org.apache.maven.its.it0129", "it0129-plugin", "1.0", "jar" );
@@ -31,12 +30,12 @@
verifier.resetStreams();
//now run the test
- testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-project" );
- verifier = new Verifier( testDir.getAbsolutePath() );
+ testDir = extractTestResources( getClass(), "/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-project" );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
cliOptions = new ArrayList();
verifier.executeGoal( "verify" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
-}
\ No newline at end of file
+}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1412DependenciesOrderTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1412DependenciesOrderTest.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/MavenITmng1412DependenciesOrderTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1412DependenciesOrderTest.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;
+
/**
* Test that dependencies order in classpath matches pom.xml.
*
@@ -27,9 +26,9 @@
throws Exception
{
// The testdir is computed from the location of this file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1412-DependenciesOrder" );
+ File testDir = extractTestResources( getClass(), "/mng-1412-DependenciesOrder" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-X" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1491ReactorArtifactIdCollision.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1491ReactorArtifactIdCollision.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/MavenITmng1491ReactorArtifactIdCollision.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1491ReactorArtifactIdCollision.java Sun Jul 27 14:49:43 2008
@@ -1,22 +1,21 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
+import org.apache.maven.it.IntegrationTestException;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenITmng1491ReactorArtifactIdCollision
extends AbstractMavenIntegrationTestCase
{
public void testitMNG1491 ()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1491-reactorArtifactIdCollision" );
+ File testDir = extractTestResources( getClass(), "/mng-1491-reactorArtifactIdCollision" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
try
{
@@ -26,7 +25,7 @@
fail( "Build should fail due to duplicate artifactId's in the reactor." );
}
- catch( VerificationException e )
+ catch( IntegrationTestException e )
{
// expected.
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1493NonStandardModulePomNames.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1493NonStandardModulePomNames.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/MavenITmng1493NonStandardModulePomNames.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng1493NonStandardModulePomNames.java Sun Jul 27 14:49:43 2008
@@ -1,13 +1,9 @@
package org.apache.maven.integrationtests;
import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.IntegrationTestRunner;
public class MavenITmng1493NonStandardModulePomNames
extends AbstractMavenIntegrationTestCase
@@ -21,11 +17,11 @@
public void testitMNG1493 ()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1493-nonstandardModulePomNames" );
+ File testDir = extractTestResources( getClass(), "/mng-1493-nonstandardModulePomNames" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "initialize" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2045testJarDependenciesBrokenInReactorTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2045testJarDependenciesBrokenInReactorTest.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/MavenITmng2045testJarDependenciesBrokenInReactorTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2045testJarDependenciesBrokenInReactorTest.java Sun Jul 27 14:49:43 2008
@@ -1,13 +1,9 @@
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.integrationtests.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.IntegrationTestRunner;
/**
* Simple IT test invoking maven in a reactor with 2 projects.
@@ -28,10 +24,10 @@
public void testitMNG2045()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2045-testJarDependenciesBrokenInReactor" );
- Verifier verifier;
+ File testDir = extractTestResources( getClass(), "/mng-2045-testJarDependenciesBrokenInReactor" );
+ IntegrationTestRunner verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "testing", "mng-2045-test", "1.0-SNAPSHOT", "pom" );
verifier.deleteArtifact( "testing", "first-project", "1.0-SNAPSHOT", "jar" );
verifier.deleteArtifact( "testing", "second-project", "1.0-SNAPSHOT", "jar" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2068ReactorRelativeParentsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2068ReactorRelativeParentsTest.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/MavenITmng2068ReactorRelativeParentsTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2068ReactorRelativeParentsTest.java Sun Jul 27 14:49:43 2008
@@ -20,13 +20,9 @@
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.integrationtests.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.IntegrationTestRunner;
/**
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-2068">MNG-2068</a>.
@@ -52,10 +48,10 @@
{
// The testdir is computed from the location of this
// file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2068-reactorRelativeParents" );
+ File testDir = extractTestResources( getClass(), "/mng-2068-reactorRelativeParents" );
File projectDir = new File( testDir, "frameworks" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
/*
* We must first make sure that any artifact created
@@ -64,7 +60,7 @@
* unstable test results. Fortunately, the verifier
* makes it easy to do this.
*/
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
verifier.deleteArtifact( "samplegroup", "master", "0.0.1", "pom" );
verifier.deleteArtifact( "samplegroup", "frameworks", "0.0.1", "pom" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2123VersionRangeDependencyTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2123VersionRangeDependencyTest.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/MavenITmng2123VersionRangeDependencyTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2123VersionRangeDependencyTest.java Sun Jul 27 14:49:43 2008
@@ -5,9 +5,7 @@
import java.util.List;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.IntegrationTestRunner;
public class MavenITmng2123VersionRangeDependencyTest
@@ -27,9 +25,9 @@
// The testdir is computed from the location of this
// file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2123-npe-with-conflicting-ranges" );
+ File testDir = extractTestResources( getClass(), "/mng-2123-npe-with-conflicting-ranges" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
/*
* We must first make sure that any artifact created
@@ -38,7 +36,7 @@
* unstable test results. Fortunately, the verifier
* makes it easy to do this.
*/
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.mng2123", "parent", "1.0", "pom" );
verifier.deleteArtifact( "org.apache.maven.its.mng2123", "artifact-combined", "1.0", "jar" );
verifier.deleteArtifact( "org.apache.maven.its.mng2123", "artifact-fix", "1.0", "jar" );
@@ -76,7 +74,7 @@
/*
* Build the artifact with a fix version of commons-collections
*/
- verifier = new Verifier( new File( testDir.getAbsolutePath(), "artifact-fix" ).getAbsolutePath() );
+ verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "artifact-fix" ).getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -84,7 +82,7 @@
/*
* Build the artifact with a version range of commons-collections
*/
- verifier = new Verifier( new File( testDir.getAbsolutePath(), "artifact-range" ).getAbsolutePath() );
+ verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "artifact-range" ).getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -95,7 +93,7 @@
* artifact that uses the artifacts above.
* On any version >= 2.0.9 it should work
*/
- verifier = new Verifier( new File( testDir.getAbsolutePath(), "artifact-combined" ).getAbsolutePath() );
+ verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "artifact-combined" ).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/MavenITmng2234ActiveProfilesFromSettingsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2234ActiveProfilesFromSettingsTest.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/MavenITmng2234ActiveProfilesFromSettingsTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2234ActiveProfilesFromSettingsTest.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 MavenITmng2234ActiveProfilesFromSettingsTest
extends AbstractMavenIntegrationTestCase
{
@@ -20,9 +19,9 @@
public void testitMNG2234 ()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2234-activeProfilesFromSettings" );
- Verifier verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/mng-2234-activeProfilesFromSettings" );
+ IntegrationTestRunner verifier;
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-s" );
cliOptions.add( "settings.xml" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2254PomEncodingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2254PomEncodingTest.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/MavenITmng2254PomEncodingTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2254PomEncodingTest.java Sun Jul 27 14:49:43 2008
@@ -5,9 +5,7 @@
import java.util.List;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.IntegrationTestRunner;
/**
* Test that pom.xml encoding is properly detected.
@@ -29,9 +27,9 @@
{
// The testdir is computed from the location of this
// file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2254-PomEncoding" );
+ File testDir = extractTestResources( getClass(), "/mng-2254-PomEncoding" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-N" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2277AggregatorAndResolutionPluginsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2277AggregatorAndResolutionPluginsTest.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/MavenITmng2277AggregatorAndResolutionPluginsTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2277AggregatorAndResolutionPluginsTest.java Sun Jul 27 14:49:43 2008
@@ -5,9 +5,7 @@
import java.util.List;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.IntegrationTestRunner;
/**
* @author <a href="mailto:brianf@apache.org">Brian Fox</a>
@@ -28,9 +26,9 @@
// The testdir is computed from the location of this
// file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng2277aggregatorPlugins" );
+ File testDir = extractTestResources( getClass(), "/mng2277aggregatorPlugins" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
/*
* We must first make sure that any artifact created
@@ -39,7 +37,7 @@
* unstable test results. Fortunately, the verifier
* makes it easy to do this.
*/
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.mng2277", "parent", "1.0", "pom" );
verifier.deleteArtifact( "org.apache.maven.its.mng2277", "test", "1.0", "jar" );
verifier.deleteArtifact( "org.apache.maven.its.mng2277", "assembly", "1.0", "jar" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2339BadProjectInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2339BadProjectInterpolationTest.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/MavenITmng2339BadProjectInterpolationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2339BadProjectInterpolationTest.java Sun Jul 27 14:49:43 2008
@@ -19,13 +19,12 @@
* 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 MavenITmng2339BadProjectInterpolationTest
extends AbstractMavenIntegrationTestCase
{
@@ -38,9 +37,9 @@
public void testitMNG2339a()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2339-badProjectInterpolation/a" );
- Verifier verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/mng-2339-badProjectInterpolation/a" );
+ IntegrationTestRunner verifier;
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Dversion=foo" );
verifier.executeGoal( "validate", cliOptions );
@@ -52,11 +51,11 @@
public void testitMNG2339b()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2339-badProjectInterpolation/b" );
+ File testDir = extractTestResources( getClass(), "/mng-2339-badProjectInterpolation/b" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "initialize" );
@@ -69,7 +68,7 @@
File logFile = new File( testDir, "log.txt" );
logFile.renameTo( new File( testDir, "log-pom-specified.txt" ) );
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Dversion=2" );
verifier.executeGoal( "initialize", cliOptions );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2562Timestamp.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2562Timestamp.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/MavenITmng2562Timestamp.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2562Timestamp.java Sun Jul 27 14:49:43 2008
@@ -1,11 +1,10 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.Verifier;
-
import java.io.File;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenITmng2562Timestamp extends AbstractMavenIntegrationTestCase {
public MavenITmng2562Timestamp()
@@ -15,9 +14,9 @@
}
public void testitMNG2562() throws Exception {
- File testDir = ResourceExtractor.simpleExtractResources(getClass(),
+ File testDir = extractTestResources(getClass(),
"/mng-2562-timestamp");
- Verifier verifier = new Verifier(testDir.getAbsolutePath());
+ IntegrationTestRunner verifier = new IntegrationTestRunner(testDir.getAbsolutePath());
verifier.executeGoal("verify");
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2695OfflinePluginSnapshotsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2695OfflinePluginSnapshotsTest.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/MavenITmng2695OfflinePluginSnapshotsTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2695OfflinePluginSnapshotsTest.java Sun Jul 27 14:49:43 2008
@@ -19,16 +19,15 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.it.VerificationException;
-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.util.ArrayList;
import java.util.List;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.IntegrationTestException;
+import org.apache.maven.it.IntegrationTestRunner;
+import org.codehaus.plexus.util.FileUtils;
+
/**
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3314">MNG-3314</a>.
*
@@ -75,11 +74,11 @@
public void testitMNG2695 ()
throws Exception
{
- File testParentDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2695-offlinePluginSnapshots" );
+ File testParentDir = extractTestResources( getClass(), "/mng-2695-offlinePluginSnapshots" );
File testPlugin = new File( testParentDir, "plugin" );
- Verifier verifier = new Verifier( testPlugin.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testPlugin.getAbsolutePath() );
// Deploy the dependency to the test repository.
verifier.executeGoal( "deploy" );
@@ -97,7 +96,7 @@
File testProject = new File( testParentDir, "project" );
- verifier = new Verifier( testProject.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testProject.getAbsolutePath() );
// Conditions for this build:
// 1. plugin is NOT in local repository
@@ -111,7 +110,7 @@
verifier.executeGoal( "compile", cliOptions );
fail( "Plugin should be missing from local repo, and in offline this should make the project build fail." );
}
- catch( VerificationException e )
+ catch( IntegrationTestException e )
{
// should fail.
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2739RequiredRepositoryElements.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2739RequiredRepositoryElements.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/MavenITmng2739RequiredRepositoryElements.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2739RequiredRepositoryElements.java Sun Jul 27 14:49:43 2008
@@ -19,15 +19,14 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
import java.util.Iterator;
import java.util.List;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.IntegrationTestException;
+import org.apache.maven.it.IntegrationTestRunner;
+
/**
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-2739">MNG-2739</a>.
*
@@ -49,11 +48,11 @@
public void testitMNG2739_RepositoryId()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2739/repo-id" );
+ File testDir = extractTestResources( getClass(), "/mng-2739/repo-id" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
try
{
@@ -62,7 +61,7 @@
fail( "POM should NOT validate: repository <id/> element is missing in: "
+ new File( testDir, "pom.xml" ) );
}
- catch ( VerificationException e )
+ catch ( IntegrationTestException e )
{
}
@@ -88,11 +87,11 @@
{
// The testdir is computed from the location of this
// file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2739/repo-url" );
+ File testDir = extractTestResources( getClass(), "/mng-2739/repo-url" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
try
{
@@ -101,7 +100,7 @@
fail( "POM should NOT validate: repository <url/> element is missing in: "
+ new File( testDir, "pom.xml" ) );
}
- catch ( VerificationException e )
+ catch ( IntegrationTestException e )
{
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2744checksumVerificationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2744checksumVerificationTest.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/MavenITmng2744checksumVerificationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2744checksumVerificationTest.java Sun Jul 27 14:49:43 2008
@@ -1,13 +1,9 @@
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.integrationtests.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.IntegrationTestRunner;
/**
* Tests that artifact checksums are properly verified.
@@ -28,9 +24,9 @@
public void testitMNG2744()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2744-checksumVerification" );
+ File testDir = extractTestResources( getClass(), "/mng-2744-checksumVerification" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.mng2744", "a", "1", "pom" );
verifier.deleteArtifact( "org.apache.maven.its.mng2744", "a", "1", "jar" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.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/MavenITmng2861RelocationsAndRanges.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.java Sun Jul 27 14:49:43 2008
@@ -1,11 +1,10 @@
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 org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenITmng2861RelocationsAndRanges
extends AbstractMavenIntegrationTestCase
@@ -23,9 +22,9 @@
// The testdir is computed from the location of this
// file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2861relocationsAndRanges" );
+ File testDir = extractTestResources( getClass(), "/mng-2861relocationsAndRanges" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
/*
* We must first make sure that any artifact created
@@ -34,7 +33,7 @@
* unstable test results. Fortunately, the verifier
* makes it easy to do this.
*/
- verifier = new Verifier( new File(testDir,"MNG-2861").getAbsolutePath() );
+ verifier = new IntegrationTestRunner( new File(testDir,"MNG-2861").getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.mng2861", "MNG-2861", "1.0-SNAPSHOT", "pom" );
verifier.deleteArtifact( "org.apache.maven.its.mng2861", "A", "1.0-SNAPSHOT", "jar" );
verifier.deleteArtifact( "org.apache.maven.its.mng2861", "B", "1.0-SNAPSHOT", "jar" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2883LegacyRepoOfflineTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2883LegacyRepoOfflineTest.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/MavenITmng2883LegacyRepoOfflineTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2883LegacyRepoOfflineTest.java Sun Jul 27 14:49:43 2008
@@ -1,14 +1,5 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.it.DefaultInvocationRequest;
-import org.apache.maven.it.InvocationRequest;
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.IOUtil;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.util.StringUtils;
-
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
@@ -19,6 +10,14 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.DefaultInvocationRequest;
+import org.apache.maven.it.IntegrationTestException;
+import org.apache.maven.it.IntegrationTestRunner;
+import org.apache.maven.it.InvocationRequest;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.StringUtils;
+
/**
* This is a sample integration test. The IT tests typically
* operate by having a sample project in the
@@ -45,13 +44,13 @@
throws Exception
{
String testName = "parent";
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
+ File testDir = extractTestResources( getClass(),
"/mng-2883-legacy-repo-offline/"
+ testName );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
File settings = writeSettings( testDir );
List cliOptions = new ArrayList();
@@ -65,9 +64,9 @@
// this will ensure that all relevant plugins are present.
verifier.executeGoal( "initialize", cliOptions );
}
- catch ( VerificationException e )
+ catch ( IntegrationTestException e )
{
- throw new VerificationException( "Build should succeed the first time through when NOT in offline mode!", e );
+ throw new IntegrationTestException( "Build should succeed the first time through when NOT in offline mode!", e );
}
// the centerpiece of these tests!
@@ -88,7 +87,7 @@
fail( "Build should fail with unresolvable parent POM." );
}
- catch ( VerificationException e )
+ catch ( IntegrationTestException e )
{
}
@@ -136,13 +135,13 @@
throws Exception
{
String testName = "dependency";
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
+ File testDir = extractTestResources( getClass(),
"/mng-2883-legacy-repo-offline/"
+ testName );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
@@ -157,9 +156,9 @@
// this will ensure that all relevant plugins are present.
verifier.executeGoal( "compile", cliOptions );
}
- catch ( VerificationException e )
+ catch ( IntegrationTestException e )
{
- throw new VerificationException( "Build should succeed the first time through when NOT in offline mode!", e );
+ throw new IntegrationTestException( "Build should succeed the first time through when NOT in offline mode!", e );
}
// the centerpiece of these tests!
@@ -175,7 +174,7 @@
fail( "Build should fail with unresolvable dependency artifact." );
}
- catch ( VerificationException e )
+ catch ( IntegrationTestException e )
{
}
@@ -225,13 +224,13 @@
throws Exception
{
String testName = "plugin";
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
+ File testDir = extractTestResources( getClass(),
"/mng-2883-legacy-repo-offline/"
+ testName );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
@@ -254,7 +253,7 @@
fail( "Build should fail with unresolvable plugin artifact." );
}
- catch ( VerificationException e )
+ catch ( IntegrationTestException e )
{
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2972OverridePluginDependency.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2972OverridePluginDependency.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/MavenITmng2972OverridePluginDependency.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2972OverridePluginDependency.java Sun Jul 27 14:49:43 2008
@@ -1,17 +1,13 @@
package org.apache.maven.integrationtests;
import java.io.File;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import junit.framework.Assert;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.FileUtils;
-import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.IntegrationTestRunner;
public class MavenITmng2972OverridePluginDependency
extends AbstractMavenIntegrationTestCase
@@ -28,33 +24,33 @@
// The testdir is computed from the location of this
// file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng2972-overridingPluginDependency" );
+ File testDir = extractTestResources( getClass(), "/mng2972-overridingPluginDependency" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
/*
* We must first make sure that any artifact created by this test has been removed from the local repository.
* Failing to do this could cause unstable test results. Fortunately, the verifier makes it easy to do this.
*/
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.mng2972", "user", "1.0", "jar" );
verifier.deleteArtifact( "org.apache.maven.its.mng2972", "mojo", "0.0.1-SNAPSHOT", "jar" );
verifier.deleteArtifact( "org.apache.maven.its.mng2972", "dep", "1.0", "jar" );
verifier.deleteArtifact( "org.apache.maven.its.mng2972", "dep", "2.0", "jar" );
- verifier = new Verifier( new File( testDir.getAbsolutePath(), "dep1" ).getAbsolutePath() );
+ verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "dep1" ).getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier = new Verifier( new File( testDir.getAbsolutePath(), "dep2" ).getAbsolutePath() );
+ verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "dep2" ).getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier = new Verifier( new File( testDir.getAbsolutePath(), "mojo" ).getAbsolutePath() );
+ verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "mojo" ).getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier = new Verifier( new File( testDir.getAbsolutePath(), "user" ).getAbsolutePath() );
+ verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "user" ).getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@@ -81,7 +77,7 @@
* Now try to execute the plugin directly
*/
- verifier = new Verifier( new File( testDir.getAbsolutePath(), "user" ).getAbsolutePath() );
+ verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "user" ).getAbsolutePath() );
verifier.executeGoal( "org.apache.maven.its.mng2972:mojo:0.0.1-SNAPSHOT:test" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3052DepRepoAggregationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3052DepRepoAggregationTest.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/MavenITmng3052DepRepoAggregationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3052DepRepoAggregationTest.java Sun Jul 27 14:49:43 2008
@@ -19,13 +19,6 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.FileUtils;
-import org.apache.maven.it.util.IOUtil;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.util.StringUtils;
-
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
@@ -33,6 +26,12 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.IntegrationTestRunner;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.StringUtils;
+
/**
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3052">MNG-3052</a>.
*
@@ -59,7 +58,7 @@
public void testitMNG3052 ()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3052depRepoAggregation" )
+ File testDir = extractTestResources( getClass(), "/mng-3052depRepoAggregation" )
.getCanonicalFile();
File foo = new File( testDir, "foo" );
@@ -82,13 +81,13 @@
List cliOptions = new ArrayList();
cliOptions.add( "-X" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
// First, build the two levels of dependencies that will be resolved.
// This one is a transitive dependency, and will be deployed to a
// repository that is NOT listed in the main project's POM (wombat).
- verifier = new Verifier( foo.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( foo.getAbsolutePath() );
verifier.executeGoal( "deploy", cliOptions );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -97,7 +96,7 @@
// that IS listed in the main project's POM (wombat). It lists its own
// repository entry that should enable resolution of the transitive
// dependency it lists (foo, above).
- verifier = new Verifier( bar.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( bar.getAbsolutePath() );
verifier.executeGoal( "deploy", cliOptions );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -112,7 +111,7 @@
// project (above) was deployed. It should be able to use the
// repositories declared in the bar POM to find the transitive dependency
// (foo, top).
- verifier = new Verifier( wombat.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( wombat.getAbsolutePath() );
verifier.executeGoal( "package", cliOptions );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3099SettingsProfilesWithNoPOM.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3099SettingsProfilesWithNoPOM.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/MavenITmng3099SettingsProfilesWithNoPOM.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3099SettingsProfilesWithNoPOM.java Sun Jul 27 14:49:43 2008
@@ -1,16 +1,15 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.it.DefaultInvocationRequest;
-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.ArrayList;
import java.util.Iterator;
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;
+
/**
* This is a sample integration test. The IT tests typically operate by having a sample project in
* the /src/test/resources folder along with a junit test like this one. The junit test uses the
@@ -35,13 +34,13 @@
{
// The testdir is computed from the location of this
// file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3099-settingsProfilesWithNoPOM" );
+ File testDir = extractTestResources( getClass(), "/mng-3099-settingsProfilesWithNoPOM" );
File plugin = new File( testDir, "plugin" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( plugin.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( plugin.getAbsolutePath() );
verifier.executeGoal( "install" );
@@ -51,7 +50,7 @@
*/
verifier.resetStreams();
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
/*
* Use the settings for this test, which contains the profile we're looking for.
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3106ProfileMultipleActivators.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3106ProfileMultipleActivators.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/MavenITmng3106ProfileMultipleActivators.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3106ProfileMultipleActivators.java Sun Jul 27 14:49:43 2008
@@ -5,8 +5,7 @@
import java.util.List;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.IntegrationTestRunner;
/**
* Test that profiles with multiple activators are activated
@@ -31,11 +30,11 @@
public void testProfilesWithMultipleActivators()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3106-ProfileMultipleActivators" );
+ File testDir = extractTestResources( getClass(), "/mng-3106-ProfileMultipleActivators" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Dprofile1.on=true" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3220ImportScopeTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3220ImportScopeTest.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/MavenITmng3220ImportScopeTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3220ImportScopeTest.java Sun Jul 27 14:49:43 2008
@@ -1,14 +1,13 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
import java.util.Iterator;
import java.util.List;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.IntegrationTestException;
+import org.apache.maven.it.IntegrationTestRunner;
+
public class MavenITmng3220ImportScopeTest
extends AbstractMavenIntegrationTestCase
{
@@ -21,11 +20,11 @@
public void testitMNG3220a()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
+ File testDir = extractTestResources( getClass(),
"/mng-3220-importedDepMgmt/imported-pom-depMgmt" );
File dmDir = new File( testDir, "dm-pom" );
- Verifier verifier = new Verifier( dmDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( dmDir.getAbsolutePath() );
verifier.executeGoal( "install" );
@@ -33,7 +32,7 @@
verifier.resetStreams();
File projectDir = new File( testDir, "project" );
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
@@ -43,17 +42,17 @@
public void testitMNG3220b()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
+ File testDir = extractTestResources( getClass(),
"/mng-3220-importedDepMgmt/depMgmt-pom-module-notImported" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
try
{
verifier.executeGoal( "install" );
fail( "Should fail to build with missing junit version." );
}
- catch ( VerificationException e )
+ catch ( IntegrationTestException e )
{
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.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/MavenITmng3221InfiniteForking.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.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 MavenITmng3221InfiniteForking
extends AbstractMavenIntegrationTestCase
{
@@ -20,17 +19,17 @@
public void testitMNG3221a()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3221" );
+ File testDir = extractTestResources( getClass(), "/mng-3221" );
File logBackupDir = testDir.getAbsoluteFile().getParentFile();
File reportDir = new File( testDir, "report" );
File projectDir = new File( testDir, "user" );
- Verifier verifier = null;
+ IntegrationTestRunner verifier = null;
try
{
- verifier = new Verifier( reportDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( reportDir.getAbsolutePath() );
verifier.deleteArtifact( "tests", "maven-forking-report-plugin", "1", "jar" );
@@ -38,7 +37,7 @@
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Psite" );
@@ -62,17 +61,17 @@
public void testitMNG3221b()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3221" );
+ File testDir = extractTestResources( getClass(), "/mng-3221" );
File logBackupDir = testDir.getAbsoluteFile().getParentFile();
File pluginDir = new File( testDir, "plugin" );
File projectDir = new File( testDir, "user" );
- Verifier verifier = null;
+ IntegrationTestRunner verifier = null;
try
{
- verifier = new Verifier( pluginDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
verifier.deleteArtifact( "tests", "maven-forking-test-plugin", "1", "jar" );
@@ -80,7 +79,7 @@
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Pplugin" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3259DepsDroppedInMultiModuleBuild.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3259DepsDroppedInMultiModuleBuild.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/MavenITmng3259DepsDroppedInMultiModuleBuild.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3259DepsDroppedInMultiModuleBuild.java Sun Jul 27 14:49:43 2008
@@ -1,26 +1,25 @@
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 MavenITmng3259DepsDroppedInMultiModuleBuild
extends AbstractMavenIntegrationTestCase
{
public void testitMNG3259 ()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3259-depsDroppedInMultiModuleBuild" );
- Verifier verifier;
- verifier = new Verifier( new File( testDir, "parent" ).getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/mng-3259-depsDroppedInMultiModuleBuild" );
+ IntegrationTestRunner verifier;
+ verifier = new IntegrationTestRunner( new File( testDir, "parent" ).getAbsolutePath() );
List cliOptions = new ArrayList();
verifier.executeGoal( "install", cliOptions );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( testDir.getAbsolutePath() );
+ 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/MavenITmng3268MultipleDashPCommandLine.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3268MultipleDashPCommandLine.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/MavenITmng3268MultipleDashPCommandLine.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3268MultipleDashPCommandLine.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 MavenITmng3268MultipleDashPCommandLine
extends AbstractMavenIntegrationTestCase
{
@@ -20,11 +19,11 @@
public void testMultipleProfileParams ()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3268-MultipleDashPCommandLine" );
+ File testDir = extractTestResources( getClass(), "/mng-3268-MultipleDashPCommandLine" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Pprofile1,profile2" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.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/MavenITmng3284UsingCachedPluginsTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java Sun Jul 27 14:49:43 2008
@@ -7,8 +7,7 @@
import junit.framework.Assert;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.IntegrationTestRunner;
/**
* Integration test to check MNG-3284 - that explicitly defined plugins are used, not the one that is cached.
@@ -28,14 +27,14 @@
// The testdir is computed from the location of this
// file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng3284-usingCachedPlugins" );
+ File testDir = extractTestResources( getClass(), "/mng3284-usingCachedPlugins" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
/*
* Build Mojo v1
*/
- verifier = new Verifier( new File( testDir.getAbsolutePath(), "mojo" ).getAbsolutePath() );
+ verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "mojo" ).getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -43,7 +42,7 @@
/*
* Build Mojo v2
*/
- verifier = new Verifier( new File( testDir.getAbsolutePath(), "mojo2" ).getAbsolutePath() );
+ verifier = new IntegrationTestRunner( new File( testDir.getAbsolutePath(), "mojo2" ).getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -51,7 +50,7 @@
/*
* Run the simple build
*/
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3314OfflineSnapshotsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3314OfflineSnapshotsTest.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/MavenITmng3314OfflineSnapshotsTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3314OfflineSnapshotsTest.java Sun Jul 27 14:49:43 2008
@@ -19,16 +19,15 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.it.VerificationException;
-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.util.ArrayList;
import java.util.List;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.IntegrationTestException;
+import org.apache.maven.it.IntegrationTestRunner;
+import org.codehaus.plexus.util.FileUtils;
+
/**
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3314">MNG-3314</a>.
*
@@ -75,11 +74,11 @@
public void testitMNG3314 ()
throws Exception
{
- File testParentDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3314-offlineSnapshots" );
+ File testParentDir = extractTestResources( getClass(), "/mng-3314-offlineSnapshots" );
File testDep = new File( testParentDir, "dep" );
- Verifier verifier = new Verifier( testDep.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDep.getAbsolutePath() );
// Deploy the dependency to the test repository.
verifier.executeGoal( "deploy" );
@@ -97,7 +96,7 @@
File testProject = new File( testParentDir, "project" );
- verifier = new Verifier( testProject.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testProject.getAbsolutePath() );
// Conditions for this build:
// 1. dependency is NOT in local repository
@@ -112,7 +111,7 @@
fail( "Dependency should be missing from local repo, and in offline this should make the project build fail." );
}
- catch( VerificationException e )
+ catch( IntegrationTestException e )
{
// should fail.
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3331ModulePathNormalization.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3331ModulePathNormalization.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/MavenITmng3331ModulePathNormalization.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3331ModulePathNormalization.java Sun Jul 27 14:49:43 2008
@@ -1,12 +1,8 @@
package org.apache.maven.integrationtests;
import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.IntegrationTestRunner;
/**
* This is a sample integration test. The IT tests typically
@@ -28,11 +24,11 @@
throws Exception
{
//testMNG3331ModuleWithSpaces
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3331-modulePathNormalization/with-spaces" );
+ File testDir = extractTestResources( getClass(), "/mng-3331-modulePathNormalization/with-spaces" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "initialize" );
@@ -58,11 +54,11 @@
throws Exception
{
//testMNG3331ModuleWithRelativeParentDirRef
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3331-modulePathNormalization/with-relative-parentDir-ref" );
+ File testDir = extractTestResources( getClass(), "/mng-3331-modulePathNormalization/with-relative-parentDir-ref" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( new File( testDir, "parent" ).getAbsolutePath() );
+ verifier = new IntegrationTestRunner( new File( testDir, "parent" ).getAbsolutePath() );
verifier.executeGoal( "initialize" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3341MetadataUpdatedFromDeploymentRepositoryTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3341MetadataUpdatedFromDeploymentRepositoryTest.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/MavenITmng3341MetadataUpdatedFromDeploymentRepositoryTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3341MetadataUpdatedFromDeploymentRepositoryTest.java Sun Jul 27 14:49:43 2008
@@ -1,19 +1,18 @@
package org.apache.maven.integrationtests;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.FileUtils;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.IntegrationTestRunner;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+
public class MavenITmng3341MetadataUpdatedFromDeploymentRepositoryTest
extends AbstractMavenIntegrationTestCase
{
@@ -27,15 +26,15 @@
throws Exception
{
File testDir =
- ResourceExtractor.simpleExtractResources( getClass(), "/mng-3341-metadataUpdatedFromDeploymentRepository" );
+ extractTestResources( getClass(), "/mng-3341-metadataUpdatedFromDeploymentRepository" );
File targetRepository = new File( testDir, "target-repository" );
FileUtils.deleteDirectory( targetRepository );
FileUtils.copyDirectoryStructure( new File( testDir, "deployment-repository" ), targetRepository );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-s" );
@@ -69,4 +68,4 @@
reader.close();
}
}
-}
\ No newline at end of file
+}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3355TranslatedPathInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3355TranslatedPathInterpolationTest.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/MavenITmng3355TranslatedPathInterpolationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3355TranslatedPathInterpolationTest.java Sun Jul 27 14:49:43 2008
@@ -19,13 +19,12 @@
* 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 MavenITmng3355TranslatedPathInterpolationTest
extends AbstractMavenIntegrationTestCase
{
@@ -38,8 +37,8 @@
public void testitMNG3355()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3355" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/mng-3355" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Dversion=foo" );
verifier.executeGoal( "validate", cliOptions );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3380ManagedRelocatedTransdepsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3380ManagedRelocatedTransdepsTest.java?rev=680197&r1=680196&r2=680197&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3380ManagedRelocatedTransdepsTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3380ManagedRelocatedTransdepsTest.java Sun Jul 27 14:49:43 2008
@@ -1,11 +1,10 @@
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 org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.IntegrationTestRunner;
+
/**
* expected project.getArtifacts() results:
*
@@ -31,9 +30,9 @@
{
// compute test directory
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3380-managedRelocatedTransdeps" );
+ File testDir = extractTestResources( getClass(), "/mng-3380-managedRelocatedTransdeps" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
deleteArtifacts( verifier );
@@ -42,7 +41,7 @@
String path = testDir.getAbsolutePath() //
+ "/consumer";
- verifier = new Verifier( path );
+ verifier = new IntegrationTestRunner( path );
verifier.executeGoal( "package" );
// verify no errors so far
@@ -56,41 +55,41 @@
// install projects
String path = testDir.getAbsolutePath() //
+ "/other-c";
- Verifier verifier = new Verifier( path );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( path );
verifier.executeGoal( "install" );
path = testDir.getAbsolutePath() //
+ "/other-b";
- verifier = new Verifier( path );
+ verifier = new IntegrationTestRunner( path );
verifier.executeGoal( "install" );
path = testDir.getAbsolutePath() //
+ "/other-a";
- verifier = new Verifier( path );
+ verifier = new IntegrationTestRunner( path );
verifier.executeGoal( "install" );
path = testDir.getAbsolutePath() //
+ "/transdep-old";
- verifier = new Verifier( path );
+ verifier = new IntegrationTestRunner( path );
verifier.executeGoal( "install" );
path = testDir.getAbsolutePath() //
+ "/transdep-new-1";
- verifier = new Verifier( path );
+ verifier = new IntegrationTestRunner( path );
verifier.executeGoal( "install" );
path = testDir.getAbsolutePath() //
+ "/transdep-new-2";
- verifier = new Verifier( path );
+ verifier = new IntegrationTestRunner( path );
verifier.executeGoal( "install" );
path = testDir.getAbsolutePath() //
+ "/direct-dep";
- verifier = new Verifier( path );
+ verifier = new IntegrationTestRunner( path );
verifier.executeGoal( "install" );
}
- private void deleteArtifacts( Verifier verifier )
+ private void deleteArtifacts( IntegrationTestRunner verifier )
throws Exception
{
// delete projects