Remove remaining reference to verifier.getCliOptions() (#198)

apache · Sep 9, 2022 · 3a8468e · 3a8468e
1 parent f1118d8
commit 3a8468e
Showing 1 changed file with 19 additions and 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
@@ -42,44 +42,53 @@ public 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" ) );
     }