Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java Thu Dec 24 18:42:29 2020 @@ -17,9 +17,9 @@ package org.apache.poi.hssf.record; -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 org.apache.poi.ss.formula.ptg.AttrPtg; import org.apache.poi.ss.formula.ptg.FuncVarPtg; @@ -28,7 +28,7 @@ import org.apache.poi.ss.formula.ptg.Ptg import org.apache.poi.ss.formula.ptg.RefPtg; import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.FormulaError; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link FormulaRecord} @@ -83,17 +83,18 @@ public final class TestFormulaRecord { }; FormulaRecord record = new FormulaRecord(TestcaseRecordInputStream.create(FormulaRecord.sid, formulaByte)); - assertEquals("Row", 0, record.getRow()); - assertEquals("Column", 0, record.getColumn()); + assertEquals(0, record.getRow(), "Row"); + assertEquals(0, record.getColumn(), "Column"); //noinspection deprecation assertEquals(CellType.ERROR.getCode(), record.getCachedResultType()); assertEquals(CellType.ERROR, record.getCachedResultTypeEnum()); byte[] output = record.serialize(); - assertEquals("Output size", 33, output.length); //includes sid+recordlength + // includes sid+recordlength + assertEquals(33, output.length, "Output size"); for (int i = 5; i < 13;i++) { - assertEquals("FormulaByte NaN doesn't match", formulaByte[i], output[i+4]); + assertEquals(formulaByte[i], output[i+4], "FormulaByte NaN doesn't match"); } } @@ -111,11 +112,12 @@ public final class TestFormulaRecord { formulaByte[20]=(byte)0x05; formulaByte[22]=(byte)0x01; FormulaRecord record = new FormulaRecord(TestcaseRecordInputStream.create(FormulaRecord.sid, formulaByte)); - assertEquals("Row", 0, record.getRow()); - assertEquals("Column", 0, record.getColumn()); + assertEquals(0, record.getRow(), "Row"); + assertEquals(0, record.getColumn(), "Column"); byte[] output = record.serialize(); - assertEquals("Output size", 31, output.length); //includes sid+recordlength - assertEquals("Offset 22", 1, output[26]); + // includes sid+recordlength + assertEquals(31, output.length, "Output size"); + assertEquals(1, output[26], "Offset 22"); } @Test @@ -191,7 +193,7 @@ public final class TestFormulaRecord { fr0.setCachedResultBoolean(false); fr1.setCachedResultBoolean(true); - assertFalse("Identified bug 46479c", fr0.getCachedBooleanValue() && !fr1.getCachedBooleanValue()); + assertFalse(fr0.getCachedBooleanValue() && !fr1.getCachedBooleanValue(), "Identified bug 46479c"); assertFalse(fr0.getCachedBooleanValue()); assertTrue(fr1.getCachedBooleanValue()); }
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java Thu Dec 24 18:42:29 2020 @@ -18,10 +18,10 @@ package org.apache.poi.hssf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the FtCblsSubRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java Thu Dec 24 18:42:29 2020 @@ -17,10 +17,10 @@ package org.apache.poi.hssf.record; import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.ByteArrayInputStream; import java.io.DataInputStream; @@ -33,7 +33,7 @@ import org.apache.poi.util.HexDump; import org.apache.poi.util.HexRead; import org.apache.poi.util.LittleEndianByteArrayInputStream; import org.apache.poi.util.LittleEndianByteArrayOutputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test HyperlinkRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java Thu Dec 24 18:42:29 2020 @@ -18,14 +18,14 @@ package org.apache.poi.hssf.record; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayInputStream; import java.util.List; import org.apache.poi.util.HexDump; import org.apache.poi.util.HexRead; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the EndSubRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestLabelRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestLabelRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestLabelRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestLabelRecord.java Thu Dec 24 18:42:29 2020 @@ -17,14 +17,14 @@ package org.apache.poi.hssf.record; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for <tt>LabelRecord</tt> Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java Thu Dec 24 18:42:29 2020 @@ -19,10 +19,10 @@ package org.apache.poi.hssf.record; import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -33,7 +33,7 @@ import org.apache.poi.ss.util.CellRangeA import org.apache.poi.util.HexRead; import org.apache.poi.util.LittleEndianInputStream; import org.apache.poi.util.LittleEndianOutputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the LbsDataSubRecord class works correctly. Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java Thu Dec 24 18:42:29 2020 @@ -17,8 +17,8 @@ package org.apache.poi.hssf.record; -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.util.ArrayList; import java.util.List; @@ -26,7 +26,7 @@ import java.util.List; import org.apache.poi.hssf.model.RecordStream; import org.apache.poi.hssf.record.aggregates.MergedCellsTable; import org.apache.poi.ss.util.CellRangeAddress; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** @@ -43,15 +43,15 @@ public final class TestMergeCellsRecord MergeCellsRecord merge = new MergeCellsRecord(cras, 0, cras.length); MergeCellsRecord clone = merge.copy(); - assertNotSame("Merged and cloned objects are the same", merge, clone); + assertNotSame(merge, clone, "Merged and cloned objects are the same"); CellRangeAddress mergeRegion = merge.getAreaAt(0); CellRangeAddress cloneRegion = clone.getAreaAt(0); - assertNotSame("Should not point to same objects when cloning", mergeRegion, cloneRegion); - assertEquals("New Clone Row From doesnt match", mergeRegion.getFirstRow(), cloneRegion.getFirstRow()); - assertEquals("New Clone Row To doesnt match", mergeRegion.getLastRow(), cloneRegion.getLastRow()); - assertEquals("New Clone Col From doesnt match", mergeRegion.getFirstColumn(), cloneRegion.getFirstColumn()); - assertEquals("New Clone Col To doesnt match", mergeRegion.getLastColumn(), cloneRegion.getLastColumn()); + assertNotSame(mergeRegion, cloneRegion, "Should not point to same objects when cloning"); + assertEquals(mergeRegion.getFirstRow(), cloneRegion.getFirstRow(), "New Clone Row From doesnt match"); + assertEquals(mergeRegion.getLastRow(), cloneRegion.getLastRow(), "New Clone Row To doesnt match"); + assertEquals(mergeRegion.getFirstColumn(), cloneRegion.getFirstColumn(), "New Clone Col From doesnt match"); + assertEquals(mergeRegion.getLastColumn(), cloneRegion.getLastColumn(), "New Clone Col To doesnt match"); assertNotSame(merge.getAreaAt(0), clone.getAreaAt(0)); } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNameCommentRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNameCommentRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNameCommentRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNameCommentRecord.java Thu Dec 24 18:42:29 2020 @@ -18,10 +18,10 @@ package org.apache.poi.hssf.record; import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.poi.util.HexRead; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the NameCommentRecord serializes/deserializes correctly Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNameRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNameRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNameRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNameRecord.java Thu Dec 24 18:42:29 2020 @@ -18,10 +18,10 @@ package org.apache.poi.hssf.record; import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; @@ -34,7 +34,7 @@ import org.apache.poi.ss.formula.ptg.Nam import org.apache.poi.ss.formula.ptg.Ptg; import org.apache.poi.ss.formula.ptg.Ref3DPtg; import org.apache.poi.util.HexRead; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the NameRecord serializes/deserializes correctly Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java Thu Dec 24 18:42:29 2020 @@ -18,14 +18,14 @@ package org.apache.poi.hssf.record; import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +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.assertTrue; import org.apache.poi.util.HexRead; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the NoteRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java Thu Dec 24 18:42:29 2020 @@ -18,10 +18,10 @@ package org.apache.poi.hssf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the NoteRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestObjRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestObjRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestObjRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestObjRecord.java Thu Dec 24 18:42:29 2020 @@ -18,16 +18,16 @@ package org.apache.poi.hssf.record; import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; import java.util.List; import org.apache.poi.util.HexRead; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the ObjRecord class works correctly. @@ -111,11 +111,7 @@ public final class TestObjRecord { @Test public void testReadWriteWithPadding_bug45133() { ObjRecord record = new ObjRecord(TestcaseRecordInputStream.create(recdataNeedingPadding)); - - if (record.getRecordSize() == 34) { - fail("Identified bug 45133"); - } - + assertNotEquals(34, record.getRecordSize(), "Identified bug 45133"); assertEquals(36, record.getRecordSize()); List<SubRecord> subrecords = record.getSubRecords(); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java Thu Dec 24 18:42:29 2020 @@ -25,7 +25,7 @@ import org.apache.poi.hssf.usermodel.HSS import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.DataValidationConstraint; import org.apache.poi.ss.util.CellRangeAddressList; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Verify that presence of PLV record doesn't break data Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java Thu Dec 24 18:42:29 2020 @@ -17,13 +17,14 @@ package org.apache.poi.hssf.record; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.Map; import java.util.Map.Entry; import org.apache.poi.hssf.util.HSSFColor; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Verifies that custom palette editing works correctly @@ -46,9 +47,10 @@ public final class TestPaletteRecord { byte[] paletteTriplet = palette.getColor((short) index); String msg = "Expected HSSFColor constant to match PaletteRecord at index" + (index == c.getIndex2() ? "2" : "") + " 0x" + Integer.toHexString(index); - assertEquals(msg, rgbTriplet[0], paletteTriplet[0] & 0xff); - assertEquals(msg, rgbTriplet[1], paletteTriplet[1] & 0xff); - assertEquals(msg, rgbTriplet[2], paletteTriplet[2] & 0xff); + assertNotNull(paletteTriplet); + assertEquals(rgbTriplet[0], paletteTriplet[0] & 0xff, msg); + assertEquals(rgbTriplet[1], paletteTriplet[1] & 0xff, msg); + assertEquals(rgbTriplet[2], paletteTriplet[2] & 0xff, msg); } } } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPaneRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPaneRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPaneRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPaneRecord.java Thu Dec 24 18:42:29 2020 @@ -19,9 +19,9 @@ package org.apache.poi.hssf.record; import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the PaneRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecalcIdRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecalcIdRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecalcIdRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecalcIdRecord.java Thu Dec 24 18:42:29 2020 @@ -18,11 +18,11 @@ package org.apache.poi.hssf.record; import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.poi.util.HexRead; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class TestRecalcIdRecord { Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java Thu Dec 24 18:42:29 2020 @@ -17,7 +17,7 @@ package org.apache.poi.hssf.record; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -27,7 +27,7 @@ import java.util.List; import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.apache.poi.util.HexRead; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the record factory @@ -123,25 +123,19 @@ public final class TestRecordFactory { ByteArrayInputStream bois = new ByteArrayInputStream(data); Record[] records = RecordFactory.createRecords(bois).toArray(new Record[0]); - assertEquals("Created record count", 3, records.length); - assertEquals("1st record's type", - UnknownRecord.class.getName(), - records[ 0 ].getClass().getName()); - assertEquals("1st record's sid", (short)-256, records[0].getSid()); - assertEquals("2nd record's type", - ContinueRecord.class.getName(), - records[ 1 ].getClass().getName()); + assertEquals(3, records.length, "Created record count"); + assertEquals(UnknownRecord.class.getName(), records[ 0 ].getClass().getName(), "1st record's type"); + assertEquals((short)-256, records[0].getSid(), "1st record's sid"); + assertEquals(ContinueRecord.class.getName(), records[ 1 ].getClass().getName(), "2nd record's type"); ContinueRecord record = (ContinueRecord) records[1]; - assertEquals("2nd record's sid", 0x3C, record.getSid()); - assertEquals("1st data byte", 1, record.getData()[ 0 ]); - assertEquals("2nd data byte", 2, record.getData()[ 1 ]); - assertEquals("3rd data byte", 3, record.getData()[ 2 ]); - assertEquals("3rd record's type", - ContinueRecord.class.getName(), - records[ 2 ].getClass().getName()); + assertEquals(0x3C, record.getSid(), "2nd record's sid"); + assertEquals(1, record.getData()[ 0 ], "1st data byte"); + assertEquals(2, record.getData()[ 1 ], "2nd data byte"); + assertEquals(3, record.getData()[ 2 ], "3rd data byte"); + assertEquals(ContinueRecord.class.getName(), records[ 2 ].getClass().getName(), "3rd record's type"); record = (ContinueRecord) records[2]; - assertEquals("3nd record's sid", 0x3C, record.getSid()); - assertEquals("4th data byte", 4, record.getData()[ 0 ]); + assertEquals(0x3C, record.getSid(), "3nd record's sid"); + assertEquals(4, record.getData()[ 0 ], "4th data byte"); } /** @@ -151,10 +145,8 @@ public final class TestRecordFactory { */ @Test public void testMixedContinue() throws IOException { - /** - * Adapted from a real test sample file 39512.xls (Offset 0x4854). - * See Bug 39512 for details. - */ + // Adapted from a real test sample file 39512.xls (Offset 0x4854). + // See Bug 39512 for details. String dump = //OBJ "5D 00 48 00 15 00 12 00 0C 00 3C 00 11 00 A0 2E 03 01 CC 42 " + Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java Thu Dec 24 18:42:29 2020 @@ -17,17 +17,17 @@ package org.apache.poi.hssf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayInputStream; import org.apache.poi.EncryptedDocumentException; import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey; import org.apache.poi.util.HexRead; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link RecordFactoryInputStream} Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordInputStream.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordInputStream.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordInputStream.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordInputStream.java Thu Dec 24 18:42:29 2020 @@ -17,10 +17,10 @@ package org.apache.poi.hssf.record; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.poi.util.HexRead; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link RecordInputStream} Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java Thu Dec 24 18:42:29 2020 @@ -19,9 +19,9 @@ package org.apache.poi.hssf.record; import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the SCLRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java Thu Dec 24 18:42:29 2020 @@ -17,7 +17,7 @@ package org.apache.poi.hssf.record; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.io.InputStream; @@ -26,7 +26,7 @@ import org.apache.poi.hssf.HSSFTestDataS import org.apache.poi.hssf.record.common.UnicodeString; import org.apache.poi.util.HexRead; import org.apache.poi.util.IntMapper; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Exercise the SSTDeserializer class. @@ -42,7 +42,7 @@ public final class TestSSTDeserializer { System.arraycopy(b, 0, result, a.length, b.length); return result; } - + private static byte[] readSampleHexData(String sampleFileName, String sectionName, int recSid) throws IOException { InputStream is = HSSFTestDataSamples.openSampleFileStream(sampleFileName); @@ -57,7 +57,7 @@ public final class TestSSTDeserializer { byte[] header = readSampleHexData("richtextdata.txt", "header", FAKE_SID); byte[] continueBytes = readSampleHexData("richtextdata.txt", "continue1", ContinueRecord.sid); RecordInputStream in = TestcaseRecordInputStream.create(concat(header, continueBytes)); - + IntMapper<UnicodeString> strings = new IntMapper<>(); SSTDeserializer deserializer = new SSTDeserializer( strings ); @@ -88,7 +88,7 @@ public final class TestSSTDeserializer { byte[] header = readSampleHexData("stringacross2continuations.txt", "header", FAKE_SID); byte[] continue1 = readSampleHexData("stringacross2continuations.txt", "continue1", ContinueRecord.sid); byte[] continue2 = readSampleHexData("stringacross2continuations.txt", "continue2", ContinueRecord.sid); - + RecordInputStream in = TestcaseRecordInputStream.create(concat(header, concat(continue1, continue2))); IntMapper<UnicodeString> strings = new IntMapper<>(); @@ -104,7 +104,7 @@ public final class TestSSTDeserializer { byte[] header = readSampleHexData("extendedtextstrings.txt", "rich-header", FAKE_SID); byte[] continueBytes = readSampleHexData("extendedtextstrings.txt", "rich-continue1", ContinueRecord.sid); RecordInputStream in = TestcaseRecordInputStream.create(concat(header, continueBytes)); - + IntMapper<UnicodeString> strings = new IntMapper<>(); SSTDeserializer deserializer = new SSTDeserializer( strings ); deserializer.manufactureStrings( 1, in); @@ -115,7 +115,7 @@ public final class TestSSTDeserializer { header = readSampleHexData("extendedtextstrings.txt", "norich-header", FAKE_SID); continueBytes = readSampleHexData("extendedtextstrings.txt", "norich-continue1", ContinueRecord.sid); in = TestcaseRecordInputStream.create(concat(header, continueBytes)); - + strings = new IntMapper<>(); deserializer = new SSTDeserializer( strings ); deserializer.manufactureStrings( 1, in); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java Thu Dec 24 18:42:29 2020 @@ -17,10 +17,10 @@ package org.apache.poi.hssf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.fail; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -39,7 +39,7 @@ import org.apache.poi.poifs.storage.RawD import org.apache.poi.util.HexRead; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LocaleUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class TestSSTRecord { @@ -339,9 +339,9 @@ public final class TestSSTRecord { * deep comparison of two SST records */ private static void assertRecordEquals(SSTRecord expected, SSTRecord actual){ - assertEquals("number of strings", expected.getNumStrings(), actual.getNumStrings()); - assertEquals("number of unique strings", expected.getNumUniqueStrings(), actual.getNumUniqueStrings()); - assertEquals("count of strings", expected.countStrings(), actual.countStrings()); + assertEquals(expected.getNumStrings(), actual.getNumStrings(), "number of strings"); + assertEquals(expected.getNumUniqueStrings(), actual.getNumUniqueStrings(), "number of unique strings"); + assertEquals(expected.countStrings(), actual.countStrings(), "count of strings"); Iterator<UnicodeString> iterA = expected.getStrings(); Iterator<UnicodeString> iterB = actual.getStrings(); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java Thu Dec 24 18:42:29 2020 @@ -17,13 +17,13 @@ package org.apache.poi.hssf.record; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.poi.hssf.record.common.UnicodeString; import org.apache.poi.hssf.record.cont.ContinuableRecordOutput; import org.apache.poi.util.IntMapper; import org.apache.poi.util.LittleEndianConsts; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that records size calculates correctly. Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java Thu Dec 24 18:42:29 2020 @@ -17,9 +17,9 @@ package org.apache.poi.hssf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import java.util.stream.Stream; @@ -39,7 +39,7 @@ import org.apache.poi.ss.formula.ptg.Ref import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.CellValue; import org.apache.poi.util.LittleEndianInput; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class TestSharedFormulaRecord { @@ -87,14 +87,14 @@ public final class TestSharedFormulaReco RefPtg refPtg = (RefPtg) convertedFormula[1]; assertEquals("$C101", refPtg.toFormulaString()); - assertNotEquals("Identified bug 45123", Ptg.CLASS_REF, refPtg.getPtgClass()); + assertNotEquals(Ptg.CLASS_REF, refPtg.getPtgClass(), "Identified bug 45123"); confirmOperandClasses(sharedFormula, convertedFormula); } private static void confirmOperandClasses(Ptg[] originalPtgs, Ptg[] convertedPtgs) { int[] exp = Stream.of(originalPtgs).map(Ptg::getPtgClass).mapToInt(Byte::intValue).toArray(); int[] act = Stream.of(convertedPtgs).map(Ptg::getPtgClass).mapToInt(Byte::intValue).toArray(); - assertArrayEquals("Different operand class", exp, act); + assertArrayEquals(exp, act, "Different operand class"); } @Test Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestStringRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestStringRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestStringRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestStringRecord.java Thu Dec 24 18:42:29 2020 @@ -18,15 +18,16 @@ package org.apache.poi.hssf.record; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import org.apache.poi.util.HexRead; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianByteArrayInputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the StringRecord @@ -58,10 +59,10 @@ public final class TestStringRecord { byte [] recordBytes = record.serialize(); assertEquals(recordBytes.length - 4, data.length); for (int i = 0; i < data.length; i++) { - assertEquals("At offset " + i, data[i], recordBytes[i+4]); + assertEquals(data[i], recordBytes[i+4], "At offset " + i); } } - + @Test public void testContinue() throws IOException { int MAX_BIFF_DATA = RecordInputStream.MAX_RECORD_DATA_SIZE; @@ -77,9 +78,8 @@ public final class TestStringRecord { sr.setString(sb.toString()); byte[] ser = sr.serialize(); assertEquals(StringRecord.sid, LittleEndian.getUShort(ser, 0)); - if (LittleEndian.getUShort(ser, 2) > MAX_BIFF_DATA) { - fail("StringRecord should have been split with a continue record"); - } + assertTrue(LittleEndian.getUShort(ser, 2) <= MAX_BIFF_DATA, + "StringRecord should have been split with a continue record"); // Confirm expected size of first record, and ushort strLen. assertEquals(MAX_BIFF_DATA, LittleEndian.getUShort(ser, 2)); assertEquals(TEXT_LEN, LittleEndian.getUShort(ser, 4)); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestStyleRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestStyleRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestStyleRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestStyleRecord.java Thu Dec 24 18:42:29 2020 @@ -18,10 +18,10 @@ package org.apache.poi.hssf.record; import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.poi.util.HexRead; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link StyleRecord} Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSubRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSubRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSubRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSubRecord.java Thu Dec 24 18:42:29 2020 @@ -20,15 +20,15 @@ package org.apache.poi.hssf.record; import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import java.util.Arrays; import org.apache.poi.util.HexRead; import org.apache.poi.util.LittleEndian; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests Subrecord components of an OBJ record. Test data taken directly @@ -79,7 +79,7 @@ public final class TestSubRecord { RecordInputStream in = TestcaseRecordInputStream.create(dataAutoFilter); ObjRecord or = new ObjRecord(in); byte[] data2 = or.serialize(); - assertNotEquals("Identified bug 45778", 8228, data2.length); + assertNotEquals(8228, data2.length, "Identified bug 45778"); assertEquals(74, data2.length); assertArrayEquals(dataAutoFilter, data2); } @@ -100,9 +100,9 @@ public final class TestSubRecord { RecordInputStream in = TestcaseRecordInputStream.create(data); ObjRecord or = new ObjRecord(in); byte[] data2 = or.serialize(); - assertNotEquals("Identified bug 45778", 8228, data2.length); - assertEquals("Encoded length", data.length, data2.length); - assertArrayEquals("Encoded data differs", data, data2); + assertNotEquals(8228, data2.length, "Identified bug 45778"); + assertEquals(data.length, data2.length, "Encoded length"); + assertArrayEquals(data, data2, "Encoded data differs"); } /** Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSupBookRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSupBookRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSupBookRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSupBookRecord.java Thu Dec 24 18:42:29 2020 @@ -27,10 +27,10 @@ import static org.apache.poi.hssf.record import static org.apache.poi.hssf.record.SupBookRecord.CH_VOLUME; import static org.apache.poi.hssf.record.SupBookRecord.PATH_SEPERATOR; import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the SupBook record Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestTableRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestTableRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestTableRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestTableRecord.java Thu Dec 24 18:42:29 2020 @@ -18,10 +18,10 @@ package org.apache.poi.hssf.record; import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.poi.hssf.util.CellRangeAddress8Bit; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the TableRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java Thu Dec 24 18:42:29 2020 @@ -18,13 +18,13 @@ package org.apache.poi.hssf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +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 org.apache.poi.hssf.usermodel.HSSFRichTextString; import org.apache.poi.util.HexRead; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the TextObjectBaseRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestTextObjectRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestTextObjectRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestTextObjectRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestTextObjectRecord.java Thu Dec 24 18:42:29 2020 @@ -17,9 +17,9 @@ package org.apache.poi.hssf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.ByteArrayInputStream; @@ -28,7 +28,7 @@ import org.apache.poi.ss.formula.ptg.Ptg import org.apache.poi.ss.formula.ptg.RefPtg; import org.apache.poi.util.HexRead; import org.apache.poi.util.LittleEndian; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that serialization and deserialization of the TextObjectRecord . @@ -97,7 +97,7 @@ public final class TestTextObjectRecord byte [] ser = record.serialize(); int formatDataLen = LittleEndian.getUShort(ser, 16); - assertEquals("formatDataLength", 0, formatDataLen); + assertEquals(0, formatDataLen, "formatDataLength"); assertEquals(22, ser.length); // just the TXO record Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestUnicodeNameRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestUnicodeNameRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestUnicodeNameRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestUnicodeNameRecord.java Thu Dec 24 18:42:29 2020 @@ -18,14 +18,14 @@ package org.apache.poi.hssf.record; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.IOException; import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class TestUnicodeNameRecord { Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestWriteAccessRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestWriteAccessRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestWriteAccessRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestWriteAccessRecord.java Thu Dec 24 18:42:29 2020 @@ -18,10 +18,10 @@ package org.apache.poi.hssf.record; import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.poi.util.HexRead; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link WriteAccessRecord} Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestcaseRecordInputStream.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestcaseRecordInputStream.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestcaseRecordInputStream.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestcaseRecordInputStream.java Thu Dec 24 18:42:29 2020 @@ -17,8 +17,8 @@ package org.apache.poi.hssf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -85,7 +85,7 @@ public final class TestcaseRecordInputSt */ public static void confirmRecordEncoding(String msgPrefix, int expectedSid, byte[] expectedData, byte[] actualRecordBytes) { int expectedDataSize = expectedData.length; - assertEquals("Size of encode data mismatch", actualRecordBytes.length - 4, expectedDataSize); + assertEquals(actualRecordBytes.length - 4, expectedDataSize, "Size of encode data mismatch"); assertEquals(expectedSid, LittleEndian.getShort(actualRecordBytes, 0)); assertEquals(expectedDataSize, LittleEndian.getShort(actualRecordBytes, 2)); assertArrayEquals(expectedData, cut(actualRecordBytes, 4)); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java Thu Dec 24 18:42:29 2020 @@ -17,12 +17,12 @@ package org.apache.poi.hssf.record.aggregates; -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.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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -36,13 +36,12 @@ import org.apache.poi.hssf.record.CFRule import org.apache.poi.hssf.record.CFRuleBase; import org.apache.poi.hssf.record.CFRuleBase.ComparisonOperator; import org.apache.poi.hssf.record.CFRuleRecord; -import org.apache.poi.hssf.record.Record; import org.apache.poi.hssf.record.RecordFactory; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.util.LittleEndian; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the CFRecordsAggregate @@ -138,7 +137,7 @@ public final class TestCFRecordsAggregat agg.serialize(0, serializedRecord); int nRules = LittleEndian.getUShort(serializedRecord, 4); - assertNotEquals("Identified bug 45682 b", 0, nRules); + assertNotEquals(0, nRules, "Identified bug 45682 b"); assertEquals(rules.length, nRules); } @@ -150,27 +149,20 @@ public final class TestCFRecordsAggregat new CellRangeAddress(0,1,0,0), new CellRangeAddress(0,1,2,2), }; - CFRuleBase[] rules = { + CFRuleBase[] rules1 = { CFRuleRecord.create(sheet, "7"), CFRule12Record.create(sheet, ComparisonOperator.BETWEEN, "2", "5"), }; - try { - new CFRecordsAggregate(cellRanges, rules); - fail("Shouldn't be able to mix between types"); - } catch (IllegalArgumentException e) { - // expected here - } + assertThrows(IllegalArgumentException.class, () -> new CFRecordsAggregate(cellRanges, rules1), + "Shouldn't be able to mix between types"); - rules = new CFRuleBase[] { CFRuleRecord.create(sheet, "7") }; - CFRecordsAggregate agg = new CFRecordsAggregate(cellRanges, rules); + + CFRuleBase[] rules2 = { CFRuleRecord.create(sheet, "7") }; + CFRecordsAggregate agg = new CFRecordsAggregate(cellRanges, rules2); assertTrue(agg.getHeader().getNeedRecalculation()); - try { - agg.addRule(CFRule12Record.create(sheet, "7")); - fail("Shouldn't be able to mix between types"); - } catch (IllegalArgumentException e) { - // expected here - } + assertThrows(IllegalArgumentException.class, () -> agg.addRule(CFRule12Record.create(sheet, "7")), + "Shouldn't be able to mix between types"); } } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java Thu Dec 24 18:42:29 2020 @@ -17,16 +17,15 @@ package org.apache.poi.hssf.record.aggregates; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.List; import org.apache.poi.hssf.record.ColumnInfoRecord; -import org.apache.poi.hssf.record.Record; import org.apache.poi.hssf.record.RecordBase; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class TestColumnInfoRecordsAggregate { @@ -109,7 +108,7 @@ public final class TestColumnInfoRecords cirs.clear(); agg.visitContainedRecords(cirs::add); assertEquals(4, cirs.size()); - assertTrue("Inner group should still be hidden", ((ColumnInfoRecord)cirs.get(1)).getHidden()); + assertTrue(((ColumnInfoRecord)cirs.get(1)).getHidden(), "Inner group should still be hidden"); confirmCIR(cirs, 0, 1, 3, 1, true, false); confirmCIR(cirs, 1, 4, 12, 2, true, false); confirmCIR(cirs, 2, 13, 15, 1, true, false); @@ -119,10 +118,10 @@ public final class TestColumnInfoRecords private static void confirmCIR(List<org.apache.poi.hssf.record.Record> cirs, int ix, int startColIx, int endColIx, int level, boolean isHidden, boolean isCollapsed) { assertTrue(cirs.get(ix) instanceof ColumnInfoRecord); ColumnInfoRecord cir = (ColumnInfoRecord)cirs.get(ix); - assertEquals("startColIx", startColIx, cir.getFirstColumn()); - assertEquals("endColIx", endColIx, cir.getLastColumn()); - assertEquals("level", level, cir.getOutlineLevel()); - assertEquals("hidden", isHidden, cir.getHidden()); - assertEquals("collapsed", isCollapsed, cir.getCollapsed()); + assertEquals(startColIx, cir.getFirstColumn(), "startColIx"); + assertEquals(endColIx, cir.getLastColumn(), "endColIx"); + assertEquals(level, cir.getOutlineLevel(), "level"); + assertEquals(isHidden, cir.getHidden(), "hidden"); + assertEquals(isCollapsed, cir.getCollapsed(), "collapsed"); } } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java Thu Dec 24 18:42:29 2020 @@ -17,23 +17,22 @@ package org.apache.poi.hssf.record.aggregates; -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.util.ArrayList; import java.util.List; import org.apache.poi.hssf.model.HSSFFormulaParser; import org.apache.poi.hssf.record.FormulaRecord; -import org.apache.poi.hssf.record.Record; import org.apache.poi.hssf.record.StringRecord; import org.apache.poi.ss.formula.FormulaRenderer; import org.apache.poi.ss.formula.FormulaType; import org.apache.poi.ss.formula.ptg.ExpPtg; import org.apache.poi.ss.formula.ptg.Ptg; import org.apache.poi.ss.util.CellRangeAddress; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class TestFormulaRecordAggregate { Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java Thu Dec 24 18:42:29 2020 @@ -17,12 +17,12 @@ package org.apache.poi.hssf.record.aggregates; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +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.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Arrays; @@ -55,7 +55,7 @@ import org.apache.poi.hssf.usermodel.HSS import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.util.HexRead; import org.apache.poi.util.RecordFormatException; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tess for {@link PageSettingsBlock} @@ -228,7 +228,7 @@ public final class TestPageSettingsBlock List<org.apache.poi.hssf.record.Record> outRecs = new ArrayList<>(); psb.visitContainedRecords(outRecs::add); - assertNotEquals("PageSettingsBlock didn't add missing header/footer records", 2, outRecs.size()); + assertNotEquals(2, outRecs.size(), "PageSettingsBlock didn't add missing header/footer records"); Class<?>[] act = outRecs.stream().map(Object::getClass).toArray(Class[]::new); Class<?>[] exp = { HeaderRecord.class, FooterRecord.class, HCenterRecord.class, VCenterRecord.class}; Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java Thu Dec 24 18:42:29 2020 @@ -17,10 +17,11 @@ package org.apache.poi.hssf.record.aggregates; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.util.ArrayList; import java.util.Arrays; @@ -41,7 +42,7 @@ import org.apache.poi.hssf.record.Unknow import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.util.CellRangeAddress8Bit; import org.apache.poi.util.LocaleUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link RowRecordsAggregate} @@ -58,8 +59,8 @@ public final class TestRowRecordsAggrega RowRecord rr1 = rra.getRow(4); assertNotNull(rr1); - assertEquals("Row number is 1", 4, rr1.getRowNumber()); - assertSame("Row record retrieved is identical ", rr1, rr); + assertEquals(4, rr1.getRowNumber(), "Row number is 1"); + assertSame(rr1, rr, "Row record retrieved is identical "); } /** @@ -108,11 +109,8 @@ public final class TestRowRecordsAggrega if (rec.getClass() == shfClass) { result++; Record prevRec = recs.get(i-1); - if (!(prevRec instanceof FormulaRecord)) { - fail("Bad record order at index " - + i + ": Formula record expected but got (" - + prevRec.getClass().getName() + ")"); - } + assertTrue(prevRec instanceof FormulaRecord, + "Bad record order at index " + i + ": Formula record expected but got (" + prevRec.getClass().getName() + ")"); verifySharedFormula((FormulaRecord) prevRec, rec); } } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java Thu Dec 24 18:42:29 2020 @@ -17,8 +17,8 @@ package org.apache.poi.hssf.record.aggregates; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import java.util.Collection; import java.util.HashMap; @@ -28,7 +28,7 @@ import org.apache.poi.hssf.record.Shared import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link SharedValueManager} Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java Thu Dec 24 18:42:29 2020 @@ -17,11 +17,11 @@ package org.apache.poi.hssf.record.aggregates; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.io.InputStream; @@ -44,7 +44,7 @@ import org.apache.poi.hssf.record.aggreg import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.util.HexRead; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link ValueRecordsAggregate} @@ -78,8 +78,8 @@ public final class TestValueRecordsAggre assertEquals(1, cvrs.size()); CellValueRecordInterface record = cvrs.get(0); - assertNotNull( "Row contains a value", record ); - assertTrue( "First record is a FormulaRecordsAggregate", ( record instanceof FormulaRecordAggregate ) ); + assertNotNull( record, "Row contains a value" ); + assertTrue( ( record instanceof FormulaRecordAggregate ), "First record is a FormulaRecordsAggregate"); } private void constructValueRecord(List<org.apache.poi.hssf.record.Record> records) { @@ -258,13 +258,13 @@ public final class TestValueRecordsAggre String cellFormula; cellFormula = getFormulaFromFirstCell(s, 0); // row "1" // the problem is not observable in the first row of the shared formula - assertEquals("Something else wrong with this test case", "\"first formula\"", cellFormula); + assertEquals("\"first formula\"", cellFormula, "Something else wrong with this test case"); // but the problem is observable in rows 2,3,4 cellFormula = getFormulaFromFirstCell(s, 1); // row "2" - assertNotEquals("found bug 44449 (Wrong SharedFormulaRecord was used).", "\"second formula\"", cellFormula); + assertNotEquals("\"second formula\"", cellFormula, "found bug 44449 (Wrong SharedFormulaRecord was used)."); - assertEquals("Something else wrong with this test case", "\"first formula\"", cellFormula); + assertEquals("\"first formula\"", cellFormula, "Something else wrong with this test case"); wb.close(); } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/cf/TestCellRange.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/cf/TestCellRange.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/cf/TestCellRange.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/cf/TestCellRange.java Thu Dec 24 18:42:29 2020 @@ -17,15 +17,15 @@ limitations under the License. package org.apache.poi.hssf.record.cf; -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.util.Arrays; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.CellRangeUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests CellRange operations. @@ -78,7 +78,7 @@ public final class TestCellRange { for(int j=0; j!=ranges.length;j++) { boolean expectedResult = containsExpectedResults[i][j]; - assertEquals("("+i+","+j+"): ", expectedResult, CellRangeUtil.contains(ranges[i], ranges[j])); + assertEquals(expectedResult, CellRangeUtil.contains(ranges[i], ranges[j]), "("+i+","+j+"): "); } } } @@ -169,8 +169,8 @@ public final class TestCellRange { public void testCreate() { CellRangeAddress cr = createCR(0, -1, 2, 255); // $C:$IV - assertFalse("isFullRowRange", cr.isFullRowRange()); - assertTrue("isFullColumnRange", cr.isFullColumnRange()); + assertFalse(cr.isFullRowRange(), "isFullRowRange"); + assertTrue(cr.isFullColumnRange(), "isFullColumnRange"); createCR(0, 7, 1, 1); // $B$1:$B$8 @@ -249,11 +249,11 @@ public final class TestCellRange { // } private void verifyExpectedResult(CellRangeAddress[] result, String... expectedOutput) { - assertEquals("\nExpected: " + Arrays.toString(expectedOutput) + "\nHad: " + Arrays.toString(result), - expectedOutput.length, result.length); + assertEquals(expectedOutput.length, result.length, + "\nExpected: " + Arrays.toString(expectedOutput) + "\nHad: " + Arrays.toString(result)); for(int i = 0;i < expectedOutput.length;i++) { - assertEquals("\nExpected: " + Arrays.toString(expectedOutput) + "\nHad: " + Arrays.toString(result), - expectedOutput[i], result[i].formatAsString()); + assertEquals(expectedOutput[i], result[i].formatAsString(), + "\nExpected: " + Arrays.toString(expectedOutput) + "\nHad: " + Arrays.toString(result)); } } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java Thu Dec 24 18:42:29 2020 @@ -19,12 +19,12 @@ package org.apache.poi.hssf.record.chart import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -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 org.apache.poi.hssf.record.TestcaseRecordInputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the AreaFormatRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java Thu Dec 24 18:42:29 2020 @@ -19,12 +19,12 @@ package org.apache.poi.hssf.record.chart import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -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 org.apache.poi.hssf.record.TestcaseRecordInputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the AreaRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java Thu Dec 24 18:42:29 2020 @@ -19,10 +19,10 @@ package org.apache.poi.hssf.record.chart import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.poi.hssf.record.TestcaseRecordInputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the AxisLineFormatRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java Thu Dec 24 18:42:29 2020 @@ -19,12 +19,12 @@ package org.apache.poi.hssf.record.chart import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -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 org.apache.poi.hssf.record.TestcaseRecordInputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the AxisOptionsRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java Thu Dec 24 18:42:29 2020 @@ -19,10 +19,10 @@ package org.apache.poi.hssf.record.chart import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.poi.hssf.record.TestcaseRecordInputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the AxisParentRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java Thu Dec 24 18:42:29 2020 @@ -19,10 +19,10 @@ package org.apache.poi.hssf.record.chart import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.poi.hssf.record.TestcaseRecordInputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the AxisRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java Thu Dec 24 18:42:29 2020 @@ -19,10 +19,10 @@ package org.apache.poi.hssf.record.chart import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.poi.hssf.record.TestcaseRecordInputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the AxisUsedRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java Thu Dec 24 18:42:29 2020 @@ -19,11 +19,11 @@ package org.apache.poi.hssf.record.chart import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -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 org.apache.poi.hssf.record.TestcaseRecordInputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the BarRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java Thu Dec 24 18:42:29 2020 @@ -19,12 +19,12 @@ package org.apache.poi.hssf.record.chart import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -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 org.apache.poi.hssf.record.TestcaseRecordInputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the CategorySeriesAxisRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java Thu Dec 24 18:42:29 2020 @@ -17,14 +17,14 @@ package org.apache.poi.hssf.record.chart; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import org.apache.poi.hssf.record.RecordInputStream; import org.apache.poi.hssf.record.TestcaseRecordInputStream; import org.apache.poi.util.HexRead; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link ChartFormatRecord} Test data taken directly from a real @@ -48,7 +48,7 @@ public final class TestChartFormatRecord public void testLoad() { RecordInputStream in = TestcaseRecordInputStream.create(data); ChartFormatRecord record = new ChartFormatRecord(in); - assertNotEquals("Identified bug 44693d", 2, in.remaining()); + assertNotEquals(2, in.remaining(), "Identified bug 44693d"); assertEquals(0, in.remaining()); assertEquals(24, record.getRecordSize()); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java Thu Dec 24 18:42:29 2020 @@ -19,10 +19,10 @@ package org.apache.poi.hssf.record.chart import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.poi.hssf.record.TestcaseRecordInputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the ChartRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java Thu Dec 24 18:42:29 2020 @@ -17,7 +17,7 @@ package org.apache.poi.hssf.record.chart; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.InputStream; import java.util.ArrayList; @@ -27,10 +27,9 @@ import org.apache.poi.hssf.HSSFTestDataS import org.apache.poi.hssf.eventusermodel.HSSFEventFactory; import org.apache.poi.hssf.eventusermodel.HSSFListener; import org.apache.poi.hssf.eventusermodel.HSSFRequest; -import org.apache.poi.hssf.record.Record; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.poifs.filesystem.POIFSFileSystem; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class TestChartTitleFormatRecord { @@ -38,10 +37,10 @@ public final class TestChartTitleFormatR public void testRecord() throws Exception { POIFSFileSystem fs = new POIFSFileSystem( HSSFTestDataSamples.getSampleFile("WithFormattedGraphTitle.xls")); - + // Check we can open the file via usermodel HSSFWorkbook hssf = new HSSFWorkbook(fs); - + // Now process it through eventusermodel, and // look out for the title records ChartTitleFormatRecordGrabber grabber = new ChartTitleFormatRecordGrabber(); @@ -51,21 +50,21 @@ public final class TestChartTitleFormatR HSSFEventFactory factory = new HSSFEventFactory(); factory.processEvents(req, din); din.close(); - + // Should've found one assertEquals(1, grabber.chartTitleFormatRecords.size()); // And it should be of something interesting ChartTitleFormatRecord r = grabber.chartTitleFormatRecords.get(0); assertEquals(3, r.getFormatCount()); - + hssf.close(); fs.close(); - + } - + private static final class ChartTitleFormatRecordGrabber implements HSSFListener { private final List<ChartTitleFormatRecord> chartTitleFormatRecords; - + ChartTitleFormatRecordGrabber() { chartTitleFormatRecords = new ArrayList<>(); } @@ -76,6 +75,6 @@ public final class TestChartTitleFormatR chartTitleFormatRecords.add((ChartTitleFormatRecord)record); } } - + } } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java Thu Dec 24 18:42:29 2020 @@ -19,12 +19,12 @@ package org.apache.poi.hssf.record.chart import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -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 org.apache.poi.hssf.record.TestcaseRecordInputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the DatRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java Thu Dec 24 18:42:29 2020 @@ -19,11 +19,11 @@ package org.apache.poi.hssf.record.chart import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -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 org.apache.poi.hssf.record.TestcaseRecordInputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the DataFormatRecord --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org For additional commands, e-mail: commits-h...@poi.apache.org
