svn commit: r1384232 - /archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java

[ol...@apache.org]

Author: olamy
Date: Thu Sep 13 08:39:20 2012
New Revision: 1384232

URL: http://svn.apache.org/viewvc?rev=1384232&view=rev
Log:
ensure file are cleaned before test for folks who do not use clean and break the build (folks like me I mean :-))

Modified:
    archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java

Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java?rev=1384232&r1=1384231&r2=1384232&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java Thu Sep 13 08:39:20 2012
@@ -49,6 +49,7 @@ import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.FilenameFilter;
 import java.io.IOException;
 import java.util.Set;
 import java.util.zip.ZipEntry;
@@ -274,6 +275,20 @@ public class ArchivaIndexingTaskExecutor
         throws Exception
     {
 
+        File indexerDirectory = new File( repositoryConfig.getLocation(), ".indexer" );
+
+        indexerDirectory.listFiles( new FilenameFilter()
+        {
+            public boolean accept( File file, String s )
+            {
+                if ( s.startsWith( "nexus-maven-repository-index" ) )
+                {
+                    new File( file, s ).delete();
+                }
+                return false;
+            }
+        } );
+
         File artifactFile = new File( repositoryConfig.getLocation(),
                                       "org/apache/archiva/archiva-index-methods-jar-test/1.0/archiva-index-methods-jar-test-1.0.jar" );
 
@@ -291,9 +306,7 @@ public class ArchivaIndexingTaskExecutor
 
         indexingExecutor.executeTask( task );
 
-        assertTrue( new File( repositoryConfig.getLocation(), ".indexer" ).exists() );
-
-        File indexerDirectory = new File( repositoryConfig.getLocation(), ".indexer" );
+        assertTrue( indexerDirectory.exists() );
 
         // test packed index file creation
         assertTrue( new File( indexerDirectory, "nexus-maven-repository-index.zip" ).exists() );