Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-7661] Replace deprecated 'verifier.executeGoal()'

This commit is contained in:
Petr Široký 2023-01-04 16:36:01 +01:00 committed by Slawomir Jaranowski
parent 9eb3ee980f
commit 5ec94529d2
642 changed files with 2006 additions and 1021 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java
View File

@ -52,7 +52,8 @@ public class MavenIT0008SimplePluginTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-plugin-touch", "1.0", "maven-plugin" );
verifier.executeGoal( "process-sources" );
verifier.addCliArgument( "process-sources" );
verifier.execute();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFilePresent( "target/test-basedir-alignment/touch.txt" );
verifier.verifyErrorFreeLog();

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java
View File

@ -52,7 +52,8 @@ public class MavenIT0009GoalConfigurationTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyFilePresent( supportSpaceInXml ? "target/ pluginItem " : "target/pluginItem");
verifier.verifyFilePresent( "target/goalItem" );
verifier.verifyFileNotPresent( "target/bad-item" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java
View File

@ -55,7 +55,8 @@ public class MavenIT0010DependencyClosureResolutionTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.it0010", "a", "0.1", "jar" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java
View File

@ -52,7 +52,8 @@ public class MavenIT0011DefaultVersionByDependencyManagementTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java
View File

@ -48,7 +48,8 @@ public class MavenIT0012PomInterpolationTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "child-project/target" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.execute();
verifier.verifyFilePresent( "target/touch-3.8.1.txt" );
verifier.verifyFilePresent( "child-project/target/child-touch-3.0.3.txt" );
verifier.verifyErrorFreeLog();

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java
View File

@ -52,7 +52,8 @@ public class MavenIT0018DependencyManagementTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
verifier.execute();
verifier.verifyArtifactPresent( "org.apache.maven.its.it0018", "managed-dep", "1.0.3", "jar" );
verifier.verifyErrorFreeLog();
}

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java
View File

@ -47,7 +47,8 @@ public class MavenIT0019PluginVersionMgmtBySuperPomTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "process-resources" );
verifier.addCliArgument( "process-resources" );
verifier.execute();
verifier.verifyFilePresent( "target/classes/test.txt" );
verifier.verifyErrorFreeLog();
}

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java
View File

