Fix ITs when the build is launched with a custom maven.repo.local set on the CLI.

Guillaume Boué · Guillaume Boué · commit 83f324b50805 · 2017-06-17T21:02:49.000Z
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1799022 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven-remote-resources-plugin/pom.xml b/maven-remote-resources-plugin/pom.xml
@@ -350,8 +350,12 @@ under the License.
                 </goals>
                 <configuration>
                   <systemPropertyVariables>
-                    <!-- Pass this through to the tests (if set!) to have them pick the right repository -->
-                    <maven.repo.local>${project.build.directory}/it-repo</maven.repo.local>
+                    <!--
+                      The tests have to pick the right repository.
+                      SUREFIRE-1385: Cannot set maven.repo.local directly because it might have been set by the user 
+                      on the CLI directly (and it would be preferred)
+                    -->
+                    <localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
                   </systemPropertyVariables>
                 </configuration>
               </execution>
diff --git a/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java b/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java
@@ -40,9 +40,7 @@ public void test()
     {
         File dir = TestUtils.getTestDir( "bad-dependency-poms" );
 
-        Verifier verifier;
-
-        verifier = new Verifier( dir.getAbsolutePath() );
+        Verifier verifier = TestUtils.newVerifier( dir );
         verifier.deleteArtifacts( "test" );
         verifier.getSystemProperties().setProperty( "it.dir", dir.getAbsolutePath() );
         
diff --git a/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java b/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java
@@ -36,7 +36,7 @@ public void test()
         throws IOException, URISyntaxException, VerificationException
     {
         File dir = TestUtils.getTestDir( "custom-filter-delim" );
-        Verifier verifier = new Verifier( dir.getAbsolutePath() );
+        Verifier verifier = TestUtils.newVerifier( dir );
         
         verifier.getCliOptions().add( "-X" );
         
diff --git a/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java b/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java
@@ -36,7 +36,7 @@ public void test()
         throws IOException, URISyntaxException, VerificationException
     {
         File dir = TestUtils.getTestDir( "filter-local-override" );
-        Verifier verifier = new Verifier( dir.getAbsolutePath() );
+        Verifier verifier = TestUtils.newVerifier( dir );
         
         verifier.executeGoal( "generate-resources" );
         verifier.verifyErrorFreeLog();
diff --git a/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java b/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java
@@ -36,7 +36,7 @@ public void test()
         throws IOException, URISyntaxException, VerificationException
     {
         File dir = TestUtils.getTestDir( "generate-from-bundle" );
-        Verifier verifier = new Verifier( dir.getAbsolutePath() );
+        Verifier verifier = TestUtils.newVerifier( dir );
         
         verifier.executeGoal( "generate-resources" );
         verifier.verifyErrorFreeLog();
diff --git a/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java b/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java
@@ -36,7 +36,7 @@ public void test()
         throws IOException, URISyntaxException, VerificationException
     {
         File dir = TestUtils.getTestDir( "generate-from-bundle-with-type-and-classifier" );
-        Verifier verifier = new Verifier( dir.getAbsolutePath() );
+        Verifier verifier = TestUtils.newVerifier( dir );
         
         verifier.executeGoal( "generate-resources" );
         verifier.verifyErrorFreeLog();
diff --git a/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java b/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java
@@ -36,7 +36,7 @@ public void test()
         throws IOException, URISyntaxException, VerificationException
     {
         File dir = TestUtils.getTestDir( "generate-from-override" );
-        Verifier verifier = new Verifier( dir.getAbsolutePath() );
+        Verifier verifier = TestUtils.newVerifier( dir );
         
         verifier.executeGoal( "generate-resources" );
         verifier.verifyErrorFreeLog();
diff --git a/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GetDependencyProjects.java b/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GetDependencyProjects.java
@@ -42,12 +42,12 @@ public void test()
 
         Verifier verifier;
 
-        verifier = new Verifier( dir.getAbsolutePath() );
+        verifier = TestUtils.newVerifier( dir );
         verifier.executeGoal( "deploy" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        verifier = new Verifier( new File( dir, "project" ).getAbsolutePath() );
+        verifier = TestUtils.newVerifier( new File( dir, "project" ) );
 
         verifier.deleteArtifacts( "org.apache.maven.plugin.rresource.it.gdp" );
 
diff --git a/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java b/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java
@@ -42,12 +42,12 @@ public void test()
 
         Verifier verifier;
 
-        verifier = new Verifier( new File( dir, "resource-projects" ).getAbsolutePath() );
+        verifier = TestUtils.newVerifier( new File( dir, "resource-projects" ) );
         verifier.executeGoal( "deploy" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        verifier = new Verifier( dir.getAbsolutePath() );
+        verifier = TestUtils.newVerifier( dir );
 
         // I'm not sure what exactly the intention of the test was.
         // Based on the name i assumed to be sure the remote-resources-plugin
diff --git a/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java b/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java
@@ -43,15 +43,15 @@ public void test()
 
         Verifier verifier;
 
-        verifier = new Verifier( resources.getAbsolutePath() );
+        verifier = TestUtils.newVerifier( resources );
         
         verifier.deleteArtifacts( "org.apache.maven.plugin.rresource.it.mrr43" );
 
         verifier.executeGoal( "deploy" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        verifier = new Verifier( dir.getAbsolutePath() );
+        verifier = TestUtils.newVerifier( dir );
 
         verifier.executeGoal( "generate-resources" );
         verifier.verifyErrorFreeLog();
diff --git a/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/support/BootstrapInstaller.java b/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/support/BootstrapInstaller.java
@@ -38,7 +38,7 @@ public static void install()
         {
             File bootstrapDir = TestUtils.getTestDir( "bootstrap" );
             
-            Verifier verifier = new Verifier( bootstrapDir.getAbsolutePath() );
+            Verifier verifier = TestUtils.newVerifier( bootstrapDir );
             
             verifier.executeGoal( "deploy" );
             
diff --git a/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/support/TestUtils.java b/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/support/TestUtils.java
@@ -25,6 +25,9 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+
 public class TestUtils
 {
     public static File getTestDir( final String name )
@@ -53,4 +56,13 @@ public static File getBaseDir()
             return result.getAbsoluteFile();
         }
     }
+
+    public static Verifier newVerifier( File dir )
+        throws VerificationException
+    {
+        Verifier verifier = new Verifier( dir.getAbsolutePath() );
+        verifier.setLocalRepo( System.getProperty( "localRepositoryPath" ) );
+        return verifier;
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,7 @@ public void test()`
`40`	`40`	`{`
`41`	`41`	`File dir = TestUtils.getTestDir( "bad-dependency-poms" );`
`42`	`42`
`43`		`- Verifier verifier;`
`44`		`-`
`45`		`- verifier = new Verifier( dir.getAbsolutePath() );`
	`43`	`+ Verifier verifier = TestUtils.newVerifier( dir );`
`46`	`44`	`verifier.deleteArtifacts( "test" );`
`47`	`45`	`verifier.getSystemProperties().setProperty( "it.dir", dir.getAbsolutePath() );`
`48`	`46`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public void test()`
`36`	`36`	`throws IOException, URISyntaxException, VerificationException`
`37`	`37`	`{`
`38`	`38`	`File dir = TestUtils.getTestDir( "custom-filter-delim" );`
`39`		`- Verifier verifier = new Verifier( dir.getAbsolutePath() );`
	`39`	`+ Verifier verifier = TestUtils.newVerifier( dir );`
`40`	`40`
`41`	`41`	`verifier.getCliOptions().add( "-X" );`
`42`	`42`