children = patriarchBack.getChildren();
assertEquals(4, children.size());
HSSFShape hssfShape = children.get(0);
@@ -843,7 +847,7 @@ public class TestDrawingShapes {
assertEquals(2, cAnchor.getCol2());
assertEquals(2, cAnchor.getRow1());
assertEquals(2, cAnchor.getRow2());
-
+
wbBack.close();
}
}
diff --git a/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java b/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java
index a3776e5bdc..72e9e55941 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java
@@ -17,17 +17,18 @@
package org.apache.poi.hssf.model;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.apache.poi.ddf.DefaultEscherRecordFactory.isContainer;
+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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.List;
import java.util.Random;
-import org.apache.poi.ddf.DefaultEscherRecordFactory;
import org.apache.poi.ddf.EscherContainerRecord;
import org.apache.poi.ddf.EscherTextboxRecord;
import org.apache.poi.hssf.HSSFTestDataSamples;
@@ -37,7 +38,7 @@ import org.apache.poi.hssf.record.RecordBase;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFTestHelper;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestEscherRecordFactory {
@@ -57,30 +58,30 @@ public class TestEscherRecordFactory {
@Test
public void testDetectContainer() {
Random rnd = new Random();
- assertTrue(DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.DG_CONTAINER));
- assertTrue(DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.SOLVER_CONTAINER));
- assertTrue(DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.SP_CONTAINER));
- assertTrue(DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.DGG_CONTAINER));
- assertTrue(DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.BSTORE_CONTAINER));
- assertTrue(DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.SPGR_CONTAINER));
+ assertTrue(isContainer((short) 0x0, EscherContainerRecord.DG_CONTAINER));
+ assertTrue(isContainer((short) 0x0, EscherContainerRecord.SOLVER_CONTAINER));
+ assertTrue(isContainer((short) 0x0, EscherContainerRecord.SP_CONTAINER));
+ assertTrue(isContainer((short) 0x0, EscherContainerRecord.DGG_CONTAINER));
+ assertTrue(isContainer((short) 0x0, EscherContainerRecord.BSTORE_CONTAINER));
+ assertTrue(isContainer((short) 0x0, EscherContainerRecord.SPGR_CONTAINER));
- for (Short i=EscherContainerRecord.DGG_CONTAINER; i<= EscherContainerRecord.SOLVER_CONTAINER; i++){
- assertTrue(DefaultEscherRecordFactory.isContainer(Integer.valueOf(rnd.nextInt(Short.MAX_VALUE)).shortValue(), i));
+ for (short i=EscherContainerRecord.DGG_CONTAINER; i<= EscherContainerRecord.SOLVER_CONTAINER; i++){
+ assertTrue(isContainer(Integer.valueOf(rnd.nextInt(Short.MAX_VALUE)).shortValue(), i));
}
- assertFalse(DefaultEscherRecordFactory.isContainer((short) 0x0, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER - 1).shortValue()));
- assertFalse(DefaultEscherRecordFactory.isContainer((short) 0x0, Integer.valueOf(EscherContainerRecord.SOLVER_CONTAINER + 1).shortValue()));
+ assertFalse(isContainer((short) 0x0, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER - 1).shortValue()));
+ assertFalse(isContainer((short) 0x0, Integer.valueOf(EscherContainerRecord.SOLVER_CONTAINER + 1).shortValue()));
- assertTrue(DefaultEscherRecordFactory.isContainer((short) 0x000F, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER - 1).shortValue()));
- assertTrue(DefaultEscherRecordFactory.isContainer((short) 0xFFFF, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER - 1).shortValue()));
- assertFalse(DefaultEscherRecordFactory.isContainer((short) 0x000C, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER - 1).shortValue()));
- assertFalse(DefaultEscherRecordFactory.isContainer((short) 0xCCCC, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER - 1).shortValue()));
- assertFalse(DefaultEscherRecordFactory.isContainer((short) 0x000F, EscherTextboxRecord.RECORD_ID));
- assertFalse(DefaultEscherRecordFactory.isContainer((short) 0xCCCC, EscherTextboxRecord.RECORD_ID));
+ assertTrue(isContainer((short) 0x000F, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER - 1).shortValue()));
+ assertTrue(isContainer((short) 0xFFFF, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER - 1).shortValue()));
+ assertFalse(isContainer((short) 0x000C, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER - 1).shortValue()));
+ assertFalse(isContainer((short) 0xCCCC, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER - 1).shortValue()));
+ assertFalse(isContainer((short) 0x000F, EscherTextboxRecord.RECORD_ID));
+ assertFalse(isContainer((short) 0xCCCC, EscherTextboxRecord.RECORD_ID));
}
@Test
- public void testDgContainerMustBeRootOfHSSFSheetEscherRecords() throws IOException {
+ public void testDgContainerMustBeRootOfHSSFSheetEscherRecords() {
HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("47251.xls");
HSSFSheet sh = wb.getSheetAt(0);
InternalSheet ish = HSSFTestHelper.getSheetForTest(sh);
@@ -90,12 +91,14 @@ public class TestEscherRecordFactory {
byte[] dgBytes = toByteArray(dgRecords);
sh.getDrawingPatriarch();
EscherAggregate agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
+ assertNotNull(agg);
assertTrue(agg.getEscherRecords().get(0) instanceof EscherContainerRecord);
assertEquals(EscherContainerRecord.DG_CONTAINER, agg.getEscherRecords().get(0).getRecordId());
assertEquals((short) 0x0, agg.getEscherRecords().get(0).getOptions());
agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
+ assertNotNull(agg);
byte[] dgBytesAfterSave = agg.serialize();
- assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
- assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
+ assertEquals(dgBytes.length, dgBytesAfterSave.length, "different size of drawing data before and after save");
+ assertArrayEquals(dgBytes, dgBytesAfterSave, "drawing data before and after save is different");
}
}
diff --git a/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java b/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
index 5a88f460b8..db7f6f1862 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
@@ -17,11 +17,14 @@
package org.apache.poi.hssf.model;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-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.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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
import java.util.Locale;
@@ -48,7 +51,7 @@ import org.apache.poi.ss.usermodel.FormulaEvaluator;
import org.apache.poi.ss.usermodel.Name;
import org.apache.poi.util.HexRead;
import org.apache.poi.util.LittleEndianByteArrayInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test the low level formula parser functionality. High level tests are to
@@ -61,7 +64,7 @@ public final class TestFormulaParser {
*/
/* package */ static Ptg[] parseFormula(String formula) {
Ptg[] result = HSSFFormulaParser.parse(formula, null);
- assertNotNull("Ptg array should not be null", result);
+ assertNotNull(result, "Ptg array should not be null");
return result;
}
private static String toFormulaString(Ptg[] ptgs) {
@@ -279,18 +282,18 @@ public final class TestFormulaParser {
String value = " hi ";
Ptg[] ptgs = parseFormula("\"" + value + "\"");
confirmTokenClasses(ptgs, StringPtg.class);
- assertEquals("ptg0 contains exact value", ((StringPtg) ptgs[0]).getValue(), value);
+ assertEquals(((StringPtg) ptgs[0]).getValue(), value, "ptg0 contains exact value");
}
@Test
public void testLookupAndMatchFunctionArgs() {
Ptg[] ptgs = parseFormula("lookup(A1, A3:A52, B3:B52)");
confirmTokenClasses(ptgs, RefPtg.class, AreaPtg.class, AreaPtg.class, FuncVarPtg.class);
- assertEquals("ptg0 has Value class", ptgs[0].getPtgClass(), Ptg.CLASS_VALUE);
+ assertEquals(ptgs[0].getPtgClass(), Ptg.CLASS_VALUE, "ptg0 has Value class");
ptgs = parseFormula("match(A1, A3:A52)");
confirmTokenClasses(ptgs, RefPtg.class, AreaPtg.class, FuncVarPtg.class);
- assertEquals("ptg0 has Value class", ptgs[0].getPtgClass(), Ptg.CLASS_VALUE);
+ assertEquals(ptgs[0].getPtgClass(), Ptg.CLASS_VALUE, "ptg0 has Value class");
}
/** bug 33160*/
@@ -394,63 +397,63 @@ public final class TestFormulaParser {
cell.setCellFormula("1.3E21/3");
formula = cell.getCellFormula();
- assertEquals("Exponential formula string", "1.3E+21/3", formula);
+ assertEquals("1.3E+21/3", formula);
cell.setCellFormula("-1.3E21/3");
formula = cell.getCellFormula();
- assertEquals("Exponential formula string", "-1.3E+21/3", formula);
+ assertEquals("-1.3E+21/3", formula);
cell.setCellFormula("1322E21/3");
formula = cell.getCellFormula();
- assertEquals("Exponential formula string", "1.322E+24/3", formula);
+ assertEquals("1.322E+24/3", formula);
cell.setCellFormula("-1322E21/3");
formula = cell.getCellFormula();
- assertEquals("Exponential formula string", "-1.322E+24/3", formula);
+ assertEquals("-1.322E+24/3", formula);
cell.setCellFormula("1.3E1/3");
formula = cell.getCellFormula();
- assertEquals("Exponential formula string", "13/3", formula);
+ assertEquals("13/3", formula);
cell.setCellFormula("-1.3E1/3");
formula = cell.getCellFormula();
- assertEquals("Exponential formula string", "-13/3", formula);
+ assertEquals("-13/3", formula);
cell.setCellFormula("1.3E-4/3");
formula = cell.getCellFormula();
- assertEquals("Exponential formula string", "0.00013/3", formula);
+ assertEquals("0.00013/3", formula);
cell.setCellFormula("-1.3E-4/3");
formula = cell.getCellFormula();
- assertEquals("Exponential formula string", "-0.00013/3", formula);
+ assertEquals("-0.00013/3", formula);
cell.setCellFormula("13E-15/3");
formula = cell.getCellFormula();
- assertEquals("Exponential formula string", "0.000000000000013/3", formula);
+ assertEquals("0.000000000000013/3", formula);
cell.setCellFormula("-13E-15/3");
formula = cell.getCellFormula();
- assertEquals("Exponential formula string", "-0.000000000000013/3", formula);
+ assertEquals("-0.000000000000013/3", formula);
cell.setCellFormula("1.3E3/3");
formula = cell.getCellFormula();
- assertEquals("Exponential formula string", "1300/3", formula);
+ assertEquals("1300/3", formula);
cell.setCellFormula("-1.3E3/3");
formula = cell.getCellFormula();
- assertEquals("Exponential formula string", "-1300/3", formula);
+ assertEquals("-1300/3", formula);
cell.setCellFormula("1300000000000000/3");
formula = cell.getCellFormula();
- assertEquals("Exponential formula string", "1300000000000000/3", formula);
+ assertEquals("1300000000000000/3", formula);
cell.setCellFormula("-1300000000000000/3");
formula = cell.getCellFormula();
- assertEquals("Exponential formula string", "-1300000000000000/3", formula);
+ assertEquals("-1300000000000000/3", formula);
cell.setCellFormula("-10E-1/3.1E2*4E3/3E4");
formula = cell.getCellFormula();
- assertEquals("Exponential formula string", "-1/310*4000/30000", formula);
+ assertEquals("-1/310*4000/30000", formula);
wb.close();
}
@@ -653,11 +656,10 @@ public final class TestFormulaParser {
private static void confirmTokenClasses(Ptg[] ptgs, Class...expectedClasses) {
assertEquals(expectedClasses.length, ptgs.length);
for (int i = 0; i < expectedClasses.length; i++) {
- if(expectedClasses[i] != ptgs[i].getClass()) {
- fail("difference at token[" + i + "]: expected ("
- + expectedClasses[i].getName() + ") but got ("
- + ptgs[i].getClass().getName() + ")");
- }
+ assertEquals(expectedClasses[i], ptgs[i].getClass(),
+ "difference at token[" + i + "]: expected ("
+ + expectedClasses[i].getName() + ") but got ("
+ + ptgs[i].getClass().getName() + ")");
}
}
@@ -763,9 +765,7 @@ public final class TestFormulaParser {
HSSFCell cell = row.createCell(0);
cell.setCellFormula("right(\"test\"\"ing\", 3)");
String actualCellFormula = cell.getCellFormula();
- if ("RIGHT(\"test\"ing\",3)".equals(actualCellFormula)) {
- fail("Identified bug 28754b");
- }
+ assertNotEquals("RIGHT(\"test\"ing\",3)", actualCellFormula, "Identified bug 28754b");
assertEquals("RIGHT(\"test\"\"ing\",3)", actualCellFormula);
}
}
@@ -819,13 +819,8 @@ public final class TestFormulaParser {
}
private static void parseExpectedException(String formula) {
- try {
- parseFormula(formula);
- fail("Expected FormulaParseException: " + formula);
- } catch (FormulaParseException e) {
- // expected during successful test
- assertNotNull(e.getMessage());
- }
+ FormulaParseException e = assertThrows(FormulaParseException.class, () -> parseFormula(formula));
+ assertNotNull(e.getMessage());
}
@Test
@@ -838,9 +833,7 @@ public final class TestFormulaParser {
HSSFRow row = sheet.createRow(0);
HSSFCell cell = row.createCell(0);
cell.setCellFormula("SUM(A32769:A32770)");
- if("SUM(A-32767:A-32766)".equals(cell.getCellFormula())) {
- fail("Identified bug 44539");
- }
+ assertNotEquals("SUM(A-32767:A-32766)", cell.getCellFormula(), "Identified bug 44539");
assertEquals("SUM(A32769:A32770)", cell.getCellFormula());
wb.close();
@@ -883,14 +876,10 @@ public final class TestFormulaParser {
new IntPtg(1),
DividePtg.instance,
};
- try {
- toFormulaString(ptgs);
- fail("Expected exception was not thrown");
- } catch (IllegalStateException e) {
- // expected during successful test
- assertTrue(e.getMessage().startsWith("Too few arguments supplied to operation"));
- }
+ IllegalStateException e = assertThrows(IllegalStateException.class, () -> toFormulaString(ptgs));
+ assertTrue(e.getMessage().startsWith("Too few arguments supplied to operation"));
}
+
/**
* Make sure that POI uses the right Func Ptg when encoding formulas. Functions with variable
* number of args should get FuncVarPtg, functions with fixed args should get FuncPtg.
@@ -904,9 +893,7 @@ public final class TestFormulaParser {
Ptg[] ptgs = parseFormula("countif(A1:A2, 1)");
assertEquals(3, ptgs.length);
- if(ptgs[2] instanceof FuncVarPtg) {
- fail("Identified bug 44675");
- }
+ assertFalse(ptgs[2] instanceof FuncVarPtg, "Identified bug 44675");
confirmTokenClasses(ptgs, AreaPtg.class, IntPtg.class, FuncPtg.class);
confirmTokenClasses("sin(1)", IntPtg.class, FuncPtg.class);
@@ -921,34 +908,20 @@ public final class TestFormulaParser {
}
private static void confirmArgCountMsg(String formula, String expectedMessage) throws IOException {
- HSSFWorkbook book = new HSSFWorkbook();
- try {
- HSSFFormulaParser.parse(formula, book);
- fail("Didn't get parse exception as expected");
- } catch (FormulaParseException e) {
+ try (HSSFWorkbook book = new HSSFWorkbook()) {
+ FormulaParseException e = assertThrows(FormulaParseException.class, () -> HSSFFormulaParser.parse(formula, book));
confirmParseException(e, expectedMessage);
}
- book.close();
}
@Test
public void testParseErrorExpectedMsg() {
+ FormulaParseException e;
+ e = assertThrows(FormulaParseException.class, () -> parseFormula("round(3.14;2)"));
+ confirmParseException(e, "Parse error near char 10 ';' in specified formula 'round(3.14;2)'. Expected ',' or ')'");
- try {
- parseFormula("round(3.14;2)");
- fail("Didn't get parse exception as expected");
- } catch (FormulaParseException e) {
- confirmParseException(e,
- "Parse error near char 10 ';' in specified formula 'round(3.14;2)'. Expected ',' or ')'");
- }
-
- try {
- parseFormula(" =2+2");
- fail("Didn't get parse exception as expected");
- } catch (FormulaParseException e) {
- confirmParseException(e,
- "The specified formula ' =2+2' starts with an equals sign which is not allowed.");
- }
+ e = assertThrows(FormulaParseException.class, () -> parseFormula(" =2+2"));
+ confirmParseException(e, "The specified formula ' =2+2' starts with an equals sign which is not allowed.");
}
/**
@@ -972,36 +945,30 @@ public final class TestFormulaParser {
@Test
public void testNamedRangeThatLooksLikeCell() throws IOException {
- HSSFWorkbook wb = new HSSFWorkbook();
- HSSFSheet sheet = wb.createSheet("Sheet1");
- HSSFName name = wb.createName();
- name.setRefersToFormula("Sheet1!B1");
- name.setNameName("pfy1");
+ try (HSSFWorkbook wb = new HSSFWorkbook()) {
+ HSSFSheet sheet = wb.createSheet("Sheet1");
+ HSSFName name = wb.createName();
+ name.setRefersToFormula("Sheet1!B1");
+ name.setNameName("pfy1");
- Ptg[] ptgs;
- try {
- ptgs = HSSFFormulaParser.parse("count(pfy1)", wb);
- } catch (IllegalArgumentException e) {
- if (e.getMessage().equals("Specified colIx (1012) is out of range")) {
- fail("Identified bug 45354");
+ Ptg[] ptgs;
+ try {
+ ptgs = HSSFFormulaParser.parse("count(pfy1)", wb);
+ } catch (IllegalArgumentException e) {
+ if (e.getMessage().equals("Specified colIx (1012) is out of range")) {
+ fail("Identified bug 45354");
+ }
+ throw e;
}
- wb.close();
- throw e;
- }
- confirmTokenClasses(ptgs, NamePtg.class, FuncVarPtg.class);
+ confirmTokenClasses(ptgs, NamePtg.class, FuncVarPtg.class);
- HSSFCell cell = sheet.createRow(0).createCell(0);
- cell.setCellFormula("count(pfy1)");
- assertEquals("COUNT(pfy1)", cell.getCellFormula());
- try {
- cell.setCellFormula("count(pf1)");
- fail("Expected formula parse execption");
- } catch (FormulaParseException e) {
- confirmParseException(e,
- "Specified named range 'pf1' does not exist in the current workbook.");
+ HSSFCell cell = sheet.createRow(0).createCell(0);
+ cell.setCellFormula("count(pfy1)");
+ assertEquals("COUNT(pfy1)", cell.getCellFormula());
+ FormulaParseException e = assertThrows(FormulaParseException.class, () -> cell.setCellFormula("count(pf1)"));
+ confirmParseException(e, "Specified named range 'pf1' does not exist in the current workbook.");
+ cell.setCellFormula("count(fp1)"); // plain cell ref, col is in range
}
- cell.setCellFormula("count(fp1)"); // plain cell ref, col is in range
- wb.close();
}
@Test
@@ -1014,9 +981,7 @@ public final class TestFormulaParser {
ptgs = HSSFFormulaParser.parse("Sheet1!A10:A40000", book);
aptg = (AreaI) ptgs[0];
- if (aptg.getLastRow() == -25537) {
- fail("Identified bug 45358");
- }
+ assertNotEquals(-25537, aptg.getLastRow(), "Identified bug 45358");
assertEquals(39999, aptg.getLastRow());
ptgs = HSSFFormulaParser.parse("Sheet1!A10:A65536", book);
@@ -1050,10 +1015,8 @@ public final class TestFormulaParser {
ptgs = parseFormula("MAX({\"5\"},3)");
confirmTokenClasses(ptgs, ArrayPtg.class, IntPtg.class, FuncVarPtg.class);
Object element = ((ArrayPtg)ptgs[0]).getTokenArrayValues()[0][0];
- if (element instanceof UnicodeString) {
- // this would cause ClassCastException below
- fail("Wrong encoding of array element value");
- }
+ // this would cause ClassCastException below
+ assertFalse(element instanceof UnicodeString, "Wrong encoding of array element value");
assertEquals(String.class, element.getClass());
// make sure the formula encodes OK
@@ -1354,28 +1317,27 @@ public final class TestFormulaParser {
@Test
public void testRangeFuncOperand_bug46951() throws IOException {
- HSSFWorkbook wb = new HSSFWorkbook();
- Ptg[] ptgs;
- try {
- ptgs = HSSFFormulaParser.parse("SUM(C1:OFFSET(C1,0,B1))", wb);
- } catch (RuntimeException e) {
- if (e.getMessage().equals("Specified named range 'OFFSET' does not exist in the current workbook.")) {
- fail("Identified bug 46951");
+ try (HSSFWorkbook wb = new HSSFWorkbook()) {
+ Ptg[] ptgs;
+ try {
+ ptgs = HSSFFormulaParser.parse("SUM(C1:OFFSET(C1,0,B1))", wb);
+ } catch (RuntimeException e) {
+ if (e.getMessage().equals("Specified named range 'OFFSET' does not exist in the current workbook.")) {
+ fail("Identified bug 46951");
+ }
+ throw e;
}
- wb.close();
- throw e;
+ confirmTokenClasses(ptgs,
+ MemFuncPtg.class, // [len=23]
+ RefPtg.class, // [C1]
+ RefPtg.class, // [C1]
+ IntPtg.class, // [0]
+ RefPtg.class, // [B1]
+ FuncVarPtg.class, // [OFFSET nArgs=3]
+ RangePtg.class, //
+ AttrPtg.class // [sum ]
+ );
}
- confirmTokenClasses(ptgs,
- MemFuncPtg.class, // [len=23]
- RefPtg.class, // [C1]
- RefPtg.class, // [C1]
- IntPtg.class, // [0]
- RefPtg.class, // [B1]
- FuncVarPtg.class, // [OFFSET nArgs=3]
- RangePtg.class, //
- AttrPtg.class // [sum ]
- );
- wb.close();
}
@Test
@@ -1507,13 +1469,8 @@ public final class TestFormulaParser {
}
private static void confirmParseError(HSSFWorkbook wb, String formula, String expectedMessage) {
-
- try {
- HSSFFormulaParser.parse(formula, wb);
- fail("Expected formula parse execption");
- } catch (FormulaParseException e) {
- confirmParseException(e, expectedMessage);
- }
+ FormulaParseException e = assertThrows(FormulaParseException.class, () -> HSSFFormulaParser.parse(formula, wb));
+ confirmParseException(e, expectedMessage);
}
/**
@@ -1524,29 +1481,27 @@ public final class TestFormulaParser {
public void testParseComplexName() throws IOException {
// Mock up a spreadsheet to match the critical details of the sample
- HSSFWorkbook wb = new HSSFWorkbook();
- wb.createSheet("Sheet1");
- HSSFName definedName = wb.createName();
- definedName.setNameName("foo");
- definedName.setRefersToFormula("Sheet1!B2");
+ try (HSSFWorkbook wb = new HSSFWorkbook()) {
+ wb.createSheet("Sheet1");
+ HSSFName definedName = wb.createName();
+ definedName.setNameName("foo");
+ definedName.setRefersToFormula("Sheet1!B2");
- // Set the complex flag - POI doesn't usually manipulate this flag
- NameRecord nameRec = TestHSSFName.getNameRecord(definedName);
- nameRec.setOptionFlag((short)0x10); // 0x10 -> complex
+ // Set the complex flag - POI doesn't usually manipulate this flag
+ NameRecord nameRec = TestHSSFName.getNameRecord(definedName);
+ nameRec.setOptionFlag((short) 0x10); // 0x10 -> complex
- Ptg[] result;
- try {
- result = HSSFFormulaParser.parse("1+foo", wb);
- } catch (FormulaParseException e) {
- if (e.getMessage().equals("Specified name 'foo' is not a range as expected.")) {
- fail("Identified bug 47078c");
+ Ptg[] result;
+ try {
+ result = HSSFFormulaParser.parse("1+foo", wb);
+ } catch (FormulaParseException e) {
+ if (e.getMessage().equals("Specified name 'foo' is not a range as expected.")) {
+ fail("Identified bug 47078c");
+ }
+ throw e;
}
- wb.close();
- throw e;
+ confirmTokenClasses(result, IntPtg.class, NamePtg.class, AddPtg.class);
}
- confirmTokenClasses(result, IntPtg.class, NamePtg.class, AddPtg.class);
-
- wb.close();
}
/**
@@ -1562,23 +1517,16 @@ public final class TestFormulaParser {
String leadingZeroCellRef = "B000001"; // this should get parsed as "B1"
HSSFWorkbook wb = new HSSFWorkbook();
- try {
- HSSFFormulaParser.parse(badCellRef, wb);
- fail("Identified bug 47312b - Shouldn't be able to parse cell ref '"
- + badCellRef + "'.");
- } catch (FormulaParseException e) {
- // expected during successful test
- confirmParseException(e, "Specified named range '"
- + badCellRef + "' does not exist in the current workbook.");
- }
+ FormulaParseException e = assertThrows(FormulaParseException.class, () -> HSSFFormulaParser.parse(badCellRef, wb),
+ "Identified bug 47312b - Shouldn't be able to parse cell ref '" + badCellRef + "'.");
+ confirmParseException(e, "Specified named range '" + badCellRef + "' does not exist in the current workbook.");
Ptg[] ptgs;
try {
ptgs = HSSFFormulaParser.parse(leadingZeroCellRef, wb);
assertEquals("B1", ptgs[0].toFormulaString());
- } catch (FormulaParseException e) {
- confirmParseException(e, "Specified named range '"
- + leadingZeroCellRef + "' does not exist in the current workbook.");
+ } catch (FormulaParseException e2) {
+ confirmParseException(e2, "Specified named range '" + leadingZeroCellRef + "' does not exist in the current workbook.");
// close but no cigar
fail("Identified bug 47312c - '" + leadingZeroCellRef + "' should parse as 'B1'.");
}
@@ -1601,7 +1549,7 @@ public final class TestFormulaParser {
public void test57196_Formula() throws IOException {
HSSFWorkbook wb = new HSSFWorkbook();
Ptg[] ptgs = HSSFFormulaParser.parse("DEC2HEX(HEX2DEC(O8)-O2+D2)", wb, FormulaType.CELL, -1);
- assertNotNull("Ptg array should not be null", ptgs);
+ assertNotNull(ptgs, "Ptg array should not be null");
confirmTokenClasses(ptgs,
NameXPtg.class, // ??
diff --git a/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java b/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java
index aba91ad718..d948695620 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java
@@ -17,7 +17,7 @@
package org.apache.poi.hssf.model;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
@@ -30,7 +30,7 @@ import org.apache.poi.ss.formula.ptg.NamePtg;
import org.apache.poi.ss.formula.ptg.Ptg;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.CellValue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test the low level formula parser functionality,
@@ -70,7 +70,7 @@ public final class TestFormulaParserEval {
*/
private static void confirmParseFormula(HSSFWorkbook workbook) {
Ptg[] ptgs = HSSFFormulaParser.parse("SUM(testName)", workbook);
- assertEquals("two tokens expected, got " + ptgs.length, 2, ptgs.length);
+ assertEquals(2, ptgs.length, "two tokens expected, got " + ptgs.length);
assertEquals(NamePtg.class, ptgs[0].getClass());
assertEquals(AttrPtg.class, ptgs[1].getClass());
}
diff --git a/src/testcases/org/apache/poi/hssf/model/TestFormulaParserIf.java b/src/testcases/org/apache/poi/hssf/model/TestFormulaParserIf.java
index 6897ccb88c..42f650a549 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestFormulaParserIf.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestFormulaParserIf.java
@@ -17,8 +17,8 @@
package org.apache.poi.hssf.model;
-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.apache.poi.ss.formula.ptg.AddPtg;
import org.apache.poi.ss.formula.ptg.AttrPtg;
@@ -33,7 +33,7 @@ import org.apache.poi.ss.formula.ptg.NotEqualPtg;
import org.apache.poi.ss.formula.ptg.Ptg;
import org.apache.poi.ss.formula.ptg.RefPtg;
import org.apache.poi.ss.formula.ptg.StringPtg;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests FormulaParser specifically with respect to IF() functions
@@ -49,7 +49,7 @@ public final class TestFormulaParserIf {
private static void confirmAttrData(Ptg[] ptgs, int i, int expectedData) {
Ptg ptg = ptgs[i];
- assertTrue("Token[" + i + "] was not AttrPtg as expected", ptg instanceof AttrPtg);
+ assertTrue(ptg instanceof AttrPtg, "Token[" + i + "] was not AttrPtg as expected");
AttrPtg attrPtg = (AttrPtg) ptg;
assertEquals(expectedData, attrPtg.getData());
}
@@ -164,24 +164,24 @@ public final class TestFormulaParserIf {
Ptg[] ptgs = parseFormula("IF(3>=1,\"*\",IF(4<>1,\"first\",\"second\"))");
assertEquals(17, ptgs.length);
- assertEquals("6th Ptg is not a goto (Attr) ptg",AttrPtg.class,ptgs[5].getClass());
- assertEquals("9th Ptg is not a not equal ptg",NotEqualPtg.class,ptgs[8].getClass());
- assertEquals("15th Ptg is not the inner IF variable function ptg",FuncVarPtg.class,ptgs[14].getClass());
+ assertEquals(AttrPtg.class, ptgs[5].getClass(), "6th Ptg is not a goto (Attr) ptg");
+ assertEquals(NotEqualPtg.class, ptgs[8].getClass(), "9th Ptg is not a not equal ptg");
+ assertEquals(FuncVarPtg.class, ptgs[14].getClass(), "15th Ptg is not the inner IF variable function ptg");
}
@Test
public void testSimpleLogical() {
Ptg[] ptgs = parseFormula("IF(A1OperandClassTransformer.
@@ -41,7 +41,7 @@ public final class TestOperandClassTransformer {
private static Ptg[] parseFormula(String formula) {
Ptg[] result = HSSFFormulaParser.parse(formula, null);
- assertNotNull("Ptg array should not be null", result);
+ assertNotNull(result, "Ptg array should not be null");
return result;
}
@@ -79,7 +79,7 @@ public final class TestOperandClassTransformer {
* This test has been added but disabled in order to document this issue.
*/
@Test
- @Ignore
+ @Disabled
public void testIndexPi1() {
String formula = "INDEX(PI(),1)";
Ptg[] ptgs = parseFormula(formula);
@@ -144,7 +144,7 @@ public final class TestOperandClassTransformer {
private void confirmTokenClass(Ptg[] ptgs, int i, byte operandClass) {
Ptg ptg = ptgs[i];
- assertFalse("ptg[" + i + "] is a base token", ptg.isBaseToken());
+ assertFalse(ptg.isBaseToken(), "ptg[" + i + "] is a base token");
assertEquals(operandClass, ptg.getPtgClass());
}
}
diff --git a/src/testcases/org/apache/poi/hssf/model/TestRVA.java b/src/testcases/org/apache/poi/hssf/model/TestRVA.java
index 20bc884622..8ca28bb6fc 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestRVA.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestRVA.java
@@ -17,12 +17,13 @@
package org.apache.poi.hssf.model;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
+import java.util.stream.Stream;
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.usermodel.FormulaExtractor;
@@ -34,19 +35,16 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.ss.formula.ptg.AttrPtg;
import org.apache.poi.ss.formula.ptg.Ptg;
import org.apache.poi.ss.usermodel.CellType;
-import org.junit.AfterClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
/**
* Tests 'operand class' transformation performed by
* OperandClassTransformer by comparing its results with those
* directly produced by Excel (in a sample spreadsheet).
*/
-@RunWith(Parameterized.class)
public final class TestRVA {
private static final String NEW_LINE = System.getProperty("line.separator");
@@ -54,25 +52,19 @@ public final class TestRVA {
private static HSSFWorkbook workbook;
- @Parameter(value = 0)
- public HSSFCell formulaCell;
- @Parameter(value = 1)
- public String formula;
-
- @AfterClass
+ @AfterAll
public static void closeResource() throws Exception {
workbook.close();
poifs.close();
}
- @Parameters(name="{1}")
- public static Collection data() throws Exception {
+ public static Stream data() throws Exception {
poifs = new POIFSFileSystem(HSSFTestDataSamples.getSampleFile("testRVA.xls"), true);
workbook = new HSSFWorkbook(poifs);
HSSFSheet sheet = workbook.getSheetAt(0);
- List data = new ArrayList<>();
-
+ List data = new ArrayList<>();
+
for (int rowIdx = 0; true; rowIdx++) {
HSSFRow row = sheet.getRow(rowIdx);
if (row == null) {
@@ -84,29 +76,29 @@ public final class TestRVA {
}
String formula = cell.getCellFormula();
- data.add(new Object[]{cell,formula});
+ data.add(Arguments.of(cell,formula));
}
-
- return data;
+
+ return data.stream();
}
-
- @Test
- public void confirmCell() {
+
+ @ParameterizedTest
+ @MethodSource("data")
+ public void confirmCell(HSSFCell formulaCell, String formula) {
Ptg[] excelPtgs = FormulaExtractor.getPtgs(formulaCell);
Ptg[] poiPtgs = HSSFFormulaParser.parse(formula, workbook);
int nExcelTokens = excelPtgs.length;
int nPoiTokens = poiPtgs.length;
if (nExcelTokens != nPoiTokens) {
- if (nExcelTokens == nPoiTokens + 1 && excelPtgs[0].getClass() == AttrPtg.class) {
- // compensate for missing tAttrVolatile, which belongs in any formula
- // involving OFFSET() et al. POI currently does not insert where required
- Ptg[] temp = new Ptg[nExcelTokens];
- temp[0] = excelPtgs[0];
- System.arraycopy(poiPtgs, 0, temp, 1, nPoiTokens);
- poiPtgs = temp;
- } else {
- fail("Expected " + nExcelTokens + " tokens but got " + nPoiTokens);
- }
+ assertTrue(nExcelTokens == nPoiTokens + 1 && excelPtgs[0].getClass() == AttrPtg.class,
+ "Expected " + nExcelTokens + " tokens but got " + nPoiTokens);
+
+ // compensate for missing tAttrVolatile, which belongs in any formula
+ // involving OFFSET() et al. POI currently does not insert where required
+ Ptg[] temp = new Ptg[nExcelTokens];
+ temp[0] = excelPtgs[0];
+ System.arraycopy(poiPtgs, 0, temp, 1, nPoiTokens);
+ poiPtgs = temp;
}
boolean hasMismatch = false;
StringBuilder sb = new StringBuilder();
diff --git a/src/testcases/org/apache/poi/hssf/model/TestRowBlocksReader.java b/src/testcases/org/apache/poi/hssf/model/TestRowBlocksReader.java
index bf1fce7996..aa9b4c4c6a 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestRowBlocksReader.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestRowBlocksReader.java
@@ -17,10 +17,11 @@
package org.apache.poi.hssf.model;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-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.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.Arrays;
@@ -31,7 +32,7 @@ import org.apache.poi.hssf.record.UnknownRecord;
import org.apache.poi.hssf.record.WindowTwoRecord;
import org.apache.poi.hssf.record.pivottable.ViewDefinitionRecord;
import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link RowBlocksReader}
@@ -51,10 +52,9 @@ public final class TestRowBlocksReader {
};
RecordStream rs = new RecordStream(Arrays.asList(inRecs), 0);
RowBlocksReader rbr = new RowBlocksReader(rs);
- if (rs.peekNextClass() == WindowTwoRecord.class) {
- // Should have stopped at the SXVIEW record
- fail("Identified bug 46280b");
- }
+ assertNotEquals(WindowTwoRecord.class, rs.peekNextClass(),
+ "Should have stopped at the SXVIEW record - Identified bug 46280b");
+
RecordStream rbStream = rbr.getPlainRecordStream();
assertEquals(inRecs[0], rbStream.getNext());
assertEquals(inRecs[1], rbStream.getNext());
diff --git a/src/testcases/org/apache/poi/hssf/model/TestSheet.java b/src/testcases/org/apache/poi/hssf/model/TestSheet.java
index 8042be6e0e..bdc27459c6 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestSheet.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestSheet.java
@@ -17,12 +17,13 @@
package org.apache.poi.hssf.model;
-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 static org.junit.jupiter.api.Assertions.fail;
import java.util.ArrayList;
import java.util.Arrays;
@@ -44,7 +45,7 @@ import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.ss.formula.FormulaShifter;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Unit test for the {@link InternalSheet} class.
@@ -112,7 +113,7 @@ public final class TestSheet {
for (int n = 0; n < regionsToAdd; n++)
{
int index = sheet.addMergedRegion(0, (short) 0, 1, (short) 1);
- assertEquals("Merged region index expected to be " + n + " got " + index, index, n);
+ assertEquals(index, n, "Merged region index expected to be " + n + " got " + index);
}
//test all the regions were indeed added
@@ -127,23 +128,16 @@ public final class TestSheet {
if ((regionsToAdd % 1027) != 0) {
recordsExpected++;
}
- assertEquals("The " + regionsToAdd + " merged regions should have been spread out over "
- + recordsExpected + " records, not " + recordsAdded, recordsAdded, recordsExpected);
+ assertEquals(recordsAdded, recordsExpected,
+ "The " + regionsToAdd + " merged regions should have been spread out over "
+ + recordsExpected + " records, not " + recordsAdded);
// Check we can't add one with invalid date
- try {
- sheet.addMergedRegion(10, (short)10, 9, (short)12);
- fail("Expected an exception to occur");
- } catch(IllegalArgumentException e) {
- // occurs during successful test
- assertEquals("The 'to' row (9) must not be less than the 'from' row (10)", e.getMessage());
- }
- try {
- sheet.addMergedRegion(10, (short)10, 12, (short)9);
- fail("Expected an exception to occur");
- } catch(IllegalArgumentException e) {
- // occurs during successful test
- assertEquals("The 'to' col (9) must not be less than the 'from' col (10)", e.getMessage());
- }
+ IllegalArgumentException e;
+ e = assertThrows(IllegalArgumentException.class, () -> sheet.addMergedRegion(10, (short)10, 9, (short)12));
+ assertEquals("The 'to' row (9) must not be less than the 'from' row (10)", e.getMessage());
+
+ e = assertThrows(IllegalArgumentException.class, () -> sheet.addMergedRegion(10, (short)10, 12, (short)9));
+ assertEquals("The 'to' col (9) must not be less than the 'from' col (10)", e.getMessage());
}
@Test
@@ -162,12 +156,12 @@ public final class TestSheet {
{
sheet.removeMergedRegion(0);
//assert they have been deleted
- assertEquals("Num of regions", regionsToAdd - n - 1, sheet.getNumMergedRegions());
+ assertEquals(regionsToAdd - n - 1, sheet.getNumMergedRegions(), "Num of regions");
}
// merge records are removed from within the MergedCellsTable,
// so the sheet record count should not change
- assertEquals("Sheet Records", nSheetRecords, sheet.getRecords().size());
+ assertEquals(nSheetRecords, sheet.getRecords().size(), "Sheet Records");
}
/**
@@ -199,7 +193,7 @@ public final class TestSheet {
//stub object to throw off list INDEX operations
sheet.removeMergedRegion(0);
- assertEquals("Should be no more merged regions", 0, sheet.getNumMergedRegions());
+ assertEquals(0, sheet.getNumMergedRegions(), "Should be no more merged regions");
}
// @Test
@@ -233,7 +227,7 @@ public final class TestSheet {
records.add(EOFRecord.instance);
InternalSheet sheet = createSheet(records);
- assertNotNull("Row [2] was skipped", sheet.getRow(2));
+ assertNotNull(sheet.getRow(2), "Row [2] was skipped");
}
/**
@@ -249,21 +243,21 @@ public final class TestSheet {
PageSettingsBlock sheet = worksheet.getPageSettings();
sheet.setRowBreak(0, colFrom, colTo);
- assertTrue("no row break at 0", sheet.isRowBroken(0));
- assertEquals("1 row break available", 1, sheet.getNumRowBreaks());
+ assertTrue(sheet.isRowBroken(0), "no row break at 0");
+ assertEquals(1, sheet.getNumRowBreaks(), "1 row break available");
sheet.setRowBreak(0, colFrom, colTo);
sheet.setRowBreak(0, colFrom, colTo);
- assertTrue("no row break at 0", sheet.isRowBroken(0));
- assertEquals("1 row break available", 1, sheet.getNumRowBreaks());
+ assertTrue(sheet.isRowBroken(0), "no row break at 0");
+ assertEquals(1, sheet.getNumRowBreaks(), "1 row break available");
sheet.setRowBreak(10, colFrom, colTo);
sheet.setRowBreak(11, colFrom, colTo);
- assertTrue("no row break at 10", sheet.isRowBroken(10));
- assertTrue("no row break at 11", sheet.isRowBroken(11));
- assertEquals("3 row break available", 3, sheet.getNumRowBreaks());
+ assertTrue(sheet.isRowBroken(10), "no row break at 10");
+ assertTrue(sheet.isRowBroken(11), "no row break at 11");
+ assertEquals(3, sheet.getNumRowBreaks(), "3 row break available");
boolean is10 = false;
@@ -272,24 +266,24 @@ public final class TestSheet {
int[] rowBreaks = sheet.getRowBreaks();
for (int main : rowBreaks) {
- if (main != 0 && main != 10 && main != 11) fail("Invalid page break");
+ assertTrue(main == 0 || main == 10 || main == 11, "Invalid page break");
if (main == 0) is0 = true;
- if (main == 10) is10= true;
+ if (main == 10) is10 = true;
if (main == 11) is11 = true;
}
- assertTrue("one of the breaks didnt make it", is0 && is10 && is11);
+ assertTrue(is0 && is10 && is11, "one of the breaks didnt make it");
sheet.removeRowBreak(11);
- assertFalse("row should be removed", sheet.isRowBroken(11));
+ assertFalse(sheet.isRowBroken(11), "row should be removed");
sheet.removeRowBreak(0);
- assertFalse("row should be removed", sheet.isRowBroken(0));
+ assertFalse(sheet.isRowBroken(0), "row should be removed");
sheet.removeRowBreak(10);
- assertFalse("row should be removed", sheet.isRowBroken(10));
+ assertFalse(sheet.isRowBroken(10), "row should be removed");
- assertEquals("no more breaks", 0, sheet.getNumRowBreaks());
+ assertEquals(0, sheet.getNumRowBreaks(), "no more breaks");
}
/**
@@ -305,22 +299,22 @@ public final class TestSheet {
PageSettingsBlock sheet = worksheet.getPageSettings();
sheet.setColumnBreak((short)0, rowFrom, rowTo);
- assertTrue("no col break at 0", sheet.isColumnBroken(0));
- assertEquals("1 col break available", 1, sheet.getNumColumnBreaks());
+ assertTrue(sheet.isColumnBroken(0), "no col break at 0");
+ assertEquals(1, sheet.getNumColumnBreaks(), "1 col break available");
sheet.setColumnBreak((short)0, rowFrom, rowTo);
- assertTrue("no col break at 0", sheet.isColumnBroken(0));
- assertEquals("1 col break available", 1, sheet.getNumColumnBreaks());
+ assertTrue(sheet.isColumnBroken(0), "no col break at 0");
+ assertEquals(1, sheet.getNumColumnBreaks(), "1 col break available");
sheet.setColumnBreak((short)1, rowFrom, rowTo);
sheet.setColumnBreak((short)10, rowFrom, rowTo);
sheet.setColumnBreak((short)15, rowFrom, rowTo);
- assertTrue("no col break at 1", sheet.isColumnBroken(1));
- assertTrue("no col break at 10", sheet.isColumnBroken(10));
- assertTrue("no col break at 15", sheet.isColumnBroken(15));
- assertEquals("4 col break available", 4, sheet.getNumColumnBreaks());
+ assertTrue(sheet.isColumnBroken(1), "no col break at 1");
+ assertTrue(sheet.isColumnBroken(10), "no col break at 10");
+ assertTrue(sheet.isColumnBroken(15), "no col break at 15");
+ assertEquals(4, sheet.getNumColumnBreaks(), "4 col break available");
boolean is10 = false;
boolean is0 = false;
@@ -329,28 +323,28 @@ public final class TestSheet {
int[] colBreaks = sheet.getColumnBreaks();
for (int main : colBreaks) {
- if (main != 0 && main != 1 && main != 10 && main != 15) fail("Invalid page break");
+ assertTrue(main == 0 || main == 1 || main == 10 || main == 15, "Invalid page break");
if (main == 0) is0 = true;
if (main == 1) is1 = true;
if (main == 10) is10= true;
if (main == 15) is15 = true;
}
- assertTrue("one of the breaks didnt make it", is0 && is1 && is10 && is15);
+ assertTrue(is0 && is1 && is10 && is15, "one of the breaks didnt make it");
sheet.removeColumnBreak(15);
- assertFalse("column break should not be there", sheet.isColumnBroken(15));
+ assertFalse(sheet.isColumnBroken(15), "column break should not be there");
sheet.removeColumnBreak(0);
- assertFalse("column break should not be there", sheet.isColumnBroken(0));
+ assertFalse(sheet.isColumnBroken(0), "column break should not be there");
sheet.removeColumnBreak(1);
- assertFalse("column break should not be there", sheet.isColumnBroken(1));
+ assertFalse(sheet.isColumnBroken(1), "column break should not be there");
sheet.removeColumnBreak(10);
- assertFalse("column break should not be there", sheet.isColumnBroken(10));
+ assertFalse(sheet.isColumnBroken(10), "column break should not be there");
- assertEquals("no more breaks", 0, sheet.getNumColumnBreaks());
+ assertEquals(0, sheet.getNumColumnBreaks(), "no more breaks");
}
/**
@@ -447,7 +441,7 @@ public final class TestSheet {
sheet.visitContainedRecords(r -> {
int estimatedSize = r.getRecordSize();
int serializedSize = r.serialize(0, buf);
- assertEquals("serialized size mismatch for record (" + r.getClass().getName() + ")", estimatedSize, serializedSize);
+ assertEquals(estimatedSize, serializedSize, "serialized size mismatch for record (" + r.getClass().getName() + ")");
totalSize[0] += estimatedSize;
}, 0);
assertEquals(90, totalSize[0]);
@@ -540,17 +534,13 @@ public final class TestSheet {
@Test
public void testMisplacedMergedCellsRecords_bug45699() throws Exception {
- HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("ex45698-22488.xls");
-
- HSSFSheet sheet = wb.getSheetAt(0);
- HSSFRow row = sheet.getRow(3);
- HSSFCell cell = row.getCell(4);
- if (cell == null) {
- fail("Identified bug 45699");
+ try (HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("ex45698-22488.xls")) {
+ HSSFSheet sheet = wb.getSheetAt(0);
+ HSSFRow row = sheet.getRow(3);
+ HSSFCell cell = row.getCell(4);
+ assertNotNull(cell, "Identified bug 45699");
+ assertEquals("Informations", cell.getRichStringCellValue().getString());
}
- assertEquals("Informations", cell.getRichStringCellValue().getString());
-
- wb.close();
}
/**
* In 3.1, setting margins between creating first row and first cell caused an exception.
diff --git a/src/testcases/org/apache/poi/hssf/model/TestSheetAdditional.java b/src/testcases/org/apache/poi/hssf/model/TestSheetAdditional.java
index c0ef0fd7dc..974a336553 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestSheetAdditional.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestSheetAdditional.java
@@ -17,11 +17,11 @@
package org.apache.poi.hssf.model;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.poi.hssf.record.ColumnInfoRecord;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestSheetAdditional {
@Test
diff --git a/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java b/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java
index bc8db67c85..ee9b06d0fd 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java
@@ -17,12 +17,12 @@
package org.apache.poi.hssf.model;
-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.assertSame;
-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.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
@@ -36,7 +36,7 @@ import org.apache.poi.ss.formula.functions.FreeRefFunction;
import org.apache.poi.ss.formula.udf.AggregatingUDFFinder;
import org.apache.poi.ss.formula.udf.DefaultUDFFinder;
import org.apache.poi.ss.formula.udf.UDFFinder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Unit test for the Workbook class.
@@ -161,15 +161,13 @@ public final class TestWorkbook {
InternalWorkbook iwb = TestHSSFWorkbook.getInternalWorkbook(wb);
int oldRecordsCount = iwb.getNumRecords();
- //System.out.println("records count = " + oldRecordsCount);
- assertEquals("records count", 68, oldRecordsCount);
+ assertEquals(68, oldRecordsCount, "records count");
WriteAccessRecord writeAccess = iwb.getWriteAccess();
assertNotNull(writeAccess);
assertEquals(WriteAccessRecord.sid, writeAccess.getSid());
int newRecordsCount = iwb.getNumRecords();
- //System.out.println("records count after 'getWriteAccess' = " + newRecordsCount);
- assertEquals("records count after getWriteAccess", oldRecordsCount, newRecordsCount);
+ assertEquals(oldRecordsCount, newRecordsCount, "records count after getWriteAccess");
}
}
diff --git a/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java b/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
deleted file mode 100644
index e32816756c..0000000000
--- a/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record;
-
-import org.apache.poi.hssf.record.aggregates.AllRecordAggregateTests;
-import org.apache.poi.hssf.record.cf.TestCellRange;
-import org.apache.poi.hssf.record.chart.AllChartRecordTests;
-import org.apache.poi.hssf.record.common.TestUnicodeString;
-import org.apache.poi.hssf.record.pivot.AllPivotRecordTests;
-import org.apache.poi.poifs.crypt.AllEncryptionTests;
-import org.apache.poi.ss.formula.constant.TestConstantValueParser;
-import org.apache.poi.ss.formula.ptg.AllFormulaTests;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Collects all tests for package org.apache.poi.hssf.record and sub-packages.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
- AllChartRecordTests.class,
- AllEncryptionTests.class,
- AllFormulaTests.class,
- AllPivotRecordTests.class,
- AllRecordAggregateTests.class,
- TestArrayRecord.class,
- TestBOFRecord.class,
- TestBoolErrRecord.class,
- TestBoundSheetRecord.class,
- TestCellRange.class,
- TestCFHeaderRecord.class,
- TestCFRuleRecord.class,
- TestColumnInfoRecord.class,
- TestCommonObjectDataSubRecord.class,
- TestConstantValueParser.class,
- TestDVALRecord.class,
- TestDrawingGroupRecord.class,
- TestDrawingRecord.class,
- TestEmbeddedObjectRefSubRecord.class,
- TestEndSubRecord.class,
- TestEscherAggregate.class,
- TestExtendedFormatRecord.class,
- TestExternalNameRecord.class,
- TestFeatRecord.class,
- TestFontRecord.class,
- TestFormulaRecord.class,
- TestHyperlinkRecord.class,
- TestInterfaceEndRecord.class,
- TestLabelRecord.class,
- TestLbsDataSubRecord.class,
- TestMergeCellsRecord.class,
- TestNameRecord.class,
- TestNoteRecord.class,
- TestNoteStructureSubRecord.class,
- TestObjRecord.class,
- //TestPaletteRecord.class, //converted to junit4
- TestPaneRecord.class,
- TestPLVRecord.class,
- TestRecalcIdRecord.class,
- TestRecordFactory.class,
- TestRecordFactoryInputStream.class,
- TestRecordInputStream.class,
- TestSCLRecord.class,
- TestSSTDeserializer.class,
- TestSSTRecord.class,
- TestSSTRecordSizeCalculator.class,
- TestSharedFormulaRecord.class,
- TestStringRecord.class,
- TestStyleRecord.class,
- TestSubRecord.class,
- TestSupBookRecord.class,
- TestTableRecord.class,
- TestTextObjectBaseRecord.class,
- TestTextObjectRecord.class,
- TestUnicodeNameRecord.class,
- TestUnicodeString.class,
- TestWriteAccessRecord.class,
- TestDConRefRecord.class
-})
-public final class AllRecordTests {
-}
diff --git a/src/testcases/org/apache/poi/hssf/record/TestArrayRecord.java b/src/testcases/org/apache/poi/hssf/record/TestArrayRecord.java
index d84b514b08..a7da3501f7 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestArrayRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestArrayRecord.java
@@ -17,8 +17,8 @@
package org.apache.poi.hssf.record;
-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.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -31,7 +31,7 @@ import org.apache.poi.ss.formula.FormulaType;
import org.apache.poi.ss.formula.ptg.Ptg;
import org.apache.poi.util.HexDump;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestArrayRecord {
diff --git a/src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java b/src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java
index 2baf72b8a4..daa41fc8d2 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java
@@ -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.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the AutoFilterInfoRecord class.
diff --git a/src/testcases/org/apache/poi/hssf/record/TestBOFRecord.java b/src/testcases/org/apache/poi/hssf/record/TestBOFRecord.java
index f63993e424..a73e0aacf6 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestBOFRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestBOFRecord.java
@@ -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.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Sheet;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestBOFRecord {
@Test
diff --git a/src/testcases/org/apache/poi/hssf/record/TestBoolErrRecord.java b/src/testcases/org/apache/poi/hssf/record/TestBoolErrRecord.java
index ee5d8af5c3..a281b5f009 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestBoolErrRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestBoolErrRecord.java
@@ -17,13 +17,13 @@
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.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.assertTrue;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link BoolErrRecord}
diff --git a/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java b/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java
index 4f2f32904f..48b2796d2c 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java
@@ -17,16 +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.assertFalse;
-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.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.ArrayList;
import java.util.List;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests BoundSheetRecord.
@@ -45,10 +46,10 @@ public final class TestBoundSheetRecord {
assertEquals(24, record.getRecordSize());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testName() {
BoundSheetRecord record = new BoundSheetRecord("1234567890223456789032345678904");
- record.setSheetname("s//*s");
+ assertThrows(IllegalArgumentException.class, () -> record.setSheetname("s//*s"));
}
@Test
diff --git a/src/testcases/org/apache/poi/hssf/record/TestCFHeaderRecord.java b/src/testcases/org/apache/poi/hssf/record/TestCFHeaderRecord.java
index 484cfc0b7d..68b5bad564 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestCFHeaderRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestCFHeaderRecord.java
@@ -18,12 +18,12 @@
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.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.util.CellRangeAddress;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the {@link CFHeaderRecord}
@@ -133,7 +133,7 @@ public final class TestCFHeaderRecord {
CFHeaderRecord record = new CFHeaderRecord(TestcaseRecordInputStream.create(CFHeaderRecord.sid, recordData));
- assertEquals("#CFRULES", 3, record.getNumberOfConditionalFormats());
+ assertEquals(3, record.getNumberOfConditionalFormats(), "#CFRULES");
assertTrue(record.getNeedRecalculation());
confirm(record.getEnclosingCellRange(), 0, 3, 0, 3);
CellRangeAddress[] ranges = record.getCellRanges();
@@ -180,7 +180,7 @@ public final class TestCFHeaderRecord {
// bug 44739b - invalid cell range (-25536, 2, -15536, 2)
CFHeaderRecord record = new CFHeaderRecord(TestcaseRecordInputStream.create(CFHeaderRecord.sid, recordData));
- assertEquals("#CFRULES", 19, record.getNumberOfConditionalFormats());
+ assertEquals(19, record.getNumberOfConditionalFormats(), "#CFRULES");
assertFalse(record.getNeedRecalculation());
confirm(record.getEnclosingCellRange(), 0, 65535, 0, 255);
CellRangeAddress[] ranges = record.getCellRanges();
@@ -194,9 +194,9 @@ public final class TestCFHeaderRecord {
}
private static void confirm(CellRangeAddress cr, int expFirstRow, int expLastRow, int expFirstCol, int expLastColumn) {
- assertEquals("first row", expFirstRow, cr.getFirstRow());
- assertEquals("last row", expLastRow, cr.getLastRow());
- assertEquals("first column", expFirstCol, cr.getFirstColumn());
- assertEquals("last column", expLastColumn, cr.getLastColumn());
+ assertEquals(expFirstRow, cr.getFirstRow(), "first row");
+ assertEquals(expLastRow, cr.getLastRow(), "last row");
+ assertEquals(expFirstCol, cr.getFirstColumn(), "first column");
+ assertEquals(expLastColumn, cr.getLastColumn(), "last column");
}
}
diff --git a/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java b/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java
index c0aa3629ea..ea5462dd33 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java
@@ -18,12 +18,12 @@
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.assertNotNull;
-import static org.junit.Assert.assertSame;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.util.Arrays;
@@ -42,7 +42,7 @@ import org.apache.poi.ss.formula.ptg.RefPtg;
import org.apache.poi.ss.usermodel.ConditionalFormattingThreshold.RangeType;
import org.apache.poi.ss.usermodel.IconMultiStateFormatting.IconSet;
import org.apache.poi.util.LittleEndian;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the TestCFRuleRecord
@@ -387,8 +387,9 @@ public final class TestCFRuleRecord {
assertEquals(3, LittleEndian.getShort(data, 8));
int flags = LittleEndian.getInt(data, 10);
- assertEquals("unused flags should be 111", 0x00380000, flags & 0x00380000);
- assertEquals("undocumented flags should be 0000", 0, flags & 0x03C00000); // Otherwise Excel gets unhappy
+ assertEquals(0x00380000, flags & 0x00380000, "unused flags should be 111");
+ // Otherwise Excel gets unhappy
+ assertEquals(0, flags & 0x03C00000, "undocumented flags should be 0000");
// check all remaining flag bits (some are not well understood yet)
assertEquals(0x203FFFFF, flags);
}
@@ -415,7 +416,7 @@ public final class TestCFRuleRecord {
CFRuleRecord rr = new CFRuleRecord(is);
Ptg[] ptgs = rr.getParsedExpression1();
assertEquals(3, ptgs.length);
- assertFalse("Identified bug 45234", ptgs[0] instanceof RefPtg);
+ assertFalse(ptgs[0] instanceof RefPtg, "Identified bug 45234");
assertEquals(RefNPtg.class, ptgs[0].getClass());
RefNPtg refNPtg = (RefNPtg) ptgs[0];
assertTrue(refNPtg.isColRelative());
diff --git a/src/testcases/org/apache/poi/hssf/record/TestColumnInfoRecord.java b/src/testcases/org/apache/poi/hssf/record/TestColumnInfoRecord.java
index 0d57714618..1910a96f7b 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestColumnInfoRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestColumnInfoRecord.java
@@ -17,12 +17,12 @@
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.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link ColumnInfoRecord}
diff --git a/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java b/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java
index d46cda971c..c79165fec2 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java
@@ -19,11 +19,11 @@ 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.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.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the {@link CommonObjectDataSubRecord}
diff --git a/src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java b/src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java
index 259cd9b2a3..c9797cc6f0 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java
@@ -19,17 +19,17 @@
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.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.assertTrue;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Arrays;
import org.apache.poi.util.LittleEndianOutputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Unit tests for DConRefRecord class.
@@ -214,7 +214,7 @@ public class TestDConRefRecord {
d.serialize(o);
o.flush();
- assertArrayEquals(message, data, bos.toByteArray());
+ assertArrayEquals(data, bos.toByteArray(), message);
}
/**
@@ -241,14 +241,14 @@ public class TestDConRefRecord {
DConRefRecord instance = new DConRefRecord(TestcaseRecordInputStream.create(81, data1));
int expResult = data1.length;
int result = instance.getDataSize();
- assertEquals("single byte external reference, volume type path data size", expResult, result);
+ assertEquals(expResult, result, "single byte external reference, volume type path data size");
instance = new DConRefRecord(TestcaseRecordInputStream.create(81, data2));
- assertEquals("double byte self reference data size", data2.length, instance.getDataSize());
+ assertEquals(data2.length, instance.getDataSize(), "double byte self reference data size");
instance = new DConRefRecord(TestcaseRecordInputStream.create(81, data3));
- assertEquals("single byte self reference data size", data3.length, instance.getDataSize());
+ assertEquals(data3.length, instance.getDataSize(), "single byte self reference data size");
instance = new DConRefRecord(TestcaseRecordInputStream.create(81, data4));
- assertEquals("double byte external reference, UNC volume type path data size", data4.length,
- instance.getDataSize());
+ assertEquals(data4.length, instance.getDataSize(),
+ "double byte external reference, UNC volume type path data size");
}
/**
@@ -259,7 +259,7 @@ public class TestDConRefRecord {
DConRefRecord instance = new DConRefRecord(TestcaseRecordInputStream.create(81, data1));
short expResult = 81;
short result = instance.getSid();
- assertEquals("SID", expResult, result);
+ assertEquals(expResult, result, "SID");
}
/**
@@ -271,7 +271,7 @@ public class TestDConRefRecord {
DConRefRecord instance = new DConRefRecord(TestcaseRecordInputStream.create(81, data1));
byte[] expResult = Arrays.copyOfRange(data1, 9, data1.length);
byte[] result = instance.getPath();
- assertArrayEquals("get path", expResult, result);
+ assertArrayEquals(expResult, result, "get path");
}
/**
@@ -280,8 +280,8 @@ public class TestDConRefRecord {
@Test
public void testIsExternalRef() {
DConRefRecord instance = new DConRefRecord(TestcaseRecordInputStream.create(81, data1));
- assertTrue("external reference", instance.isExternalRef());
+ assertTrue(instance.isExternalRef(), "external reference");
instance = new DConRefRecord(TestcaseRecordInputStream.create(81, data2));
- assertFalse("internal reference", instance.isExternalRef());
+ assertFalse(instance.isExternalRef(), "internal reference");
}
}
diff --git a/src/testcases/org/apache/poi/hssf/record/TestDVALRecord.java b/src/testcases/org/apache/poi/hssf/record/TestDVALRecord.java
index 3e8ab9811e..83fff74ae8 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestDVALRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestDVALRecord.java
@@ -17,13 +17,13 @@
package org.apache.poi.hssf.record;
-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.io.ByteArrayInputStream;
import org.apache.poi.util.LittleEndian;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestDVALRecord {
@Test
@@ -45,7 +45,7 @@ public final class TestDVALRecord {
assertEquals(56, dv.getHorizontalPos());
assertEquals(57, dv.getVerticalPos());
assertEquals(58, dv.getObjectID());
- assertNotEquals("Identified bug 44510",0, dv.getDVRecNo());
+ assertNotEquals(0, dv.getDVRecNo(), "Identified bug 44510");
assertEquals(59, dv.getDVRecNo());
}
}
diff --git a/src/testcases/org/apache/poi/hssf/record/TestDrawingGroupRecord.java b/src/testcases/org/apache/poi/hssf/record/TestDrawingGroupRecord.java
index acee4f2727..042c3ec348 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestDrawingGroupRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestDrawingGroupRecord.java
@@ -18,12 +18,12 @@
package org.apache.poi.hssf.record;
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.cut;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.ddf.EscherContainerRecord;
import org.apache.poi.ddf.EscherSpRecord;
import org.apache.poi.util.HexDump;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestDrawingGroupRecord {
private static final int MAX_RECORD_SIZE = 8228;
diff --git a/src/testcases/org/apache/poi/hssf/record/TestDrawingRecord.java b/src/testcases/org/apache/poi/hssf/record/TestDrawingRecord.java
index 9b2c650c42..1aa1cefa88 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestDrawingRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestDrawingRecord.java
@@ -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.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 java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -27,7 +27,7 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestDrawingRecord {
diff --git a/src/testcases/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java b/src/testcases/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java
index b8b1e20bd8..ac3f6b56e7 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java
@@ -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;
/**
* Tests the serialization and deserialization of the TestEmbeddedObjectRefSubRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/TestEndSubRecord.java b/src/testcases/org/apache/poi/hssf/record/TestEndSubRecord.java
index fa5d9c7233..306c60d451 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestEndSubRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestEndSubRecord.java
@@ -18,9 +18,9 @@
package org.apache.poi.hssf.record;
-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 EndSubRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java b/src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java
index 32c0750336..761256479b 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java
@@ -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.util.ArrayList;
import java.util.List;
@@ -27,7 +27,7 @@ import org.apache.poi.ddf.EscherContainerRecord;
import org.apache.poi.ddf.EscherSpRecord;
import org.apache.poi.util.HexDump;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the EscherAggregate class.
diff --git a/src/testcases/org/apache/poi/hssf/record/TestExtSSTRecord.java b/src/testcases/org/apache/poi/hssf/record/TestExtSSTRecord.java
index 0d6bf167af..5ad4a65830 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestExtSSTRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestExtSSTRecord.java
@@ -19,12 +19,12 @@
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.poifs.storage.RawDataUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestExtSSTRecord {
diff --git a/src/testcases/org/apache/poi/hssf/record/TestExtendedFormatRecord.java b/src/testcases/org/apache/poi/hssf/record/TestExtendedFormatRecord.java
index 71de921dcc..632a6f1cf2 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestExtendedFormatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestExtendedFormatRecord.java
@@ -18,9 +18,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;
public final class TestExtendedFormatRecord {
diff --git a/src/testcases/org/apache/poi/hssf/record/TestExternalNameRecord.java b/src/testcases/org/apache/poi/hssf/record/TestExternalNameRecord.java
index 3bb3c8394a..bca4bbe6fe 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestExternalNameRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestExternalNameRecord.java
@@ -18,15 +18,15 @@
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.assertFalse;
-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.assertFalse;
+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 org.apache.poi.util.HexDump;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestExternalNameRecord {
@@ -64,7 +64,7 @@ public final class TestExternalNameRecord {
@Test
public void testBasicSize() {
ExternalNameRecord enr = createSimpleENR(dataFDS);
- assertNotEquals("Identified bug 44695",13, enr.getRecordSize());
+ assertNotEquals(13, enr.getRecordSize(), "Identified bug 44695");
assertEquals(17, enr.getRecordSize());
assertNotNull(enr.serialize());
diff --git a/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java b/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java
index fe56976545..74b06b172e 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java
@@ -17,11 +17,11 @@
package org.apache.poi.hssf.record;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
@@ -32,7 +32,7 @@ import org.apache.poi.hssf.record.common.FeatFormulaErr2;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFTestHelper;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for FeatRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/TestFontRecord.java b/src/testcases/org/apache/poi/hssf/record/TestFontRecord.java
index 69f6254f96..2a24c80143 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestFontRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestFontRecord.java
@@ -19,13 +19,13 @@ 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.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-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.assertTrue;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the {@link FontRecord}
@@ -111,7 +111,7 @@ public final class TestFontRecord {
byte [] recordBytes = other.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
diff --git a/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java b/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java
index bd454365e1..180a8d0521 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java
@@ -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());
}
diff --git a/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java b/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java
index 1a1204c2f5..985fe64eaa 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java b/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java
index 269bbd1adb..cbcb0a493f 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java b/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java
index f085cf15c8..96e844486c 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/TestLabelRecord.java b/src/testcases/org/apache/poi/hssf/record/TestLabelRecord.java
index ec5ed36689..f1f93ffe95 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestLabelRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestLabelRecord.java
@@ -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 LabelRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java b/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java
index ab54970fb1..71e2504761 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java
@@ -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.CellRangeAddress;
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.
diff --git a/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java b/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java
index fa4dc0b1e5..f19e428355 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java
@@ -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));
}
diff --git a/src/testcases/org/apache/poi/hssf/record/TestNameCommentRecord.java b/src/testcases/org/apache/poi/hssf/record/TestNameCommentRecord.java
index 062784675f..20fa58db33 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestNameCommentRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestNameCommentRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/TestNameRecord.java b/src/testcases/org/apache/poi/hssf/record/TestNameRecord.java
index 7dfdf4f8ee..3c0f267bd7 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestNameRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestNameRecord.java
@@ -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.NamePtg;
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
diff --git a/src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java b/src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java
index c2ccad9a4a..cbec6a7573 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java b/src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java
index 358a1431c6..b1692389d7 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/TestObjRecord.java b/src/testcases/org/apache/poi/hssf/record/TestObjRecord.java
index c6cb9ac26f..54b9cd3cac 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestObjRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestObjRecord.java
@@ -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 subrecords = record.getSubRecords();
diff --git a/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java b/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java
index 94c8bca18d..653335cf69 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java
@@ -25,7 +25,7 @@ import org.apache.poi.hssf.usermodel.HSSFDataValidation;
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
diff --git a/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java b/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java
index 321b6e3129..d1805300b1 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java
@@ -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);
}
}
}
diff --git a/src/testcases/org/apache/poi/hssf/record/TestPaneRecord.java b/src/testcases/org/apache/poi/hssf/record/TestPaneRecord.java
index f787ef25e5..906a73f6fd 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestPaneRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestPaneRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/TestRecalcIdRecord.java b/src/testcases/org/apache/poi/hssf/record/TestRecalcIdRecord.java
index bbaeae4a23..7662a95d5b 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestRecalcIdRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestRecalcIdRecord.java
@@ -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 {
diff --git a/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java b/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java
index 2e67f25b7d..103eeace7d 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java
@@ -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 " +
diff --git a/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java b/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java
index 757da3c9ca..89604135b5 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java
@@ -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}
diff --git a/src/testcases/org/apache/poi/hssf/record/TestRecordInputStream.java b/src/testcases/org/apache/poi/hssf/record/TestRecordInputStream.java
index ebd0db6cf2..e01048fe24 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestRecordInputStream.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestRecordInputStream.java
@@ -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}
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java b/src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java
index 561a966861..cfe9f1ebea 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java b/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java
index 17a5a8852f..5c0c88c3b8 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java
@@ -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.HSSFTestDataSamples;
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 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 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 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);
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java b/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java
index 96ff3ad6ac..9b030894a8 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java
@@ -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.RawDataUtil;
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 iterA = expected.getStrings();
Iterator iterB = actual.getStrings();
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java b/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java
index e9dd0798fa..2c26a91f54 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java
@@ -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.
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java b/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
index a5cc315975..b24f02af78 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
@@ -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.RefPtg;
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 TestSharedFormulaRecord {
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
diff --git a/src/testcases/org/apache/poi/hssf/record/TestStringRecord.java b/src/testcases/org/apache/poi/hssf/record/TestStringRecord.java
index e113837a2a..ed1282152d 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestStringRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestStringRecord.java
@@ -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));
diff --git a/src/testcases/org/apache/poi/hssf/record/TestStyleRecord.java b/src/testcases/org/apache/poi/hssf/record/TestStyleRecord.java
index a2236addc9..068ea327b2 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestStyleRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestStyleRecord.java
@@ -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}
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSubRecord.java b/src/testcases/org/apache/poi/hssf/record/TestSubRecord.java
index 10377c23f3..608e5a9050 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSubRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestSubRecord.java
@@ -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");
}
/**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSupBookRecord.java b/src/testcases/org/apache/poi/hssf/record/TestSupBookRecord.java
index da8f6a1576..4ad7a39d35 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSupBookRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestSupBookRecord.java
@@ -27,10 +27,10 @@ import static org.apache.poi.hssf.record.SupBookRecord.CH_UP_DIR;
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
diff --git a/src/testcases/org/apache/poi/hssf/record/TestTableRecord.java b/src/testcases/org/apache/poi/hssf/record/TestTableRecord.java
index 7f052df943..0ce1f53b92 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestTableRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestTableRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java b/src/testcases/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java
index dd327048b7..7823705ea9 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/TestTextObjectRecord.java b/src/testcases/org/apache/poi/hssf/record/TestTextObjectRecord.java
index 2b57c2fc03..9456aa985a 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestTextObjectRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestTextObjectRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/TestUnicodeNameRecord.java b/src/testcases/org/apache/poi/hssf/record/TestUnicodeNameRecord.java
index 03e3a17919..55f80ed678 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestUnicodeNameRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestUnicodeNameRecord.java
@@ -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 {
diff --git a/src/testcases/org/apache/poi/hssf/record/TestWriteAccessRecord.java b/src/testcases/org/apache/poi/hssf/record/TestWriteAccessRecord.java
index 38806d9020..2187479fc9 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestWriteAccessRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestWriteAccessRecord.java
@@ -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}
diff --git a/src/testcases/org/apache/poi/hssf/record/TestcaseRecordInputStream.java b/src/testcases/org/apache/poi/hssf/record/TestcaseRecordInputStream.java
index 4acc5f71e3..93c62912a9 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestcaseRecordInputStream.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestcaseRecordInputStream.java
@@ -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 TestcaseRecordInputStream {
*/
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));
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/AllRecordAggregateTests.java b/src/testcases/org/apache/poi/hssf/record/aggregates/AllRecordAggregateTests.java
deleted file mode 100644
index 4edf3eb9c0..0000000000
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/AllRecordAggregateTests.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.aggregates;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Collects all tests for package org.apache.poi.hssf.record.aggregates.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
- TestCFRecordsAggregate.class,
- TestColumnInfoRecordsAggregate.class,
- TestFormulaRecordAggregate.class,
- TestRowRecordsAggregate.class,
- TestSharedValueManager.class,
- TestValueRecordsAggregate.class,
- TestPageSettingsBlock.class
-})
-public final class AllRecordAggregateTests {
-}
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java b/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java
index e5fb8e769d..f930fadf1d 100644
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java
+++ b/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java
@@ -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.CFRule12Record;
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 TestCFRecordsAggregate {
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 TestCFRecordsAggregate {
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");
}
}
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java b/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
index 569ffbc8fc..238f74e3b4 100644
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
+++ b/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
@@ -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 TestColumnInfoRecordsAggregate {
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 TestColumnInfoRecordsAggregate {
private static void confirmCIR(List 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");
}
}
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java b/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java
index 798fa54b5a..d31f3d837f 100644
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java
+++ b/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java
@@ -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 {
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java b/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java
index 2f4217400b..c7822c28f0 100644
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java
+++ b/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java
@@ -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.HSSFSheet;
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 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};
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java b/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java
index c6b44be8f4..f0b2b671f6 100644
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java
+++ b/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java
@@ -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.UnknownRecord;
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 TestRowRecordsAggregate {
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 TestRowRecordsAggregate {
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);
}
}
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java b/src/testcases/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java
index 8c2a47e14c..2790da2cc9 100644
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java
+++ b/src/testcases/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java
@@ -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.SharedFormulaRecord;
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}
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java b/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java
index 477affdbf0..44f9656e19 100644
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java
+++ b/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java
@@ -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.aggregates.RecordAggregate.RecordVisitor;
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 TestValueRecordsAggregate {
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 records) {
@@ -258,13 +258,13 @@ public final class TestValueRecordsAggregate {
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();
}
diff --git a/src/testcases/org/apache/poi/hssf/record/cf/TestCellRange.java b/src/testcases/org/apache/poi/hssf/record/cf/TestCellRange.java
index 639edca2b3..aa59f19b88 100644
--- a/src/testcases/org/apache/poi/hssf/record/cf/TestCellRange.java
+++ b/src/testcases/org/apache/poi/hssf/record/cf/TestCellRange.java
@@ -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));
}
}
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/AllChartRecordTests.java b/src/testcases/org/apache/poi/hssf/record/chart/AllChartRecordTests.java
deleted file mode 100644
index 0f0c698681..0000000000
--- a/src/testcases/org/apache/poi/hssf/record/chart/AllChartRecordTests.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.chart;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Collects all tests for package org.apache.poi.hssf.record.class.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
- TestAreaFormatRecord.class,
- TestAreaRecord.class,
- TestAxisLineFormatRecord.class,
- TestAxisOptionsRecord.class,
- TestAxisParentRecord.class,
- TestAxisRecord.class,
- TestAxisUsedRecord.class,
- TestBarRecord.class,
- TestCategorySeriesAxisRecord.class,
- TestChartFormatRecord.class,
- TestChartRecord.class,
- TestChartTitleFormatRecord.class,
- TestDatRecord.class,
- TestDataFormatRecord.class,
- TestDefaultDataLabelTextPropertiesRecord.class,
- TestFontBasisRecord.class,
- TestFontIndexRecord.class,
- TestFrameRecord.class,
- TestLegendRecord.class,
- TestLineFormatRecord.class,
- TestLinkedDataRecord.class,
- TestNumberFormatIndexRecord.class,
- TestObjectLinkRecord.class,
- TestPlotAreaRecord.class,
- TestPlotGrowthRecord.class,
- TestSeriesChartGroupIndexRecord.class,
- TestSeriesIndexRecord.class,
- TestSeriesLabelsRecord.class,
- TestSeriesListRecord.class,
- TestSeriesRecord.class,
- TestSeriesTextRecord.class,
- TestSheetPropertiesRecord.class,
- TestTextRecord.class,
- TestTickRecord.class,
- TestUnitsRecord.class,
- TestValueRangeRecord.class
-})
-public class AllChartRecordTests {
-}
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
index 9df58a8427..c8684fd20d 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java
index 1bf68f0558..0143a3fe0b 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java
index ac12f27119..d7cd652e46 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
index d17dcfa765..906544cf0a 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java
index 7f12260a89..581611161f 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java
index 56ba5d58a3..7065c50f89 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
index b2907aa5ea..13bc7826e7 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java
index ca4f581612..911e72828b 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
index d23783b755..52ea943d21 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java
index 8d497e8699..ce6ede8437 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java
@@ -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());
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java
index 545e236623..621fa7676d 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java
index 53774be9ac..eb3894ba4a 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java
@@ -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.HSSFTestDataSamples;
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 TestChartTitleFormatRecord {
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 TestChartTitleFormatRecord {
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 chartTitleFormatRecords;
-
+
ChartTitleFormatRecordGrabber() {
chartTitleFormatRecords = new ArrayList<>();
}
@@ -76,6 +75,6 @@ public final class TestChartTitleFormatRecord {
chartTitleFormatRecords.add((ChartTitleFormatRecord)record);
}
}
-
+
}
}
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java
index adce7880dc..71b0c6901c 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
index 47b22d6a5d..b304166a5d 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
@@ -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
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java
index 1dd31d92d6..fe54c3d6c2 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java
@@ -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 DefaultDataLabelTextPropertiesRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java
index d478945fbd..ce95d58328 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java
@@ -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 FontBasisRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java
index 1f055491af..0bb9d954e7 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java
@@ -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 FontIndexRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java
index 86e2729d4c..86ab6691fc 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java
@@ -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 FrameRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java
index 16eaf33b72..1965bcf776 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java
@@ -18,12 +18,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 LegendRecord class works
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
index 7305134f35..dd2e5a60c5 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
@@ -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 LineFormatRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
index ae5b652b9a..91bb43f998 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
@@ -19,13 +19,13 @@ 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.apache.poi.ss.formula.ptg.Area3DPtg;
import org.apache.poi.ss.formula.ptg.Ptg;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the LinkedDataRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java
index c5efa00df4..b2fe6db59c 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java
@@ -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 NumberFormatIndexRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java
index 8913ca60d6..1641270e37 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java
@@ -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 ObjectLinkRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java
index ece7eefd91..119cf47117 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java
@@ -18,10 +18,10 @@
package org.apache.poi.hssf.record.chart;
-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 PlotAreaRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java
index f12474fa54..235d144bbc 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java
@@ -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 PlotGrowthRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java
index ea674198c9..27aec2c93b 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java
@@ -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 SeriesChartGroupIndexRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java
index 1607f88cbd..92c54e4a47 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java
@@ -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 SeriesIndexRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
index 232a1f7b70..1454da7474 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
@@ -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 SeriesLabelsRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java
index fe310f233b..49cf366d84 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java
@@ -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 SeriesListRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java
index dd6c944881..2fd3d4384c 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java
@@ -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 SeriesRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java
index 138415f49f..59dcb4b2ac 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java
@@ -18,13 +18,13 @@
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.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
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 the serialization and deserialization of the SeriesTextRecord class
@@ -88,7 +88,7 @@ public final class TestSeriesTextRecord {
// "Bad requested string length (-126)"
SeriesTextRecord str = new SeriesTextRecord(in);
- assertTrue("Identified bug 45784b", str.getRecordSize() >= 0);
+ assertTrue(str.getRecordSize() >= 0, "Identified bug 45784b");
byte[] ser = str.serialize();
confirmRecordEncoding(SeriesTextRecord.sid, data, ser);
}
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
index fb9273fb30..2fc545854e 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
@@ -19,14 +19,14 @@ 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.assertNotEquals;
-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.assertTrue;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link SheetPropertiesRecord}
@@ -43,7 +43,7 @@ public final class TestSheetPropertiesRecord {
public void testLoad() {
RecordInputStream in = TestcaseRecordInputStream.create(0x1044, data);
SheetPropertiesRecord record = new SheetPropertiesRecord(in);
- assertNotEquals("Identified bug 44693c", 1, in.remaining());
+ assertNotEquals(1, in.remaining(), "Identified bug 44693c");
assertEquals(0, in.remaining());
assertEquals( 10, record.getFlags());
assertFalse(record.isChartTypeManuallyFormatted());
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java
index 5e0b854743..99de874822 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java
@@ -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 TextRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java
index 7b64608cda..7e5395f583 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java
@@ -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.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+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 TickRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java
index f99c6a4e87..5996f909c5 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java
@@ -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 UnitsRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
index 5c5fe7bf69..d0314e1ae5 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
@@ -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 ValueRangeRecord
diff --git a/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java b/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java
index f1016745bb..ab43d21e3d 100644
--- a/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java
+++ b/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java
@@ -17,7 +17,7 @@
package org.apache.poi.hssf.record.common;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -41,7 +41,7 @@ import org.apache.poi.util.LittleEndianInput;
import org.apache.poi.util.LittleEndianInputStream;
import org.apache.poi.util.LittleEndianOutputStream;
import org.apache.poi.util.StringUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests that {@link UnicodeString} record size calculates correctly. The record size
diff --git a/src/testcases/org/apache/poi/hssf/record/pivot/AllPivotRecordTests.java b/src/testcases/org/apache/poi/hssf/record/pivot/AllPivotRecordTests.java
deleted file mode 100644
index 3f25e99398..0000000000
--- a/src/testcases/org/apache/poi/hssf/record/pivot/AllPivotRecordTests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.record.pivot;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Collects all tests for org.apache.poi.hssf.record.pivot.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
- TestExtendedPivotTableViewFieldsRecord.class,
- TestPageItemRecord.class,
- TestViewFieldsRecord.class
-})
-public final class AllPivotRecordTests {
-}
diff --git a/src/testcases/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java b/src/testcases/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java
index 113951d32c..314fbdd686 100644
--- a/src/testcases/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java
@@ -18,13 +18,13 @@
package org.apache.poi.hssf.record.pivot;
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.RecordInputStream;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
import org.apache.poi.hssf.record.pivottable.ExtendedPivotTableViewFieldsRecord;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link ExtendedPivotTableViewFieldsRecord}
diff --git a/src/testcases/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java b/src/testcases/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java
index 1468fc1401..e9f7ff1f36 100644
--- a/src/testcases/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java
@@ -18,14 +18,14 @@
package org.apache.poi.hssf.record.pivot;
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.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.hssf.record.pivottable.PageItemRecord;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link PageItemRecord}
@@ -36,7 +36,7 @@ public final class TestPageItemRecord {
byte[] data = HexRead.readFromString("01 02 03 04 05 06 07 08 09 0A 0B 0C");
RecordInputStream in = TestcaseRecordInputStream.create(PageItemRecord.sid, data);
PageItemRecord rec = new PageItemRecord(in);
- assertNotEquals("Identified bug 46917", 6, in.remaining());
+ assertNotEquals(6, in.remaining(), "Identified bug 46917");
assertEquals(0, in.remaining());
assertEquals(4+data.length, rec.getRecordSize());
diff --git a/src/testcases/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java b/src/testcases/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java
index 3ab92651b3..c51da99e2e 100644
--- a/src/testcases/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java
@@ -18,14 +18,14 @@
package org.apache.poi.hssf.record.pivot;
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.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.hssf.record.pivottable.ViewFieldsRecord;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link ViewFieldsRecord}
@@ -37,7 +37,7 @@ public final class TestViewFieldsRecord {
byte[] data = HexRead.readFromString("01 00 01 00 01 00 04 00 05 00 00 6D 61 72 63 6F");
RecordInputStream in = TestcaseRecordInputStream.create(ViewFieldsRecord.sid, data);
ViewFieldsRecord rec = new ViewFieldsRecord(in);
- assertNotEquals("Identified bug 46693b", 1, in.remaining());
+ assertNotEquals(1, in.remaining(), "Identified bug 46693b");
assertEquals(0, in.remaining());
assertEquals(4+data.length, rec.getRecordSize());
}
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/AllUserModelTests.java b/src/testcases/org/apache/poi/hssf/usermodel/AllUserModelTests.java
deleted file mode 100644
index bcbddf0551..0000000000
--- a/src/testcases/org/apache/poi/hssf/usermodel/AllUserModelTests.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Collects all tests for the org.apache.poi.hssf.usermodel package.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
- TestBug42464.class,
- TestBugs.class,
- TestCellStyle.class,
- TestCloneSheet.class,
- TestDataValidation.class,
- TestEscherGraphics.class,
- TestEscherGraphics2d.class,
- TestFontDetails.class,
- TestFormulaEvaluatorBugs.class,
- TestFormulaEvaluatorDocs.class,
- TestFormulas.class,
- TestHSSFCell.class,
- TestHSSFClientAnchor.class,
- //TestHSSFComment.class, //converted to junit4
- TestHSSFConditionalFormatting.class,
- TestHSSFDataFormat.class,
- TestHSSFDataFormatter.class,
- TestHSSFDateUtil.class,
- TestHSSFFont.class,
- TestHSSFFormulaEvaluator.class,
- TestHSSFHeaderFooter.class,
- TestHSSFHyperlink.class,
- TestHSSFName.class,
- TestHSSFOptimiser.class,
- TestHSSFPalette.class,
- TestHSSFPatriarch.class,
- TestHSSFPicture.class,
- TestHSSFPictureData.class,
- TestHSSFRichTextString.class,
- TestHSSFRow.class,
- TestHSSFSheet.class,
- TestHSSFSheetShiftRows.class,
- TestHSSFSheetUpdateArrayFormulas.class,
- TestHSSFTextbox.class,
- TestHSSFWorkbook.class,
- TestOLE2Embeding.class,
- TestPOIFSProperties.class,
- TestReadWriteChart.class,
- TestRowStyle.class,
- TestSanityChecker.class,
- TestSheetHiding.class,
- /* deliberately avoiding this one
- TestUnfixedBugs.class,*/
- TestUnicodeWorkbook.class,
- TestNonStandardWorkbookStreamNames.class,
- TestWorkbook.class
-})
-public class AllUserModelTests {
-}
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java b/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java
index 04ac448d25..0f67a86c10 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java
@@ -19,188 +19,107 @@
package org.apache.poi.hssf.usermodel;
-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.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List;
import org.apache.poi.hssf.model.InternalSheet;
import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.record.BOFRecord;
-import org.apache.poi.hssf.record.BackupRecord;
-import org.apache.poi.hssf.record.BookBoolRecord;
-import org.apache.poi.hssf.record.BoundSheetRecord;
-import org.apache.poi.hssf.record.CalcModeRecord;
-import org.apache.poi.hssf.record.CodepageRecord;
-import org.apache.poi.hssf.record.CountryRecord;
-import org.apache.poi.hssf.record.DSFRecord;
-import org.apache.poi.hssf.record.DateWindow1904Record;
-import org.apache.poi.hssf.record.DefaultColWidthRecord;
-import org.apache.poi.hssf.record.DefaultRowHeightRecord;
-import org.apache.poi.hssf.record.DeltaRecord;
-import org.apache.poi.hssf.record.DimensionsRecord;
-import org.apache.poi.hssf.record.EOFRecord;
-import org.apache.poi.hssf.record.ExtSSTRecord;
-import org.apache.poi.hssf.record.ExtendedFormatRecord;
-import org.apache.poi.hssf.record.ExternSheetRecord;
-import org.apache.poi.hssf.record.FnGroupCountRecord;
-import org.apache.poi.hssf.record.FontRecord;
-import org.apache.poi.hssf.record.FormatRecord;
-import org.apache.poi.hssf.record.GridsetRecord;
-import org.apache.poi.hssf.record.GutsRecord;
-import org.apache.poi.hssf.record.HideObjRecord;
-import org.apache.poi.hssf.record.InterfaceEndRecord;
-import org.apache.poi.hssf.record.InterfaceHdrRecord;
-import org.apache.poi.hssf.record.IterationRecord;
-import org.apache.poi.hssf.record.MMSRecord;
-import org.apache.poi.hssf.record.NameRecord;
-import org.apache.poi.hssf.record.PasswordRev4Record;
-import org.apache.poi.hssf.record.PrecisionRecord;
-import org.apache.poi.hssf.record.PrintGridlinesRecord;
-import org.apache.poi.hssf.record.PrintHeadersRecord;
-import org.apache.poi.hssf.record.ProtectRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordBase;
-import org.apache.poi.hssf.record.RefModeRecord;
-import org.apache.poi.hssf.record.RefreshAllRecord;
-import org.apache.poi.hssf.record.SSTRecord;
-import org.apache.poi.hssf.record.SaveRecalcRecord;
-import org.apache.poi.hssf.record.SelectionRecord;
-import org.apache.poi.hssf.record.StyleRecord;
-import org.apache.poi.hssf.record.SupBookRecord;
-import org.apache.poi.hssf.record.TabIdRecord;
-import org.apache.poi.hssf.record.UseSelFSRecord;
-import org.apache.poi.hssf.record.WSBoolRecord;
-import org.apache.poi.hssf.record.WindowOneRecord;
-import org.apache.poi.hssf.record.WindowProtectRecord;
-import org.apache.poi.hssf.record.WindowTwoRecord;
-import org.apache.poi.hssf.record.WriteAccessRecord;
+import org.apache.poi.hssf.record.*;
import org.apache.poi.hssf.record.aggregates.PageSettingsBlock;
/**
* Designed to check wither the records written actually make sense.
*/
public class SanityChecker {
- static class CheckRecord
- {
+ static class CheckRecord {
Class record;
char occurance; // 1 = one time, M = 1..many times, * = 0..many, 0 = optional
private final boolean together;
- public CheckRecord( Class record, char occurance )
- {
+ public CheckRecord(Class record, char occurance) {
this(record, occurance, true);
}
/**
- * @param record The record type to check
- * @param occurance The occurance 1 = occurs once, M = occurs many times
+ * @param record The record type to check
+ * @param occurance The occurance 1 = occurs once, M = occurs many times
* @param together
*/
- public CheckRecord(Class record, char occurance, boolean together)
- {
+ public CheckRecord(Class record, char occurance, boolean together) {
this.record = record;
this.occurance = occurance;
this.together = together;
}
- public Class getRecord()
- {
+ public Class getRecord() {
return record;
}
- public char getOccurance()
- {
- return occurance;
- }
-
- public boolean isRequired()
- {
+ public boolean isRequired() {
return occurance == '1' || occurance == 'M';
}
- public boolean isOptional()
- {
+ public boolean isOptional() {
return occurance == '0' || occurance == '*';
}
- public boolean isTogether()
- {
- return together;
- }
-
- public boolean isMany()
- {
+ public boolean isMany() {
return occurance == '*' || occurance == 'M';
}
- public int match( List records, int recordIdx )
- {
+ public int match(List records, int recordIdx) {
int firstRecord = findFirstRecord(records, getRecord(), recordIdx);
- if (isRequired())
- {
- return matchRequired( firstRecord, records, recordIdx );
+ if (isRequired()) {
+ return matchRequired(firstRecord, records, recordIdx);
}
- return matchOptional( firstRecord, records, recordIdx );
+ return matchOptional(firstRecord, records, recordIdx);
}
- private int matchOptional( int firstRecord, List records, int recordIdx )
- {
- if (firstRecord == -1)
- {
+ private int matchOptional(int firstRecord, List records, int recordIdx) {
+ if (firstRecord == -1) {
return recordIdx;
}
- return matchOneOrMany( records, firstRecord );
+ return matchOneOrMany(records, firstRecord);
}
- private int matchRequired( int firstRecord, List records, int recordIdx )
- {
- if (firstRecord == -1)
- {
- fail("Manditory record missing or out of order: " + record);
- }
+ private int matchRequired(int firstRecord, List records, int recordIdx) {
+ assertNotEquals(-1, firstRecord, "Manditory record missing or out of order: " + record);
- return matchOneOrMany( records, firstRecord );
+ return matchOneOrMany(records, firstRecord);
}
- private int matchOneOrMany( List records, int recordIdx )
- {
- if (isZeroOrOne())
- {
+ private int matchOneOrMany(List records, int recordIdx) {
+ if (isZeroOrOne()) {
// check no other records
- if (findFirstRecord(records, getRecord(), recordIdx+1) != -1)
- fail("More than one record matched for " + getRecord().getName());
- }
- else if (isZeroToMany())
- {
- if (together)
- {
- int nextIdx = findFirstRecord(records, record, recordIdx+1);
- while (nextIdx != -1)
- {
- if (nextIdx - 1 != recordIdx)
- fail("Records are not together " + record.getName());
+ assertEquals(-1, findFirstRecord(records, getRecord(), recordIdx + 1),
+ "More than one record matched for " + getRecord().getName());
+ } else if (isZeroToMany()) {
+ if (together) {
+ int nextIdx = findFirstRecord(records, record, recordIdx + 1);
+ while (nextIdx != -1) {
+ assertEquals(recordIdx+1, nextIdx, "Records are not together " + record.getName());
recordIdx = nextIdx;
- nextIdx = findFirstRecord(records, record, recordIdx+1);
+ nextIdx = findFirstRecord(records, record, recordIdx + 1);
}
}
}
- return recordIdx+1;
+ return recordIdx + 1;
}
- private boolean isZeroToMany()
- {
+ private boolean isZeroToMany() {
return occurance == '*' || occurance == 'M';
}
- private boolean isZeroOrOne()
- {
+ private boolean isZeroOrOne() {
return occurance == '0' || occurance == '1';
}
}
- CheckRecord[] workbookRecords = new CheckRecord[] {
+ CheckRecord[] workbookRecords = {
new CheckRecord(BOFRecord.class, '1'),
new CheckRecord(InterfaceHdrRecord.class, '1'),
new CheckRecord(MMSRecord.class, '1'),
@@ -235,7 +154,7 @@ public class SanityChecker {
new CheckRecord(EOFRecord.class, '1'),
};
- CheckRecord[] sheetRecords = new CheckRecord[] {
+ CheckRecord[] sheetRecords = {
new CheckRecord(BOFRecord.class, '1'),
new CheckRecord(CalcModeRecord.class, '1'),
new CheckRecord(RefModeRecord.class, '1'),
@@ -256,14 +175,12 @@ public class SanityChecker {
new CheckRecord(EOFRecord.class, '1')
};
- private void checkWorkbookRecords(InternalWorkbook workbook)
- {
+ private void checkWorkbookRecords(InternalWorkbook workbook) {
List records = workbook.getRecords();
assertTrue(records.get(0) instanceof BOFRecord);
assertTrue(records.get(records.size() - 1) instanceof EOFRecord);
checkRecordOrder(records, workbookRecords);
-// checkRecordsTogether(records, workbookRecords);
}
private void checkSheetRecords(InternalSheet sheet) {
@@ -272,104 +189,27 @@ public class SanityChecker {
assertTrue(records.get(records.size() - 1) instanceof EOFRecord);
checkRecordOrder(records, sheetRecords);
-// checkRecordsTogether(records, sheetRecords);
}
- public void checkHSSFWorkbook(HSSFWorkbook wb)
- {
+ public void checkHSSFWorkbook(HSSFWorkbook wb) {
checkWorkbookRecords(wb.getWorkbook());
for (int i = 0; i < wb.getNumberOfSheets(); i++)
checkSheetRecords(wb.getSheetAt(i).getSheet());
}
- /*
- private void checkRecordsTogether(List records, CheckRecord[] check)
- {
- for ( int checkIdx = 0; checkIdx < check.length; checkIdx++ )
- {
- int recordIdx = findFirstRecord(records, check[checkIdx].getRecord());
- boolean notFoundAndRecordRequired = (recordIdx == -1 && check[checkIdx].isRequired());
- if (notFoundAndRecordRequired)
- {
- fail("Expected to find record of class " + check.getClass() + " but did not");
- }
- else if (recordIdx >= 0)
- {
- if (check[checkIdx].isMany())
- {
- // Skip records that are together
- while (recordIdx < records.size() && check[checkIdx].getRecord().isInstance(records.get(recordIdx)))
- recordIdx++;
- }
-
- // Make sure record does not occur in remaining records (after the next)
- recordIdx++;
- for (int recordIdx2 = recordIdx; recordIdx2 < records.size(); recordIdx2++)
- {
- if (check[checkIdx].getRecord().isInstance(records.get(recordIdx2)))
- fail("Record occurs scattered throughout record chain:\n" + records.get(recordIdx2));
- }
- }
- }
- } */
-
- /* package */ static int findFirstRecord( List records, Class record, int startIndex )
- {
- for (int i = startIndex; i < records.size(); i++)
- {
+ static int findFirstRecord(List records, Class record, int startIndex) {
+ for (int i = startIndex; i < records.size(); i++) {
if (record.getName().equals(records.get(i).getClass().getName()))
return i;
}
return -1;
}
- void checkRecordOrder(List records, CheckRecord[] check)
- {
+ void checkRecordOrder(List records, CheckRecord[] check) {
int recordIdx = 0;
for (CheckRecord element : check) {
recordIdx = element.match(records, recordIdx);
}
}
-
- /*
- void checkRecordOrder(List records, CheckRecord[] check)
- {
- int checkIndex = 0;
- for (int recordIndex = 0; recordIndex < records.size(); recordIndex++)
- {
- Record record = (org.apache.poi.hssf.record.Record) records.get(recordIndex);
- if (check[checkIndex].getRecord().isInstance(record))
- {
- if (check[checkIndex].getOccurance() == 'M')
- {
- // skip over duplicate records if multiples are allowed
- while (recordIndex+1 < records.size() && check[checkIndex].getRecord().isInstance(records.get(recordIndex+1)))
- recordIndex++;
-// lastGoodMatch = recordIndex;
- }
- else if (check[checkIndex].getOccurance() == '1')
- {
- // Check next record to make sure there's not more than one
- if (recordIndex != records.size() - 1)
- {
- if (check[checkIndex].getRecord().isInstance(records.get(recordIndex+1)))
- {
- fail("More than one occurance of record found:\n" + records.get(recordIndex).toString());
- }
- }
-// lastGoodMatch = recordIndex;
- }
-// else if (check[checkIndex].getOccurance() == '0')
-// {
-//
-// }
- checkIndex++;
- }
- if (checkIndex >= check.length)
- return;
- }
- fail("Could not find required record: " + check[checkIndex]);
- } */
-
}
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestBug42464.java b/src/testcases/org/apache/poi/hssf/usermodel/TestBug42464.java
index 5e414f08a7..6f51abef42 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestBug42464.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestBug42464.java
@@ -17,19 +17,19 @@
package org.apache.poi.hssf.usermodel;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.Iterator;
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.record.FormulaRecord;
import org.apache.poi.hssf.record.aggregates.FormulaRecordAggregate;
-import org.apache.poi.ss.util.CellReference;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.CellValue;
import org.apache.poi.ss.usermodel.Row;
-import org.junit.Test;
+import org.apache.poi.ss.util.CellReference;
+import org.junit.jupiter.api.Test;
/**
*
@@ -42,7 +42,7 @@ public final class TestBug42464 {
process(wb);
wb.close();
}
-
+
@Test
public void testExpSharedBadFile() throws Exception {
HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("42464-ExpPtg-bad.xls");
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
index 24c5bf4c92..342335e267 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
@@ -20,7 +20,7 @@ package org.apache.poi.hssf.usermodel;
import static org.apache.poi.POITestCase.assertContains;
import static org.apache.poi.hssf.HSSFTestDataSamples.openSampleWorkbook;
import static org.apache.poi.hssf.HSSFTestDataSamples.writeOutAndReadBack;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
@@ -88,11 +88,11 @@ import org.apache.poi.ss.usermodel.SheetVisibility;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.util.LocaleUtil;
-import org.junit.AfterClass;
-import org.junit.Assume;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Testcases for bugs entered in bugzilla
@@ -110,7 +110,7 @@ public final class TestBugs extends BaseTestBugzillaIssues {
private static final Map SIMPLE_REFS = new LinkedHashMap<>();
// References used for the simpleTest convenience method
- @BeforeClass
+ @BeforeAll
public static void initSimpleRefs() {
String[] refs = {
"Calculations",
@@ -138,7 +138,7 @@ public final class TestBugs extends BaseTestBugzillaIssues {
LocaleUtil.setUserLocale(Locale.US);
}
- @AfterClass
+ @AfterAll
public static void cleanUpRefs() {
SIMPLE_REFS.clear();
}
@@ -837,7 +837,7 @@ public final class TestBugs extends BaseTestBugzillaIssues {
* Problems with extracting check boxes from
* HSSFObjectData
*/
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void bug44840() throws Exception {
try (HSSFWorkbook wb = openSampleWorkbook("WithCheckBoxes.xls")) {
@@ -863,7 +863,7 @@ public final class TestBugs extends BaseTestBugzillaIssues {
assertEquals(12, obj.getObjectData().length);
assertEquals("Forms.CheckBox.1", obj.getOLE2ClassName());
- obj.getDirectory();
+ assertThrows(IllegalArgumentException.class, obj::getDirectory);
}
}
@@ -1001,13 +1001,8 @@ public final class TestBugs extends BaseTestBugzillaIssues {
// formula cells, so we can see it updates properly
c3.setCellValue(new HSSFRichTextString("test"));
confirmCachedValue("test", c3);
- try {
- c3.getNumericCellValue();
- fail("exception should have been thrown");
- } catch (IllegalStateException e) {
- assertEquals("Cannot get a NUMERIC value from a STRING formula cell", e.getMessage());
- }
-
+ IllegalStateException e = assertThrows(IllegalStateException.class, c3::getNumericCellValue);
+ assertEquals("Cannot get a NUMERIC value from a STRING formula cell", e.getMessage());
// Now evaluate, they should all be changed
HSSFFormulaEvaluator eval = new HSSFFormulaEvaluator(wb1);
@@ -1082,7 +1077,7 @@ public final class TestBugs extends BaseTestBugzillaIssues {
*
* Expected ExpPtg to be converted from Shared to Non-Shared...
*/
- @Ignore("For now, blows up with an exception from ExtPtg")
+ @Disabled("For now, blows up with an exception from ExtPtg")
@Test
public void test43623() throws Exception {
try (HSSFWorkbook wb1 = openSampleWorkbook("43623.xls")) {
@@ -1913,12 +1908,10 @@ public final class TestBugs extends BaseTestBugzillaIssues {
// Will show as the center, as that is what excel does
// with an invalid footer lacking left/right/center details
- assertEquals("Left text should be empty", "", f.getLeft());
- assertEquals("Right text should be empty", "", f.getRight());
- assertEquals(
- "Center text should contain the illegal value",
- "BlahBlah blah blah ", f.getCenter()
- );
+ assertEquals("", f.getLeft(), "Left text should be empty");
+ assertEquals("", f.getRight(), "Right text should be empty");
+ assertEquals("BlahBlah blah blah ", f.getCenter(),
+ "Center text should contain the illegal value");
}
}
@@ -2226,9 +2219,9 @@ public final class TestBugs extends BaseTestBugzillaIssues {
* Normally encrypted files have BOF then FILEPASS, but
* some may squeeze a WRITEPROTECT in the middle
*/
- @Test(expected = EncryptedDocumentException.class)
- public void bug51832() throws IOException {
- simpleTest("51832.xls");
+ @Test
+ public void bug51832() {
+ assertThrows(EncryptedDocumentException.class, () -> simpleTest("51832.xls"));
}
@Test
@@ -2265,9 +2258,9 @@ public final class TestBugs extends BaseTestBugzillaIssues {
// Problem 3: These used to fail, now pass
HSSFFormulaEvaluator eval = new HSSFFormulaEvaluator(wb);
- assertEquals("evaluating c1", 30.0, eval.evaluate(c1).getNumberValue(), 0.001);
- assertEquals("evaluating d1", 30.0, eval.evaluate(d1).getNumberValue(), 0.001);
- assertEquals("evaluating e1", 30.0, eval.evaluate(e1).getNumberValue(), 0.001);
+ assertEquals(30.0, eval.evaluate(c1).getNumberValue(), 0.001, "evaluating c1");
+ assertEquals(30.0, eval.evaluate(d1).getNumberValue(), 0.001, "evaluating d1");
+ assertEquals(30.0, eval.evaluate(e1).getNumberValue(), 0.001, "evaluating e1");
}
}
@@ -2697,7 +2690,7 @@ public final class TestBugs extends BaseTestBugzillaIssues {
try {
bimage = ImageIO.read(structURL);
} catch (IOException e) {
- Assume.assumeNoException("Downloading a jpg from poi.apache.org should work", e);
+ Assumptions.assumeFalse(true, "Downloading a jpg from poi.apache.org should work");
return;
}
@@ -2711,7 +2704,7 @@ public final class TestBugs extends BaseTestBugzillaIssues {
// Pop structure into Structure HSSFSheet
int pict = wb.addPicture(imageBytes, HSSFWorkbook.PICTURE_TYPE_JPEG);
Sheet sheet = wb.getSheet("Structure");
- assertNotNull("Did not find sheet", sheet);
+ assertNotNull(sheet, "Did not find sheet");
HSSFPatriarch patriarch = (HSSFPatriarch) sheet.createDrawingPatriarch();
HSSFClientAnchor anchor = new HSSFClientAnchor(0, 0, 0, 0, (short) 1, 1, (short) 10, 22);
anchor.setAnchorType(AnchorType.MOVE_DONT_RESIZE);
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java b/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java
index 1bac320643..4f856657fb 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java
@@ -17,13 +17,13 @@
package org.apache.poi.hssf.usermodel;
-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.assertNotSame;
-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.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.FileOutputStream;
@@ -45,7 +45,7 @@ import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.util.LocaleUtil;
import org.apache.poi.util.TempFile;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Class to test cell styling functionality
@@ -97,8 +97,8 @@ public final class TestCellStyle {
SanityChecker sanityChecker = new SanityChecker();
sanityChecker.checkHSSFWorkbook(wb);
- assertEquals("LAST ROW == 99", 99, s.getLastRowNum());
- assertEquals("FIRST ROW == 0", 0, s.getFirstRowNum());
+ assertEquals(99, s.getLastRowNum(), "LAST ROW == 99");
+ assertEquals(0, s.getFirstRowNum(), "FIRST ROW == 0");
}
// assert((s.getLastRowNum() == 99));
@@ -134,8 +134,8 @@ public final class TestCellStyle {
SanityChecker sanityChecker = new SanityChecker();
sanityChecker.checkHSSFWorkbook(wb);
- assertEquals("LAST ROW ", 0, s.getLastRowNum());
- assertEquals("FIRST ROW ", 0, s.getFirstRowNum());
+ assertEquals(0, s.getLastRowNum(), "LAST ROW");
+ assertEquals(0, s.getFirstRowNum(), "FIRST ROW");
}
}
@@ -185,8 +185,6 @@ public final class TestCellStyle {
File file = TempFile.createTempFile("testWriteSheetStyle", ".xls");
try (HSSFWorkbook wb = new HSSFWorkbook()) {
HSSFSheet s = wb.createSheet();
- HSSFRow r = null;
- HSSFCell c = null;
HSSFFont fnt = wb.createFont();
HSSFCellStyle cs = wb.createCellStyle();
HSSFCellStyle cs2 = wb.createCellStyle();
@@ -203,10 +201,10 @@ public final class TestCellStyle {
cs2.setFillPattern(FillPatternType.DIAMONDS);
cs2.setFont(fnt);
for (int rownum = 0; rownum < 100; rownum++) {
- r = s.createRow(rownum);
+ HSSFRow r = s.createRow(rownum);
for (int cellnum = 0; cellnum < 50; cellnum += 2) {
- c = r.createCell(cellnum);
+ HSSFCell c = r.createCell(cellnum);
c.setCellValue(rownum * 10000 + cellnum
+ (((double) rownum / 1000)
+ ((double) cellnum / 10000)));
@@ -221,8 +219,8 @@ public final class TestCellStyle {
}
SanityChecker sanityChecker = new SanityChecker();
sanityChecker.checkHSSFWorkbook(wb);
- assertEquals("LAST ROW == 99", 99, s.getLastRowNum());
- assertEquals("FIRST ROW == 0", 0, s.getFirstRowNum());
+ assertEquals(99, s.getLastRowNum(), "LAST ROW == 99");
+ assertEquals(0, s.getFirstRowNum(), "FIRST ROW == 0");
}
}
@@ -455,13 +453,13 @@ public final class TestCellStyle {
Sheet sheet = wb.getSheetAt(0);
for (Row row : sheet) {
- for (Integer idxCell = 0; idxCell < row.getLastCellNum(); idxCell++) {
+ for (int idxCell = 0; idxCell < row.getLastCellNum(); idxCell++) {
Cell cell = row.getCell(idxCell);
cell.getCellStyle().getDataFormatString();
if (cell.getCellType() == CellType.NUMERIC) {
boolean isDate = DateUtil.isCellDateFormatted(cell);
- assertFalse("cell " + idxCell + " is not a date.", idxCell > 0 && isDate);
+ assertFalse(idxCell > 0 && isDate, "cell " + idxCell + " is not a date.");
}
}
}
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java b/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java
index 5bdfe6227b..d8e6ea92e8 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java
@@ -17,18 +17,21 @@
package org.apache.poi.hssf.usermodel;
+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.assertNull;
+
+import java.io.IOException;
+import java.util.Arrays;
+
import org.apache.poi.ddf.EscherDgRecord;
import org.apache.poi.ddf.EscherSpRecord;
import org.apache.poi.hssf.HSSFITestDataProvider;
import org.apache.poi.hssf.record.CommonObjectDataSubRecord;
import org.apache.poi.hssf.record.EscherAggregate;
import org.apache.poi.ss.usermodel.BaseTestCloneSheet;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
/**
* Test the ability to clone a sheet.
@@ -46,7 +49,7 @@ public final class TestCloneSheet extends BaseTestCloneSheet {
HSSFWorkbook b = new HSSFWorkbook();
HSSFSheet s = b.createSheet("Test");
HSSFSheet s2 = s.cloneSheet(b);
-
+
assertNull(s.getDrawingPatriarch());
assertNull(s2.getDrawingPatriarch());
assertEquals(HSSFTestHelper.getSheetForTest(s).getRecords().size(), HSSFTestHelper.getSheetForTest(s2).getRecords().size());
@@ -97,7 +100,7 @@ public final class TestCloneSheet extends BaseTestCloneSheet {
c.setColumn(1);
c.setRow(2);
c.setString(new HSSFRichTextString("qwertyuio"));
-
+
HSSFSheet sh2 = wb.cloneSheet(0);
HSSFPatriarch p2 = sh2.getDrawingPatriarch();
HSSFComment c2 = (HSSFComment) p2.getChildren().get(0);
@@ -106,11 +109,11 @@ public final class TestCloneSheet extends BaseTestCloneSheet {
assertEquals(c.getRow(), c2.getRow());
assertEquals(c.getColumn(), c2.getColumn());
- // The ShapeId is not equal?
+ // The ShapeId is not equal?
// assertEquals(c.getNoteRecord().getShapeId(), c2.getNoteRecord().getShapeId());
-
+
assertArrayEquals(c2.getTextObjectRecord().serialize(), c.getTextObjectRecord().serialize());
-
+
// ShapeId is different
CommonObjectDataSubRecord subRecord = (CommonObjectDataSubRecord) c2.getObjRecord().getSubRecords().get(0);
subRecord.setObjectId(1025);
@@ -126,7 +129,7 @@ public final class TestCloneSheet extends BaseTestCloneSheet {
EscherSpRecord sp = (EscherSpRecord) c2.getEscherContainer().getChild(0);
sp.setShapeId(1025);
assertArrayEquals(c2.getEscherContainer().serialize(), c.getEscherContainer().serialize());
-
+
wb.close();
}
}
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestCryptoAPI.java b/src/testcases/org/apache/poi/hssf/usermodel/TestCryptoAPI.java
index 92e5f64472..b03292cd71 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestCryptoAPI.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestCryptoAPI.java
@@ -24,8 +24,7 @@ import java.io.IOException;
import org.apache.poi.hssf.HSSFITestDataProvider;
import org.apache.poi.hssf.extractor.ExcelExtractor;
import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
-import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestCryptoAPI {
final HSSFITestDataProvider ssTests = HSSFITestDataProvider.instance;
@@ -44,7 +43,7 @@ public class TestCryptoAPI {
// CryptoAPI
validateContent("35897-type4.xls", "freedom", "Sheet1\nhello there!\n");
}
-
+
private void validateContent(String wbFile, String password, String textExpected) throws IOException {
Biff8EncryptionKey.setCurrentUserPassword(password);
try (HSSFWorkbook wb = ssTests.openSampleWorkbook(wbFile);
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java b/src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java
index 1e3fc381cc..51bca0f4af 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java
@@ -17,11 +17,12 @@
package org.apache.poi.hssf.usermodel;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-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.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -45,7 +46,7 @@ import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.ss.util.CellRangeAddressList;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Class for testing Excel's data validation mechanism
@@ -164,9 +165,7 @@ public final class TestDataValidation extends BaseTestDataValidation {
// nextSid should be for a DVRecord. If anything comes between the DV header record
// and the DV records, Excel will not be able to open the workbook without error.
- if (nextSid == 0x0867) {
- fail("Identified bug 45519");
- }
+ assertNotEquals(0x0867, nextSid, "Identified bug 45519");
assertEquals(DVRecord.sid, nextSid);
}
}
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java b/src/testcases/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java
index 51a5c64847..af2c703582 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java
@@ -17,14 +17,14 @@
package org.apache.poi.hssf.usermodel;
-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 java.io.IOException;
import java.util.List;
import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for the embedded object fetching support in HSSF
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics.java b/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics.java
index f8c4c65c7e..4f4cce473e 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics.java
@@ -17,9 +17,9 @@
package org.apache.poi.hssf.usermodel;
-import static org.junit.Assert.assertEquals;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.awt.Color;
import java.awt.Font;
@@ -28,9 +28,9 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-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;
/**
* Tests the capabilities of the EscherGraphics class.
@@ -45,7 +45,7 @@ public final class TestEscherGraphics {
private HSSFShapeGroup escherGroupA;
private EscherGraphics graphics;
- @Before
+ @BeforeEach
public void setUp() throws IOException {
workbook = new HSSFWorkbook();
@@ -55,8 +55,8 @@ public final class TestEscherGraphics {
patriarch.createGroup(new HSSFClientAnchor(20,30,500,200,(short)0,0,(short) 0,0));
graphics = new EscherGraphics(escherGroupA, workbook, Color.black, 1.0f);
}
-
- @After
+
+ @AfterEach
public void closeResources() throws IOException {
workbook.close();
}
@@ -268,9 +268,9 @@ public final class TestEscherGraphics {
assertEquals(40, patriarch.getY2());
// Check the two groups and the text
- // Result of patriarch.countOfAllChildren() makes no sense:
+ // Result of patriarch.countOfAllChildren() makes no sense:
// Returns 4 for 2 empty groups + 1 TextBox.
- //assertEquals(3, patriarch.countOfAllChildren());
+ //assertEquals(3, patriarch.countOfAllChildren());
assertEquals(3, patriarch.getChildren().size());
// Should be two groups and a text
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java b/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java
index e765936b01..f207b9a117 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java
@@ -17,9 +17,8 @@
package org.apache.poi.hssf.usermodel;
-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.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.awt.Color;
import java.awt.Font;
@@ -27,9 +26,9 @@ import java.awt.FontMetrics;
import java.awt.geom.Line2D;
import java.io.IOException;
-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;
/**
* Tests the Graphics2d drawing capability.
@@ -39,7 +38,7 @@ public final class TestEscherGraphics2d {
private HSSFShapeGroup escherGroup;
private EscherGraphics2d graphics;
- @Before
+ @BeforeEach
public void setUp() {
workbook = new HSSFWorkbook();
HSSFSheet sheet = workbook.createSheet("test");
@@ -48,8 +47,8 @@ public final class TestEscherGraphics2d {
EscherGraphics g = new EscherGraphics(escherGroup, workbook, Color.black, 1.0f);
graphics = new EscherGraphics2d(g);
}
-
- @After
+
+ @AfterEach
public void closeResources() throws IOException {
workbook.close();
}
@@ -77,12 +76,7 @@ public final class TestEscherGraphics2d {
// But with an invalid font, we get an exception
font = new Font("IamAmadeUPfont", Font.PLAIN, 22);
graphics.setFont(font);
- try {
- graphics.drawString("This is another test", 10, 10);
- fail();
- } catch(IllegalArgumentException e) {
- // expected
- }
+ assertThrows(IllegalArgumentException.class, () -> graphics.drawString("This is another test", 10, 10));
}
@Test
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java b/src/testcases/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java
index 39d7e13d90..b60b5c10c1 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java
@@ -16,16 +16,16 @@
==================================================================== */
package org.apache.poi.hssf.usermodel;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.ss.usermodel.CellType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestExternalReferenceChange {
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestFontDetails.java b/src/testcases/org/apache/poi/hssf/usermodel/TestFontDetails.java
index 724ffb29d0..0b469d64a8 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestFontDetails.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestFontDetails.java
@@ -17,12 +17,12 @@
package org.apache.poi.hssf.usermodel;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Properties;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests the implementation of the FontDetails class.
@@ -30,7 +30,7 @@ import org.junit.Test;
public final class TestFontDetails {
private FontDetails fontDetails;
- @Before
+ @BeforeEach
public void setUp() {
Properties properties = new Properties();
properties.setProperty("font.Arial.height", "13");
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
index 61103829af..dc03e67cfd 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
@@ -17,9 +17,9 @@
package org.apache.poi.hssf.usermodel;
-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.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.File;
import java.io.FileOutputStream;
@@ -45,8 +45,8 @@ import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.util.CellReference;
import org.apache.poi.util.LocaleUtil;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
*
@@ -55,7 +55,7 @@ public final class TestFormulaEvaluatorBugs {
private static boolean OUTPUT_TEST_FILES;
private static String tmpDirName;
- @BeforeClass
+ @BeforeAll
public static void setUp() {
tmpDirName = System.getProperty("java.io.tmpdir");
OUTPUT_TEST_FILES = Boolean.parseBoolean(
@@ -95,7 +95,7 @@ public final class TestFormulaEvaluatorBugs {
System.err.println("Existing file for bug #44636 written to " + existing);
}
wb.close();
-
+
// Now, do a new file from scratch
wb = new HSSFWorkbook();
sheet = wb.createSheet();
@@ -182,7 +182,7 @@ public final class TestFormulaEvaluatorBugs {
cell = row.getCell(0);
assertEquals("-1000000-3000000", cell.getCellFormula());
assertEquals(-4000000, eva.evaluate(cell).getNumberValue(), 0);
-
+
wb.close();
}
@@ -243,7 +243,7 @@ public final class TestFormulaEvaluatorBugs {
HSSFCell cellSUM2D = rowSUM2D.getCell(0);
assertEquals("SUM(C:D)", cellSUM2D.getCellFormula());
assertEquals(66, eva.evaluate(cellSUM2D).getNumberValue(), 0);
-
+
wb.close();
}
@@ -267,7 +267,7 @@ public final class TestFormulaEvaluatorBugs {
fail("Identified bug 44508");
}
assertTrue(cell.getBooleanCellValue());
-
+
wb.close();
}
@@ -292,27 +292,24 @@ public final class TestFormulaEvaluatorBugs {
}
}
}
-
+
wb.close();
}
@Test
public void testEvaluateInCellWithErrorCode_bug44950() throws Exception {
- HSSFWorkbook wb = new HSSFWorkbook();
- HSSFSheet sheet = wb.createSheet("Sheet1");
- HSSFRow row = sheet.createRow(1);
- HSSFCell cell = row.createCell(0);
- cell.setCellFormula("na()"); // this formula evaluates to an Excel error code '#N/A'
- HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
- try {
+ try (HSSFWorkbook wb = new HSSFWorkbook()) {
+ HSSFSheet sheet = wb.createSheet("Sheet1");
+ HSSFRow row = sheet.createRow(1);
+ HSSFCell cell = row.createCell(0);
+ cell.setCellFormula("na()"); // this formula evaluates to an Excel error code '#N/A'
+ HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
fe.evaluateInCell(cell);
} catch (NumberFormatException e) {
if (e.getMessage().equals("You cannot get an error value from a non-error cell")) {
fail("Identified bug 44950 b");
}
throw e;
- } finally {
- wb.close();
}
}
@@ -357,7 +354,7 @@ public final class TestFormulaEvaluatorBugs {
cell.setCellFormula("DATE(2012,2-12,1+4)");
fe.notifyUpdateCell(cell);
assertEquals(40579.0, fe.evaluate(cell).getNumberValue(), 0);
-
+
wb.close();
}
@@ -420,13 +417,11 @@ public final class TestFormulaEvaluatorBugs {
WorkbookEvaluator evaluator = WorkbookEvaluatorTestHelper.createEvaluator(wb, evalListener);
ValueEval ve = evaluator.evaluate(HSSFEvaluationTestHelper.wrapCell(cell));
int evalCount = evalListener.getCountCacheMisses();
- if (evalCount > 10) {
- // Without caching, evaluating cell 'A9' takes 21845 evaluations which consumes
- // much time (~3 sec on Core 2 Duo 2.2GHz)
- // short-circuit-if optimisation cuts this down to 255 evaluations which is still too high
- // System.err.println("Cell A9 took " + evalCount + " intermediate evaluations");
- fail("Identifed bug 45376 - Formula evaluator should cache values");
- }
+ // Without caching, evaluating cell 'A9' takes 21845 evaluations which consumes
+ // much time (~3 sec on Core 2 Duo 2.2GHz)
+ // short-circuit-if optimisation cuts this down to 255 evaluations which is still too high
+ // System.err.println("Cell A9 took " + evalCount + " intermediate evaluations");
+ assertTrue(evalCount <= 10, "Identifed bug 45376 - Formula evaluator should cache values");
// With caching, the evaluationCount is 8 which is exactly the
// number of formula cells that needed to be evaluated.
assertEquals(8, evalCount);
@@ -440,7 +435,7 @@ public final class TestFormulaEvaluatorBugs {
// confirm the evaluation result too
assertEquals(ErrorEval.NA, ve);
-
+
wb.close();
}
@@ -527,22 +522,22 @@ public final class TestFormulaEvaluatorBugs {
cell = row.getCell(CellReference.convertColStringToIndex("B"));
assertRefPtgA1('V', getPtgs(cell), 0);
// assertRefPtgA1('V', getPtgs(cell), 4); // FIXME!
-
+
cell = row.getCell(CellReference.convertColStringToIndex("D"));
assertRefPtgA1('V', getPtgs(cell), 0);
// assertRefPtgA1('V', getPtgs(cell), 6); // FIXME!
-
+
cell = row.getCell(CellReference.convertColStringToIndex("F"));
assertRefPtgA1('V', getPtgs(cell), 0);
// assertRefPtgA1('V', getPtgs(cell), 4); // FIXME!
// assertRefPtgA1('V', getPtgs(cell), 9); // FIXME!
-
+
cell = row.getCell(CellReference.convertColStringToIndex("G"));
assertRefPtgA1('V', getPtgs(cell), 0);
// assertRefPtgA1('V', getPtgs(cell), 4); // FIXME!
// assertRefPtgA1('V', getPtgs(cell), 9); // FIXME!
-
-
+
+
// Check our cached values were correctly evaluated
cell = row.getCell(CellReference.convertColStringToIndex("A"));
assertEquals("abc", cell.getStringCellValue());
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java
index 30c85cbe3d..c718fece8d 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java
@@ -17,7 +17,7 @@
package org.apache.poi.hssf.usermodel;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
@@ -25,7 +25,7 @@ import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests to show that our documentation at
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java b/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java
index d2aeaf3803..8ef9614e57 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java
@@ -18,10 +18,10 @@
package org.apache.poi.hssf.usermodel;
import static org.apache.poi.hssf.HSSFTestDataSamples.writeOutAndReadBack;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+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 java.io.File;
import java.io.FileOutputStream;
@@ -40,7 +40,7 @@ import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.util.CellReference;
import org.apache.poi.util.LocaleUtil;
import org.apache.poi.util.TempFile;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestFormulas {
@@ -66,7 +66,7 @@ public final class TestFormulas {
r = s.getRow(1);
c = r.getCell(1);
- assertEquals("Formula is as expected", "1+1", c.getCellFormula());
+ assertEquals("1+1", c.getCellFormula(), "Formula is as expected");
}
}
}
@@ -201,9 +201,10 @@ public final class TestFormulas {
for (int y = 1; y < 256 && y > 0; y=(short)(y+2)) {
HSSFCell c = r.getCell(y);
- assertNotNull("got a formula", c.getCellFormula());
+ assertNotNull(c.getCellFormula(), "got a formula");
- assertEquals("loop Formula is as expected " + x + "." + y + operator + y + "." + x + "!=" + c.getCellFormula(), ("" + x + "." + y + operator + y + "." + x), c.getCellFormula());
+ assertEquals(("" + x + "." + y + operator + y + "." + x), c.getCellFormula(),
+ "loop Formula is as expected " + x + "." + y + operator + y + "." + x + "!=" + c.getCellFormula());
}
}
}
@@ -281,7 +282,8 @@ public final class TestFormulas {
HSSFRow r = s.getRow(0);
HSSFCell c = r.getCell(1);
//get our minimum values
- assertEquals("minval Formula is as expected A2" + operator + "A3 != " + c.getCellFormula(), ("A2" + operator + "A3"), c.getCellFormula());
+ assertEquals(("A2" + operator + "A3"), c.getCellFormula(),
+ "minval Formula is as expected A2" + operator + "A3 != " + c.getCellFormula());
for (int x = 1; x < Short.MAX_VALUE && x > 0; x=(short)(x*2)) {
@@ -301,7 +303,8 @@ public final class TestFormulas {
String ref2=cr.formatAsString();
- assertEquals("loop Formula is as expected " + ref + operator + ref2 + "!=" + c.getCellFormula(), ("" + ref + operator + ref2), c.getCellFormula());
+ assertEquals(("" + ref + operator + ref2), c.getCellFormula(),
+ "loop Formula is as expected " + ref + operator + ref2 + "!=" + c.getCellFormula());
}
}
@@ -332,7 +335,7 @@ public final class TestFormulas {
//get our minimum values
r = s.getRow(0);
c = r.getCell(1);
- assertEquals("minval Formula is as expected", formula, c.getCellFormula());
+ assertEquals(formula, c.getCellFormula(), "minval Formula is as expected");
}
}
}
@@ -382,14 +385,16 @@ public final class TestFormulas {
//get our minimum values
HSSFRow r = s.getRow(0);
HSSFCell c = r.getCell(1);
- assertEquals("minval Formula is as expected 1" + operator + "1 != " + c.getCellFormula(), ("1" + operator + "1"), c.getCellFormula());
+ assertEquals(("1" + operator + "1"), c.getCellFormula(),
+ "minval Formula is as expected 1" + operator + "1 != " + c.getCellFormula());
for (int x = 1; x < Short.MAX_VALUE && x > 0; x=(short)(x*2)) {
r = s.getRow(x);
for (int y = 1; y < 256 && y > 0; y++) {
c = r.getCell(y);
- assertEquals("loop Formula is as expected " + x + operator + y + "!=" + c.getCellFormula(), ("" + x + operator + y), c.getCellFormula());
+ assertEquals(("" + x + operator + y), c.getCellFormula(),
+ "loop Formula is as expected " + x + operator + y + "!=" + c.getCellFormula());
}
}
@@ -397,7 +402,8 @@ public final class TestFormulas {
r = s.getRow(0);
c = r.getCell(0);
- assertEquals("maxval Formula is as expected", ("" + Short.MAX_VALUE + operator + Short.MAX_VALUE), c.getCellFormula());
+ assertEquals(("" + Short.MAX_VALUE + operator + Short.MAX_VALUE), c.getCellFormula(),
+ "maxval Formula is as expected");
}
/**
@@ -415,7 +421,8 @@ public final class TestFormulas {
r = s.getRow(0);
c = r.getCell(0);
- assertEquals("function =" + function + "(A2:A3)", function + "(A2:A3)", c.getCellFormula());
+ assertEquals(function + "(A2:A3)", c.getCellFormula(),
+ "function =" + function + "(A2:A3)");
}
}
}
@@ -436,7 +443,7 @@ public final class TestFormulas {
r = s.getRow(0);
c = r.getCell(0);
- assertEquals("function =" + function + "(A2,A3)", (function + "(A2,A3)"), c.getCellFormula());
+ assertEquals((function + "(A2,A3)"), c.getCellFormula(), "function =" + function + "(A2,A3)");
}
}
}
@@ -461,10 +468,10 @@ public final class TestFormulas {
r = s.getRow(0);
c = r.getCell(0);
- assertEquals("function =" + function + "(A2:A4,B2:B4)", (function + "(A2:A4,B2:B4)"), c.getCellFormula());
+ assertEquals((function + "(A2:A4,B2:B4)"), c.getCellFormula(), "function =" + function + "(A2:A4,B2:B4)");
c = r.getCell(1);
- assertEquals("function =" + function + "($A$2:$A4,B$2:B4)", (function + "($A$2:$A4,B$2:B4)"), c.getCellFormula());
+ assertEquals((function + "($A$2:$A4,B$2:B4)"), c.getCellFormula(), "function =" + function + "($A$2:$A4,B$2:B4)");
}
}
}
@@ -490,15 +497,15 @@ public final class TestFormulas {
s = wb2.getSheetAt(0);
r = s.getRow(0);
c = r.getCell(0);
- assertEquals("A3+A2", ("A3+A2"), c.getCellFormula());
+ assertEquals("A3+A2", c.getCellFormula());
c = r.getCell(1);
- assertEquals("$A3+$A2", ("$A3+$A2"), c.getCellFormula());
+ assertEquals("$A3+$A2", c.getCellFormula());
c = r.getCell(2);
- assertEquals("A$3+A$2", ("A$3+A$2"), c.getCellFormula());
+ assertEquals("A$3+A$2", c.getCellFormula());
c = r.getCell(3);
- assertEquals("$A$3+$A$2", ("$A$3+$A$2"), c.getCellFormula());
+ assertEquals("$A$3+$A$2", c.getCellFormula());
c = r.getCell(4);
- assertEquals("SUM($A$3,$A$2)", ("SUM($A$3,$A$2)"), c.getCellFormula());
+ assertEquals("SUM($A$3,$A$2)", c.getCellFormula());
}
}
}
@@ -526,9 +533,11 @@ public final class TestFormulas {
s = wb2.getSheet("B");
r = s.getRow(0);
c = r.getCell(0);
- assertEquals("expected: AVERAGE(A!A1:B1) got: " + c.getCellFormula(), ("AVERAGE(A!A1:B1)"), c.getCellFormula());
+ assertEquals("AVERAGE(A!A1:B1)", c.getCellFormula(),
+ "expected: AVERAGE(A!A1:B1) got: " + c.getCellFormula());
c = r.getCell(1);
- assertEquals("expected: A!A1+A!B1 got: " + c.getCellFormula(), ("A!A1+A!B1"), c.getCellFormula());
+ assertEquals("A!A1+A!B1", c.getCellFormula(),
+ "expected: A!A1+A!B1 got: " + c.getCellFormula());
}
}
}
@@ -568,7 +577,7 @@ public final class TestFormulas {
try (FileOutputStream out = new FileOutputStream(file)) {
wb.write(out);
}
- assertTrue("file exists", file.exists());
+ assertTrue(file.exists());
}
}
@@ -607,7 +616,7 @@ public final class TestFormulas {
s = wb2.getSheetAt(0);
r = s.getRow(0);
c = r.getCell(1);
- assertEquals("Formula in cell 1 ", "IF(A1 styA.verifyBelongsToWorkbook(wbB));
+ assertThrows(IllegalArgumentException.class, () -> styB.verifyBelongsToWorkbook(wbA));
Cell cellA = wbA.createSheet().createRow(0).createCell(0);
Cell cellB = wbB.createSheet().createRow(0).createCell(0);
cellA.setCellStyle(styA);
cellB.setCellStyle(styB);
- try {
- cellA.setCellStyle(styB);
- fail("expected IllegalArgumentException");
- } catch (IllegalArgumentException e) {
- // expected during successful test
- }
- try {
- cellB.setCellStyle(styA);
- fail("expected IllegalArgumentException");
- } catch (IllegalArgumentException e) {
- // expected during successful test
- }
+ assertThrows(IllegalArgumentException.class, () -> cellA.setCellStyle(styB));
+ assertThrows(IllegalArgumentException.class, () -> cellB.setCellStyle(styA));
}
}
@@ -329,7 +302,7 @@ public final class TestHSSFCell extends BaseTestCell {
final List recs = new ArrayList<>();
sheet.getSheet().visitContainedRecords(recs::add, 0);
- assertFalse("Identified bug - leftover StringRecord", recs.size() == 28 && recs.get(23) instanceof StringRecord);
+ assertFalse(recs.size() == 28 && recs.get(23) instanceof StringRecord, "Identified bug - leftover StringRecord");
confirmStringRecord(sheet, false);
// string to error code
@@ -390,12 +363,7 @@ public final class TestHSSFCell extends BaseTestCell {
// cover some deprecated methods and other smaller stuff...
assertEquals(wb.getWorkbook(), cell.getBoundWorkbook());
- try {
- cell.getCachedFormulaResultType();
- fail("Should catch exception");
- } catch (IllegalStateException e) {
- // expected here
- }
+ assertThrows(IllegalStateException.class, cell::getCachedFormulaResultType);
cell.removeCellComment();
cell.removeCellComment();
@@ -410,7 +378,7 @@ public final class TestHSSFCell extends BaseTestCell {
Cell cell = row.createCell(0);
cell.setBlank();
- assertNull(null, cell.getDateCellValue());
+ assertNull(cell.getDateCellValue());
assertFalse(cell.getBooleanCellValue());
assertEquals("", cell.toString());
@@ -440,11 +408,11 @@ public final class TestHSSFCell extends BaseTestCell {
}
}
- @Test(expected = IllegalStateException.class)
+ @Test
public void getErrorCellValue_throwsISE_onABlankCell() throws IOException {
try (HSSFWorkbook wb = new HSSFWorkbook()) {
Cell cell = wb.createSheet().createRow(0).createCell(0);
- cell.getErrorCellValue();
+ assertThrows(IllegalStateException.class, cell::getErrorCellValue);
}
}
}
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFChart.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFChart.java
index 987741f4ca..494072402c 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFChart.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFChart.java
@@ -17,9 +17,9 @@
package org.apache.poi.hssf.usermodel;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.IOException;
@@ -29,7 +29,7 @@ import org.apache.poi.hssf.record.chart.SeriesRecord;
import org.apache.poi.hssf.usermodel.HSSFChart.HSSFSeries;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.ss.util.CellRangeAddressBase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link HSSFChart}
@@ -139,26 +139,26 @@ public final class TestHSSFChart {
assertEquals("Base Numbers", charts[0].getSeries()[1].getSeriesTitle());
assertEquals("Sheet 3 Chart with Title", charts[0].getChartTitle());
}
-
+
@Test
public void testExistingSheet3() throws Exception {
HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("49581.xls");
-
+
HSSFSheet sheet = wb.getSheetAt( 2 ) ;
HSSFChart[] charts = HSSFChart.getSheetCharts( sheet ) ;
assertEquals(1, charts.length);
-
+
for ( HSSFChart chart : charts ) {
for ( HSSFSeries series : chart.getSeries() ) {
chart.removeSeries( series ) ;
}
}
-
+
// Save and re-check
wb = HSSFITestDataProvider.instance.writeOutAndReadBack(wb);
sheet = wb.getSheetAt( 2 ) ;
assertEquals(1, HSSFChart.getSheetCharts(sheet).length);
-
+
HSSFChart c = HSSFChart.getSheetCharts(sheet)[0];
assertEquals(0, c.getSeries().length);
}
@@ -168,11 +168,11 @@ public final class TestHSSFChart {
HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("49581.xls");
HSSFSheet sheet = wb.getSheetAt( 1 ) ;
HSSFChart[] charts = HSSFChart.getSheetCharts( sheet ) ;
-
+
assertEquals(1, charts.length);
for ( HSSFChart chart : charts ) {
HSSFSeries series ;
-
+
// Starts with one
assertEquals(1, chart.getSeries().length);
@@ -185,12 +185,12 @@ public final class TestHSSFChart {
series.setCategoryLabelsCellRange( new CellRangeAddress( 6, 7, 0, 0 ) ) ;
series.setValuesCellRange( new CellRangeAddress( 6, 7, 1, 1 ) ) ;
}
-
+
// Save and re-check
wb = HSSFITestDataProvider.instance.writeOutAndReadBack(wb);
sheet = wb.getSheetAt( 1 ) ;
assertEquals(1, HSSFChart.getSheetCharts(sheet).length);
-
+
HSSFChart c = HSSFChart.getSheetCharts(sheet)[0];
assertEquals(3, c.getSeries().length);
}
@@ -200,7 +200,7 @@ public final class TestHSSFChart {
HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("49581.xls");
HSSFSheet sheet = wb.getSheetAt( 0 ) ;
HSSFChart[] charts = HSSFChart.getSheetCharts( sheet ) ;
-
+
for ( HSSFChart chart : charts ) {
//System.out.println( chart.getType() ) ;
HSSFSeries[] seriesArray = chart.getSeries() ;
@@ -237,7 +237,7 @@ public final class TestHSSFChart {
HSSFChart chart = charts[ 2 ] ;
chart.removeSeries( chart.getSeries()[ 0 ] ) ;
}
-
+
/**
* Bug 26862: HSSFWorkbook.cloneSheet copies charts
*/
@@ -248,10 +248,10 @@ public final class TestHSSFChart {
HSSFChart[] srcCharts = HSSFChart.getSheetCharts(srcSheet);
assertEquals(1, srcCharts.length);
HSSFChart srcChart = srcCharts[0];
-
+
// Clone the sheet
HSSFSheet clonedSheet = wb.cloneSheet(0);
-
+
// Verify the chart was copied
HSSFChart[] clonedCharts = HSSFChart.getSheetCharts(clonedSheet);
assertEquals(1, clonedCharts.length);
@@ -263,11 +263,11 @@ public final class TestHSSFChart {
assertEquals(srcChart.getChartHeight(), clonedChart.getChartHeight());
assertEquals(srcChart.getChartX(), clonedChart.getChartX());
assertEquals(srcChart.getChartY(), clonedChart.getChartY());
-
+
// Check if chart was shallow copied or deep copied
clonedChart.setChartWidth(clonedChart.getChartWidth()+10);
assertEquals(srcChart.getChartWidth()+10, clonedChart.getChartWidth());
-
+
wb.close();
}
}
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java
index 30c6fce97a..2d19ce1aaf 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java
@@ -17,13 +17,14 @@
package org.apache.poi.hssf.usermodel;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.IOException;
import org.apache.poi.ddf.EscherClientAnchorRecord;
import org.apache.poi.hssf.model.ConvertAnchor;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Various tests for HSSFClientAnchor.
@@ -128,9 +129,10 @@ public final class TestHSSFClientAnchor {
assertEquals(65535, anchor.getRow2());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testCannotHaveRowGreaterThan65535() {
- new HSSFClientAnchor(0, 0, 0, 0, (short) 0, 65536, (short) 0, 65536);
+ assertThrows(IllegalArgumentException.class, () ->
+ new HSSFClientAnchor(0, 0, 0, 0, (short) 0, 65536, (short) 0, 65536));
}
/**
@@ -146,13 +148,15 @@ public final class TestHSSFClientAnchor {
assertEquals(65535, anchor.getRow2());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testCannotSetRow1GreaterThan65535() {
- new HSSFClientAnchor().setRow1(65536);
+ assertThrows(IllegalArgumentException.class, () ->
+ new HSSFClientAnchor().setRow1(65536));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testCannotSetRow2GreaterThan65535() {
- new HSSFClientAnchor().setRow2(65536);
+ assertThrows(IllegalArgumentException.class, () ->
+ new HSSFClientAnchor().setRow2(65536));
}
}
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java
index 62ecf00a4f..ef4a2bc538 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java
@@ -17,12 +17,12 @@
package org.apache.poi.hssf.usermodel;
import static org.apache.poi.poifs.storage.RawDataUtil.decompress;
-import static org.junit.Assert.assertArrayEquals;
-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.assertArrayEquals;
+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 java.io.IOException;
@@ -44,7 +44,7 @@ import org.apache.poi.ss.usermodel.RichTextString;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests TestHSSFCellComment.
@@ -97,10 +97,10 @@ public final class TestHSSFComment extends BaseTestCellComment {
cell = sheet.getRow(5).getCell(2);
comment = cell.getCellComment();
assertEquals("c6", comment.getString().getString());
-
+
wb.close();
}
-
+
@Test
public void testBug56380InsertComments() throws Exception {
HSSFWorkbook workbook = new HSSFWorkbook();
@@ -108,7 +108,7 @@ public final class TestHSSFComment extends BaseTestCellComment {
Drawing drawing = sheet.createDrawingPatriarch();
int noOfRows = 1025;
String comment = "c";
-
+
for(int i = 0; i < noOfRows; i++) {
Row row = sheet.createRow(i);
Cell cell = row.createCell(0);
@@ -125,14 +125,14 @@ public final class TestHSSFComment extends BaseTestCellComment {
} finally {
fs.close();
}*/
-
+
// save and recreate the workbook from the saved file
HSSFWorkbook workbookBack = HSSFTestDataSamples.writeOutAndReadBack(workbook);
sheet = workbookBack.getSheetAt(0);
-
+
// assert that the comments are created properly after reading back in
checkComments(sheet, noOfRows, comment);
-
+
workbook.close();
workbookBack.close();
}
@@ -173,7 +173,7 @@ public final class TestHSSFComment extends BaseTestCellComment {
for(int i = 0; i < noOfRows; i++) {
assertNotNull(sheet.getRow(i));
assertNotNull(sheet.getRow(i).getCell(0));
- assertNotNull("Did not get a Cell Comment for row " + i, sheet.getRow(i).getCell(0).getCellComment());
+ assertNotNull(sheet.getRow(i).getCell(0).getCellComment(), "Did not get a Cell Comment for row " + i);
assertNotNull(sheet.getRow(i).getCell(0).getCellComment().getString());
assertEquals(comment + i, sheet.getRow(i).getCell(0).getCellComment().getString().getString());
}
@@ -181,27 +181,27 @@ public final class TestHSSFComment extends BaseTestCellComment {
private Comment insertComment(Drawing drawing, Cell cell, String message) {
CreationHelper factory = cell.getSheet().getWorkbook().getCreationHelper();
-
+
ClientAnchor anchor = factory.createClientAnchor();
anchor.setCol1(cell.getColumnIndex());
anchor.setCol2(cell.getColumnIndex() + 1);
anchor.setRow1(cell.getRowIndex());
anchor.setRow2(cell.getRowIndex() + 1);
- anchor.setDx1(100);
+ anchor.setDx1(100);
anchor.setDx2(100);
anchor.setDy1(100);
anchor.setDy2(100);
-
+
Comment comment = drawing.createCellComment(anchor);
-
+
RichTextString str = factory.createRichTextString(message);
comment.setString(str);
comment.setAuthor("fanfy");
cell.setCellComment(comment);
-
+
return comment;
}
-
+
@Test
public void resultEqualsToNonExistingAbstractShape() throws IOException {
HSSFWorkbook wb = new HSSFWorkbook();
@@ -308,7 +308,7 @@ public final class TestHSSFComment extends BaseTestCellComment {
assertEquals(((HSSFComment) patriarch.getChildren().get(0)).getString().getString(), "comment1");
assertEquals(((HSSFComment) patriarch.getChildren().get(1)).getString().getString(), "comment2");
assertEquals(((HSSFComment) patriarch.getChildren().get(2)).getString().getString(), "comment3");
-
+
wb.close();
wbBack.close();
wbBack2.close();
@@ -364,7 +364,7 @@ public final class TestHSSFComment extends BaseTestCellComment {
assertEquals(comment.getColumn(), 32);
assertEquals(comment.getRow(), 42);
assertTrue(comment.isVisible());
-
+
wb.close();
wbBack.close();
wbBack2.close();
@@ -403,7 +403,7 @@ public final class TestHSSFComment extends BaseTestCellComment {
assertNotNull(sh.findCellComment(5, 4));
assertNull(sh.findCellComment(5, 5));
-
+
wb.close();
wbBack.close();
}
@@ -424,7 +424,7 @@ public final class TestHSSFComment extends BaseTestCellComment {
assertNotNull(shape);
assertEquals(comment.getOptRecord().getEscherProperties().size(), 10);
-
+
wb.close();
}
@@ -446,7 +446,7 @@ public final class TestHSSFComment extends BaseTestCellComment {
assertEquals(2024, spRecord.getShapeId(), 2024);
assertEquals(2024, comment.getShapeId(), 2024);
assertEquals(2024, comment.getNoteRecord().getShapeId());
-
+
wb.close();
}
}
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java
index 63ba22c935..0512d5a080 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java
@@ -18,14 +18,19 @@
package org.apache.poi.hssf.usermodel;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.IOException;
import org.apache.poi.hssf.HSSFITestDataProvider;
import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.usermodel.*;
-import org.junit.Test;
+import org.apache.poi.ss.usermodel.BaseTestConditionalFormatting;
+import org.apache.poi.ss.usermodel.Color;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.SheetConditionalFormatting;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.junit.jupiter.api.Test;
/**
* HSSF-specific Conditional Formatting tests
@@ -35,8 +40,8 @@ public final class TestHSSFConditionalFormatting extends BaseTestConditionalForm
super(HSSFITestDataProvider.instance);
}
@Override
- protected void assertColour(String hexExpected, Color actual) {
- assertNotNull("Colour must be given", actual);
+ protected void assertColor(String hexExpected, Color actual) {
+ assertNotNull(actual, "Colour must be given");
if (actual instanceof HSSFColor) {
HSSFColor colour = (HSSFColor)actual;
assertEquals(hexExpected, colour.getHexString());
@@ -54,7 +59,7 @@ public final class TestHSSFConditionalFormatting extends BaseTestConditionalForm
public void testRead() throws IOException {
testRead("WithConditionalFormatting.xls");
}
-
+
@Test
public void testReadOffice2007() throws IOException {
testReadOffice2007("NewStyleConditionalFormattings.xls");
@@ -73,10 +78,10 @@ public final class TestHSSFConditionalFormatting extends BaseTestConditionalForm
}
wb.removeSheetAt(1);*/
-
+
// initially it is good
writeTemp53691(wb, "agood");
-
+
// clone sheet corrupts it
Sheet sheet = wb.cloneSheet(0);
writeTemp53691(wb, "bbad");
@@ -84,28 +89,28 @@ public final class TestHSSFConditionalFormatting extends BaseTestConditionalForm
// removing the sheet makes it good again
wb.removeSheetAt(wb.getSheetIndex(sheet));
writeTemp53691(wb, "cgood");
-
+
// cloning again and removing the conditional formatting makes it good again
sheet = wb.cloneSheet(0);
- removeConditionalFormatting(sheet);
+ removeConditionalFormatting(sheet);
writeTemp53691(wb, "dgood");
-
+
// cloning the conditional formatting manually makes it bad again
cf = sheet.getSheetConditionalFormatting();
SheetConditionalFormatting scf = wb.getSheetAt(0).getSheetConditionalFormatting();
for (int j = 0; j < scf.getNumConditionalFormattings(); j++) {
cf.addConditionalFormatting(scf.getConditionalFormattingAt(j));
- }
+ }
writeTemp53691(wb, "ebad");
// remove all conditional formatting for comparing BIFF output
- removeConditionalFormatting(sheet);
- removeConditionalFormatting(wb.getSheetAt(0));
+ removeConditionalFormatting(sheet);
+ removeConditionalFormatting(wb.getSheetAt(0));
writeTemp53691(wb, "fgood");
-
+
wb.close();
}
-
+
private void removeConditionalFormatting(Sheet sheet) {
SheetConditionalFormatting cf = sheet.getSheetConditionalFormatting();
for (int j = 0; j < cf.getNumConditionalFormattings(); j++) {
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
index dd334b0183..2747b19d52 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
@@ -17,8 +17,8 @@
package org.apache.poi.hssf.usermodel;
-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.io.IOException;
@@ -32,7 +32,7 @@ import org.apache.poi.ss.usermodel.DataFormat;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link HSSFDataFormat}
@@ -62,12 +62,12 @@ public final class TestHSSFDataFormat extends BaseTestDataFormat {
short customFmtIdx = dataFormat.getFormat("\u00a3##.00[Yellow]");
assertTrue(customFmtIdx >= BuiltinFormats.FIRST_USER_DEFINED_FORMAT_INDEX );
assertEquals("\u00a3##.00[Yellow]", dataFormat.getFormat(customFmtIdx));
-
+
wb.close();
}
/**
- * [Bug 58532] Handle formats that go numnum, numK, numM etc
+ * [Bug 58532] Handle formats that go numnum, numK, numM etc
*/
@Override
@Test
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java
index 7ee4525989..035eeaa78a 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java
@@ -17,9 +17,9 @@
package org.apache.poi.hssf.usermodel;
-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.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
@@ -35,9 +35,9 @@ import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.DateUtil;
import org.apache.poi.util.LocaleUtil;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Unit tests for HSSFDataFormatter.java
@@ -45,14 +45,14 @@ import org.junit.Test;
public final class TestHSSFDataFormatter {
private static TimeZone userTimeZone;
- @BeforeClass
+ @BeforeAll
public static void setTimeZone() {
userTimeZone = LocaleUtil.getUserTimeZone();
LocaleUtil.setUserTimeZone(TimeZone.getTimeZone("CET"));
LocaleUtil.setUserLocale(Locale.US);
}
- @AfterClass
+ @AfterAll
public static void resetTimeZone() {
LocaleUtil.setUserTimeZone(userTimeZone);
LocaleUtil.setUserLocale(Locale.ROOT);
@@ -109,10 +109,10 @@ public final class TestHSSFDataFormatter {
String[] goodTimePatterns = {
"HH:MM",
"HH:MM:SS",
- "HH:MM;HH:MM;HH:MM",
+ "HH:MM;HH:MM;HH:MM",
// This is fun - blue if positive time,
// red if negative time or green for zero!
- "[BLUE]HH:MM;[RED]HH:MM;[GREEN]HH:MM",
+ "[BLUE]HH:MM;[RED]HH:MM;[GREEN]HH:MM",
"yyyy-mm-dd hh:mm",
"yyyy-mm-dd hh:mm:ss",
};
@@ -241,7 +241,7 @@ public final class TestHSSFDataFormatter {
// should not be equal to "555.555"
assertTrue( DateUtil.isCellDateFormatted(cell) );
- assertFalse("555.555".equals(fmtval));
+ assertNotEquals(fmtval, "555.555");
String fmt = cell.getCellStyle().getDataFormatString();
@@ -257,7 +257,7 @@ public final class TestHSSFDataFormatter {
jul = jul.substring(0,1);
}
// check we found july properly
- assertTrue("Format came out incorrect - " + fmt, fmtval.contains(jul));
+ assertTrue(fmtval.contains(jul), "Format came out incorrect - " + fmt);
}
row = wb.getSheetAt(0).getRow(1);
@@ -271,11 +271,11 @@ public final class TestHSSFDataFormatter {
// should not be equal to "555.47431"
assertTrue( DateUtil.isCellDateFormatted(cell) );
- assertFalse("555.47431".equals(fmtval));
+ assertNotEquals(fmtval, "555.47431");
// check we found the time properly
- assertTrue("Format came out incorrect - " + fmt + " - found " + fmtval +
- ", but expected to find '11:23'", fmtval.contains("11:23"));
+ assertTrue(fmtval.contains("11:23"),
+ "Format came out incorrect - " + fmt + " - found " + fmtval + ", but expected to find '11:23'");
}
// test number formats
@@ -367,10 +367,10 @@ public final class TestHSSFDataFormatter {
Cell cell = it.next();
cell.setCellValue(cell.getNumericCellValue() * Math.random() / 1000000 - 1000);
log(formatter.formatCellValue(cell));
-
- String formatted = formatter.formatCellValue(cell);
- assertTrue("Doesn't start with Balance: " + formatted, formatted.startsWith("Balance "));
- assertTrue("Doesn't end with USD: " + formatted, formatted.endsWith(" USD"));
+
+ String formatted = formatter.formatCellValue(cell);
+ assertTrue(formatted.startsWith("Balance "), "Doesn't start with Balance: " + formatted);
+ assertTrue(formatted.endsWith(" USD"), "Doesn't end with USD: " + formatted);
}
}
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
index 066f4bdf66..cbb6bfcdd8 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
@@ -17,10 +17,10 @@
package org.apache.poi.hssf.usermodel;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.util.TimeZone;
@@ -29,9 +29,9 @@ import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.model.InternalWorkbook;
import org.apache.poi.ss.usermodel.DateUtil;
import org.apache.poi.util.LocaleUtil;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Class TestHSSFDateUtil
@@ -39,14 +39,14 @@ import org.junit.Test;
public class TestHSSFDateUtil {
static TimeZone userTimeZone;
-
- @BeforeClass
+
+ @BeforeAll
public static void setCEST() {
userTimeZone = LocaleUtil.getUserTimeZone();
LocaleUtil.setUserTimeZone(TimeZone.getTimeZone("CEST"));
}
-
- @AfterClass
+
+ @AfterAll
public static void resetTimeZone() {
LocaleUtil.setUserTimeZone(userTimeZone);
}
@@ -54,7 +54,7 @@ public class TestHSSFDateUtil {
/**
* Test that against a real, test file, we still do everything
* correctly
- * @throws IOException
+ * @throws IOException
*/
@Test
public void onARealFile() throws IOException {
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFEvaluationSheet.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFEvaluationSheet.java
index c53e01b4aa..538d266cf4 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFEvaluationSheet.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFEvaluationSheet.java
@@ -17,15 +17,15 @@
package org.apache.poi.hssf.usermodel;
+import java.util.AbstractMap;
+import java.util.Map;
+
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.ss.formula.EvaluationSheet;
import org.apache.poi.ss.usermodel.BaseTestXEvaluationSheet;
import org.apache.poi.ss.usermodel.Name;
import org.apache.poi.ss.usermodel.Sheet;
-import org.junit.Test;
-
-import java.util.AbstractMap;
-import java.util.Map;
+import org.junit.jupiter.api.Test;
public class TestHSSFEvaluationSheet extends BaseTestXEvaluationSheet {
@Override
@@ -33,7 +33,7 @@ public class TestHSSFEvaluationSheet extends BaseTestXEvaluationSheet {
HSSFSheet sheet = new HSSFWorkbook().createSheet();
return new AbstractMap.SimpleEntry<>(sheet, new HSSFEvaluationSheet(sheet));
}
-
+
@Test
public void testMissingExternalName() {
HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("external_name.xls");
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFont.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFont.java
index 81f28d81fe..f05ebb5203 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFont.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFont.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import org.apache.poi.hssf.HSSFITestDataProvider;
import org.apache.poi.ss.usermodel.BaseTestFont;
import org.apache.poi.ss.usermodel.Font;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests various functionality having to do with {@link org.apache.poi.ss.usermodel.Name}.
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
index daae2cc6e4..c421e2cee5 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
@@ -17,8 +17,10 @@
package org.apache.poi.hssf.usermodel;
-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.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
@@ -35,7 +37,7 @@ import org.apache.poi.ss.usermodel.BaseTestFormulaEvaluator;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.CellValue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestHSSFFormulaEvaluator extends BaseTestFormulaEvaluator {
@@ -43,258 +45,249 @@ public final class TestHSSFFormulaEvaluator extends BaseTestFormulaEvaluator {
super(HSSFITestDataProvider.instance);
}
- /**
- * Test that the HSSFFormulaEvaluator can evaluate simple named ranges
- * (single cells and rectangular areas)
- */
+ /**
+ * Test that the HSSFFormulaEvaluator can evaluate simple named ranges
+ * (single cells and rectangular areas)
+ */
@Test
- public void testEvaluateSimple() throws IOException {
- HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("testNames.xls");
- HSSFSheet sheet = wb.getSheetAt(0);
- HSSFCell cell = sheet.getRow(8).getCell(0);
- HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
- CellValue cv = fe.evaluate(cell);
- assertEquals(CellType.NUMERIC, cv.getCellType());
- assertEquals(3.72, cv.getNumberValue(), 0.0);
- wb.close();
- }
+ public void testEvaluateSimple() throws IOException {
+ HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("testNames.xls");
+ HSSFSheet sheet = wb.getSheetAt(0);
+ HSSFCell cell = sheet.getRow(8).getCell(0);
+ HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
+ CellValue cv = fe.evaluate(cell);
+ assertEquals(CellType.NUMERIC, cv.getCellType());
+ assertEquals(3.72, cv.getNumberValue(), 0.0);
+ wb.close();
+ }
- /**
- * When evaluating defined names, POI has to decide whether it is capable. Currently
- * (May2009) POI only supports simple cell and area refs.
- * The sample spreadsheet (bugzilla attachment 23508) had a name flagged as 'complex'
- * which contained a simple area ref. It is not clear what the 'complex' flag is used
- * for but POI should look elsewhere to decide whether it can evaluate the name.
- */
+ /**
+ * When evaluating defined names, POI has to decide whether it is capable. Currently
+ * (May2009) POI only supports simple cell and area refs.
+ * The sample spreadsheet (bugzilla attachment 23508) had a name flagged as 'complex'
+ * which contained a simple area ref. It is not clear what the 'complex' flag is used
+ * for but POI should look elsewhere to decide whether it can evaluate the name.
+ */
@Test
- public void testDefinedNameWithComplexFlag_bug47048() throws IOException {
- // Mock up a spreadsheet to match the critical details of the sample
- HSSFWorkbook wb = new HSSFWorkbook();
- HSSFSheet sheet = wb.createSheet("Input");
- HSSFName definedName = wb.createName();
- definedName.setNameName("Is_Multicar_Vehicle");
- definedName.setRefersToFormula("Input!$B$17:$G$17");
+ public void testDefinedNameWithComplexFlag_bug47048() throws IOException {
+ // Mock up a spreadsheet to match the critical details of the sample
+ HSSFWorkbook wb = new HSSFWorkbook();
+ HSSFSheet sheet = wb.createSheet("Input");
+ HSSFName definedName = wb.createName();
+ definedName.setNameName("Is_Multicar_Vehicle");
+ definedName.setRefersToFormula("Input!$B$17:$G$17");
- // Set up some data and the formula
- HSSFRow row17 = sheet.createRow(16);
- row17.createCell(0).setCellValue(25.0);
- row17.createCell(1).setCellValue(1.33);
- row17.createCell(2).setCellValue(4.0);
+ // Set up some data and the formula
+ HSSFRow row17 = sheet.createRow(16);
+ row17.createCell(0).setCellValue(25.0);
+ row17.createCell(1).setCellValue(1.33);
+ row17.createCell(2).setCellValue(4.0);
- HSSFRow row = sheet.createRow(0);
- HSSFCell cellA1 = row.createCell(0);
- cellA1.setCellFormula("SUM(Is_Multicar_Vehicle)");
+ HSSFRow row = sheet.createRow(0);
+ HSSFCell cellA1 = row.createCell(0);
+ cellA1.setCellFormula("SUM(Is_Multicar_Vehicle)");
- // Set the complex flag - POI doesn't usually manipulate this flag
- NameRecord nameRec = TestHSSFName.getNameRecord(definedName);
- nameRec.setOptionFlag((short)0x10); // 0x10 -> complex
+ // Set the complex flag - POI doesn't usually manipulate this flag
+ NameRecord nameRec = TestHSSFName.getNameRecord(definedName);
+ nameRec.setOptionFlag((short) 0x10); // 0x10 -> complex
- HSSFFormulaEvaluator hsf = new HSSFFormulaEvaluator(wb);
- CellValue value;
- try {
- value = hsf.evaluate(cellA1);
+ HSSFFormulaEvaluator hsf = new HSSFFormulaEvaluator(wb);
+ CellValue value;
+ try {
+ value = hsf.evaluate(cellA1);
- assertEquals(CellType.NUMERIC, value.getCellType());
- assertEquals(5.33, value.getNumberValue(), 0.0);
-
- } catch (RuntimeException e) {
- if (e.getMessage().equals("Don't know how to evaluate name 'Is_Multicar_Vehicle'")) {
- fail("Identified bug 47048a");
- }
- throw e;
- } finally {
- wb.close();
- }
- }
-
- private static final class EvalCountListener extends EvaluationListener {
- private int _evalCount;
- public EvalCountListener() {
- _evalCount = 0;
- }
- @Override
- public void onStartEvaluate(EvaluationCell cell, ICacheEntry entry) {
- _evalCount++;
- }
- public int getEvalCount() {
- return _evalCount;
- }
- }
+ assertEquals(CellType.NUMERIC, value.getCellType());
+ assertEquals(5.33, value.getNumberValue(), 0.0);
- /**
- * The HSSFFormula evaluator performance benefits greatly from caching of intermediate cell values
- */
- @Test
- public void testShortCircuitIfEvaluation() throws IOException {
- // Set up a simple IF() formula that has measurable evaluation cost for its operands.
- HSSFWorkbook wb = new HSSFWorkbook();
- HSSFSheet sheet = wb.createSheet("Sheet1");
- HSSFRow row = sheet.createRow(0);
- HSSFCell cellA1 = row.createCell(0);
- cellA1.setCellFormula("if(B1,C1,D1+E1+F1)");
- // populate cells B1..F1 with simple formulas instead of plain values so we can use
- // EvaluationListener to check which parts of the first formula get evaluated
- for (int i=1; i<6; i++) {
- // formulas are just literal constants "1".."5"
- row.createCell(i).setCellFormula(String.valueOf(i));
- }
-
- EvalCountListener evalListener = new EvalCountListener();
- WorkbookEvaluator evaluator = WorkbookEvaluatorTestHelper.createEvaluator(wb, evalListener);
- ValueEval ve = evaluator.evaluate(HSSFEvaluationTestHelper.wrapCell(cellA1));
- int evalCount = evalListener.getEvalCount();
- if (evalCount == 6) {
- // Without short-circuit-if evaluation, evaluating cell 'A1' takes 3 extra evaluations (for D1,E1,F1)
- fail("Identifed bug 48195 - Formula evaluator should short-circuit IF() calculations.");
- }
- assertEquals(3, evalCount);
- assertEquals(2.0, ((NumberEval)ve).getNumberValue(), 0D);
-
- wb.close();
- }
-
- /**
- * Ensures that we can handle NameXPtgs in the formulas
- * we parse.
- */
- @Test
- public void testXRefs() throws IOException {
- HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("XRefCalc.xls");
- HSSFWorkbook wb2 = HSSFTestDataSamples.openSampleWorkbook("XRefCalcData.xls");
- Cell cell;
-
- // VLookup on a name in another file
- cell = wb1.getSheetAt(0).getRow(1).getCell(2);
- assertEquals(CellType.FORMULA, cell.getCellType());
- assertEquals(CellType.NUMERIC, cell.getCachedFormulaResultType());
- assertEquals(12.30, cell.getNumericCellValue(), 0.0001);
- // WARNING - this is wrong!
- // The file name should be showing, but bug #45970 is fixed
- // we seem to loose it
- assertEquals("VLOOKUP(PART,COSTS,2,FALSE)", cell.getCellFormula());
-
-
- // Simple reference to a name in another file
- cell = wb1.getSheetAt(0).getRow(1).getCell(4);
- assertEquals(CellType.FORMULA, cell.getCellType());
- assertEquals(CellType.NUMERIC, cell.getCachedFormulaResultType());
- assertEquals(36.90, cell.getNumericCellValue(), 0.0001);
- // TODO Correct this!
- // The file name should be shown too, see bug #56742
- assertEquals("Cost*Markup_Cost", cell.getCellFormula());
-
-
- // Evaluate the cells
- HSSFFormulaEvaluator eval = new HSSFFormulaEvaluator(wb1);
- HSSFFormulaEvaluator.setupEnvironment(
- new String[] { "XRefCalc.xls", "XRefCalcData.xls" },
- new HSSFFormulaEvaluator[] {
- eval,
- new HSSFFormulaEvaluator(wb2)
+ } catch (RuntimeException e) {
+ if (e.getMessage().equals("Don't know how to evaluate name 'Is_Multicar_Vehicle'")) {
+ fail("Identified bug 47048a");
}
- );
- eval.evaluateFormulaCell(
- wb1.getSheetAt(0).getRow(1).getCell(2)
- );
- eval.evaluateFormulaCell(
- wb1.getSheetAt(0).getRow(1).getCell(4)
- );
-
+ throw e;
+ } finally {
+ wb.close();
+ }
+ }
- // Re-check VLOOKUP one
- cell = wb1.getSheetAt(0).getRow(1).getCell(2);
- assertEquals(CellType.FORMULA, cell.getCellType());
- assertEquals(CellType.NUMERIC, cell.getCachedFormulaResultType());
- assertEquals(12.30, cell.getNumericCellValue(), 0.0001);
-
- // Re-check ref one
- cell = wb1.getSheetAt(0).getRow(1).getCell(4);
- assertEquals(CellType.FORMULA, cell.getCellType());
- assertEquals(CellType.NUMERIC, cell.getCachedFormulaResultType());
- assertEquals(36.90, cell.getNumericCellValue(), 0.0001);
-
-
- // Add a formula that refers to one of the existing external workbooks
- cell = wb1.getSheetAt(0).getRow(1).createCell(40);
- cell.setCellFormula("Cost*[XRefCalcData.xls]MarkupSheet!$B$1");
-
- // Check is was stored correctly
- assertEquals("Cost*[XRefCalcData.xls]MarkupSheet!$B$1", cell.getCellFormula());
-
- // Check it evaluates correctly
- eval.evaluateFormulaCell(cell);
- assertEquals(24.60*1.8, cell.getNumericCellValue(), 0);
+ private static final class EvalCountListener extends EvaluationListener {
+ private int _evalCount;
- // Try to add a formula for a new external workbook, won't be allowed to start
- try {
- cell = wb1.getSheetAt(0).getRow(1).createCell(42);
- cell.setCellFormula("[alt.xls]Sheet0!$A$1");
- fail("New workbook not linked, shouldn't be able to add");
- } catch(Exception e) {
- // expected here
- }
-
- // Link our new workbook
- HSSFWorkbook wb3 = new HSSFWorkbook();
- wb3.createSheet().createRow(0).createCell(0).setCellValue("In another workbook");
- assertEquals(2, wb1.linkExternalWorkbook("alt.xls", wb3));
-
- // Now add a formula that refers to our new workbook
- cell.setCellFormula("[alt.xls]Sheet0!$A$1");
- assertEquals("[alt.xls]Sheet0!$A$1", cell.getCellFormula());
+ public EvalCountListener() {
+ _evalCount = 0;
+ }
- // Evaluate it, without a link to that workbook
- try {
- eval.evaluate(cell);
- fail("No cached value and no link to workbook, shouldn't evaluate");
- } catch(Exception e) {
- // expected here
- }
-
- // Add a link, check it does
- HSSFFormulaEvaluator.setupEnvironment(
- new String[] { "XRefCalc.xls", "XRefCalcData.xls", "alt.xls" },
- new HSSFFormulaEvaluator[] {
- eval,
- new HSSFFormulaEvaluator(wb2),
- new HSSFFormulaEvaluator(wb3)
- }
- );
- eval.evaluateFormulaCell(cell);
- assertEquals("In another workbook", cell.getStringCellValue());
-
-
- // Save and re-load
- HSSFWorkbook wb4 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
- eval = new HSSFFormulaEvaluator(wb4);
- HSSFFormulaEvaluator.setupEnvironment(
- new String[] { "XRefCalc.xls", "XRefCalcData.xls", "alt.xls" },
- new HSSFFormulaEvaluator[] {
- eval,
- new HSSFFormulaEvaluator(wb2),
- new HSSFFormulaEvaluator(wb3)
- }
- );
-
- // Check the one referring to the previously existing workbook behaves
- cell = wb4.getSheetAt(0).getRow(1).getCell(40);
- assertEquals("Cost*[XRefCalcData.xls]MarkupSheet!$B$1", cell.getCellFormula());
- eval.evaluateFormulaCell(cell);
- assertEquals(24.60*1.8, cell.getNumericCellValue(), 0);
-
- // Now check the newly added reference
- cell = wb4.getSheetAt(0).getRow(1).getCell(42);
- assertEquals("[alt.xls]Sheet0!$A$1", cell.getCellFormula());
- eval.evaluateFormulaCell(cell);
- assertEquals("In another workbook", cell.getStringCellValue());
-
- wb4.close();
- wb3.close();
- wb2.close();
- wb1.close();
- }
+ @Override
+ public void onStartEvaluate(EvaluationCell cell, ICacheEntry entry) {
+ _evalCount++;
+ }
- @Test
+ public int getEvalCount() {
+ return _evalCount;
+ }
+ }
+
+ /**
+ * The HSSFFormula evaluator performance benefits greatly from caching of intermediate cell values
+ */
+ @Test
+ public void testShortCircuitIfEvaluation() throws IOException {
+ // Set up a simple IF() formula that has measurable evaluation cost for its operands.
+ try (HSSFWorkbook wb = new HSSFWorkbook()) {
+ HSSFSheet sheet = wb.createSheet("Sheet1");
+ HSSFRow row = sheet.createRow(0);
+ HSSFCell cellA1 = row.createCell(0);
+ cellA1.setCellFormula("if(B1,C1,D1+E1+F1)");
+ // populate cells B1..F1 with simple formulas instead of plain values so we can use
+ // EvaluationListener to check which parts of the first formula get evaluated
+ for (int i = 1; i < 6; i++) {
+ // formulas are just literal constants "1".."5"
+ row.createCell(i).setCellFormula(String.valueOf(i));
+ }
+
+ EvalCountListener evalListener = new EvalCountListener();
+ WorkbookEvaluator evaluator = WorkbookEvaluatorTestHelper.createEvaluator(wb, evalListener);
+ ValueEval ve = evaluator.evaluate(HSSFEvaluationTestHelper.wrapCell(cellA1));
+ int evalCount = evalListener.getEvalCount();
+ // Without short-circuit-if evaluation, evaluating cell 'A1' takes 3 extra evaluations (for D1,E1,F1)
+ assertNotEquals(6, evalCount, "Identifed bug 48195 - Formula evaluator should short-circuit IF() calculations.");
+ assertEquals(3, evalCount);
+ assertEquals(2.0, ((NumberEval) ve).getNumberValue(), 0D);
+ }
+ }
+
+ /**
+ * Ensures that we can handle NameXPtgs in the formulas
+ * we parse.
+ */
+ @Test
+ public void testXRefs() throws IOException {
+ try (HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("XRefCalc.xls");
+ HSSFWorkbook wb2 = HSSFTestDataSamples.openSampleWorkbook("XRefCalcData.xls")) {
+ Cell cell;
+
+ // VLookup on a name in another file
+ cell = wb1.getSheetAt(0).getRow(1).getCell(2);
+ assertEquals(CellType.FORMULA, cell.getCellType());
+ assertEquals(CellType.NUMERIC, cell.getCachedFormulaResultType());
+ assertEquals(12.30, cell.getNumericCellValue(), 0.0001);
+ // WARNING - this is wrong!
+ // The file name should be showing, but bug #45970 is fixed
+ // we seem to loose it
+ assertEquals("VLOOKUP(PART,COSTS,2,FALSE)", cell.getCellFormula());
+
+
+ // Simple reference to a name in another file
+ cell = wb1.getSheetAt(0).getRow(1).getCell(4);
+ assertEquals(CellType.FORMULA, cell.getCellType());
+ assertEquals(CellType.NUMERIC, cell.getCachedFormulaResultType());
+ assertEquals(36.90, cell.getNumericCellValue(), 0.0001);
+ // TODO Correct this!
+ // The file name should be shown too, see bug #56742
+ assertEquals("Cost*Markup_Cost", cell.getCellFormula());
+
+
+ // Evaluate the cells
+ HSSFFormulaEvaluator eval = new HSSFFormulaEvaluator(wb1);
+ HSSFFormulaEvaluator.setupEnvironment(
+ new String[]{"XRefCalc.xls", "XRefCalcData.xls"},
+ new HSSFFormulaEvaluator[]{
+ eval,
+ new HSSFFormulaEvaluator(wb2)
+ }
+ );
+ eval.evaluateFormulaCell(
+ wb1.getSheetAt(0).getRow(1).getCell(2)
+ );
+ eval.evaluateFormulaCell(
+ wb1.getSheetAt(0).getRow(1).getCell(4)
+ );
+
+
+ // Re-check VLOOKUP one
+ cell = wb1.getSheetAt(0).getRow(1).getCell(2);
+ assertEquals(CellType.FORMULA, cell.getCellType());
+ assertEquals(CellType.NUMERIC, cell.getCachedFormulaResultType());
+ assertEquals(12.30, cell.getNumericCellValue(), 0.0001);
+
+ // Re-check ref one
+ cell = wb1.getSheetAt(0).getRow(1).getCell(4);
+ assertEquals(CellType.FORMULA, cell.getCellType());
+ assertEquals(CellType.NUMERIC, cell.getCachedFormulaResultType());
+ assertEquals(36.90, cell.getNumericCellValue(), 0.0001);
+
+
+ // Add a formula that refers to one of the existing external workbooks
+ cell = wb1.getSheetAt(0).getRow(1).createCell(40);
+ cell.setCellFormula("Cost*[XRefCalcData.xls]MarkupSheet!$B$1");
+
+ // Check is was stored correctly
+ assertEquals("Cost*[XRefCalcData.xls]MarkupSheet!$B$1", cell.getCellFormula());
+
+ // Check it evaluates correctly
+ eval.evaluateFormulaCell(cell);
+ assertEquals(24.60 * 1.8, cell.getNumericCellValue(), 0);
+
+ // Try to add a formula for a new external workbook, won't be allowed to start
+ cell = wb1.getSheetAt(0).getRow(1).createCell(42);
+ final Cell cell2 = cell;
+ assertThrows(Exception.class, () -> cell2.setCellFormula("[alt.xls]Sheet0!$A$1"),
+ "New workbook not linked, shouldn't be able to add");
+
+ // Link our new workbook
+ try (HSSFWorkbook wb3 = new HSSFWorkbook()) {
+ wb3.createSheet().createRow(0).createCell(0).setCellValue("In another workbook");
+ assertEquals(2, wb1.linkExternalWorkbook("alt.xls", wb3));
+
+ // Now add a formula that refers to our new workbook
+ cell.setCellFormula("[alt.xls]Sheet0!$A$1");
+ assertEquals("[alt.xls]Sheet0!$A$1", cell.getCellFormula());
+
+ HSSFFormulaEvaluator eval2 = eval;
+ assertThrows(Exception.class, () -> eval2.evaluate(cell2),
+ "No cached value and no link to workbook, shouldn't evaluate");
+
+ // Add a link, check it does
+ HSSFFormulaEvaluator.setupEnvironment(
+ new String[]{"XRefCalc.xls", "XRefCalcData.xls", "alt.xls"},
+ new HSSFFormulaEvaluator[]{
+ eval,
+ new HSSFFormulaEvaluator(wb2),
+ new HSSFFormulaEvaluator(wb3)
+ }
+ );
+ eval.evaluateFormulaCell(cell);
+ assertEquals("In another workbook", cell.getStringCellValue());
+
+
+ // Save and re-load
+ try (HSSFWorkbook wb4 = HSSFTestDataSamples.writeOutAndReadBack(wb1)) {
+ eval = new HSSFFormulaEvaluator(wb4);
+ HSSFFormulaEvaluator.setupEnvironment(
+ new String[]{"XRefCalc.xls", "XRefCalcData.xls", "alt.xls"},
+ new HSSFFormulaEvaluator[]{
+ eval,
+ new HSSFFormulaEvaluator(wb2),
+ new HSSFFormulaEvaluator(wb3)
+ }
+ );
+
+ // Check the one referring to the previously existing workbook behaves
+ cell = wb4.getSheetAt(0).getRow(1).getCell(40);
+ assertEquals("Cost*[XRefCalcData.xls]MarkupSheet!$B$1", cell.getCellFormula());
+ eval.evaluateFormulaCell(cell);
+ assertEquals(24.60 * 1.8, cell.getNumericCellValue(), 0);
+
+ // Now check the newly added reference
+ cell = wb4.getSheetAt(0).getRow(1).getCell(42);
+ assertEquals("[alt.xls]Sheet0!$A$1", cell.getCellFormula());
+ eval.evaluateFormulaCell(cell);
+ assertEquals("In another workbook", cell.getStringCellValue());
+ }
+ }
+ }
+ }
+
+ @Test
public void testSharedFormulas() throws IOException {
baseTestSharedFormulas("shared_formulas.xls");
}
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java
index a8e8b33ae9..6d2263dd9b 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java
@@ -18,12 +18,12 @@
package org.apache.poi.hssf.usermodel;
import static org.apache.poi.hssf.HSSFTestDataSamples.openSampleWorkbook;
-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.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link HSSFHeader} / {@link HSSFFooter}
@@ -156,14 +156,14 @@ public final class TestHSSFHeaderFooter {
try (HSSFWorkbook wb = openSampleWorkbook("DBCSHeader.xls")) {
HSSFSheet s = wb.getSheetAt(0);
HSSFHeader h = s.getHeader();
- assertEquals("Header Left ", h.getLeft(), "\u090f\u0915");
- assertEquals("Header Center ", h.getCenter(), "\u0939\u094b\u0917\u093e");
- assertEquals("Header Right ", h.getRight(), "\u091c\u093e");
+ assertEquals(h.getLeft(), "\u090f\u0915", "Header Left");
+ assertEquals(h.getCenter(), "\u0939\u094b\u0917\u093e", "Header Center");
+ assertEquals(h.getRight(), "\u091c\u093e", "Header Right");
HSSFFooter f = s.getFooter();
- assertEquals("Footer Left ", f.getLeft(), "\u091c\u093e");
- assertEquals("Footer Center ", f.getCenter(), "\u091c\u093e");
- assertEquals("Footer Right ", f.getRight(), "\u091c\u093e");
+ assertEquals(f.getLeft(), "\u091c\u093e", "Footer Left");
+ assertEquals(f.getCenter(), "\u091c\u093e", "Footer Center");
+ assertEquals(f.getRight(), "\u091c\u093e", "Footer Right");
}
}
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java
index 39d20c1ebd..180624a495 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java
@@ -17,9 +17,9 @@
package org.apache.poi.hssf.usermodel;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.IOException;
@@ -28,13 +28,7 @@ import org.apache.poi.hssf.HSSFITestDataProvider;
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.ss.usermodel.BaseTestHyperlink;
import org.apache.poi.ss.usermodel.Hyperlink;
-/*
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.usermodel.XSSFCreationHelper;
-import org.apache.poi.xssf.usermodel.XSSFHyperlink;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-*/
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests HSSFHyperlink.
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFName.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFName.java
index 566e2f57c5..cc4d519c65 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFName.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFName.java
@@ -17,6 +17,12 @@
package org.apache.poi.hssf.usermodel;
+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.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.poi.POITestCase;
import org.apache.poi.hssf.HSSFITestDataProvider;
import org.apache.poi.hssf.HSSFTestDataSamples;
@@ -26,11 +32,8 @@ import org.apache.poi.ss.formula.FormulaType;
import org.apache.poi.ss.formula.ptg.Ptg;
import org.apache.poi.ss.usermodel.BaseTestNamedRange;
import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.util.CellRangeAddress;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
/**
* Tests various functionality having to do with {@link org.apache.poi.ss.usermodel.Name}.
@@ -126,7 +129,7 @@ public final class TestHSSFName extends BaseTestNamedRange {
HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
HSSFName nm = wb2.getNameAt(wb2.getNameIndex("RangeTest"));
- assertEquals("Name is " + nm.getNameName(), "RangeTest", nm.getNameName());
+ assertEquals("RangeTest", nm.getNameName(), "Name is " + nm.getNameName());
assertEquals(wb2.getSheetName(0)+"!$D$4:$E$8", nm.getRefersToFormula());
wb2.close();
wb1.close();
@@ -152,16 +155,16 @@ public final class TestHSSFName extends BaseTestNamedRange {
String reference = namedRange1.getRefersToFormula();
assertEquals(sheetName+"!$A$1:$D$10", reference);
- assertEquals(false, namedRange1.isDeleted());
- assertEquals(false, namedRange1.isHidden());
+ assertFalse(namedRange1.isDeleted());
+ assertFalse(namedRange1.isHidden());
HSSFName namedRange2 = wb.getNameAt(1);
assertEquals(sheetName+"!$D$17:$G$27", namedRange2.getRefersToFormula());
assertEquals("SecondNamedRange", namedRange2.getNameName());
- assertEquals(false, namedRange2.isDeleted());
- assertEquals(false, namedRange2.isHidden());
-
+ assertFalse(namedRange2.isDeleted());
+ assertFalse(namedRange2.isHidden());
+
wb.close();
}
@@ -184,7 +187,7 @@ public final class TestHSSFName extends BaseTestNamedRange {
name.setRefersToFormula(newReference);
assertEquals(newReference, name.getRefersToFormula());
-
+
wb.close();
}
@@ -204,26 +207,23 @@ public final class TestHSSFName extends BaseTestNamedRange {
@Test
public void testDeletedReference() throws Exception {
- HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("24207.xls");
- assertEquals(2, wb.getNumberOfNames());
+ try (HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("24207.xls")) {
+ assertEquals(2, wb.getNumberOfNames());
- HSSFName name1 = wb.getNameAt(0);
- assertEquals("a", name1.getNameName());
- assertEquals("Sheet1!$A$1", name1.getRefersToFormula());
- wb.getCreationHelper().createAreaReference(name1.getRefersToFormula());
- assertTrue("Successfully constructed first reference", true);
+ HSSFName name1 = wb.getNameAt(0);
+ assertEquals("a", name1.getNameName());
+ assertEquals("Sheet1!$A$1", name1.getRefersToFormula());
+ wb.getCreationHelper().createAreaReference(name1.getRefersToFormula());
- HSSFName name2 = wb.getNameAt(1);
- assertEquals("b", name2.getNameName());
- assertEquals("Sheet1!#REF!", name2.getRefersToFormula());
- assertTrue(name2.isDeleted());
- try {
- wb.getCreationHelper().createAreaReference(name2.getRefersToFormula());
- fail("attempt to supply an invalid reference to AreaReference constructor results in exception");
- } catch (IllegalArgumentException e) { // TODO - use a stronger typed exception for this condition
- // expected during successful test
+ HSSFName name2 = wb.getNameAt(1);
+ assertEquals("b", name2.getNameName());
+ assertEquals("Sheet1!#REF!", name2.getRefersToFormula());
+ assertTrue(name2.isDeleted());
+ // TODO - use a stronger typed exception for this condition
+ assertThrows(IllegalArgumentException.class, () ->
+ wb.getCreationHelper().createAreaReference(name2.getRefersToFormula()),
+ "attempt to supply an invalid reference to AreaReference constructor results in exception");
}
- wb.close();
}
/**
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java
index 3a351afa06..c7c3ddbffb 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java
@@ -16,13 +16,17 @@
==================================================================== */
package org.apache.poi.hssf.usermodel;
-import java.io.IOException;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
-import org.apache.poi.ss.usermodel.*;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.FillPatternType;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.junit.jupiter.api.Test;
public final class TestHSSFOptimiser {
@Test
@@ -324,8 +328,8 @@ public final class TestHSSFOptimiser {
@Test
public void testColumnAndRowStyles() {
HSSFWorkbook wb = new HSSFWorkbook();
- assertEquals("Usually we have 21 pre-defined styles in a newly created Workbook, see InternalWorkbook.createWorkbook()",
- 21, wb.getNumCellStyles());
+ assertEquals(21, wb.getNumCellStyles(),
+ "Usually we have 21 pre-defined styles in a newly created Workbook, see InternalWorkbook.createWorkbook()");
HSSFSheet sheet = wb.createSheet();
@@ -357,8 +361,8 @@ public final class TestHSSFOptimiser {
@Test
public void testUnusedStyle() {
HSSFWorkbook wb = new HSSFWorkbook();
- assertEquals("Usually we have 21 pre-defined styles in a newly created Workbook, see InternalWorkbook.createWorkbook()",
- 21, wb.getNumCellStyles());
+ assertEquals(21, wb.getNumCellStyles(),
+ "Usually we have 21 pre-defined styles in a newly created Workbook, see InternalWorkbook.createWorkbook()");
HSSFSheet sheet = wb.createSheet();
@@ -395,8 +399,8 @@ public final class TestHSSFOptimiser {
@Test
public void testUnusedStyleOneUsed() {
HSSFWorkbook wb = new HSSFWorkbook();
- assertEquals("Usually we have 21 pre-defined styles in a newly created Workbook, see InternalWorkbook.createWorkbook()",
- 21, wb.getNumCellStyles());
+ assertEquals(21, wb.getNumCellStyles(),
+ "Usually we have 21 pre-defined styles in a newly created Workbook, see InternalWorkbook.createWorkbook()");
HSSFSheet sheet = wb.createSheet();
@@ -431,10 +435,10 @@ public final class TestHSSFOptimiser {
}
@Test
- public void testDefaultColumnStyleWitoutCell() throws IOException {
+ public void testDefaultColumnStyleWitoutCell() {
HSSFWorkbook wb = new HSSFWorkbook();
- assertEquals("Usually we have 21 pre-defined styles in a newly created Workbook, see InternalWorkbook.createWorkbook()",
- 21, wb.getNumCellStyles());
+ assertEquals(21, wb.getNumCellStyles(),
+ "Usually we have 21 pre-defined styles in a newly created Workbook, see InternalWorkbook.createWorkbook()");
HSSFSheet sheet = wb.createSheet();
@@ -473,10 +477,10 @@ public final class TestHSSFOptimiser {
}
@Test
- public void testUserDefinedStylesAreNeverOptimizedAway() throws IOException {
+ public void testUserDefinedStylesAreNeverOptimizedAway() {
HSSFWorkbook wb = new HSSFWorkbook();
- assertEquals("Usually we have 21 pre-defined styles in a newly created Workbook, see InternalWorkbook.createWorkbook()",
- 21, wb.getNumCellStyles());
+ assertEquals(21, wb.getNumCellStyles(),
+ "Usually we have 21 pre-defined styles in a newly created Workbook, see InternalWorkbook.createWorkbook()");
HSSFSheet sheet = wb.createSheet();
@@ -532,10 +536,10 @@ public final class TestHSSFOptimiser {
}
@Test
- public void testBug57517() throws IOException {
+ public void testBug57517() {
HSSFWorkbook wb = new HSSFWorkbook();
- assertEquals("Usually we have 21 pre-defined styles in a newly created Workbook, see InternalWorkbook.createWorkbook()",
- 21, wb.getNumCellStyles());
+ assertEquals(21, wb.getNumCellStyles(),
+ "Usually we have 21 pre-defined styles in a newly created Workbook, see InternalWorkbook.createWorkbook()");
HSSFSheet sheet = wb.createSheet();
@@ -599,7 +603,7 @@ public final class TestHSSFOptimiser {
// Create a test font and style, and use them
for (int i = 3; i < 6; i++) {
// Set Cell Color : GREEN
- HSSFRow row = sheet.getRow(0 + 9);
+ HSSFRow row = sheet.getRow(9);
row.createCell(i - 3).setCellStyle(
createColorStyle(wb, IndexedColors.GREEN));
obj_cnt++;
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java
index e26146a1eb..d009a6f58a 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java
@@ -17,15 +17,14 @@
package org.apache.poi.hssf.usermodel;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.awt.Color;
import java.io.IOException;
-import java.util.Iterator;
import java.util.Map;
import org.apache.poi.hssf.HSSFTestDataSamples;
@@ -34,17 +33,16 @@ import org.apache.poi.hssf.util.HSSFColor;
import org.apache.poi.hssf.util.HSSFColor.HSSFColorPredefined;
import org.apache.poi.ss.usermodel.FillPatternType;
import org.apache.poi.ss.usermodel.Font;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public final class TestHSSFPalette {
- private PaletteRecord _palette;
private HSSFPalette _hssfPalette;
- @Before
+ @BeforeEach
public void setUp() {
- _palette = new PaletteRecord();
+ PaletteRecord _palette = new PaletteRecord();
_hssfPalette = new HSSFPalette(_palette);
}
@@ -66,27 +64,27 @@ public final class TestHSSFPalette {
palette = book.getCustomPalette();
HSSFColor color = palette.getColor(HSSFColorPredefined.CORAL.getIndex()); //unmodified
- assertNotNull("Unexpected null in custom palette (unmodified index)", color);
+ assertNotNull(color, "Unexpected null in custom palette (unmodified index)");
short[] expectedRGB = HSSFColorPredefined.CORAL.getTriplet();
short[] actualRGB = color.getTriplet();
String msg = "Expected palette position to remain unmodified";
- assertEquals(msg, expectedRGB[0], actualRGB[0]);
- assertEquals(msg, expectedRGB[1], actualRGB[1]);
- assertEquals(msg, expectedRGB[2], actualRGB[2]);
+ assertEquals(expectedRGB[0], actualRGB[0], msg);
+ assertEquals(expectedRGB[1], actualRGB[1], msg);
+ assertEquals(expectedRGB[2], actualRGB[2], msg);
color = palette.getColor((short) 0x12);
- assertNotNull("Unexpected null in custom palette (modified)", color);
+ assertNotNull(color, "Unexpected null in custom palette (modified)");
actualRGB = color.getTriplet();
msg = "Expected palette modification to be preserved across save";
- assertEquals(msg, (short) 101, actualRGB[0]);
- assertEquals(msg, (short) 230, actualRGB[1]);
- assertEquals(msg, (short) 100, actualRGB[2]);
+ assertEquals((short) 101, actualRGB[0], msg);
+ assertEquals((short) 230, actualRGB[1], msg);
+ assertEquals((short) 100, actualRGB[2], msg);
}
/**
* Uses the palette from cell stylings
*/
- @SuppressWarnings("deprecation")
+ @SuppressWarnings("ConstantConditions")
@Test
public void testPaletteFromCellColours() {
HSSFWorkbook book = HSSFTestDataSamples.openSampleWorkbook("SimpleWithColours.xls");
@@ -105,6 +103,7 @@ public final class TestHSSFPalette {
assertEquals(64, cellA.getCellStyle().getFillBackgroundColor());
assertEquals(Font.COLOR_NORMAL, cellA.getCellStyle().getFont(book).getColor());
assertEquals(FillPatternType.NO_FILL, cellA.getCellStyle().getFillPattern());
+ assertNotNull(p.getColor((short)64));
assertEquals("0:0:0", p.getColor((short)64).getHexString());
assertNull(p.getColor((short) 32767));
@@ -145,11 +144,12 @@ public final class TestHSSFPalette {
assertEquals("FFFF:0:FFFF", p.getColor((short)14).getHexString());
}
+ @SuppressWarnings("ConstantConditions")
@Test
public void testFindSimilar() throws IOException {
HSSFWorkbook book = new HSSFWorkbook();
HSSFPalette p = book.getCustomPalette();
-
+
/* first test the defaults */
assertArrayEquals(
new short[] {(short) 255, (short) 255, (short) 0}, // not [204, 255, 255]
@@ -218,7 +218,7 @@ public final class TestHSSFPalette {
p.getColor((short)12).getHexString(),
p.findSimilarColor((byte)-1, (byte)2, (byte)10).getHexString()
);
-
+
// And with ints not bytes
assertEquals(
p.getColor((short)11).getHexString(),
@@ -228,23 +228,17 @@ public final class TestHSSFPalette {
p.getColor((short)12).getHexString(),
p.findSimilarColor(255, 2, 10).getHexString()
);
-
+
book.close();
}
-
+
/**
* Verifies that the generated gnumeric-format string values match the
* hardcoded values in the HSSFColor default color palette
*/
@Test
public void testGnumericStrings() {
- compareToDefaults(new ColorComparator() {
- @Override
- public void compare(HSSFColor expected, HSSFColor palette)
- {
- assertEquals(expected.getHexString(), palette.getHexString());
- }
- });
+ compareToDefaults((expected, palette) -> assertEquals(expected.getHexString(), palette.getHexString()));
}
/**
@@ -258,25 +252,18 @@ public final class TestHSSFPalette {
_hssfPalette.setColorAtIndex((short) 0x45, (byte) 255, (byte) 255, (byte) 255);
//should still match defaults;
- compareToDefaults(new ColorComparator() {
- @Override
- public void compare(HSSFColor expected, HSSFColor palette)
- {
- short[] s1 = expected.getTriplet();
- short[] s2 = palette.getTriplet();
- assertEquals(s1[0], s2[0]);
- assertEquals(s1[1], s2[1]);
- assertEquals(s1[2], s2[2]);
- }
+ compareToDefaults((expected, palette) -> {
+ short[] s1 = expected.getTriplet();
+ short[] s2 = palette.getTriplet();
+ assertEquals(s1[0], s2[0]);
+ assertEquals(s1[1], s2[1]);
+ assertEquals(s1[2], s2[2]);
});
}
private void compareToDefaults(ColorComparator c) {
Map colors = HSSFColor.getIndexHash();
- Iterator it = colors.keySet().iterator();
- while (it.hasNext())
- {
- Number index = it.next();
+ for (Integer index : colors.keySet()) {
HSSFColor expectedColor = colors.get(index);
HSSFColor paletteColor = _hssfPalette.getColor(index.shortValue());
c.compare(expectedColor, paletteColor);
@@ -285,16 +272,11 @@ public final class TestHSSFPalette {
@Test
public void testAddColor() {
- try
- {
- _hssfPalette.addColor((byte)10,(byte)10,(byte)10);
- fail();
- } catch (RuntimeException e) {
- // Failing because by default there are no colours left in the palette.
- }
+ assertThrows(RuntimeException.class, () -> _hssfPalette.addColor((byte)10,(byte)10,(byte)10),
+ "Failing because by default there are no colours left in the palette.");
}
- private static interface ColorComparator {
+ private interface ColorComparator {
void compare(HSSFColor expected, HSSFColor palette);
}
@@ -304,7 +286,7 @@ public final class TestHSSFPalette {
Color color = Color.decode("#006B6B");
HSSFPalette palette = wb.getCustomPalette();
-
+
HSSFColor hssfColor = palette.findColor((byte) color.getRed(),
(byte) color.getGreen(), (byte) color.getBlue());
assertNull(hssfColor);
@@ -317,7 +299,7 @@ public final class TestHSSFPalette {
assertNotNull(hssfColor);
assertEquals(55, hssfColor.getIndex());
assertArrayEquals(new short[] {0, 107, 107}, hssfColor.getTriplet());
-
+
wb.close();
}
}
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java
index ff65cbe113..4e81dbc402 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java
@@ -17,13 +17,13 @@
package org.apache.poi.hssf.usermodel;
-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.ss.usermodel.ClientAnchor.AnchorType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestHSSFPatriarch {
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java
index 95bd508770..5de42c63ef 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java
@@ -17,8 +17,8 @@
package org.apache.poi.hssf.usermodel;
-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.IOException;
import java.util.Arrays;
@@ -34,7 +34,7 @@ import org.apache.poi.ss.usermodel.ClientAnchor;
import org.apache.poi.ss.usermodel.CreationHelper;
import org.apache.poi.ss.usermodel.PictureData;
import org.apache.poi.ss.usermodel.Workbook;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestHSSFPicture extends BaseTestPicture {
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
index 986bad978d..0a9a0b8894 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
@@ -17,9 +17,9 @@
package org.apache.poi.hssf.usermodel;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
+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.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
@@ -31,15 +31,15 @@ import javax.imageio.IIOException;
import javax.imageio.ImageIO;
import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Test HSSFPictureData.
* The code to retrieve images from a workbook provided by Trejkaz (trejkaz at trypticon dot org) in Bug 41223.
*/
public final class TestHSSFPictureData {
- @BeforeClass
+ @BeforeAll
public static void setUpClass() {
final String tmpDirProperty = System.getProperty("java.io.tmpdir");
if(tmpDirProperty == null || "".equals(tmpDirProperty)) {
@@ -86,7 +86,7 @@ public final class TestHSSFPictureData {
}
}
} catch (IIOException e) {
- assertFalse(e.getMessage(), e.getMessage().contains("Can't create cache file"));
+ assertFalse(e.getMessage().contains("Can't create cache file"), e.getMessage());
}
}
@@ -100,7 +100,7 @@ public final class TestHSSFPictureData {
HSSFPictureData pict = lst.get(0);
String ext = pict.suggestFileExtension();
- assertEquals("Expected a PNG.", "png", ext);
+ assertEquals("png", ext, "Expected a PNG.");
//try to read image data using javax.imageio.* (JDK 1.4+)
byte[] data = pict.getData();
@@ -111,7 +111,7 @@ public final class TestHSSFPictureData {
assertEquals(HSSFWorkbook.PICTURE_TYPE_PNG, pict.getFormat());
assertEquals("image/png", pict.getMimeType());
} catch (IIOException e) {
- assertFalse(e.getMessage(), e.getMessage().contains("Can't create cache file"));
+ assertFalse(e.getMessage().contains("Can't create cache file"), e.getMessage());
}
}
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRangeCopier.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRangeCopier.java
index 07f37d8e4a..9ba33f7d8c 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRangeCopier.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRangeCopier.java
@@ -22,7 +22,7 @@ package org.apache.poi.hssf.usermodel;
import org.apache.poi.hssf.HSSFITestDataProvider;
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.ss.usermodel.BaseTestRangeCopier;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
public class TestHSSFRangeCopier extends BaseTestRangeCopier {
@@ -32,7 +32,7 @@ public class TestHSSFRangeCopier extends BaseTestRangeCopier {
testDataProvider = HSSFITestDataProvider.instance;
}
- @Before
+ @BeforeEach
public void init() {
workbook = HSSFTestDataSamples.openSampleWorkbook("tile-range-test.xls");
initSheets();
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java
index 442bf7e8c5..36d8f13c78 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java
@@ -17,9 +17,9 @@
package org.apache.poi.hssf.usermodel;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestHSSFRichTextString {
@Test
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
index 53d799e953..0bfef5735b 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
@@ -17,6 +17,13 @@
package org.apache.poi.hssf.usermodel;
+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.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.IOException;
import org.apache.poi.hssf.HSSFITestDataProvider;
@@ -24,9 +31,7 @@ import org.apache.poi.hssf.record.BlankRecord;
import org.apache.poi.hssf.record.RowRecord;
import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.ss.usermodel.BaseTestRow;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
/**
* Test HSSFRow is okay.
@@ -67,9 +72,8 @@ public final class TestHSSFRow extends BaseTestRow {
HSSFRow row = new HSSFRow(workbook, sheet, rowRec);
HSSFCell cell = row.createCellFromRecord(br);
- if (row.getFirstCellNum() == 2 && row.getLastCellNum() == 5) {
- fail("Identified bug 46654a");
- }
+ assertFalse(row.getFirstCellNum() == 2 && row.getLastCellNum() == 5, "Identified bug 46654a");
+
assertEquals(COL_IX, row.getFirstCellNum());
assertEquals(COL_IX + 1, row.getLastCellNum());
row.removeCell(cell);
@@ -100,20 +104,10 @@ public final class TestHSSFRow extends BaseTestRow {
assertEquals(4, row.getLastCellNum());
// Try to move to somewhere else that's used
- try {
- row.moveCell(cellB2, (short)3);
- fail("IllegalArgumentException should have been thrown");
- } catch(IllegalArgumentException e) {
- // expected during successful test
- }
+ assertThrows(IllegalArgumentException.class, () -> row.moveCell(cellB2, (short)3));
// Try to move one off a different row
- try {
- row.moveCell(cellA2, (short)3);
- fail("IllegalArgumentException should have been thrown");
- } catch(IllegalArgumentException e) {
- // expected during successful test
- }
+ assertThrows(IllegalArgumentException.class, () -> row.moveCell(cellA2, (short)3));
// Move somewhere spare
assertNotNull(row.getCell(1));
@@ -124,7 +118,7 @@ public final class TestHSSFRow extends BaseTestRow {
assertEquals(5, cellB2.getColumnIndex());
assertEquals(2, row.getFirstCellNum());
assertEquals(6, row.getLastCellNum());
-
+
workbook.close();
}
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
index 09906b8e27..38f5b28422 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
@@ -18,7 +18,15 @@
package org.apache.poi.hssf.usermodel;
import static org.apache.poi.hssf.HSSFTestDataSamples.writeOutAndReadBack;
-import static org.junit.Assert.*;
+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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+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 java.io.IOException;
import java.util.ArrayList;
@@ -43,7 +51,7 @@ import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.ss.util.CellRangeAddressList;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests HSSFSheet. This test case is very incomplete at the moment.
@@ -390,10 +398,10 @@ public final class TestHSSFSheet extends BaseTestSheet {
HSSFSheet s = wb.createSheet();
s.protectSheet("abcdefghij");
WorksheetProtectionBlock pb = s.getSheet().getProtectionBlock();
- assertTrue("protection should be on", pb.isSheetProtected());
- assertTrue("object protection should be on", pb.isObjectProtected());
- assertTrue("scenario protection should be on", pb.isScenarioProtected());
- assertEquals("well known value for top secret hash should be " + Integer.toHexString(expectedHash).substring(4), expectedHash, pb.getPasswordHash());
+ assertTrue(pb.isSheetProtected(), "protection should be on");
+ assertTrue(pb.isObjectProtected(), "object protection should be on");
+ assertTrue(pb.isScenarioProtected(), "scenario protection should be on");
+ assertEquals(expectedHash, pb.getPasswordHash(), "well known value for top secret hash should be " + Integer.toHexString(expectedHash).substring(4));
}
}
@@ -465,30 +473,18 @@ public final class TestHSSFSheet extends BaseTestSheet {
assertEquals(sclLoc, window2Loc + 1);
// verify limits
- try {
- sheet.setZoom(0);
- fail("Should catch Exception here");
- } catch (IllegalArgumentException e) {
- assertEquals("Numerator must be greater than 0 and less than 65536", e.getMessage());
- }
- try {
- sheet.setZoom(65536);
- fail("Should catch Exception here");
- } catch (IllegalArgumentException e) {
- assertEquals("Numerator must be greater than 0 and less than 65536", e.getMessage());
- }
- try {
- sheet.setZoom(2, 0);
- fail("Should catch Exception here");
- } catch (IllegalArgumentException e) {
- assertEquals("Denominator must be greater than 0 and less than 65536", e.getMessage());
- }
- try {
- sheet.setZoom(2, 65536);
- fail("Should catch Exception here");
- } catch (IllegalArgumentException e) {
- assertEquals("Denominator must be greater than 0 and less than 65536", e.getMessage());
- }
+ IllegalArgumentException e;
+ e = assertThrows(IllegalArgumentException.class, () -> sheet.setZoom(0));
+ assertEquals("Numerator must be greater than 0 and less than 65536", e.getMessage());
+
+ e = assertThrows(IllegalArgumentException.class, () -> sheet.setZoom(65536));
+ assertEquals("Numerator must be greater than 0 and less than 65536", e.getMessage());
+
+ e = assertThrows(IllegalArgumentException.class, () -> sheet.setZoom(2, 0));
+ assertEquals("Denominator must be greater than 0 and less than 65536", e.getMessage());
+
+ e = assertThrows(IllegalArgumentException.class, () -> sheet.setZoom(2, 65536));
+ assertEquals("Denominator must be greater than 0 and less than 65536", e.getMessage());
}
}
@@ -504,26 +500,26 @@ public final class TestHSSFSheet extends BaseTestSheet {
HSSFSheet sheet = wb1.getSheetAt(0);
assertNotNull(sheet);
- assertEquals("1 row page break", 1, sheet.getRowBreaks().length);
- assertEquals("1 column page break", 1, sheet.getColumnBreaks().length);
+ assertEquals(1, sheet.getRowBreaks().length, "1 row page break");
+ assertEquals(1, sheet.getColumnBreaks().length, "1 column page break");
- assertTrue("No row page break", sheet.isRowBroken(22));
- assertTrue("No column page break", sheet.isColumnBroken((short) 4));
+ assertTrue(sheet.isRowBroken(22), "No row page break");
+ assertTrue(sheet.isColumnBroken((short) 4), "No column page break");
sheet.setRowBreak(10);
sheet.setColumnBreak((short) 13);
- assertEquals("row breaks number", 2, sheet.getRowBreaks().length);
- assertEquals("column breaks number", 2, sheet.getColumnBreaks().length);
+ assertEquals(2, sheet.getRowBreaks().length, "row breaks number");
+ assertEquals(2, sheet.getColumnBreaks().length, "column breaks number");
try (HSSFWorkbook wb2 = writeOutAndReadBack(wb1)) {
sheet = wb2.getSheetAt(0);
- assertTrue("No row page break", sheet.isRowBroken(22));
- assertTrue("No column page break", sheet.isColumnBroken((short) 4));
+ assertTrue(sheet.isRowBroken(22), "No row page break");
+ assertTrue(sheet.isColumnBroken((short) 4), "No column page break");
- assertEquals("row breaks number", 2, sheet.getRowBreaks().length);
- assertEquals("column breaks number", 2, sheet.getColumnBreaks().length);
+ assertEquals(2, sheet.getRowBreaks().length, "row breaks number");
+ assertEquals(2, sheet.getColumnBreaks().length, "column breaks number");
}
}
}
@@ -532,8 +528,8 @@ public final class TestHSSFSheet extends BaseTestSheet {
public void dbcsName () throws IOException {
try (HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("DBCSSheetName.xls")) {
wb.getSheetAt(1);
- assertEquals("DBCS Sheet Name 2", wb.getSheetName(1), "\u090f\u0915");
- assertEquals("DBCS Sheet Name 1", wb.getSheetName(0), "\u091c\u093e");
+ assertEquals(wb.getSheetName(1), "\u090f\u0915", "DBCS Sheet Name 2");
+ assertEquals(wb.getSheetName(0), "\u091c\u093e", "DBCS Sheet Name 1");
}
}
@@ -551,8 +547,8 @@ public final class TestHSSFSheet extends BaseTestSheet {
short toprow = (short) 100;
short leftcol = (short) 50;
sheet.showInPane(toprow, leftcol);
- assertEquals("HSSFSheet.getTopRow()", toprow, sheet.getTopRow());
- assertEquals("HSSFSheet.getLeftCol()", leftcol, sheet.getLeftCol());
+ assertEquals(toprow, sheet.getTopRow(), "HSSFSheet.getTopRow()");
+ assertEquals(leftcol, sheet.getLeftCol(), "HSSFSheet.getLeftCol()");
}
}
@@ -597,8 +593,8 @@ public final class TestHSSFSheet extends BaseTestSheet {
// autoSize the first column and check its size before the merged region (1,0,1,1) is set:
// it has to be based on the 2nd row width
sheet.autoSizeColumn((short) 0);
- assertTrue("Column autosized with only one row: wrong width", sheet.getColumnWidth(0) >= minWithRow1And2);
- assertTrue("Column autosized with only one row: wrong width", sheet.getColumnWidth(0) <= maxWithRow1And2);
+ assertTrue(sheet.getColumnWidth(0) >= minWithRow1And2, "Column autosized with only one row: wrong width");
+ assertTrue(sheet.getColumnWidth(0) <= maxWithRow1And2, "Column autosized with only one row: wrong width");
//create a region over the 2nd row and auto size the first column
assertEquals(1, sheet.addMergedRegion(new CellRangeAddress(1, 1, 0, 1)));
@@ -779,11 +775,11 @@ public final class TestHSSFSheet extends BaseTestSheet {
try (HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("ex41187-19267.xls")) {
HSSFSheet sheet = wb.getSheetAt(0);
HSSFRow row = sheet.getRow(0);
- assertNotNull("Identified bug 41187 a", row);
+ assertNotNull(row, "Identified bug 41187 a");
- assertNotEquals("Identified bug 41187 b", (short) 0, row.getHeight());
+ assertNotEquals((short) 0, row.getHeight(), "Identified bug 41187 b");
- assertEquals("Hi Excel!", row.getCell(0).getRichStringCellValue().getString());
+ assertEquals(row.getCell(0).getRichStringCellValue().getString(), "Hi Excel!");
// check row height for 'default' flag
assertEquals((short) 0xFF, row.getHeight());
@@ -838,12 +834,10 @@ public final class TestHSSFSheet extends BaseTestSheet {
final String SAME_PREFIX = "A123456789B123456789C123456789"; // 30 chars
wb.createSheet(SAME_PREFIX + "Dxxxx");
- try {
- wb.createSheet(SAME_PREFIX + "Dyyyy"); // identical up to the 32nd char
- fail("Expected exception not thrown");
- } catch (IllegalArgumentException e) {
- assertEquals("The workbook already contains a sheet named 'A123456789B123456789C123456789Dyyyy'", e.getMessage());
- }
+ // identical up to the 32nd char
+ IllegalArgumentException e = assertThrows(IllegalArgumentException.class, () -> wb.createSheet(SAME_PREFIX + "Dyyyy"));
+ assertEquals("The workbook already contains a sheet named 'A123456789B123456789C123456789Dyyyy'", e.getMessage());
+
wb.createSheet(SAME_PREFIX + "Exxxx"); // OK - differs in the 31st char
}
}
@@ -923,8 +917,8 @@ public final class TestHSSFSheet extends BaseTestSheet {
// The built-in name for auto-filter must consist of a single Area3d Ptg.
Ptg[] ptg = name.getNameDefinition();
- assertEquals("The built-in name for auto-filter must consist of a single Area3d Ptg", 1, ptg.length);
- assertTrue("The built-in name for auto-filter must consist of a single Area3d Ptg", ptg[0] instanceof Area3DPtg);
+ assertEquals(1, ptg.length, "The built-in name for auto-filter must consist of a single Area3d Ptg");
+ assertTrue(ptg[0] instanceof Area3DPtg, "The built-in name for auto-filter must consist of a single Area3d Ptg");
Area3DPtg aref = (Area3DPtg) ptg[0];
assertEquals(range.getFirstColumn(), aref.getFirstColumn());
@@ -1003,12 +997,10 @@ public final class TestHSSFSheet extends BaseTestSheet {
assertEquals(40000, sheet.getColumnWidth((short) 10));
//The maximum column width for an individual cell is 255 characters
- try {
- sheet.setColumnWidth((short) 9, 256 * 256);
- fail("expected exception");
- } catch (IllegalArgumentException e) {
- assertEquals("The maximum column width for an individual cell is 255 characters.", e.getMessage());
- }
+ Sheet sheet2 = sheet;
+ IllegalArgumentException e = assertThrows(IllegalArgumentException.class, () ->
+ sheet2.setColumnWidth((short) 9, 256 * 256));
+ assertEquals("The maximum column width for an individual cell is 255 characters.", e.getMessage());
//serialize and read again
try (HSSFWorkbook wb2 = writeOutAndReadBack(wb1)) {
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftColumns.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftColumns.java
index f5be8470d2..5da9a1c606 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftColumns.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftColumns.java
@@ -24,14 +24,14 @@ import org.apache.poi.hssf.HSSFITestDataProvider;
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.ss.usermodel.BaseTestSheetShiftColumns;
import org.apache.poi.ss.usermodel.Workbook;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
public class TestHSSFSheetShiftColumns extends BaseTestSheetShiftColumns {
public TestHSSFSheetShiftColumns() {
- super();
+ super();
workbook = new HSSFWorkbook();
- _testDataProvider = HSSFITestDataProvider.instance;
+ _testDataProvider = HSSFITestDataProvider.instance;
}
protected Workbook openWorkbook(String spreadsheetFileName)
@@ -42,45 +42,45 @@ public class TestHSSFSheetShiftColumns extends BaseTestSheetShiftColumns {
protected Workbook getReadBackWorkbook(Workbook wb) throws IOException {
return HSSFTestDataSamples.writeOutAndReadBack((HSSFWorkbook)wb);
}
-
- @Override
- @Ignore("see ")
+
+ @Override
+ @Disabled("see ")
@Test
public void shiftMergedColumnsToMergedColumnsLeft() throws IOException {
- // This override is used only in order to test failing for HSSF. Please remove method after code is fixed on hssf,
- // so that original method from BaseTestSheetShiftColumns can be executed.
- }
- @Override
- @Ignore("see ")
- @Test
- public void shiftMergedColumnsToMergedColumnsRight() throws IOException {
- // This override is used only in order to test failing for HSSF. Please remove method after code is fixed on hssf,
- // so that original method from BaseTestSheetShiftColumns can be executed.
- }
- @Override
- @Ignore("see ")
- @Test
- public void testBug54524() throws IOException {
- // This override is used only in order to test failing for HSSF. Please remove method after code is fixed on hssf,
- // so that original method from BaseTestSheetShiftColumns can be executed.
- }
- @Override
- @Ignore("see ")
- @Test
- public void testCommentsShifting() throws IOException {
- // This override is used only in order to test failing for HSSF. Please remove method after code is fixed on hssf,
- // so that original method from BaseTestSheetShiftColumns can be executed.
- }
- @Override
- @Ignore("see