You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2015/04/02 15:03:20 UTC

maven-integration-testing git commit: Only run the mirror-auth test for 3.3.2+

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master b3a9ea084 -> 445dbb937


Only run the mirror-auth test for 3.3.2+


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/445dbb93
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/445dbb93
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/445dbb93

Branch: refs/heads/master
Commit: 445dbb937e3c8a3d1fa98132d302b91bfbaf051d
Parents: b3a9ea0
Author: Jason van Zyl <ja...@tesla.io>
Authored: Thu Apr 2 09:03:05 2015 -0400
Committer: Jason van Zyl <ja...@tesla.io>
Committed: Thu Apr 2 09:03:05 2015 -0400

----------------------------------------------------------------------
 .../it/MavenITmng5771CoreExtensionsTest.java    | 40 +++++++++++---------
 1 file changed, 23 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/445dbb93/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
----------------------------------------------------------------------
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 41dad74..be055ba 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
@@ -31,9 +31,32 @@ public class MavenITmng5771CoreExtensionsTest
         verifier.resetStreams();
     }
 
+    public void testCoreExtensionNoDescriptor()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5771-core-extensions" );
+
+        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+        verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+
+        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.executeGoal( "validate" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+    }
+    
+    //
+    // https://jira.codehaus.org/browse/MNG-5795: Maven extensions can not be retrieved from authenticated repositories
+    //
     public void testCoreExtensionRetrievedFromAMirrorWithBasicAuthentication()
         throws Exception
     {
+        requiresMavenVersion( "[3.3.2-SNAPSHOT,)" );
+
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5771-core-extensions" );
 
         HttpServer server = HttpServer.builder() //
@@ -61,22 +84,5 @@ public class MavenITmng5771CoreExtensionsTest
         server.stop();
     }
     
-    public void testCoreExtensionNoDescriptor()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5771-core-extensions" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-
-        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.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-    }
 
 }