You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2021/10/20 22:50:35 UTC
svn commit: r1894426 [2/2] - in /poi/trunk:
poi-ooxml/src/test/java/org/apache/poi/ooxml/
poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/
poi/src/test/java/org/apache/poi/hssf/model/
poi/src/test/java/org/apache/poi/hssf/usermodel/ poi/src/test/...
Modified: poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestShapeGroup.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestShapeGroup.java?rev=1894426&r1=1894425&r2=1894426&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestShapeGroup.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestShapeGroup.java Wed Oct 20 22:50:35 2021
@@ -34,216 +34,210 @@ class TestShapeGroup {
@Test
void testSetGetCoordinates() throws IOException {
- HSSFWorkbook wb1 = new HSSFWorkbook();
- HSSFSheet sh = wb1.createSheet();
- HSSFPatriarch patriarch = sh.createDrawingPatriarch();
- HSSFShapeGroup group = patriarch.createGroup(new HSSFClientAnchor());
- assertEquals(group.getX1(), 0);
- assertEquals(group.getY1(), 0);
- assertEquals(group.getX2(), 1023);
- assertEquals(group.getY2(), 255);
-
- group.setCoordinates(1,2,3,4);
-
- assertEquals(group.getX1(), 1);
- assertEquals(group.getY1(), 2);
- assertEquals(group.getX2(), 3);
- assertEquals(group.getY2(), 4);
-
- HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
- wb1.close();
- sh = wb2.getSheetAt(0);
- patriarch = sh.getDrawingPatriarch();
-
- group = (HSSFShapeGroup) patriarch.getChildren().get(0);
- assertEquals(group.getX1(), 1);
- assertEquals(group.getY1(), 2);
- assertEquals(group.getX2(), 3);
- assertEquals(group.getY2(), 4);
- wb2.close();
+ try (HSSFWorkbook wb1 = new HSSFWorkbook()) {
+ HSSFSheet sh = wb1.createSheet();
+ HSSFPatriarch patriarch = sh.createDrawingPatriarch();
+ HSSFShapeGroup group = patriarch.createGroup(new HSSFClientAnchor());
+ assertEquals(0, group.getX1());
+ assertEquals(0, group.getY1());
+ assertEquals(1023, group.getX2());
+ assertEquals(255, group.getY2());
+
+ group.setCoordinates(1, 2, 3, 4);
+
+ assertEquals(1, group.getX1());
+ assertEquals(2, group.getY1());
+ assertEquals(3, group.getX2());
+ assertEquals(4, group.getY2());
+
+ try (HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1)) {
+ sh = wb2.getSheetAt(0);
+ patriarch = sh.getDrawingPatriarch();
+
+ group = (HSSFShapeGroup) patriarch.getChildren().get(0);
+ assertEquals(1, group.getX1());
+ assertEquals(2, group.getY1());
+ assertEquals(3, group.getX2());
+ assertEquals(4, group.getY2());
+ }
+ }
}
@Test
void testAddToExistingFile() throws IOException {
- HSSFWorkbook wb1 = new HSSFWorkbook();
- HSSFSheet sh = wb1.createSheet();
- HSSFPatriarch patriarch = sh.createDrawingPatriarch();
- HSSFShapeGroup group1 = patriarch.createGroup(new HSSFClientAnchor());
- HSSFShapeGroup group2 = patriarch.createGroup(new HSSFClientAnchor());
-
- group1.setCoordinates(1,2,3,4);
- group2.setCoordinates(5,6,7,8);
-
- HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
- wb1.close();
- sh = wb2.getSheetAt(0);
- patriarch = sh.getDrawingPatriarch();
-
- assertEquals(patriarch.getChildren().size(), 2);
-
- HSSFShapeGroup group3 = patriarch.createGroup(new HSSFClientAnchor());
- group3.setCoordinates(9,10,11,12);
-
- HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2);
- wb2.close();
- sh = wb3.getSheetAt(0);
- patriarch = sh.getDrawingPatriarch();
-
- assertEquals(patriarch.getChildren().size(), 3);
- wb3.close();
+ try (HSSFWorkbook wb1 = new HSSFWorkbook()) {
+ HSSFSheet sh = wb1.createSheet();
+ HSSFPatriarch patriarch = sh.createDrawingPatriarch();
+ HSSFShapeGroup group1 = patriarch.createGroup(new HSSFClientAnchor());
+ HSSFShapeGroup group2 = patriarch.createGroup(new HSSFClientAnchor());
+
+ group1.setCoordinates(1, 2, 3, 4);
+ group2.setCoordinates(5, 6, 7, 8);
+
+ try (HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1)) {
+ sh = wb2.getSheetAt(0);
+ patriarch = sh.getDrawingPatriarch();
+
+ assertEquals(2, patriarch.getChildren().size());
+
+ HSSFShapeGroup group3 = patriarch.createGroup(new HSSFClientAnchor());
+ group3.setCoordinates(9, 10, 11, 12);
+
+ try (HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2)) {
+ sh = wb3.getSheetAt(0);
+ patriarch = sh.getDrawingPatriarch();
+
+ assertEquals(3, patriarch.getChildren().size());
+ }
+ }
+ }
}
@Test
void testModify() throws IOException {
- HSSFWorkbook wb1 = new HSSFWorkbook();
+ try (HSSFWorkbook wb1 = new HSSFWorkbook()) {
- // create a sheet with a text box
- HSSFSheet sheet = wb1.createSheet();
- HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
-
- HSSFShapeGroup group1 = patriarch.createGroup(new
- HSSFClientAnchor(0,0,0,0,
- (short)0, 0, (short)15, 25));
- group1.setCoordinates(0, 0, 792, 612);
-
- HSSFTextbox textbox1 = group1.createTextbox(new
- HSSFChildAnchor(100, 100, 300, 300));
- HSSFRichTextString rt1 = new HSSFRichTextString("Hello, World!");
- textbox1.setString(rt1);
-
- // write, read back and check that our text box is there
- HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
- wb1.close();
- sheet = wb2.getSheetAt(0);
- patriarch = sheet.getDrawingPatriarch();
- assertEquals(1, patriarch.getChildren().size());
-
- group1 = (HSSFShapeGroup)patriarch.getChildren().get(0);
- assertEquals(1, group1.getChildren().size());
- textbox1 = (HSSFTextbox)group1.getChildren().get(0);
- assertEquals("Hello, World!", textbox1.getString().getString());
-
- // modify anchor
- assertEquals(new HSSFChildAnchor(100, 100, 300, 300),
- textbox1.getAnchor());
- HSSFChildAnchor newAnchor = new HSSFChildAnchor(200,200, 400, 400);
- textbox1.setAnchor(newAnchor);
- // modify text
- textbox1.setString(new HSSFRichTextString("Hello, World! (modified)"));
-
- // add a new text box
- HSSFTextbox textbox2 = group1.createTextbox(new
- HSSFChildAnchor(400, 400, 600, 600));
- HSSFRichTextString rt2 = new HSSFRichTextString("Hello, World-2");
- textbox2.setString(rt2);
- assertEquals(2, group1.getChildren().size());
-
- HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2);
- wb2.close();
- sheet = wb3.getSheetAt(0);
- patriarch = sheet.getDrawingPatriarch();
- assertEquals(1, patriarch.getChildren().size());
-
- group1 = (HSSFShapeGroup)patriarch.getChildren().get(0);
- assertEquals(2, group1.getChildren().size());
- textbox1 = (HSSFTextbox)group1.getChildren().get(0);
- assertEquals("Hello, World! (modified)",
- textbox1.getString().getString());
- assertEquals(new HSSFChildAnchor(200,200, 400, 400),
- textbox1.getAnchor());
-
- textbox2 = (HSSFTextbox)group1.getChildren().get(1);
- assertEquals("Hello, World-2", textbox2.getString().getString());
- assertEquals(new HSSFChildAnchor(400, 400, 600, 600),
- textbox2.getAnchor());
-
- HSSFWorkbook wb4 = HSSFTestDataSamples.writeOutAndReadBack(wb3);
- wb3.close();
- sheet = wb4.getSheetAt(0);
- patriarch = sheet.getDrawingPatriarch();
- group1 = (HSSFShapeGroup)patriarch.getChildren().get(0);
- textbox1 = (HSSFTextbox)group1.getChildren().get(0);
- textbox2 = (HSSFTextbox)group1.getChildren().get(1);
- HSSFTextbox textbox3 = group1.createTextbox(new
- HSSFChildAnchor(400,200, 600, 400));
- HSSFRichTextString rt3 = new HSSFRichTextString("Hello, World-3");
- textbox3.setString(rt3);
- wb4.close();
+ // create a sheet with a text box
+ HSSFSheet sheet = wb1.createSheet();
+ HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
+
+ HSSFShapeGroup group1 = patriarch.createGroup(new
+ HSSFClientAnchor(0, 0, 0, 0,
+ (short) 0, 0, (short) 15, 25));
+ group1.setCoordinates(0, 0, 792, 612);
+
+ HSSFTextbox textbox1 = group1.createTextbox(new
+ HSSFChildAnchor(100, 100, 300, 300));
+ HSSFRichTextString rt1 = new HSSFRichTextString("Hello, World!");
+ textbox1.setString(rt1);
+
+ // write, read back and check that our text box is there
+ try (HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1)) {
+ sheet = wb2.getSheetAt(0);
+ patriarch = sheet.getDrawingPatriarch();
+ assertEquals(1, patriarch.getChildren().size());
+
+ group1 = (HSSFShapeGroup) patriarch.getChildren().get(0);
+ assertEquals(1, group1.getChildren().size());
+ textbox1 = (HSSFTextbox) group1.getChildren().get(0);
+ assertEquals("Hello, World!", textbox1.getString().getString());
+
+ // modify anchor
+ assertEquals(new HSSFChildAnchor(100, 100, 300, 300), textbox1.getAnchor());
+ HSSFChildAnchor newAnchor = new HSSFChildAnchor(200, 200, 400, 400);
+ textbox1.setAnchor(newAnchor);
+ // modify text
+ textbox1.setString(new HSSFRichTextString("Hello, World! (modified)"));
+
+ // add a new text box
+ HSSFTextbox textbox2 = group1.createTextbox(new HSSFChildAnchor(400, 400, 600, 600));
+ HSSFRichTextString rt2 = new HSSFRichTextString("Hello, World-2");
+ textbox2.setString(rt2);
+ assertEquals(2, group1.getChildren().size());
+
+ try (HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2)) {
+ sheet = wb3.getSheetAt(0);
+ patriarch = sheet.getDrawingPatriarch();
+ assertEquals(1, patriarch.getChildren().size());
+
+ group1 = (HSSFShapeGroup) patriarch.getChildren().get(0);
+ assertEquals(2, group1.getChildren().size());
+ textbox1 = (HSSFTextbox) group1.getChildren().get(0);
+ assertEquals("Hello, World! (modified)", textbox1.getString().getString());
+ assertEquals(new HSSFChildAnchor(200, 200, 400, 400), textbox1.getAnchor());
+
+ textbox2 = (HSSFTextbox) group1.getChildren().get(1);
+ assertEquals("Hello, World-2", textbox2.getString().getString());
+ assertEquals(new HSSFChildAnchor(400, 400, 600, 600), textbox2.getAnchor());
+
+ try (HSSFWorkbook wb4 = HSSFTestDataSamples.writeOutAndReadBack(wb3)) {
+ sheet = wb4.getSheetAt(0);
+ patriarch = sheet.getDrawingPatriarch();
+ group1 = (HSSFShapeGroup) patriarch.getChildren().get(0);
+ textbox1 = (HSSFTextbox) group1.getChildren().get(0);
+ textbox2 = (HSSFTextbox) group1.getChildren().get(1);
+ HSSFTextbox textbox3 = group1.createTextbox(new HSSFChildAnchor(400, 200, 600, 400));
+ HSSFRichTextString rt3 = new HSSFRichTextString("Hello, World-3");
+ textbox3.setString(rt3);
+ }
+ }
+ }
+ }
}
@Test
void testAddShapesToGroup() throws IOException {
- HSSFWorkbook wb1 = new HSSFWorkbook();
-
- // create a sheet with a text box
- HSSFSheet sheet = wb1.createSheet();
- HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
-
- HSSFShapeGroup group = patriarch.createGroup(new HSSFClientAnchor());
- int index = wb1.addPicture(new byte[]{1,2,3}, HSSFWorkbook.PICTURE_TYPE_JPEG);
- group.createPicture(new HSSFChildAnchor(), index);
- HSSFPolygon polygon = group.createPolygon(new HSSFChildAnchor());
- polygon.setPoints(new int[]{1,100, 1}, new int[]{1, 50, 100});
- group.createTextbox(new HSSFChildAnchor());
- group.createShape(new HSSFChildAnchor());
-
- HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
- wb1.close();
- sheet = wb2.getSheetAt(0);
- patriarch = sheet.getDrawingPatriarch();
- assertEquals(1, patriarch.getChildren().size());
-
- assertTrue(patriarch.getChildren().get(0) instanceof HSSFShapeGroup);
- group = (HSSFShapeGroup) patriarch.getChildren().get(0);
-
- assertEquals(group.getChildren().size(), 4);
-
- assertTrue(group.getChildren().get(0) instanceof HSSFPicture);
- assertTrue(group.getChildren().get(1) instanceof HSSFPolygon);
- assertTrue(group.getChildren().get(2) instanceof HSSFTextbox);
- assertTrue(group.getChildren().get(3) instanceof HSSFSimpleShape);
-
- HSSFShapeGroup group2 = patriarch.createGroup(new HSSFClientAnchor());
-
- index = wb2.addPicture(new byte[]{2,2,2}, HSSFWorkbook.PICTURE_TYPE_JPEG);
- group2.createPicture(new HSSFChildAnchor(), index);
- polygon = group2.createPolygon(new HSSFChildAnchor());
- polygon.setPoints(new int[]{1,100, 1}, new int[]{1, 50, 100});
- group2.createTextbox(new HSSFChildAnchor());
- group2.createShape(new HSSFChildAnchor());
- group2.createShape(new HSSFChildAnchor());
-
- HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2);
- wb2.close();
- sheet = wb3.getSheetAt(0);
- patriarch = sheet.getDrawingPatriarch();
- assertEquals(2, patriarch.getChildren().size());
-
- group = (HSSFShapeGroup) patriarch.getChildren().get(1);
-
- assertEquals(group.getChildren().size(), 5);
-
- assertTrue(group.getChildren().get(0) instanceof HSSFPicture);
- assertTrue(group.getChildren().get(1) instanceof HSSFPolygon);
- assertTrue(group.getChildren().get(2) instanceof HSSFTextbox);
- assertTrue(group.getChildren().get(3) instanceof HSSFSimpleShape);
- assertTrue(group.getChildren().get(4) instanceof HSSFSimpleShape);
+ try (HSSFWorkbook wb1 = new HSSFWorkbook()) {
- group.getShapeId();
- wb3.close();
+ // create a sheet with a text box
+ HSSFSheet sheet = wb1.createSheet();
+ HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
+
+ HSSFShapeGroup group = patriarch.createGroup(new HSSFClientAnchor());
+ int index = wb1.addPicture(new byte[]{1, 2, 3}, HSSFWorkbook.PICTURE_TYPE_JPEG);
+ group.createPicture(new HSSFChildAnchor(), index);
+ HSSFPolygon polygon = group.createPolygon(new HSSFChildAnchor());
+ polygon.setPoints(new int[]{1, 100, 1}, new int[]{1, 50, 100});
+ group.createTextbox(new HSSFChildAnchor());
+ group.createShape(new HSSFChildAnchor());
+
+ try (HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1)) {
+ sheet = wb2.getSheetAt(0);
+ patriarch = sheet.getDrawingPatriarch();
+ assertEquals(1, patriarch.getChildren().size());
+
+ assertTrue(patriarch.getChildren().get(0) instanceof HSSFShapeGroup);
+ group = (HSSFShapeGroup) patriarch.getChildren().get(0);
+
+ assertEquals(4, group.getChildren().size());
+
+ assertTrue(group.getChildren().get(0) instanceof HSSFPicture);
+ assertTrue(group.getChildren().get(1) instanceof HSSFPolygon);
+ assertTrue(group.getChildren().get(2) instanceof HSSFTextbox);
+ assertTrue(group.getChildren().get(3) instanceof HSSFSimpleShape);
+
+ HSSFShapeGroup group2 = patriarch.createGroup(new HSSFClientAnchor());
+
+ index = wb2.addPicture(new byte[]{2, 2, 2}, HSSFWorkbook.PICTURE_TYPE_JPEG);
+ group2.createPicture(new HSSFChildAnchor(), index);
+ polygon = group2.createPolygon(new HSSFChildAnchor());
+ polygon.setPoints(new int[]{1, 100, 1}, new int[]{1, 50, 100});
+ group2.createTextbox(new HSSFChildAnchor());
+ group2.createShape(new HSSFChildAnchor());
+ group2.createShape(new HSSFChildAnchor());
+
+ try (HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2)) {
+ sheet = wb3.getSheetAt(0);
+ patriarch = sheet.getDrawingPatriarch();
+ assertEquals(2, patriarch.getChildren().size());
+
+ group = (HSSFShapeGroup) patriarch.getChildren().get(1);
+
+ assertEquals(5, group.getChildren().size());
+
+ assertTrue(group.getChildren().get(0) instanceof HSSFPicture);
+ assertTrue(group.getChildren().get(1) instanceof HSSFPolygon);
+ assertTrue(group.getChildren().get(2) instanceof HSSFTextbox);
+ assertTrue(group.getChildren().get(3) instanceof HSSFSimpleShape);
+ assertTrue(group.getChildren().get(4) instanceof HSSFSimpleShape);
+
+ group.getShapeId();
+ }
+ }
+ }
}
@Test
void testSpgrRecord() throws IOException {
- HSSFWorkbook wb = new HSSFWorkbook();
+ try (HSSFWorkbook wb = new HSSFWorkbook()) {
- // create a sheet with a text box
- HSSFSheet sheet = wb.createSheet();
- HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
-
- HSSFShapeGroup group = patriarch.createGroup(new HSSFClientAnchor());
- assertSame(((EscherContainerRecord)group.getEscherContainer().getChild(0)).getChildById(EscherSpgrRecord.RECORD_ID), getSpgrRecord(group));
- wb.close();
+ // create a sheet with a text box
+ HSSFSheet sheet = wb.createSheet();
+ HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
+
+ HSSFShapeGroup group = patriarch.createGroup(new HSSFClientAnchor());
+ assertSame(((EscherContainerRecord) group.getEscherContainer().getChild(0)).getChildById(EscherSpgrRecord.RECORD_ID), getSpgrRecord(group));
+ }
}
private static EscherSpgrRecord getSpgrRecord(HSSFShapeGroup group) {
@@ -252,36 +246,36 @@ class TestShapeGroup {
@Test
void testClearShapes() throws IOException {
- HSSFWorkbook wb1 = new HSSFWorkbook();
- HSSFSheet sheet = wb1.createSheet();
- HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
- HSSFShapeGroup group = patriarch.createGroup(new HSSFClientAnchor());
+ try (HSSFWorkbook wb1 = new HSSFWorkbook()) {
+ HSSFSheet sheet = wb1.createSheet();
+ HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
+ HSSFShapeGroup group = patriarch.createGroup(new HSSFClientAnchor());
- group.createShape(new HSSFChildAnchor());
- group.createShape(new HSSFChildAnchor());
+ group.createShape(new HSSFChildAnchor());
+ group.createShape(new HSSFChildAnchor());
- EscherAggregate agg = HSSFTestHelper.getEscherAggregate(patriarch);
+ EscherAggregate agg = HSSFTestHelper.getEscherAggregate(patriarch);
- assertEquals(agg.getShapeToObjMapping().size(), 5);
- assertEquals(agg.getTailRecords().size(), 0);
- assertEquals(group.getChildren().size(), 2);
+ assertEquals(5, agg.getShapeToObjMapping().size());
+ assertEquals(0, agg.getTailRecords().size());
+ assertEquals(2, group.getChildren().size());
- group.clear();
+ group.clear();
- assertEquals(agg.getShapeToObjMapping().size(), 1);
- assertEquals(agg.getTailRecords().size(), 0);
- assertEquals(group.getChildren().size(), 0);
+ assertEquals(1, agg.getShapeToObjMapping().size());
+ assertEquals(0, agg.getTailRecords().size());
+ assertEquals(0, group.getChildren().size());
- HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
- wb1.close();
- sheet = wb2.getSheetAt(0);
- patriarch = sheet.getDrawingPatriarch();
+ try (HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1)) {
+ sheet = wb2.getSheetAt(0);
+ patriarch = sheet.getDrawingPatriarch();
- group = (HSSFShapeGroup) patriarch.getChildren().get(0);
+ group = (HSSFShapeGroup) patriarch.getChildren().get(0);
- assertEquals(agg.getShapeToObjMapping().size(), 1);
- assertEquals(agg.getTailRecords().size(), 0);
- assertEquals(group.getChildren().size(), 0);
- wb2.close();
+ assertEquals(1, agg.getShapeToObjMapping().size());
+ assertEquals(0, agg.getTailRecords().size());
+ assertEquals(0, group.getChildren().size());
+ }
+ }
}
}
Modified: poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestText.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestText.java?rev=1894426&r1=1894425&r2=1894426&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestText.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestText.java Wed Oct 20 22:50:35 2021
@@ -37,7 +37,7 @@ class TestText {
HSSFPatriarch patriarch = sh.createDrawingPatriarch();
HSSFTextbox textbox = patriarch.createTextbox(new HSSFClientAnchor());
- assertEquals(textbox.getEscherContainer().getChildCount(), 5);
+ assertEquals(5, textbox.getEscherContainer().getChildCount());
//sp record
byte[] expected = decompress("H4sIAAAAAAAAAFvEw/WBg4GBgZEFSHAxMAAA9gX7nhAAAAA=");
@@ -85,126 +85,123 @@ class TestText {
@Test
void testAddTextToExistingFile() throws Exception {
- HSSFWorkbook wb1 = new HSSFWorkbook();
- HSSFSheet sh = wb1.createSheet();
- HSSFPatriarch patriarch = sh.createDrawingPatriarch();
- HSSFTextbox textbox = patriarch.createTextbox(new HSSFClientAnchor());
- textbox.setString(new HSSFRichTextString("just for test"));
- HSSFTextbox textbox2 = patriarch.createTextbox(new HSSFClientAnchor());
- textbox2.setString(new HSSFRichTextString("just for test2"));
-
- assertEquals(patriarch.getChildren().size(), 2);
-
- HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
- wb1.close();
- sh = wb2.getSheetAt(0);
- patriarch = sh.getDrawingPatriarch();
-
- assertEquals(patriarch.getChildren().size(), 2);
- HSSFTextbox text3 = patriarch.createTextbox(new HSSFClientAnchor());
- text3.setString(new HSSFRichTextString("text3"));
- assertEquals(patriarch.getChildren().size(), 3);
-
- HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2);
- wb2.close();
- sh = wb3.getSheetAt(0);
- patriarch = sh.getDrawingPatriarch();
-
- assertEquals(patriarch.getChildren().size(), 3);
- assertEquals(((HSSFTextbox) patriarch.getChildren().get(0)).getString().getString(), "just for test");
- assertEquals(((HSSFTextbox) patriarch.getChildren().get(1)).getString().getString(), "just for test2");
- assertEquals(((HSSFTextbox) patriarch.getChildren().get(2)).getString().getString(), "text3");
-
- wb3.close();
+ try (HSSFWorkbook wb1 = new HSSFWorkbook()) {
+ HSSFSheet sh = wb1.createSheet();
+ HSSFPatriarch patriarch = sh.createDrawingPatriarch();
+ HSSFTextbox textbox = patriarch.createTextbox(new HSSFClientAnchor());
+ textbox.setString(new HSSFRichTextString("just for test"));
+ HSSFTextbox textbox2 = patriarch.createTextbox(new HSSFClientAnchor());
+ textbox2.setString(new HSSFRichTextString("just for test2"));
+
+ assertEquals(2, patriarch.getChildren().size());
+
+ try (HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1)) {
+ sh = wb2.getSheetAt(0);
+ patriarch = sh.getDrawingPatriarch();
+
+ assertEquals(2, patriarch.getChildren().size());
+ HSSFTextbox text3 = patriarch.createTextbox(new HSSFClientAnchor());
+ text3.setString(new HSSFRichTextString("text3"));
+ assertEquals(3, patriarch.getChildren().size());
+
+ try (HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2)) {
+ sh = wb3.getSheetAt(0);
+ patriarch = sh.getDrawingPatriarch();
+
+ assertEquals(3, patriarch.getChildren().size());
+ assertEquals("just for test", ((HSSFTextbox) patriarch.getChildren().get(0)).getString().getString());
+ assertEquals("just for test2", ((HSSFTextbox) patriarch.getChildren().get(1)).getString().getString());
+ assertEquals("text3", ((HSSFTextbox) patriarch.getChildren().get(2)).getString().getString());
+ }
+ }
+ }
}
@Test
void testSetGetProperties() throws Exception {
- HSSFWorkbook wb1 = new HSSFWorkbook();
- HSSFSheet sh = wb1.createSheet();
- HSSFPatriarch patriarch = sh.createDrawingPatriarch();
- HSSFTextbox textbox = patriarch.createTextbox(new HSSFClientAnchor());
- textbox.setString(new HSSFRichTextString("test"));
- assertEquals(textbox.getString().getString(), "test");
-
- textbox.setHorizontalAlignment((short) 5);
- assertEquals(textbox.getHorizontalAlignment(), 5);
-
- textbox.setVerticalAlignment((short) 6);
- assertEquals(textbox.getVerticalAlignment(), (short) 6);
-
- textbox.setMarginBottom(7);
- assertEquals(textbox.getMarginBottom(), 7);
-
- textbox.setMarginLeft(8);
- assertEquals(textbox.getMarginLeft(), 8);
-
- textbox.setMarginRight(9);
- assertEquals(textbox.getMarginRight(), 9);
-
- textbox.setMarginTop(10);
- assertEquals(textbox.getMarginTop(), 10);
-
- HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
- wb1.close();
- sh = wb2.getSheetAt(0);
- patriarch = sh.getDrawingPatriarch();
- textbox = (HSSFTextbox) patriarch.getChildren().get(0);
- assertEquals(textbox.getString().getString(), "test");
- assertEquals(textbox.getHorizontalAlignment(), 5);
- assertEquals(textbox.getVerticalAlignment(), (short) 6);
- assertEquals(textbox.getMarginBottom(), 7);
- assertEquals(textbox.getMarginLeft(), 8);
- assertEquals(textbox.getMarginRight(), 9);
- assertEquals(textbox.getMarginTop(), 10);
-
- textbox.setString(new HSSFRichTextString("test1"));
- textbox.setHorizontalAlignment(HSSFTextbox.HORIZONTAL_ALIGNMENT_CENTERED);
- textbox.setVerticalAlignment(HSSFTextbox.VERTICAL_ALIGNMENT_TOP);
- textbox.setMarginBottom(71);
- textbox.setMarginLeft(81);
- textbox.setMarginRight(91);
- textbox.setMarginTop(101);
-
- assertEquals(textbox.getString().getString(), "test1");
- assertEquals(textbox.getHorizontalAlignment(), HSSFTextbox.HORIZONTAL_ALIGNMENT_CENTERED);
- assertEquals(textbox.getVerticalAlignment(), HSSFTextbox.VERTICAL_ALIGNMENT_TOP);
- assertEquals(textbox.getMarginBottom(), 71);
- assertEquals(textbox.getMarginLeft(), 81);
- assertEquals(textbox.getMarginRight(), 91);
- assertEquals(textbox.getMarginTop(), 101);
-
- HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2);
- wb2.close();
- sh = wb3.getSheetAt(0);
- patriarch = sh.getDrawingPatriarch();
- textbox = (HSSFTextbox) patriarch.getChildren().get(0);
-
- assertEquals(textbox.getString().getString(), "test1");
- assertEquals(textbox.getHorizontalAlignment(), HSSFTextbox.HORIZONTAL_ALIGNMENT_CENTERED);
- assertEquals(textbox.getVerticalAlignment(), HSSFTextbox.VERTICAL_ALIGNMENT_TOP);
- assertEquals(textbox.getMarginBottom(), 71);
- assertEquals(textbox.getMarginLeft(), 81);
- assertEquals(textbox.getMarginRight(), 91);
- assertEquals(textbox.getMarginTop(), 101);
-
- wb3.close();
+ try (HSSFWorkbook wb1 = new HSSFWorkbook()) {
+ HSSFSheet sh = wb1.createSheet();
+ HSSFPatriarch patriarch = sh.createDrawingPatriarch();
+ HSSFTextbox textbox = patriarch.createTextbox(new HSSFClientAnchor());
+ textbox.setString(new HSSFRichTextString("test"));
+ assertEquals("test", textbox.getString().getString());
+
+ textbox.setHorizontalAlignment((short) 5);
+ assertEquals(5, textbox.getHorizontalAlignment());
+
+ textbox.setVerticalAlignment((short) 6);
+ assertEquals((short) 6, textbox.getVerticalAlignment());
+
+ textbox.setMarginBottom(7);
+ assertEquals(7, textbox.getMarginBottom());
+
+ textbox.setMarginLeft(8);
+ assertEquals(8, textbox.getMarginLeft());
+
+ textbox.setMarginRight(9);
+ assertEquals(9, textbox.getMarginRight());
+
+ textbox.setMarginTop(10);
+ assertEquals(10, textbox.getMarginTop());
+
+ try (HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1)) {
+ sh = wb2.getSheetAt(0);
+ patriarch = sh.getDrawingPatriarch();
+ textbox = (HSSFTextbox) patriarch.getChildren().get(0);
+ assertEquals("test", textbox.getString().getString());
+ assertEquals(5, textbox.getHorizontalAlignment());
+ assertEquals((short) 6, textbox.getVerticalAlignment());
+ assertEquals(7, textbox.getMarginBottom());
+ assertEquals(8, textbox.getMarginLeft());
+ assertEquals(9, textbox.getMarginRight());
+ assertEquals(10, textbox.getMarginTop());
+
+ textbox.setString(new HSSFRichTextString("test1"));
+ textbox.setHorizontalAlignment(HSSFTextbox.HORIZONTAL_ALIGNMENT_CENTERED);
+ textbox.setVerticalAlignment(HSSFTextbox.VERTICAL_ALIGNMENT_TOP);
+ textbox.setMarginBottom(71);
+ textbox.setMarginLeft(81);
+ textbox.setMarginRight(91);
+ textbox.setMarginTop(101);
+
+ assertEquals("test1", textbox.getString().getString());
+ assertEquals(HSSFTextbox.HORIZONTAL_ALIGNMENT_CENTERED, textbox.getHorizontalAlignment());
+ assertEquals(HSSFTextbox.VERTICAL_ALIGNMENT_TOP, textbox.getVerticalAlignment());
+ assertEquals(71, textbox.getMarginBottom());
+ assertEquals(81, textbox.getMarginLeft());
+ assertEquals(91, textbox.getMarginRight());
+ assertEquals(101, textbox.getMarginTop());
+
+ try (HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2)) {
+ sh = wb3.getSheetAt(0);
+ patriarch = sh.getDrawingPatriarch();
+ textbox = (HSSFTextbox) patriarch.getChildren().get(0);
+
+ assertEquals("test1", textbox.getString().getString());
+ assertEquals(HSSFTextbox.HORIZONTAL_ALIGNMENT_CENTERED, textbox.getHorizontalAlignment());
+ assertEquals(HSSFTextbox.VERTICAL_ALIGNMENT_TOP, textbox.getVerticalAlignment());
+ assertEquals(71, textbox.getMarginBottom());
+ assertEquals(81, textbox.getMarginLeft());
+ assertEquals(91, textbox.getMarginRight());
+ assertEquals(101, textbox.getMarginTop());
+ }
+ }
+ }
}
@Test
void testExistingFileWithText() throws Exception {
- HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("drawings.xls");
- HSSFSheet sheet = wb.getSheet("text");
- HSSFPatriarch drawing = sheet.getDrawingPatriarch();
- assertEquals(1, drawing.getChildren().size());
- HSSFTextbox textbox = (HSSFTextbox) drawing.getChildren().get(0);
- assertEquals(textbox.getHorizontalAlignment(), HSSFTextbox.HORIZONTAL_ALIGNMENT_LEFT);
- assertEquals(textbox.getVerticalAlignment(), HSSFTextbox.VERTICAL_ALIGNMENT_TOP);
- assertEquals(textbox.getMarginTop(), 0);
- assertEquals(textbox.getMarginBottom(), 3600000);
- assertEquals(textbox.getMarginLeft(), 3600000);
- assertEquals(textbox.getMarginRight(), 0);
- assertEquals(textbox.getString().getString(), "teeeeesssstttt");
- wb.close();
+ try (HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("drawings.xls")) {
+ HSSFSheet sheet = wb.getSheet("text");
+ HSSFPatriarch drawing = sheet.getDrawingPatriarch();
+ assertEquals(1, drawing.getChildren().size());
+ HSSFTextbox textbox = (HSSFTextbox) drawing.getChildren().get(0);
+ assertEquals(HSSFTextbox.VERTICAL_ALIGNMENT_TOP, textbox.getVerticalAlignment());
+ assertEquals(0, textbox.getMarginTop());
+ assertEquals(3600000, textbox.getMarginBottom());
+ assertEquals(3600000, textbox.getMarginLeft());
+ assertEquals(0, textbox.getMarginRight());
+ assertEquals("teeeeesssstttt", textbox.getString().getString());
+ }
}
}
Modified: poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java?rev=1894426&r1=1894425&r2=1894426&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java Wed Oct 20 22:50:35 2021
@@ -44,7 +44,7 @@ final class TestUnicodeWorkbook {
c.setCellValue(new HSSFRichTextString("\u00e4"));
//Confirm that the sring will be compressed
- assertEquals(c.getRichStringCellValue().getUnicodeString().getOptionFlags(), 0);
+ assertEquals(0, c.getRichStringCellValue().getUnicodeString().getOptionFlags());
try (HSSFWorkbook wb = HSSFTestDataSamples.writeOutAndReadBack(wb1)) {
@@ -53,7 +53,7 @@ final class TestUnicodeWorkbook {
assertNotNull(s);
c = r.getCell(1);
- assertEquals(c.getRichStringCellValue().getString(), "\u00e4");
+ assertEquals("\u00e4", c.getRichStringCellValue().getString());
}
}
}
Modified: poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestWorkbook.java?rev=1894426&r1=1894425&r2=1894426&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestWorkbook.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestWorkbook.java Wed Oct 20 22:50:35 2021
@@ -20,6 +20,7 @@ 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.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -66,7 +67,7 @@ final class TestWorkbook {
* SUCCESS: HSSF creates a sheet. Filesize matches a known good. HSSFSheet objects
* Last row, first row is tested against the correct values (99,0).<P>
* FAILURE: HSSF does not create a sheet or excepts. Filesize does not match the known good.
- * HSSFSheet last row or first row is incorrect. <P>
+ * HSSFSheet last row or first row is incorrect.
*/
@Test
void testWriteSheetSimple() throws IOException {
@@ -95,7 +96,7 @@ final class TestWorkbook {
* SUCCESS: HSSF creates a sheet. Filesize matches a known good. HSSFSheet objects
* Last row, first row is tested against the correct values (74,25).<P>
* FAILURE: HSSF does not create a sheet or excepts. Filesize does not match the known good.
- * HSSFSheet last row or first row is incorrect. <P>
+ * HSSFSheet last row or first row is incorrect.
*/
@Test
void testWriteModifySheetSimple() throws IOException {
@@ -133,7 +134,7 @@ final class TestWorkbook {
* OBJECTIVE: Test that HSSF can read a simple spreadsheet (Simple.xls).<P>
* SUCCESS: HSSF reads the sheet. Matches values in their particular positions.<P>
* FAILURE: HSSF does not read a sheet or excepts. HSSF cannot identify values
- * in the sheet in their known positions.<P>
+ * in the sheet in their known positions.
*/
@Test
void testReadSimple() throws IOException {
@@ -150,7 +151,7 @@ final class TestWorkbook {
* OBJECTIVE: Test that HSSF can read a simple spreadsheet (SimpleWithDataFormat.xls).<P>
* SUCCESS: HSSF reads the sheet. Matches values in their particular positions and format is correct<P>
* FAILURE: HSSF does not read a sheet or excepts. HSSF cannot identify values
- * in the sheet in their known positions.<P>
+ * in the sheet in their known positions.
*/
@Test
void testReadSimpleWithDataFormat() throws IOException {
@@ -161,7 +162,7 @@ final class TestWorkbook {
assertEquals(1.25,cell.getNumericCellValue(), 1e-10);
- assertEquals(format.getFormat(cell.getCellStyle().getDataFormat()), "0.0");
+ assertEquals("0.0", format.getFormat(cell.getCellStyle().getDataFormat()));
wb.close();
}
@@ -171,7 +172,7 @@ final class TestWorkbook {
* OBJECTIVE: Test that HSSF can write a sheet with custom data formats and then read it and get the proper formats.<P>
* SUCCESS: HSSF reads the sheet. Matches values in their particular positions and format is correct<P>
* FAILURE: HSSF does not read a sheet or excepts. HSSF cannot identify values
- * in the sheet in their known positions.<P>
+ * in the sheet in their known positions.
*/
@Test
void testWriteDataFormat() throws IOException {
@@ -196,9 +197,9 @@ final class TestWorkbook {
assertEquals(1.25, c2.getNumericCellValue(), 1e-10);
- assertEquals(format.getFormat(df), "0.0");
+ assertEquals("0.0", format.getFormat(df));
- assertEquals(format, wb2.createDataFormat());
+ assertSame(format, wb2.createDataFormat());
wb2.close();
wb1.close();
@@ -209,7 +210,7 @@ final class TestWorkbook {
* OBJECTIVE: Test that HSSF can read a simple spreadsheet (Employee.xls).<P>
* SUCCESS: HSSF reads the sheet. Matches values in their particular positions.<P>
* FAILURE: HSSF does not read a sheet or excepts. HSSF cannot identify values
- * in the sheet in their known positions.<P>
+ * in the sheet in their known positions.
*
*/
@Test
@@ -234,7 +235,7 @@ final class TestWorkbook {
* has been properly replaced. <P>
* FAILURE: HSSF does not read a sheet or excepts. HSSF does not write the sheet or excepts.
* HSSF does not re-read the sheet or excepts. Upon re-reading the sheet the value
- * is incorrect or has not been replaced. <P>
+ * is incorrect or has not been replaced.
*/
@Test
void testModifySimple() throws IOException {
@@ -263,7 +264,7 @@ final class TestWorkbook {
* FAILURE: HSSF does not read a sheet or excepts. HSSF does not write the sheet or excepts.
* HSSF does not re-read the sheet or excepts. Upon re-reading the sheet the value
* is incorrect or has not been replaced or the incorrect cell has its value replaced
- * or is incorrect. <P>
+ * or is incorrect.
*/
@Test
void testModifySimpleWithSkip() throws IOException {
@@ -301,7 +302,7 @@ final class TestWorkbook {
* has been properly replaced. <P>
* FAILURE: HSSF does not read a sheet or excepts. HSSF does not write the sheet or excepts.
* HSSF does not re-read the sheet or excepts. Upon re-reading the sheet the value
- * is incorrect or has not been replaced. <P>
+ * is incorrect or has not been replaced.
*/
@Test
void testModifySimpleWithStyling() throws IOException {
@@ -334,7 +335,7 @@ final class TestWorkbook {
* has been properly replaced. <P>
* FAILURE: HSSF does not read a sheet or excepts. HSSF does not write the sheet or excepts.
* HSSF does not re-read the sheet or excepts. Upon re-reading the sheet the value
- * is incorrect or has not been replaced. <P>
+ * is incorrect or has not been replaced.
*/
@Test
void testModifyEmployee() throws IOException {
@@ -364,7 +365,7 @@ final class TestWorkbook {
* OBJECTIVE: Test that HSSF can read a simple spreadsheet with and RKRecord and correctly
* identify the cell as numeric and convert it to a NumberRecord. <P>
* SUCCESS: HSSF reads a sheet. HSSF returns that the cell is a numeric type cell. <P>
- * FAILURE: HSSF does not read a sheet or excepts. HSSF incorrectly identifies the cell<P>
+ * FAILURE: HSSF does not read a sheet or excepts. HSSF incorrectly identifies the cell
*/
@Test
void testReadSheetWithRK() throws IOException {
@@ -384,7 +385,7 @@ final class TestWorkbook {
* SUCCESS: HSSF creates a sheet. Filesize matches a known good. HSSFSheet objects
* Last row, first row is tested against the correct values (74,25).<P>
* FAILURE: HSSF does not create a sheet or excepts. Filesize does not match the known good.
- * HSSFSheet last row or first row is incorrect. <P>
+ * HSSFSheet last row or first row is incorrect.
*/
@Test
void testWriteModifySheetMerged() throws IOException {
Modified: poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java?rev=1894426&r1=1894425&r2=1894426&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java Wed Oct 20 22:50:35 2021
@@ -19,8 +19,8 @@
package org.apache.poi.poifs.filesystem;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
import java.util.Arrays;
@@ -43,15 +43,7 @@ final class TestDocumentOutputStream {
POIFSWriterListener l = (event) -> {
DocumentOutputStream dstream = event.getStream();
-
- try {
- for (byte b : expected) {
- dstream.write(b);
- }
- } catch (IOException ignored) {
- fail("stream exhausted too early");
- }
-
+ assertDoesNotThrow(() -> { for (byte b : expected) dstream.write(b); }, "stream exhausted too early");
assertThrows(IOException.class, () -> dstream.write(0));
};
@@ -67,13 +59,7 @@ final class TestDocumentOutputStream {
POIFSWriterListener l = (event) -> {
DocumentOutputStream dstream = event.getStream();
-
- try {
- dstream.write(expected);
- } catch (IOException ignored) {
- fail("stream exhausted too early");
- }
-
+ assertDoesNotThrow(() -> dstream.write(expected), "stream exhausted too early");
assertThrows(IOException.class, () -> dstream.write(new byte[]{'7','7','7','7'}));
};
@@ -90,11 +76,7 @@ final class TestDocumentOutputStream {
POIFSWriterListener l = (event) -> {
DocumentOutputStream dstream = event.getStream();
- try {
- dstream.write(input, 1, 25);
- } catch (IOException ignored) {
- fail("stream exhausted too early");
- }
+ assertDoesNotThrow(() -> dstream.write(input, 1, 25), "stream exhausted too early");
assertThrows(IOException.class, () -> dstream.write(input, 0, 1));
};
Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/TestWorkbookEvaluator.java?rev=1894426&r1=1894425&r2=1894426&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/TestWorkbookEvaluator.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/TestWorkbookEvaluator.java Wed Oct 20 22:50:35 2021
@@ -633,12 +633,12 @@ class TestWorkbookEvaluator {
wb.getCreationHelper().createFormulaEvaluator().evaluateAll();
- assertEquals(cellA2.getStringCellValue(), "1");
- assertEquals(cellB2.getNumericCellValue(),0, 0.00001);
- assertEquals(cellC2.getStringCellValue(),"3");
+ assertEquals("1", cellA2.getStringCellValue());
+ assertEquals(0,cellB2.getNumericCellValue(), 0.00001);
+ assertEquals("3",cellC2.getStringCellValue());
- assertEquals(cellA3.getStringCellValue(), "1");
- assertEquals(cellB3.getNumericCellValue(),0, 0.00001);
- assertEquals(cellC3.getStringCellValue(),"3");
+ assertEquals("1", cellA3.getStringCellValue());
+ assertEquals(0,cellB3.getNumericCellValue(), 0.00001);
+ assertEquals("3",cellC3.getStringCellValue());
}
}
Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java?rev=1894426&r1=1894425&r2=1894426&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java Wed Oct 20 22:50:35 2021
@@ -66,7 +66,7 @@ public abstract class BaseTestCircularRe
* Makes sure that the specified evaluated cell value represents a circular reference error.
*/
private static void confirmCycleErrorCode(CellValue cellValue) {
- assertSame(cellValue.getCellType(), CellType.ERROR);
+ assertSame(CellType.ERROR, cellValue.getCellType());
assertEquals(ErrorEval.CIRCULAR_REF_ERROR.getErrorCode(), cellValue.getErrorValue());
}
@@ -96,7 +96,7 @@ public abstract class BaseTestCircularRe
CellValue cellValue = evaluateWithCycles(wb, testCell);
assertNotNull(cellValue);
- assertSame(cellValue.getCellType(), CellType.NUMERIC);
+ assertSame(CellType.NUMERIC, cellValue.getCellType());
assertEquals(2, cellValue.getNumberValue(), 0);
}
}
Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/eval/TestFormulaBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/eval/TestFormulaBugs.java?rev=1894426&r1=1894425&r2=1894426&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/eval/TestFormulaBugs.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/eval/TestFormulaBugs.java Wed Oct 20 22:50:35 2021
@@ -17,9 +17,9 @@
package org.apache.poi.ss.formula.eval;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
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 java.io.InputStream;
@@ -98,17 +98,6 @@ final class TestFormulaBugs {
cell = row.createCell(3); // D5
cell.setCellFormula("IF(ISNUMBER(b1),b1,b2)");
-// if (false) { // set true to check excel file manually
-// // bug report mentions 'Editing the formula in excel "fixes" the problem.'
-// try {
-// FileOutputStream fileOut = new FileOutputStream("27405output.xls");
-// wb.write(fileOut);
-// fileOut.close();
-// } catch (IOException e) {
-// throw new RuntimeException(e);
-// }
-// }
-
// use POI's evaluator as an extra sanity check
FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
CellValue cv;
@@ -124,7 +113,7 @@ final class TestFormulaBugs {
}
/**
- * Bug 42448 - Can't parse SUMPRODUCT(A!C7:A!C67, B8:B68) / B69 <p>
+ * Bug 42448 - Can't parse SUMPRODUCT(A!C7:A!C67, B8:B68) / B69
*/
@Test
void test42448() throws IOException {
@@ -142,11 +131,7 @@ final class TestFormulaBugs {
// re-entered
String inputFormula = "SUMPRODUCT(A!C7:A!C67, B8:B68) / B69"; // as per bug report
- try {
- cell.setCellFormula(inputFormula);
- } catch (StringIndexOutOfBoundsException e) {
- fail("Identified bug 42448");
- }
+ assertDoesNotThrow(() -> cell.setCellFormula(inputFormula), "Identified bug 42448");
assertEquals("SUMPRODUCT(A!C7:A!C67,B8:B68)/B69", cell.getCellFormula());
Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTFunc.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTFunc.java?rev=1894426&r1=1894425&r2=1894426&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTFunc.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTFunc.java Wed Oct 20 22:50:35 2021
@@ -117,7 +117,7 @@ final class TestTFunc {
confirmString(eval, "");
eval = invokeTWithReference(ErrorEval.NAME_INVALID);
- assertSame(eval, ErrorEval.NAME_INVALID);
+ assertSame(ErrorEval.NAME_INVALID, eval);
}
@Test
Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunc.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunc.java?rev=1894426&r1=1894425&r2=1894426&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunc.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunc.java Wed Oct 20 22:50:35 2021
@@ -17,17 +17,21 @@
package org.apache.poi.ss.formula.functions;
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.*;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.util.StringUtil;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.time.LocalDate;
import java.time.LocalDateTime;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.apache.poi.ss.formula.OperationEvaluationContext;
+import org.apache.poi.ss.formula.eval.BlankEval;
+import org.apache.poi.ss.formula.eval.ErrorEval;
+import org.apache.poi.ss.formula.eval.NumberEval;
+import org.apache.poi.ss.formula.eval.StringEval;
+import org.apache.poi.ss.formula.eval.ValueEval;
+import org.apache.poi.ss.usermodel.DateUtil;
+import org.apache.poi.util.StringUtil;
+import org.junit.jupiter.api.Test;
/**
* Tests WEEKNUM(date[, return_type]) excel function
@@ -91,21 +95,15 @@ class TestWeekNumFunc {
String formula = "WEEKNUM(" + dateValue + ")";
ValueEval[] args = new ValueEval[] { new NumberEval(dateValue) };
ValueEval result = WeekNum.instance.evaluate(args, DEFAULT_CONTEXT);
- if (result instanceof NumberEval) {
- assertEquals(expected, ((NumberEval)result).getNumberValue(), TOLERANCE, formula);
- } else {
- fail("unexpected eval result " + result);
- }
+ assertTrue(result instanceof NumberEval);
+ assertEquals(expected, ((NumberEval)result).getNumberValue(), TOLERANCE, formula);
}
private void assertEvaluateEquals(double expected, double dateValue, double return_type) {
String formula = "WEEKNUM(" + dateValue + ", " + return_type + ")";
ValueEval[] args = new ValueEval[] { new NumberEval(dateValue), new NumberEval(return_type) };
ValueEval result = WeekNum.instance.evaluate(args, DEFAULT_CONTEXT);
- if (result instanceof NumberEval) {
- assertEquals(expected, ((NumberEval)result).getNumberValue(), TOLERANCE, formula);
- } else {
- fail("unexpected eval result " + result);
- }
+ assertTrue(result instanceof NumberEval);
+ assertEquals(expected, ((NumberEval)result).getNumberValue(), TOLERANCE, formula);
}
}
Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestArrayPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestArrayPtg.java?rev=1894426&r1=1894425&r2=1894426&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestArrayPtg.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestArrayPtg.java Wed Oct 20 22:50:35 2021
@@ -17,11 +17,13 @@
package org.apache.poi.ss.formula.ptg;
+import static org.apache.poi.hssf.HSSFTestDataSamples.openSampleWorkbook;
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.HSSFTestDataSamples;
+import java.io.IOException;
+
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.util.LittleEndianByteArrayOutputStream;
@@ -101,14 +103,15 @@ final class TestArrayPtg {
* A spreadsheet was added to make the ordering clearer.
*/
@Test
- void testElementOrderingInSpreadsheet() {
- HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("ex42564-elementOrder.xls");
-
- // The formula has an array with 3 rows and 5 columns
- String formula = wb.getSheetAt(0).getRow(0).getCell(0).getCellFormula();
-
- assertNotEquals("Identified bug 42564 b", "SUM({1,6,11;2,7,12;3,8,13;4,9,14;5,10,15})", formula);
- assertEquals("SUM({1,2,3,4,5;6,7,8,9,10;11,12,13,14,15})", formula);
+ void testElementOrderingInSpreadsheet() throws IOException {
+ String formula;
+ try (HSSFWorkbook wb = openSampleWorkbook("ex42564-elementOrder.xls")) {
+
+ // The formula has an array with 3 rows and 5 columns
+ formula = wb.getSheetAt(0).getRow(0).getCell(0).getCellFormula();
+ assertNotEquals("SUM({1,6,11;2,7,12;3,8,13;4,9,14;5,10,15})", formula, "Identified bug 42564 b");
+ assertEquals("SUM({1,2,3,4,5;6,7,8,9,10;11,12,13,14,15})", formula);
+ }
}
@Test
Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java?rev=1894426&r1=1894425&r2=1894426&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java Wed Oct 20 22:50:35 2021
@@ -1539,13 +1539,13 @@ public abstract class BaseTestBugzillaIs
// Verify that the changes were made
assertNull(wb.getPrintArea(0), "Sheet0 before write");
- assertEquals(wb.getPrintArea(1), "Sheet1 before write", "Sheet1!$A$1:$A$1");
+ assertEquals("Sheet1!$A$1:$A$1", wb.getPrintArea(1), "Sheet1 before write");
// Verify that the changes are non-volatile
try (Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb)) {
// CURRENTLY FAILS with "Sheet0!$A$1:$C$6"
assertNull(wb2.getPrintArea(0), "Sheet0 after write");
- assertEquals(wb2.getPrintArea(1), "Sheet1 after write", "Sheet1!$A$1:$A$1");
+ assertEquals("Sheet1!$A$1:$A$1", wb2.getPrintArea(1), "Sheet1 after write");
}
}
}
Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheet.java?rev=1894426&r1=1894425&r2=1894426&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheet.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheet.java Wed Oct 20 22:50:35 2021
@@ -184,7 +184,7 @@ public abstract class BaseTestSheet {
Row clonedRow = clonedSheet.getRow(0);
//Check for a good clone
- assertEquals(clonedRow.getCell(0).getRichStringCellValue().getString(), "clone_test");
+ assertEquals("clone_test", clonedRow.getCell(0).getRichStringCellValue().getString());
//Check that the cells are not somehow linked
cell.setCellValue(factory.createRichTextString("Difference Check"));
@@ -195,8 +195,8 @@ public abstract class BaseTestSheet {
assertNotEquals("COS(2)", clonedRow.getCell(1).getCellFormula(), "formula cell not properly cloned");
- assertEquals(clonedRow.getCell(0).getRichStringCellValue().getString(), "clone_test");
- assertEquals(clonedRow.getCell(1).getCellFormula(), "SIN(1)");
+ assertEquals("clone_test", clonedRow.getCell(0).getRichStringCellValue().getString());
+ assertEquals("SIN(1)", clonedRow.getCell(1).getCellFormula());
}
}
@@ -641,9 +641,9 @@ public abstract class BaseTestSheet {
Sheet s1 = wb.cloneSheet(0);
r = s1.getRow(0);
// sanity check
- assertEquals(r.getCell(0).getNumericCellValue(), 1, 0, "double");
+ assertEquals(1, r.getCell(0).getNumericCellValue(), 0, "double");
assertNotNull(r.getCell(1));
- assertEquals(r.getCell(1).getCellFormula(), "A1*2", "formula");
+ assertEquals("A1*2", r.getCell(1).getCellFormula(), "formula");
}
}
Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java?rev=1894426&r1=1894425&r2=1894426&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java Wed Oct 20 22:50:35 2021
@@ -70,11 +70,11 @@ public abstract class BaseTestSheetShift
// row (in original file each row was unique)
s = wb2.getSheetAt(0);
- assertEquals(s.getRow(0).getPhysicalNumberOfCells(), 1);
+ assertEquals(1, s.getRow(0).getPhysicalNumberOfCells());
confirmEmptyRow(s, 1);
- assertEquals(s.getRow(2).getPhysicalNumberOfCells(), 2);
- assertEquals(s.getRow(3).getPhysicalNumberOfCells(), 4);
- assertEquals(s.getRow(4).getPhysicalNumberOfCells(), 5);
+ assertEquals(2, s.getRow(2).getPhysicalNumberOfCells());
+ assertEquals(4, s.getRow(3).getPhysicalNumberOfCells());
+ assertEquals(5, s.getRow(4).getPhysicalNumberOfCells());
// Shift rows 1-3 down 3 in the current one. This tests when
// 1 row is blank. Write to a another temp file
@@ -85,9 +85,9 @@ public abstract class BaseTestSheetShift
confirmEmptyRow(s, 0);
confirmEmptyRow(s, 1);
confirmEmptyRow(s, 2);
- assertEquals(s.getRow(3).getPhysicalNumberOfCells(), 1);
+ assertEquals(1, s.getRow(3).getPhysicalNumberOfCells());
confirmEmptyRow(s, 4);
- assertEquals(s.getRow(5).getPhysicalNumberOfCells(), 2);
+ assertEquals(2, s.getRow(5).getPhysicalNumberOfCells());
}
}
}
@@ -100,11 +100,11 @@ public abstract class BaseTestSheetShift
s.shiftRows(2, 3, -2);
try (Workbook wb5 = _testDataProvider.writeOutAndReadBack(wb4)) {
s = wb5.getSheetAt(0);
- assertEquals(s.getRow(0).getPhysicalNumberOfCells(), 3);
- assertEquals(s.getRow(1).getPhysicalNumberOfCells(), 4);
+ assertEquals(3, s.getRow(0).getPhysicalNumberOfCells());
+ assertEquals(4, s.getRow(1).getPhysicalNumberOfCells());
confirmEmptyRow(s, 2);
confirmEmptyRow(s, 3);
- assertEquals(s.getRow(4).getPhysicalNumberOfCells(), 5);
+ assertEquals(5, s.getRow(4).getPhysicalNumberOfCells());
}
}
}
@@ -157,11 +157,11 @@ public abstract class BaseTestSheetShift
assertNotNull(sheet.getCellComment(new CellAddress(3, 0)));
String comment1 = sheet.getCellComment(new CellAddress(0, 0)).getString().getString();
- assertEquals(comment1, "comment top row1 (index0)\n");
+ assertEquals("comment top row1 (index0)\n", comment1);
String comment3 = sheet.getCellComment(new CellAddress(2, 0)).getString().getString();
- assertEquals(comment3, "comment top row3 (index2)\n");
+ assertEquals("comment top row3 (index2)\n", comment3);
String comment4 = sheet.getCellComment(new CellAddress(3, 0)).getString().getString();
- assertEquals(comment4, "comment top row4 (index3)\n");
+ assertEquals("comment top row4 (index3)\n", comment4);
//Workbook wbBack = _testDataProvider.writeOutAndReadBack(wb);
@@ -220,9 +220,9 @@ public abstract class BaseTestSheetShift
}
comment1 = sheet.getCellComment(new CellAddress(1, 0)).getString().getString();
- assertEquals(comment1, "comment top row3 (index2)\n");
+ assertEquals("comment top row3 (index2)\n", comment1);
String comment2 = sheet.getCellComment(new CellAddress(2, 0)).getString().getString();
- assertEquals(comment2, "comment top row4 (index3)\n");
+ assertEquals("comment top row4 (index3)\n", comment2);
}
}
}
Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java?rev=1894426&r1=1894425&r2=1894426&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java Wed Oct 20 22:50:35 2021
@@ -571,15 +571,15 @@ public abstract class BaseTestWorkbook {
//Test the header
h = s.getHeader();
- assertEquals(h.getCenter(), "\u20ac");
- assertEquals(h.getLeft(), "\u20ac");
- assertEquals(h.getRight(), "\u20ac");
+ assertEquals("\u20ac", h.getCenter());
+ assertEquals("\u20ac", h.getLeft());
+ assertEquals("\u20ac", h.getRight());
//Test the footer
f = s.getFooter();
- assertEquals(f.getCenter(), "\u20ac");
- assertEquals(f.getLeft(), "\u20ac");
- assertEquals(f.getRight(), "\u20ac");
+ assertEquals("\u20ac", f.getCenter());
+ assertEquals("\u20ac", f.getLeft());
+ assertEquals("\u20ac", f.getRight());
//Test the dataformat
r = s.getRow(0);
@@ -590,7 +590,7 @@ public abstract class BaseTestWorkbook {
//Test the cell string value
/*c2 =*/
r.getCell(2);
- assertEquals(c.getRichStringCellValue().getString(), "\u20ac");
+ assertEquals("\u20ac", c.getRichStringCellValue().getString());
//Test the cell formula
c3 = r.getCell(3);
@@ -782,8 +782,8 @@ public abstract class BaseTestWorkbook {
@Test
void windowOneDefaults() throws IOException {
try (Workbook b = _testDataProvider.createWorkbook()) {
- assertEquals(b.getActiveSheetIndex(), 0);
- assertEquals(b.getFirstVisibleTab(), 0);
+ assertEquals(0, b.getActiveSheetIndex());
+ assertEquals(0, b.getFirstVisibleTab());
// throws NullPointerException when WindowOneRecord in Workbook is not probably initialized
}
}
Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestSheetBuilder.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestSheetBuilder.java?rev=1894426&r1=1894425&r2=1894426&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestSheetBuilder.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestSheetBuilder.java Wed Oct 20 22:50:35 2021
@@ -39,7 +39,7 @@ import org.junit.jupiter.api.Test;
*/
final class TestSheetBuilder {
- private static Object[][] testData = new Object[][]{
+ private static final Object[][] testData = {
{1, 2, 3},
{new Date(), null, null},
{"one", "two", "=A1+B2"}
@@ -50,12 +50,12 @@ final class TestSheetBuilder {
try (Workbook wb = new HSSFWorkbook()) {
Sheet sheet = new SheetBuilder(wb, testData).build();
- assertEquals(sheet.getPhysicalNumberOfRows(), 3);
+ assertEquals(3, sheet.getPhysicalNumberOfRows());
Row firstRow = sheet.getRow(0);
Cell firstCell = firstRow.getCell(0);
- assertEquals(firstCell.getCellType(), CellType.NUMERIC);
+ assertEquals(CellType.NUMERIC, firstCell.getCellType());
assertEquals(1.0, firstCell.getNumericCellValue(), 0.00001);
Modified: poi/trunk/poi/src/test/java/org/apache/poi/util/TestBitField.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/util/TestBitField.java?rev=1894426&r1=1894425&r2=1894426&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/util/TestBitField.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/util/TestBitField.java Wed Oct 20 22:50:35 2021
@@ -27,41 +27,39 @@ import org.junit.jupiter.api.Test;
* Class to test BitField functionality
*/
final class TestBitField {
- private static BitField bf_multi = BitFieldFactory.getInstance(0x3F80);
- private static BitField bf_single = BitFieldFactory.getInstance(0x4000);
+ private static final BitField bf_multi = BitFieldFactory.getInstance(0x3F80);
+ private static final BitField bf_single = BitFieldFactory.getInstance(0x4000);
@Test
void testGetValue() {
- assertEquals(bf_multi.getValue(-1), 127);
- assertEquals(bf_multi.getValue(0), 0);
- assertEquals(bf_single.getValue(-1), 1);
- assertEquals(bf_single.getValue(0), 0);
+ assertEquals(127, bf_multi.getValue(-1));
+ assertEquals(0, bf_multi.getValue(0));
+ assertEquals(1, bf_single.getValue(-1));
+ assertEquals(0, bf_single.getValue(0));
}
@Test
void testGetShortValue() {
- assertEquals(bf_multi.getShortValue(( short ) -1), ( short ) 127);
- assertEquals(bf_multi.getShortValue(( short ) 0), ( short ) 0);
- assertEquals(bf_single.getShortValue(( short ) -1), ( short ) 1);
- assertEquals(bf_single.getShortValue(( short ) 0), ( short ) 0);
+ assertEquals(( short ) 127, bf_multi.getShortValue(( short ) -1));
+ assertEquals(( short ) 0, bf_multi.getShortValue(( short ) 0));
+ assertEquals(( short ) 1, bf_single.getShortValue(( short ) -1));
+ assertEquals(( short ) 0, bf_single.getShortValue(( short ) 0));
}
@Test
void testGetRawValue() {
- assertEquals(bf_multi.getRawValue(-1), 0x3F80);
- assertEquals(bf_multi.getRawValue(0), 0);
- assertEquals(bf_single.getRawValue(-1), 0x4000);
- assertEquals(bf_single.getRawValue(0), 0);
+ assertEquals(0x3F80, bf_multi.getRawValue(-1));
+ assertEquals(0, bf_multi.getRawValue(0));
+ assertEquals(0x4000, bf_single.getRawValue(-1));
+ assertEquals(0, bf_single.getRawValue(0));
}
@Test
void testGetShortRawValue() {
- assertEquals(bf_multi.getShortRawValue(( short ) -1),
- ( short ) 0x3F80);
- assertEquals(bf_multi.getShortRawValue(( short ) 0), ( short ) 0);
- assertEquals(bf_single.getShortRawValue(( short ) -1),
- ( short ) 0x4000);
- assertEquals(bf_single.getShortRawValue(( short ) 0), ( short ) 0);
+ assertEquals(( short ) 0x3F80, bf_multi.getShortRawValue(( short ) -1));
+ assertEquals(( short ) 0, bf_multi.getShortRawValue(( short ) 0));
+ assertEquals(( short ) 0x4000, bf_single.getShortRawValue(( short ) -1));
+ assertEquals(( short ) 0, bf_single.getShortRawValue(( short ) 0));
}
@Test
@@ -90,48 +88,39 @@ final class TestBitField {
void testSetValue() {
for (int j = 0; j < 128; j++)
{
- assertEquals(bf_multi.getValue(bf_multi.setValue(0, j)), j);
- assertEquals(bf_multi.setValue(0, j), j << 7);
+ assertEquals(j, bf_multi.getValue(bf_multi.setValue(0, j)));
+ assertEquals(j << 7, bf_multi.setValue(0, j));
}
// verify that excess bits are stripped off
- assertEquals(bf_multi.setValue(0x3f80, 128), 0);
+ assertEquals(0, bf_multi.setValue(0x3f80, 128));
for (int j = 0; j < 2; j++)
{
- assertEquals(bf_single.getValue(bf_single.setValue(0, j)), j);
- assertEquals(bf_single.setValue(0, j), j << 14);
+ assertEquals(j, bf_single.getValue(bf_single.setValue(0, j)));
+ assertEquals(j << 14, bf_single.setValue(0, j));
}
// verify that excess bits are stripped off
- assertEquals(bf_single.setValue(0x4000, 2), 0);
+ assertEquals(0, bf_single.setValue(0x4000, 2));
}
@Test
void testSetShortValue() {
for (int j = 0; j < 128; j++)
{
- assertEquals(bf_multi
- .getShortValue(bf_multi
- .setShortValue(( short ) 0, ( short ) j)), ( short ) j);
- assertEquals(bf_multi.setShortValue(( short ) 0, ( short ) j),
- ( short ) (j << 7));
+ assertEquals(( short ) j, bf_multi.getShortValue(bf_multi.setShortValue(( short ) 0, ( short ) j)));
+ assertEquals(( short ) (j << 7), bf_multi.setShortValue(( short ) 0, ( short ) j));
}
// verify that excess bits are stripped off
- assertEquals(bf_multi.setShortValue(( short ) 0x3f80, ( short ) 128),
- ( short ) 0);
- for (int j = 0; j < 2; j++)
- {
- assertEquals(bf_single
- .getShortValue(bf_single
- .setShortValue(( short ) 0, ( short ) j)), ( short ) j);
- assertEquals(bf_single.setShortValue(( short ) 0, ( short ) j),
- ( short ) (j << 14));
+ assertEquals(( short ) 0, bf_multi.setShortValue(( short ) 0x3f80, ( short ) 128));
+ for (int j = 0; j < 2; j++) {
+ assertEquals(( short ) j, bf_single.getShortValue(bf_single.setShortValue(( short ) 0, ( short ) j)));
+ assertEquals(( short ) (j << 14), bf_single.setShortValue(( short ) 0, ( short ) j));
}
// verify that excess bits are stripped off
- assertEquals(bf_single.setShortValue(( short ) 0x4000, ( short ) 2),
- ( short ) 0);
+ assertEquals(( short ) 0, bf_single.setShortValue(( short ) 0x4000, ( short ) 2));
}
@Test
@@ -143,8 +132,7 @@ final class TestBitField {
assertEquals(16, BitFieldFactory.getInstance(16).setByteBoolean(( byte ) 0, true));
assertEquals(32, BitFieldFactory.getInstance(32).setByteBoolean(( byte ) 0, true));
assertEquals(64, BitFieldFactory.getInstance(64).setByteBoolean(( byte ) 0, true));
- assertEquals(-128,
- BitFieldFactory.getInstance(128).setByteBoolean(( byte ) 0, true));
+ assertEquals(-128, BitFieldFactory.getInstance(128).setByteBoolean(( byte ) 0, true));
assertEquals(0, BitFieldFactory.getInstance(1).setByteBoolean(( byte ) 1, false));
assertEquals(0, BitFieldFactory.getInstance(2).setByteBoolean(( byte ) 2, false));
assertEquals(0, BitFieldFactory.getInstance(4).setByteBoolean(( byte ) 4, false));
@@ -163,26 +151,26 @@ final class TestBitField {
@Test
void testClear() {
- assertEquals(bf_multi.clear(-1), 0xFFFFC07F);
- assertEquals(bf_single.clear(-1), 0xFFFFBFFF);
+ assertEquals(0xFFFFC07F, bf_multi.clear(-1));
+ assertEquals(0xFFFFBFFF, bf_single.clear(-1));
}
@Test
void testClearShort() {
- assertEquals(bf_multi.clearShort(( short ) -1), ( short ) 0xC07F);
- assertEquals(bf_single.clearShort(( short ) -1), ( short ) 0xBFFF);
+ assertEquals(( short ) 0xC07F, bf_multi.clearShort(( short ) -1));
+ assertEquals(( short ) 0xBFFF, bf_single.clearShort(( short ) -1));
}
@Test
void testSet() {
- assertEquals(bf_multi.set(0), 0x3F80);
- assertEquals(bf_single.set(0), 0x4000);
+ assertEquals(0x3F80, bf_multi.set(0));
+ assertEquals(0x4000, bf_single.set(0));
}
@Test
void testSetShort() {
- assertEquals(bf_multi.setShort(( short ) 0), ( short ) 0x3F80);
- assertEquals(bf_single.setShort(( short ) 0), ( short ) 0x4000);
+ assertEquals(( short ) 0x3F80, bf_multi.setShort(( short ) 0));
+ assertEquals(( short ) 0x4000, bf_single.setShort(( short ) 0));
}
@Test
@@ -195,14 +183,10 @@ final class TestBitField {
@Test
void testSetShortBoolean() {
- assertEquals(bf_multi.setShort(( short ) 0),
- bf_multi.setShortBoolean(( short ) 0, true));
- assertEquals(bf_single.setShort(( short ) 0),
- bf_single.setShortBoolean(( short ) 0, true));
- assertEquals(bf_multi.clearShort(( short ) -1),
- bf_multi.setShortBoolean(( short ) -1, false));
- assertEquals(bf_single.clearShort(( short ) -1),
- bf_single.setShortBoolean(( short ) -1, false));
+ assertEquals(bf_multi.setShort(( short ) 0), bf_multi.setShortBoolean(( short ) 0, true));
+ assertEquals(bf_single.setShort(( short ) 0), bf_single.setShortBoolean(( short ) 0, true));
+ assertEquals(bf_multi.clearShort(( short ) -1), bf_multi.setShortBoolean(( short ) -1, false));
+ assertEquals(bf_single.clearShort(( short ) -1), bf_single.setShortBoolean(( short ) -1, false));
}
@Test
Modified: poi/trunk/poi/src/test/java/org/apache/poi/util/TestByteField.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/util/TestByteField.java?rev=1894426&r1=1894425&r2=1894426&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/util/TestByteField.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/util/TestByteField.java Wed Oct 20 22:50:35 2021
@@ -19,7 +19,7 @@
package org.apache.poi.util;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -37,41 +37,24 @@ final class TestByteField {
@Test
void testConstructors() {
- try {
- new ByteField(-1);
- fail("Should have caught ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException ignored_e) {
- // as expected
- }
+ assertThrows(ArrayIndexOutOfBoundsException.class, () -> new ByteField(-1));
ByteField field = new ByteField(2);
assertEquals(( byte ) 0, field.get());
- try {
- new ByteField(-1, ( byte ) 1);
- fail("Should have caught ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException ignored_e) {
- // as expected
- }
+ assertThrows(ArrayIndexOutOfBoundsException.class, () -> new ByteField(-1, (byte)1));
+
field = new ByteField(2, ( byte ) 3);
assertEquals(( byte ) 3, field.get());
- byte[] array = new byte[ 3 ];
- try {
- new ByteField(-1, ( byte ) 1, array);
- fail("Should have caught ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException ignored_e) {
- // as expected
- }
+ assertThrows(ArrayIndexOutOfBoundsException.class, () -> new ByteField(-1, (byte)1, new byte[3]));
+
+ byte[] array = new byte[ 3 ];
field = new ByteField(2, ( byte ) 4, array);
assertEquals(( byte ) 4, field.get());
assertEquals(( byte ) 4, array[ 2 ]);
- array = new byte[ 2 ];
- try {
- new ByteField(2, ( byte ) 5, array);
- fail("should have gotten ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException ignored_e) {
- // as expected
- }
+
+ assertThrows(ArrayIndexOutOfBoundsException.class, () -> new ByteField(2, (byte)5, new byte[2]));
+
for (byte b : _test_array) {
array = new byte[ 1 ];
new ByteField(0, b, array);
@@ -96,20 +79,16 @@ final class TestByteField {
@Test
void testReadFromBytes() {
- ByteField field = new ByteField(1);
+ ByteField field1 = new ByteField(1);
byte[] array = new byte[ 1 ];
- try {
- field.readFromBytes(array);
- fail("should have caught ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException ignored_e) {
- // as expected
- }
- field = new ByteField(0);
+ assertThrows(ArrayIndexOutOfBoundsException.class, () -> field1.readFromBytes(array));
+
+ ByteField field2 = new ByteField(0);
for (int j = 0; j < _test_array.length; j++) {
array[ 0 ] = _test_array[ j ];
- field.readFromBytes(array);
- assertEquals(_test_array[ j ], field.get(), "testing " + j);
+ field2.readFromBytes(array);
+ assertEquals(_test_array[ j ], field2.get(), "testing " + j);
}
}
Modified: poi/trunk/poi/src/test/java/org/apache/poi/util/TestLittleEndian.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/util/TestLittleEndian.java?rev=1894426&r1=1894425&r2=1894426&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/util/TestLittleEndian.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/util/TestLittleEndian.java Wed Oct 20 22:50:35 2021
@@ -17,6 +17,7 @@
package org.apache.poi.util;
+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;
@@ -76,9 +77,9 @@ final class TestLittleEndian {
byte[] testdata3 = new byte[ LittleEndianConsts.SHORT_SIZE + 1 ];
LittleEndian.putUShort(testdata3, 0, expected2);
LittleEndian.putUShort(testdata3, 1, expected3);
- assertEquals(testdata3[0], 0x0D);
- assertEquals(testdata3[1], (byte)0x93);
- assertEquals(testdata3[2], (byte)0xFF);
+ assertEquals(0x0D, testdata3[0]);
+ assertEquals((byte)0x93, testdata3[1]);
+ assertEquals((byte)0xFF, testdata3[2]);
assertEquals(expected2, LittleEndian.getUShort(testdata3));
assertEquals(expected3, LittleEndian.getUShort(testdata3, 1));
@@ -107,9 +108,7 @@ final class TestLittleEndian {
double nan = LittleEndian.getDouble(_nan_double_array, 0);
byte[] data = new byte[8];
LittleEndian.putDouble(data, 0, nan);
- for ( int i = 0; i < data.length; i++ ) {
- assertEquals(data[i], _nan_double_array[i]);
- }
+ assertArrayEquals(data, _nan_double_array);
}
/**
Modified: poi/trunk/poi/src/test/java/org/apache/poi/util/TestLongField.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/util/TestLongField.java?rev=1894426&r1=1894425&r2=1894426&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/util/TestLongField.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/util/TestLongField.java Wed Oct 20 22:50:35 2021
@@ -19,7 +19,6 @@ package org.apache.poi.util;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -96,16 +95,12 @@ final class TestLongField {
@Test
void testReadFromBytes() {
- LongField field = new LongField(1);
+ LongField field1 = new LongField(1);
byte[] array = new byte[ 8 ];
- try {
- field.readFromBytes(array);
- fail("should have caught ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException ignored_e) {
- // as expected
- }
- field = new LongField(0);
+ assertThrows(ArrayIndexOutOfBoundsException.class, () -> field1.readFromBytes(array));
+
+ LongField field2 = new LongField(0);
for (int j = 0; j < _test_array.length; j++) {
array[ 0 ] = ( byte ) (_test_array[ j ] % 256);
array[ 1 ] = ( byte ) ((_test_array[ j ] >> 8) % 256);
@@ -115,8 +110,8 @@ final class TestLongField {
array[ 5 ] = ( byte ) ((_test_array[ j ] >> 40) % 256);
array[ 6 ] = ( byte ) ((_test_array[ j ] >> 48) % 256);
array[ 7 ] = ( byte ) ((_test_array[ j ] >> 56) % 256);
- field.readFromBytes(array);
- assertEquals(_test_array[ j ], field.get(), "testing " + j);
+ field2.readFromBytes(array);
+ assertEquals(_test_array[ j ], field2.get(), "testing " + j);
}
}
Modified: poi/trunk/poi/src/test/java9/module-info.class
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java9/module-info.class?rev=1894426&r1=1894425&r2=1894426&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org