From fb86f0d61eb2881164e8be4b48236dada03b8a5a Mon Sep 17 00:00:00 2001 From: Vikram Agrawal Date: Thu, 29 Aug 2019 10:21:13 +0530 Subject: [PATCH] Minor Fixes in FileUtilitySuite --- .../org/apache/spark/io/FileUtilitySuite.java | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/core/src/test/java/org/apache/spark/io/FileUtilitySuite.java b/core/src/test/java/org/apache/spark/io/FileUtilitySuite.java index 99fb5e7107f22..9b904b4ded77e 100644 --- a/core/src/test/java/org/apache/spark/io/FileUtilitySuite.java +++ b/core/src/test/java/org/apache/spark/io/FileUtilitySuite.java @@ -33,21 +33,20 @@ public class FileUtilitySuite { protected File sourceFolder; - protected File destFile; protected File destTarLoc; + protected File destFolder; @Before public void setUp() throws IOException { - sourceFolder = Utils.createTempDir(System.getProperty("java.io.tmpdir"), - "FileUtilTest" + RandomUtils.nextLong()); - destTarLoc = File.createTempFile("dest-tar", ".tar"); - destFile = File.createTempFile("dest-file", ".tmp"); + String tmpDir = System.getProperty("java.io.tmpdir"); + sourceFolder = Utils.createTempDir(tmpDir, "FileUtilTest-src-" + RandomUtils.nextLong()); + destFolder = Utils.createTempDir(tmpDir, "FileUtilTest-dest-" + RandomUtils.nextLong()); + destTarLoc= File.createTempFile("dest-tar", ".tar"); } @After public void tearDown() { destTarLoc.delete(); - destFile.delete(); } @Test @@ -66,14 +65,12 @@ public void testCreationAndExtraction() throws IllegalStateException, IOExceptio Assert.assertTrue(destTarLoc.exists()); // Extract the tarball - String destFilePath = destFile.getAbsolutePath(); - destFile.delete(); - Assert.assertFalse(destFile.exists()); - FileUtility.extractTarFile(destTarLoc.getAbsolutePath(), destFilePath); + Assert.assertEquals(destFolder.listFiles().length , 0); + FileUtility.extractTarFile(destTarLoc.getAbsolutePath(), destFolder.getAbsolutePath()); - Assert.assertTrue(destFile.exists()); - Assert.assertEquals(destFile.listFiles().length , 1); - Assert.assertArrayEquals(randomBytes, FileUtils.readFileToByteArray(destFile.listFiles()[0])); + Assert.assertTrue(destFolder.exists()); + Assert.assertEquals(destFolder.listFiles().length , 1); + Assert.assertArrayEquals(randomBytes, FileUtils.readFileToByteArray(destFolder.listFiles()[0])); } }