From e8e6f671ef055819b0627e0c38fef65e4c6b299d Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Tue, 3 Oct 2023 06:17:01 +0000 Subject: [PATCH] Assert that deleting test-files and entries works in tests git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1912709 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/xssf/streaming/TestSXSSFUnicodeSurrogates.java | 3 ++- .../poi/xssf/usermodel/TestXSSFUnicodeSurrogates.java | 3 ++- .../apache/poi/xssf/usermodel/TestXSSFWorkbook.java | 2 +- .../apache/poi/hssf/usermodel/TestPOIFSProperties.java | 3 ++- .../apache/poi/poifs/filesystem/TestPOIFSStream.java | 10 +++++----- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFUnicodeSurrogates.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFUnicodeSurrogates.java index aba3a2f376..360bd0576d 100644 --- a/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFUnicodeSurrogates.java +++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFUnicodeSurrogates.java @@ -18,6 +18,7 @@ package org.apache.poi.xssf.streaming; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; @@ -62,7 +63,7 @@ class TestSXSSFUnicodeSurrogates { assertEquals(unicodeText, cell2.getStringCellValue()); } } finally { - tf.delete(); + assertTrue(tf.delete()); } } } diff --git a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFUnicodeSurrogates.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFUnicodeSurrogates.java index 506e0dead8..48c116eb15 100644 --- a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFUnicodeSurrogates.java +++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFUnicodeSurrogates.java @@ -18,6 +18,7 @@ package org.apache.poi.xssf.usermodel; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; @@ -61,7 +62,7 @@ class TestXSSFUnicodeSurrogates { assertEquals(unicodeText, cell2.getStringCellValue()); } } finally { - tf.delete(); + assertTrue(tf.delete()); } } } diff --git a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java index 8d258bb289..9e1a7cc0f3 100644 --- a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java +++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java @@ -1479,7 +1479,7 @@ public final class TestXSSFWorkbook extends BaseTestXWorkbook { } assertEquals(2, count); } finally { - tempFile.delete(); + assertTrue(tempFile.delete()); } } diff --git a/poi/src/test/java/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java index 4faf164731..e9a6fbf43e 100644 --- a/poi/src/test/java/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java +++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java @@ -19,6 +19,7 @@ package org.apache.poi.hssf.usermodel; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -89,7 +90,7 @@ class TestPOIFSProperties { summary1.setTitle(title); //write the modified property back to POIFS - fs.getRoot().getEntryCaseInsensitive(SummaryInformation.DEFAULT_STREAM_NAME).delete(); + assertTrue(fs.getRoot().getEntryCaseInsensitive(SummaryInformation.DEFAULT_STREAM_NAME).delete()); fs.createDocument(summary1.toInputStream(), SummaryInformation.DEFAULT_STREAM_NAME); // check that the information was added successfully to the filesystem object diff --git a/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSStream.java b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSStream.java index 7f25ca751d..0b97d8eb8c 100644 --- a/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSStream.java +++ b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSStream.java @@ -1817,7 +1817,7 @@ final class TestPOIFSStream { main4096[4095] = -11; testDir.createDocument("Normal4096", new ByteArrayInputStream(main4096)); - root.getEntryCaseInsensitive("Tags").delete(); + assertTrue(root.getEntryCaseInsensitive("Tags").delete()); // Write out, re-load @@ -1848,7 +1848,7 @@ final class TestPOIFSStream { // Delete a directory, and add one more - testDir.getEntryCaseInsensitive("Testing 456").delete(); + assertTrue(testDir.getEntryCaseInsensitive("Testing 456").delete()); testDir.createDirectory("Testing ABC"); @@ -1903,7 +1903,7 @@ final class TestPOIFSStream { // Delete a mini stream, add one more - testDir.getEntryCaseInsensitive("Mini").delete(); + assertTrue(testDir.getEntryCaseInsensitive("Mini").delete()); byte[] mini3 = new byte[]{42, 0, 42, 0, 42, 0, 42}; testDir.createDocument("Mini3", new ByteArrayInputStream(mini3)); @@ -2179,8 +2179,8 @@ final class TestPOIFSStream { // Delete a couple of streams - miniDoc.delete(); - normDoc.delete(); + assertTrue(miniDoc.delete()); + assertTrue(normDoc.delete()); // Check - will have un-used sectors now