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 [5/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/MavenITmng3391ImportScopeErrorScenariosTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3391ImportScopeErrorScenariosTest.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/MavenITmng3391ImportScopeErrorScenariosTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3391ImportScopeErrorScenariosTest.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 MavenITmng3391ImportScopeErrorScenariosTest
extends AbstractMavenIntegrationTestCase
{
@@ -18,10 +17,10 @@
public void testitMNG3391a()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
+ File testDir = extractTestResources( getClass(),
"/mng-3391-importScopeErrorScenarios/depMgmt-importPom-noParentCycle" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.mng3391.2", "dm-pom", "1", "pom" );
@@ -35,14 +34,14 @@
public void testitMNG3391b()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
+ File testDir = extractTestResources( getClass(),
"/mng-3391-importScopeErrorScenarios/depMgmt-importPom-noParentCycle" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.mng3391.2", "dm-pom", "1", "pom" );
- Verifier v2 = new Verifier( new File( testDir, "dm-pom" ).getAbsolutePath() );
+ IntegrationTestRunner v2 = new IntegrationTestRunner( new File( testDir, "dm-pom" ).getAbsolutePath() );
v2.executeGoal( "install" );
v2.verifyErrorFreeLog();
v2.resetStreams();
@@ -55,10 +54,10 @@
public void testitMNG3391c()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
+ File testDir = extractTestResources( getClass(),
"/mng-3391-importScopeErrorScenarios/depMgmt-importPom-parentCycle" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.mng3391.1", "dm-pom", "1", "pom" );
@@ -72,10 +71,10 @@
public void testitMNG3391d()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
+ File testDir = extractTestResources( getClass(),
"/mng-3391-importScopeErrorScenarios/depMgmt-importPom-parentCycle" );
- Verifier verifier = new Verifier( new File( testDir, "dm-pom" ).getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( new File( testDir, "dm-pom" ).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/MavenITmng3394POMPluginVersionDominanceTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3394POMPluginVersionDominanceTest.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/MavenITmng3394POMPluginVersionDominanceTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3394POMPluginVersionDominanceTest.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.Collections;
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;
+
/**
* Check that plugin versions in the POM obey the correct order of precedence. Specifically, that
* mojos in the default lifecycle bindings can find plugin versions in the pluginManagement section
@@ -33,11 +32,11 @@
throws Exception
{
//testShouldUsePluginVersionFromPluginMgmtForLifecycleMojoWhenNotInBuildPlugins
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), BASEDIR_PREFIX + "lifecycleMojoVersionInPluginMgmt" );
+ File testDir = extractTestResources( getClass(), BASEDIR_PREFIX + "lifecycleMojoVersionInPluginMgmt" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "install", Collections.singletonList( "-X" ) );
@@ -78,11 +77,11 @@
throws Exception
{
//testShouldPreferPluginVersionFromBuildPluginsOverThatInPluginMgmt
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), BASEDIR_PREFIX + "preferBuildPluginOverPluginMgmt" );
+ File testDir = extractTestResources( getClass(), BASEDIR_PREFIX + "preferBuildPluginOverPluginMgmt" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
InvocationRequest r = new DefaultInvocationRequest()
.setGoals( "clean" )
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3396DependencyManagementForOverConstrainedRanges.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3396DependencyManagementForOverConstrainedRanges.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/MavenITmng3396DependencyManagementForOverConstrainedRanges.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3396DependencyManagementForOverConstrainedRanges.java Sun Jul 27 14:49:43 2008
@@ -22,8 +22,7 @@
import java.io.File;
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 MavenITmng3396DependencyManagementForOverConstrainedRanges
extends AbstractMavenIntegrationTestCase
@@ -40,9 +39,9 @@
throws Exception
{
String baseDir = "/mng-3396-dependencyManagementForOverConstrainedRanges";
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), baseDir + "/dependencies" );
+ File testDir = extractTestResources( getClass(), baseDir + "/dependencies" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( GROUP_ID, "A", "1.0", "pom" );
verifier.deleteArtifact( GROUP_ID, "A", "1.0", "jar" );
verifier.deleteArtifact( GROUP_ID, "B", "1.0", "pom" );
@@ -51,9 +50,9 @@
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- testDir = ResourceExtractor.simpleExtractResources( getClass(), baseDir + "/plugin" );
+ testDir = extractTestResources( getClass(), baseDir + "/plugin" );
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( GROUP_ID, "A", "1.0", "pom" );
verifier.deleteArtifact( GROUP_ID, "A", "1.0", "jar" );
verifier.deleteArtifact( GROUP_ID, "A", "3.0", "pom" );
@@ -64,9 +63,9 @@
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- testDir = ResourceExtractor.simpleExtractResources( getClass(), baseDir + "/pluginuser" );
+ testDir = extractTestResources( getClass(), baseDir + "/pluginuser" );
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( GROUP_ID, "pluginuser", "1.0", "pom" );
verifier.deleteArtifact( GROUP_ID, "pluginuser", "1.0", "jar" );
verifier.executeGoal( "install" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3415JunkRepositoryMetadataTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3415JunkRepositoryMetadataTest.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/MavenITmng3415JunkRepositoryMetadataTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3415JunkRepositoryMetadataTest.java Sun Jul 27 14:49:43 2008
@@ -1,13 +1,5 @@
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.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;
@@ -18,6 +10,13 @@
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;
+import org.codehaus.plexus.util.FileUtils;
+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
@@ -73,7 +72,7 @@
{
String methodName = getMethodName();
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), RESOURCE_BASE );
+ File testDir = extractTestResources( getClass(), RESOURCE_BASE );
File projectDir = new File( testDir, "project" );
File logFile = new File( projectDir, "log.txt" );
@@ -85,9 +84,9 @@
setupDummyDependency( testDir, localRepo, true );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-X" );
@@ -154,7 +153,7 @@
{
String methodName = getMethodName();
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), RESOURCE_BASE );
+ File testDir = extractTestResources( getClass(), RESOURCE_BASE );
File projectDir = new File( testDir, "project" );
File logFile = new File( projectDir, "log.txt" );
@@ -164,9 +163,9 @@
setupDummyDependency( testDir, localRepo, true );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-X" );
@@ -212,7 +211,7 @@
private void setupDummyDependency( File testDir,
File localRepo,
boolean resetUpdateInterval )
- throws VerificationException, IOException
+ throws IntegrationTestException, IOException
{
File metadata = getMetadataFile( localRepo );
@@ -279,13 +278,13 @@
}
private File findLocalRepoDirectory()
- throws VerificationException, IOException
+ throws IntegrationTestException, IOException
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
+ File testDir = extractTestResources( getClass(),
RESOURCE_BASE
+ "/maven-find-local-repo-plugin" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.plugins", "maven-find-local-repo-plugin", "1.0-SNAPSHOT", "jar" );
@@ -355,10 +354,10 @@
return settingsOut;
}
- private void assertOutputLinePresent( Verifier verifier,
+ private void assertOutputLinePresent( IntegrationTestRunner verifier,
File logFile,
String lineContents )
- throws VerificationException
+ throws IntegrationTestException
{
List lines = verifier.loadFile( logFile, false );
@@ -376,10 +375,10 @@
assertTrue( "Build output in:\n\n" + logFile + "\n\nshould contain line with contents:\n\n" + lineContents + "\n", found );
}
- private void assertOutputLineMissing( Verifier verifier,
+ private void assertOutputLineMissing( IntegrationTestRunner verifier,
File logFile,
String lineContents )
- throws VerificationException
+ throws IntegrationTestException
{
List lines = verifier.loadFile( logFile, false );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3426PluginsClasspathOverrideTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3426PluginsClasspathOverrideTest.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/MavenITmng3426PluginsClasspathOverrideTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3426PluginsClasspathOverrideTest.java Sun Jul 27 14:49:43 2008
@@ -19,17 +19,16 @@
* under the License.
*/
-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 java.io.File;
import java.util.ArrayList;
import java.util.List;
import junit.framework.Assert;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.IntegrationTestRunner;
+import org.codehaus.plexus.util.FileUtils;
+
/**
* @author <a href="mailto:nicolas@apache.org">Nicolas De Loof</a>
*
@@ -49,9 +48,9 @@
// The testdir is computed from the location of this
// file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng3426-overridingPluginDependency" );
+ File testDir = extractTestResources( getClass(), "/mng3426-overridingPluginDependency" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-X" );
verifier.executeGoal( "org.codehaus.mojo:castor-maven-plugin:generate", cliOptions );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.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/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.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;
+
/**
* Tests that the PluginDescriptor.getArtifacts() call returns all of the dependencies of the plugin,
* not just those that made it past the filter excluding Maven's core artifacts.
@@ -21,9 +20,9 @@
public void testitMNG3428 ()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3428-pluginDescriptorArtifactsIncomplete" );
+ File testDir = extractTestResources( getClass(), "/mng-3428-pluginDescriptorArtifactsIncomplete" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
// First, build the plugin we'll use to test the PluginDescriptor artifact collection.
verifier.executeGoal( "install" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3473PluginReportCrash.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3473PluginReportCrash.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/MavenITmng3473PluginReportCrash.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3473PluginReportCrash.java Sun Jul 27 14:49:43 2008
@@ -1,15 +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.ArrayList;
-import java.util.Arrays;
import java.util.List;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.IntegrationTestException;
+import org.apache.maven.it.IntegrationTestRunner;
+
/**
* Tests that the PluginDescriptor.getArtifacts() call returns all of the dependencies of the plugin,
* not just those that made it past the filter excluding Maven's core artifacts.
@@ -25,9 +23,9 @@
public void testitMNG3473 ()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3473PluginReportCrash" );
+ File testDir = extractTestResources( getClass(), "/mng-3473PluginReportCrash" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
File logFile = new File( testDir, "log.txt" );
@@ -57,7 +55,7 @@
{
verifier.executeGoal( "site", cliOptions );
}
- catch (VerificationException e)
+ catch (IntegrationTestException e)
{
//expected this but don't require it cause some os's don't return the correct error code
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3475BaseAlignedDir.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3475BaseAlignedDir.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/MavenITmng3475BaseAlignedDir.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3475BaseAlignedDir.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 MavenITmng3475BaseAlignedDir
extends AbstractMavenIntegrationTestCase
{
@@ -19,11 +18,11 @@
public void testitMNG3475()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
+ File testDir = extractTestResources( getClass(),
"/mng-3475-baseAlignedDir" );
File pluginDir = new File( testDir, "plugin" );
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
@@ -31,7 +30,7 @@
verifier.resetStreams();
File projectDir = new File( testDir, "project" );
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3482DependencyPomInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3482DependencyPomInterpolationTest.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/MavenITmng3482DependencyPomInterpolationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3482DependencyPomInterpolationTest.java Sun Jul 27 14:49:43 2008
@@ -19,11 +19,6 @@
package org.apache.maven.integrationtests;
-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;
@@ -33,6 +28,10 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.it.IntegrationTestRunner;
+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-3482">MNG-3482</a>.
*
@@ -50,11 +49,11 @@
{
// The testdir is computed from the location of this
// file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3482" );
+ File testDir = extractTestResources( getClass(), "/mng-3482" );
File settings = writeSettings( testDir );
- Verifier verifier;
+ IntegrationTestRunner verifier;
/*
* We must first make sure that any artifact created
@@ -63,7 +62,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.mng3482", "mng-3482", "1", "pom" );
verifier.deleteArtifact( "org.apache.maven.its.mng3482", "mng-3482", "1", "jar" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3485OverrideWagonExtensionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3485OverrideWagonExtensionTest.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/MavenITmng3485OverrideWagonExtensionTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3485OverrideWagonExtensionTest.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 MavenITmng3485OverrideWagonExtensionTest
extends AbstractMavenIntegrationTestCase
{
@@ -20,9 +19,9 @@
public void testitMNG3485 ()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3485-overrideWagonExtension" );
- Verifier verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/mng-3485-overrideWagonExtension" );
+ IntegrationTestRunner verifier;
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
verifier.executeGoal( "deploy", cliOptions );
verifier.assertFilePresent( "target/wagon-data" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3498ForkToOtherMojoTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3498ForkToOtherMojoTest.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/MavenITmng3498ForkToOtherMojoTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3498ForkToOtherMojoTest.java Sun Jul 27 14:49:43 2008
@@ -19,11 +19,10 @@
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;
+
/**
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3498">MNG-3498</a>.
*
@@ -47,12 +46,12 @@
{
// The testdir is computed from the location of this
// file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3498" );
+ File testDir = extractTestResources( getClass(), "/mng-3498" );
File pluginDir = new File( testDir, "maven-mng3498-plugin" );
File projectDir = new File( testDir, "mng-3498-project" );
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.mng3498", "maven-mng3498-plugin", "1", "pom" );
verifier.executeGoal( "install" );
@@ -60,7 +59,7 @@
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
verifier.executeGoal( "validate" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3503Xpp3ShadingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3503Xpp3ShadingTest.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/MavenITmng3503Xpp3ShadingTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3503Xpp3ShadingTest.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-xxxx">MNG-xxxx</a>.
@@ -51,9 +47,9 @@
{
// The testdir is computed from the location of this
// file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3503-xpp3Shading" );
+ File testDir = extractTestResources( getClass(), "/mng-3503-xpp3Shading" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
/*
* We must first make sure that any artifact created
@@ -62,7 +58,7 @@
* unstable test results. Fortunately, the verifier
* makes it easy to do this.
*/
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3530DynamicPOMInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3530DynamicPOMInterpolationTest.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/MavenITmng3530DynamicPOMInterpolationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3530DynamicPOMInterpolationTest.java Sun Jul 27 14:49:43 2008
@@ -19,12 +19,11 @@
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;
+
/**
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3530">MNG-3530</a>.
*
@@ -48,7 +47,7 @@
public void testitMNG3530_BuildPath()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), BASEDIR + "build-path" );
+ File testDir = extractTestResources( getClass(), BASEDIR + "build-path" );
File pluginDir = new File( testDir, "plugin" );
File projectDir = new File( testDir, "project" );
@@ -56,7 +55,7 @@
// validates that the modification propagated into the validation-mojo
// configuration. Once this is installed, we can run a project build that
// uses it to see how Maven will respond to a modification in the project build directory.
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
@@ -64,7 +63,7 @@
// Now, build the project. If the plugin configuration doesn't recognize
// the update to the project.build.directory, it will fail the build.
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
@@ -74,7 +73,7 @@
public void testitMNG3530_POMProperty()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), BASEDIR
+ File testDir = extractTestResources( getClass(), BASEDIR
+ "pom-property" );
File pluginDir = new File( testDir, "plugin" );
File projectDir = new File( testDir, "project" );
@@ -83,7 +82,7 @@
// validates that the modification propagated into the validation-mojo
// configuration. Once this is installed, we can run a project build that
// uses it to see how Maven will respond to a modification in the POM property.
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
@@ -91,7 +90,7 @@
// Now, build the project. If the plugin configuration doesn't recognize
// the update to the myDirectory, it will fail the build.
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
@@ -101,14 +100,14 @@
public void testitMNG3530_ResourceDirectoryInterpolation()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), BASEDIR
+ File testDir = extractTestResources( getClass(), BASEDIR
+ "resource-object" );
File pluginDir = new File( testDir, "plugin" );
File projectDir = new File( testDir, "project" );
// First, install the plugin which validates that all resource directory
// specifications have been interpolated.
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
@@ -116,7 +115,7 @@
// Now, build the project. If the plugin finds an uninterpolated resource
// directory, it will fail the build.
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3535SelfReferentialProperties.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3535SelfReferentialProperties.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/MavenITmng3535SelfReferentialProperties.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3535SelfReferentialProperties.java Sun Jul 27 14:49:43 2008
@@ -1,15 +1,14 @@
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.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;
+
public class MavenITmng3535SelfReferentialProperties
extends AbstractMavenIntegrationTestCase
{
@@ -23,8 +22,8 @@
public void testitMNG3535()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3535-selfReferentialProperties" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/mng-3535-selfReferentialProperties" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List opts = new ArrayList();
opts.add( "-X" );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3536AppendedAbsolutePaths.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3536AppendedAbsolutePaths.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/MavenITmng3536AppendedAbsolutePaths.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3536AppendedAbsolutePaths.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 MavenITmng3536AppendedAbsolutePaths extends AbstractMavenIntegrationTestCase {
public MavenITmng3536AppendedAbsolutePaths()
@@ -15,10 +14,10 @@
}
public void testitMNG3536() throws Exception {
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
+ File testDir = extractTestResources( getClass(),
"/mng-3536-appendedAbsolutePaths" );
File pluginDir = new File( testDir, "plugin" );
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
@@ -26,7 +25,7 @@
verifier.resetStreams();
File projectDir = new File( testDir, "project" );
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
verifier.executeGoal( "verify" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3545ProfileDeactivation.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3545ProfileDeactivation.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/MavenITmng3545ProfileDeactivation.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3545ProfileDeactivation.java Sun Jul 27 14:49:43 2008
@@ -6,8 +6,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 activation and deactivation of profiles.
@@ -29,11 +28,11 @@
public void testBasicBuildWithDefaultProfiles()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3545-ProfileDeactivation" );
+ File testDir = extractTestResources( getClass(), "/mng-3545-ProfileDeactivation" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
verifier.executeGoal( "package", cliOptions );
@@ -55,11 +54,11 @@
public void testDeactivateDefaultProfilesDash()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3545-ProfileDeactivation" );
+ File testDir = extractTestResources( getClass(), "/mng-3545-ProfileDeactivation" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
@@ -77,11 +76,11 @@
public void testDeactivateDefaultProfilesExclamation()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3545-ProfileDeactivation" );
+ File testDir = extractTestResources( getClass(), "/mng-3545-ProfileDeactivation" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
@@ -105,11 +104,11 @@
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3545-ProfileDeactivation" );
+ File testDir = extractTestResources( getClass(), "/mng-3545-ProfileDeactivation" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
@@ -135,11 +134,11 @@
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3545-ProfileDeactivation" );
+ File testDir = extractTestResources( getClass(), "/mng-3545-ProfileDeactivation" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
@@ -165,11 +164,11 @@
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3545-ProfileDeactivation" );
+ File testDir = extractTestResources( getClass(), "/mng-3545-ProfileDeactivation" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
@@ -191,7 +190,7 @@
public void tearDown()
throws IOException
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3545-ProfileDeactivation" );
+ File testDir = extractTestResources( getClass(), "/mng-3545-ProfileDeactivation" );
File targetDir = new File( testDir, "target" );
if ( targetDir.exists() )
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3581PluginUsesWagonDependency.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3581PluginUsesWagonDependency.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/MavenITmng3581PluginUsesWagonDependency.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3581PluginUsesWagonDependency.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 MavenITmng3581PluginUsesWagonDependency
extends AbstractMavenIntegrationTestCase
{
@@ -22,16 +21,16 @@
public void testmng3581()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3581-useWagonDependency" );
+ File testDir = extractTestResources( getClass(), "/mng-3581-useWagonDependency" );
File pluginDir = new File( testDir, "plugin" );
File projectDir = new File( testDir, "project" );
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3642DynamicResourcesTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3642DynamicResourcesTest.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/MavenITmng3642DynamicResourcesTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3642DynamicResourcesTest.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-3642">MNG-3642</a>.
@@ -51,9 +47,9 @@
{
// The testdir is computed from the location of this
// file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3642-dynamicResources" );
+ File testDir = extractTestResources( getClass(), "/mng-3642-dynamicResources" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
/*
* We must first make sure that any artifact created
@@ -62,7 +58,7 @@
* unstable test results. Fortunately, the verifier
* makes it easy to do this.
*/
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
/*
* The Command Line Options (CLI) are passed to the
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3645POMSyntaxErrorTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3645POMSyntaxErrorTest.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/MavenITmng3645POMSyntaxErrorTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3645POMSyntaxErrorTest.java Sun Jul 27 14:49:43 2008
@@ -19,13 +19,12 @@
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 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-xxxx">MNG-xxxx</a>.
*
@@ -49,9 +48,9 @@
{
// The testdir is computed from the location of this
// file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3645-pomSyntaxError" );
+ File testDir = extractTestResources( getClass(), "/mng-3645-pomSyntaxError" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
try
{
@@ -59,7 +58,7 @@
fail( "Should fail to validate the POM syntax due to missing dependency element inside dependencyManagement section." );
}
- catch ( VerificationException e )
+ catch ( IntegrationTestException e )
{
// expect this.
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.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/MavenITmng3652UserAgentHeader.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java Sun Jul 27 14:49:43 2008
@@ -14,8 +14,7 @@
import java.util.logging.Logger;
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 MavenITmng3652UserAgentHeader
extends AbstractMavenIntegrationTestCase
@@ -35,11 +34,11 @@
public void testmng3652()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3652-user-agent" );
+ File testDir = extractTestResources( getClass(), "/mng-3652-user-agent" );
File pluginDir = new File( testDir, "test-plugin" );
File projectDir = new File( testDir, "test-project" );
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -51,7 +50,7 @@
t.setDaemon( true );
t.start();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-DtestPort=" + port );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3667ResolveDepsWithBadPomVersionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3667ResolveDepsWithBadPomVersionTest.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/MavenITmng3667ResolveDepsWithBadPomVersionTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3667ResolveDepsWithBadPomVersionTest.java Sun Jul 27 14:49:43 2008
@@ -20,14 +20,10 @@
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.FileUtils;
-import org.apache.maven.it.util.ResourceExtractor;
+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-3667">MNG-3667</a>.
@@ -52,11 +48,11 @@
{
// The testdir is computed from the location of this
// file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3667-resolveDepsWithBadPomVersion" );
+ File testDir = extractTestResources( getClass(), "/mng-3667-resolveDepsWithBadPomVersion" );
File repoDir = new File( testDir, "repo" );
File projectDir = new File( testDir, "project" );
- Verifier verifier;
+ IntegrationTestRunner verifier;
/*
* We must first make sure that any artifact created
@@ -65,7 +61,7 @@
* unstable test results. Fortunately, the verifier
* makes it easy to do this.
*/
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
File localRepoDir = new File( verifier.localRepo );
FileUtils.copyDirectoryStructure( repoDir, localRepoDir );
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3671PluginLevelDepInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3671PluginLevelDepInterpolationTest.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/MavenITmng3671PluginLevelDepInterpolationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3671PluginLevelDepInterpolationTest.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-3671">MNG-3671</a>.
@@ -53,8 +49,8 @@
{
// The testdir is computed from the location of this
// file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3671-pluginLevelDepInterpolation" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/mng-3671-pluginLevelDepInterpolation" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "compile" );
/*
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3679PluginExecIdInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3679PluginExecIdInterpolationTest.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/MavenITmng3679PluginExecIdInterpolationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3679PluginExecIdInterpolationTest.java Sun Jul 27 14:49:43 2008
@@ -2,8 +2,7 @@
import java.io.File;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.IntegrationTestRunner;
/**
* Checks that a plugin execution with an id that contains an expression will
@@ -17,8 +16,8 @@
public void testitMNG3679 ()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3679-pluginExecIdInterpolation" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/mng-3679-pluginExecIdInterpolation" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3680InvalidDependencyPOMTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3680InvalidDependencyPOMTest.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/MavenITmng3680InvalidDependencyPOMTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3680InvalidDependencyPOMTest.java Sun Jul 27 14:49:43 2008
@@ -3,8 +3,7 @@
import java.io.File;
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;
/**
* Verify that dependencies with invalid POMs can still be used without failing
@@ -24,8 +23,8 @@
public void testitMNG3680 ()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3680-invalidDependencyPOM" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir = extractTestResources( getClass(), "/mng-3680-invalidDependencyPOM" );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
verifier.executeGoal( "compile" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3684BuildPluginParameterTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3684BuildPluginParameterTest.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/MavenITmng3684BuildPluginParameterTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3684BuildPluginParameterTest.java Sun Jul 27 14:49:43 2008
@@ -3,8 +3,7 @@
import java.io.File;
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;
/**
* Verify that the Build instance injected as a plugin parameter contains
@@ -24,17 +23,17 @@
public void testitMNG3684 ()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3684-buildPluginParameter" );
+ File testDir = extractTestResources( getClass(), "/mng-3684-buildPluginParameter" );
File pluginDir = new File( testDir, "maven-mng3684-plugin" );
File projectDir = new File( testDir, "project" );
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+ IntegrationTestRunner verifier = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();