Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXCell.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXCell.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXCell.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXCell.java Thu Dec 24 18:42:29 2020 @@ -17,7 +17,7 @@ package org.apache.poi.ss.tests.usermodel; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; @@ -30,7 +30,7 @@ import org.apache.poi.ss.usermodel.Sheet import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.streaming.SXSSFCell; import org.apache.poi.xssf.usermodel.XSSFCell; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Class for combined testing of XML-specific functionality of
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java Thu Dec 24 18:42:29 2020 @@ -23,7 +23,7 @@ import org.apache.poi.ss.ITestDataProvid import org.apache.poi.ss.usermodel.BaseTestRow; import org.apache.poi.xssf.streaming.SXSSFRow; import org.apache.poi.xssf.usermodel.XSSFRow; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Class for combined testing of XML-specific functionality of Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/ConditionalFormattingEvalTest.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/ConditionalFormattingEvalTest.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/ConditionalFormattingEvalTest.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/ConditionalFormattingEvalTest.java Thu Dec 24 18:42:29 2020 @@ -18,11 +18,10 @@ package org.apache.poi.ss.tests.usermodel; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; -import java.io.IOException; import java.util.Date; import java.util.List; @@ -32,13 +31,14 @@ import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Color; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.util.CellReference; +import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.XSSFTestDataSamples; import org.apache.poi.xssf.usermodel.XSSFColor; import org.apache.poi.xssf.usermodel.XSSFFormulaEvaluator; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class ConditionalFormattingEvalTest { @@ -49,25 +49,20 @@ public class ConditionalFormattingEvalTe private CellReference ref; private List<EvaluationConditionalFormatRule> rules; - @Before + @BeforeEach public void openWB() { wb = XSSFTestDataSamples.openSampleWorkbook("ConditionalFormattingSamples.xlsx"); formulaEval = new XSSFFormulaEvaluator(wb); cfe = new ConditionalFormattingEvaluator(wb, formulaEval); } - @After + @AfterEach public void closeWB() { formulaEval = null; cfe = null; ref = null; rules = null; - try { - if (wb != null) wb.close(); - } catch (IOException e) { - // keep going, this shouldn't cancel things - e.printStackTrace(); - } + IOUtils.closeQuietly(wb); } @Test @@ -75,25 +70,25 @@ public class ConditionalFormattingEvalTe sheet = wb.getSheet("Products1"); getRulesFor(12, 1); - assertEquals("wrong # of rules for " + ref, 1, rules.size()); - assertEquals("wrong bg color for " + ref, "FFFFEB9C", getColor(rules.get(0).getRule().getPatternFormatting().getFillBackgroundColorColor())); - assertFalse("should not be italic " + ref, rules.get(0).getRule().getFontFormatting().isItalic()); + assertEquals(1, rules.size(), "wrong # of rules for " + ref); + assertEquals("FFFFEB9C", getColor(rules.get(0).getRule().getPatternFormatting().getFillBackgroundColorColor()), "wrong bg color for " + ref); + assertFalse(rules.get(0).getRule().getFontFormatting().isItalic(), "should not be italic " + ref); getRulesFor(16, 3); - assertEquals("wrong # of rules for " + ref, 1, rules.size()); - assertEquals("wrong bg color for " + ref, 0.7999816888943144d, getTint(rules.get(0).getRule().getPatternFormatting().getFillBackgroundColorColor()), 0.000000000000001); + assertEquals(1, rules.size(), "wrong # of rules for " + ref); + assertEquals(0.7999816888943144d, getTint(rules.get(0).getRule().getPatternFormatting().getFillBackgroundColorColor()), 0.000000000000001, "wrong bg color for " + ref); getRulesFor(12, 3); - assertEquals("wrong # of rules for " + ref, 0, rules.size()); + assertEquals(0, rules.size(), "wrong # of rules for " + ref); sheet = wb.getSheet("Products2"); getRulesFor(15,1); - assertEquals("wrong # of rules for " + ref, 1, rules.size()); - assertEquals("wrong bg color for " + ref, "FFFFEB9C", getColor(rules.get(0).getRule().getPatternFormatting().getFillBackgroundColorColor())); + assertEquals(1, rules.size(), "wrong # of rules for " + ref); + assertEquals("FFFFEB9C", getColor(rules.get(0).getRule().getPatternFormatting().getFillBackgroundColorColor()), "wrong bg color for " + ref); getRulesFor(20,3); - assertEquals("wrong # of rules for " + ref, 0, rules.size()); + assertEquals(0, rules.size(), "wrong # of rules for " + ref); // now change a cell value that's an input for the rules Cell cell = sheet.getRow(1).getCell(6); @@ -107,103 +102,103 @@ public class ConditionalFormattingEvalTe // test that the conditional validation evaluations changed getRulesFor(15,1); - assertEquals("wrong # of rules for " + ref, 0, rules.size()); + assertEquals(0, rules.size(), "wrong # of rules for " + ref); getRulesFor(20,3); - assertEquals("wrong # of rules for " + ref, 1, rules.size()); - assertEquals("wrong bg color for " + ref, 0.7999816888943144d, getTint(rules.get(0).getRule().getPatternFormatting().getFillBackgroundColorColor()), 0.000000000000001); + assertEquals(1, rules.size(), "wrong # of rules for " + ref); + assertEquals(0.7999816888943144d, getTint(rules.get(0).getRule().getPatternFormatting().getFillBackgroundColorColor()), 0.000000000000001, "wrong bg color for " + ref); getRulesFor(20,1); - assertEquals("wrong # of rules for " + ref, 1, rules.size()); - assertEquals("wrong bg color for " + ref, "FFFFEB9C", getColor(rules.get(0).getRule().getPatternFormatting().getFillBackgroundColorColor())); + assertEquals(1, rules.size(), "wrong # of rules for " + ref); + assertEquals("FFFFEB9C", getColor(rules.get(0).getRule().getPatternFormatting().getFillBackgroundColorColor()), "wrong bg color for " + ref); sheet = wb.getSheet("Book tour"); getRulesFor(8,2); - assertEquals("wrong # of rules for " + ref, 1, rules.size()); + assertEquals(1, rules.size(), "wrong # of rules for " + ref); sheet = wb.getSheet("Compare to totals"); getRulesFor(3, 2); - assertEquals("wrong # of rules for " + ref, 1, rules.size()); - assertEquals("wrong fg color for " + ref, "FFFF0000", getColor(rules.get(0).getRule().getFontFormatting().getFontColor())); + assertEquals(1, rules.size(), "wrong # of rules for " + ref); + assertEquals("FFFF0000", getColor(rules.get(0).getRule().getFontFormatting().getFontColor()), "wrong fg color for " + ref); getRulesFor(3, 3); - assertEquals("wrong # of rules for " + ref, 0, rules.size()); + assertEquals(0, rules.size(), "wrong # of rules for " + ref); getRulesFor(15, 4); - assertEquals("wrong # of rules for " + ref, 0, rules.size()); + assertEquals(0, rules.size(), "wrong # of rules for " + ref); getRulesFor(16, 1); - assertEquals("wrong # of rules for " + ref, 1, rules.size()); - assertEquals("wrong fg color for " + ref, "FFFF0000", getColor(rules.get(0).getRule().getFontFormatting().getFontColor())); + assertEquals(1, rules.size(), "wrong # of rules for " + ref); + assertEquals("FFFF0000", getColor(rules.get(0).getRule().getFontFormatting().getFontColor()), "wrong fg color for " + ref); sheet = wb.getSheet("Products3"); sheet.getRow(8).getCell(0).setCellValue(new Date()); getRulesFor(8, 0); - assertEquals("wrong # of rules for " + ref, 1, rules.size()); + assertEquals(1, rules.size(), "wrong # of rules for " + ref); getRulesFor(8, 3); - assertEquals("wrong # of rules for " + ref, 1, rules.size()); + assertEquals(1, rules.size(), "wrong # of rules for " + ref); sheet = wb.getSheet("Customers2"); getRulesFor(3, 0); - assertEquals("wrong # of rules for " + ref, 0, rules.size()); + assertEquals(0, rules.size(), "wrong # of rules for " + ref); } @Test - public void testFormattingOnUndefinedCell() throws Exception { + public void testFormattingOnUndefinedCell() { wb = XSSFTestDataSamples.openSampleWorkbook("conditional_formatting_with_formula_on_second_sheet.xlsx"); formulaEval = new XSSFFormulaEvaluator(wb); cfe = new ConditionalFormattingEvaluator(wb, formulaEval); sheet = wb.getSheet("Sales Plan"); getRulesFor(9,2); - assertNotEquals("No rules for " + ref, 0, rules.size()); - assertEquals("wrong bg color for " + ref, "FFFFFF00", getColor(rules.get(0).getRule().getPatternFormatting().getFillBackgroundColorColor())); + assertNotEquals(0, rules.size(), "No rules for " + ref); + assertEquals("FFFFFF00", getColor(rules.get(0).getRule().getPatternFormatting().getFillBackgroundColorColor()), "wrong bg color for " + ref); } @Test - public void testRepeatedEval() throws Exception { + public void testRepeatedEval() { wb = XSSFTestDataSamples.openSampleWorkbook("test_conditional_formatting.xlsx"); formulaEval = new XSSFFormulaEvaluator(wb); cfe = new ConditionalFormattingEvaluator(wb, formulaEval); sheet = wb.getSheetAt(0); - assertEquals("no rules should apply", 0, getRulesFor(2, 1).size()); + assertEquals(0, getRulesFor(2, 1).size(), "no rules should apply"); - assertEquals("no rules should apply", 0, getRulesFor(2, 1).size()); + assertEquals(0, getRulesFor(2, 1).size(), "no rules should apply"); } @Test - public void testCellValueIsWrongType() throws Exception { + public void testCellValueIsWrongType() { wb = XSSFTestDataSamples.openSampleWorkbook("conditional_formatting_cell_is.xlsx"); formulaEval = new XSSFFormulaEvaluator(wb); cfe = new ConditionalFormattingEvaluator(wb, formulaEval); sheet = wb.getSheetAt(1); - assertEquals("wrong # of matching rules", 1, getRulesFor(3, 1).size()); + assertEquals(1, getRulesFor(3, 1).size(), "wrong # of matching rules"); } @Test - public void testRangeCondition() throws Exception { + public void testRangeCondition() { wb = XSSFTestDataSamples.openSampleWorkbook("conditional_formatting_multiple_ranges.xlsx"); formulaEval = new XSSFFormulaEvaluator(wb); cfe = new ConditionalFormattingEvaluator(wb, formulaEval); sheet = wb.getSheetAt(0); - assertEquals("wrong # of matching rules", 0, getRulesFor(0, 0).size()); - assertEquals("wrong # of matching rules", 0, getRulesFor(1, 0).size()); - assertEquals("wrong # of matching rules", 0, getRulesFor(2, 0).size()); - assertEquals("wrong # of matching rules", 1, getRulesFor(3, 0).size()); - assertEquals("wrong # of matching rules", 0, getRulesFor(0, 1).size()); - assertEquals("wrong # of matching rules", 0, getRulesFor(1, 1).size()); - assertEquals("wrong # of matching rules", 1, getRulesFor(2, 1).size()); - assertEquals("wrong # of matching rules", 1, getRulesFor(3, 1).size()); - assertEquals("wrong # of matching rules", 1, getRulesFor(0, 3).size()); - assertEquals("wrong # of matching rules", 0, getRulesFor(1, 3).size()); - assertEquals("wrong # of matching rules", 1, getRulesFor(2, 3).size()); - assertEquals("wrong # of matching rules", 0, getRulesFor(0, 6).size()); - assertEquals("wrong # of matching rules", 0, getRulesFor(3, 6).size()); - assertEquals("wrong # of matching rules", 0, getRulesFor(2, 6).size()); + assertEquals(0, getRulesFor(0, 0).size(), "wrong # of matching rules"); + assertEquals(0, getRulesFor(1, 0).size(), "wrong # of matching rules"); + assertEquals(0, getRulesFor(2, 0).size(), "wrong # of matching rules"); + assertEquals(1, getRulesFor(3, 0).size(), "wrong # of matching rules"); + assertEquals(0, getRulesFor(0, 1).size(), "wrong # of matching rules"); + assertEquals(0, getRulesFor(1, 1).size(), "wrong # of matching rules"); + assertEquals(1, getRulesFor(2, 1).size(), "wrong # of matching rules"); + assertEquals(1, getRulesFor(3, 1).size(), "wrong # of matching rules"); + assertEquals(1, getRulesFor(0, 3).size(), "wrong # of matching rules"); + assertEquals(0, getRulesFor(1, 3).size(), "wrong # of matching rules"); + assertEquals(1, getRulesFor(2, 3).size(), "wrong # of matching rules"); + assertEquals(0, getRulesFor(0, 6).size(), "wrong # of matching rules"); + assertEquals(0, getRulesFor(3, 6).size(), "wrong # of matching rules"); + assertEquals(0, getRulesFor(2, 6).size(), "wrong # of matching rules"); } private List<EvaluationConditionalFormatRule> getRulesFor(int row, int col) { Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java Thu Dec 24 18:42:29 2020 @@ -18,10 +18,10 @@ package org.apache.poi.ss.tests.usermodel; import static org.apache.poi.sl.tests.SLCommonUtils.xslfOnly; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeFalse; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assumptions.assumeFalse; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -62,15 +62,15 @@ import org.apache.poi.ss.usermodel.Workb import org.apache.poi.xssf.XSSFTestDataSamples; import org.apache.poi.xssf.usermodel.XSSFObjectData; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; public class TestEmbedOLEPackage { private static byte[] samplePPT, samplePPTX, samplePNG; private static final POIDataSamples ssamples = POIDataSamples.getSpreadSheetInstance(); - @BeforeClass + @BeforeAll public static void init() throws IOException { samplePPT = getSamplePPT(false); samplePPTX = getSamplePPT(true); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestXSSFRangeCopier.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestXSSFRangeCopier.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestXSSFRangeCopier.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestXSSFRangeCopier.java Thu Dec 24 18:42:29 2020 @@ -19,7 +19,7 @@ package org.apache.poi.ss.tests.usermodel; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; @@ -31,9 +31,9 @@ import org.apache.poi.xssf.XSSFTestDataS import org.apache.poi.xssf.usermodel.XSSFRangeCopier; import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class TestXSSFRangeCopier extends BaseTestRangeCopier { public TestXSSFRangeCopier() { @@ -42,7 +42,7 @@ public class TestXSSFRangeCopier extends testDataProvider = XSSFITestDataProvider.instance; } - @Before + @BeforeEach public void init() { workbook = XSSFTestDataSamples.openSampleWorkbook("tile-range-test.xlsx"); initSheets(); @@ -50,7 +50,7 @@ public class TestXSSFRangeCopier extends transSheetRangeCopier = new XSSFRangeCopier(sheet1, sheet2); } - @After + @AfterEach public void shutdown() throws IOException { workbook.close(); } Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestXSSFPropertyTemplate.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestXSSFPropertyTemplate.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestXSSFPropertyTemplate.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestXSSFPropertyTemplate.java Thu Dec 24 18:42:29 2020 @@ -17,8 +17,8 @@ package org.apache.poi.ss.tests.util; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; import java.io.IOException; @@ -33,7 +33,7 @@ import org.apache.poi.ss.usermodel.Workb import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.PropertyTemplate; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestXSSFPropertyTemplate { Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/util/tests/TestIdentifierManager.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/util/tests/TestIdentifierManager.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/util/tests/TestIdentifierManager.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/util/tests/TestIdentifierManager.java Thu Dec 24 18:42:29 2020 @@ -16,15 +16,15 @@ ==================================================================== */ package org.apache.poi.util.tests; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.poi.ooxml.util.IdentifierManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestIdentifierManager { @Test @@ -43,8 +43,8 @@ public class TestIdentifierManager { long min = IdentifierManager.MIN_ID; long max = IdentifierManager.MAX_ID; IdentifierManager manager = new IdentifierManager(min,max); - assertTrue("Limits lead to a long variable overflow", max - min + 1 > 0); - assertTrue("Limits lead to a long variable overflow", manager.getRemainingIdentifiers() > 0); + assertTrue(max - min + 1 > 0, "Limits lead to a long variable overflow"); + assertTrue(manager.getRemainingIdentifiers() > 0, "Limits lead to a long variable overflow"); assertEquals(min,manager.reserveNew()); assertEquals(max,manager.reserve(max)); assertEquals(max - min -1, manager.getRemainingIdentifiers()); @@ -54,37 +54,22 @@ public class TestIdentifierManager { @Test public void testReserve() { - IdentifierManager manager = new IdentifierManager(10L,30L); - assertEquals(12L,manager.reserve(12L)); - long reserve = manager.reserve(12L); - assertNotEquals("Same id must be reserved twice!", 12L, reserve); - assertTrue(manager.release(12L)); - assertTrue(manager.release(reserve)); - assertFalse(manager.release(12L)); - assertFalse(manager.release(reserve)); - - manager = new IdentifierManager(0L,2L); - assertEquals(0L,manager.reserve(0L)); - assertEquals(1L,manager.reserve(1L)); - assertEquals(2L,manager.reserve(2L)); - try { - manager.reserve(0L); - fail("Exception expected"); - } catch(IllegalStateException e) { - // expected - } - try { - manager.reserve(1L); - fail("Exception expected"); - } catch(IllegalStateException e) { - // expected - } - try { - manager.reserve(2L); - fail("Exception expected"); - } catch(IllegalStateException e) { - // expected - } + IdentifierManager manager1 = new IdentifierManager(10L, 30L); + assertEquals(12L, manager1.reserve(12L)); + long reserve = manager1.reserve(12L); + assertNotEquals(12L, reserve, "Same id must be reserved twice!"); + assertTrue(manager1.release(12L)); + assertTrue(manager1.release(reserve)); + assertFalse(manager1.release(12L)); + assertFalse(manager1.release(reserve)); + + IdentifierManager manager2 = new IdentifierManager(0L, 2L); + assertEquals(0L, manager2.reserve(0L)); + assertEquals(1L, manager2.reserve(1L)); + assertEquals(2L, manager2.reserve(2L)); + assertThrows(IllegalStateException.class, () -> manager2.reserve(0L)); + assertThrows(IllegalStateException.class, () -> manager2.reserve(1L)); + assertThrows(IllegalStateException.class, () -> manager2.reserve(2L)); } @Test @@ -93,12 +78,7 @@ public class TestIdentifierManager { assertSame(10L,manager.reserveNew()); assertSame(11L,manager.reserveNew()); assertSame(12L,manager.reserveNew()); - try { - manager.reserveNew(); - fail("IllegalStateException expected"); - } catch (IllegalStateException e) { - // expected - } + assertThrows(IllegalStateException.class, manager::reserveNew); } @Test Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/util/tests/TestTempFileThreaded.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/util/tests/TestTempFileThreaded.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/util/tests/TestTempFileThreaded.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/util/tests/TestTempFileThreaded.java Thu Dec 24 18:42:29 2020 @@ -18,7 +18,7 @@ package org.apache.poi.util.tests; import static org.apache.poi.util.DefaultTempFileCreationStrategy.POIFILES; import static org.apache.poi.util.TempFile.JAVA_IO_TMPDIR; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; import java.io.FileOutputStream; @@ -36,9 +36,9 @@ import org.apache.poi.util.TempFile; import org.apache.poi.util.TempFileCreationStrategy; import org.apache.poi.xssf.streaming.SXSSFSheet; import org.apache.poi.xssf.streaming.SXSSFWorkbook; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class TestTempFileThreaded { private static final int NUMBER_OF_THREADS = 10; @@ -72,7 +72,7 @@ public class TestTempFileThreaded { }; } - @BeforeClass + @BeforeAll public static void setUpClass() throws IOException { String tmpDir = System.getProperty(JAVA_IO_TMPDIR); if (tmpDir == null) { @@ -82,7 +82,7 @@ public class TestTempFileThreaded { TempFile.setTempFileCreationStrategy(createTempFileCreationStrategy(new File(new File(tmpDir, POIFILES), "TestTempFileThreaded"))); } - @Before + @BeforeEach public void setUp() { // Initialize array to allow to summarize afterwards executions = new int[NUMBER_OF_THREADS]; @@ -111,9 +111,7 @@ public class TestTempFileThreaded { // make sure the resulting number of executions is correct for (int i = 0; i < NUMBER_OF_THREADS; i++) { // check if enough items were performed - assertEquals("Thread " + i - + " did not execute all iterations", NUMBER_OF_TESTS, - executions[i]); + assertEquals(NUMBER_OF_TESTS, executions[i], "Thread " + i + " did not execute all iterations"); } } @@ -155,10 +153,6 @@ public class TestTempFileThreaded { } files.get(threadNum).add(file); - - if (iter % 30 == 0) { - // System.out.println("thread: " + threadNum + ", iter: " + iter + ": " + file); - } } } } Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java Thu Dec 24 18:42:29 2020 @@ -17,12 +17,14 @@ package org.apache.poi.xddf.usermodel; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + import org.apache.poi.xddf.usermodel.chart.ErrorBarType; import org.apache.poi.xddf.usermodel.chart.ErrorDirection; import org.apache.poi.xddf.usermodel.chart.ErrorValueType; import org.apache.poi.xddf.usermodel.chart.XDDFErrorBars; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openxmlformats.schemas.drawingml.x2006.chart.*; import org.openxmlformats.schemas.drawingml.x2006.main.*; @@ -32,158 +34,158 @@ public class TestNecessaryOOXMLClasses { @Test public void testProblemClasses() { CTXYAdjustHandle ctxyAdjustHandle = CTXYAdjustHandle.Factory.newInstance(); - Assert.assertNotNull(ctxyAdjustHandle); + assertNotNull(ctxyAdjustHandle); CTPolarAdjustHandle ctPolarAdjustHandle = CTPolarAdjustHandle.Factory.newInstance(); - Assert.assertNotNull(ctPolarAdjustHandle); + assertNotNull(ctPolarAdjustHandle); CTChartLines ctChartLines = CTChartLines.Factory.newInstance(); - Assert.assertNotNull(ctChartLines); + assertNotNull(ctChartLines); CTDashStop ctDashStop = CTDashStop.Factory.newInstance(); - Assert.assertNotNull(ctDashStop); + assertNotNull(ctDashStop); CTSurface ctSurface = CTSurface.Factory.newInstance(); - Assert.assertNotNull(ctSurface); + assertNotNull(ctSurface); CTLegendEntry ctLegendEntry = CTLegendEntry.Factory.newInstance(); - Assert.assertNotNull(ctLegendEntry); + assertNotNull(ctLegendEntry); CTShape3D ctShape3D = CTShape3D.Factory.newInstance(); - Assert.assertNotNull(ctShape3D); + assertNotNull(ctShape3D); CTScene3D ctScene3D = CTScene3D.Factory.newInstance(); - Assert.assertNotNull(ctScene3D); + assertNotNull(ctScene3D); CTEffectContainer ctEffectContainer = CTEffectContainer.Factory.newInstance(); - Assert.assertNotNull(ctEffectContainer); + assertNotNull(ctEffectContainer); CTConnectionSite ctConnectionSite = CTConnectionSite.Factory.newInstance(); - Assert.assertNotNull(ctConnectionSite); + assertNotNull(ctConnectionSite); STLblAlgn stLblAlgn = STLblAlgn.Factory.newInstance(); - Assert.assertNotNull(stLblAlgn); + assertNotNull(stLblAlgn); STBlackWhiteMode stBlackWhiteMode = STBlackWhiteMode.Factory.newInstance(); - Assert.assertNotNull(stBlackWhiteMode); + assertNotNull(stBlackWhiteMode); STRectAlignment stRectAlignment = STRectAlignment.Factory.newInstance(); - Assert.assertNotNull(stRectAlignment); + assertNotNull(stRectAlignment); STTileFlipMode stTileFlipMode = STTileFlipMode.Factory.newInstance(); - Assert.assertNotNull(stTileFlipMode); + assertNotNull(stTileFlipMode); STPresetPatternVal stPresetPatternVal = STPresetPatternVal.Factory.newInstance(); - Assert.assertNotNull(stPresetPatternVal); + assertNotNull(stPresetPatternVal); STOnOffStyleType stOnOffStyleType = STOnOffStyleType.Factory.newInstance(); - Assert.assertNotNull(stOnOffStyleType); + assertNotNull(stOnOffStyleType); CTLineJoinBevel ctLineJoinBevel = CTLineJoinBevel.Factory.newInstance(); - Assert.assertNotNull(ctLineJoinBevel); + assertNotNull(ctLineJoinBevel); CTLineJoinMiterProperties ctLineJoinMiterProperties = CTLineJoinMiterProperties.Factory.newInstance(); - Assert.assertNotNull(ctLineJoinMiterProperties); + assertNotNull(ctLineJoinMiterProperties); CTTileInfoProperties ctTileInfoProperties = CTTileInfoProperties.Factory.newInstance(); - Assert.assertNotNull(ctTileInfoProperties); + assertNotNull(ctTileInfoProperties); CTTableStyleTextStyle ctTableStyleTextStyle = CTTableStyleTextStyle.Factory.newInstance(); - Assert.assertNotNull(ctTableStyleTextStyle); + assertNotNull(ctTableStyleTextStyle); CTHeaderFooter ctHeaderFooter = CTHeaderFooter.Factory.newInstance(); - Assert.assertNotNull(ctHeaderFooter); + assertNotNull(ctHeaderFooter); CTMarkerSize ctMarkerSize = CTMarkerSize.Factory.newInstance(); - Assert.assertNotNull(ctMarkerSize); + assertNotNull(ctMarkerSize); CTDLbls ctdLbls = CTDLbls.Factory.newInstance(); - Assert.assertNotNull(ctdLbls); + assertNotNull(ctdLbls); CTMarker ctMarker = CTMarker.Factory.newInstance(); - Assert.assertNotNull(ctMarker); + assertNotNull(ctMarker); STMarkerStyle stMarkerStyle = STMarkerStyle.Factory.newInstance(); - Assert.assertNotNull(stMarkerStyle); + assertNotNull(stMarkerStyle); CTMarkerStyle ctMarkerStyle = CTMarkerStyle.Factory.newInstance(); - Assert.assertNotNull(ctMarkerStyle); + assertNotNull(ctMarkerStyle); CTExternalData ctExternalData = CTExternalData.Factory.newInstance(); - Assert.assertNotNull(ctExternalData); + assertNotNull(ctExternalData); CTAxisUnit ctAxisUnit = CTAxisUnit.Factory.newInstance(); - Assert.assertNotNull(ctAxisUnit); + assertNotNull(ctAxisUnit); CTLblAlgn ctLblAlgn = CTLblAlgn.Factory.newInstance(); - Assert.assertNotNull(ctLblAlgn); + assertNotNull(ctLblAlgn); CTDashStopList ctDashStopList = CTDashStopList.Factory.newInstance(); - Assert.assertNotNull(ctDashStopList); + assertNotNull(ctDashStopList); STDispBlanksAs stDashBlanksAs = STDispBlanksAs.Factory.newInstance(); - Assert.assertNotNull(stDashBlanksAs); + assertNotNull(stDashBlanksAs); CTDispBlanksAs ctDashBlanksAs = CTDispBlanksAs.Factory.newInstance(); - Assert.assertNotNull(ctDashBlanksAs); + assertNotNull(ctDashBlanksAs); CTAreaChart ctAreaChart = CTAreaChart.Factory.newInstance(); - Assert.assertNotNull(ctAreaChart); + assertNotNull(ctAreaChart); CTArea3DChart ctArea3DChart = CTArea3DChart.Factory.newInstance(); - Assert.assertNotNull(ctArea3DChart); + assertNotNull(ctArea3DChart); CTSurfaceChart ctSurfaceChart = CTSurfaceChart.Factory.newInstance(); - Assert.assertNotNull(ctSurfaceChart); + assertNotNull(ctSurfaceChart); CTDoughnutChart ctDoughnutChart = CTDoughnutChart.Factory.newInstance(); - Assert.assertNotNull(ctDoughnutChart); + assertNotNull(ctDoughnutChart); CTBar3DChart ctBar3DChart = CTBar3DChart.Factory.newInstance(); - Assert.assertNotNull(ctBar3DChart); + assertNotNull(ctBar3DChart); CTLine3DChart ctLine3DChart = CTLine3DChart.Factory.newInstance(); - Assert.assertNotNull(ctLine3DChart); + assertNotNull(ctLine3DChart); CTPie3DChart ctPie3DChart = CTPie3DChart.Factory.newInstance(); - Assert.assertNotNull(ctPie3DChart); + assertNotNull(ctPie3DChart); CTSurface3DChart ctSurface3DChart = CTSurface3DChart.Factory.newInstance(); - Assert.assertNotNull(ctSurface3DChart); + assertNotNull(ctSurface3DChart); CTAreaSer ctAreaSer = CTAreaSer.Factory.newInstance(); - Assert.assertNotNull(ctAreaSer); + assertNotNull(ctAreaSer); CTSurfaceSer ctSurfaceSer = CTSurfaceSer.Factory.newInstance(); - Assert.assertNotNull(ctSurfaceSer); + assertNotNull(ctSurfaceSer); CTView3D ctView3D = CTView3D.Factory.newInstance(); - Assert.assertNotNull(ctView3D); + assertNotNull(ctView3D); STShape stShape = STShape.Factory.newInstance(); - Assert.assertNotNull(stShape); + assertNotNull(stShape); STLblAlgn.Enum e1 = STLblAlgn.Enum.forString("ctr"); - Assert.assertNotNull(e1); + assertNotNull(e1); STBlackWhiteMode.Enum e2 = STBlackWhiteMode.Enum.forString("clr"); - Assert.assertNotNull(e2); + assertNotNull(e2); STRectAlignment.Enum e3 = STRectAlignment.Enum.forString("ctr"); - Assert.assertNotNull(e3); + assertNotNull(e3); STTileFlipMode.Enum e4 = STTileFlipMode.Enum.forString("xy"); - Assert.assertNotNull(e4); + assertNotNull(e4); STPresetPatternVal.Enum e5 = STPresetPatternVal.Enum.forString("horz"); - Assert.assertNotNull(e5); + assertNotNull(e5); STMarkerStyle.Enum e6 = STMarkerStyle.Enum.forString("circle"); - Assert.assertNotNull(e6); + assertNotNull(e6); STDispBlanksAs.Enum e7 = STDispBlanksAs.Enum.forString("span"); - Assert.assertNotNull(e7); + assertNotNull(e7); STShape.Enum e8 = STShape.Enum.forString("cone"); - Assert.assertNotNull(e8); + assertNotNull(e8); CTTextBulletTypefaceFollowText ctTextBulletTypefaceFollowText = CTTextBulletTypefaceFollowText.Factory.newInstance(); - Assert.assertNotNull(ctTextBulletTypefaceFollowText); + assertNotNull(ctTextBulletTypefaceFollowText); CTTextBulletSizeFollowText ctTextBulletSizeFollowText = CTTextBulletSizeFollowText.Factory.newInstance(); - Assert.assertNotNull(ctTextBulletSizeFollowText); + assertNotNull(ctTextBulletSizeFollowText); CTTextBulletColorFollowText ctTextBulletColorFollowText = CTTextBulletColorFollowText.Factory.newInstance(); - Assert.assertNotNull(ctTextBulletColorFollowText); + assertNotNull(ctTextBulletColorFollowText); CTTextBlipBullet ctTextBlipBullet = CTTextBlipBullet.Factory.newInstance(); - Assert.assertNotNull(ctTextBlipBullet); + assertNotNull(ctTextBlipBullet); CTRotX ctRotX = CTRotX.Factory.newInstance(); - Assert.assertNotNull(ctRotX); + assertNotNull(ctRotX); CTRotY ctRotY = CTRotY.Factory.newInstance(); - Assert.assertNotNull(ctRotY); + assertNotNull(ctRotY); CTPerspective ctPerspective = CTPerspective.Factory.newInstance(); - Assert.assertNotNull(ctPerspective); + assertNotNull(ctPerspective); CTDepthPercent ctDepthPercent = CTDepthPercent.Factory.newInstance(); - Assert.assertNotNull(ctDepthPercent); + assertNotNull(ctDepthPercent); CTHPercent ctHPercent = CTHPercent.Factory.newInstance(); - Assert.assertNotNull(ctHPercent); + assertNotNull(ctHPercent); CTShape ctShape = CTShape.Factory.newInstance(); - Assert.assertNotNull(ctShape); + assertNotNull(ctShape); CTOverlap ctOverlap = CTOverlap.Factory.newInstance(); - Assert.assertNotNull(ctOverlap); + assertNotNull(ctOverlap); CTFirstSliceAng ctFirstSliceAng = CTFirstSliceAng.Factory.newInstance(); - Assert.assertNotNull(ctFirstSliceAng); + assertNotNull(ctFirstSliceAng); - Assert.assertNotNull(ErrorBarType.BOTH); - Assert.assertNotNull(ErrorValueType.CUSTOM); - Assert.assertNotNull(ErrorDirection.X); + assertNotNull(ErrorBarType.BOTH); + assertNotNull(ErrorValueType.CUSTOM); + assertNotNull(ErrorDirection.X); XDDFErrorBars xeb = new XDDFErrorBars(); - Assert.assertNotNull(xeb); - Assert.assertNull(xeb.getErrorBarType()); - Assert.assertNull(xeb.getErrorDirection()); - Assert.assertNull(xeb.getErrorValueType()); - - Assert.assertNotNull(CTErrBarType.Factory.newInstance()); - Assert.assertNotNull(CTErrValType.Factory.newInstance()); - Assert.assertNotNull(CTErrDir.Factory.newInstance()); + assertNotNull(xeb); + assertNull(xeb.getErrorBarType()); + assertNull(xeb.getErrorDirection()); + assertNull(xeb.getErrorValueType()); + + assertNotNull(CTErrBarType.Factory.newInstance()); + assertNotNull(CTErrValType.Factory.newInstance()); + assertNotNull(CTErrDir.Factory.newInstance()); STErrBarType.Enum e9 = STErrBarType.Enum.forString("both"); - Assert.assertNotNull(e9); + assertNotNull(e9); STErrValType.Enum e10 = STErrValType.Enum.forString("percentage"); - Assert.assertNotNull(e10); + assertNotNull(e10); STErrDir.Enum e11 = STErrDir.Enum.forString("x"); - Assert.assertNotNull(e11); + assertNotNull(e11); CTErrBars bars = CTErrBars.Factory.newInstance(); - Assert.assertNotNull(bars); + assertNotNull(bars); } } Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestXDDFColor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestXDDFColor.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestXDDFColor.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestXDDFColor.java Thu Dec 24 18:42:29 2020 @@ -17,14 +17,15 @@ package org.apache.poi.xddf.usermodel; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.IOException; import org.apache.poi.xslf.usermodel.XMLSlideShow; import org.apache.poi.xslf.usermodel.XSLFTheme; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openxmlformats.schemas.drawingml.x2006.main.CTColor; import org.openxmlformats.schemas.drawingml.x2006.main.CTSRgbColor; import org.openxmlformats.schemas.drawingml.x2006.main.CTScRgbColor; @@ -45,20 +46,23 @@ public class TestXDDFColor { XSLFTheme theme = ppt.createSlide().getTheme(); XDDFColor color = XDDFColor.forColorContainer(getThemeColor(theme, STSchemeColorVal.ACCENT_2)); + assertNotNull(color); // accent2 in theme1.xml is <a:srgbClr val="C0504D"/> Diff d1 = DiffBuilder.compare(Input.fromString("<a:srgbClr val=\"C0504D\" " + XMLNS)) .withTest(color.getColorContainer().toString()).build(); - assertFalse(d1.toString(), d1.hasDifferences()); + assertFalse(d1.hasDifferences(), d1.toString()); color = XDDFColor.forColorContainer(getThemeColor(theme, STSchemeColorVal.LT_1)); + assertNotNull(color); Diff d2 = DiffBuilder.compare(Input.fromString("<a:sysClr lastClr=\"FFFFFF\" val=\"window\" " + XMLNS)) .withTest(color.getColorContainer().toString()).build(); - assertFalse(d2.toString(), d2.hasDifferences()); + assertFalse(d2.hasDifferences(), d2.toString()); color = XDDFColor.forColorContainer(getThemeColor(theme, STSchemeColorVal.DK_1)); + assertNotNull(color); Diff d3 = DiffBuilder.compare(Input.fromString("<a:sysClr lastClr=\"000000\" val=\"windowText\" " + XMLNS)) .withTest(color.getColorContainer().toString()).build(); - assertFalse(d3.toString(), d3.hasDifferences()); + assertFalse(d3.hasDifferences(), d3.toString()); } } @@ -71,7 +75,9 @@ public class TestXDDFColor { public void testPreset() { CTColor xml = CTColor.Factory.newInstance(); xml.addNewPrstClr().setVal(STPresetColorVal.AQUAMARINE); - String expected = XDDFColor.forColorContainer(xml).getXmlObject().toString(); + XDDFColor color = XDDFColor.forColorContainer(xml); + assertNotNull(color); + String expected = color.getXmlObject().toString(); XDDFColor built = XDDFColor.from(PresetColor.AQUAMARINE); assertEquals(expected, built.getXmlObject().toString()); } @@ -81,7 +87,9 @@ public class TestXDDFColor { CTColor xml = CTColor.Factory.newInstance(); CTSystemColor sys = xml.addNewSysClr(); sys.setVal(STSystemColorVal.CAPTION_TEXT); - String expected = XDDFColor.forColorContainer(xml).getXmlObject().toString(); + XDDFColor color = XDDFColor.forColorContainer(xml); + assertNotNull(color); + String expected = color.getXmlObject().toString(); XDDFColor built = new XDDFColorSystemDefined(sys, xml); assertEquals(expected, built.getXmlObject().toString()); @@ -96,7 +104,9 @@ public class TestXDDFColor { CTSRgbColor color = xml.addNewSrgbClr(); byte[] bs = new byte[]{-1, -1, -1}; color.setVal(bs); - String expected = XDDFColor.forColorContainer(xml).getXmlObject().toString(); + XDDFColor color2 = XDDFColor.forColorContainer(xml); + assertNotNull(color2); + String expected = color2.getXmlObject().toString(); XDDFColor built = XDDFColor.from(bs); assertEquals(expected, built.getXmlObject().toString()); @@ -110,7 +120,9 @@ public class TestXDDFColor { color.setR(0); color.setG(0); color.setB(0); - String expected = XDDFColor.forColorContainer(xml).getXmlObject().toString(); + XDDFColor color2 = XDDFColor.forColorContainer(xml); + assertNotNull(color2); + String expected = color2.getXmlObject().toString(); XDDFColorRgbPercent built = (XDDFColorRgbPercent) XDDFColor.from(-1, -1, -1); assertEquals(expected, built.getXmlObject().toString()); @@ -119,7 +131,9 @@ public class TestXDDFColor { color.setR(100_000); color.setG(100_000); color.setB(100_000); - expected = XDDFColor.forColorContainer(xml).getXmlObject().toString(); + color2 = XDDFColor.forColorContainer(xml); + assertNotNull(color2); + expected = color2.getXmlObject().toString(); built = (XDDFColorRgbPercent) XDDFColor.from(654321, 654321, 654321); assertEquals(expected, built.getXmlObject().toString()); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java Thu Dec 24 18:42:29 2020 @@ -18,12 +18,12 @@ */ package org.apache.poi.xddf.usermodel.chart; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import org.apache.poi.ooxml.POIXMLFactory; import org.apache.poi.ooxml.POIXMLRelation; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openxmlformats.schemas.drawingml.x2006.chart.CTChartSpace; public class TestXDDFChart { Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java Thu Dec 24 18:42:29 2020 @@ -16,10 +16,10 @@ ==================================================================== */ package org.apache.poi.xddf.usermodel.chart; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestXDDFChartExtensionList { Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java Thu Dec 24 18:42:29 2020 @@ -16,7 +16,7 @@ ==================================================================== */ package org.apache.poi.xddf.usermodel.chart; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; import java.io.FileOutputStream; @@ -28,9 +28,9 @@ import org.apache.poi.xssf.usermodel.XSS import org.apache.poi.xssf.usermodel.XSSFDrawing; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Test case for bug 63153 @@ -53,7 +53,7 @@ public class TestXDDFChartRemoveSeries { * This creates a workbook with one worksheet, which contains a single * scatter chart. */ - @Before + @BeforeEach public void setup() { final boolean bDebug = false; workbook = new XSSFWorkbook(); @@ -98,7 +98,7 @@ public class TestXDDFChartRemoveSeries { /** * This method writes the workbook to resultDir/fileName. */ - @After + @AfterEach public void cleanup() { if (workbook == null) { System.out.println(String.format(Locale.ROOT, "%s: workbook==null", procName)); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFDataSourcesFactory.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFDataSourcesFactory.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFDataSourcesFactory.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFDataSourcesFactory.java Thu Dec 24 18:42:29 2020 @@ -16,17 +16,17 @@ ==================================================================== */ package org.apache.poi.xddf.usermodel.chart; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.SheetBuilder; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link XDDFDataSourcesFactory}. Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextBodyProperties.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextBodyProperties.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextBodyProperties.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextBodyProperties.java Thu Dec 24 18:42:29 2020 @@ -16,14 +16,14 @@ ==================================================================== */ package org.apache.poi.xddf.usermodel.text; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import org.apache.poi.util.Units; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openxmlformats.schemas.drawingml.x2006.main.CTTextBodyProperties; public class TestXDDFTextBodyProperties { Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextRun.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextRun.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextRun.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextRun.java Thu Dec 24 18:42:29 2020 @@ -16,12 +16,12 @@ ==================================================================== */ package org.apache.poi.xddf.usermodel.text; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.io.InputStream; @@ -32,15 +32,13 @@ import org.apache.poi.util.LocaleUtil; import org.apache.poi.xslf.usermodel.XMLSlideShow; import org.apache.poi.xslf.usermodel.XSLFShape; import org.apache.poi.xslf.usermodel.XSLFSlide; -import org.apache.poi.xslf.usermodel.XSLFTextParagraph; -import org.apache.poi.xslf.usermodel.XSLFTextRun; import org.apache.poi.xslf.usermodel.XSLFTextShape; import org.apache.poi.xssf.usermodel.XSSFClientAnchor; import org.apache.poi.xssf.usermodel.XSSFDrawing; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFTextBox; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestXDDFTextRun { Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java Thu Dec 24 18:42:29 2020 @@ -17,7 +17,7 @@ package org.apache.poi.xdgf.extractor; import static org.apache.poi.POITestCase.assertContains; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.io.InputStream; @@ -25,9 +25,9 @@ import java.io.InputStream; import org.apache.poi.POIDataSamples; import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.xdgf.usermodel.XmlVisioDocument; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class TestXDGFVisioExtractor { @@ -35,13 +35,13 @@ public class TestXDGFVisioExtractor { private OPCPackage pkg; private XmlVisioDocument xml; - @Before + @BeforeEach public void setUp() throws Exception { pkg = OPCPackage.open(SAMPLES.openResourceAsStream("test_text_extraction.vsdx")); xml = new XmlVisioDocument(pkg); } - - @After + + @AfterEach public void closeResources() throws IOException { if(xml != null) { xml.close(); @@ -53,14 +53,14 @@ public class TestXDGFVisioExtractor { public void testGetSimpleText() throws IOException { new XDGFVisioExtractor(xml).close(); new XDGFVisioExtractor(pkg).close(); - + XDGFVisioExtractor extractor = new XDGFVisioExtractor(xml); extractor.getText(); - + String text = extractor.getText(); String expected = "Text here\nText there\nText, text, everywhere!\nRouter here\n"; assertEquals(expected, text); - + extractor.close(); } @@ -77,7 +77,7 @@ public class TestXDGFVisioExtractor { assertContains(text, "Arrears"); extractor.close(); } - + /** * Some confusion on PolylineTo vs PolyLineTo, both should be handled. * Previously failed with: Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/CombinedIteratorTest.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/CombinedIteratorTest.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/CombinedIteratorTest.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/CombinedIteratorTest.java Thu Dec 24 18:42:29 2020 @@ -17,12 +17,15 @@ package org.apache.poi.xdgf.usermodel.section; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Iterator; import java.util.SortedMap; import java.util.TreeMap; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CombinedIteratorTest { @@ -31,11 +34,11 @@ public class CombinedIteratorTest { Iterator<String> iter = iterable.iterator(); for (String element : expected) { - Assert.assertTrue(iter.hasNext()); - Assert.assertEquals(element, iter.next()); + assertTrue(iter.hasNext()); + assertEquals(element, iter.next()); } - Assert.assertFalse(iter.hasNext()); + assertFalse(iter.hasNext()); } @Test Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java Thu Dec 24 18:42:29 2020 @@ -17,14 +17,14 @@ package org.apache.poi.xslf; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.Arrays; import java.util.List; import java.util.function.Supplier; import org.apache.xmlbeans.XmlObject; -import org.junit.Test; +import org.junit.jupiter.api.Test; // aim is to get these classes loaded and included in poi-ooxml-lite.jar public class TestNecessaryOOXMLClasses { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org For additional commands, e-mail: commits-h...@poi.apache.org