You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/09/09 08:32:49 UTC
[maven-integration-testing] branch master updated: Remove verifier.getCliOptions().add( x ) pattern (#197)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
The following commit(s) were added to refs/heads/master by this push:
new f1118d89a Remove verifier.getCliOptions().add( x ) pattern (#197)
f1118d89a is described below
commit f1118d89a33ef6ef784e69908faa1b4183e667fa
Author: Guillaume Nodet <gn...@apache.org>
AuthorDate: Fri Sep 9 10:32:45 2022 +0200
Remove verifier.getCliOptions().add( x ) pattern (#197)
Follow up to ecf4a04cd1c4b7698f28e3332cd24c23116c1467 which missed a few tests using the above pattern
---
.../it/MavenITmng5530MojoExecutionScopeTest.java | 5 ++++-
.../maven/it/MavenITmng5771CoreExtensionsTest.java | 22 +++++++++++-----------
.../MavenITmng5774ConfigurationProcessorsTest.java | 8 ++++----
.../apache/maven/it/MavenITmng5889FindBasedir.java | 6 +++---
.../it/MavenITmng6071GetResourceWithCustomPom.java | 3 ++-
...venITmng6210CoreExtensionsCustomScopesTest.java | 4 ++--
.../maven/it/MavenITmng6255FixConcatLines.java | 2 +-
...nITmng6256SpecialCharsAlternatePOMLocation.java | 4 ++--
...mng6772NestedImportScopeRepositoryOverride.java | 6 +++---
.../maven/it/AbstractMavenIntegrationTestCase.java | 8 ++++----
10 files changed, 36 insertions(+), 32 deletions(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
index 93e1cf9ab..5370c8bf1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
@@ -74,7 +74,10 @@ public class MavenITmng5530MojoExecutionScopeTest
// build the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
- verifier.getCliOptions().add( "--builder multithreaded -T 1" );
+ verifier.addCliOption( "--builder" );
+ verifier.addCliOption( "multithreaded" );
+ verifier.addCliOption( "-T" );
+ verifier.addCliOption( "1" );
verifier.executeGoal( "package" );
verifier.resetStreams();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
index 933ee9065..17339cc18 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
@@ -29,8 +29,8 @@ public class MavenITmng5771CoreExtensionsTest
verifier = newVerifier( new File( testDir, "client" ).getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.it-core-extensions" );
- verifier.getCliOptions().add( "-s" );
- verifier.getCliOptions().add( new File( testDir, "settings.xml" ).getAbsolutePath() );
+ verifier.addCliOption( "-s" );
+ verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -47,8 +47,8 @@ public class MavenITmng5771CoreExtensionsTest
verifier = newVerifier( new File( testDir, "client-no-descriptor" ).getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.it-core-extensions" );
- verifier.getCliOptions().add( "-s" );
- verifier.getCliOptions().add( new File( testDir, "settings.xml" ).getAbsolutePath() );
+ verifier.addCliOption( "-s" );
+ verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -90,8 +90,8 @@ public class MavenITmng5771CoreExtensionsTest
verifier = newVerifier( new File( testDir, "client" ).getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.it-core-extensions" );
- verifier.getCliOptions().add( "-s" );
- verifier.getCliOptions().add( new File( testDir, "settings.xml" ).getAbsolutePath() );
+ verifier.addCliOption( "-s" );
+ verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -115,9 +115,9 @@ public class MavenITmng5771CoreExtensionsTest
verifier = newVerifier( new File( testDir, "client-properties" ).getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.it-core-extensions" );
- verifier.getCliOptions().add( "-s" );
- verifier.getCliOptions().add( new File( testDir, "settings.xml" ).getAbsolutePath() );
- verifier.getCliOptions().add( "-Dtest-extension-version=0.1" );
+ verifier.addCliOption( "-s" );
+ verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
+ verifier.addCliOption( "-Dtest-extension-version=0.1" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -139,8 +139,8 @@ public class MavenITmng5771CoreExtensionsTest
verifier = newVerifier( new File( testDir, "client-config" ).getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.it-core-extensions" );
- verifier.getCliOptions().add( "-s" );
- verifier.getCliOptions().add( new File( testDir, "settings.xml" ).getAbsolutePath() );
+ verifier.addCliOption( "-s" );
+ verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
verifier.setForkJvm( true ); // force forked JVM since we need the shell script to detect .mvn/
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java
index 9e44a4b8c..2278bc9c1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java
@@ -24,8 +24,8 @@ public class MavenITmng5774ConfigurationProcessorsTest
verifier = newVerifier( new File( testDir, "build-with-one-processor-valid" ).getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.it-configuration-processors" );
- verifier.getCliOptions().add( "-s" );
- verifier.getCliOptions().add( new File( testDir, "settings.xml" ).getAbsolutePath() );
+ verifier.addCliOption( "-s" );
+ verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
verifier.executeGoal( "process-resources" );
verifier.verifyErrorFreeLog();
// Making sure our configuration processor executes
@@ -48,8 +48,8 @@ public class MavenITmng5774ConfigurationProcessorsTest
verifier = newVerifier( new File( testDir, "build-with-two-processors-invalid" ).getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.it-configuration-processors" );
- verifier.getCliOptions().add( "-s" );
- verifier.getCliOptions().add( new File( testDir, "settings.xml" ).getAbsolutePath() );
+ verifier.addCliOption( "-s" );
+ verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
try
{
verifier.executeGoal( "process-resources" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java
index e06be7c04..7eef97633 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java
@@ -107,9 +107,9 @@ public class MavenITmng5889FindBasedir
}
Verifier verifier = newVerifier( basedir.getAbsolutePath() );
- verifier.getCliOptions().add( "-Dexpression.outputFile=" + new File( basedir, "expression.properties" ).getAbsolutePath() );
- verifier.getCliOptions().add( option ); // -f/--file client/pom.xml
- verifier.getCliOptions().add( ( pom ? new File( testDir, "pom.xml" ) : testDir ).getAbsolutePath() );
+ verifier.addCliOption( "-Dexpression.outputFile=" + new File( basedir, "expression.properties" ).getAbsolutePath() );
+ verifier.addCliOption( option ); // -f/--file client/pom.xml
+ verifier.addCliOption( ( pom ? new File( testDir, "pom.xml" ) : testDir ).getAbsolutePath() );
verifier.setForkJvm( true ); // force forked JVM since we need the shell script to detect .mvn/ location
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java
index 120b38c8f..90052b6d9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java
@@ -29,7 +29,8 @@ public class MavenITmng6071GetResourceWithCustomPom
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6071" );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.getCliOptions().add( "-f ./pom.xml" );
+ verifier.addCliOption( "-f" );
+ verifier.addCliOption( "./pom.xml" );
verifier.setForkJvm( true );
verifier.executeGoal( "verify" );
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java
index d1231667a..e28f5f35e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java
@@ -48,8 +48,8 @@ public class MavenITmng6210CoreExtensionsCustomScopesTest
verifier = newVerifier( new File( testDir, "client" ).getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.it-core-extensions-custom-scopes" );
- verifier.getCliOptions().add( "-s" );
- verifier.getCliOptions().add( new File( testDir, "settings.xml" ).getAbsolutePath() );
+ verifier.addCliOption( "-s" );
+ verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java
index 4fa7ed4d8..f2aeb8b69 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java
@@ -91,7 +91,7 @@ public class MavenITmng6255FixConcatLines
createJvmConfigFile( jvmConfig, lineEndings, "-Djvm.config=ok", "-Xms256m", "-Xmx512m" );
Verifier verifier = newVerifier( baseDir.getAbsolutePath() );
- verifier.getCliOptions().add( "-Dexpression.outputFile=" + new File( baseDir, "expression.properties" ).getAbsolutePath() );
+ verifier.addCliOption( "-Dexpression.outputFile=" + new File( baseDir, "expression.properties" ).getAbsolutePath() );
verifier.setForkJvm( true );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java
index 76cabe5a3..1cb77fa34 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java
@@ -87,8 +87,8 @@ public class MavenITmng6256SpecialCharsAlternatePOMLocation
testDir.mkdir();
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.getCliOptions().add( option ); // -f/--file
- verifier.getCliOptions().add( "\"" + new File( resourceDir, subDir ).getAbsolutePath() + "\"" ); // "<path>"
+ verifier.addCliOption( option ); // -f/--file
+ verifier.addCliOption( "\"" + new File( resourceDir, subDir ).getAbsolutePath() + "\"" ); // "<path>"
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java
index 6d0ee3579..76a7451ab 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java
@@ -100,14 +100,14 @@ public class MavenITmng6772NestedImportScopeRepositoryOverride
{
final File settingsFile = new File( testDir, "settings-override.xml" );
final String path = settingsFile.getAbsolutePath();
- verifier.getCliOptions().add( "--global-settings" );
+ verifier.addCliOption( "--global-settings" );
if ( path.indexOf( ' ' ) < 0 )
{
- verifier.getCliOptions().add( path );
+ verifier.addCliOption( path );
}
else
{
- verifier.getCliOptions().add( '"' + path + '"' );
+ verifier.addCliOption( '"' + path + '"' );
}
}
diff --git a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
index 7586377d3..e1e4df43c 100644
--- a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
+++ b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
@@ -571,14 +571,14 @@ public abstract class AbstractMavenIntegrationTestCase
// dedicated CLI option only available since MNG-3914
if ( matchesVersionRange( "[2.1.0,)" ) )
{
- verifier.getCliOptions().add( "--global-settings" );
+ verifier.addCliOption( "--global-settings" );
if ( path.indexOf( ' ' ) < 0 )
{
- verifier.getCliOptions().add( path );
+ verifier.addCliOption( path );
}
else
{
- verifier.getCliOptions().add( '"' + path + '"' );
+ verifier.addCliOption( '"' + path + '"' );
}
}
else
@@ -592,7 +592,7 @@ public abstract class AbstractMavenIntegrationTestCase
// Java7 TLS protocol
if ( VersionRange.createFromVersionSpec( "(,1.8.0)" ).containsVersion( getJavaVersion() ) )
{
- verifier.getCliOptions().add( "-Dhttps.protocols=TLSv1.2" );
+ verifier.addCliOption( "-Dhttps.protocols=TLSv1.2" );
}
// auto set source+target to lowest reasonable java version