svn commit: r1390287 - in /incubator/npanday/npanday-its/trunk/src/test/java/npanday/its: AbstractNPandayIntegrationTestCase.java NPandayIT0036InstalledArtifactsVerificationTest.java

[brett]

Author: brett
Date: Wed Sep 26 05:49:15 2012
New Revision: 1390287

URL: http://svn.apache.org/viewvc?rev=1390287&view=rev
Log:
update test now that sources are not necessarily copied to
target/build-sources

Modified:
    
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
    
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0036InstalledArtifactsVerificationTest.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=1390287&r1=1390286&r2=1390287&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
 Wed Sep 26 05:49:15 2012
@@ -310,24 +310,9 @@ public abstract class AbstractNPandayInt
         return "target/comments.xml";
     }
 
-    protected String getBuildSourcesMain( String fileName )
-    {
-        return getBuildFile( "build-sources", fileName );
-    }
-
     protected String getBuildSourcesGenerated( String fileName )
     {
-        return getBuildSourcesMain( fileName );
-    }
-
-    protected String getTestSourcesMain( String fileName )
-    {
-        return getBuildFile( "build-test-sources", fileName );
-    }
-
-    protected String getTestSourcesGenerated( String fileName )
-    {
-        return getTestSourcesMain( fileName );
+        return getBuildFile( "build-sources", fileName );
     }
 
     protected String getBuildFile( String buildDirectory, String fileName )

Modified: 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0036InstalledArtifactsVerificationTest.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0036InstalledArtifactsVerificationTest.java?rev=1390287&r1=1390286&r2=1390287&view=diff
==============================================================================
--- 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0036InstalledArtifactsVerificationTest.java
 (original)
+++ 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0036InstalledArtifactsVerificationTest.java
 Wed Sep 26 05:49:15 2012
@@ -38,8 +38,9 @@ public class NPandayIT0036InstalledArtif
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), 
"/NPandayIT0036InstalledArtifactsVerificationTest" );
         Verifier verifier = getVerifier( testDir );
         verifier.executeGoal( "install" );
-        verifier.assertFilePresent(
-            new File( testDir, getAssemblyFile( "NPandayIT0036", "1.0.0.0", 
"exe" ) ).getAbsolutePath() );
+        String exe =
+            new File( testDir, getAssemblyFile( "NPandayIT0036", "1.0.0.0", 
"exe" ) ).getAbsolutePath();
+        verifier.assertFilePresent( exe );
         verifier.assertFilePresent(
             new File( testDir, getAssemblyFile( "NPandayIT0036-test", 
"1.0.0.0", "dll" ) ).getAbsolutePath() );
         verifier.assertFilePresent( new File( testDir, getAssemblyFile( 
"test-assemblies/NPandayIT0036", "1.0.0.0",
@@ -49,27 +50,8 @@ public class NPandayIT0036InstalledArtif
         verifier.assertFilePresent( new File( testDir, getAssemblyFile( 
"test-assemblies/NUnit.Framework", "1.0.0.0",
                                                                         "dll" 
) ).getAbsolutePath() );
 
-        verifier.assertFilePresent( new File( testDir, getBuildSourcesMain( 
"Module1.vb" ) ).getAbsolutePath() );
-        verifier.assertFilePresent( new File( testDir, getBuildSourcesMain( 
"folder/Module2.vb" ) ).getAbsolutePath() );
-        verifier.assertFileNotPresent(
-            new File( testDir, getBuildSourcesMain( "should-not-be-copied.txt" 
) ).getAbsolutePath() );
-        verifier.assertFileNotPresent(
-            new File( testDir, getBuildSourcesMain( "should-not-be-copied.xml" 
) ).getAbsolutePath() );
-        verifier.assertFileNotPresent(
-            new File( testDir, getBuildSourcesMain( 
"folder/should-not-be-copied-2.txt" ) ).getAbsolutePath() );
-        verifier.assertFileNotPresent(
-            new File( testDir, getBuildSourcesMain( 
"folder/should-not-be-copied-2.xml" ) ).getAbsolutePath() );
-
-        verifier.assertFilePresent( new File( testDir, getTestSourcesMain( 
"Module1.vb" ) ).getAbsolutePath() );
-        verifier.assertFilePresent( new File( testDir, getTestSourcesMain( 
"folder/Module2.vb" ) ).getAbsolutePath() );
-        verifier.assertFileNotPresent(
-            new File( testDir, getTestSourcesMain( 
"should-not-be-copied-test.txt" ) ).getAbsolutePath() );
-        verifier.assertFileNotPresent(
-            new File( testDir, getTestSourcesMain( 
"should-not-be-copied-test.xml" ) ).getAbsolutePath() );
-        verifier.assertFileNotPresent(
-            new File( testDir, getTestSourcesMain( 
"folder/should-not-be-copied-test-2.txt" ) ).getAbsolutePath() );
-        verifier.assertFileNotPresent(
-            new File( testDir, getTestSourcesMain( 
"folder/should-not-be-copied--test-2.xml" ) ).getAbsolutePath() );
+        assertClassPresent( exe, "Module1" );
+        assertClassPresent( exe, "Module2" );
 
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();