commit 2d7cf0e23aec2eb9480a4b00d724a53bbe6132cb
author Brett Porter <brett@apache.org> Fri Jul 11 10:45:44 2014 +0000
committer Brett Porter <brett@apache.org> Fri Jul 11 10:45:44 2014 +0000
tree 40ec89bb347a961f97fd43f2dad2d0d1f88b3af9
parent e01d11b69c810cc4bf0a610919e4cb29f8d2f87a

fix npanday-settings.xml override which was accidentally inverted

git-svn-id: https://svn.apache.org/repos/asf/incubator/npanday/npanday-its/trunk@1609684 13f79535-47bb-0310-9956-ffa450edef68

src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java

diff --git a/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java b/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
index bb2e419..aa817c0 100644
--- a/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
+++ b/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
@@ -92,7 +92,7 @@
     {
         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 @@
 
     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 @@
         {
             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 @@
         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;

src/test/java/npanday/its/NPANDAY_377_WithCustomNPandaySettingsDirectoryTest.java

diff --git a/src/test/java/npanday/its/NPANDAY_377_WithCustomNPandaySettingsDirectoryTest.java b/src/test/java/npanday/its/NPANDAY_377_WithCustomNPandaySettingsDirectoryTest.java
index 1ae1c6a..6f90f06 100644
--- a/src/test/java/npanday/its/NPANDAY_377_WithCustomNPandaySettingsDirectoryTest.java
+++ b/src/test/java/npanday/its/NPANDAY_377_WithCustomNPandaySettingsDirectoryTest.java
@@ -34,10 +34,9 @@
     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() );

src/test/java/npanday/its/NPANDAY_377_WithCustomNPandaySettingsFileTest.java

diff --git a/src/test/java/npanday/its/NPANDAY_377_WithCustomNPandaySettingsFileTest.java b/src/test/java/npanday/its/NPANDAY_377_WithCustomNPandaySettingsFileTest.java
index e826a4d..0cae1a5 100644
--- a/src/test/java/npanday/its/NPANDAY_377_WithCustomNPandaySettingsFileTest.java
+++ b/src/test/java/npanday/its/NPANDAY_377_WithCustomNPandaySettingsFileTest.java
@@ -34,9 +34,8 @@
     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() );