svn commit: r1608849 - 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: Tue Jul  8 16:57:24 2014
New Revision: 1608849

URL: http://svn.apache.org/r1608849
Log:
repair custom settings tests

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=1608849&r1=1608848&r2=1608849&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
 Tue Jul  8 16:57:24 2014
@@ -275,7 +275,12 @@ public abstract class AbstractNPandayInt
         return simpleName;
     }
 
-    protected Verifier getVerifier( File testDirectory )
+    protected Verifier getVerifier(File testDirectory)
+        throws VerificationException {
+        return getVerifier(testDirectory, true);
+    }
+
+    protected Verifier getVerifier(File testDirectory, boolean 
overrideNPandaySettings)
         throws VerificationException
     {
         Verifier verifier;
@@ -291,7 +296,9 @@ public abstract class AbstractNPandayInt
         }
         List<String> cliOptions = new ArrayList<String>( 2 );
         cliOptions.add( "-Dnpanday.version=" + version );
-        cliOptions.add( "-Dnpanday.settings=" + new File( testDirectory, 
"npanday-settings.xml" ).getAbsolutePath() );
+        if (overrideNPandaySettings) {
+            cliOptions.add( "-Dnpanday.settings=" + new File( testDirectory, 
"npanday-settings.xml" ).getAbsolutePath() );
+        }
         if ( debugOutput )
         {
             cliOptions.add( "-X" );

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=1608849&r1=1608848&r2=1608849&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
 Tue Jul  8 16:57:24 2014
@@ -36,7 +36,7 @@ public class NPANDAY_377_WithCustomNPand
         throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), 
"/NPANDAY_377_WithCustomNPandaySettingsDirectoryTest" );
-        Verifier verifier = getVerifier( testDir );
+        Verifier verifier = getVerifier( testDir, false );
         verifier.executeGoal( "install" );
         verifier.assertFilePresent( new File( testDir, 
"NPANDAY_377_WithCustomNPandaySettingsDirectoryTest/" +
             getAssemblyFile( 
"NPANDAY377WithCustomNPandaySettingsDirectoryTest", "1.0.0", "dll" ) 
).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=1608849&r1=1608848&r2=1608849&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
 Tue Jul  8 16:57:24 2014
@@ -36,7 +36,7 @@ public class NPANDAY_377_WithCustomNPand
         throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), 
"/NPANDAY_377_WithCustomNPandaySettingsFileTest" );
-        Verifier verifier = getVerifier( testDir );
+        Verifier verifier = getVerifier( testDir, false );
         verifier.executeGoal( "install" );
         verifier.assertFilePresent( new File( testDir, 
"NPANDAY_377_WithCustomNPandaySettingsFileTest/" +
             getAssemblyFile( "NPANDAY377WithCustomNPandaySettingsFileTest", 
"1.0.0", "dll" ) ).getAbsolutePath() );