[archiva] 03/03: Improving tests to make them idempotent.

[martin_s]

This is an automated email from the ASF dual-hosted git repository.

martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git

commit f9073a2c7d97df6dbb03a6be87958f05a6245640
Author: Martin Stockhammer <martin.stockham...@ars.de>
AuthorDate: Tue Oct 30 14:30:55 2018 +0100

    Improving tests to make them idempotent.
---
 .../maven/ArchivaIndexingTaskExecutorTest.java     | 27 +++++++++++-----------
 .../merge/Maven2RepositoryMergerTest.java          | 10 +++++---
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git 
a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutorTest.java
 
b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutorTest.java
index b67ee24..758568b 100644
--- 
a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutorTest.java
+++ 
b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/src/test/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutorTest.java
@@ -278,19 +278,20 @@ public class ArchivaIndexingTaskExecutorTest
         Path packedIndexDirectory = icf.getLocalPackedIndexPath();
         Path indexerDirectory = icf.getLocalIndexPath();
 
-        Files.list(packedIndexDirectory).filter( path -> 
path.getFileName().toString().startsWith("nexus-maven-repository-index") )
-            .forEach( path ->
-            {
-                try
-                {
-                    System.err.println("Deleting "+path);
-                    Files.delete( path );
-                }
-                catch ( IOException e )
-                {
-                    e.printStackTrace( );
-                }
-            } );
+        for (Path dir : new Path[] { packedIndexDirectory, indexerDirectory }) 
{
+            Files.list(dir).filter(path -> 
path.getFileName().toString().startsWith("nexus-maven-repository-index"))
+                    .forEach(path ->
+                    {
+                        try {
+                            System.err.println("Deleting " + path);
+                            Files.delete(path);
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    });
+        }
+
+
 
 
         Path artifactFile = basePath.resolve(
diff --git 
a/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java
 
b/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java
index bc63d42..5626f99 100644
--- 
a/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java
+++ 
b/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java
@@ -95,9 +95,13 @@ public class Maven2RepositoryMergerTest
         Path pom = Paths.get( targetRepoPath,
                              
"com/example/test/test-artifact/1.0-SNAPSHOT/test-artifact-1.0-20100308.230825-1.pom"
 );
 
-        assertFalse( Files.exists(mergedArtifact) );
-        assertFalse( Files.exists(mavenMetadata) );
-        assertFalse( Files.exists(pom) );
+        for (Path testArtifact : new Path[] { mergedArtifact, mavenMetadata, 
pom }) {
+            Files.deleteIfExists(testArtifact);
+        }
+
+        assertFalse( "Artifact file exists already", 
Files.exists(mergedArtifact) );
+        assertFalse( "Metadata file exists already", 
Files.exists(mavenMetadata) );
+        assertFalse( "Pom File exists already", Files.exists(pom) );
         Configuration c = new Configuration();
         ManagedRepositoryConfiguration testRepo = new 
ManagedRepositoryConfiguration();
         testRepo.setId( TEST_REPO_ID );