svn commit: r1609684 - in /incubator/npanday/npanday-its/trunk/src/test/java/npanday/its: AbstractNPandayIntegrationTestCase.java NPANDAY_377_WithCustomNPandaySettingsDirectoryTest.java NPANDAY_377_WithCustomNPandaySettingsFileTest.java

[brett]

Author: brett
Date: Fri Jul 11 10:45:44 2014
New Revision: 1609684

URL: http://svn.apache.org/r1609684
Log:
fix npanday-settings.xml override which was accidentally inverted

Modified:
    
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
    
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_377_WithCustomNPandaySettingsDirectoryTest.java
    
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_377_WithCustomNPandaySettingsFileTest.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=1609684&r1=1609683&r2=1609684&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:45:44 2014
@@ -92,7 +92,7 @@ public abstract class AbstractNPandayInt
     {
         VersionRange versionRange = createVersionRange(versionRangeStr);
 
-        if ( !checkNPandayVersion( versionRange, version ) && !forceVersion )
+        if ( !checkNPandayVersion(versionRange, version) && !forceVersion )
         {
             skip = true;
             skipReason = "NPanday version " + version + " not in range " + 
versionRange;
@@ -289,6 +289,11 @@ public abstract class AbstractNPandayInt
 
     protected Verifier getVerifier(File testDirectory)
         throws VerificationException, IOException {
+        return getVerifier(testDirectory, true);
+    }
+
+    protected Verifier getVerifier(File testDirectory, boolean 
overrideNPandaySettings)
+        throws VerificationException, IOException {
         if ( verifier != null ) {
             throw new IllegalStateException( "Previous verifier has not been 
reset - call resetVerifier()" );
         }
@@ -311,6 +316,12 @@ public abstract class AbstractNPandayInt
         {
             cliOptions.add( "-X" );
         }
+
+        if (overrideNPandaySettings) {
+            cliOptions.add("-Dnpanday.settings=" +
+                    new File(verifier.getBasedir(), 
"npanday-settings.xml").getAbsolutePath());
+        }
+
         verifier.setCliOptions( cliOptions );
 
         verifier.deleteArtifacts(context.getGroupId());
@@ -318,11 +329,6 @@ public abstract class AbstractNPandayInt
         return verifier;
     }
 
-    protected static void overrideNPandaySettings( Verifier verifier ) {
-        verifier.getCliOptions().add("-Dnpanday.settings=" +
-                new File(verifier.getBasedir(), 
"npanday-settings.xml").getAbsolutePath());
-    }
-
     protected void resetVerifier() {
         verifier.resetStreams();
         verifier = null;

Modified: 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_377_WithCustomNPandaySettingsDirectoryTest.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_377_WithCustomNPandaySettingsDirectoryTest.java?rev=1609684&r1=1609683&r2=1609684&view=diff
==============================================================================
--- 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_377_WithCustomNPandaySettingsDirectoryTest.java
 (original)
+++ 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_377_WithCustomNPandaySettingsDirectoryTest.java
 Fri Jul 11 10:45:44 2014
@@ -34,10 +34,9 @@ public class NPANDAY_377_WithCustomNPand
     public void test()
         throws Exception
     {
-        Verifier verifier = getDefaultVerifier();
-        String testDir = verifier.getBasedir();
-        overrideNPandaySettings( verifier );
-        verifier.executeGoal( "install" );
+        File testDir = context.getTestDir();
+        Verifier verifier = getVerifier(testDir, false);
+        verifier.executeGoal("install");
         verifier.assertFilePresent( new File( testDir, 
"NPANDAY_377_WithCustomNPandaySettingsDirectoryTest/" +
             getAssemblyFile( 
"NPANDAY377WithCustomNPandaySettingsDirectoryTest", "1.0.0", "dll" ) 
).getAbsolutePath() );
         verifier.assertFilePresent( new File( testDir, 
"NPANDAY_377_WithCustomNPandaySettingsDirectoryTest/npanday-settings.xml" 
).getAbsolutePath() );

Modified: 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_377_WithCustomNPandaySettingsFileTest.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_377_WithCustomNPandaySettingsFileTest.java?rev=1609684&r1=1609683&r2=1609684&view=diff
==============================================================================
--- 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_377_WithCustomNPandaySettingsFileTest.java
 (original)
+++ 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_377_WithCustomNPandaySettingsFileTest.java
 Fri Jul 11 10:45:44 2014
@@ -34,9 +34,8 @@ public class NPANDAY_377_WithCustomNPand
     public void test()
         throws Exception
     {
-        Verifier verifier = getDefaultVerifier();
-        String testDir = verifier.getBasedir();
-        overrideNPandaySettings( verifier );
+        File testDir = context.getTestDir();
+        Verifier verifier = getVerifier(testDir, false);
         verifier.executeGoal( "install" );
         verifier.assertFilePresent( new File( testDir, 
"NPANDAY_377_WithCustomNPandaySettingsFileTest/" +
             getAssemblyFile( "NPANDAY377WithCustomNPandaySettingsFileTest", 
"1.0.0", "dll" ) ).getAbsolutePath() );