@ -54,7 +54,8 @@ public class MavenIT0021PomProfileTest
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.addCliOption( "-Pprofile-2" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.it0021", "a", "0.1", "jar" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java
View File

@ -51,7 +51,8 @@ public class MavenIT0023SettingsProfileTest
verifier.deleteDirectory( "target" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/test.txt" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java
View File

@ -55,7 +55,8 @@ public class MavenIT0024MultipleGoalExecutionsTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "initialize" );
verifier.addCliArgument( "initialize" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/plugin-exec-configuration.txt" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java
View File

@ -54,7 +54,8 @@ public class MavenIT0025MultipleExecutionLevelConfigsTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/test.txt" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java
View File

@ -50,7 +50,8 @@ public class MavenIT0030DepPomDepMgmtInheritanceTest
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" );
verifier.deleteArtifact( "org.apache.maven.it", "maven-it-it0030-child-project2", "1.0-SNAPSHOT", "jar" );
verifier.executeGoal( "install" );
verifier.addCliArgument( "install" );
verifier.execute();
verifier.verifyFilePresent( "child-hierarchy/project2/target/classes/org/apache/maven/it0001/Person.class" );
verifier.verifyErrorFreeLog();

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java
View File

@ -47,7 +47,8 @@ public class MavenIT0032MavenPrerequisiteTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.executeGoal( "initialize" );
verifier.addCliArgument( "initialize" );
verifier.execute();
verifier.verifyErrorFreeLog();
}

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java
View File

@ -56,7 +56,8 @@ public class MavenIT0037AlternatePomFileSameDirTest
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-f" );
verifier.addCliOption( "pom2.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/passed.log" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java
View File

@ -56,7 +56,8 @@ public class MavenIT0038AlternatePomFileDifferentDirTest
verifier.deleteDirectory( "project/target" );
verifier.addCliOption( "-f" );
verifier.addCliOption( "project/pom2.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "project/target/passed.log" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java
View File

@ -55,7 +55,8 @@ public class MavenIT0040PackagingFromPluginExtensionTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "package" );
verifier.addCliArgument( "package" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/maven-it-it0040-1.0-it.jar" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
View File

@ -56,7 +56,8 @@ public class MavenIT0041ArtifactTypeFromPluginExtensionTest
verifier.deleteArtifacts( "org.apache.maven", "maven-core-it-support", "1.2" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.2", "coreit-artifact" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java
View File

@ -50,7 +50,8 @@ public class MavenIT0051ReleaseProfileTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-DperformRelease=true" );
verifier.executeGoal( "package" );
verifier.addCliArgument( "package" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/source-jar.txt" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java
View File

@ -49,7 +49,8 @@ public class MavenIT0052ReleaseProfileTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "package" );
verifier.addCliArgument( "package" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/jar-jar.txt" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java
View File

@ -49,7 +49,8 @@ public class MavenIT0056MultipleGoalExecutionsTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "initialize" );
verifier.addCliArgument( "initialize" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/first-exec.txt" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java
View File

@ -50,7 +50,8 @@ public class MavenIT0063SystemScopeDependencyTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getSystemProperties().setProperty( "jre.home", new File( testDir, "jdk/jre" ).getPath() );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadLines( "target/compile.txt", "UTF-8" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java
View File

@ -49,7 +49,8 @@ public class MavenIT0064MojoConfigViaSettersTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-setter:setter-touch" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-setter:setter-touch" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/fooValue" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java
View File

@ -55,7 +55,8 @@ public class MavenIT0071PluginConfigWithDottedPropertyTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/foo2" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java
View File

@ -56,7 +56,8 @@ public class MavenIT0072InterpolationWithDottedPropertyTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java
View File

@ -57,7 +57,8 @@ public class MavenIT0085TransitiveSystemScopeTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
Collection<String> lines = verifier.loadLines( "target/test.txt", "UTF-8" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java
View File

@ -56,7 +56,8 @@ public class MavenIT0086PluginRealmTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java
View File

@ -60,7 +60,8 @@ public class MavenIT0087PluginRealmWithProjectLevelDepsTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );

8
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java
View File

@ -23,8 +23,6 @@ import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import org.junit.jupiter.api.Test;
@ -50,11 +48,11 @@ public class MavenIT0090EnvVarInterpolationTest
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0090" );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
Map<String, String> envVars = new HashMap<>();
envVars.put( "MAVEN_TEST_ENVAR", "MAVEN_TEST_ENVAR_VALUE" );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate", envVars );
verifier.setEnvironmentVariable( "MAVEN_TEST_ENVAR", "MAVEN_TEST_ENVAR_VALUE" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/env.properties" );

27
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java
View File

@ -83,7 +83,8 @@ public class MavenIT0108SnapshotUpdateTest
public void testSnapshotUpdated()
throws Exception
{
verifier.executeGoal( "package" );
verifier.addCliArgument( "package" );
verifier.execute();
verifier.verifyErrorFreeLog();
@ -94,7 +95,8 @@ public class MavenIT0108SnapshotUpdateTest
FileUtils.fileWrite( artifact.getAbsolutePath(), "updatedArtifact" );
verifier.executeGoal( "package" );
verifier.addCliArgument( "package" );
verifier.execute();
verifyArtifactContent( "updatedArtifact" );
@ -110,7 +112,8 @@ public class MavenIT0108SnapshotUpdateTest
FileUtils.fileWrite( metadata.getAbsolutePath(),
constructMetadata( "1", System.currentTimeMillis() - TIME_OFFSET, true ) );
verifier.executeGoal( "package" );
verifier.addCliArgument( "package" );
verifier.execute();
verifier.verifyErrorFreeLog();
@ -120,7 +123,8 @@ public class MavenIT0108SnapshotUpdateTest
metadata = new File( repository, "org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml" );
FileUtils.fileWrite( metadata.getAbsolutePath(), constructMetadata( "2", System.currentTimeMillis(), true ) );
verifier.executeGoal( "package" );
verifier.addCliArgument( "package" );
verifier.execute();
verifyArtifactContent( "updatedArtifact" );
@ -142,7 +146,8 @@ public class MavenIT0108SnapshotUpdateTest
FileUtils.fileWrite( metadata.getAbsolutePath(),
constructMetadata( "1", System.currentTimeMillis() - TIME_OFFSET, true ) );
verifier.executeGoal( "package" );
verifier.addCliArgument( "package" );
verifier.execute();
verifier.verifyErrorFreeLog();
@ -157,7 +162,8 @@ public class MavenIT0108SnapshotUpdateTest
// update the remote file, but we shouldn't be looking
artifact.setLastModified( System.currentTimeMillis() );
verifier.executeGoal( "package" );
verifier.addCliArgument( "package" );
verifier.execute();
verifyArtifactContent( "localArtifact" );
@ -172,7 +178,8 @@ public class MavenIT0108SnapshotUpdateTest
constructMetadata( "2", System.currentTimeMillis() - 2000, true ) );
artifact.setLastModified( System.currentTimeMillis() );
verifier.executeGoal( "package" );
verifier.addCliArgument( "package" );
verifier.execute();
verifyArtifactContent( "originalArtifact" );
@ -189,7 +196,8 @@ public class MavenIT0108SnapshotUpdateTest
constructMetadata( "1", System.currentTimeMillis() - TIME_OFFSET, false ) );
metadata.setLastModified( System.currentTimeMillis() - TIME_OFFSET );
verifier.executeGoal( "package" );
verifier.addCliArgument( "package" );
verifier.execute();
verifier.verifyErrorFreeLog();
@ -199,7 +207,8 @@ public class MavenIT0108SnapshotUpdateTest
metadata = new File( repository, "org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml" );
FileUtils.fileWrite( metadata.getAbsolutePath(), constructMetadata( "2", System.currentTimeMillis(), false ) );
verifier.executeGoal( "package" );
verifier.addCliArgument( "package" );
verifier.execute();
verifyArtifactContent( "updatedArtifact" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java
View File

@ -52,7 +52,8 @@ public class MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest
verifier.deleteDirectory( "target" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/auth.properties" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java
View File

@ -54,7 +54,8 @@ public class MavenIT0130CleanLifecycleTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "clean" );
verifier.addCliArgument( "clean" );
verifier.execute();
verifier.verifyFilePresent( "target/clean-clean.txt" );
verifier.verifyErrorFreeLog();
}

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java
View File

@ -54,7 +54,8 @@ public class MavenIT0131SiteLifecycleTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "site-deploy" );
verifier.addCliArgument( "site-deploy" );
verifier.execute();
verifier.verifyFilePresent( "target/site-site.txt" );
verifier.verifyFilePresent( "target/site-deploy.txt" );
verifier.verifyErrorFreeLog();

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java
View File

@ -54,7 +54,8 @@ public class MavenIT0132PomLifecycleTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "deploy" );
verifier.addCliArgument( "deploy" );
verifier.execute();
if ( matchesVersionRange( "(2.0.1,3.0-alpha-1)" ) )
{
verifier.verifyFilePresent( "target/site-attach-descriptor.txt" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java
View File

@ -54,7 +54,8 @@ public class MavenIT0133JarLifecycleTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "deploy" );
verifier.addCliArgument( "deploy" );
verifier.execute();
verifier.verifyFilePresent( "target/resources-resources.txt" );
verifier.verifyFilePresent( "target/compiler-compile.txt" );
verifier.verifyFilePresent( "target/resources-test-resources.txt" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java
View File

@ -54,7 +54,8 @@ public class MavenIT0134WarLifecycleTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "deploy" );
verifier.addCliArgument( "deploy" );
verifier.execute();
verifier.verifyFilePresent( "target/resources-resources.txt" );
verifier.verifyFilePresent( "target/compiler-compile.txt" );
verifier.verifyFilePresent( "target/resources-test-resources.txt" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java
View File

@ -54,7 +54,8 @@ public class MavenIT0135EjbLifecycleTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "deploy" );
verifier.addCliArgument( "deploy" );
verifier.execute();
verifier.verifyFilePresent( "target/resources-resources.txt" );
verifier.verifyFilePresent( "target/compiler-compile.txt" );
verifier.verifyFilePresent( "target/resources-test-resources.txt" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java
View File

@ -54,7 +54,8 @@ public class MavenIT0136RarLifecycleTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "deploy" );
verifier.addCliArgument( "deploy" );
verifier.execute();
verifier.verifyFilePresent( "target/resources-resources.txt" );
verifier.verifyFilePresent( "target/compiler-compile.txt" );
verifier.verifyFilePresent( "target/resources-test-resources.txt" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java
View File

@ -54,7 +54,8 @@ public class MavenIT0137EarLifecycleTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "deploy" );
verifier.addCliArgument( "deploy" );
verifier.execute();
verifier.verifyFilePresent( "target/ear-generate-application-xml.txt" );
verifier.verifyFilePresent( "target/resources-resources.txt" );
verifier.verifyFilePresent( "target/ear-ear.txt" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java
View File

@ -54,7 +54,8 @@ public class MavenIT0138PluginLifecycleTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "deploy" );
verifier.addCliArgument( "deploy" );
verifier.execute();
verifier.verifyFilePresent( "target/plugin-descriptor.txt" );
verifier.verifyFilePresent( "target/resources-resources.txt" );
verifier.verifyFilePresent( "target/compiler-compile.txt" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java
View File

@ -55,7 +55,8 @@ public class MavenIT0139InterpolationWithProjectPrefixTest
Verifier verifier = newVerifier( child.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "initialize" );
verifier.addCliArgument( "initialize" );
verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/interpolated.properties" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java
View File

@ -57,7 +57,8 @@ public class MavenIT0140InterpolationWithPomPrefixTest
Verifier verifier = newVerifier( child.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "initialize" );
verifier.addCliArgument( "initialize" );
verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/interpolated.properties" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java
View File

@ -66,7 +66,8 @@ public class MavenIT0142DirectDependencyScopesTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compileArtifacts = verifier.loadLines( "target/compile-artifacts.txt", "UTF-8" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java
View File

@ -257,7 +257,8 @@ public class MavenIT0143TransitiveDependencyScopesTest
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.setLogFileName( "log-" + scope + ".txt" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
return verifier;

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java
View File

@ -56,7 +56,8 @@ public class MavenIT0144LifecycleExecutionOrderTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoals( Arrays.asList( new String[]{ "post-clean", "deploy", "site-deploy" } ) );
verifier.addCliArguments( "post-clean", "deploy", "site-deploy" );
verifier.execute();
verifier.verifyErrorFreeLog();
List<String> expected = new ArrayList<>();

9
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
View File

@ -106,7 +106,8 @@ public class MavenIT0146InstallerSnapshotNaming
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/appassembler/repo/dep-0.1-20110726.105319-1.jar" );
@ -124,7 +125,8 @@ public class MavenIT0146InstallerSnapshotNaming
verifier.deleteDirectory( "project/target" );
verifier.setLogFileName( "log2.txt" );
verifier.executeGoal( "install" );
verifier.addCliArgument( "install" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( testDir.getAbsolutePath() );
@ -144,7 +146,8 @@ public class MavenIT0146InstallerSnapshotNaming
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/appassembler/repo/dep-0.1-SNAPSHOT.jar" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java
View File

@ -50,7 +50,8 @@ public class MavenIT0199CyclicImportScopeTest extends AbstractMavenIntegrationTe
Verifier verifier = newVerifier(new File(testDir.getAbsolutePath(), module).getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.executeGoal("install");
verifier.addCliArgument("install");
verifier.execute();
if (expectedArtifact != null) {
verifier.verifyFilePresent(expectedArtifact);
}

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java
View File

@ -57,7 +57,8 @@ public class MavenITBootstrapTest
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.addCliOption( "-Dbootstrap=" + getClass().getResource( "/bootstrap.txt" ).toURI().getPath() );
verifier.executeGoal( "install" );
verifier.addCliArgument( "install" );
verifier.execute();
verifier.verifyErrorFreeLog();
}

9
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
View File

@ -63,7 +63,8 @@ public class MavenITmng0095ReactorFailureBehaviorTest
verifier.setLogFileName( "log-ff.txt" );
try
{
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.execute();
verifier.verifyErrorFreeLog();
}
catch ( VerificationException e )
@ -97,7 +98,8 @@ public class MavenITmng0095ReactorFailureBehaviorTest
verifier.deleteDirectory( "subproject3/target" );
verifier.addCliOption( "--fail-never" );
verifier.setLogFileName( "log-fn.txt" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.execute();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject1/target/touch.txt" );
@ -128,7 +130,8 @@ public class MavenITmng0095ReactorFailureBehaviorTest
verifier.setLogFileName( "log-fae.txt" );
try
{
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.execute();
verifier.verifyErrorFreeLog();
}
catch ( VerificationException e )

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java
View File

@ -62,7 +62,8 @@ public class MavenITmng0187CollectedProjectsTest
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "sub-1/target" );
verifier.deleteDirectory( "sub-1/sub-2/target" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
Properties props;

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java
View File

@ -54,7 +54,8 @@ public class MavenITmng0249ResolveDepsFromReactorTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
List<String> ccp = verifier.loadLines( "test-component-c/target/compile.txt", "UTF-8" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
View File

@ -55,7 +55,8 @@ public class MavenITmng0282NonReactorExecWhenProjectIndependentTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "subproject/target" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-no-project:light-touch" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-no-project:light-touch" );
verifier.execute();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject/target/touch.txt" );
verifier.verifyErrorFreeLog();

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
View File

@ -60,7 +60,8 @@ public class MavenITmng0294MergeGlobalAndUserSettingsTest
// dedicated CLI option only available since MNG-3914
verifier.addCliOption( "--global-settings" );
verifier.addCliOption( "global-settings.xml" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/test.txt" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
View File

@ -60,7 +60,8 @@ public class MavenITmng0377PluginLookupFromPrefixTest
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.addCliArgument( "-Dtouch.outputFile=target/file.txt" );
verifier.executeGoal( "itprefix:touch" );
verifier.addCliArgument( "itprefix:touch" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/file.txt" );

6
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
View File

@ -68,7 +68,8 @@ public class MavenITmng0449PluginVersionResolutionTest
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
// Maven 3.x prefers RELEASE over LATEST (see MNG-4206)
@ -112,7 +113,8 @@ public class MavenITmng0449PluginVersionResolutionTest
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "org.apache.maven.its.mng0449:maven-it-plugin-a:touch" );
verifier.addCliArgument( "org.apache.maven.its.mng0449:maven-it-plugin-a:touch" );
verifier.execute();
verifier.verifyErrorFreeLog();
// Maven 3.x prefers RELEASE over LATEST (see MNG-4206)

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java
View File

@ -59,7 +59,8 @@ public class MavenITmng0461TolerateMissingDependencyPomTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );

9
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
View File

@ -56,7 +56,8 @@ public class MavenITmng0469ReportConfigTest
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" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-configuration:2.1-SNAPSHOT:config" );
verifier.execute();
verifier.verifyFilePresent( "target/build.txt" );
verifier.verifyFileNotPresent( "target/reporting.txt" );
verifier.verifyErrorFreeLog();
@ -78,12 +79,14 @@ public class MavenITmng0469ReportConfigTest
verifier.setAutoclean( false );
if ( matchesVersionRange( "(,3.0-alpha-1)" ) )
{
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-site:2.1-SNAPSHOT:generate" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-site:2.1-SNAPSHOT:generate" );
verifier.execute();
verifier.verifyFilePresent( "target/site/info.properties" );
}
else
{
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
Properties props = verifier.loadProperties( "target/config.properties" );
assertEquals( "maven-it-plugin-site", props.getProperty( "project.reporting.plugins.0.artifactId" ) );
assertNotEquals( "fail.properties", props.getProperty( "project.reporting.plugins.0.configuration.children.infoFile.0.value" ) );

6
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java
View File

@ -56,9 +56,9 @@ public class MavenITmng0471CustomLifecycleTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
List<String> goals = Arrays.asList( new String[]{"org.apache.maven.its.plugins:maven-it-plugin-fork:fork",
"org.apache.maven.its.plugins:maven-it-plugin-fork:fork-goal"} );
verifier.executeGoals( goals );
verifier.addCliArguments( "org.apache.maven.its.plugins:maven-it-plugin-fork:fork",
"org.apache.maven.its.plugins:maven-it-plugin-fork:fork-goal" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/forked/touch.txt" );

18
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
View File

@ -59,7 +59,8 @@ public class MavenITmng0479OverrideCentralRepoTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
verifier.execute();
verifier.verifyErrorFreeLog();
// Phase 2: Now run the test
@ -71,7 +72,8 @@ public class MavenITmng0479OverrideCentralRepoTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/expression.properties" );
@ -135,7 +137,8 @@ public class MavenITmng0479OverrideCentralRepoTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
@ -154,7 +157,8 @@ public class MavenITmng0479OverrideCentralRepoTest
verifier.addCliOption( "settings.xml" );
try
{
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build should have failed to resolve parent POM" );
}
@ -173,7 +177,8 @@ public class MavenITmng0479OverrideCentralRepoTest
verifier.addCliOption( "settings.xml" );
try
{
verifier.executeGoal( "org.apache.maven.its.mng0479:maven-mng0479-plugin:0.1-SNAPSHOT:touch" );
verifier.addCliArgument( "org.apache.maven.its.mng0479:maven-mng0479-plugin:0.1-SNAPSHOT:touch" );
verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build should have failed to resolve direct dependency" );
}
@ -193,7 +198,8 @@ public class MavenITmng0479OverrideCentralRepoTest
verifier.addCliOption( "settings.xml" );
try
{
verifier.executeGoal( "org.apache.maven.its.mng0479:maven-mng0479-plugin:0.1-SNAPSHOT:touch" );
verifier.addCliArgument( "org.apache.maven.its.mng0479:maven-mng0479-plugin:0.1-SNAPSHOT:touch" );
verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build should have failed to resolve transitive dependency" );
}

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
View File

@ -55,7 +55,8 @@ public class MavenITmng0496IgnoreUnknownPluginParametersTest
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" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-log-file:2.1-SNAPSHOT:reset" );
verifier.execute();
verifier.verifyFilePresent( "target/file.txt" );
verifier.verifyErrorFreeLog();
}

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
View File

@ -63,7 +63,8 @@ public class MavenITmng0505VersionRangeTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
Collection<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
View File

@ -59,7 +59,8 @@ public class MavenITmng0507ArtifactRelocationTest
verifier.deleteArtifacts( "org.apache.maven", "maven-core-it-support-old-location", "1.1" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.1", "jar" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java
View File

@ -54,7 +54,8 @@ public class MavenITmng0522InheritedPluginMgmtConfigTest
Verifier verifier = newVerifier( new File( testDir, "child-project" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "process-resources" );
verifier.addCliArgument( "process-resources" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/plugin-mngt-config-1.txt" );

12
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
View File

@ -139,7 +139,8 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
setUserHome( verifier, new File( testDir, "userhome" ) );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar" );
@ -176,7 +177,8 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
verifier.addCliOption( "settings.xml" );
// NOTE: The selection of the Turkish language for the JVM locale is essential part of the test
verifier.setEnvironmentVariable( "MAVEN_OPTS", "-Dsettings.security=" + new File( testDir, "settings~security.xml" ).getAbsolutePath() + " -Duser.language=tr" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar" );
@ -201,7 +203,8 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
verifier.addCliOption( "--encrypt-master-password" );
verifier.addCliOption( "test" );
verifier.setLogFileName( "log-emp.txt" );
verifier.executeGoal( "-e" );
verifier.addCliArgument( "-e" );
verifier.execute();
verifier.verifyErrorFreeLog();
List<String> log = verifier.loadLines( verifier.getLogFileName(), null );
@ -213,7 +216,8 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
verifier.addCliOption( "--encrypt-password" );
verifier.addCliOption( "testpass" );
verifier.setLogFileName( "log-ep.txt" );
verifier.executeGoal( "-e" );
verifier.addCliArgument( "-e" );
verifier.execute();
verifier.verifyErrorFreeLog();
log = verifier.loadLines( verifier.getLogFileName(), null );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java
View File

@ -56,7 +56,8 @@ public class MavenITmng0557UserSettingsCliOptionTest
verifier.deleteDirectory( "target" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/test.txt" );

9
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java
View File

@ -53,17 +53,20 @@ public class MavenITmng0612NewestConflictResolverTest
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0612/dependency" );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.addCliArgument( "install" );
verifier.execute();
verifier.verifyErrorFreeLog();
testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0612/plugin" );
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.addCliArgument( "install" );
verifier.execute();
verifier.verifyErrorFreeLog();
testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0612/project" );
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "verify" );
verifier.addCliArgument( "verify" );
verifier.execute();
verifier.verifyErrorFreeLog();
}
}

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java
View File

@ -60,7 +60,8 @@ public class MavenITmng0666IgnoreLegacyPomTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
// don't verify error free log
verifier.verifyArtifactPresent( "org.apache.maven.its.it0059", "test", "3.8.1", "jar" );

6
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java
View File

@ -58,7 +58,8 @@ public class MavenITmng0674PluginParameterAliasTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log-lifecycle.txt" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
@ -82,7 +83,8 @@ public class MavenITmng0674PluginParameterAliasTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log-cli.txt" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-configuration:config" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-configuration:config" );
verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java
View File

@ -59,7 +59,8 @@ public class MavenITmng0680ParentBasedirTest
Verifier verifier = newVerifier( subDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/basedir.properties" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java
View File

@ -57,7 +57,8 @@ public class MavenITmng0761MissingSnapshotDistRepoTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng0761" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/repo/org/apache/maven/its/mng0761/test/1.0-SNAPSHOT/test-1.0-*.jar" );

9
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
View File

@ -130,7 +130,8 @@ public class MavenITmng0768OfflineModeTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", props );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
verifier.execute();
verifier.verifyFilePresent( "target/compile.txt" );
verifier.verifyErrorFreeLog();
}
@ -146,7 +147,8 @@ public class MavenITmng0768OfflineModeTest
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.setLogFileName( "log2.txt" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
verifier.execute();
verifier.verifyFilePresent( "target/compile.txt" );
verifier.verifyErrorFreeLog();
}
@ -166,7 +168,8 @@ public class MavenITmng0768OfflineModeTest
verifier.setLogFileName( "log3.txt" );
try
{
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build did not fail to resolve missing dependency although Maven ought to work offline!" );
}

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java
View File

@ -55,7 +55,8 @@ public class MavenITmng0773SettingsProfileReactorPollutionTest
verifier.setAutoclean( false );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
}

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java
View File

@ -55,7 +55,8 @@ public class MavenITmng0781PluginConfigVsExecConfigTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "process-resources" );
verifier.addCliArgument( "process-resources" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/exec-level.txt" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java
View File

@ -58,7 +58,8 @@ public class MavenITmng0786ProfileAwareReactorTest
verifier.deleteDirectory( "sub2/target" );
verifier.addCliArgument( "-Dexpression.outputFile=target/expression.properties" );
verifier.addCliArgument( "-Dactivate=anything" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
verifier.execute();
verifier.verifyFilePresent( "sub1/target/expression.properties" );
verifier.verifyFilePresent( "sub2/target/expression.properties" );
verifier.verifyErrorFreeLog();

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java
View File

@ -57,7 +57,8 @@ public class MavenITmng0814ExplicitProfileActivationTest
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-P" );
verifier.addCliOption( "test-profile" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/profile.properties" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java
View File

@ -60,7 +60,8 @@ public class MavenITmng0818WarDepsNotTransitiveTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
Collection<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java
View File

@ -59,7 +59,8 @@ public class MavenITmng0820ConflictResolutionTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
Collection<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );

6
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java
View File

@ -56,9 +56,9 @@ public class MavenITmng0823MojoContextPassingTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
List<String> goals = Arrays.asList( new String[]{"org.apache.maven.its.plugins:maven-it-plugin-context-passing:throw",
"org.apache.maven.its.plugins:maven-it-plugin-context-passing:catch"} );
verifier.executeGoals( goals );
verifier.addCliArguments( "org.apache.maven.its.plugins:maven-it-plugin-context-passing:throw",
"org.apache.maven.its.plugins:maven-it-plugin-context-passing:catch" );
verifier.execute();
verifier.verifyFilePresent( "target/thrown-value" );
verifier.verifyErrorFreeLog();
}

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java
View File

@ -61,7 +61,8 @@ public class MavenITmng0828PluginConfigValuesInDebugTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setMavenDebug( true );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
String log = FileUtils.fileRead( new File( verifier.getBasedir(), verifier.getLogFileName() ) );

6
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java
View File

@ -64,14 +64,16 @@ public class MavenITmng0836PluginParentResolutionTest
// Maven 3.x aims to separate plugins and project dependencies (MNG-4191)
if ( matchesVersionRange( "(,3.0-alpha-1),(3.0-alpha-1,3.0-alpha-7)" ) )
{
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
}
else
{
try
{
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Plugin parent POM was erroneously resolved from non-plugin repository." );
}

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java
View File

@ -57,7 +57,8 @@ public class MavenITmng0848UserPropertyOverridesDefaultValueTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.addCliArgument( "-Dconfig.aliasDefaultExpressionParam=PASSED" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
Properties configProps = verifier.loadProperties( "target/config.properties" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java
View File

@ -57,7 +57,8 @@ public class MavenITmng0866EvaluateDefaultValueTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
Properties configProps = verifier.loadProperties( "target/config.properties" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java
View File

@ -60,7 +60,8 @@ public class MavenITmng0870ReactorAwarePluginDiscoveryTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "initialize" );
verifier.addCliArgument( "initialize" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "project/target/touch.txt" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java
View File

@ -62,7 +62,8 @@ public class MavenITmng0947OptionalDependencyTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java
View File

@ -58,7 +58,8 @@ public class MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
Properties apiProps = verifier.loadProperties( "target/component.properties" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java
View File

@ -55,7 +55,8 @@ public class MavenITmng0985NonExecutedPluginMgmtGoalsTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "initialize" );
verifier.addCliArgument( "initialize" );
verifier.execute();
verifier.verifyFileNotPresent( "target/unexpected.txt" );
verifier.verifyErrorFreeLog();
}

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
View File

@ -55,7 +55,8 @@ public class MavenITmng1021EqualAttachmentBuildNumberTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "repo" );
verifier.deleteArtifacts( "org.apache.maven.its.mng1021" );
verifier.executeGoal( "initialize" );
verifier.addCliArgument( "initialize" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1021", "test", "1-SNAPSHOT", "pom" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java
View File

@ -55,7 +55,8 @@ public class MavenITmng1052PluginMgmtConfigTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "process-resources" );
verifier.addCliArgument( "process-resources" );
verifier.execute();
verifier.verifyFilePresent( "target/plugin-management.txt" );
verifier.verifyFileNotPresent( "target/resources-resources.txt" );
verifier.verifyErrorFreeLog();

6
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java
View File

@ -60,7 +60,8 @@ public class MavenITmng1073AggregatorForksReactorTest
verifier.deleteDirectory( "sub-1/target" );
verifier.deleteDirectory( "sub-2/target" );
verifier.setLogFileName( "log-lifecycle.txt" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-fork:2.1-SNAPSHOT:fork-lifecycle-aggregator" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-fork:2.1-SNAPSHOT:fork-lifecycle-aggregator" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/forked/touch.txt" );
@ -85,7 +86,8 @@ public class MavenITmng1073AggregatorForksReactorTest
verifier.deleteDirectory( "sub-1/target" );
verifier.deleteDirectory( "sub-2/target" );
verifier.setLogFileName( "log-goal.txt" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-fork:2.1-SNAPSHOT:fork-goal-aggregator" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-fork:2.1-SNAPSHOT:fork-goal-aggregator" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java
View File

@ -62,7 +62,8 @@ public class MavenITmng1088ReactorPluginResolutionTest
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
// NOTE: It's essential part of the test to invoke a phase before "compile"
verifier.executeGoal( "initialize" );
verifier.addCliArgument( "initialize" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "client/target/touch.txt" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java
View File

@ -79,7 +79,8 @@ public class MavenITmng1142VersionRangeIntersectionTest
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java
View File

@ -55,7 +55,7 @@ public class MavenITmng1144MultipleDefaultGoalsTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoals( Collections.<String> emptyList() );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/clean-clean.txt" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java
View File

@ -59,7 +59,8 @@ public class MavenITmng1233WarDepWithProvidedScopeTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
Collection<String> compileArtifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java
View File

@ -64,7 +64,8 @@ public class MavenITmng1323AntrunDependenciesTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
Properties pclProps;

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java
View File

@ -58,7 +58,8 @@ public class MavenITmng1349ChecksumFormatsTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1349", "md5-a", "0.1", "jar" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java
View File

@ -56,7 +56,8 @@ public class MavenITmng1412DependenciesOrderTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compileArtifacts = verifier.loadLines( "target/compile-artifacts.txt", "UTF-8" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java
View File

@ -55,7 +55,8 @@ public class MavenITmng1415QuotedSystemPropertiesTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-Dtest.property=Test Property" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/cli.properties" );

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java
View File

@ -52,7 +52,8 @@ public class MavenITmng1491ReactorArtifactIdCollisionTest
try
{
verifier.executeGoal( "initialize" );
verifier.addCliArgument( "initialize" );
verifier.execute();
verifier.verifyErrorFreeLog();

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java
View File

@ -48,7 +48,8 @@ public class MavenITmng1493NonStandardModulePomNamesTest
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.executeGoal( "initialize" );
verifier.addCliArgument( "initialize" );
verifier.execute();
/*
* This is the simplest way to check a build

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java
View File

@ -56,7 +56,8 @@ public class MavenITmng1701DuplicatePluginTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
try {
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
}
catch ( VerificationException e )
{

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java
View File

@ -61,7 +61,8 @@ public class MavenITmng1703PluginMgmtDepInheritanceTest
verifier.addCliOption( "settings.xml" );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng1703" );
verifier.executeGoal( "validate" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );

Some files were not shown because too many files have changed in this diff Show More