Also replace for JUnit 5 in comments

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1884956 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/TestWorkbookFactory.java b/src/ooxml/testcases/org/apache/poi/ss/tests/TestWorkbookFactory.java
index 478d2a551c0dfd81db60fdf1b262fdbb3e6dc21e..8bf02dfb13292ff9c42b177af0f17db92cc3383e 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/TestWorkbookFactory.java
+++ b/src/ooxml/testcases/org/apache/poi/ss/tests/TestWorkbookFactory.java
@@ -22,7 +22,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;

diff --git a/src/scratchpad/testcases/org/apache/poi/hemf/usermodel/TestHemfPicture.java b/src/scratchpad/testcases/org/apache/poi/hemf/usermodel/TestHemfPicture.java
index 1921b37bb1e04e4be62ddd114b2543528019d779..b199c5ec0512e307a5a14d6b1223aa6facaa08a0 100644 (file)
--- a/src/scratchpad/testcases/org/apache/poi/hemf/usermodel/TestHemfPicture.java
+++ b/src/scratchpad/testcases/org/apache/poi/hemf/usermodel/TestHemfPicture.java
@@ -60,7 +60,7 @@ public class TestHemfPicture {
 
 /*
     @Test
-    @Ignore("Only for manual tests")
+    @Disabled("Only for manual tests")
     public void paintSingle() throws Exception {
         File fileIn = new File("tmp/emfs/govdocs1/844/844795.ppt_2.emf");
 
@@ -82,7 +82,7 @@ public class TestHemfPicture {
 
 /*
     @Test
-    @Ignore("Only for manual tests - need to add org.tukaani:xz:1.8 for this to work")
+    @Disabled("Only for manual tests - need to add org.tukaani:xz:1.8 for this to work")
     public void paintMultiple() throws Exception {
         Pattern fileExt = Pattern.compile("(?i)^(.+/)*(.+)\\.(emf|wmf)$");
         final byte[] buf = new byte[50_000_000];

diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java
index b7f9369925ca8d51f87662a3c87413835f61d28b..ca4ee450716a34a2ee820a1d16eee7439993cdbb 100644 (file)
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java
@@ -51,7 +51,7 @@ import org.junit.jupiter.api.Test;
 public class TestFontRendering {
     private static final POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
 
-    // @Ignore2("This fails on some systems because fonts are rendered slightly different")
+    // @Disabled2("This fails on some systems because fonts are rendered slightly different")
     @Test
     public void bug55902mixedFontWithChineseCharacters() throws IOException, FontFormatException {
         // font files need to be downloaded first via

diff --git a/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java b/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java
index 6130b1566da32fc31543fcb4166d0c62640a4fcb..3e84c6db6db240f0fd724359d86ccf3294275006 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java
+++ b/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java
@@ -64,7 +64,7 @@ public class TestBiffViewer extends BaseTestIteratingXLS {
     }
 
 //    @Test
-//    @Ignore("only used for manual tests")
+//    @Disabled("only used for manual tests")
 //    @SuppressWarnings("java:S2699")
 //    public void testOneFile() throws Exception {
 //        POIDataSamples samples = POIDataSamples.getSpreadSheetInstance();

diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
index 8b4ecf8eb958b885213d4bd66d3d8479f611e72d..1fb3de3712f0b6b035ac04343e5ec73c83eb60fb 100644 (file)
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
+++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
@@ -297,7 +297,7 @@ public abstract class BaseTestSheetShiftRows {
         wb.close();
     }
 
-    //@Ignore("bug 56454: Incorrectly handles merged regions that do not contain column 0")
+    //@Disabled("bug 56454: Incorrectly handles merged regions that do not contain column 0")
     @Test
     public final void shiftWithMergedRegions_bug56454() throws IOException {
         Workbook wb = _testDataProvider.createWorkbook();
@@ -597,7 +597,7 @@ public abstract class BaseTestSheetShiftRows {
         read.close();
     }
 
-    //@Ignore("bug 56454: Incorrectly handles merged regions that do not contain column 0")
+    //@Disabled("bug 56454: Incorrectly handles merged regions that do not contain column 0")
     @Test
     public void shiftRowsWithMergedRegionsThatDoNotContainColumnZero() throws IOException {
         Workbook wb = _testDataProvider.createWorkbook();