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 15:30:20 UTC
[maven-integration-testing] branch master updated: Remove remaining reference to verifier.getCliOptions() (#198)
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 3a8468e05 Remove remaining reference to verifier.getCliOptions() (#198)
3a8468e05 is described below
commit 3a8468e051fd6657c2cb8072c067bc3c21e4a078
Author: Guillaume Nodet <gn...@apache.org>
AuthorDate: Fri Sep 9 17:30:14 2022 +0200
Remove remaining reference to verifier.getCliOptions() (#198)
---
.../MavenITmng4189UniqueVersionSnapshotTest.java | 29 ++++++++++++++--------
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
index 378e135f2..b076247d9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
@@ -42,44 +42,53 @@ public class MavenITmng4189UniqueVersionSnapshotTest
public void testit()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4189" );
+ final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4189" );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.setAutoclean( false );
- verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4189" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.addCliOption( "--settings" );
- verifier.addCliOption( "settings.xml" );
// depend on org.apache.maven.its.mng4189:dep:1.0-20090608.090416-1:jar
+ verifier = newVerifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.addCliOption( "--settings" );
+ verifier.addCliOption( "settings.xml" );
verifier.setLogFileName( "log-1.txt" );
verifier.executeGoal( "validate" );
- verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+ verifier.verifyErrorFreeLog();
Properties checksums = verifier.loadProperties( "target/checksum.properties" );
assertEquals( "da2e54f69a9ba120f9211c476029f049967d840c", checksums.getProperty( "dep-1.0-SNAPSHOT.jar" ) );
// depend on org.apache.maven.its.mng4189:dep:1.0-20090608.090416-2:jar
+ verifier = newVerifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
+ verifier.addCliOption( "--settings" );
+ verifier.addCliOption( "settings.xml" );
verifier.addCliOption( "-f" );
verifier.addCliOption( "dependent-on-newer-timestamp-pom.xml" );
verifier.setLogFileName( "log-2.txt" );
verifier.executeGoal( "validate" );
- verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+ verifier.verifyErrorFreeLog();
checksums = verifier.loadProperties( "target/checksum.properties" );
assertEquals( "835979c28041014c5fd55daa15302d92976924a7", checksums.getProperty( "dep-1.0-SNAPSHOT.jar" ) );
// revert back to org.apache.maven.its.mng4189:dep:1.0-20090608.090416-1:jar
+ verifier = newVerifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.getCliOptions().remove( "-f" );
- verifier.getCliOptions().remove( "dependent-on-newer-timestamp-pom.xml" );
+ verifier.addCliOption( "--settings" );
+ verifier.addCliOption( "settings.xml" );
verifier.setLogFileName( "log-3.txt" );
verifier.executeGoal( "validate" );
- verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ verifier.verifyErrorFreeLog();
checksums = verifier.loadProperties( "target/checksum.properties" );
assertEquals( "da2e54f69a9ba120f9211c476029f049967d840c", checksums.getProperty( "dep-1.0-SNAPSHOT.jar" ) );
}