svn commit: r1609667 - in /incubator/npanday/npanday-its/trunk/src/test/java/npanday/its: AbstractNPandayIntegrationTestCase.java NPandayIT0028RemoteSnapshotRepoTest.java

[brett]

Author: brett
Date: Fri Jul 11 10:03:02 2014
New Revision: 1609667

URL: http://svn.apache.org/r1609667
Log:
skip test only valid on Maven 2 if running newer

Modified:
    
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
    
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0028RemoteSnapshotRepoTest.java

Modified: 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java?rev=1609667&r1=1609666&r2=1609667&view=diff
==============================================================================
--- 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
 (original)
+++ 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
 Fri Jul 11 10:03:02 2014
@@ -40,10 +40,8 @@ import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -57,6 +55,8 @@ public abstract class AbstractNPandayInt
     protected static final String FRAMEWORK_V2_0 = "v2.0.50727";
     protected static final String FRAMEWORK_V1_1 = "v1.1";
 
+    private static String mavenVersion;
+
     protected boolean skip;
 
     protected String skipReason;
@@ -726,6 +726,26 @@ public abstract class AbstractNPandayInt
         }
     }
 
+    protected void skipIfMavenVersion(String versionSpec) throws 
InvalidVersionSpecificationException, VerificationException {
+        VersionRange range = VersionRange.createFromVersionSpec( versionSpec );
+        String mavenVersion = findMavenVersion();
+        if (range.containsVersion(new DefaultArtifactVersion(mavenVersion))) {
+            skipReason = "Skipping because Maven version " + mavenVersion + " 
is in range " + versionSpec;
+            skip = true;
+        }
+    }
+
+    private static String findMavenVersion() {
+        if (mavenVersion == null) {
+            try {
+                mavenVersion = new Verifier("").getMavenVersion();
+            } catch (VerificationException e) {
+                throw new RuntimeException(e.getMessage(), e);
+            }
+        }
+        return mavenVersion;
+    }
+
     protected void skipIfXdtNotPresent()
     {
         File f = new File( System.getenv( "PROGRAMFILES" ), "MSBuild" );

Modified: 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0028RemoteSnapshotRepoTest.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0028RemoteSnapshotRepoTest.java?rev=1609667&r1=1609666&r2=1609667&view=diff
==============================================================================
--- 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0028RemoteSnapshotRepoTest.java
 (original)
+++ 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0028RemoteSnapshotRepoTest.java
 Fri Jul 11 10:03:02 2014
@@ -19,17 +19,18 @@ package npanday.its;
  * under the License.
  */
 
+import 
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.VerificationException;
 import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
 
 public class NPandayIT0028RemoteSnapshotRepoTest
     extends AbstractNPandayIntegrationTestCase
 {
-    public NPandayIT0028RemoteSnapshotRepoTest()
-    {
-        super( "[1.0.2,)" );
+    public NPandayIT0028RemoteSnapshotRepoTest() throws VerificationException, 
InvalidVersionSpecificationException {
+        super("[1.0.2,)");
+        skipIfMavenVersion( "[3.0,)" );
     }
 
     public void testSnapDeploymentRemoteRepoNotUnique()
@@ -43,7 +44,7 @@ public class NPandayIT0028RemoteSnapshot
         String path =
             
"target/remoteSnapshotRepo/snapshots/NPandayIT0028/NPandayIT0028/1.0-SNAPSHOT/NPandayIT0028-1.0-SNAPSHOT";
         verifier.assertFilePresent( new File( testDir, path + ".dll" 
).getAbsolutePath() );
-        verifier.assertFilePresent( new File( testDir, path + ".pom" 
).getAbsolutePath() );
+        verifier.assertFilePresent(new File(testDir, path + 
".pom").getAbsolutePath());
         verifier.verifyErrorFreeLog();
     }
 }