mirror of https://github.com/apache/maven.git
o Made ITs use global settings for common setup
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@981712 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
6b1259ec75
commit
24d00c6eda
|
@ -51,6 +51,9 @@ under the License.
|
|||
|
||||
ITs that don't require to fork Maven can also be run from the IDE using the Maven projects from the workspace if the
|
||||
Maven dependencies are added to the test class path.
|
||||
|
||||
If you're behind a proxy, use the system properties proxy.host, proxy.port, proxy.user and proxy.pass to specify the
|
||||
required proxy setup for the ITs.
|
||||
-->
|
||||
|
||||
<scm>
|
||||
|
@ -65,6 +68,13 @@ under the License.
|
|||
<mavenHome>${maven.home}</mavenHome>
|
||||
<!-- The (possibly instrumented copy of the) Maven distribution we actually use for the tests. -->
|
||||
<preparedMavenHome>${mavenHome}</preparedMavenHome>
|
||||
<!-- default properties used to filter the global settings -->
|
||||
<proxy.active>false</proxy.active>
|
||||
<proxy.host>localhost</proxy.host>
|
||||
<proxy.port>80</proxy.port>
|
||||
<proxy.type>none</proxy.type>
|
||||
<proxy.user></proxy.user>
|
||||
<proxy.pass></proxy.pass>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
@ -111,6 +121,15 @@ under the License.
|
|||
</dependencies>
|
||||
|
||||
<build>
|
||||
<testResources>
|
||||
<testResource>
|
||||
<directory>src/test/resources</directory>
|
||||
</testResource>
|
||||
<testResource>
|
||||
<directory>src/test/resources-filtered</directory>
|
||||
<filtering>true</filtering>
|
||||
</testResource>
|
||||
</testResources>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
|
@ -130,6 +149,10 @@ under the License.
|
|||
<name>maven.home</name>
|
||||
<value>${preparedMavenHome}</value>
|
||||
</property>
|
||||
<property>
|
||||
<name>maven.test.global-settings</name>
|
||||
<value>${project.build.testOutputDirectory}/settings.xml</value>
|
||||
</property>
|
||||
</systemProperties>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
@ -210,7 +233,6 @@ under the License.
|
|||
<plugin>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<configuration>
|
||||
<skip>false</skip>
|
||||
<forkMode>once</forkMode>
|
||||
<argLine>${surefireMemory}</argLine>
|
||||
<systemProperties combine.children="append">
|
||||
|
@ -411,5 +433,17 @@ under the License.
|
|||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>proxy</id>
|
||||
<activation>
|
||||
<property>
|
||||
<name>proxy.host</name>
|
||||
</property>
|
||||
</activation>
|
||||
<properties>
|
||||
<proxy.type>http</proxy.type>
|
||||
<proxy.active>true</proxy.active>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
</project>
|
||||
|
|
|
@ -43,7 +43,7 @@ public class MavenIT0008SimplePluginTest
|
|||
throws Exception
|
||||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0008" );
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-plugin-touch", "1.0", "maven-plugin" );
|
||||
|
|
|
@ -41,7 +41,7 @@ public class MavenIT0009GoalConfigurationTest
|
|||
throws Exception
|
||||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0009" );
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoal( "validate" );
|
||||
|
|
|
@ -43,7 +43,7 @@ public class MavenIT0010DependencyClosureResolutionTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0010" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.it0010" );
|
||||
|
|
|
@ -40,7 +40,7 @@ public class MavenIT0011DefaultVersionByDependencyManagementTest
|
|||
throws Exception
|
||||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0011" );
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.it0011" );
|
||||
|
|
|
@ -39,7 +39,7 @@ public class MavenIT0012PomInterpolationTest
|
|||
throws Exception
|
||||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0012" );
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteDirectory( "child-project/target" );
|
||||
|
|
|
@ -41,7 +41,7 @@ public class MavenIT0018DependencyManagementTest
|
|||
throws Exception
|
||||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0018" );
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.it0018" );
|
||||
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
|
||||
|
|
|
@ -39,7 +39,7 @@ public class MavenIT0019PluginVersionMngtBySuperPomTest
|
|||
throws Exception
|
||||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0019" );
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoal( "process-resources" );
|
||||
|
|
|
@ -41,7 +41,7 @@ public class MavenIT0021PomProfileTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0021" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.it0021" );
|
||||
verifier.getSystemProperties().setProperty( "includeProfile", "true" );
|
||||
|
|
|
@ -41,7 +41,7 @@ public class MavenIT0023SettingsProfileTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0023" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.getCliOptions().add( "--settings" );
|
||||
|
|
|
@ -47,7 +47,7 @@ public class MavenIT0024MultipleGoalExecutionsTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0024" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoal( "initialize" );
|
||||
|
|
|
@ -46,7 +46,7 @@ public class MavenIT0025MultipleExecutionLevelConfigsTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0025" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoal( "validate" );
|
||||
|
|
|
@ -40,7 +40,7 @@ public class MavenIT0030DepPomDepMngtInheritanceTest
|
|||
throws Exception
|
||||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0030" );
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.deleteArtifact( "org.apache.maven.it", "maven-it-it0030", "1.0-SNAPSHOT", "jar" );
|
||||
verifier.deleteArtifact( "org.apache.maven.it", "maven-it-it0030-child-hierarchy", "1.0-SNAPSHOT", "jar" );
|
||||
verifier.deleteArtifact( "org.apache.maven.it", "maven-it-it0030-child-project1", "1.0-SNAPSHOT", "jar" );
|
||||
|
|
|
@ -40,7 +40,7 @@ public class MavenIT0032MavenPrerequisiteTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0032" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.executeGoal( "initialize" );
|
||||
verifier.verifyErrorFreeLog();
|
||||
|
|
|
@ -46,7 +46,7 @@ public class MavenIT0036ReleasePomTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0036" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoal( "validate" );
|
||||
|
|
|
@ -46,7 +46,7 @@ public class MavenIT0037AlternatePomFileSameDirTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0037" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.getCliOptions().add( "-f" );
|
||||
|
|
|
@ -46,7 +46,7 @@ public class MavenIT0038AlternatePomFileDifferentDirTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0038" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "project/target" );
|
||||
verifier.getCliOptions().add( "-f" );
|
||||
|
|
|
@ -48,7 +48,7 @@ public class MavenIT0039ReleasePomInReactorTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0039" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "project/target" );
|
||||
verifier.deleteDirectory( "project2/target" );
|
||||
|
|
|
@ -47,7 +47,7 @@ public class MavenIT0040PackagingFromPluginExtensionTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0040" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoal( "package" );
|
||||
|
|
|
@ -46,9 +46,11 @@ public class MavenIT0041ArtifactTypeFromPluginExtensionTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0041" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.2", "coreit-artifact" );
|
||||
verifier.deleteArtifacts( "org.apache.maven", "maven-core-it-support", "1.2" );
|
||||
verifier.getCliOptions().add( "--settings" );
|
||||
verifier.getCliOptions().add( "settings.xml" );
|
||||
verifier.executeGoal( "validate" );
|
||||
verifier.verifyErrorFreeLog();
|
||||
verifier.resetStreams();
|
||||
|
|
|
@ -41,7 +41,7 @@ public class MavenIT0051ReleaseProfileTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0051" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.getCliOptions().add( "-DperformRelease=true" );
|
||||
|
|
|
@ -41,7 +41,7 @@ public class MavenIT0052ReleaseProfileTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0052" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoal( "package" );
|
||||
|
|
|
@ -41,7 +41,7 @@ public class MavenIT0056MultipleGoalExecutionsTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0056" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoal( "initialize" );
|
||||
|
|
|
@ -41,7 +41,7 @@ public class MavenIT0063SystemScopeDependencyTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0063" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.getSystemProperties().setProperty( "jre.home", new File( testDir, "jdk/jre" ).getPath() );
|
||||
|
|
|
@ -41,7 +41,7 @@ public class MavenIT0064MojoConfigViaSettersTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0064" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-setter:setter-touch" );
|
||||
|
|
|
@ -47,7 +47,7 @@ public class MavenIT0071PluginConfigWithDottedPropertyTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0071" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
|
||||
|
|
|
@ -48,7 +48,7 @@ public class MavenIT0072InterpolationWithDottedPropertyTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0072" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoal( "validate" );
|
||||
|
|
|
@ -44,7 +44,7 @@ public class MavenIT0085TransitiveSystemScopeTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0085" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.it0085" );
|
||||
|
|
|
@ -48,7 +48,7 @@ public class MavenIT0086PluginRealmTest
|
|||
throws Exception
|
||||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0086" );
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoal( "validate" );
|
||||
|
|
|
@ -48,7 +48,7 @@ public class MavenIT0087PluginRealmWithProjectLevelDepsTest
|
|||
throws Exception
|
||||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0087" );
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.it0087" );
|
||||
|
|
|
@ -44,7 +44,7 @@ public class MavenIT0090EnvVarInterpolationTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0090" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath(), true );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
Map envVars = new HashMap();
|
||||
envVars.put( "MAVEN_TEST_ENVAR", "MAVEN_TEST_ENVAR_VALUE" );
|
||||
verifier.setAutoclean( false );
|
||||
|
|
|
@ -58,7 +58,7 @@ public class MavenIT0108SnapshotUpdateTest
|
|||
super.setUp();
|
||||
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0108" );
|
||||
verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
localRepoFile = getLocalRepoFile( verifier );
|
||||
deleteLocalArtifact( verifier, localRepoFile );
|
||||
|
||||
|
|
|
@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier;
|
|||
import org.apache.maven.it.util.ResourceExtractor;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Properties;
|
||||
|
||||
public class MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest
|
||||
|
@ -44,13 +42,11 @@ public class MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0113" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
List cliOptions = new ArrayList();
|
||||
cliOptions.add( "--settings" );
|
||||
cliOptions.add( "settings.xml" );
|
||||
verifier.setCliOptions( cliOptions );
|
||||
verifier.getCliOptions().add( "--settings" );
|
||||
verifier.getCliOptions().add( "settings.xml" );
|
||||
verifier.executeGoal( "validate" );
|
||||
verifier.verifyErrorFreeLog();
|
||||
verifier.resetStreams();
|
||||
|
|
|
@ -46,7 +46,7 @@ public class MavenIT0130CleanLifecycleTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0130" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.executeGoal( "clean" );
|
||||
|
|
|
@ -46,7 +46,7 @@ public class MavenIT0131SiteLifecycleTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0131" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.executeGoal( "site-deploy" );
|
||||
|
|
|
@ -46,7 +46,7 @@ public class MavenIT0132PomLifecycleTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0132" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.executeGoal( "deploy" );
|
||||
|
|
|
@ -46,7 +46,7 @@ public class MavenIT0133JarLifecycleTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0133" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.executeGoal( "deploy" );
|
||||
|
|
|
@ -46,7 +46,7 @@ public class MavenIT0134WarLifecycleTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0134" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.executeGoal( "deploy" );
|
||||
|
|
|
@ -46,7 +46,7 @@ public class MavenIT0135EjbLifecycleTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0135" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.executeGoal( "deploy" );
|
||||
|
|
|
@ -46,7 +46,7 @@ public class MavenIT0136RarLifecycleTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0136" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.executeGoal( "deploy" );
|
||||
|
|
|
@ -46,7 +46,7 @@ public class MavenIT0137EarLifecycleTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0137" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.executeGoal( "deploy" );
|
||||
|
|
|
@ -46,7 +46,7 @@ public class MavenIT0138PluginLifecycleTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0138" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.executeGoal( "deploy" );
|
||||
|
|
|
@ -47,7 +47,7 @@ public class MavenIT0139InterpolationWithProjectPrefixTest
|
|||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0139" );
|
||||
File child = new File( testDir, "child" );
|
||||
|
||||
Verifier verifier = new Verifier( child.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( child.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoal( "initialize" );
|
||||
|
|
|
@ -47,7 +47,7 @@ public class MavenIT0140InterpolationWithPomPrefixTest
|
|||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0140" );
|
||||
File child = new File( testDir, "child" );
|
||||
|
||||
Verifier verifier = new Verifier( child.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( child.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoal( "initialize" );
|
||||
|
|
|
@ -52,7 +52,7 @@ public class MavenIT0142DirectDependencyScopesTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0142" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.it0142" );
|
||||
|
|
|
@ -232,7 +232,7 @@ public class MavenIT0143TransitiveDependencyScopesTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0143" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target-" + scope );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.it0143" );
|
||||
|
|
|
@ -49,7 +49,7 @@ public class MavenIT0144LifecycleExecutionOrderTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0144" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.executeGoals( Arrays.asList( new String[] { "post-clean", "deploy", "site-deploy" } ) );
|
||||
|
|
|
@ -49,7 +49,7 @@ public class MavenIT0145ReactorWithIncludesExcludesTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0145" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteDirectory( "mod-a/target" );
|
||||
|
@ -73,7 +73,7 @@ public class MavenIT0145ReactorWithIncludesExcludesTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0145" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteDirectory( "mod-a/target" );
|
||||
|
@ -98,7 +98,7 @@ public class MavenIT0145ReactorWithIncludesExcludesTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0145" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteDirectory( "mod-a/target" );
|
||||
|
|
|
@ -45,7 +45,7 @@ public class MavenITBootstrapTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/bootstrap" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.getCliOptions().add( "--settings" );
|
||||
verifier.getCliOptions().add( "settings.xml" );
|
||||
|
|
|
@ -47,7 +47,7 @@ public class MavenITmng0095ReactorFailureBehaviorTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0095" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteDirectory( "subproject1/target" );
|
||||
|
@ -81,7 +81,7 @@ public class MavenITmng0095ReactorFailureBehaviorTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0095" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteDirectory( "subproject1/target" );
|
||||
|
@ -108,7 +108,7 @@ public class MavenITmng0095ReactorFailureBehaviorTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0095" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteDirectory( "subproject1/target" );
|
||||
|
|
|
@ -53,7 +53,7 @@ public class MavenITmng0187CollectedProjectsTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0187" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteDirectory( "sub-1/target" );
|
||||
|
|
|
@ -47,7 +47,7 @@ public class MavenITmng0249ResolveDepsFromReactorTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0249" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.executeGoal( "validate" );
|
||||
verifier.verifyErrorFreeLog();
|
||||
|
|
|
@ -46,7 +46,7 @@ public class MavenITmng0282NonReactorExecWhenProjectIndependentTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0282" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteDirectory( "subproject/target" );
|
||||
|
|
|
@ -23,7 +23,6 @@ import org.apache.maven.it.Verifier;
|
|||
import org.apache.maven.it.util.ResourceExtractor;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Properties;
|
||||
|
||||
/**
|
||||
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-294">MNG-294</a>.
|
||||
|
@ -61,9 +60,7 @@ public class MavenITmng0294MergeGlobalAndUserSettingsTest
|
|||
}
|
||||
else
|
||||
{
|
||||
Properties systemProperties = new Properties();
|
||||
systemProperties.put( "org.apache.maven.global-settings", "global-settings.xml" );
|
||||
verifier.setSystemProperties( systemProperties );
|
||||
verifier.setSystemProperty( "org.apache.maven.global-settings", "global-settings.xml" );
|
||||
}
|
||||
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
|
||||
verifier.verifyErrorFreeLog();
|
||||
|
|
|
@ -23,7 +23,6 @@ import org.apache.maven.it.Verifier;
|
|||
import org.apache.maven.it.util.ResourceExtractor;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Properties;
|
||||
|
||||
/**
|
||||
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-377">MNG-377</a>.
|
||||
|
@ -48,16 +47,14 @@ public class MavenITmng0377PluginLookupFromPrefixTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0377" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.mng0377" );
|
||||
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
|
||||
verifier.getCliOptions().add( "--settings" );
|
||||
verifier.getCliOptions().add( "settings.xml" );
|
||||
Properties systemProperties = new Properties();
|
||||
systemProperties.put( "touch.outputFile", "target/file.txt" );
|
||||
verifier.setSystemProperties( systemProperties );
|
||||
verifier.setSystemProperty( "touch.outputFile", "target/file.txt" );
|
||||
verifier.executeGoal( "itprefix:touch" );
|
||||
verifier.verifyErrorFreeLog();
|
||||
verifier.resetStreams();
|
||||
|
|
|
@ -49,7 +49,7 @@ public class MavenITmng0449PluginVersionResolutionTest
|
|||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0449" );
|
||||
testDir = new File( testDir, "lifecycle" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
try
|
||||
|
@ -91,7 +91,7 @@ public class MavenITmng0449PluginVersionResolutionTest
|
|||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0449" );
|
||||
testDir = new File( testDir, "direct" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
try
|
||||
|
|
|
@ -48,7 +48,7 @@ public class MavenITmng0461TolerateMissingDependencyPomTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0461" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.mng0461" );
|
||||
|
|
|
@ -50,7 +50,7 @@ public class MavenITmng0469ReportConfigTest
|
|||
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0469/test0" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-configuration:2.1-SNAPSHOT:config" );
|
||||
|
@ -69,7 +69,7 @@ public class MavenITmng0469ReportConfigTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0469/test1" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-configuration:2.1-SNAPSHOT:config" );
|
||||
|
@ -87,7 +87,7 @@ public class MavenITmng0469ReportConfigTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0469/test2" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.setAutoclean( false );
|
||||
if ( matchesVersionRange( "(,3.0-alpha-1)" ) )
|
||||
|
|
|
@ -48,7 +48,7 @@ public class MavenITmng0471CustomLifecycleTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0471" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
List goals = Arrays.asList( new String[]{"org.apache.maven.its.plugins:maven-it-plugin-fork:fork",
|
||||
|
|
|
@ -49,7 +49,7 @@ public class MavenITmng0479OverrideCentralRepoTest
|
|||
|
||||
// Phase 1: Ensure the test plugin is downloaded before the test cuts off access to central
|
||||
File child1 = new File( testDir, "setup" );
|
||||
Verifier verifier = new Verifier( child1.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( child1.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
|
||||
|
@ -59,7 +59,7 @@ public class MavenITmng0479OverrideCentralRepoTest
|
|||
|
||||
// Phase 2: Now run the test
|
||||
File child2 = new File( testDir, "test" );
|
||||
verifier = new Verifier( child2.getAbsolutePath() );
|
||||
verifier = newVerifier( child2.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ public class MavenITmng0496IgnoreUnknownPluginParametersTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0496" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-log-file:2.1-SNAPSHOT:reset" );
|
||||
|
|
|
@ -51,7 +51,7 @@ public class MavenITmng0505VersionRangeTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0505" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.mng0505" );
|
||||
|
|
|
@ -47,13 +47,13 @@ public class MavenITmng0507ArtifactRelocationTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0507" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.1", "jar" );
|
||||
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.1", "pom" );
|
||||
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support-old-location", "1.1", "jar" );
|
||||
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support-old-location", "1.1", "pom" );
|
||||
verifier.deleteArtifacts( "org.apache.maven", "maven-core-it-support", "1.1" );
|
||||
verifier.deleteArtifacts( "org.apache.maven", "maven-core-it-support-old-location", "1.1" );
|
||||
verifier.getCliOptions().add( "--settings" );
|
||||
verifier.getCliOptions().add( "settings.xml" );
|
||||
verifier.executeGoal( "validate" );
|
||||
verifier.verifyErrorFreeLog();
|
||||
verifier.resetStreams();
|
||||
|
|
|
@ -46,7 +46,7 @@ public class MavenITmng0522InheritedPluginMgmtConfigTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0522" );
|
||||
|
||||
Verifier verifier = new Verifier( new File( testDir, "child-project" ).getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( new File( testDir, "child-project" ).getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoal( "process-resources" );
|
||||
|
|
|
@ -119,7 +119,7 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
|
|||
Properties filterProps = new Properties();
|
||||
filterProps.setProperty( "@port@", Integer.toString( port ) );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.mng0553" );
|
||||
verifier.assertArtifactNotPresent( "org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar" );
|
||||
|
@ -149,7 +149,7 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
|
|||
String secUrl = "FILE://" + new File( testDir, "relocated-settings-security.xml" ).toURI().getRawPath();
|
||||
filterProps.setProperty( "@relocation@", secUrl );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.mng0553" );
|
||||
verifier.assertArtifactNotPresent( "org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar" );
|
||||
|
@ -180,7 +180,7 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
|
|||
|
||||
testDir = new File( testDir, "test-3" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
setUserHome( verifier, new File( testDir, "userhome" ) );
|
||||
verifier.getCliOptions().add( "--encrypt-master-password" );
|
||||
|
@ -193,7 +193,7 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
|
|||
List log = verifier.loadLines( verifier.getLogFileName(), null );
|
||||
assertNotNull( findPassword( log ) );
|
||||
|
||||
verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
setUserHome( verifier, new File( testDir, "userhome" ) );
|
||||
verifier.getCliOptions().add( "--encrypt-password" );
|
||||
|
|
|
@ -23,8 +23,6 @@ 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;
|
||||
|
||||
/**
|
||||
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-557">MNG-557</a>.
|
||||
|
@ -48,12 +46,11 @@ public class MavenITmng0557UserSettingsCliOptionTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0557" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
List cliOptions = new ArrayList();
|
||||
cliOptions.add( "--settings settings.xml" );
|
||||
verifier.setCliOptions( cliOptions );
|
||||
verifier.getCliOptions().add( "--settings" );
|
||||
verifier.getCliOptions().add( "settings.xml" );
|
||||
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
|
||||
verifier.verifyErrorFreeLog();
|
||||
verifier.resetStreams();
|
||||
|
|
|
@ -45,19 +45,19 @@ public class MavenITmng0612NewestConflictResolverTest
|
|||
throws Exception
|
||||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0612/dependency" );
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.executeGoal( "install" );
|
||||
verifier.verifyErrorFreeLog();
|
||||
verifier.resetStreams();
|
||||
|
||||
testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0612/plugin" );
|
||||
verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.executeGoal( "install" );
|
||||
verifier.verifyErrorFreeLog();
|
||||
verifier.resetStreams();
|
||||
|
||||
testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0612/project" );
|
||||
verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.executeGoal( "verify" );
|
||||
verifier.verifyErrorFreeLog();
|
||||
verifier.resetStreams();
|
||||
|
|
|
@ -48,7 +48,7 @@ public class MavenITmng0666IgnoreLegacyPomTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0666" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.it0059" );
|
||||
|
|
|
@ -48,7 +48,7 @@ public class MavenITmng0674PluginParameterAliasTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0674" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.setLogFileName( "log-lifecycle.txt" );
|
||||
|
@ -69,7 +69,7 @@ public class MavenITmng0674PluginParameterAliasTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0674" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.setLogFileName( "log-cli.txt" );
|
||||
|
|
|
@ -48,7 +48,7 @@ public class MavenITmng0680ParentBasedirTest
|
|||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0680" );
|
||||
File subDir = new File( testDir, "subproject" );
|
||||
|
||||
Verifier verifier = new Verifier( subDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( subDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoal( "validate" );
|
||||
|
|
|
@ -50,7 +50,7 @@ public class MavenITmng0731LegacyRepoLayoutTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0731" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoal( "validate" );
|
||||
|
|
|
@ -48,7 +48,7 @@ public class MavenITmng0761MissingSnapshotDistRepoTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0761" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.mng0761" );
|
||||
|
|
|
@ -108,7 +108,7 @@ public class MavenITmng0768OfflineModeTest
|
|||
{
|
||||
{
|
||||
// phase 1: run build in online mode to fill local repo
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.mng0768" );
|
||||
|
@ -128,7 +128,7 @@ public class MavenITmng0768OfflineModeTest
|
|||
|
||||
{
|
||||
// phase 2: run build in offline mode to check it still passes, without network accesses
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.getCliOptions().add( "-o" );
|
||||
|
@ -146,7 +146,7 @@ public class MavenITmng0768OfflineModeTest
|
|||
{
|
||||
// phase 3: delete test artifact and run build in offline mode to check it fails now
|
||||
// NOTE: Adding the settings again to offer Maven the bad choice of using the remote repo
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.mng0768" );
|
||||
|
|
|
@ -23,8 +23,6 @@ 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;
|
||||
|
||||
/**
|
||||
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-773">MNG-773</a>.
|
||||
|
@ -48,12 +46,10 @@ public class MavenITmng0773SettingsProfileReactorPollutionTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0773" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
List cliOptions = new ArrayList();
|
||||
cliOptions.add( "--settings" );
|
||||
cliOptions.add( "settings.xml" );
|
||||
verifier.setCliOptions( cliOptions );
|
||||
verifier.getCliOptions().add( "--settings" );
|
||||
verifier.getCliOptions().add( "settings.xml" );
|
||||
verifier.executeGoal( "validate" );
|
||||
verifier.verifyErrorFreeLog();
|
||||
verifier.resetStreams();
|
||||
|
|
|
@ -47,7 +47,7 @@ public class MavenITmng0781PluginConfigVsExecConfigTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0781" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoal( "process-resources" );
|
||||
|
|
|
@ -23,7 +23,6 @@ import org.apache.maven.it.Verifier;
|
|||
import org.apache.maven.it.util.ResourceExtractor;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Properties;
|
||||
|
||||
/**
|
||||
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-786">MNG-786</a>.
|
||||
|
@ -48,14 +47,12 @@ public class MavenITmng0786ProfileAwareReactorTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0786" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "sub1/target" );
|
||||
verifier.deleteDirectory( "sub2/target" );
|
||||
Properties systemProperties = new Properties();
|
||||
systemProperties.put( "expression.outputFile", "target/expression.properties" );
|
||||
systemProperties.put( "activate", "anything" );
|
||||
verifier.setSystemProperties( systemProperties );
|
||||
verifier.setSystemProperty( "expression.outputFile", "target/expression.properties" );
|
||||
verifier.setSystemProperty( "activate", "anything" );
|
||||
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
|
||||
verifier.assertFilePresent( "sub1/target/expression.properties" );
|
||||
verifier.assertFilePresent( "sub2/target/expression.properties" );
|
||||
|
|
|
@ -47,7 +47,7 @@ public class MavenITmng0814ExplicitProfileActivationTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0814" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.getCliOptions().add( "-P" );
|
||||
|
|
|
@ -48,7 +48,7 @@ public class MavenITmng0818WarDepsNotTransitiveTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0818" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.it0080" );
|
||||
|
|
|
@ -47,7 +47,7 @@ public class MavenITmng0820ConflictResolutionTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0820" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.mng0820" );
|
||||
|
|
|
@ -48,7 +48,7 @@ public class MavenITmng0823MojoContextPassingTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0823" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
List goals = Arrays.asList( new String[]{"org.apache.maven.its.plugins:maven-it-plugin-context-passing:throw",
|
||||
|
|
|
@ -49,7 +49,7 @@ public class MavenITmng0836PluginParentResolutionTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0836" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.mng836" );
|
||||
|
|
|
@ -48,12 +48,10 @@ public class MavenITmng0848SystemPropOverridesDefaultValueTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0848" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
Properties sysProps = new Properties();
|
||||
sysProps.setProperty( "config.aliasDefaultExpressionParam", "PASSED" );
|
||||
verifier.setSystemProperties( sysProps );
|
||||
verifier.setSystemProperty( "config.aliasDefaultExpressionParam", "PASSED" );
|
||||
verifier.executeGoal( "validate" );
|
||||
verifier.verifyErrorFreeLog();
|
||||
verifier.resetStreams();
|
||||
|
|
|
@ -49,7 +49,7 @@ public class MavenITmng0866EvaluateDefaultValueTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0866" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoal( "validate" );
|
||||
|
|
|
@ -48,7 +48,7 @@ public class MavenITmng0870ReactorAwarePluginDiscoveryTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0870" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "project/target" );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.mng0870" );
|
||||
|
|
|
@ -48,7 +48,7 @@ public class MavenITmng0947OptionalDependencyTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0947" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.mng0947" );
|
||||
|
|
|
@ -46,7 +46,7 @@ public class MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest
|
|||
throws Exception
|
||||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0956" );
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.mng0956" );
|
||||
|
|
|
@ -47,7 +47,7 @@ public class MavenITmng0985NonExecutedPluginMngtGoalsTest
|
|||
throws Exception
|
||||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0985" );
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoal( "initialize" );
|
||||
|
|
|
@ -46,7 +46,7 @@ public class MavenITmng1021EqualAttachmentBuildNumberTest
|
|||
throws Exception
|
||||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1021" );
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "repo" );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.mng1021" );
|
||||
|
|
|
@ -47,7 +47,7 @@ public class MavenITmng1052PluginMngtConfigTest
|
|||
throws Exception
|
||||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1052" );
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoal( "process-resources" );
|
||||
|
|
|
@ -49,7 +49,7 @@ public class MavenITmng1073AggregatorForksReactorTest
|
|||
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1073" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteDirectory( "sub-1/target" );
|
||||
|
@ -72,7 +72,7 @@ public class MavenITmng1073AggregatorForksReactorTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1073" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteDirectory( "sub-1/target" );
|
||||
|
|
|
@ -49,7 +49,7 @@ public class MavenITmng1088ReactorPluginResolutionTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1088" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "client/target" );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.mng1088" );
|
||||
|
|
|
@ -47,7 +47,7 @@ public class MavenITmng1144MultipleDefaultGoalsTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1144" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.executeGoals( Collections.EMPTY_LIST );
|
||||
|
|
|
@ -47,7 +47,7 @@ public class MavenITmng1233WarDepWithProvidedScopeTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1233" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.it0083" );
|
||||
|
|
|
@ -49,7 +49,7 @@ public class MavenITmng1323AntrunDependenciesTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1323" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteDirectory( "a/target" );
|
||||
|
|
|
@ -47,7 +47,7 @@ public class MavenITmng1349ChecksumFormatsTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1349" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.mng1349" );
|
||||
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
|
||||
|
|
|
@ -45,7 +45,7 @@ public class MavenITmng1412DependenciesOrderTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1412" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
verifier.deleteArtifacts( "org.apache.maven.its.mng1412" );
|
||||
|
|
|
@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier;
|
|||
import org.apache.maven.it.util.ResourceExtractor;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Properties;
|
||||
|
||||
/**
|
||||
|
@ -48,12 +46,10 @@ public class MavenITmng1415QuotedSystemPropertiesTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1415" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.deleteDirectory( "target" );
|
||||
List cliOptions = new ArrayList();
|
||||
cliOptions.add( "-Dtest.property=\"Test Property\"" );
|
||||
verifier.setCliOptions( cliOptions );
|
||||
verifier.getCliOptions().add( "-Dtest.property=\"Test Property\"" );
|
||||
verifier.executeGoal( "validate" );
|
||||
verifier.verifyErrorFreeLog();
|
||||
verifier.resetStreams();
|
||||
|
|
|
@ -39,7 +39,7 @@ public class MavenITmng1491ReactorArtifactIdCollisionTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1491" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
|
||||
try
|
||||
|
|
|
@ -39,7 +39,7 @@ public class MavenITmng1493NonStandardModulePomNamesTest
|
|||
|
||||
Verifier verifier;
|
||||
|
||||
verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
|
||||
verifier.executeGoal( "initialize" );
|
||||
|
|
|
@ -47,7 +47,7 @@ public class MavenITmng1701DuplicatePluginTest
|
|||
{
|
||||
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1701" );
|
||||
|
||||
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
|
||||
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
|
||||
verifier.setAutoclean( false );
|
||||
verifier.executeGoal( "validate" );
|
||||
verifier.verifyErrorFreeLog();
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue