From 7c1a2a0f019d4b23edb26ae4c20abdfb274aa235 Mon Sep 17 00:00:00 2001 From: Plamen Totev Date: Sat, 27 May 2017 23:44:52 +0300 Subject: [PATCH] Fix tests that fail when run twice in a row Some XZ test cases assert if a file created by the execution of the test does not exists. Because they don't try to delete it first, they will fail if run more than once. --- .../codehaus/plexus/archiver/tar/TarXzUnArchiverTest.java | 5 +++++ .../java/org/codehaus/plexus/archiver/xz/XzArchiverTest.java | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/test/java/org/codehaus/plexus/archiver/tar/TarXzUnArchiverTest.java b/src/test/java/org/codehaus/plexus/archiver/tar/TarXzUnArchiverTest.java index 047223f4f..b3ed2a59f 100644 --- a/src/test/java/org/codehaus/plexus/archiver/tar/TarXzUnArchiverTest.java +++ b/src/test/java/org/codehaus/plexus/archiver/tar/TarXzUnArchiverTest.java @@ -20,6 +20,7 @@ import org.codehaus.plexus.archiver.Archiver; import org.codehaus.plexus.archiver.UnArchiver; import org.codehaus.plexus.archiver.xz.XZArchiver; +import org.codehaus.plexus.util.FileUtils; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertTrue; import static org.codehaus.plexus.PlexusTestCase.getTestFile; @@ -48,6 +49,10 @@ public void testExtract() assertFalse( file2InTar.exists() ); File testXZFile = getTestFile( "target/output/archive.tar.xz" ); + if ( testXZFile.exists() ) + { + FileUtils.fileDelete( testXZFile.getPath() ); + } assertFalse( testXZFile.exists() ); tarArchiver.addFile( getTestFile( "src/test/resources/manifests/manifest1.mf" ), fileName1 ); diff --git a/src/test/java/org/codehaus/plexus/archiver/xz/XzArchiverTest.java b/src/test/java/org/codehaus/plexus/archiver/xz/XzArchiverTest.java index da6fc1d84..38e6bcddd 100644 --- a/src/test/java/org/codehaus/plexus/archiver/xz/XzArchiverTest.java +++ b/src/test/java/org/codehaus/plexus/archiver/xz/XzArchiverTest.java @@ -51,6 +51,10 @@ public void testCreateArchive() inputFiles[0] = "archiveForxz.zip"; File targetOutputFile = getTestFile( "target/output/archive.xz" ); + if ( targetOutputFile.exists() ) + { + FileUtils.fileDelete( targetOutputFile.getPath() ); + } assertFalse( targetOutputFile.exists() ); archiver.addDirectory( getTestFile( "target/output" ), inputFiles, null );