svn commit: r1239153 - /incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_474_AspxExcludeWorkingDirectoriesTest.java

[br...@apache.org]

Author: brett
Date: Wed Feb  1 14:43:38 2012
New Revision: 1239153

URL: http://svn.apache.org/viewvc?rev=1239153&view=rev
Log:
[NPANDAY-474] test for .svn in subdirectories

Modified:
    incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_474_AspxExcludeWorkingDirectoriesTest.java

Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_474_AspxExcludeWorkingDirectoriesTest.java
URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_474_AspxExcludeWorkingDirectoriesTest.java?rev=1239153&r1=1239152&r2=1239153&view=diff
==============================================================================
--- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_474_AspxExcludeWorkingDirectoriesTest.java (original)
+++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_474_AspxExcludeWorkingDirectoriesTest.java Wed Feb  1 14:43:38 2012
@@ -23,6 +23,7 @@ import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
@@ -39,10 +40,8 @@ public class NPANDAY_474_AspxExcludeWork
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/NPANDAY_474_AspxExcludeWorkingDirectoriesTest" );
 
-        File svnDir = new File( testDir, ".svn" );
-        svnDir.mkdirs();
-        new File( svnDir, "entries" ).createNewFile();
-        new File( svnDir, "prop-base" ).mkdir();
+        createSvnDir( testDir );
+        createSvnDir( new File( testDir, "Subdir" ) );
 
         Verifier verifier = getVerifier( testDir );
         verifier.executeGoal( "install" );
@@ -52,12 +51,22 @@ public class NPANDAY_474_AspxExcludeWork
         verifier.resetStreams();
 
         assertTrue( new File( testDir, ".svn" ).exists() );
+        assertTrue( new File( testDir, "Subdir/.svn" ).exists() );
         assertTrue( new File( testDir, ".references" ).exists() );
 
-        List<String> unexpectedEntries = Arrays.asList( ".svn", ".references" );
+        List<String> unexpectedEntries = Arrays.asList( ".svn", ".references", "Subdir/.svn" );
         assertNoZipEntries( zipFile, unexpectedEntries );
 
         String assembly = new File( testDir, "target/WcfService1/bin/WcfService1.dll" ).getCanonicalPath();
         assertClassPresent( assembly, "Service1" );
     }
+
+    private void createSvnDir( File basedir )
+        throws IOException
+    {
+        File svnDir = new File( basedir, ".svn" );
+        svnDir.mkdirs();
+        new File( svnDir, "entries" ).createNewFile();
+        new File( svnDir, "prop-base" ).mkdir();
+    }
 }