Author: brett
Date: Fri Jul 11 09:57:03 2014
New Revision: 1609661

URL: http://svn.apache.org/r1609661
Log:
allow tests to run without a specified version

Modified:
    
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.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=1609661&r1=1609660&r2=1609661&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 09:57:03 2014
@@ -89,6 +89,11 @@ public abstract class AbstractNPandayInt
 
     protected static boolean checkNPandayVersion( VersionRange versionRange, 
DefaultArtifactVersion version )
     {
+        if (version == null) {
+            // run all tests
+            return true;
+        }
+
         String v = version.toString();
 
         Matcher m = PATTERN.matcher(v);
@@ -295,7 +300,9 @@ public abstract class AbstractNPandayInt
             verifier = new Verifier( testDirectory.getAbsolutePath() );
         }
         List<String> cliOptions = new ArrayList<String>( 2 );
-        cliOptions.add( "-Dnpanday.version=" + version );
+        if (version != null) {
+            cliOptions.add( "-Dnpanday.version=" + version );
+        }
         if (overrideNPandaySettings) {
             cliOptions.add( "-Dnpanday.settings=" + new File( testDirectory, 
"npanday-settings.xml" ).getAbsolutePath() );
         }


Reply via email to