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 2020/12/24 18:42:38 UTC
svn commit: r1884783 [8/40] - in /poi: site/src/documentation/content/xdocs/
trunk/ trunk/sonar/ trunk/sonar/integration-test/ trunk/sonar/ooxml/
trunk/src/excelant/poi-ant-contrib/
trunk/src/excelant/testcases/org/apache/poi/ss/excelant/ trunk/src/exc...
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java Thu Dec 24 18:42:29 2020
@@ -16,26 +16,26 @@
==================================================================== */
package org.apache.poi.xslf.usermodel;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import java.io.IOException;
import java.util.List;
import org.apache.poi.xslf.XSLFTestDataSamples;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.openxmlformats.schemas.drawingml.x2006.main.CTTableCell;
import org.openxmlformats.schemas.drawingml.x2006.main.CTTableRow;
public class TestXSLFTableRow {
-
+
private static XMLSlideShow ppt;
private static XSLFTable tbl;
private static XSLFTableRow row;
-
+
/** Copied from {@link TestXSLFTable#testRead()} */
- @Before
+ @BeforeEach
public void setUp() throws IOException {
ppt = XSLFTestDataSamples.openSampleDocument("shapes.pptx");
@@ -45,8 +45,8 @@ public class TestXSLFTableRow {
List<XSLFTableRow> rows = tbl.getRows();
row = rows.get(0);
}
-
- @After
+
+ @AfterEach
public void tearDown() throws IOException {
ppt.getPackage().revert();
ppt.close();
@@ -59,14 +59,14 @@ public class TestXSLFTableRow {
assertSame(row.getXmlObject(), row2.getXmlObject());
assertEquals(row.getHeight(), row2.getHeight(), 1e-16);
}
-
+
@Test
public void testHeight() {
final double h = 10.0;
row.setHeight(h);
assertEquals(h, row.getHeight(), 1e-16);
}
-
+
/** copied from {@link TestXSLFTable#testCreate()} */
@Test
public void getCells() {
@@ -74,7 +74,7 @@ public class TestXSLFTableRow {
assertNotNull(cells);
assertEquals(3, cells.size());
}
-
+
@Test
public void testIterator() {
int i = 0;
@@ -84,13 +84,13 @@ public class TestXSLFTableRow {
}
assertEquals(3, i);
}
-
+
/** copied from {@link TestXSLFTable#testCreate()} */
@Test
public void addCell() {
XSLFTableCell cell = row.addCell();
assertNotNull(cell);
-
+
assertNotNull(cell.getXmlObject());
// by default table cell has no borders
CTTableCell tc = (CTTableCell)cell.getXmlObject();
@@ -99,24 +99,20 @@ public class TestXSLFTableRow {
assertTrue(tc.getTcPr().getLnL().isSetNoFill());
assertTrue(tc.getTcPr().getLnR().isSetNoFill());
}
-
+
@Test
public void mergeCells() {
- try {
- row.mergeCells(0, 0);
- fail("expected IllegalArgumentException when merging fewer than 2 columns");
- } catch (final IllegalArgumentException e) {
- // expected
- }
-
+ assertThrows(IllegalArgumentException.class, () -> row.mergeCells(0, 0),
+ "expected IllegalArgumentException when merging fewer than 2 columns");
+
row.mergeCells(0, 1);
List<XSLFTableCell> cells = row.getCells();
//the top-left cell of a merged region is not regarded as merged
- assertFalse("top-left cell of merged region", cells.get(0).isMerged());
- assertTrue("inside merged region", cells.get(1).isMerged());
- assertFalse("outside merged region", cells.get(2).isMerged());
+ assertFalse(cells.get(0).isMerged(), "top-left cell of merged region");
+ assertTrue(cells.get(1).isMerged(), "inside merged region");
+ assertFalse(cells.get(2).isMerged(), "outside merged region");
}
-
+
@Test
public void getXmlObject() {
CTTableRow ctrow = row.getXmlObject();
@@ -134,12 +130,7 @@ public class TestXSLFTableRow {
for (XSLFTableRow row : ((XSLFTable) shape).getRows()) {
for (XSLFTableCell cell : row.getCells()) {
assertNull(cell.getShapeName()); // Do not throw NPE
- try {
- cell.getShapeId();
- fail("expected getShapeId to fail");
- } catch (IllegalStateException ise) {
- // expected
- }
+ assertThrows(IllegalStateException.class, cell::getShapeId);
}
}
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java Thu Dec 24 18:42:29 2020
@@ -16,12 +16,12 @@
==================================================================== */
package org.apache.poi.xslf.usermodel;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestXSLFTableStyles {
@@ -32,7 +32,7 @@ public class TestXSLFTableStyles {
assertNotNull(tblStyles);
assertEquals(0, tblStyles.getStyles().size());
-
+
ppt.close();
}
}
\ No newline at end of file
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java Thu Dec 24 18:42:29 2020
@@ -16,13 +16,13 @@
==================================================================== */
package org.apache.poi.xslf.usermodel;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.IOException;
import org.apache.poi.sl.usermodel.Placeholder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openxmlformats.schemas.drawingml.x2006.main.CTTextCharacterProperties;
/**
@@ -42,7 +42,7 @@ public class TestXSLFTextBox {
shape.setPlaceholder(null);
assertNull(shape.getTextType());
shape.setText("Apache POI");
-
+
ppt.close();
}
@@ -84,7 +84,7 @@ public class TestXSLFTextBox {
pPr.unsetSz(); // Should never be
assertNull(r.getFontSize());
-
+
ppt.close();
}
}
\ No newline at end of file
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java Thu Dec 24 18:42:29 2020
@@ -17,10 +17,12 @@
package org.apache.poi.xslf.usermodel;
import static org.apache.poi.sl.usermodel.BaseTestSlideShow.getColor;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.awt.Color;
import java.awt.Graphics2D;
@@ -34,8 +36,7 @@ import org.apache.poi.sl.draw.DrawTextPa
import org.apache.poi.sl.usermodel.AutoNumberingScheme;
import org.apache.poi.sl.usermodel.TextParagraph.TextAlign;
import org.apache.poi.xslf.XSLFTestDataSamples;
-import org.junit.Assume;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Yegor Kozlov
@@ -159,7 +160,7 @@ public class TestXSLFTextParagraph {
@Test
public void testBreakLines() throws IOException {
String os = System.getProperty("os.name");
- Assume.assumeTrue("Skipping testBreakLines(), it is executed only on Windows machines", (os != null && os.contains("Windows")));
+ assumeTrue((os != null && os.contains("Windows")), "Skipping testBreakLines(), it is executed only on Windows machines");
XMLSlideShow ppt = new XMLSlideShow();
XSLFSlide slide = ppt.createSlide();
@@ -363,7 +364,7 @@ public class TestXSLFTextParagraph {
ppt.close();
}
- @Test(expected = IllegalStateException.class)
+ @Test
public void testLineBreak() throws IOException {
try (XMLSlideShow ppt = new XMLSlideShow()) {
XSLFSlide slide = ppt.createSlide();
@@ -385,7 +386,7 @@ public class TestXSLFTextParagraph {
assertEquals("Hello,\nWorld!\n", sh.getText());
// "You cannot change text of a line break, it is always '\\n'"
- r2.setText("aaa");
+ assertThrows(IllegalStateException.class, () -> r2.setText("aaa"));
}
}
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java Thu Dec 24 18:42:29 2020
@@ -19,10 +19,10 @@
package org.apache.poi.xslf.usermodel;
import static org.apache.poi.sl.usermodel.BaseTestSlideShow.getColor;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.awt.Color;
import java.io.IOException;
@@ -30,7 +30,7 @@ import java.io.InputStream;
import org.apache.poi.POIDataSamples;
import org.apache.poi.sl.draw.DrawTextParagraph;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openxmlformats.schemas.drawingml.x2006.main.CTTextLineBreak;
import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraph;
import org.openxmlformats.schemas.presentationml.x2006.main.CTShape;
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java Thu Dec 24 18:42:29 2020
@@ -18,13 +18,13 @@ package org.apache.poi.xslf.usermodel;
import static org.apache.poi.sl.usermodel.BaseTestSlideShow.getColor;
import static org.apache.poi.xslf.usermodel.TestXSLFSimpleShape.getSpPr;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
import java.awt.Color;
import java.io.File;
@@ -43,8 +43,8 @@ import org.apache.poi.xddf.usermodel.tex
import org.apache.poi.xddf.usermodel.text.XDDFTextBody;
import org.apache.poi.xddf.usermodel.text.XDDFTextParagraph;
import org.apache.poi.xslf.XSLFTestDataSamples;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.openxmlformats.schemas.drawingml.x2006.main.CTTextBodyProperties;
import org.openxmlformats.schemas.drawingml.x2006.main.CTTextCharacterProperties;
import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraphProperties;
@@ -55,7 +55,7 @@ import org.openxmlformats.schemas.presen
public class TestXSLFTextShape {
private static boolean xslfOnly;
- @BeforeClass
+ @BeforeAll
public static void checkHslf() {
try {
Class.forName("org.apache.poi.hslf.usermodel.HSLFSlideShow");
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java Thu Dec 24 18:42:29 2020
@@ -17,10 +17,10 @@
package org.apache.poi.xslf.usermodel;
import static org.apache.poi.sl.usermodel.BaseTestSlideShow.getColor;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.awt.Color;
import java.util.List;
@@ -30,7 +30,7 @@ import org.apache.poi.sl.usermodel.Paint
import org.apache.poi.sl.usermodel.PaintStyle.SolidPaint;
import org.apache.poi.sl.usermodel.PaintStyle.TexturePaint;
import org.apache.poi.xslf.XSLFTestDataSamples;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* test reading properties from a multi-theme and multi-master document
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java Thu Dec 24 18:42:29 2020
@@ -17,8 +17,9 @@
package org.apache.poi.xssf;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRow;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSheetData;
@@ -30,7 +31,7 @@ public class TestNecessaryOOXMLClasses {
CTRow row = CTRow.Factory.newInstance();
CTSheetData sheetData = CTSheetData.Factory.newInstance();
// need to get the inner class that implements the row list class loaded
- Assert.assertTrue(sheetData.getRowList().add(row));
- Assert.assertTrue(sheetData.getRowList().iterator().hasNext());
+ assertTrue(sheetData.getRowList().add(row));
+ assertTrue(sheetData.getRowList().iterator().hasNext());
}
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestSheetProtection.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestSheetProtection.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestSheetProtection.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestSheetProtection.java Thu Dec 24 18:42:29 2020
@@ -18,26 +18,26 @@ package org.apache.poi.xssf;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class TestSheetProtection {
private XSSFWorkbook workbook;
private XSSFSheet sheet;
-
- @Before
+
+ @BeforeEach
public void setUp() {
workbook = XSSFTestDataSamples.openSampleWorkbook("sheetProtection_not_protected.xlsx");
sheet = workbook.getSheetAt(0);
}
- @After
+ @AfterEach
public void tearDown() throws IOException {
workbook.close();
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java Thu Dec 24 18:42:29 2020
@@ -18,10 +18,10 @@ package org.apache.poi.xssf;
import static org.apache.poi.xssf.XSSFTestDataSamples.openSampleWorkbook;
import static org.apache.poi.xssf.XSSFTestDataSamples.writeOutAndReadBack;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.FileInputStream;
@@ -42,14 +42,14 @@ import org.apache.poi.xssf.usermodel.XSS
import org.apache.poi.xssf.usermodel.XSSFRow;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestWorkbookProtection {
@Test
public void workbookAndRevisionPassword() throws Exception {
String password = "test";
-
+
// validate password with an actual office file (Excel 2010)
try (XSSFWorkbook workbook = openSampleWorkbook("workbookProtection-workbook_password_user_range-2010.xlsx")) {
assertTrue(workbook.validateWorkbookPassword(password));
@@ -94,7 +94,7 @@ public class TestWorkbookProtection {
assertTrue(workbook.validateRevisionsPassword(password));
}
}
-
+
@Test
public void shouldReadWorkbookProtection() throws Exception {
try (XSSFWorkbook workbook = openSampleWorkbook("workbookProtection_not_protected.xlsx")) {
@@ -181,7 +181,7 @@ public class TestWorkbookProtection {
}
}
}
-
+
@SuppressWarnings("resource")
@Test
public void testIntegration() throws Exception {
@@ -199,7 +199,7 @@ public class TestWorkbookProtection {
}
}
}
-
+
@Test
public void testEncryptDecrypt() throws Exception {
final String password = "abc123";
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFCloneSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFCloneSheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFCloneSheet.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFCloneSheet.java Thu Dec 24 18:42:29 2020
@@ -17,24 +17,21 @@
package org.apache.poi.xssf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.poi.hssf.HSSFITestDataProvider;
import org.apache.poi.ss.usermodel.BaseTestCloneSheet;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.util.TempFile;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.OutputStream;
public class TestXSSFCloneSheet extends BaseTestCloneSheet {
public TestXSSFCloneSheet() {
@@ -45,10 +42,10 @@ public class TestXSSFCloneSheet extends
private static final String VALID_SHEET_NAME = "Sheet01";
private XSSFWorkbook wb;
- @Before
+ @BeforeEach
public void setUp() {
wb = new XSSFWorkbook();
- wb.createSheet(VALID_SHEET_NAME);
+ wb.createSheet(VALID_SHEET_NAME);
}
@Test
@@ -57,15 +54,10 @@ public class TestXSSFCloneSheet extends
assertEquals(OTHER_SHEET_NAME, cloned.getSheetName());
assertEquals(2, wb.getNumberOfSheets());
}
-
+
@Test
public void testCloneSheetIntStringInvalidName() {
- try {
- wb.cloneSheet(0, VALID_SHEET_NAME);
- fail("Should fail");
- } catch (IllegalArgumentException e) {
- // expected here
- }
+ assertThrows(IllegalArgumentException.class, () -> wb.cloneSheet(0, VALID_SHEET_NAME));
assertEquals(1, wb.getNumberOfSheets());
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFOffset.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFOffset.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFOffset.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFOffset.java Thu Dec 24 18:42:29 2020
@@ -23,9 +23,9 @@ import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class TestXSSFOffset {
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/XSSFMemoryLeakTests.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/XSSFMemoryLeakTests.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/XSSFMemoryLeakTests.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/XSSFMemoryLeakTests.java Thu Dec 24 18:42:29 2020
@@ -17,6 +17,16 @@
package org.apache.poi.xssf;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.poi.ooxml.POIXMLException;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.openxml4j.opc.OPCPackage;
@@ -25,20 +35,10 @@ import org.apache.poi.xssf.usermodel.XSS
import org.apache.poi.xssf.usermodel.XSSFRow;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCell;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
-
/**
* A test which uses {@link MemoryLeakVerifier} to ensure that certain
* objects are not left over in memory after the test.
@@ -52,9 +52,9 @@ public class XSSFMemoryLeakTests {
// verify that they do not keep certain objects in memory,
// e.g. nested CT... objects which should be released
@SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
- private List<Object> references = new ArrayList<>();
+ private final List<Object> references = new ArrayList<>();
- @After
+ @AfterEach
public void tearDown() {
verifier.assertGarbageCollected();
}
@@ -76,10 +76,8 @@ public class XSSFMemoryLeakTests {
}
CTCell ctCell = cell.getCTCell();
- assertSame("The CTCell should not be replaced",
- cell.getCTCell(), ctCell);
- assertSame("The CTCell in the row should not be replaced",
- row.getCTRow().getCArray(0), ctCell);
+ assertSame(cell.getCTCell(), ctCell, "The CTCell should not be replaced");
+ assertSame(row.getCTRow().getCArray(0), ctCell, "The CTCell in the row should not be replaced");
wb.close();
}
@@ -147,23 +145,19 @@ public class XSSFMemoryLeakTests {
wb1.close();
}
- @Test(expected = POIXMLException.class)
- public void testFileLeak() throws IOException, InvalidFormatException {
+ @Test
+ public void testFileLeak() {
File file = XSSFTestDataSamples.getSampleFile("xlsx-corrupted.xlsx");
verifier.addObject(file);
- try (XSSFWorkbook ignored = new XSSFWorkbook(file)) {
- fail("Should catch exception as the file is corrupted");
- }
+ assertThrows(POIXMLException.class, () -> new XSSFWorkbook(file), "Should catch exception as the file is corrupted");
}
- @Test(expected = POIXMLException.class)
+ @Test
public void testFileLeak2() throws IOException, InvalidFormatException {
File file = XSSFTestDataSamples.getSampleFile("xlsx-corrupted.xlsx");
verifier.addObject(file);
try (OPCPackage pkg = OPCPackage.open(file)) {
- try (XSSFWorkbook ignored = new XSSFWorkbook(pkg)) {
- fail("Should catch exception as the file is corrupted");
- }
+ assertThrows(POIXMLException.class, () -> new XSSFWorkbook(pkg), "Should catch exception as the file is corrupted");
}
}
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSharedStringsTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSharedStringsTable.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSharedStringsTable.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSharedStringsTable.java Thu Dec 24 18:42:29 2020
@@ -17,7 +17,7 @@
package org.apache.poi.xssf.binary;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
import java.util.regex.Pattern;
@@ -25,7 +25,7 @@ import java.util.regex.Pattern;
import org.apache.poi.POIDataSamples;
import org.apache.poi.openxml4j.opc.OPCPackage;
import org.apache.poi.openxml4j.opc.PackagePart;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestXSSFBSharedStringsTable {
private static POIDataSamples _ssTests = POIDataSamples.getSpreadSheetInstance();
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSheetHyperlinkManager.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSheetHyperlinkManager.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSheetHyperlinkManager.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSheetHyperlinkManager.java Thu Dec 24 18:42:29 2020
@@ -17,8 +17,8 @@
package org.apache.poi.xssf.binary;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.List;
@@ -27,7 +27,7 @@ import org.apache.poi.openxml4j.opc.OPCP
import org.apache.poi.ss.util.CellAddress;
import org.apache.poi.xssf.eventusermodel.XSSFBReader;
import org.apache.poi.xssf.eventusermodel.XSSFReader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestXSSFBSheetHyperlinkManager {
private static POIDataSamples _ssTests = POIDataSamples.getSpreadSheetInstance();
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java Thu Dec 24 18:42:29 2020
@@ -19,7 +19,7 @@
package org.apache.poi.xssf.eventusermodel;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import java.util.List;
@@ -31,8 +31,7 @@ import org.apache.poi.openxml4j.opc.Pack
import org.apache.poi.ss.usermodel.RichTextString;
import org.apache.poi.xssf.model.SharedStringsTable;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.xml.sax.SAXException;
/**
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java Thu Dec 24 18:42:29 2020
@@ -18,8 +18,8 @@
package org.apache.poi.xssf.eventusermodel;
import static org.apache.poi.POITestCase.assertContains;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.InputStream;
import java.util.ArrayList;
@@ -32,7 +32,7 @@ import org.apache.poi.xssf.binary.XSSFBS
import org.apache.poi.xssf.binary.XSSFBSheetHandler;
import org.apache.poi.xssf.binary.XSSFBStylesTable;
import org.apache.poi.xssf.usermodel.XSSFComment;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestXSSFBReader {
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java Thu Dec 24 18:42:29 2020
@@ -19,12 +19,13 @@ package org.apache.poi.xssf.eventusermod
import static org.apache.poi.POITestCase.assertContains;
import static org.apache.poi.POITestCase.assertNotContained;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.InputStream;
import java.util.HashSet;
@@ -43,15 +44,15 @@ import org.apache.poi.xssf.model.Comment
import org.apache.poi.xssf.model.StylesTable;
import org.apache.poi.xssf.usermodel.XSSFShape;
import org.apache.poi.xssf.usermodel.XSSFSimpleShape;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link XSSFReader}
*/
public final class TestXSSFReader {
- private static POIDataSamples _ssTests = POIDataSamples.getSpreadSheetInstance();
+ private static final POIDataSamples _ssTests = POIDataSamples.getSpreadSheetInstance();
@Test
public void testGetBits() throws Exception {
@@ -231,24 +232,19 @@ public final class TestXSSFReader {
@Test
public void testBug57914() throws Exception {
try (OPCPackage pkg = XSSFTestDataSamples.openSamplePackage("57914.xlsx")) {
- final XSSFReader r;
-
// for now expect this to fail, when we fix 57699, this one should fail so we know we should adjust
// this test as well
- try {
- r = new XSSFReader(pkg);
- fail("This will fail until bug 57699 is fixed");
- } catch (POIXMLException e) {
- assertContains(e.getMessage(), "57699");
- return;
- }
+ POIXMLException e = assertThrows(POIXMLException.class, () -> {
+ final XSSFReader r = new XSSFReader(pkg);
- XSSFReader.SheetIterator it = (XSSFReader.SheetIterator) r.getSheetsData();
+ XSSFReader.SheetIterator it = (XSSFReader.SheetIterator) r.getSheetsData();
- String text = getShapesString(it);
- assertContains(text, "Line 1");
- assertContains(text, "Line 2");
- assertContains(text, "Line 3");
+ String text = getShapesString(it);
+ assertContains(text, "Line 1");
+ assertContains(text, "Line 2");
+ assertContains(text, "Line 3");
+ });
+ assertContains(e.getMessage(), "57699");
}
}
@@ -322,7 +318,7 @@ public final class TestXSSFReader {
}
@Test
- @Ignore("until we fix issue https://bz.apache.org/bugzilla/show_bug.cgi?id=61701")
+ @Disabled("until we fix issue https://bz.apache.org/bugzilla/show_bug.cgi?id=61701")
public void test61701() throws Exception {
try(Workbook workbook = XSSFTestDataSamples.openSampleWorkbook("simple-table-named-range.xlsx")) {
Name name = workbook.getName("total");
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java Thu Dec 24 18:42:29 2020
@@ -20,11 +20,11 @@ package org.apache.poi.xssf.extractor;
import static org.apache.poi.POITestCase.assertContains;
import static org.apache.poi.POITestCase.assertStartsWith;
import static org.apache.poi.POITestCase.assertEndsWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.BufferedReader;
import java.nio.charset.StandardCharsets;
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java Thu Dec 24 18:42:29 2020
@@ -20,10 +20,10 @@ package org.apache.poi.xssf.extractor;
import static org.apache.poi.POITestCase.assertContains;
import static org.apache.poi.POITestCase.assertStartsWith;
import static org.apache.poi.POITestCase.assertEndsWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -33,7 +33,7 @@ import org.apache.poi.ooxml.extractor.PO
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.extractor.ExcelExtractor;
import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link XSSFEventBasedExcelExtractor}
@@ -52,26 +52,26 @@ public class TestXSSFEventBasedExcelExtr
// a very simple file
XSSFEventBasedExcelExtractor extractor = getExtractor("sample.xlsx");
extractor.getText();
-
+
String text = extractor.getText();
assertTrue(text.length() > 0);
-
+
// Check sheet names
assertStartsWith(text, "Sheet1");
assertEndsWith(text, "Sheet3\n");
-
+
// Now without, will have text
extractor.setIncludeSheetNames(false);
text = extractor.getText();
String CHUNK1 =
- "Lorem\t111\n" +
- "ipsum\t222\n" +
- "dolor\t333\n" +
- "sit\t444\n" +
- "amet\t555\n" +
- "consectetuer\t666\n" +
- "adipiscing\t777\n" +
- "elit\t888\n" +
+ "Lorem\t111\n" +
+ "ipsum\t222\n" +
+ "dolor\t333\n" +
+ "sit\t444\n" +
+ "amet\t555\n" +
+ "consectetuer\t666\n" +
+ "adipiscing\t777\n" +
+ "elit\t888\n" +
"Nunc\t999\n";
String CHUNK2 =
"The quick brown fox jumps over the lazy dog\n" +
@@ -80,52 +80,52 @@ public class TestXSSFEventBasedExcelExtr
"hello, xssf hello, xssf\n" +
"hello, xssf hello, xssf\n";
assertEquals(
- CHUNK1 +
- "at\t4995\n" +
+ CHUNK1 +
+ "at\t4995\n" +
CHUNK2
, text);
-
+
// Now get formulas not their values
extractor.setFormulasNotResults(true);
text = extractor.getText();
assertEquals(
CHUNK1 +
- "at\tSUM(B1:B9)\n" +
+ "at\tSUM(B1:B9)\n" +
CHUNK2, text);
-
+
// With sheet names too
extractor.setIncludeSheetNames(true);
text = extractor.getText();
assertEquals(
"Sheet1\n" +
CHUNK1 +
- "at\tSUM(B1:B9)\n" +
+ "at\tSUM(B1:B9)\n" +
"rich test\n" +
CHUNK2 +
"Sheet3\n"
, text);
-
+
extractor.close();
}
-
+
@Test
public void testGetComplexText() throws Exception {
// A fairly complex file
XSSFEventBasedExcelExtractor extractor = getExtractor("AverageTaxRates.xlsx");
extractor.getText();
-
+
String text = extractor.getText();
assertTrue(text.length() > 0);
-
+
// Might not have all formatting it should do!
- assertStartsWith(text,
+ assertStartsWith(text,
"Avgtxfull\n" +
- "(iii) AVERAGE TAX RATES ON ANNUAL"
+ "(iii) AVERAGE TAX RATES ON ANNUAL"
);
-
+
extractor.close();
}
-
+
@Test
public void testInlineStrings() throws Exception {
XSSFEventBasedExcelExtractor extractor = getExtractor("InlineStrings.xlsx");
@@ -135,7 +135,7 @@ public class TestXSSFEventBasedExcelExtr
// Numbers
assertContains(text, "43");
assertContains(text, "22");
-
+
// Strings
assertContains(text, "ABCDE");
assertContains(text, "Long Text");
@@ -150,7 +150,7 @@ public class TestXSSFEventBasedExcelExtr
extractor.close();
}
-
+
/**
* Test that we return pretty much the same as
* ExcelExtractor does, when we're both passed
@@ -163,7 +163,7 @@ public class TestXSSFEventBasedExcelExtr
ExcelExtractor ole2Extractor =
new ExcelExtractor(HSSFTestDataSamples.openSampleWorkbook("SampleSS.xls"));
-
+
POITextExtractor[] extractors =
new POITextExtractor[] { ooxmlExtractor, ole2Extractor };
for (POITextExtractor extractor : extractors) {
@@ -171,17 +171,14 @@ public class TestXSSFEventBasedExcelExtr
assertStartsWith(text, "First Sheet\nTest spreadsheet\n2nd row2nd row 2nd column\n");
Pattern pattern = Pattern.compile(".*13(\\.0+)?\\s+Sheet3.*", Pattern.DOTALL);
Matcher m = pattern.matcher(text);
- assertTrue(m.matches());
+ assertTrue(m.matches());
}
-
+
ole2Extractor.close();
ooxmlExtractor.close();
}
-
- /**
- * Test text extraction from text box using getShapes()
- * @throws Exception
- */
+
+ /** Test text extraction from text box using getShapes() */
@Test
public void testShapes() throws Exception{
@@ -304,7 +301,7 @@ public class TestXSSFEventBasedExcelExtr
assertEquals(eventBasedExtractorOutputWithComments, fixture.getText());
}
}
-
+
@Test
public void testFile56278_normal() throws Exception {
// first with normal Text Extractor
@@ -313,7 +310,7 @@ public class TestXSSFEventBasedExcelExtr
assertNotNull(extractor.getText());
}
}
-
+
@Test
public void testFile56278_event() throws Exception {
// then with event based one
@@ -349,7 +346,8 @@ public class TestXSSFEventBasedExcelExtr
XSSFTestDataSamples.openSamplePackage("51519.xlsx"));
ex.setConcatenatePhoneticRuns(false);
text = ex.getText();
- assertFalse("should not be able to find appended phonetic run", text.contains("\u65E5\u672C\u30AA\u30E9\u30AF\u30EB \u30CB\u30DB\u30F3"));
+ assertFalse(text.contains("\u65E5\u672C\u30AA\u30E9\u30AF\u30EB \u30CB\u30DB\u30F3"),
+ "should not be able to find appended phonetic run");
ex.close();
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java Thu Dec 24 18:42:29 2020
@@ -18,7 +18,7 @@ package org.apache.poi.xssf.extractor;
import org.apache.poi.extractor.ExtractorFactory;
import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.junit.After;
+import org.junit.jupiter.api.AfterEach;
public class TestXSSFEventBasedExcelExtractorUsingFactory extends TestXSSFEventBasedExcelExtractor {
@@ -28,7 +28,7 @@ public class TestXSSFEventBasedExcelExtr
return (XSSFEventBasedExcelExtractor) ExtractorFactory.createExtractor(HSSFTestDataSamples.openSampleFileStream(sampleName));
}
- @After
+ @AfterEach
public void tearDown() {
// reset setting to not affect other tests
ExtractorFactory.setAllThreadsPreferEventExtractors(null);
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java Thu Dec 24 18:42:29 2020
@@ -21,8 +21,8 @@ import static org.apache.poi.POITestCase
import static org.apache.poi.POITestCase.assertEndsWith;
import static org.apache.poi.POITestCase.assertNotContained;
import static org.apache.poi.POITestCase.assertStartsWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.util.HashMap;
@@ -35,7 +35,7 @@ import org.apache.poi.extractor.POITextE
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.extractor.ExcelExtractor;
import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link XSSFExcelExtractor}
@@ -149,7 +149,7 @@ public class TestXSSFExcelExtractor {
assertStartsWith(filename, text, "First Sheet\nTest spreadsheet\n2nd row2nd row 2nd column\n");
Pattern pattern = Pattern.compile(".*13(\\.0+)?\\s+Sheet3.*", Pattern.DOTALL);
Matcher m = pattern.matcher(text);
- assertTrue(filename, m.matches());
+ assertTrue(m.matches(), filename);
}
ole2Extractor.close();
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java Thu Dec 24 18:42:29 2020
@@ -19,7 +19,7 @@ package org.apache.poi.xssf.extractor;
import org.apache.poi.extractor.ExtractorFactory;
import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.junit.After;
+import org.junit.jupiter.api.AfterEach;
/**
* Tests for {@link XSSFExcelExtractor}
@@ -36,7 +36,7 @@ public final class TestXSSFExcelExtracto
}
}
- @After
+ @AfterEach
public void tearDown() {
// reset setting to not affect other tests
ExtractorFactory.setAllThreadsPreferEventExtractors(null);
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java Thu Dec 24 18:42:29 2020
@@ -17,10 +17,11 @@
package org.apache.poi.xssf.extractor;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -44,8 +45,8 @@ import org.apache.poi.xssf.XSSFTestDataS
import org.apache.poi.xssf.model.MapInfo;
import org.apache.poi.xssf.usermodel.XSSFMap;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
@@ -218,7 +219,7 @@ public final class TestXSSFExportToXML {
}
@Test
- @Ignore(value="Fails, but I don't know if it is ok or not...")
+ @Disabled(value="Fails, but I don't know if it is ok or not...")
public void testExportToXMLSingleAttributeNamespace() throws Exception {
try (XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXMLMapping-singleattributenamespace.xlsx")) {
@@ -245,7 +246,7 @@ public final class TestXSSFExportToXML {
XSSFMap map = mapInfo.getXSSFMapById(2);
- assertNotNull("XSSFMap is null", map);
+ assertNotNull(map, "XSSFMap is null");
XSSFExportToXml exporter = new XSSFExportToXml(map);
ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -289,7 +290,7 @@ public final class TestXSSFExportToXML {
XSSFMap map = mapInfo.getXSSFMapById(1);
- assertNotNull("XSSFMap is null", map);
+ assertNotNull(map, "XSSFMap is null");
XSSFExportToXml exporter = new XSSFExportToXml(map);
ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -324,7 +325,7 @@ public final class TestXSSFExportToXML {
XSSFMap map = mapInfo.getXSSFMapById(1);
- assertNotNull("XSSFMap is null", map);
+ assertNotNull(map, "XSSFMap is null");
XSSFExportToXml exporter = new XSSFExportToXml(map);
ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -363,7 +364,7 @@ public final class TestXSSFExportToXML {
XSSFMap map = mapInfo.getXSSFMapById(1);
- assertNotNull("XSSFMap is null", map);
+ assertNotNull(map, "XSSFMap is null");
XSSFExportToXml exporter = new XSSFExportToXml(map);
ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -421,6 +422,7 @@ public final class TestXSSFExportToXML {
}
}
+ @SuppressWarnings("EqualsWithItself")
@Test
public void testXmlExportCompare_Bug_55923() throws Exception {
try (XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("55923.xlsx")) {
@@ -435,7 +437,7 @@ public final class TestXSSFExportToXML {
XSSFMap map = mapInfo.getXSSFMapById(4);
- assertNotNull("XSSFMap is null", map);
+ assertNotNull(map, "XSSFMap is null");
XSSFExportToXml exporter = new XSSFExportToXml(map);
assertEquals(0, exporter.compare("", ""));
@@ -466,7 +468,7 @@ public final class TestXSSFExportToXML {
XSSFMap map = mapInfo.getXSSFMapById(4);
- assertNotNull("XSSFMap is null", map);
+ assertNotNull(map, "XSSFMap is null");
XSSFExportToXml exporter = new XSSFExportToXml(map);
ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -544,7 +546,7 @@ public final class TestXSSFExportToXML {
XSSFMap map = mapInfo.getXSSFMapById(4);
- assertNotNull("XSSFMap is null", map);
+ assertNotNull(map, "XSSFMap is null");
XSSFExportToXml exporter = new XSSFExportToXml(map);
ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -575,7 +577,7 @@ public final class TestXSSFExportToXML {
XSSFMap map = mapInfo.getXSSFMapById(4);
- assertNotNull("XSSFMap is null", map);
+ assertNotNull(map, "XSSFMap is null");
XSSFExportToXml exporter = new XSSFExportToXml(map);
ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -607,7 +609,7 @@ public final class TestXSSFExportToXML {
XSSFMap map = mapInfo.getXSSFMapById(1);
- assertNotNull("XSSFMap is null", map);
+ assertNotNull(map, "XSSFMap is null");
XSSFExportToXml exporter = new XSSFExportToXml(map);
ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -657,13 +659,13 @@ public final class TestXSSFExportToXML {
}
}
- @Test(expected = SAXParseException.class)
+ @Test
public void testXXEInSchema() throws Exception {
try (XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("xxe_in_schema.xlsx")) {
for (XSSFMap map : wb.getCustomXMLMappings()) {
XSSFExportToXml exporter = new XSSFExportToXml(map);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
- exporter.exportToXML(bos, true);
+ assertThrows(SAXParseException.class, () -> exporter.exportToXML(bos, true));
}
}
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java Thu Dec 24 18:42:29 2020
@@ -17,10 +17,11 @@
package org.apache.poi.xssf.extractor;
+import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.poi.xssf.usermodel.XSSFRelation.NS_SPREADSHEETML;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.IOException;
import java.text.DateFormatSymbols;
@@ -37,7 +38,8 @@ import org.apache.poi.xssf.usermodel.XSS
import org.apache.poi.xssf.usermodel.XSSFRow;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.xml.sax.SAXException;
public class TestXSSFImportFromXML {
@@ -85,7 +87,8 @@ public class TestXSSFImportFromXML {
}
}
- @Test(timeout=60000)
+ @Timeout(value = 60, unit = SECONDS)
+ @Test
public void testMultiTable() throws IOException, XPathExpressionException, SAXException{
try (XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXMLMappings-complex-type.xlsx")) {
String cellC6 = "c6";
@@ -196,7 +199,7 @@ public class TestXSSFImportFromXML {
// Value for OptionalRating is declared optional (minOccurs=0) in 55864.xlsx
assertEquals("OptionalRating", rowHeadings.getCell(3).getStringCellValue());
- assertNull("", rowData.getCell(3));
+ assertNull(rowData.getCell(3), "");
}
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java Thu Dec 24 18:42:29 2020
@@ -17,8 +17,8 @@
package org.apache.poi.xssf.io;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.List;
@@ -29,7 +29,7 @@ import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.xssf.usermodel.XSSFPictureData;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestLoadSaveXSSF {
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestCalculationChain.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestCalculationChain.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestCalculationChain.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestCalculationChain.java Thu Dec 24 18:42:29 2020
@@ -17,7 +17,7 @@
package org.apache.poi.xssf.model;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
@@ -26,7 +26,7 @@ import org.apache.poi.xssf.XSSFTestDataS
import org.apache.poi.xssf.usermodel.XSSFCell;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCalcCell;
public final class TestCalculationChain {
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestCommentsTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestCommentsTable.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestCommentsTable.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestCommentsTable.java Thu Dec 24 18:42:29 2020
@@ -17,12 +17,12 @@
package org.apache.poi.xssf.model;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
@@ -40,7 +40,7 @@ import org.apache.poi.xssf.usermodel.XSS
import org.apache.poi.xssf.usermodel.XSSFRichTextString;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTComment;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCommentList;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTComments;
@@ -217,7 +217,7 @@ public class TestCommentsTable {
final CellAddress addrA1 = new CellAddress("A1");
final CellAddress addrA2 = new CellAddress("A2");
final CellAddress addrA3 = new CellAddress("A3");
-
+
CommentsTable sheetComments = new CommentsTable();
CTComment a1 = sheetComments.newComment(addrA1);
CTComment a2 = sheetComments.newComment(addrA2);
@@ -261,28 +261,28 @@ public class TestCommentsTable {
//Cell A1 = getCell(sheet, 2, 2);
Drawing<?> drawing = sheet.createDrawingPatriarch();
setComment(A1, drawing, "for A1", helper, anchor);
-
+
// find comment in A1 before we set the comment in B2
Comment commentA1 = A1.getCellComment();
- assertNotNull("Should still find the previous comment in A1, but had null", commentA1);
- assertEquals("should find correct comment in A1, but had null: " + commentA1, "for A1", commentA1.getString().getString());
-
+ assertNotNull(commentA1, "Should still find the previous comment in A1, but had null");
+ assertEquals("for A1", commentA1.getString().getString(), "should find correct comment in A1, but had null: " + commentA1);
+
// place comment in B2, according to Bug 54920 this removes the comment in A1!
Cell B2 = getCell(sheet, 1, 1);
setComment(B2, drawing, "for B2", helper, anchor);
// find comment in A1
Comment commentB2 = B2.getCellComment();
- assertEquals("should find correct comment in B2, but had null: " + commentB2, "for B2", commentB2.getString().getString());
-
+ assertEquals("for B2", commentB2.getString().getString(), "should find correct comment in B2, but had null: " + commentB2);
+
// find comment in A1
commentA1 = A1.getCellComment();
- assertNotNull("Should still find the previous comment in A1, but had null", commentA1);
- assertEquals("should find correct comment in A1, but had null: " + commentA1, "for A1", commentA1.getString().getString());
-
+ assertNotNull(commentA1, "Should still find the previous comment in A1, but had null");
+ assertEquals("for A1", commentA1.getString().getString(), "should find correct comment in A1, but had null: " + commentA1);
+
workbook.close();
}
-
+
// Set the comment on a sheet
//
private static void setComment(Cell cell, Drawing<?> drawing, String commentText, CreationHelper helper, ClientAnchor anchor) {
@@ -290,7 +290,7 @@ public class TestCommentsTable {
anchor.setCol2(cell.getColumnIndex());
anchor.setRow1(cell.getRowIndex());
anchor.setRow2(cell.getRowIndex());
-
+
// get comment, or create if it does not exist
// NOTE - only occurs if getCellComment is called first
Comment comment = cell.getCellComment();
@@ -299,12 +299,12 @@ public class TestCommentsTable {
comment = drawing.createCellComment(anchor);
}
comment.setAuthor("Test");
-
+
// attach the comment to the cell
comment.setString(helper.createRichTextString(commentText));
cell.setCellComment(comment);
}
-
+
// Get a cell, create as needed
//
private static Cell getCell(Sheet sheet, int rowIndex, int colIndex) {
@@ -312,12 +312,12 @@ public class TestCommentsTable {
if (row == null) {
row = sheet.createRow(rowIndex);
}
-
+
Cell cell = row.getCell(colIndex);
if (cell == null) {
cell = row.createCell(colIndex);
}
-
+
return cell;
}
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestExternalLinksTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestExternalLinksTable.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestExternalLinksTable.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestExternalLinksTable.java Thu Dec 24 18:42:29 2020
@@ -17,16 +17,16 @@
package org.apache.poi.xssf.model;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.io.IOException;
import org.apache.poi.ss.usermodel.Name;
import org.apache.poi.xssf.XSSFTestDataSamples;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
-
-import java.io.IOException;
+import org.junit.jupiter.api.Test;
public final class TestExternalLinksTable {
@Test
@@ -36,7 +36,7 @@ public final class TestExternalLinksTabl
assertEquals(0, wb.getExternalLinksTable().size());
}
}
-
+
@Test
public void basicRead() throws IOException {
try (XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("ref-56737.xlsx")) {
@@ -66,7 +66,7 @@ public final class TestExternalLinksTabl
assertEquals("56737.xlsx", links.getLinkedFileName());
}
}
-
+
@Test
public void basicReadWriteRead() throws IOException {
try (XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("ref-56737.xlsx")) {
@@ -91,7 +91,7 @@ public final class TestExternalLinksTabl
assertEquals("$A$1", name.getRefersToFormula());
}
}
-
+
@Test
public void readWithReferencesToTwoExternalBooks() throws IOException {
try (XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("ref2-56737.xlsx")) {
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestMapInfo.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestMapInfo.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestMapInfo.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestMapInfo.java Thu Dec 24 18:42:29 2020
@@ -16,20 +16,20 @@
==================================================================== */
package org.apache.poi.xssf.model;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.io.IOException;
+
import org.apache.poi.ooxml.POIXMLDocumentPart;
import org.apache.poi.xssf.XSSFTestDataSamples;
import org.apache.poi.xssf.usermodel.XSSFMap;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTMapInfo;
import org.w3c.dom.Node;
-import java.io.IOException;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
/**
* @author Roberto Manicardi
*/
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestSharedStringsTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestSharedStringsTable.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestSharedStringsTable.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestSharedStringsTable.java Thu Dec 24 18:42:29 2020
@@ -17,8 +17,8 @@
package org.apache.poi.xssf.model;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -35,7 +35,7 @@ import org.apache.poi.xssf.XSSFTestDataS
import org.apache.poi.xssf.usermodel.XSSFFont;
import org.apache.poi.xssf.usermodel.XSSFRichTextString;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRElt;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRPrElt;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRst;
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestStylesTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestStylesTable.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestStylesTable.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestStylesTable.java Thu Dec 24 18:42:29 2020
@@ -17,14 +17,15 @@
package org.apache.poi.xssf.model;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
import java.util.Map;
@@ -39,8 +40,8 @@ import org.apache.poi.xssf.usermodel.XSS
public final class TestStylesTable {
private static final String testFile = "Formatting.xlsx";
private static final String customDataFormat = "YYYY-mm-dd";
-
- @BeforeClass
+
+ @BeforeAll
public static void assumeCustomDataFormatIsNotBuiltIn() {
assertEquals(-1, BuiltinFormats.getBuiltinFormat(customDataFormat));
}
@@ -120,7 +121,7 @@ public final class TestStylesTable {
assertNotNull(st.getStyleAt(0));
assertNotNull(st.getStyleAt(1));
assertNotNull(st.getStyleAt(2));
-
+
assertEquals(0, st.getStyleAt(0).getDataFormat());
assertEquals(14, st.getStyleAt(1).getDataFormat());
assertEquals(0, st.getStyleAt(2).getDataFormat());
@@ -189,7 +190,7 @@ public final class TestStylesTable {
assertNotNull(XSSFTestDataSamples.writeOutAndReadBack(workbook));
}
}
-
+
@Test
public void exceedNumberFormatLimit() throws IOException {
try (XSSFWorkbook wb = new XSSFWorkbook()) {
@@ -206,14 +207,14 @@ public final class TestStylesTable {
}
}
}
-
+
private static <K,V> void assertNotContainsKey(Map<K,V> map, K key) {
assertFalse(map.containsKey(key));
}
private static <K,V> void assertNotContainsValue(Map<K,V> map, V value) {
assertFalse(map.containsValue(value));
}
-
+
@Test
public void removeNumberFormat() throws IOException {
try (XSSFWorkbook wb1 = new XSSFWorkbook()) {
@@ -230,14 +231,8 @@ public final class TestStylesTable {
assertEquals(fmt, wb1.getStylesSource().getNumberFormatAt(fmtIdx));
// remove the number format from the workbook
- assertTrue("The format is removed on first call",
- wb1.getStylesSource().removeNumberFormat(fmt));
- try {
- wb1.getStylesSource().removeNumberFormat(fmt);
- fail("Should fail here");
- } catch (IllegalStateException e) {
- // expected here
- }
+ assertTrue(wb1.getStylesSource().removeNumberFormat(fmt), "The format is removed on first call");
+ assertThrows(IllegalStateException.class, () -> wb1.getStylesSource().removeNumberFormat(fmt));
// number format in CellStyles should be restored to default number format
final short defaultFmtIdx = 0;
@@ -272,7 +267,7 @@ public final class TestStylesTable {
}
}
}
-
+
@Test
public void maxNumberOfDataFormats() throws IOException {
try (XSSFWorkbook wb = new XSSFWorkbook()) {
@@ -290,17 +285,12 @@ public final class TestStylesTable {
assertEquals(n, styles.getMaxNumberOfDataFormats());
// Check negative (illegal) limits
- try {
- styles.setMaxNumberOfDataFormats(-1);
- fail("Expected to get an IllegalArgumentException(\"Maximum Number of Data Formats must be greater than or equal to 0\")");
- } catch (final IllegalArgumentException e) {
- if (!e.getMessage().startsWith("Maximum Number of Data Formats must be greater than or equal to 0")) {
- throw e;
- }
- }
+ IllegalArgumentException e = assertThrows(IllegalArgumentException.class, () -> styles.setMaxNumberOfDataFormats(-1),
+ "Expected to get an IllegalArgumentException(\"Maximum Number of Data Formats must be greater than or equal to 0\")");
+ assertTrue(e.getMessage().startsWith("Maximum Number of Data Formats must be greater than or equal to 0"));
}
}
-
+
@Test
public void addDataFormatsBeyondUpperLimit() throws IOException {
try (XSSFWorkbook wb = new XSSFWorkbook()) {
@@ -308,17 +298,11 @@ public final class TestStylesTable {
styles.setMaxNumberOfDataFormats(0);
// Try adding a format beyond the upper limit
- try {
- styles.putNumberFormat("\"test \"0");
- fail("Expected to raise IllegalStateException");
- } catch (final IllegalStateException e) {
- if (!e.getMessage().startsWith("The maximum number of Data Formats was exceeded.")) {
- throw e;
- }
- }
+ IllegalStateException e = assertThrows(IllegalStateException.class, () -> styles.putNumberFormat("\"test \"0"));
+ assertTrue(e.getMessage().startsWith("The maximum number of Data Formats was exceeded."));
}
}
-
+
@Test
public void decreaseUpperLimitBelowCurrentNumDataFormats() throws IOException {
try (XSSFWorkbook wb = new XSSFWorkbook()) {
@@ -326,14 +310,8 @@ public final class TestStylesTable {
styles.putNumberFormat(customDataFormat);
// Try decreasing the upper limit below the current number of formats
- try {
- styles.setMaxNumberOfDataFormats(0);
- fail("Expected to raise IllegalStateException");
- } catch (final IllegalStateException e) {
- if (!e.getMessage().startsWith("Cannot set the maximum number of data formats less than the current quantity.")) {
- throw e;
- }
- }
+ IllegalStateException e = assertThrows(IllegalStateException.class, () -> styles.setMaxNumberOfDataFormats(0));
+ assertTrue(e.getMessage().startsWith("Cannot set the maximum number of data formats less than the current quantity."));
}
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java Thu Dec 24 18:42:29 2020
@@ -17,11 +17,11 @@
package org.apache.poi.xssf.model;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -41,7 +41,7 @@ import org.apache.poi.xssf.usermodel.XSS
import org.apache.poi.xssf.usermodel.XSSFRow;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTColor;
public class TestThemesTable {
@@ -101,17 +101,15 @@ public class TestThemesTable {
for (int rn=startRN; rn<rgbExpected.length+startRN; rn++) {
XSSFRow row = sheet.getRow(rn);
- assertNotNull("Missing row " + rn + " in " + whatWorkbook, row);
+ assertNotNull(row, "Missing row " + rn + " in " + whatWorkbook);
String ref = (new CellReference(rn, 0)).formatAsString();
XSSFCell cell = row.getCell(0);
- assertNotNull(
- "Missing cell " + ref + " in " + whatWorkbook, cell);
+ assertNotNull(cell, "Missing cell " + ref + " in " + whatWorkbook);
int expectedThemeIdx = rn-startRN;
ThemeElement themeElem = ThemeElement.byId(expectedThemeIdx);
- assertEquals(
- "Wrong theme at " + ref + " in " + whatWorkbook,
- themeElem.name.toLowerCase(Locale.ROOT), cell.getStringCellValue());
+ assertEquals(themeElem.name.toLowerCase(Locale.ROOT), cell.getStringCellValue(),
+ "Wrong theme at " + ref + " in " + whatWorkbook);
// Fonts are theme-based in their colours
XSSFFont font = cell.getCellStyle().getFont();
@@ -125,13 +123,11 @@ public class TestThemesTable {
// Theme colours aren't tinted
assertFalse(color.hasTint());
// Check the RGB part (no tint)
- assertEquals(
- "Wrong theme colour " + themeElem.name + " on " + whatWorkbook,
- rgbExpected[expectedThemeIdx], Hex.encodeHexString(color.getRGB()));
+ assertEquals(rgbExpected[expectedThemeIdx], Hex.encodeHexString(color.getRGB()),
+ "Wrong theme colour " + themeElem.name + " on " + whatWorkbook);
long themeIdx = font.getCTFont().getColorArray(0).getTheme();
- assertEquals(
- "Wrong theme index " + expectedThemeIdx + " on " + whatWorkbook,
- expectedThemeIdx, themeIdx);
+ assertEquals(expectedThemeIdx, themeIdx,
+ "Wrong theme index " + expectedThemeIdx + " on " + whatWorkbook);
if (createFiles) {
XSSFCellStyle cs = row.getSheet().getWorkbook().createCellStyle();
@@ -181,7 +177,7 @@ public class TestThemesTable {
for (int rn = 1; rn < 8; rn++) {
int idx = rn - 1;
XSSFRow row = sheet.getRow(rn);
- assertNotNull("Missing row " + rn, row);
+ assertNotNull(row, "Missing row " + rn);
// Theme cells come first
XSSFCell themeCell = row.getCell(0);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org