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/18 22:35:17 UTC
svn commit: r1894365 [3/3] - in /poi/trunk:
poi-examples/src/test/java/org/apache/poi/integration/
poi-excelant/src/test/java/org/apache/poi/ss/excelant/util/
poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/
poi-ooxml/src/test/java/org/ap...
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTable.java?rev=1894365&r1=1894364&r2=1894365&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTable.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTable.java Mon Oct 18 22:35:17 2021
@@ -17,11 +17,24 @@
package org.apache.poi.xssf.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 java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.util.AreaReference;
import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.util.IOUtils;
import org.apache.poi.util.TempFile;
import org.apache.poi.xssf.XSSFTestDataSamples;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
@@ -30,20 +43,6 @@ import org.openxmlformats.schemas.spread
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTTableColumn;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTTableStyleInfo;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-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;
-
public final class TestXSSFTable {
@Test
@@ -86,34 +85,33 @@ public final class TestXSSFTable {
@Test
void testCTTableStyleInfo() throws IOException {
- XSSFWorkbook outputWorkbook = new XSSFWorkbook();
- XSSFSheet sheet = outputWorkbook.createSheet();
+ try (XSSFWorkbook outputWorkbook = new XSSFWorkbook()) {
+ XSSFSheet sheet = outputWorkbook.createSheet();
- //Create
- XSSFTable outputTable = sheet.createTable(null);
- outputTable.setDisplayName("Test");
- CTTable outputCTTable = outputTable.getCTTable();
-
- //Style configurations
- CTTableStyleInfo outputStyleInfo = outputCTTable.addNewTableStyleInfo();
- outputStyleInfo.setName("TableStyleLight1");
- outputStyleInfo.setShowColumnStripes(false);
- outputStyleInfo.setShowRowStripes(true);
-
- XSSFWorkbook inputWorkbook = XSSFTestDataSamples.writeOutAndReadBack(outputWorkbook);
- List<XSSFTable> tables = inputWorkbook.getSheetAt(0).getTables();
- assertEquals(1, tables.size(), "Tables number");
-
- XSSFTable inputTable = tables.get(0);
- assertEquals(outputTable.getDisplayName(), inputTable.getDisplayName(), "Table display name");
-
- CTTableStyleInfo inputStyleInfo = inputTable.getCTTable().getTableStyleInfo();
- assertEquals(outputStyleInfo.getName(), inputStyleInfo.getName(), "Style name");
- assertEquals(outputStyleInfo.getShowColumnStripes(), inputStyleInfo.getShowColumnStripes(), "Show column stripes");
- assertEquals(outputStyleInfo.getShowRowStripes(), inputStyleInfo.getShowRowStripes(), "Show row stripes");
-
- inputWorkbook.close();
- outputWorkbook.close();
+ //Create
+ XSSFTable outputTable = sheet.createTable(null);
+ outputTable.setDisplayName("Test");
+ CTTable outputCTTable = outputTable.getCTTable();
+
+ //Style configurations
+ CTTableStyleInfo outputStyleInfo = outputCTTable.addNewTableStyleInfo();
+ outputStyleInfo.setName("TableStyleLight1");
+ outputStyleInfo.setShowColumnStripes(false);
+ outputStyleInfo.setShowRowStripes(true);
+
+ try (XSSFWorkbook inputWorkbook = XSSFTestDataSamples.writeOutAndReadBack(outputWorkbook)) {
+ List<XSSFTable> tables = inputWorkbook.getSheetAt(0).getTables();
+ assertEquals(1, tables.size(), "Tables number");
+
+ XSSFTable inputTable = tables.get(0);
+ assertEquals(outputTable.getDisplayName(), inputTable.getDisplayName(), "Table display name");
+
+ CTTableStyleInfo inputStyleInfo = inputTable.getCTTable().getTableStyleInfo();
+ assertEquals(outputStyleInfo.getName(), inputStyleInfo.getName(), "Style name");
+ assertEquals(outputStyleInfo.getShowColumnStripes(), inputStyleInfo.getShowColumnStripes(), "Show column stripes");
+ assertEquals(outputStyleInfo.getShowRowStripes(), inputStyleInfo.getShowRowStripes(), "Show row stripes");
+ }
+ }
}
@Test
@@ -269,8 +267,6 @@ public final class TestXSSFTable {
assertEquals(new CellReference("C1"), table.getStartCellReference());
assertEquals(new CellReference("M3"), table.getEndCellReference());
-
- IOUtils.closeQuietly(wb);
}
}
@@ -292,8 +288,6 @@ public final class TestXSSFTable {
// update cell references to clear the cache
table.updateReferences();
assertEquals(11, table.getRowCount());
-
- IOUtils.closeQuietly(wb);
}
}
@@ -311,8 +305,6 @@ public final class TestXSSFTable {
assertEquals(6, table.getRowCount());
assertEquals(5, table.getDataRowCount());
-
- IOUtils.closeQuietly(wb);
}
}
@@ -340,8 +332,6 @@ public final class TestXSSFTable {
assertEquals(0, table.getTotalsRowCount());
assertEquals("C10:C15", table.getArea().formatAsString());
-
- IOUtils.closeQuietly(wb);
}
}
@@ -441,10 +431,10 @@ public final class TestXSSFTable {
assertTrue (cB.getId() < cD.getId(), "Column D ID");
assertTrue (cD.getId() < cC.getId(), "Column C ID");
// generated name
- assertEquals(table.getColumns().get(0).getName(), "Column 1");
- assertEquals(table.getColumns().get(1).getName(), "Column B");
- assertEquals(table.getColumns().get(2).getName(), "Column C");
- assertEquals(table.getColumns().get(3).getName(), "Column D");
+ assertEquals("Column 1", table.getColumns().get(0).getName());
+ assertEquals("Column B", table.getColumns().get(1).getName());
+ assertEquals("Column C", table.getColumns().get(2).getName());
+ assertEquals("Column D", table.getColumns().get(3).getName());
}
}
@@ -528,23 +518,20 @@ public final class TestXSSFTable {
));
// Save and re-load
- XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb);
- IOUtils.closeQuietly(wb);
- s = wb2.getSheetAt(0);
-
- // Check
- assertEquals(1, s.getTables().size());
- t = s.getTables().get(0);
- assertEquals("A1", t.getStartCellReference().formatAsString());
- assertEquals("C2", t.getEndCellReference().formatAsString());
+ try (XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb)) {
+ s = wb2.getSheetAt(0);
- // TODO Nicer column fetching
- assertEquals("12", t.getCTTable().getTableColumns().getTableColumnArray(0).getName());
- assertEquals("34.56", t.getCTTable().getTableColumns().getTableColumnArray(1).getName());
- assertEquals("ABCD", t.getCTTable().getTableColumns().getTableColumnArray(2).getName());
-
- // Done
- IOUtils.closeQuietly(wb2);
+ // Check
+ assertEquals(1, s.getTables().size());
+ t = s.getTables().get(0);
+ assertEquals("A1", t.getStartCellReference().formatAsString());
+ assertEquals("C2", t.getEndCellReference().formatAsString());
+
+ // TODO Nicer column fetching
+ assertEquals("12", t.getCTTable().getTableColumns().getTableColumnArray(0).getName());
+ assertEquals("34.56", t.getCTTable().getTableColumns().getTableColumnArray(1).getName());
+ assertEquals("ABCD", t.getCTTable().getTableColumns().getTableColumnArray(2).getName());
+ }
}
}
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java?rev=1894365&r1=1894364&r2=1894365&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java Mon Oct 18 22:35:17 2021
@@ -40,9 +40,9 @@ public final class TestXSSFCategoryAxis
XDDFCategoryAxis axis = chart.createCategoryAxis(AxisPosition.BOTTOM);
axis.setCrosses(AxisCrosses.AUTO_ZERO);
- assertEquals(axis.getCrosses(), AxisCrosses.AUTO_ZERO);
+ assertEquals(AxisCrosses.AUTO_ZERO, axis.getCrosses());
- assertEquals(chart.getAxes().size(), 1);
+ assertEquals(1, chart.getAxes().size());
}
}
}
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFDateAxis.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFDateAxis.java?rev=1894365&r1=1894364&r2=1894365&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFDateAxis.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFDateAxis.java Mon Oct 18 22:35:17 2021
@@ -41,9 +41,9 @@ public final class TestXSSFDateAxis {
XDDFDateAxis axis = chart.createDateAxis(AxisPosition.BOTTOM);
axis.setCrosses(AxisCrosses.AUTO_ZERO);
- assertEquals(axis.getCrosses(), AxisCrosses.AUTO_ZERO);
+ assertEquals(AxisCrosses.AUTO_ZERO, axis.getCrosses());
- assertEquals(chart.getAxes().size(), 1);
+ assertEquals(1, chart.getAxes().size());
}
}
}
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java?rev=1894365&r1=1894364&r2=1894365&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java Mon Oct 18 22:35:17 2021
@@ -42,12 +42,12 @@ public final class TestXSSFValueAxis {
XDDFValueAxis axis = chart.createValueAxis(AxisPosition.BOTTOM);
axis.setCrossBetween(AxisCrossBetween.MIDPOINT_CATEGORY);
- assertEquals(axis.getCrossBetween(), AxisCrossBetween.MIDPOINT_CATEGORY);
+ assertEquals(AxisCrossBetween.MIDPOINT_CATEGORY, axis.getCrossBetween());
axis.setCrosses(AxisCrosses.AUTO_ZERO);
- assertEquals(axis.getCrosses(), AxisCrosses.AUTO_ZERO);
+ assertEquals(AxisCrosses.AUTO_ZERO, axis.getCrosses());
- assertEquals(chart.getAxes().size(), 1);
+ assertEquals(1, chart.getAxes().size());
}
}
}
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java?rev=1894365&r1=1894364&r2=1894365&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java Mon Oct 18 22:35:17 2021
@@ -18,6 +18,7 @@
package org.apache.poi.xssf.usermodel.extensions;
+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;
@@ -89,19 +90,13 @@ class TestXSSFCellFill {
XSSFCell cellWithThemeColor = wb.getSheetAt(0).getRow(10).getCell(0);
//color RGB will be extracted from theme
XSSFColor foregroundColor = cellWithThemeColor.getCellStyle().getFillForegroundXSSFColor();
- byte[] rgb = foregroundColor.getRGB();
- byte[] rgbWithTint = foregroundColor.getRGBWithTint();
// Dk2
- assertEquals(rgb[0], 31);
- assertEquals(rgb[1], 73);
- assertEquals(rgb[2], 125);
+ assertArrayEquals(new byte[]{31, 73, 125}, foregroundColor.getRGB());
// Dk2, lighter 40% (tint is about 0.39998)
// 31 * (1.0 - 0.39998) + (255 - 255 * (1.0 - 0.39998)) = 120.59552 => 120 (byte)
// 73 * (1.0 - 0.39998) + (255 - 255 * (1.0 - 0.39998)) = 145.79636 => -111 (byte)
// 125 * (1.0 - 0.39998) + (255 - 255 * (1.0 - 0.39998)) = 176.99740 => -80 (byte)
- assertEquals(rgbWithTint[0], 120);
- assertEquals(rgbWithTint[1], -111);
- assertEquals(rgbWithTint[2], -80);
+ assertArrayEquals(new byte[]{120, -111, -80}, foregroundColor.getRGBWithTint());
}
}
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java?rev=1894365&r1=1894364&r2=1894365&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java Mon Oct 18 22:35:17 2021
@@ -53,12 +53,12 @@ class TestXWPFBugs {
run.setFontFamily("Times New Roman");
run.setFontSize(20);
- assertEquals(run.getFontFamily(), "Times New Roman");
- assertEquals(run.getFontFamily(FontCharRange.cs), "Times New Roman");
- assertEquals(run.getFontFamily(FontCharRange.eastAsia), "Times New Roman");
- assertEquals(run.getFontFamily(FontCharRange.hAnsi), "Times New Roman");
+ assertEquals("Times New Roman", run.getFontFamily());
+ assertEquals("Times New Roman", run.getFontFamily(FontCharRange.cs));
+ assertEquals("Times New Roman", run.getFontFamily(FontCharRange.eastAsia));
+ assertEquals("Times New Roman", run.getFontFamily(FontCharRange.hAnsi));
run.setFontFamily("Arial", FontCharRange.hAnsi);
- assertEquals(run.getFontFamily(FontCharRange.hAnsi), "Arial");
+ assertEquals("Arial", run.getFontFamily(FontCharRange.hAnsi));
}
}
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java?rev=1894365&r1=1894364&r2=1894365&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java Mon Oct 18 22:35:17 2021
@@ -45,29 +45,19 @@ import org.apache.poi.xwpf.extractor.XWP
import org.apache.xmlbeans.XmlCursor;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTProperties;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
public final class TestXWPFDocument {
@Test
void testContainsMainContentType() throws Exception {
- XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("sample.docx");
- OPCPackage pack = doc.getPackage();
-
- boolean found = false;
- for (PackagePart part : pack.getParts()) {
- if (part.getContentType().equals(XWPFRelation.DOCUMENT.getContentType())) {
- found = true;
- }
-// if (false) {
-// // successful tests should be silent
-// System.out.println(part);
-// }
+ try (XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("sample.docx");
+ OPCPackage pack = doc.getPackage()) {
+ String ct = XWPFRelation.DOCUMENT.getContentType();
+ boolean found = pack.getParts().stream().anyMatch(p -> ct.equals(p.getContentType()));
+ assertTrue(found);
}
- assertTrue(found);
-
- pack.close();
- doc.close();
}
@Test
@@ -105,90 +95,92 @@ public final class TestXWPFDocument {
@Test
void testMetadataComplex() throws IOException {
- XWPFDocument xml = XWPFTestDataSamples.openSampleDocument("IllustrativeCases.docx");
- assertNotNull(xml.getProperties().getCoreProperties());
- assertNotNull(xml.getProperties().getExtendedProperties());
-
- assertEquals("Microsoft Office Outlook", xml.getProperties().getExtendedProperties().getUnderlyingProperties().getApplication());
- assertEquals(5184, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getCharacters());
- assertEquals(0, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getLines());
-
- assertEquals(" ", xml.getProperties().getCoreProperties().getTitle());
- Optional<String> subjectProperty = xml.getProperties().getCoreProperties().getUnderlyingProperties().getSubjectProperty();
- assertTrue(subjectProperty.isPresent());
- assertEquals(" ", subjectProperty.get());
- xml.close();
+ try (XWPFDocument xml = XWPFTestDataSamples.openSampleDocument("IllustrativeCases.docx")) {
+ assertNotNull(xml.getProperties().getCoreProperties());
+ assertNotNull(xml.getProperties().getExtendedProperties());
+
+ CTProperties up = xml.getProperties().getExtendedProperties().getUnderlyingProperties();
+ assertEquals("Microsoft Office Outlook", up.getApplication());
+ assertEquals(5184, up.getCharacters());
+ assertEquals(0, up.getLines());
+
+ POIXMLProperties.CoreProperties cp = xml.getProperties().getCoreProperties();
+ assertEquals(" ", cp.getTitle());
+ Optional<String> subjectProperty = cp.getUnderlyingProperties().getSubjectProperty();
+ assertTrue(subjectProperty.isPresent());
+ assertEquals(" ", subjectProperty.get());
+ }
}
@Test
void testWorkbookProperties() throws Exception {
- XWPFDocument doc = new XWPFDocument();
- POIXMLProperties props = doc.getProperties();
- assertNotNull(props);
- assertEquals("Apache POI", props.getExtendedProperties().getUnderlyingProperties().getApplication());
- doc.close();
+ try (XWPFDocument doc = new XWPFDocument()) {
+ POIXMLProperties props = doc.getProperties();
+ assertNotNull(props);
+ assertEquals("Apache POI", props.getExtendedProperties().getUnderlyingProperties().getApplication());
+ }
}
@Test
void testAddParagraph() throws IOException {
- XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("sample.docx");
- assertEquals(3, doc.getParagraphs().size());
+ try (XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("sample.docx")) {
+ assertEquals(3, doc.getParagraphs().size());
- XWPFParagraph p = doc.createParagraph();
- assertEquals(p, doc.getParagraphs().get(3));
- assertEquals(4, doc.getParagraphs().size());
-
- assertEquals(3, doc.getParagraphPos(3));
- assertEquals(3, doc.getPosOfParagraph(p));
-
- CTP ctp = p.getCTP();
- XWPFParagraph newP = doc.getParagraph(ctp);
- assertSame(p, newP);
- XmlCursor cursor = doc.getDocument().getBody().getPArray(0).newCursor();
- XWPFParagraph cP = doc.insertNewParagraph(cursor);
- assertSame(cP, doc.getParagraphs().get(0));
- assertEquals(5, doc.getParagraphs().size());
- doc.close();
+ XWPFParagraph p = doc.createParagraph();
+ assertEquals(p, doc.getParagraphs().get(3));
+ assertEquals(4, doc.getParagraphs().size());
+
+ assertEquals(3, doc.getParagraphPos(3));
+ assertEquals(3, doc.getPosOfParagraph(p));
+
+ CTP ctp = p.getCTP();
+ XWPFParagraph newP = doc.getParagraph(ctp);
+ assertSame(p, newP);
+ XmlCursor cursor = doc.getDocument().getBody().getPArray(0).newCursor();
+ XWPFParagraph cP = doc.insertNewParagraph(cursor);
+ assertSame(cP, doc.getParagraphs().get(0));
+ assertEquals(5, doc.getParagraphs().size());
+ }
}
@Test
void testAddPicture() throws IOException, InvalidFormatException {
- XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("sample.docx");
- byte[] jpeg = XWPFTestDataSamples.getImage("nature1.jpg");
- String relationId = doc.addPictureData(jpeg, Document.PICTURE_TYPE_JPEG);
-
- XWPFPictureData relationById = (XWPFPictureData) doc.getRelationById(relationId);
- assertNotNull(relationById);
- byte[] newJpeg = relationById.getData();
- assertEquals(newJpeg.length, jpeg.length);
- for (int i = 0; i < jpeg.length; i++) {
- assertEquals(newJpeg[i], jpeg[i]);
+ try (XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("sample.docx")) {
+ byte[] jpeg = XWPFTestDataSamples.getImage("nature1.jpg");
+ String relationId = doc.addPictureData(jpeg, Document.PICTURE_TYPE_JPEG);
+
+ XWPFPictureData relationById = (XWPFPictureData) doc.getRelationById(relationId);
+ assertNotNull(relationById);
+ byte[] newJpeg = relationById.getData();
+ assertEquals(newJpeg.length, jpeg.length);
+ for (int i = 0; i < jpeg.length; i++) {
+ assertEquals(newJpeg[i], jpeg[i]);
+ }
}
- doc.close();
}
@Test
void testAllPictureFormats() throws IOException, InvalidFormatException {
- XWPFDocument doc = new XWPFDocument();
+ try (XWPFDocument doc = new XWPFDocument()) {
+
+ doc.addPictureData(new byte[10], Document.PICTURE_TYPE_EMF);
+ doc.addPictureData(new byte[11], Document.PICTURE_TYPE_WMF);
+ doc.addPictureData(new byte[12], Document.PICTURE_TYPE_PICT);
+ doc.addPictureData(new byte[13], Document.PICTURE_TYPE_JPEG);
+ doc.addPictureData(new byte[14], Document.PICTURE_TYPE_PNG);
+ doc.addPictureData(new byte[15], Document.PICTURE_TYPE_DIB);
+ doc.addPictureData(new byte[16], Document.PICTURE_TYPE_GIF);
+ doc.addPictureData(new byte[17], Document.PICTURE_TYPE_TIFF);
+ doc.addPictureData(new byte[18], Document.PICTURE_TYPE_EPS);
+ doc.addPictureData(new byte[19], Document.PICTURE_TYPE_BMP);
+ doc.addPictureData(new byte[20], Document.PICTURE_TYPE_WPG);
- doc.addPictureData(new byte[10], Document.PICTURE_TYPE_EMF);
- doc.addPictureData(new byte[11], Document.PICTURE_TYPE_WMF);
- doc.addPictureData(new byte[12], Document.PICTURE_TYPE_PICT);
- doc.addPictureData(new byte[13], Document.PICTURE_TYPE_JPEG);
- doc.addPictureData(new byte[14], Document.PICTURE_TYPE_PNG);
- doc.addPictureData(new byte[15], Document.PICTURE_TYPE_DIB);
- doc.addPictureData(new byte[16], Document.PICTURE_TYPE_GIF);
- doc.addPictureData(new byte[17], Document.PICTURE_TYPE_TIFF);
- doc.addPictureData(new byte[18], Document.PICTURE_TYPE_EPS);
- doc.addPictureData(new byte[19], Document.PICTURE_TYPE_BMP);
- doc.addPictureData(new byte[20], Document.PICTURE_TYPE_WPG);
-
- assertEquals(11, doc.getAllPictures().size());
-
- XWPFDocument doc2 = XWPFTestDataSamples.writeOutAndReadBack(doc);
- assertEquals(11, doc2.getAllPictures().size());
- doc2.close();
- doc.close();
+ assertEquals(11, doc.getAllPictures().size());
+
+ try (XWPFDocument doc2 = XWPFTestDataSamples.writeOutAndReadBack(doc)) {
+ assertEquals(11, doc2.getAllPictures().size());
+ }
+ }
}
@Test
@@ -201,8 +193,8 @@ public final class TestXWPFDocument {
assertEquals("rId7", h.getHyperlinkId());
assertEquals("https://poi.apache.org/", h.getHyperlink(doc).getURL());
- assertEquals(p.getRuns().size(), 1);
- assertEquals(p.getRuns().get(0), h);
+ assertEquals(1, p.getRuns().size());
+ assertEquals(h, p.getRuns().get(0));
h = p.createHyperlinkRun("https://poi.apache.org/");
h.setText("Apache POI");
@@ -426,32 +418,27 @@ public final class TestXWPFDocument {
settings.setMirrorMargins(true);
assertTrue(settings.getMirrorMargins());
- XWPFDocument doc = new XWPFDocument();
- assertEquals(100, doc.getZoomPercent());
-
- doc.setZoomPercent(50);
- assertEquals(50, doc.getZoomPercent());
+ try (XWPFDocument doc = new XWPFDocument()) {
+ assertEquals(100, doc.getZoomPercent());
- doc.setZoomPercent(200);
- assertEquals(200, doc.getZoomPercent());
+ doc.setZoomPercent(50);
+ assertEquals(50, doc.getZoomPercent());
- assertFalse(doc.getEvenAndOddHeadings());
- doc.setEvenAndOddHeadings(true);
- assertTrue(doc.getEvenAndOddHeadings());
+ doc.setZoomPercent(200);
+ assertEquals(200, doc.getZoomPercent());
- assertFalse(doc.getMirrorMargins());
- doc.setMirrorMargins(true);
- assertTrue(doc.getMirrorMargins());
+ assertFalse(doc.getEvenAndOddHeadings());
+ doc.setEvenAndOddHeadings(true);
+ assertTrue(doc.getEvenAndOddHeadings());
- XWPFDocument back = XWPFTestDataSamples.writeOutAndReadBack(doc);
- assertEquals(200, back.getZoomPercent());
- back.close();
+ assertFalse(doc.getMirrorMargins());
+ doc.setMirrorMargins(true);
+ assertTrue(doc.getMirrorMargins());
-// OutputStream out = new FileOutputStream("/tmp/testZoom.docx");
-// doc.write(out);
-// out.close();
-
- doc.close();
+ try (XWPFDocument back = XWPFTestDataSamples.writeOutAndReadBack(doc)) {
+ assertEquals(200, back.getZoomPercent());
+ }
+ }
}
@Test
@@ -464,20 +451,19 @@ public final class TestXWPFDocument {
@Test
@Disabled("XWPF should be able to write to a new Stream when opened Read-Only")
void testWriteFromReadOnlyOPC() throws Exception {
- OPCPackage opc = OPCPackage.open(
+ try (OPCPackage opc = OPCPackage.open(
POIDataSamples.getDocumentInstance().getFile("SampleDoc.docx"),
PackageAccess.READ
- );
- XWPFDocument doc = new XWPFDocument(opc);
-
- final String origText;
- try (XWPFWordExtractor ext = new XWPFWordExtractor(doc)) {
- origText = ext.getText();
-
- doc = XWPFTestDataSamples.writeOutAndReadBack(doc);
- }
- try (XWPFWordExtractor ext = new XWPFWordExtractor(doc)) {
- assertEquals(origText, ext.getText());
+ );
+ XWPFDocument doc = new XWPFDocument(opc);
+ XWPFWordExtractor ext = new XWPFWordExtractor(doc)
+ ) {
+ final String origText = ext.getText();
+
+ try (XWPFDocument doc2 = XWPFTestDataSamples.writeOutAndReadBack(doc);
+ XWPFWordExtractor ext2 = new XWPFWordExtractor(doc2)) {
+ assertEquals(origText, ext2.getText());
+ }
}
}
}
Modified: poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestExtractor.java?rev=1894365&r1=1894364&r2=1894365&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestExtractor.java (original)
+++ poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestExtractor.java Mon Oct 18 22:35:17 2021
@@ -165,7 +165,7 @@ public final class TestExtractor {
assertNotNull(nText);
// Notes record were corrupt, so don't expect any
- assertEquals(nText.length(), 0);
+ assertEquals(0, nText.length());
// Slide records were fine
assertContains(text, "Using Disease Surveillance and Response");
Modified: poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestShapes.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestShapes.java?rev=1894365&r1=1894364&r2=1894365&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestShapes.java (original)
+++ poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestShapes.java Mon Oct 18 22:35:17 2021
@@ -116,7 +116,7 @@ public final class TestShapes {
String text = txtbox.getText();
assertNotNull(text);
- assertEquals(txtbox.getTextParagraphs().get(0).getTextRuns().size(), 1);
+ assertEquals(1, txtbox.getTextParagraphs().get(0).getTextRuns().size());
HSLFTextRun rt = txtbox.getTextParagraphs().get(0).getTextRuns().get(0);
switch (text) {
Modified: poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExControl.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExControl.java?rev=1894365&r1=1894364&r2=1894365&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExControl.java (original)
+++ poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExControl.java Mon Oct 18 22:35:17 2021
@@ -80,9 +80,9 @@ public final class TestExControl {
ExOleObjAtom oleObj = record.getExOleObjAtom();
assertNotNull(oleObj);
- assertEquals(oleObj.getDrawAspect(), ExOleObjAtom.DRAW_ASPECT_VISIBLE);
- assertEquals(oleObj.getType(), ExOleObjAtom.TYPE_CONTROL);
- assertEquals(oleObj.getSubType(), ExOleObjAtom.SUBTYPE_DEFAULT);
+ assertEquals(ExOleObjAtom.DRAW_ASPECT_VISIBLE, oleObj.getDrawAspect());
+ assertEquals(ExOleObjAtom.TYPE_CONTROL, oleObj.getType());
+ assertEquals(ExOleObjAtom.SUBTYPE_DEFAULT, oleObj.getSubType());
assertEquals("Shockwave Flash Object", record.getMenuName());
assertEquals("ShockwaveFlash.ShockwaveFlash.9", record.getProgId());
Modified: poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjAtom.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjAtom.java?rev=1894365&r1=1894364&r2=1894365&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjAtom.java (original)
+++ poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjAtom.java Mon Oct 18 22:35:17 2021
@@ -38,12 +38,13 @@ public final class TestExOleObjAtom {
ExOleObjAtom record = new ExOleObjAtom(data, 0, data.length);
assertEquals(RecordTypes.ExOleObjAtom.typeID, record.getRecordType());
- assertEquals(record.getDrawAspect(), ExOleObjAtom.DRAW_ASPECT_VISIBLE);
- assertEquals(record.getType(), ExOleObjAtom.TYPE_CONTROL);
- assertEquals(record.getObjID(), 1);
- assertEquals(record.getSubType(), ExOleObjAtom.SUBTYPE_DEFAULT);
- assertEquals(record.getObjStgDataRef(), 2);
- assertEquals(record.getOptions(), 1283584); //ther meaning is unknown
+ assertEquals(ExOleObjAtom.DRAW_ASPECT_VISIBLE, record.getDrawAspect());
+ assertEquals(ExOleObjAtom.TYPE_CONTROL, record.getType());
+ assertEquals(1, record.getObjID());
+ assertEquals(ExOleObjAtom.SUBTYPE_DEFAULT, record.getSubType());
+ assertEquals(2, record.getObjStgDataRef());
+ // the meaning is unknown
+ assertEquals(1283584, record.getOptions());
}
@Test
Modified: poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestFontCollection.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestFontCollection.java?rev=1894365&r1=1894364&r2=1894365&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestFontCollection.java (original)
+++ poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestFontCollection.java Mon Oct 18 22:35:17 2021
@@ -55,28 +55,28 @@ public final class TestFontCollection {
void testFonts() {
FontCollection fonts = new FontCollection(data, 0, data.length);
Record[] child = fonts.getChildRecords();
- assertEquals(child.length, 1);
+ assertEquals(1, child.length);
FontEntityAtom fnt = (FontEntityAtom)child[0];
- assertEquals(fnt.getFontName(), "Times New Roman");
+ assertEquals("Times New Roman", fnt.getFontName());
}
@Test
void testAddFont() {
FontCollection fonts = new FontCollection(data, 0, data.length);
HSLFFontInfo fi = fonts.addFont(HSLFFontInfoPredefined.TIMES_NEW_ROMAN);
- assertEquals((int)fi.getIndex(), 0);
+ assertEquals(0, (int)fi.getIndex());
fi = fonts.addFont(new HSLFFontInfo("Helvetica"));
- assertEquals((int)fi.getIndex(), 1);
+ assertEquals(1, (int)fi.getIndex());
fi = fonts.addFont(HSLFFontInfoPredefined.ARIAL);
- assertEquals((int)fi.getIndex(), 2);
+ assertEquals(2, (int)fi.getIndex());
//the font being added twice
fi = fonts.addFont(HSLFFontInfoPredefined.ARIAL);
- assertEquals((int)fi.getIndex(), 2);
+ assertEquals(2, (int)fi.getIndex());
// Font collection should contain 3 fonts
Record[] child = fonts.getChildRecords();
- assertEquals(child.length, 3);
+ assertEquals(3, child.length);
// Check we get the right font name for the indicies
fi = fonts.getFontInfo(0);
Modified: poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextRulerAtom.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextRulerAtom.java?rev=1894365&r1=1894364&r2=1894365&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextRulerAtom.java (original)
+++ poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextRulerAtom.java Mon Oct 18 22:35:17 2021
@@ -45,8 +45,8 @@ public final class TestTextRulerAtom {
@Test
void testReadRuler() {
TextRulerAtom ruler = new TextRulerAtom(data_1, 0, data_1.length);
- assertEquals(ruler.getNumberOfLevels(), 0);
- assertEquals(ruler.getDefaultTabSize(), 0);
+ assertEquals(0, ruler.getNumberOfLevels());
+ assertEquals(0, ruler.getDefaultTabSize());
List<HSLFTabStop> tabStops = ruler.getTabStops();
assertNotNull(tabStops);
Modified: poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestExtractEmbeddedMSG.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestExtractEmbeddedMSG.java?rev=1894365&r1=1894364&r2=1894365&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestExtractEmbeddedMSG.java (original)
+++ poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestExtractEmbeddedMSG.java Mon Oct 18 22:35:17 2021
@@ -102,7 +102,7 @@ public class TestExtractEmbeddedMSG {
expectedMessageDate.set(Calendar.MILLISECOND, 0);
assertEquals(expectedMessageDate.getTimeInMillis(), messageDate.getTimeInMillis());
// test variable length property
- assertEquals(msg.getSubject(), "Test Attachment");
+ assertEquals("Test Attachment", msg.getSubject());
}
private POIFSFileSystem rebuildFromAttached(MAPIMessage attachedMsg) throws IOException {
Modified: poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPlexOfCps.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPlexOfCps.java?rev=1894365&r1=1894364&r2=1894365&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPlexOfCps.java (original)
+++ poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPlexOfCps.java Mon Oct 18 22:35:17 2021
@@ -26,53 +26,51 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
public final class TestPlexOfCps {
- private PlexOfCps _plexOfCps;
- private HWPFDocFixture _hWPFDocFixture;
+ private PlexOfCps _plexOfCps;
+ private HWPFDocFixture _hWPFDocFixture;
- @Test
- void testWriteRead() {
- _plexOfCps = new PlexOfCps(4);
-
- int last = 0;
- for (int x = 0; x < 110; x++)
- {
- byte[] intHolder = new byte[4];
- int span = (int)(110.0f * Math.random());
- LittleEndian.putInt(intHolder, 0, span);
- _plexOfCps.addProperty(new GenericPropertyNode(last, last + span, intHolder));
- last += span;
+ @Test
+ void testWriteRead() {
+ _plexOfCps = new PlexOfCps(4);
+
+ int last = 0;
+ for (int x = 0; x < 110; x++) {
+ byte[] intHolder = new byte[4];
+ int span = (int) (110.0f * Math.random());
+ LittleEndian.putInt(intHolder, 0, span);
+ _plexOfCps.addProperty(new GenericPropertyNode(last, last + span, intHolder));
+ last += span;
+ }
+
+ byte[] output = _plexOfCps.toByteArray();
+ _plexOfCps = new PlexOfCps(output, 0, output.length, 4);
+ int len = _plexOfCps.length();
+ assertEquals(110, len);
+
+ last = 0;
+ for (int x = 0; x < len; x++) {
+ GenericPropertyNode node = _plexOfCps.getProperty(x);
+ assertEquals(node.getStart(), last);
+ last = node.getEnd();
+ int span = LittleEndian.getInt(node.getBytes());
+ assertEquals(node.getEnd() - node.getStart(), span);
+ }
}
- byte[] output = _plexOfCps.toByteArray();
- _plexOfCps = new PlexOfCps(output, 0, output.length, 4);
- int len = _plexOfCps.length();
- assertEquals(len, 110);
-
- last = 0;
- for (int x = 0; x < len; x++)
- {
- GenericPropertyNode node = _plexOfCps.getProperty(x);
- assertEquals(node.getStart(), last);
- last = node.getEnd();
- int span = LittleEndian.getInt(node.getBytes());
- assertEquals(node.getEnd()-node.getStart(), span);
+ @BeforeEach
+ void setUp() throws Exception {
+ /* @todo verify the constructors*/
+ _hWPFDocFixture = new HWPFDocFixture(this, HWPFDocFixture.DEFAULT_TEST_FILE);
+
+ _hWPFDocFixture.setUp();
}
- }
- @BeforeEach
- void setUp() throws Exception {
- /**@todo verify the constructors*/
- _hWPFDocFixture = new HWPFDocFixture(this, HWPFDocFixture.DEFAULT_TEST_FILE);
-
- _hWPFDocFixture.setUp();
- }
-
- @AfterEach
- void tearDown() throws Exception {
- _plexOfCps = null;
- _hWPFDocFixture.tearDown();
+ @AfterEach
+ void tearDown() {
+ _plexOfCps = null;
+ _hWPFDocFixture.tearDown();
- _hWPFDocFixture = null;
- }
+ _hWPFDocFixture = null;
+ }
}
Modified: poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestPictures.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestPictures.java?rev=1894365&r1=1894364&r2=1894365&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestPictures.java (original)
+++ poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestPictures.java Mon Oct 18 22:35:17 2021
@@ -52,9 +52,8 @@ public final class TestPictures {
List<Picture> pics = doc.getPicturesTable().getAllPictures();
assertNotNull(pics);
- assertEquals(pics.size(), 2);
- for (int i = 0; i < pics.size(); i++) {
- Picture pic = pics.get(i);
+ assertEquals(2, pics.size());
+ for (Picture pic : pics) {
assertNotNull(pic.suggestFileExtension());
assertNotNull(pic.suggestFullFileName());
}
@@ -289,7 +288,6 @@ public final class TestPictures {
assertEquals(0, plain8s);
}
- @SuppressWarnings("deprecation")
@Test
void testCroppedPictures() {
HWPFDocument doc = openSampleFile("testCroppedPictures.doc");
@@ -334,40 +332,40 @@ public final class TestPictures {
}
@Test
- void testPictureWithAlternativeText() {
- HWPFDocument document = openSampleFile("Picture_Alternative_Text.doc");
- PicturesTable pictureTable = document.getPicturesTable();
- Picture picture = pictureTable.getAllPictures().get(0);
+ void testPictureWithAlternativeText() throws IOException {
+ try (HWPFDocument document = openSampleFile("Picture_Alternative_Text.doc")) {
+ PicturesTable pictureTable = document.getPicturesTable();
+ Picture picture = pictureTable.getAllPictures().get(0);
- assertEquals("This is the alternative text for the picture.", picture.getDescription());
+ assertEquals("This is the alternative text for the picture.", picture.getDescription());
+ }
}
@Disabled("This bug is not fixed yet")
@Test
void test58804_1() throws Exception {
- HWPFDocument docA = openSampleFile("58804_1.doc");
-
- expectImages(docA, 1);
-
- HWPFDocument docB = HWPFTestDataSamples.writeOutAndReadBack(docA);
+ try (HWPFDocument docA = openSampleFile("58804_1.doc")) {
+ expectImages(docA, 1);
- try (OutputStream out = new FileOutputStream("/tmp/58804_1_out.doc")) {
- docB.write(out);
+ try (HWPFDocument docB = HWPFTestDataSamples.writeOutAndReadBack(docA);
+ OutputStream out = new FileOutputStream("/tmp/58804_1_out.doc")) {
+ docB.write(out);
+ expectImages(docB, 1);
+ }
}
-
- expectImages(docB, 1);
}
@Disabled("This bug is not fixed yet")
@Test
- void test58804() throws Exception {
- HWPFDocument docA = openSampleFile("58804.doc");
-
- expectImages(docA, 7);
+ void test58804() throws IOException {
+ try (HWPFDocument docA = openSampleFile("58804.doc")) {
+ expectImages(docA, 7);
- HWPFDocument docB = HWPFTestDataSamples.writeOutAndReadBack(docA);
+ try (HWPFDocument docB = HWPFTestDataSamples.writeOutAndReadBack(docA)) {
+ expectImages(docB, 7);
+ }
+ }
- expectImages(docB, 7);
}
private void expectImages(HWPFDocument docA, int expectedCount) {
Modified: poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRange.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRange.java?rev=1894365&r1=1894364&r2=1894365&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRange.java (original)
+++ poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRange.java Mon Oct 18 22:35:17 2021
@@ -64,33 +64,31 @@ public final class TestRange {
@Test
void testBug46817() throws IOException {
- InputStream is = SAMPLES.openResourceAsStream( "Bug46817.doc" );
- HWPFDocument hwpfDocument = new HWPFDocument( is );
- is.close();
-
- final List<SEPX> sections = hwpfDocument.getSectionTable()
- .getSections();
- assertEquals( sections.size(), 1 );
-
- // whole document, including additional text from shape
- SEPX sepx = sections.get( 0 );
- assertEquals( sepx.getStart(), 0 );
- assertEquals( sepx.getEnd(), 1428 );
-
- // only main range
- Range range = hwpfDocument.getRange();
- assertEquals( range.getStartOffset(), 0 );
- assertEquals( range.getEndOffset(), 766 );
+ try (InputStream is = SAMPLES.openResourceAsStream("Bug46817.doc");
+ HWPFDocument hwpfDocument = new HWPFDocument(is)) {
- Paragraph lastInMainRange = range.getParagraph( range.numParagraphs() - 1);
- assertTrue( lastInMainRange.getEndOffset() <= 766 );
+ final List<SEPX> sections = hwpfDocument.getSectionTable().getSections();
+ assertEquals( 1, sections.size() );
- Section section = range.getSection( 0 );
- assertTrue( section.getEndOffset() <= 766 );
+ // whole document, including additional text from shape
+ SEPX sepx = sections.get( 0 );
+ assertEquals( 0, sepx.getStart() );
+ assertEquals( 1428, sepx.getEnd() );
- Paragraph lastInMainSection = section.getParagraph( section
+ // only main range
+ Range range = hwpfDocument.getRange();
+ assertEquals( 0, range.getStartOffset() );
+ assertEquals( 766, range.getEndOffset() );
+
+ Paragraph lastInMainRange = range.getParagraph( range.numParagraphs() - 1);
+ assertTrue( lastInMainRange.getEndOffset() <= 766 );
+
+ Section section = range.getSection( 0 );
+ assertTrue( section.getEndOffset() <= 766 );
+
+ Paragraph lastInMainSection = section.getParagraph( section
.numParagraphs() - 1);
- assertTrue( lastInMainSection.getEndOffset() <= 766 );
- hwpfDocument.close();
+ assertTrue( lastInMainSection.getEndOffset() <= 766 );
+ }
}
}
Modified: poi/trunk/poi/src/test/java/org/apache/poi/hpsf/basic/TestBasic.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/hpsf/basic/TestBasic.java?rev=1894365&r1=1894364&r2=1894365&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/hpsf/basic/TestBasic.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/hpsf/basic/TestBasic.java Mon Oct 18 22:35:17 2021
@@ -168,7 +168,7 @@ final class TestBasic {
final SummaryInformation si = (SummaryInformation)PropertySetFactory.create(is);
final List<Section> sections = si.getSections();
final Section s = sections.get(0);
- assertEquals(s.getFormatID(), SummaryInformation.FORMAT_ID);
+ assertEquals(SummaryInformation.FORMAT_ID, s.getFormatID());
assertNotNull(s.getProperties());
assertEquals(17, s.getPropertyCount());
assertEquals("Titel", s.getProperty(PropertyIDMap.PID_TITLE));
Modified: poi/trunk/poi/src/test/java/org/apache/poi/hpsf/basic/TestEmptyProperties.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/hpsf/basic/TestEmptyProperties.java?rev=1894365&r1=1894364&r2=1894365&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/hpsf/basic/TestEmptyProperties.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/hpsf/basic/TestEmptyProperties.java Mon Oct 18 22:35:17 2021
@@ -141,13 +141,13 @@ final class TestEmptyProperties {
assertNotNull(s.getTemplate());
assertNotNull(s.getLastAuthor());
assertNotNull(s.getRevNumber());
- assertEquals(s.getEditTime(), 0);
+ assertEquals(0, s.getEditTime());
assertNull(s.getLastPrinted());
assertNull(s.getCreateDateTime());
assertNull(s.getLastSaveDateTime());
- assertEquals(s.getPageCount(), 0);
- assertEquals(s.getWordCount(), 0);
- assertEquals(s.getCharCount(), 0);
+ assertEquals(0, s.getPageCount());
+ assertEquals(0, s.getWordCount());
+ assertEquals(0, s.getCharCount());
assertNull(s.getThumbnail());
assertNull(s.getApplicationName());
}
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=1894365&r1=1894364&r2=1894365&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