svn commit: r1885341 - /poi/trunk/src/integrationtest/org/apache/poi/stress/BaseIntegrationTest.java
Author: kiwiwings
Date: Sun Jan 10 21:36:32 2021
New Revision: 1885341
URL: http://svn.apache.org/viewvc?rev=1885341=rev
Log:
revert Sonar fixes on BaseIntegrationTest
Modified:
poi/trunk/src/integrationtest/org/apache/poi/stress/BaseIntegrationTest.java
Modified:
poi/trunk/src/integrationtest/org/apache/poi/stress/BaseIntegrationTest.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/integrationtest/org/apache/poi/stress/BaseIntegrationTest.java?rev=1885341=1885340=1885341=diff
==
---
poi/trunk/src/integrationtest/org/apache/poi/stress/BaseIntegrationTest.java
(original)
+++
poi/trunk/src/integrationtest/org/apache/poi/stress/BaseIntegrationTest.java
Sun Jan 10 21:36:32 2021
@@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test;
* types of files/exceptions, e.g. old file formats.
*
*/
-class BaseIntegrationTest {
+public class BaseIntegrationTest {
private final File rootDir;
private final String file;
private FileHandler handler;
@@ -49,7 +49,6 @@ class BaseIntegrationTest {
this.handler = handler;
}
- @Test
void test() throws Exception {
assertNotNull( handler, "Unknown file extension for file: " + file +
": " + TestAllFiles.getExtension(file) );
testOneFile(new File(rootDir, file));
-
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
svn commit: r1885340 [1/5] - in /poi/trunk/src: excelant/testcases/org/apache/poi/ss/excelant/ excelant/testcases/org/apache/poi/ss/excelant/util/ integrationtest/org/apache/poi/stress/ multimodule/in
Author: kiwiwings Date: Sun Jan 10 21:16:04 2021 New Revision: 1885340 URL: http://svn.apache.org/viewvc?rev=1885340=rev Log: Sonar fixes JUnit5 test classes and methods should have default package visibility Added: poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestCountifs.java - copied, changed from r1885339, poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/CountifsTests.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestConditionalFormattingEval.java - copied, changed from r1885339, poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/ConditionalFormattingEvalTest.java poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/TestCombinedIterator.java - copied, changed from r1885339, poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/CombinedIteratorTest.java poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFMemoryLeak.java - copied, changed from r1885339, poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/XSSFMemoryLeakTests.java poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFAbstractNum.java - copied, changed from r1885339, poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/XWPFAbstractNumTest.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/dev/BaseTestPPTIterating.java - copied, changed from r1885339, poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/dev/BasePPTIteratingTest.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestAbstractWordUtils.java - copied, changed from r1885339, poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/AbstractWordUtilsTest.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPlfLfo.java - copied, changed from r1885339, poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/PlfLfoTest.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/TestLFOLVLBaseAbstractType.java - copied, changed from r1885339, poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractTypeTest.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/TestLVLFAbstractType.java - copied, changed from r1885339, poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LVLFAbstractTypeTest.java Removed: poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/CountifsTests.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/ConditionalFormattingEvalTest.java poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/CombinedIteratorTest.java poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/XSSFMemoryLeakTests.java poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/XWPFAbstractNumTest.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/dev/BasePPTIteratingTest.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/AbstractWordUtilsTest.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/PlfLfoTest.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractTypeTest.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LVLFAbstractTypeTest.java Modified: poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntPrecision.java poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntSet.java poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntSetDoubleCell.java poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntUserDefinedFunction.java poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntEvaluationResult.java poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtilFactory.java poi/trunk/src/integrationtest/org/apache/poi/stress/BaseIntegrationTest.java poi/trunk/src/integrationtest/org/apache/poi/stress/HDGFFileHandler.java poi/trunk/src/integrationtest/org/apache/poi/stress/HMEFFileHandler.java poi/trunk/src/integrationtest/org/apache/poi/stress/HPBFFileHandler.java poi/trunk/src/integrationtest/org/apache/poi/stress/HPSFFileHandler.java poi/trunk/src/integrationtest/org/apache/poi/stress/HSLFFileHandler.java poi/trunk/src/integrationtest/org/apache/poi/stress/HSMFFileHandler.java poi/trunk/src/integrationtest/org/apache/poi/stress/HSSFFileHandler.java poi/trunk/src/integrationtest/org/apache/poi/stress/HSSFRecordsStresser.java poi/trunk/src/integrationtest/org/apache/poi/stress/HWPFFileHandler.java poi/trunk/src/integrationtest/org/apache/poi/stress/OPCFileHandler.java poi/trunk/src/integrationtest/org/apache/poi/stress
svn commit: r1885340 [2/5] - in /poi/trunk/src: excelant/testcases/org/apache/poi/ss/excelant/ excelant/testcases/org/apache/poi/ss/excelant/util/ integrationtest/org/apache/poi/stress/ multimodule/in
Copied:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/TestLVLFAbstractType.java
(from r1885339,
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LVLFAbstractTypeTest.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/TestLVLFAbstractType.java?p2=poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/TestLVLFAbstractType.java=poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LVLFAbstractTypeTest.java=1885339=1885340=1885340=diff
==
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LVLFAbstractTypeTest.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/TestLVLFAbstractType.java
Sun Jan 10 21:16:04 2021
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
/**
* Test cases for {@link LVLFAbstractType}
*/
-public class LVLFAbstractTypeTest {
+class TestLVLFAbstractType {
@Test
void testGetSize() {
assertEquals( 28, LVLFAbstractType.getSize() );
Modified: poi/trunk/src/testcases/org/apache/poi/TestPOIDocumentMain.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/TestPOIDocumentMain.java?rev=1885340=1885339=1885340=diff
==
--- poi/trunk/src/testcases/org/apache/poi/TestPOIDocumentMain.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/TestPOIDocumentMain.java Sun Jan 10
21:16:04 2021
@@ -41,7 +41,7 @@ import org.junit.jupiter.api.Test;
* This is part 1 of 2 of the tests - it only does the POIDocuments
* which are part of the Main (not scratchpad)
*/
-public final class TestPOIDocumentMain {
+final class TestPOIDocumentMain {
// The POI Documents to work on
private POIDocument doc;
private POIDocument doc2;
Modified: poi/trunk/src/testcases/org/apache/poi/TestPOITestCase.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/TestPOITestCase.java?rev=1885340=1885339=1885340=diff
==
--- poi/trunk/src/testcases/org/apache/poi/TestPOITestCase.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/TestPOITestCase.java Sun Jan 10
21:16:04 2021
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
/**
* A class for testing the POI Junit TestCase utility class
*/
-public final class TestPOITestCase {
+final class TestPOITestCase {
@Test
void assertStartsWith() {
POITestCase.assertStartsWith("Apache POI", "");
Modified: poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java?rev=1885340=1885339=1885340=diff
==
--- poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java Sun Jan
10 21:16:04 2021
@@ -28,7 +28,7 @@ import org.apache.poi.util.HexDump;
import org.apache.poi.util.HexRead;
import org.junit.jupiter.api.Test;
-public final class TestEscherBSERecord {
+final class TestEscherBSERecord {
@Test
void testFillFields() {
String data = "01 00 00 00 24 00 00 00 05 05 01 02 03 04 " +
Modified: poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java?rev=1885340=1885339=1885340=diff
==
--- poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java Sun
Jan 10 21:16:04 2021
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
/**
* Test read/serialize of escher blip records
*/
-public final class TestEscherBlipRecord {
+final class TestEscherBlipRecord {
private static final POIDataSamples _samples =
POIDataSamples.getDDFInstance();
//test reading/serializing of a PNG blip
Modified: poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java?rev=1885340=1885339=1885340=diff
==
--- poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java Sun
Jan 10 21:16:04 2021
@@ -21,7 +21,7 @@ import static org.junit.jupiter.api.Asse
import org.junit.jupiter.api.Test;
-public final class TestEscherBoolProperty {
+final class TestEscherBoolProperty {
@Test
void testToString() {
svn commit: r1885340 [4/5] - in /poi/trunk/src: excelant/testcases/org/apache/poi/ss/excelant/ excelant/testcases/org/apache/poi/ss/excelant/util/ integrationtest/org/apache/poi/stress/ multimodule/in
Modified:
poi/trunk/src/testcases/org/apache/poi/poifs/property/TestPropertyTable.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/property/TestPropertyTable.java?rev=1885340=1885339=1885340=diff
==
---
poi/trunk/src/testcases/org/apache/poi/poifs/property/TestPropertyTable.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/poifs/property/TestPropertyTable.java
Sun Jan 10 21:16:04 2021
@@ -42,7 +42,7 @@ import org.junit.jupiter.api.Test;
/**
* Class to test PropertyTable functionality
*/
-public final class TestPropertyTable {
+final class TestPropertyTable {
private static void confirmBlockEncoding(String expectedDataStr,
PropertyTable table) throws IOException {
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
Modified:
poi/trunk/src/testcases/org/apache/poi/poifs/property/TestRootProperty.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/property/TestRootProperty.java?rev=1885340=1885339=1885340=diff
==
--- poi/trunk/src/testcases/org/apache/poi/poifs/property/TestRootProperty.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/poifs/property/TestRootProperty.java
Sun Jan 10 21:16:04 2021
@@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test;
*
* @author Marc Johnson
*/
-public final class TestRootProperty {
+final class TestRootProperty {
private RootProperty _property;
private byte[] _testblock;
Modified: poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestBATBlock.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestBATBlock.java?rev=1885340=1885339=1885340=diff
==
--- poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestBATBlock.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestBATBlock.java Sun
Jan 10 21:16:04 2021
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test;
/**
* Class to test BATBlock functionality
*/
-public final class TestBATBlock {
+final class TestBATBlock {
@Test
Modified:
poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestHeaderBlockReading.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestHeaderBlockReading.java?rev=1885340=1885339=1885340=diff
==
---
poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestHeaderBlockReading.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestHeaderBlockReading.java
Sun Jan 10 21:16:04 2021
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
/**
* Class to test HeaderBlockReader functionality
*/
-public final class TestHeaderBlockReading {
+final class TestHeaderBlockReading {
@Test
void testConstructors() throws IOException {
Modified: poi/trunk/src/testcases/org/apache/poi/ss/TestSpreadsheetVersion.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/TestSpreadsheetVersion.java?rev=1885340=1885339=1885340=diff
==
--- poi/trunk/src/testcases/org/apache/poi/ss/TestSpreadsheetVersion.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/TestSpreadsheetVersion.java Sun
Jan 10 21:16:04 2021
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
/**
* Check that all enum values are properly set
*/
-public final class TestSpreadsheetVersion {
+final class TestSpreadsheetVersion {
@Test
void testExcel97(){
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java?rev=1885340=1885339=1885340=diff
==
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java
Sun Jan 10 21:16:04 2021
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
/**
* Tests for {@link FormulaShifter}.
*/
-public final class TestFormulaShifter {
+final class TestFormulaShifter {
// Note - the expected result row coordinates here were determined/verified
// in Excel 2007 by manually testing.
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/TestSheetNameFormatter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/TestSheetNameFormatter.java?rev=1885340=1885339=1885340=diff
==
---
svn commit: r1885340 [5/5] - in /poi/trunk/src: excelant/testcases/org/apache/poi/ss/excelant/ excelant/testcases/org/apache/poi/ss/excelant/util/ integrationtest/org/apache/poi/stress/ multimodule/in
Modified: poi/trunk/src/testcases/org/apache/poi/ss/util/TestSheetUtil.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/util/TestSheetUtil.java?rev=1885340=1885339=1885340=diff
==
--- poi/trunk/src/testcases/org/apache/poi/ss/util/TestSheetUtil.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/util/TestSheetUtil.java Sun Jan
10 21:16:04 2021
@@ -17,6 +17,13 @@
package org.apache.poi.ss.util;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
@@ -24,19 +31,12 @@ import org.apache.poi.ss.usermodel.Sheet
import org.apache.poi.ss.usermodel.Workbook;
import org.junit.jupiter.api.Test;
-import java.io.IOException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
/**
* Tests SheetUtil.
*
* @see org.apache.poi.ss.util.SheetUtil
*/
-public final class TestSheetUtil {
+final class TestSheetUtil {
@Test
void testCellWithMerges() throws Exception {
try (Workbook wb = new HSSFWorkbook()) {
Modified: poi/trunk/src/testcases/org/apache/poi/ss/util/TestWorkbookUtil.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/util/TestWorkbookUtil.java?rev=1885340=1885339=1885340=diff
==
--- poi/trunk/src/testcases/org/apache/poi/ss/util/TestWorkbookUtil.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/util/TestWorkbookUtil.java Sun
Jan 10 21:16:04 2021
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
*
* @see org.apache.poi.ss.util.WorkbookUtil
*/
-public final class TestWorkbookUtil {
+final class TestWorkbookUtil {
/**
* borrowed test cases from
* {@link
org.apache.poi.hssf.record.TestBoundSheetRecord#testValidNames()}
Modified: poi/trunk/src/testcases/org/apache/poi/util/TestBitField.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestBitField.java?rev=1885340=1885339=1885340=diff
==
--- poi/trunk/src/testcases/org/apache/poi/util/TestBitField.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/util/TestBitField.java Sun Jan 10
21:16:04 2021
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
/**
* Class to test BitField functionality
*/
-public final class TestBitField {
+final class TestBitField {
private static BitField bf_multi = BitFieldFactory.getInstance(0x3F80);
private static BitField bf_single = BitFieldFactory.getInstance(0x4000);
Modified: poi/trunk/src/testcases/org/apache/poi/util/TestByteField.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestByteField.java?rev=1885340=1885339=1885340=diff
==
--- poi/trunk/src/testcases/org/apache/poi/util/TestByteField.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/util/TestByteField.java Sun Jan 10
21:16:04 2021
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
/**
* Unit test for ByteField class
*/
-public final class TestByteField {
+final class TestByteField {
private static final byte[] _test_array = {
Byte.MIN_VALUE, ( byte ) -1, ( byte ) 0, ( byte ) 1, Byte.MAX_VALUE
Modified: poi/trunk/src/testcases/org/apache/poi/util/TestIOUtils.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestIOUtils.java?rev=1885340=1885339=1885340=diff
==
--- poi/trunk/src/testcases/org/apache/poi/util/TestIOUtils.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/util/TestIOUtils.java Sun Jan 10
21:16:04 2021
@@ -45,7 +45,7 @@ import org.junit.jupiter.api.Test;
/**
* Class to test IOUtils
*/
-public final class TestIOUtils {
+final class TestIOUtils {
private static File TMP;
private static final long LENGTH = 300+new Random().nextInt(9000);
Modified: poi/trunk/src/testcases/org/apache/poi/util/TestIntList.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestIntList.java?rev=1885340=1885339=1885340=diff
==
--- poi/trunk/src/testcases/org/apache/poi/util/TestIntList.java (original)
+++
svn commit: r1885340 [3/5] - in /poi/trunk/src: excelant/testcases/org/apache/poi/ss/excelant/ excelant/testcases/org/apache/poi/ss/excelant/util/ integrationtest/org/apache/poi/stress/ multimodule/in
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java?rev=1885340=1885339=1885340=diff
==
---
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java
Sun Jan 10 21:16:04 2021
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
* class works correctly. Test data taken directly from a real
* Excel file.
*/
-public final class TestAxisRecord {
+final class TestAxisRecord {
byte[] data = new byte[] {
(byte)0x00,(byte)0x00, // type
(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java?rev=1885340=1885339=1885340=diff
==
---
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
Sun Jan 10 21:16:04 2021
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
* class works correctly. Test data taken directly from a real
* Excel file.
*/
-public final class TestAxisUsedRecord {
+final class TestAxisUsedRecord {
byte[] data = new byte[] {
(byte)0x01,(byte)0x00,
};
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java?rev=1885340=1885339=1885340=diff
==
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java
Sun Jan 10 21:16:04 2021
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test;
* class works correctly. Test data taken directly from a real
* Excel file.
*/
-public final class TestBarRecord {
+final class TestBarRecord {
byte[] data = new byte[] {
(byte)0x00,(byte)0x00, // bar space
(byte)0x96,(byte)0x00, // category space
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java?rev=1885340=1885339=1885340=diff
==
---
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
Sun Jan 10 21:16:04 2021
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
* class works correctly. Test data taken directly from a real
* Excel file.
*/
-public final class TestCategorySeriesAxisRecord {
+final class TestCategorySeriesAxisRecord {
byte[] data = new byte[] {
(byte)0x01,(byte)0x00,// crossing point
(byte)0x01,(byte)0x00,// label frequency
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java?rev=1885340=1885339=1885340=diff
==
---
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java
Sun Jan 10 21:16:04 2021
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test;
* Tests for {@link ChartFormatRecord} Test data taken directly from a real
* Excel file.
*/
-public final class TestChartFormatRecord {
+final class TestChartFormatRecord {
/**
* This rather uninteresting data came from attachment 23347 of bug
46693 at
* offsets 0x6BB2 and 0x7BAF
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java?rev=1885340=1885339=1885340=diff
==
---
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java
Sun Jan 10 21:16:04 2021
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
* class works correctly. Test
svn commit: r1885334 - /poi/trunk/build.xml
Author: kiwiwings
Date: Sun Jan 10 13:34:04 2021
New Revision: 1885334
URL: http://svn.apache.org/viewvc?rev=1885334=rev
Log:
ignore inner classes in junitlauncher run
Modified:
poi/trunk/build.xml
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1885334=1885333=1885334=diff
==
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Sun Jan 10 13:34:04 2021
@@ -1314,6 +1314,7 @@ under the License.
module1="ooxml" module2="scratchpad"
outputDir="${ooxml.reports.test}">
+
@@ -1548,6 +1549,7 @@ under the License.
modulepath-ref="test-main.modules" module1="poi"
outputDir="${main.reports.test}">
+
@@ -1604,6 +1606,7 @@ under the License.
modulepath-ref="test-scratchpad.modules" module1="scratchpad"
outputDir="${scratchpad.reports.test}">
+
@@ -1633,6 +1636,7 @@ under the License.
modulepath-ref="@{modulepath-ref}" module1="ooxml"
module2="scratchpad" outputDir="${ooxml.reports.test}">
+
@@ -1696,6 +1700,7 @@ under the License.
modulepath-ref="test-integration.modules" module1="stress"
outputDir="${integration.reports.test}">
+
@@ -1849,6 +1854,7 @@ under the License.
modulepath-ref="test-excelant.modules" module1="excelant"
outputDir="${excelant.reports.test}">
+
-
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
svn commit: r1885333 - /poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
Author: kiwiwings Date: Sun Jan 10 13:28:48 2021 New Revision: 1885333 URL: http://svn.apache.org/viewvc?rev=1885333=rev Log: IBM JDK is slower than the other JDKs with "test58896WithFile" testcase Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java?rev=1885333=1885332=1885333=diff == --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java Sun Jan 10 13:28:48 2021 @@ -3446,7 +3446,7 @@ public final class TestXSSFBugs extends } LOG.log(POILogger.INFO, Duration.between(start, Instant.now())); -assertTrue(Duration.between(start, Instant.now()).getSeconds() < 10); +assertTrue(Duration.between(start, Instant.now()).getSeconds() < 25); } } - To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org For additional commands, e-mail: commits-h...@poi.apache.org
svn commit: r1885326 [1/2] - in /poi/trunk/src/ooxml/testcases/org/apache/poi: extractor/ooxml/ ooxml/ openxml4j/opc/ openxml4j/opc/compliance/ openxml4j/opc/internal/marshallers/ openxml4j/util/ poif
Author: kiwiwings Date: Sun Jan 10 01:42:30 2021 New Revision: 1885326 URL: http://svn.apache.org/viewvc?rev=1885326=rev Log: Sonar fixes JUnit5 test classes and methods should have default package visibility Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/extractor/ooxml/TestExtractorFactory.java poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/TestDetectAsOOXML.java poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/TestEmbedded.java poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/TestTriggerCoverage.java poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/util/TestZipSecureFile.java poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureConfig.java poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestDecryptor.java poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestEncryptionInfo.java poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestEncryptor.java poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestHxxFEncryption.java poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestSecureTempZip.java poi/trunk/src/ooxml/testcases/org/apache/poi/sl/tests/TestFonts.java poi/trunk/src/ooxml/testcases/org/apache/poi/sl/tests/TestHeadersFooters.java poi/trunk/src/ooxml/testcases/org/apache/poi/sl/tests/TestOleShape.java poi/trunk/src/ooxml/testcases/org/apache/poi/sl/tests/TestSlide.java poi/trunk/src/ooxml/testcases/org/apache/poi/sl/tests/TestTable.java poi/trunk/src/ooxml/testcases/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/extractor/TestEmbeddedExtractor.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/format/TestCellFormatPart.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/formula/TestFormulaParser.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/formula/TestStructuredReferences.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestSumifsXSSF.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestVlookup.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestXSSFRangeCopier.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestSXSSFCellUtil.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestXSSFPropertyTemplate.java poi/trunk/src/ooxml/testcases/org/apache/poi/util/tests/TestIdentifierManager.java poi/trunk/src/ooxml/testcases/org/apache/poi/util/tests/TestTempFileThreaded.java poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestXDDFColor.java poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFDataSourcesFactory.java poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextBodyProperties.java poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextRun.java poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFBackground.java poi
svn commit: r1885326 [2/2] - in /poi/trunk/src/ooxml/testcases/org/apache/poi: extractor/ooxml/ ooxml/ openxml4j/opc/ openxml4j/opc/compliance/ openxml4j/opc/internal/marshallers/ openxml4j/util/ poif
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=1885326=1885325=1885326=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
Sun Jan 10 01:42:30 2021
@@ -40,7 +40,7 @@ import org.junit.jupiter.api.Test;
/**
* Tests for {@link XSSFExcelExtractor}
*/
-public class TestXSSFExcelExtractor {
+class TestXSSFExcelExtractor {
protected XSSFExcelExtractor getExtractor(String sampleName) {
return new
XSSFExcelExtractor(XSSFTestDataSamples.openSampleWorkbook(sampleName));
}
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=1885326=1885325=1885326=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
Sun Jan 10 01:42:30 2021
@@ -42,7 +42,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.xml.sax.SAXException;
-public class TestXSSFImportFromXML {
+class TestXSSFImportFromXML {
@Test
void testImportFromXML() throws IOException, XPathExpressionException,
SAXException{
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=1885326=1885325=1885326=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
Sun Jan 10 01:42:30 2021
@@ -32,7 +32,7 @@ import org.apache.poi.xssf.usermodel.XSS
import org.junit.jupiter.api.Test;
-public class TestLoadSaveXSSF {
+class TestLoadSaveXSSF {
private static final POIDataSamples _ssSamples =
POIDataSamples.getSpreadSheetInstance();
@Test
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=1885326=1885325=1885326=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
Sun Jan 10 01:42:30 2021
@@ -47,7 +47,7 @@ import org.openxmlformats.schemas.spread
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRst;
-public class TestCommentsTable {
+class TestCommentsTable {
private static final String TEST_A2_TEXT = "test A2 text";
private static final String TEST_A1_TEXT = "test A1 text";
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=1885326=1885325=1885326=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
Sun Jan 10 01:42:30 2021
@@ -44,7 +44,7 @@ import org.apache.poi.xssf.usermodel.XSS
import org.junit.jupiter.api.Test;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTColor;
-public class TestThemesTable {
+class TestThemesTable {
private static final String testFileComplex = "Themes2.xlsx";
// TODO .xls version available too, add HSSF support then check
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java?rev=1885326=1885325=1885326=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
Sun Jan 10 01:42:30 2021
@@ -46,7 +46,7 @@ import org.junit.jupiter.api.Test;
*
* see Bug #57450 which reported the original misbehaviour
*/
-public class TestAutoSizeColumnTracker {
svn commit: r1885325 [1/2] - in /poi/trunk/src/testcases/org/apache/poi: ./ ddf/ hpsf/ hpsf/basic/ hssf/dev/ hssf/model/ hssf/record/ hssf/usermodel/ poifs/crypt/ poifs/crypt/binaryrc4/ poifs/filesyst
Author: kiwiwings Date: Sun Jan 10 01:34:16 2021 New Revision: 1885325 URL: http://svn.apache.org/viewvc?rev=1885325=rev Log: Sonar fixes JUnit5 test classes and methods should have default package visibility Modified: poi/trunk/src/testcases/org/apache/poi/TestJDK12.java poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherClientAnchorRecord.java poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherClientDataRecord.java poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherDump.java poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherProperty.java poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherPropertyFactory.java poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherSpRecord.java poi/trunk/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestEFBiffViewer.java poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestFormulaViewer.java poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestReSave.java poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestRecordLister.java poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java poi/trunk/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java poi/trunk/src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java poi/trunk/src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCryptoAPI.java poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFColumnShifting.java poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFEvaluationSheet.java poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRangeCopier.java poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftColumns.java poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestPatriarch.java poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestPolygon.java poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestShapeGroup.java poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestText.java poi/trunk/src/testcases/org/apache/poi/poifs/crypt/TestCipherAlgorithm.java poi/trunk/src/testcases/org/apache/poi/poifs/crypt/TestXorEncryption.java poi/trunk/src/testcases/org/apache/poi/poifs/crypt/binaryrc4/TestBinaryRC4.java poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocument.java poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestEntryUtils.java poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileMagic.java poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestNotOLE2Exception.java poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestOfficeXMLException.java poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestOle10Native.java poi/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java poi/trunk/src/testcases/org/apache/poi/poifs/nio/TestDataSource.java poi/trunk/src/testcases/org/apache/poi/sl/draw/geom/TestFormulaParser.java poi/trunk/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java poi/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormat.java poi/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormatCondition.java poi/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormatResult.java poi/trunk/src/testcases/org/apache/poi/ss/formula/TestCellCacheEntry.java poi/trunk/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java poi/trunk/src/testcases/org/apache/poi/ss/formula/TestFunctionRegistry.java poi/trunk/src/testcases/org/apache/poi/ss/formula/TestPlainCellCache.java poi/trunk/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestIfError.java poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestMRound.java poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestPercentile.java
svn commit: r1885324 - /poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
Author: kiwiwings
Date: Sun Jan 10 01:15:55 2021
New Revision: 1885324
URL: http://svn.apache.org/viewvc?rev=1885324=rev
Log:
Sonar fixes
add asserts to tests
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java?rev=1885324=1885323=1885324=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
Sun Jan 10 01:15:55 2021
@@ -19,15 +19,7 @@ package org.apache.poi.xssf.usermodel;
import static org.apache.poi.extractor.ExtractorFactory.OOXML_PACKAGE;
import static org.apache.poi.openxml4j.opc.TestContentType.isOldXercesActive;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assumptions.assumeFalse;
import java.io.ByteArrayInputStream;
@@ -93,6 +85,7 @@ import org.apache.poi.ss.formula.Workboo
import org.apache.poi.ss.formula.WorkbookEvaluatorProvider;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.NumberEval;
+import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.ss.formula.functions.Function;
import org.apache.poi.ss.formula.ptg.Ptg;
import org.apache.poi.ss.usermodel.*;
@@ -118,11 +111,13 @@ import org.apache.xmlbeans.XmlException;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
import org.junit.jupiter.params.provider.EnumSource;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCalcCell;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCols;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDefinedName;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDefinedNames;
+import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTIgnoredErrors;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTMergeCell;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTMergeCells;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;
@@ -671,7 +666,8 @@ public final class TestXSSFBugs extends
for (Row row : sheet) {
for (Cell cell : row) {
if (cell.getCellType() == CellType.FORMULA) {
-formulaEvaluator.evaluateInCell(cell); // caused NPE
on some cells
+// caused NPE on some cells
+assertDoesNotThrow(() ->
formulaEvaluator.evaluateInCell(cell));
}
}
}
@@ -1205,22 +1201,17 @@ public final class TestXSSFBugs extends
*/
@Test
void bug46662() throws IOException {
-// New file
-XSSFWorkbook wb1 = new XSSFWorkbook();
-XSSFTestDataSamples.writeOutAndReadBack(wb1).close();
-XSSFTestDataSamples.writeOutAndReadBack(wb1).close();
-XSSFTestDataSamples.writeOutAndReadBack(wb1).close();
-wb1.close();
-
-// Simple file
-XSSFWorkbook wb2 =
XSSFTestDataSamples.openSampleWorkbook("sample.xlsx");
-XSSFTestDataSamples.writeOutAndReadBack(wb2).close();
-XSSFTestDataSamples.writeOutAndReadBack(wb2).close();
-XSSFTestDataSamples.writeOutAndReadBack(wb2).close();
-wb2.close();
+for (int i=0; i<2; i++) {
+try (XSSFWorkbook wb1 = (i == 0) ? new XSSFWorkbook() :
XSSFTestDataSamples.openSampleWorkbook("sample.xlsx")) {
+for (int j=0; j<3; j++) {
+try (XSSFWorkbook wb2 =
XSSFTestDataSamples.writeOutAndReadBack(wb1)) {
+assertEquals(wb1.getNumberOfSheets(),
wb2.getNumberOfSheets());
+}
+}
+}
+}
-// Complex file
-// TODO
+// TODO: Complex file
}
/**
@@ -1469,7 +1460,8 @@ public final class TestXSSFBugs extends
WorkbookEvaluator.registerFunction("GETPIVOTDATA", func);
}
-wb.getCreationHelper
svn commit: r1885308 [4/4] - in /poi/trunk/src: ooxml/testcases/org/apache/poi/xssf/streaming/ ooxml/testcases/org/apache/poi/xssf/usermodel/ testcases/org/apache/poi/ testcases/org/apache/poi/ddf/ te
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java?rev=1885308=1885307=1885308=diff
==
---
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java
Sat Jan 9 18:24:51 2021
@@ -63,7 +63,7 @@ public abstract class BaseTestSheetAutos
}
@Test
-public void numericCells() throws Exception {
+void numericCells() throws Exception {
Workbook workbook = _testDataProvider.createWorkbook();
DataFormat df = workbook.getCreationHelper().createDataFormat();
Sheet sheet = workbook.createSheet();
@@ -105,7 +105,7 @@ public abstract class BaseTestSheetAutos
}
@Test
-public void booleanCells() throws Exception {
+void booleanCells() throws Exception {
Workbook workbook = _testDataProvider.createWorkbook();
Sheet sheet = workbook.createSheet();
trackColumnsForAutoSizingIfSXSSF(sheet);
@@ -136,7 +136,7 @@ public abstract class BaseTestSheetAutos
}
@Test
-public void dateCells() throws Exception {
+void dateCells() throws Exception {
Workbook workbook = _testDataProvider.createWorkbook();
Sheet sheet = workbook.createSheet();
trackColumnsForAutoSizingIfSXSSF(sheet);
@@ -203,7 +203,7 @@ public abstract class BaseTestSheetAutos
}
@Test
-public void stringCells() throws Exception {
+void stringCells() throws Exception {
Workbook workbook = _testDataProvider.createWorkbook();
Sheet sheet = workbook.createSheet();
trackColumnsForAutoSizingIfSXSSF(sheet);
@@ -237,7 +237,7 @@ public abstract class BaseTestSheetAutos
}
@Test
-public void rotatedText() throws Exception {
+void rotatedText() throws Exception {
Workbook workbook = _testDataProvider.createWorkbook();
Sheet sheet = workbook.createSheet();
trackColumnsForAutoSizingIfSXSSF(sheet);
@@ -264,7 +264,7 @@ public abstract class BaseTestSheetAutos
}
@Test
-public void mergedCells() throws Exception {
+void mergedCells() throws Exception {
Workbook workbook = _testDataProvider.createWorkbook();
Sheet sheet = workbook.createSheet();
trackColumnsForAutoSizingIfSXSSF(sheet);
@@ -291,7 +291,7 @@ public abstract class BaseTestSheetAutos
* passed the 32767 boundary. See bug #48079
*/
@Test
-public void largeRowNumbers() throws Exception {
+void largeRowNumbers() throws Exception {
Workbook workbook = _testDataProvider.createWorkbook();
Sheet sheet = workbook.createSheet();
trackColumnsForAutoSizingIfSXSSF(sheet);
@@ -346,7 +346,7 @@ public abstract class BaseTestSheetAutos
@Test
-public void testExcelExporter() throws IOException {
+void testExcelExporter() throws IOException {
try (final Workbook wb = _testDataProvider.createWorkbook()) {
final Sheet sheet = wb.createSheet("test");
trackColumnsForAutoSizingIfSXSSF(sheet);
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java?rev=1885308=1885307=1885308=diff
==
---
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java
Sat Jan 9 18:24:51 2021
@@ -48,13 +48,13 @@ public abstract class BaseTestSheetHidin
}
@BeforeEach
-public void setUp() {
+void setUp() {
wbH = _testDataProvider.openSampleWorkbook(_file1);
wbU = _testDataProvider.openSampleWorkbook(_file2);
}
@AfterEach
- public void teadDown() throws IOException {
+ void teadDown() throws IOException {
wbH.close();
wbU.close();
}
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftColumns.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftColumns.java?rev=1885308=1885307=1885308=diff
==
---
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftColumns.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftColumns.java
Sat Jan 9 18:24:51 2021
@@ -43,7 +43,7 @@ public abstract class BaseTestSheetShift
protected ITestDataProvider _testDataProvider;
@BeforeEach
-public void init() {
svn commit: r1885308 [3/4] - in /poi/trunk/src: ooxml/testcases/org/apache/poi/xssf/streaming/ ooxml/testcases/org/apache/poi/xssf/usermodel/ testcases/org/apache/poi/ testcases/org/apache/poi/ddf/ te
Modified:
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSStream.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSStream.java?rev=1885308=1885307=1885308=diff
==
---
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSStream.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSStream.java
Sat Jan 9 18:24:51 2021
@@ -1183,7 +1183,7 @@ public final class TestPOIFSStream {
}
@Test
-public void basicOpen() throws IOException {
+void basicOpen() throws IOException {
POIFSFileSystem fsA, fsB;
// With a simple 512 block file
@@ -1206,7 +1206,7 @@ public final class TestPOIFSStream {
}
@Test
-public void propertiesAndFatOnRead() throws IOException {
+void propertiesAndFatOnRead() throws IOException {
POIFSFileSystem fsA, fsB;
// With a simple 512 block file
@@ -1341,7 +1341,7 @@ public final class TestPOIFSStream {
* out what the next one is
*/
@Test
-public void nextBlock() throws IOException {
+void nextBlock() throws IOException {
POIFSFileSystem fsA = new
POIFSFileSystem(_inst.getFile("BlockSize512.zvi"));
POIFSFileSystem fsB = new
POIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi"));
for (POIFSFileSystem fs : new POIFSFileSystem[]{fsA, fsB}) {
@@ -1403,7 +1403,7 @@ public final class TestPOIFSStream {
* Check we get the right data back for each block
*/
@Test
-public void getBlock() throws IOException {
+void getBlock() throws IOException {
POIFSFileSystem fsA = new
POIFSFileSystem(_inst.getFile("BlockSize512.zvi"));
POIFSFileSystem fsB = new
POIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi"));
for (POIFSFileSystem fs : new POIFSFileSystem[]{fsA, fsB}) {
@@ -1477,7 +1477,7 @@ public final class TestPOIFSStream {
* to be had from the FAT
*/
@Test
-public void getFreeBlockWithSpare() throws IOException {
+void getFreeBlockWithSpare() throws IOException {
POIFSFileSystem fs = new
POIFSFileSystem(_inst.getFile("BlockSize512.zvi"));
// Our first BAT block has spares
@@ -1508,7 +1508,7 @@ public final class TestPOIFSStream {
* file needs to be extended and another BAT/XBAT added
*/
@Test
-public void getFreeBlockWithNoneSpare() throws IOException {
+void getFreeBlockWithNoneSpare() throws IOException {
POIFSFileSystem fs1 = new
POIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi"));
int free;
@@ -1637,7 +1637,7 @@ public final class TestPOIFSStream {
* entries, and the details on the files in them
*/
@Test
-public void listEntries() throws IOException {
+void listEntries() throws IOException {
for (POIFSFileSystem fs : get512and4kFileAndInput()) {
DirectoryEntry root = fs.getRoot();
assertEquals(5, root.getEntryCount());
@@ -1676,7 +1676,7 @@ public final class TestPOIFSStream {
* a document in the filesystem
*/
@Test
-public void getDocumentEntry() throws Exception {
+void getDocumentEntry() throws Exception {
for (POIFSFileSystem fs : get512and4kFileAndInput()) {
DirectoryEntry root = fs.getRoot();
Entry si = root.getEntry("\u0005SummaryInformation");
@@ -1722,7 +1722,7 @@ public final class TestPOIFSStream {
* Then, alter+add some streams, write and read
*/
@Test
-public void readWriteRead() throws Exception {
+void readWriteRead() throws Exception {
SummaryInformation sinf;
DocumentSummaryInformation dinf;
DirectoryEntry root, testDir;
@@ -1996,7 +1996,7 @@ public final class TestPOIFSStream {
* Then, add some streams, write and read
*/
@Test
-public void createWriteRead() throws IOException {
+void createWriteRead() throws IOException {
POIFSFileSystem fs1 = new POIFSFileSystem();
DocumentEntry miniDoc;
DocumentEntry normDoc;
@@ -2239,7 +2239,7 @@ public final class TestPOIFSStream {
}
@Test
-public void addBeforeWrite() throws IOException {
+void addBeforeWrite() throws IOException {
POIFSFileSystem fs1 = new POIFSFileSystem();
DocumentEntry miniDoc;
DocumentEntry normDoc;
@@ -2392,7 +2392,7 @@ public final class TestPOIFSStream {
}
@Test
-public void readZeroLengthEntries() throws IOException {
+void readZeroLengthEntries() throws IOException {
POIFSFileSystem fs = new
POIFSFileSystem(_inst.getFile("only-zero-byte-streams.ole2"));
DirectoryNode testDir = fs.getRoot();
assertEquals(3, testDir.getEntryCount());
@@ -2423,7 +2423,7 @@ public final class TestPOIFSStream {
}
@Test
-
svn commit: r1885302 [1/4] - in /poi/trunk/src: multimodule/scratchpad/test9/ scratchpad/testcases/org/apache/poi/hdgf/ scratchpad/testcases/org/apache/poi/hdgf/chunks/ scratchpad/testcases/org/apache
Author: kiwiwings Date: Sat Jan 9 15:49:35 2021 New Revision: 1885302 URL: http://svn.apache.org/viewvc?rev=1885302=rev Log: Sonar fixes JUnit5 test classes and methods should have default package visibility Modified: poi/trunk/src/multimodule/scratchpad/test9/module-info.class poi/trunk/src/multimodule/scratchpad/test9/module-info.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFCore.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFLZW.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/chunks/TestChunks.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/extractor/TestVisioExtractor.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/pointers/TestPointerFactory.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBasics.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBugs.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamComplex.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hemf/hemfplus/extractor/TestHemfPlusExtractor.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hemf/usermodel/TestHemfPicture.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestAttachments.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestBugs.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestCompressedRTF.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestHMEFMessage.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestMAPIAttributes.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestTNEFAttributes.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hmef/extractor/TestHMEFContentsExtractor.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hpbf/TestHPBFDocument.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hpbf/extractor/TestPublisherTextExtractor.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestEscherParts.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestQuillContents.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestEncryptedFile.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestPOIDocumentScratchpad.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestRecordCounts.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/dev/BasePPTIteratingTest.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestPPDrawingTextListing.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestPPTXMLDump.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSLWTListing.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSLWTTextListing.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSlideAndNotesAtomListing.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSlideIdListing.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSlideShowDumper.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSlideShowRecordDumper.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestTextStyleListing.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestUserEditAndPersistListing.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestFreeform.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestLine.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPFont.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSetBoldItalic.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSheet.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTable.java poi
svn commit: r1885302 [2/4] - in /poi/trunk/src: multimodule/scratchpad/test9/ scratchpad/testcases/org/apache/poi/hdgf/ scratchpad/testcases/org/apache/poi/hdgf/chunks/ scratchpad/testcases/org/apache
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java?rev=1885302=1885301=1885302=diff
==
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java
Sat Jan 9 15:49:35 2021
@@ -47,7 +47,7 @@ public final class TestHeadersFooters
private static POIDataSamples _slTests =
POIDataSamples.getSlideShowInstance();
@Test
-public void testRead() throws IOException {
+void testRead() throws IOException {
InputStream is = _slTests.openResourceAsStream("headers_footers.ppt");
HSLFSlideShow ppt = new HSLFSlideShow(is);
is.close();
@@ -95,7 +95,7 @@ public final class TestHeadersFooters
* If Headers / Footers are not set, all the getters should return
false or null
*/
@Test
-public void testReadNoHeadersFooters() throws Exception {
+void testReadNoHeadersFooters() throws Exception {
InputStream is =
_slTests.openResourceAsStream("basic_test_ppt_file.ppt");
HSLFSlideShow ppt = new HSLFSlideShow(is);
is.close();
@@ -135,7 +135,7 @@ public final class TestHeadersFooters
* Test extraction of headers / footers from PPTs saved in Office 2007
*/
@Test
-public void testRead2007() throws IOException {
+void testRead2007() throws IOException {
InputStream is =
_slTests.openResourceAsStream("headers_footers_2007.ppt");
HSLFSlideShow ppt = new HSLFSlideShow(is);
is.close();
@@ -199,7 +199,7 @@ public final class TestHeadersFooters
}
@Test
-public void testCreateSlideFooters() throws IOException {
+void testCreateSlideFooters() throws IOException {
HSLFSlideShow ppt1 = new HSLFSlideShow();
HeadersFooters hdd = ppt1.getSlideHeadersFooters();
hdd.setFootersText("My slide footer");
@@ -216,7 +216,7 @@ public final class TestHeadersFooters
}
@Test
-public void testCreateNotesFooters() throws IOException {
+void testCreateNotesFooters() throws IOException {
HSLFSlideShow ppt1 = new HSLFSlideShow();
HeadersFooters hdd = ppt1.getNotesHeadersFooters();
hdd.setFootersText("My notes footer");
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java?rev=1885302=1885301=1885302=diff
==
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java
Sat Jan 9 15:49:35 2021
@@ -46,7 +46,7 @@ public final class TestHyperlink {
private static POIDataSamples _slTests =
POIDataSamples.getSlideShowInstance();
@Test
-public void testTextRunHyperlinks() throws Exception {
+void testTextRunHyperlinks() throws Exception {
HSLFSlideShow ppt = new
HSLFSlideShow(_slTests.openResourceAsStream("WithLinks.ppt"));
HSLFSlide slide = ppt.getSlides().get(0);
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestLine.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestLine.java?rev=1885302=1885301=1885302=diff
==
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestLine.java
(original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestLine.java
Sat Jan 9 15:49:35 2021
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
public final class TestLine {
@Test
-public void testCreateLines() throws IOException {
+void testCreateLines() throws IOException {
HSLFSlideShow ppt = new HSLFSlideShow();
HSLFSlide slide = ppt.createSlide();
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java?rev=1885302=1885301=1885302=diff
==
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java
Sat Jan 9 15:49:35 2021
@@ -40,7 +40,7 @@ public final class TestMovieShape {
private static POIDataSamples _slTests =
POIDataSamples.getSlideShowInstance();
@Test
-public void testCreate() throws Exception {
+
svn commit: r1885302 [4/4] - in /poi/trunk/src: multimodule/scratchpad/test9/ scratchpad/testcases/org/apache/poi/hdgf/ scratchpad/testcases/org/apache/poi/hdgf/chunks/ scratchpad/testcases/org/apache
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToTextConverter.java?rev=1885302=1885301=1885302=diff
==
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
Sat Jan 9 15:49:35 2021
@@ -29,7 +29,7 @@ public class TestWordToTextConverter {
* website as an embedded object
*/
@Test
-public void testBug47731() throws Exception {
+void testBug47731() throws Exception {
try (HWPFDocument doc = openSampleFile( "Bug47731.doc" )) {
String foundText = WordToTextConverter.getText(doc);
@@ -38,7 +38,7 @@ public class TestWordToTextConverter {
}
@Test
-public void testBug52311() throws Exception {
+void testBug52311() throws Exception {
try (HWPFDocument doc = openSampleFile( "Bug52311.doc" )) {
String result = WordToTextConverter.getText(doc);
@@ -54,7 +54,7 @@ public class TestWordToTextConverter {
}
@Test
-public void testBug53380_3() throws Exception {
+void testBug53380_3() throws Exception {
try (HWPFDocument doc = openSampleFile( "Bug53380_3.doc" )) {
WordToTextConverter.getText(doc);
}
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java?rev=1885302=1885301=1885302=diff
==
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java
Sat Jan 9 15:49:35 2021
@@ -70,7 +70,7 @@ public final class TestDifferentRoutes {
* Test model based extraction
*/
@Test
- public void testExtractFromModel() {
+ void testExtractFromModel() {
Range r = doc.getRange();
String[] text = new String[r.numParagraphs()];
@@ -86,7 +86,7 @@ public final class TestDifferentRoutes {
* Test textPieces based extraction
*/
@Test
- public void testExtractFromTextPieces() throws Exception {
+ void testExtractFromTextPieces() throws Exception {
String expected = StringUtil.join(p_text, "");
assertEquals(expected, doc.getDocumentText());
}
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java?rev=1885302=1885301=1885302=diff
==
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java
Sat Jan 9 15:49:35 2021
@@ -84,7 +84,7 @@ public final class TestWordExtractor {
* Test paragraph based extraction
*/
@Test
- public void testExtractFromParagraphs() throws IOException {
+ void testExtractFromParagraphs() throws IOException {
WordExtractor extractor = openExtractor("test2.doc");
String[] text = extractor.getParagraphText();
@@ -107,7 +107,7 @@ public final class TestWordExtractor {
* Test the paragraph -> flat extraction
*/
@Test
- public void testGetText() throws IOException {
+ void testGetText() throws IOException {
WordExtractor extractor = openExtractor("test2.doc");
assertEqualsTrim(p_text1_block, extractor.getText());
@@ -125,7 +125,7 @@ public final class TestWordExtractor {
* Test textPieces based extraction
*/
@Test
- public void testExtractFromTextPieces() throws IOException {
+ void testExtractFromTextPieces() throws IOException {
WordExtractor extractor = openExtractor("test2.doc");
String text = extractor.getTextFromPieces();
assertEquals(p_text1_block, text);
@@ -137,7 +137,7 @@ public final class TestWordExtractor {
* Test that we can get data from two different embedded word documents
*/
@Test
- public void testExtractFromEmbeded() throws IOException {
+ void testExtractFromEmbeded() throws IOException {
InputStream is =
POIDataSamples.getSpreadSheetInstance().openResourceAsStream("excel_with_embeded.xls");
POIFSFileSystem fs = new
svn commit: r1885300 - in /poi/trunk/src: excelant/testcases/org/apache/poi/ss/excelant/ excelant/testcases/org/apache/poi/ss/excelant/util/ multimodule/excelant/test9/
Author: kiwiwings
Date: Sat Jan 9 15:35:07 2021
New Revision: 1885300
URL: http://svn.apache.org/viewvc?rev=1885300=rev
Log:
Sonar fixes
JUnit5 test classes and methods should have default package visibility
Modified:
poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestBuildFile.java
poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntPrecision.java
poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntSet.java
poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntSetDoubleCell.java
poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntUserDefinedFunction.java
poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntEvaluationResult.java
poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java
poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtilFactory.java
poi/trunk/src/multimodule/excelant/test9/module-info.class
poi/trunk/src/multimodule/excelant/test9/module-info.java
Modified:
poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestBuildFile.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestBuildFile.java?rev=1885300=1885299=1885300=diff
==
---
poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestBuildFile.java
(original)
+++
poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestBuildFile.java
Sat Jan 9 15:35:07 2021
@@ -272,33 +272,33 @@ public class TestBuildFile {
}
@Test
-public void testMissingFilename() {
+void testMissingFilename() {
expectSpecificBuildException("test-nofile", "required argument not
specified",
"fileName attribute must be set!");
}
@Test
-public void testFileNotFound() {
+void testFileNotFound() {
expectSpecificBuildException("test-filenotfound", "required argument
not specified",
"Cannot load file invalid.xls. Make sure
the path and file permissions are correct.");
}
@Test
-public void testEvaluate() {
+void testEvaluate() {
executeTarget("test-evaluate");
assertLogContaining("Using input file: " + TestBuildFile.getDataDir()
+ "/spreadsheet/excelant.xls");
assertLogContaining("Succeeded when evaluating
'MortgageCalculator'!$B$4.");
}
@Test
-public void testEvaluateNoDetails() {
+void testEvaluateNoDetails() {
executeTarget("test-evaluate-nodetails");
assertLogContaining("Using input file: " + TestBuildFile.getDataDir()
+ "/spreadsheet/excelant.xls");
assertLogNotContaining("Succeeded when evaluating
'MortgageCalculator'!$B$4.");
}
@Test
-public void testPrecision() {
+void testPrecision() {
executeTarget("test-precision");
assertLogContaining("Using input file: " + TestBuildFile.getDataDir()
+ "/spreadsheet/excelant.xls");
@@ -312,46 +312,46 @@ public class TestBuildFile {
}
@Test
-public void testPrecisionFail() {
+void testPrecisionFail() {
expectSpecificBuildException("test-precision-fails", "precision not
matched",
"\tFailed to evaluate cell
'MortgageCalculator'!$B$4. It evaluated to 2285.5761494145563 when the value
of 2285.576149 with precision of 1.0E-10 was expected.");
}
@Test
-public void testPassOnError() {
+void testPassOnError() {
executeTarget("test-passonerror");
assertLogContaining("Using input file: " + TestBuildFile.getDataDir()
+ "/spreadsheet/excelant.xls");
assertLogContaining("Test named failonerror failed because 1 of 0
evaluations failed to evaluate correctly.");
}
@Test
-public void testFailOnError() {
+void testFailOnError() {
expectBuildException("test-failonerror", "fail on error");
assertLogContaining("Using input file: " + TestBuildFile.getDataDir()
+ "/spreadsheet/excelant.xls");
assertLogNotContaining("failed because 1 of 0 evaluations failed to
evaluate correctly. Failed to evaluate cell 'MortageCalculatorFunction'!$D$3");
}
@Test
-public void testFailOnErrorNoDetails() {
+void testFailOnErrorNoDetails() {
expectBuildException("test-failonerror-nodetails", "fail on error");
assertLogNotContaining("Using input file: " +
TestBuildFile.getDataDir() + "/spreads
svn commit: r1885283 [1/7] - in /poi/trunk/src: multimodule/ooxml/test9/ ooxml/testcases/org/apache/poi/extractor/ooxml/ ooxml/testcases/org/apache/poi/ooxml/ ooxml/testcases/org/apache/poi/openxml4j/
Author: kiwiwings Date: Sat Jan 9 00:46:52 2021 New Revision: 1885283 URL: http://svn.apache.org/viewvc?rev=1885283=rev Log: Sonar fixes JUnit5 test classes and methods should have default package visibility Modified: poi/trunk/src/multimodule/ooxml/test9/module-info.class poi/trunk/src/multimodule/ooxml/test9/module-info.java poi/trunk/src/ooxml/testcases/org/apache/poi/extractor/ooxml/TestExtractorFactory.java poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/TestDetectAsOOXML.java poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/TestEmbedded.java poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLDocument.java poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLProperties.java poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/TestTriggerCoverage.java poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/TestXMLPropertiesTextExtractor.java poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestContentType.java poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestFileHelper.java poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestListParts.java poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagePartName.java poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageThumbnail.java poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePartName.java poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/util/TestZipSecureFile.java poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureConfig.java poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestDecryptor.java poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestEncryptionInfo.java poi/trunk/src/ooxml/testcases/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/TestWorkbookFactory.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/extractor/TestEmbeddedExtractor.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/format/TestCellFormatPart.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/formula/TestFormulaParser.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/formula/TestStructuredReferences.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/CountifsTests.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestProper.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestSumifsXSSF.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestVlookup.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXCell.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/ConditionalFormattingEvalTest.java poi/trunk/src/ooxml/testcases/org/apache/poi/util/tests/TestIdentifierManager.java poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestXDDFColor.java poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFDataSourcesFactory.java poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextBodyProperties.java poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextRun.java poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/CombinedIteratorTest.java poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java poi/trunk
svn commit: r1885283 [7/7] - in /poi/trunk/src: multimodule/ooxml/test9/ ooxml/testcases/org/apache/poi/extractor/ooxml/ ooxml/testcases/org/apache/poi/ooxml/ ooxml/testcases/org/apache/poi/openxml4j/
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java?rev=1885283=1885282=1885283=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java
Sat Jan 9 00:46:52 2021
@@ -34,7 +34,7 @@ public final class TestXWPFSDT {
* Test text extraction from nested SDTs
*/
@Test
-public void testNestedSDTs() throws Exception {
+void testNestedSDTs() throws Exception {
try (XWPFDocument doc =
XWPFTestDataSamples.openSampleDocument("Bug64561.docx")) {
XWPFAbstractSDT sdt = extractAllSDTs(doc).get(0);
assertEquals("Subject", sdt.getContent().getText(), "extracted
text");
@@ -45,7 +45,7 @@ public final class TestXWPFSDT {
* Test simple tag and title extraction from SDT
*/
@Test
-public void testTagTitle() throws Exception {
+void testTagTitle() throws Exception {
try (XWPFDocument doc
=XWPFTestDataSamples.openSampleDocument("Bug54849.docx")) {
String tag = null;
String title = null;
@@ -66,7 +66,7 @@ public final class TestXWPFSDT {
}
@Test
-public void testGetSDTs() throws Exception {
+void testGetSDTs() throws Exception {
String[] contents = new String[]{
"header_rich_text",
"Rich_text",
@@ -99,7 +99,7 @@ public final class TestXWPFSDT {
* POI-54771 and TIKA-1317
*/
@Test
-public void testSDTAsCell() throws Exception {
+void testSDTAsCell() throws Exception {
//Bug54771a.docx and Bug54771b.docx test slightly
//different recursion patterns. Keep both!
try (XWPFDocument doc =
XWPFTestDataSamples.openSampleDocument("Bug54771a.docx")) {
@@ -128,7 +128,7 @@ public final class TestXWPFSDT {
* POI-55142 and Tika 1130
*/
@Test
-public void testNewLinesBetweenRuns() throws Exception {
+void testNewLinesBetweenRuns() throws Exception {
try (XWPFDocument doc
=XWPFTestDataSamples.openSampleDocument("Bug55142.docx")) {
List sdts = extractAllSDTs(doc);
List targs = new ArrayList<>();
@@ -152,7 +152,7 @@ public final class TestXWPFSDT {
}
@Test
-public void test60341() throws IOException {
+void test60341() throws IOException {
//handle sdtbody without an sdtpr
try (XWPFDocument doc
=XWPFTestDataSamples.openSampleDocument("Bug60341.docx")) {
List sdts = extractAllSDTs(doc);
@@ -163,7 +163,7 @@ public final class TestXWPFSDT {
}
@Test
-public void test62859() throws IOException {
+void test62859() throws IOException {
//this doesn't test the exact code path for this issue, but
//it does test for a related issue, and the fix fixes both.
//We should try to add the actual triggering document
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java?rev=1885283=1885282=1885283=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java
Sat Jan 9 00:46:52 2021
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
*/
public final class TestXWPFSmartTag {
@Test
-public void testSmartTags() throws IOException {
+void testSmartTags() throws IOException {
try (XWPFDocument doc =
XWPFTestDataSamples.openSampleDocument("smarttag-snippet.docx")) {
XWPFParagraph p = doc.getParagraphArray(0);
assertContains(p.getText(), "Carnegie Mellon University School of
Computer Science");
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java?rev=1885283=1885282=1885283=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java
Sat Jan 9 00:46:52 2021
@@ -39,7 +39,7 @@ import org.openxmlformats.schemas.wordpr
public final class TestXWPFStyles {
@Test
-public void testGetUsedStyles() throws IOException {
+void testGetUsedStyles() throws IOException {
try (XWPFDocument sampleDoc =
XWPFTestDataSamples.openSampleDocument("Styles.docx")) {
svn commit: r1885283 [2/7] - in /poi/trunk/src: multimodule/ooxml/test9/ ooxml/testcases/org/apache/poi/extractor/ooxml/ ooxml/testcases/org/apache/poi/ooxml/ ooxml/testcases/org/apache/poi/openxml4j/
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java?rev=1885283=1885282=1885283=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
Sat Jan 9 00:46:52 2021
@@ -395,7 +395,7 @@ public class TestSignatureInfo {
}
@Test
-public void testSignSpreadsheet() throws Exception {
+void testSignSpreadsheet() throws Exception {
String testFile = "hello-world-unsigned.xlsx";
try (OPCPackage pkg =
OPCPackage.open(copy(testdata.getFile(testFile)), PackageAccess.READ_WRITE)) {
sign(pkg);
@@ -412,7 +412,7 @@ public class TestSignatureInfo {
}
@Test
-public void testManipulation() throws Exception {
+void testManipulation() throws Exception {
// sign & validate
String testFile = "hello-world-unsigned.xlsx";
try (OPCPackage pkg =
OPCPackage.open(copy(testdata.getFile(testFile)), PackageAccess.READ_WRITE)) {
@@ -439,7 +439,7 @@ public class TestSignatureInfo {
}
@Test
-public void testSignSpreadsheetWithSignatureInfo() throws Exception {
+void testSignSpreadsheetWithSignatureInfo() throws Exception {
initKeyPair();
String testFile = "hello-world-unsigned.xlsx";
try (OPCPackage pkg =
OPCPackage.open(copy(testdata.getFile(testFile)), PackageAccess.READ_WRITE)) {
@@ -462,7 +462,7 @@ public class TestSignatureInfo {
}
@Test
-public void testSignEnvelopingDocument() throws Exception {
+void testSignEnvelopingDocument() throws Exception {
String testFile = "hello-world-unsigned.xlsx";
File sigCopy = testdata.getFile(testFile);
ByteArrayOutputStream bos = new ByteArrayOutputStream(5);
@@ -662,7 +662,7 @@ public class TestSignatureInfo {
}
@Test
-public void testCertChain() throws Exception {
+void testCertChain() throws Exception {
final boolean isIBM =
System.getProperty("java.vendor").contains("IBM");
KeyStore keystore = KeyStore.getInstance("PKCS12");
@@ -711,7 +711,7 @@ public class TestSignatureInfo {
}
@Test
-public void testNonSha1() throws Exception {
+void testNonSha1() throws Exception {
String testFile = "hello-world-unsigned.xlsx";
initKeyPair();
@@ -764,7 +764,7 @@ public class TestSignatureInfo {
}
@Test
-public void testMultiSign() throws Exception {
+void testMultiSign() throws Exception {
cal = LocaleUtil.getLocaleCalendar(LocaleUtil.TIMEZONE_UTC);
cal.clear();
cal.setTimeZone(LocaleUtil.TIMEZONE_UTC);
@@ -846,7 +846,7 @@ public class TestSignatureInfo {
}
@Test
-public void testRetrieveCertificate() throws InvalidFormatException,
IOException {
+void testRetrieveCertificate() throws InvalidFormatException, IOException {
SignatureConfig sic = new SignatureConfig();
final File file = testdata.getFile("PPT2016withComment.pptx");
try (final OPCPackage pkg = OPCPackage.open(file, PackageAccess.READ))
{
@@ -871,7 +871,7 @@ public class TestSignatureInfo {
}
@Test
-public void testSignatureImage() throws Exception {
+void testSignatureImage() throws Exception {
initKeyPair();
List> lines =
Arrays.asList(XSSFSignatureLine::new, XWPFSignatureLine::new);
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java?rev=1885283=1885282=1885283=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java
Sat Jan 9 00:46:52 2021
@@ -75,7 +75,7 @@ public class TestAgileEncryptionParamete
@ParameterizedTest
@MethodSource("data")
-public void testAgileEncryptionModes(CipherAlgorithm ca, HashAlgorithm ha,
ChainingMode cm) throws Exception {
+void testAgileEncryptionModes(CipherAlgorithm ca, HashAlgorithm ha,
ChainingMode cm) throws Exception {
int maxKeyLen = Cipher.getMaxAllowedKeyLength(ca.jceId);
assumeTrue(maxKeyLen >= ca.defaultKeySize, "Please install JCE
Unlimited Strength Jurisdiction Policy files");
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestDecryptor.java
URL:
svn commit: r1885283 [4/7] - in /poi/trunk/src: multimodule/ooxml/test9/ ooxml/testcases/org/apache/poi/extractor/ooxml/ ooxml/testcases/org/apache/poi/ooxml/ ooxml/testcases/org/apache/poi/openxml4j/
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java?rev=1885283=1885282=1885283=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
Sat Jan 9 00:46:52 2021
@@ -66,7 +66,7 @@ import org.openxmlformats.schemas.spread
*/
public final class TestUnfixedBugs {
@Test
-public void test54071() throws Exception {
+void test54071() throws Exception {
Workbook workbook =
XSSFTestDataSamples.openSampleWorkbook("54071.xlsx");
Sheet sheet = workbook.getSheetAt(0);
int rows = sheet.getPhysicalNumberOfRows();
@@ -95,7 +95,7 @@ public final class TestUnfixedBugs {
}
@Test
-public void test54071Simple() {
+void test54071Simple() {
double value1 = 41224.88425923;
double value2 = 41224.88368058;
@@ -136,7 +136,7 @@ public final class TestUnfixedBugs {
// When this is fixed, the test case should go to BaseTestXCell with
// adjustments to use _testDataProvider to also verify this for XSSF
@Test
-public void testBug57294() throws IOException {
+void testBug57294() throws IOException {
Workbook wb = SXSSFITestDataProvider.instance.createWorkbook();
Sheet sheet = wb.createSheet();
@@ -167,7 +167,7 @@ public final class TestUnfixedBugs {
// This test will run green, but the resulting file is formatted
incorrectly,
// see the bug at https://bz.apache.org/bugzilla/show_bug.cgi?id=55752
@Test
-public void testBug55752() throws IOException {
+void testBug55752() throws IOException {
try (Workbook wb = new XSSFWorkbook()) {
Sheet sheet = wb.createSheet("test");
@@ -223,7 +223,7 @@ public final class TestUnfixedBugs {
}
@Test
-public void test57423() throws IOException {
+void test57423() throws IOException {
Workbook wb = XSSFTestDataSamples.openSampleWorkbook("57423.xlsx");
Sheet testSheet = wb.getSheetAt(0);
@@ -347,7 +347,7 @@ public final class TestUnfixedBugs {
}
@Test
-public void testBug60355() throws IOException {
+void testBug60355() throws IOException {
try (Workbook workbook =
XSSFTestDataSamples.openSampleWorkbook("HsGetVal.xlsx")){
Sheet sheet = workbook.getSheetAt(workbook.getActiveSheetIndex());
@@ -396,7 +396,7 @@ public final class TestUnfixedBugs {
}
@Test
-public void testBug64759() throws IOException {
+void testBug64759() throws IOException {
try (Workbook wb =
XSSFTestDataSamples.openSampleWorkbook("64759.xlsx")) {
Sheet cloned = wb.cloneSheet(0);
assertNotNull(cloned);
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java?rev=1885283=1885282=1885283=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
Sat Jan 9 00:46:52 2021
@@ -1601,7 +1601,7 @@ public final class TestXSSFBugs extends
@Test
-public void testBug53798XLSX() throws IOException {
+void testBug53798XLSX() throws IOException {
try (XSSFWorkbook wb =
XSSFTestDataSamples.openSampleWorkbook("53798_shiftNegative_TMPL.xlsx")) {
File xlsOutput = TempFile.createTempFile("testBug53798", ".xlsx");
bug53798Work(wb, xlsOutput);
@@ -1610,7 +1610,7 @@ public final class TestXSSFBugs extends
@Disabled("Shifting rows is not yet implemented in SXSSFSheet")
@Test
-public void testBug53798XLSXStream() throws IOException {
+void testBug53798XLSXStream() throws IOException {
try (XSSFWorkbook wb =
XSSFTestDataSamples.openSampleWorkbook("53798_shiftNegative_TMPL.xlsx")) {
File xlsOutput = TempFile.createTempFile("testBug53798", ".xlsx");
SXSSFWorkbook wb2 = new SXSSFWorkbook(wb);
@@ -1620,7 +1620,7 @@ public final class TestXSSFBugs extends
}
@Test
-public void testBug53798XLS() throws IOException {
+void testBug53798XLS() throws IOException {
Workbook wb =
HSSFTestDataSamples.openSampleWorkbook("53798_shiftNegative_TMPL.xls");
File xlsOutput = TempFile.createTempFile("testBug53798", ".xls");
bug53798Work(wb, xlsOutput);
@@ -1631,7 +1631,7 @@ public final class TestXSSFBugs extends
* SUMIF was throwing a NPE on some formulas
*/
@Test
-public void
svn commit: r1885283 [5/7] - in /poi/trunk/src: multimodule/ooxml/test9/ ooxml/testcases/org/apache/poi/extractor/ooxml/ ooxml/testcases/org/apache/poi/ooxml/ ooxml/testcases/org/apache/poi/openxml4j/
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java?rev=1885283=1885282=1885283=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
Sat Jan 9 00:46:52 2021
@@ -407,7 +407,7 @@ public final class TestXSSFFormulaParser
}
@Test
-public void test58648Single() throws IOException {
+void test58648Single() throws IOException {
try (XSSFWorkbook wb = new XSSFWorkbook()) {
XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(wb);
Ptg[] ptgs;
@@ -420,7 +420,7 @@ public final class TestXSSFFormulaParser
}
@Test
-public void test58648Basic() throws IOException {
+void test58648Basic() throws IOException {
XSSFWorkbook wb = new XSSFWorkbook();
XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(wb);
Ptg[] ptgs;
@@ -463,7 +463,7 @@ public final class TestXSSFFormulaParser
}
@Test
-public void test58648FormulaParsing() throws IOException {
+void test58648FormulaParsing() throws IOException {
Workbook wb = XSSFTestDataSamples.openSampleWorkbook("58648.xlsx");
FormulaEvaluator evaluator =
wb.getCreationHelper().createFormulaEvaluator();
@@ -494,7 +494,7 @@ public final class TestXSSFFormulaParser
}
@Test
-public void testWhitespaceInFormula() throws IOException {
+void testWhitespaceInFormula() throws IOException {
XSSFWorkbook wb = new XSSFWorkbook();
XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(wb);
Ptg[] ptgs;
@@ -536,7 +536,7 @@ public final class TestXSSFFormulaParser
}
@Test
-public void testWhitespaceInComplexFormula() throws IOException {
+void testWhitespaceInComplexFormula() throws IOException {
XSSFWorkbook wb = new XSSFWorkbook();
XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(wb);
Ptg[] ptgs;
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooterProperties.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooterProperties.java?rev=1885283=1885282=1885283=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooterProperties.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooterProperties.java
Sat Jan 9 00:46:52 2021
@@ -43,14 +43,14 @@ public class TestXSSFHeaderFooterPropert
}
@Test
-public void testGetAlignWithMargins() {
+void testGetAlignWithMargins() {
assertFalse(hfProp.getAlignWithMargins());
hfProp.setAlignWithMargins(true);
assertTrue(hfProp.getAlignWithMargins());
}
@Test
-public void testGetDifferentFirst() {
+void testGetDifferentFirst() {
assertFalse(hfProp.getDifferentFirst());
hfProp.setDifferentFirst(true);
assertTrue(hfProp.getDifferentFirst());
@@ -59,7 +59,7 @@ public class TestXSSFHeaderFooterPropert
}
@Test
-public void testGetDifferentOddEven() {
+void testGetDifferentOddEven() {
assertFalse(hfProp.getDifferentOddEven());
hfProp.setDifferentOddEven(true);
assertTrue(hfProp.getDifferentOddEven());
@@ -68,14 +68,14 @@ public class TestXSSFHeaderFooterPropert
}
@Test
-public void testGetScaleWithDoc() {
+void testGetScaleWithDoc() {
assertFalse(hfProp.getScaleWithDoc());
hfProp.setScaleWithDoc(true);
assertTrue(hfProp.getScaleWithDoc());
}
@Test
-public void testRemoveAlignWithMargins() {
+void testRemoveAlignWithMargins() {
hfProp.setAlignWithMargins(true);
assertTrue(hfProp.getHeaderFooter().isSetAlignWithMargins());
hfProp.removeAlignWithMargins();
@@ -83,7 +83,7 @@ public class TestXSSFHeaderFooterPropert
}
@Test
-public void testRemoveDifferentFirst() {
+void testRemoveDifferentFirst() {
hfProp.setDifferentFirst(true);
assertTrue(hfProp.getHeaderFooter().isSetDifferentFirst());
hfProp.removeDifferentFirst();
@@ -91,7 +91,7 @@ public class TestXSSFHeaderFooterPropert
}
@Test
-public void testRemoveDifferentOddEven() {
+void testRemoveDifferentOddEven() {
hfProp.setDifferentOddEven(true);
assertTrue(hfProp.getHeaderFooter().isSetDifferentOddEven());
hfProp.removeDifferentOddEven();
@@ -99,7 +99,7 @@ public class TestXSSFHeaderFooterPropert
}
svn commit: r1885283 [6/7] - in /poi/trunk/src: multimodule/ooxml/test9/ ooxml/testcases/org/apache/poi/extractor/ooxml/ ooxml/testcases/org/apache/poi/ooxml/ ooxml/testcases/org/apache/poi/openxml4j/
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorderTest.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorderTest.java?rev=1885283=1885282=1885283=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorderTest.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorderTest.java
Sat Jan 9 00:46:52 2021
@@ -46,7 +46,7 @@ public class XSSFCellBorderTest {
}
@Test
-public void testEquals() {
+void testEquals() {
for (XSSFCellBorder.BorderSide side :
XSSFCellBorder.BorderSide.values()) {
XSSFCellBorder border = new XSSFCellBorder();
assertEquals(empty, border);
@@ -78,7 +78,7 @@ public class XSSFCellBorderTest {
}
@Test
-public void testConstruct() {
+void testConstruct() {
XSSFCellBorder border = new XSSFCellBorder((CTBorder)
empty.getCTBorder().copy());
assertEquals(empty, border);
border.getCTBorder().setOutline(true);
@@ -97,7 +97,7 @@ public class XSSFCellBorderTest {
}
@Test
-public void testGettersSetters() {
+void testGettersSetters() {
assertNotNull(empty.getCTBorder());
XSSFCellBorder border = new XSSFCellBorder((CTBorder)
empty.getCTBorder().copy());
@@ -106,7 +106,7 @@ public class XSSFCellBorderTest {
}
@Test
-public void testSetBorderStyle() {
+void testSetBorderStyle() {
XSSFCellBorder border = new XSSFCellBorder();
for (XSSFCellBorder.BorderSide side :
XSSFCellBorder.BorderSide.values()) {
assertEquals(BorderStyle.NONE, border.getBorderStyle(side));
@@ -117,7 +117,7 @@ public class XSSFCellBorderTest {
}
@Test
-public void testSetBorderColor() {
+void testSetBorderColor() {
XSSFCellBorder border = new XSSFCellBorder();
XSSFColor color = new XSSFColor(stylesSource.getIndexedColors());
@@ -130,7 +130,7 @@ public class XSSFCellBorderTest {
}
@Test
-public void testRegression() throws Exception {
+void testRegression() throws Exception {
XSSFCellStyle style = wb.createCellStyle();
style.setBorderTop(BorderStyle.THICK);
style.setBorderBottom(BorderStyle.THICK);
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java?rev=1885283=1885282=1885283=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java
Sat Jan 9 00:46:52 2021
@@ -45,7 +45,7 @@ import org.openxmlformats.schemas.spread
public final class TestColumnHelper {
@Test
-public void testCleanColumns() {
+void testCleanColumns() {
CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
CTCols cols1 = worksheet.addNewCols();
@@ -79,7 +79,7 @@ public final class TestColumnHelper {
}
@Test
-public void testSortColumns() {
+void testSortColumns() {
CTCols cols1 = CTCols.Factory.newInstance();
CTCol col1 = cols1.addNewCol();
col1.setMin(1);
@@ -125,7 +125,7 @@ public final class TestColumnHelper {
}
@Test
-public void testCloneCol() {
+void testCloneCol() {
CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
ColumnHelper helper = new ColumnHelper(worksheet);
@@ -143,7 +143,7 @@ public final class TestColumnHelper {
}
@Test
-public void testAddCleanColIntoCols() {
+void testAddCleanColIntoCols() {
CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
ColumnHelper helper = new ColumnHelper(worksheet);
@@ -195,14 +195,14 @@ public final class TestColumnHelper {
}
@Test
-public void testAddCleanColIntoColsExactOverlap() {
+void testAddCleanColIntoColsExactOverlap() {
CTCols cols = createHiddenAndBestFitColsWithHelper(1, 1, 1, 1);
assertEquals(1, cols.sizeOfColArray());
assertMinMaxHiddenBestFit(cols, 0, 1, 1, true, true);
}
@Test
-public void testAddCleanColIntoColsOverlapsOverhangingBothSides() {
+void testAddCleanColIntoColsOverlapsOverhangingBothSides() {
CTCols cols = createHiddenAndBestFitColsWithHelper(2, 2, 1, 3);
assertEquals(3, cols.sizeOfColArray());
assertMinMaxHiddenBestFit(cols, 0, 1, 1, false, true);
@@ -211,7 +211,7 @@ public final class TestColumnHelper {
}
@Test
-public void
svn commit: r1885283 [3/7] - in /poi/trunk/src: multimodule/ooxml/test9/ ooxml/testcases/org/apache/poi/extractor/ooxml/ ooxml/testcases/org/apache/poi/ooxml/ ooxml/testcases/org/apache/poi/openxml4j/
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java?rev=1885283=1885282=1885283=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java
Sat Jan 9 00:46:52 2021
@@ -50,7 +50,7 @@ import org.openxmlformats.schemas.presen
public class TestXSLFTable {
@Test
-public void testResize() throws Exception {
+void testResize() throws Exception {
String[][] data = getDummyData(20);
final int maxHeight = 400;
@@ -159,7 +159,7 @@ public class TestXSLFTable {
@Test
-public void testRead() throws IOException {
+void testRead() throws IOException {
XMLSlideShow ppt =
XSLFTestDataSamples.openSampleDocument("shapes.pptx");
XSLFSlide slide = ppt.getSlides().get(3);
@@ -201,7 +201,7 @@ public class TestXSLFTable {
}
@Test
-public void testCreate() throws IOException {
+void testCreate() throws IOException {
XMLSlideShow ppt1 = new XMLSlideShow();
XSLFSlide slide = ppt1.createSlide();
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=1885283=1885282=1885283=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
Sat Jan 9 00:46:52 2021
@@ -61,7 +61,7 @@ public class TestXSLFTableRow {
}
@Test
-public void testHeight() {
+void testHeight() {
final double h = 10.0;
row.setHeight(h);
assertEquals(h, row.getHeight(), 1e-16);
@@ -76,7 +76,7 @@ public class TestXSLFTableRow {
}
@Test
-public void testIterator() {
+void testIterator() {
int i = 0;
for (XSLFTableCell cell : row) {
i++;
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=1885283=1885282=1885283=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
Sat Jan 9 00:46:52 2021
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
public class TestXSLFTableStyles {
@Test
-public void testRead() throws IOException {
+void testRead() throws IOException {
XMLSlideShow ppt = new XMLSlideShow();
XSLFTableStyles tblStyles = ppt.getTableStyles();
assertNotNull(tblStyles);
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=1885283=1885282=1885283=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
Sat Jan 9 00:46:52 2021
@@ -31,7 +31,7 @@ import org.openxmlformats.schemas.drawin
public class TestXSLFTextBox {
@Test
-public void testPlaceholder() throws IOException {
+void testPlaceholder() throws IOException {
XMLSlideShow ppt = new XMLSlideShow();
XSLFSlide slide = ppt.createSlide();
@@ -50,7 +50,7 @@ public class TestXSLFTextBox {
* text box inherits default text proeprties from presentation.xml
*/
@Test
-public void testDefaultTextStyle() throws IOException {
+void testDefaultTextStyle() throws IOException {
XMLSlideShow ppt = new XMLSlideShow();
XSLFSlide slide = ppt.createSlide();
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=1885283=1885282=1885283=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
Sat Jan 9 00:46:52 2021
@@ -65,7 +65,7 @@ public class
svn commit: r1885281 [6/11] - in /poi/trunk/src: multimodule/poi/test9/ ooxml/testcases/org/apache/poi/xssf/streaming/ ooxml/testcases/org/apache/poi/xssf/usermodel/ testcases/org/apache/poi/ testcase
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java?rev=1885281=1885280=1885281=diff
==
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java Fri
Jan 8 23:50:02 2021
@@ -60,7 +60,7 @@ public final class TestWorkbook {
* HSSFSheet last row or first row is incorrect.
*/
@Test
-public void testWriteSheetSimple() throws IOException {
+void testWriteSheetSimple() throws IOException {
try (HSSFWorkbook wb1 = new HSSFWorkbook()) {
HSSFSheet s = wb1.createSheet();
@@ -89,7 +89,7 @@ public final class TestWorkbook {
* HSSFSheet last row or first row is incorrect.
*/
@Test
-public void testWriteModifySheetSimple() throws IOException {
+void testWriteModifySheetSimple() throws IOException {
HSSFWorkbook wb1 = new HSSFWorkbook();
HSSFSheet s = wb1.createSheet();
@@ -127,7 +127,7 @@ public final class TestWorkbook {
* in the sheet in their known positions.
*/
@Test
-public void testReadSimple() throws IOException {
+void testReadSimple() throws IOException {
HSSFWorkbook wb = openSample("Simple.xls");
HSSFSheet sheet = wb.getSheetAt(0);
@@ -144,7 +144,7 @@ public final class TestWorkbook {
* in the sheet in their known positions.
*/
@Test
-public void testReadSimpleWithDataFormat() throws IOException {
+void testReadSimpleWithDataFormat() throws IOException {
HSSFWorkbook wb = openSample("SimpleWithDataFormat.xls");
HSSFSheet sheet= wb.getSheetAt(0);
HSSFDataFormat format = wb.createDataFormat();
@@ -165,7 +165,7 @@ public final class TestWorkbook {
* in the sheet in their known positions.
*/
@Test
-public void testWriteDataFormat() throws IOException {
+void testWriteDataFormat() throws IOException {
HSSFWorkbook wb1 = new HSSFWorkbook();
HSSFSheet s1 = wb1.createSheet();
HSSFDataFormat format = wb1.createDataFormat();
@@ -204,7 +204,7 @@ public final class TestWorkbook {
*
*/
@Test
-public void testReadEmployeeSimple() throws IOException {
+void testReadEmployeeSimple() throws IOException {
HSSFWorkbook wb = openSample("Employee.xls");
HSSFSheet sheet = wb.getSheetAt(0);
@@ -228,7 +228,7 @@ public final class TestWorkbook {
* is incorrect or has not been replaced.
*/
@Test
-public void testModifySimple() throws IOException {
+void testModifySimple() throws IOException {
HSSFWorkbook wb1 = openSample("Simple.xls");
HSSFSheet sheet = wb1.getSheetAt(0);
HSSFCell cell = sheet.getRow(0).getCell(0);
@@ -257,7 +257,7 @@ public final class TestWorkbook {
* or is incorrect.
*/
@Test
-public void testModifySimpleWithSkip() throws IOException {
+void testModifySimpleWithSkip() throws IOException {
HSSFWorkbook wb1 = openSample("SimpleWithSkip.xls");
HSSFSheet sheet = wb1.getSheetAt(0);
HSSFCell cell = sheet.getRow(0).getCell(1);
@@ -295,7 +295,7 @@ public final class TestWorkbook {
* is incorrect or has not been replaced.
*/
@Test
-public void testModifySimpleWithStyling() throws IOException {
+void testModifySimpleWithStyling() throws IOException {
HSSFWorkbook wb1 = openSample("SimpleWithStyling.xls");
HSSFSheet sheet = wb1.getSheetAt(0);
@@ -328,7 +328,7 @@ public final class TestWorkbook {
* is incorrect or has not been replaced.
*/
@Test
-public void testModifyEmployee() throws IOException {
+void testModifyEmployee() throws IOException {
HSSFWorkbook wb1 = openSample("Employee.xls");
HSSFSheet sheet = wb1.getSheetAt(0);
HSSFCellcell = sheet.getRow(3).getCell(2);
@@ -358,7 +358,7 @@ public final class TestWorkbook {
* FAILURE:HSSF does not read a sheet or excepts. HSSF incorrectly
identifies the cell
*/
@Test
-public void testReadSheetWithRK() throws IOException {
+void testReadSheetWithRK() throws IOException {
HSSFWorkbook wb = openSample("rk.xls");
HSSFSheets = wb.getSheetAt(0);
HSSFCell c = s.getRow(0).getCell(0);
@@ -378,7 +378,7 @@ public final class TestWorkbook {
* HSSFSheet last row or first row is incorrect.
*/
@Test
-public void testWriteModifySheetMerged() throws IOException {
+void testWriteModifySheetMerged() throws IOException {
svn commit: r1885281 [5/11] - in /poi/trunk/src: multimodule/poi/test9/ ooxml/testcases/org/apache/poi/xssf/streaming/ ooxml/testcases/org/apache/poi/xssf/usermodel/ testcases/org/apache/poi/ testcase
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java?rev=1885281=1885280=1885281=diff
==
---
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
Fri Jan 8 23:50:02 2021
@@ -75,7 +75,7 @@ public final class TestFormulaEvaluatorB
* open up excel
*/
@Test
-public void test44636() throws Exception {
+void test44636() throws Exception {
// Open the existing file, tweak one value and
// re-calculate
@@ -130,7 +130,7 @@ public final class TestFormulaEvaluatorB
* if a formula has values in the interval [Short.MAX_VALUE,
(Short.MAX_VALUE+1)*2]
*/
@Test
-public void test44297() throws Exception {
+void test44297() throws Exception {
HSSFWorkbook wb = openSampleWorkbook("44297.xls");
@@ -194,7 +194,7 @@ public final class TestFormulaEvaluatorB
* of all the rows in Column C
*/
@Test
-public void test44410() throws Exception {
+void test44410() throws Exception {
HSSFWorkbook wb = openSampleWorkbook("SingleLetterRanges.xls");
HSSFSheet sheet = wb.getSheetAt(0);
@@ -254,7 +254,7 @@ public final class TestFormulaEvaluatorB
* Tests that we can evaluate boolean cells properly
*/
@Test
-public void testEvaluateBooleanInCell_bug44508() throws Exception {
+void testEvaluateBooleanInCell_bug44508() throws Exception {
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet sheet = wb.createSheet();
wb.setSheetName(0, "Sheet1");
@@ -275,7 +275,7 @@ public final class TestFormulaEvaluatorB
}
@Test
-public void testClassCast_bug44861() throws Exception {
+void testClassCast_bug44861() throws Exception {
try (HSSFWorkbook wb = openSampleWorkbook("44861.xls")) {
// Check direct
HSSFFormulaEvaluator.evaluateAllFormulaCells(wb);
@@ -296,7 +296,7 @@ public final class TestFormulaEvaluatorB
}
@Test
-public void testEvaluateInCellWithErrorCode_bug44950() throws Exception {
+void testEvaluateInCellWithErrorCode_bug44950() throws Exception {
try (HSSFWorkbook wb = new HSSFWorkbook()) {
HSSFSheet sheet = wb.createSheet("Sheet1");
HSSFRow row = sheet.createRow(1);
@@ -313,7 +313,7 @@ public final class TestFormulaEvaluatorB
}
@Test
-public void testDateWithNegativeParts_bug48528() throws Exception {
+void testDateWithNegativeParts_bug48528() throws Exception {
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet sheet = wb.createSheet("Sheet1");
HSSFRow row = sheet.createRow(1);
@@ -386,7 +386,7 @@ public final class TestFormulaEvaluatorB
* The HSSFFormula evaluator performance benefits greatly from caching of
intermediate cell values
*/
@Test
-public void testSlowEvaluate45376() throws Exception {
+void testSlowEvaluate45376() throws Exception {
/*
* Note - to observe behaviour without caching, disable the call to
* updateValue() from FormulaCellCacheEntry.updateFormulaResult().
@@ -440,7 +440,7 @@ public final class TestFormulaEvaluatorB
@SuppressWarnings("resource")
@Test
-public void test55747_55324() throws Exception {
+void test55747_55324() throws Exception {
HSSFWorkbook wb = new HSSFWorkbook();
HSSFFormulaEvaluator ev =
wb.getCreationHelper().createFormulaEvaluator();
HSSFSheet ws = wb.createSheet();
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java?rev=1885281=1885280=1885281=diff
==
---
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java
Fri Jan 8 23:50:02 2021
@@ -38,7 +38,7 @@ public final class TestFormulaEvaluatorD
* https://poi.apache.org/hssf/eval.html#EvaluateAll
*/
@Test
- public void testEvaluateAll() throws IOException {
+ void testEvaluateAll() throws IOException {
try (HSSFWorkbook wb = new HSSFWorkbook()) {
HSSFSheet s1 = wb.createSheet();
HSSFSheet s2 = wb.createSheet();
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java
URL:
svn commit: r1885281 [2/11] - in /poi/trunk/src: multimodule/poi/test9/ ooxml/testcases/org/apache/poi/xssf/streaming/ ooxml/testcases/org/apache/poi/xssf/usermodel/ testcases/org/apache/poi/ testcase
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java?rev=1885281=1885280=1885281=diff
==
---
poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
Fri Jan 8 23:50:02 2021
@@ -60,7 +60,7 @@ public final class TestEventRecordFactor
* tests that the records can be processed and properly return values.
*/
@Test
-public void testProcessRecords() {
+void testProcessRecords() {
final boolean[] wascalled = { false }; // hack to pass boolean by ref
into inner class
ERFListener listener = rec -> {
@@ -94,7 +94,7 @@ public final class TestEventRecordFactor
* constructed record in the simple case.
*/
@Test
-public void testCreateRecord() {
+void testCreateRecord() {
BOFRecord bof = new BOFRecord();
bof.setBuild((short)0);
bof.setBuildYear((short)1999);
@@ -122,7 +122,7 @@ public final class TestEventRecordFactor
// @NotImplemented
// @Test
// @Disabled
-// public void testCreateContinuedRecord() {
+// void testCreateContinuedRecord() {
// }
@@ -135,7 +135,7 @@ public final class TestEventRecordFactor
*
*/
@Test
- public void testContinuedUnknownRecord() throws IOException {
+ void testContinuedUnknownRecord() throws IOException {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
for (byte[] b : CONTINUE_DATA) {
bos.write(b);
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java?rev=1885281=1885280=1885281=diff
==
---
poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java
Fri Jan 8 23:50:02 2021
@@ -67,20 +67,20 @@ public final class TestEventWorkbookBuil
}
@Test
-public void testBasics() {
+void testBasics() {
assertNotNull(listener.getSSTRecord());
assertNotNull(listener.getBoundSheetRecords());
assertNotNull(listener.getExternSheetRecords());
}
@Test
-public void testGetStubWorkbooks() {
+void testGetStubWorkbooks() {
assertNotNull(listener.getStubWorkbook());
assertNotNull(listener.getStubHSSFWorkbook());
}
@Test
-public void testContents() {
+void testContents() {
assertEquals(2, listener.getSSTRecord().getNumStrings());
assertEquals(3, listener.getBoundSheetRecords().length);
assertEquals(1, listener.getExternSheetRecords().length);
@@ -94,7 +94,7 @@ public final class TestEventWorkbookBuil
}
@Test
-public void testFormulas() {
+void testFormulas() {
// Check our formula records
assertEquals(6, fRecs.size());
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java?rev=1885281=1885280=1885281=diff
==
---
poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
Fri Jan 8 23:50:02 2021
@@ -52,7 +52,7 @@ public final class TestFormatTrackingHSS
}
@Test
- public void testFormats() throws Exception {
+ void testFormats() throws Exception {
processFile("MissingBits.xls");
assertEquals("_(* #,##0_);_(* (#,##0);_(* \"-\"_);_(@_)",
listener.getFormatString(41));
@@ -69,7 +69,7 @@ public final class TestFormatTrackingHSS
* want to check the exact strings!
*/
@Test
- public void testTurnToString() throws Exception {
+ void testTurnToString() throws Exception {
String[] files = new String[] {
"45365.xls", "45365-2.xls", "MissingBits.xls"
};
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java?rev=1885281=1885280=1885281=diff
svn commit: r1885281 [3/11] - in /poi/trunk/src: multimodule/poi/test9/ ooxml/testcases/org/apache/poi/xssf/streaming/ ooxml/testcases/org/apache/poi/xssf/usermodel/ testcases/org/apache/poi/ testcase
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestBoolErrRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestBoolErrRecord.java?rev=1885281=1885280=1885281=diff
==
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestBoolErrRecord.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestBoolErrRecord.java
Fri Jan 8 23:50:02 2021
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
public final class TestBoolErrRecord {
@Test
- public void testError() {
+ void testError() {
byte[] data = HexRead.readFromString(
"00 00 00 00 0F 00 " + // row, col, xfIndex
"07 01 " // #DIV/0!, isError
@@ -54,7 +54,7 @@ public final class TestBoolErrRecord {
* work by the same coincidence).
*/
@Test
- public void testOooBadFormat_bug47479() {
+ void testOooBadFormat_bug47479() {
byte[] data = HexRead.readFromString(
"05 02 09 00 " + // sid, size
"00 00 00 00 0F 00 " + // row, col, xfIndex
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java?rev=1885281=1885280=1885281=diff
==
---
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java
Fri Jan 8 23:50:02 2021
@@ -35,25 +35,25 @@ import org.junit.jupiter.api.Test;
public final class TestBoundSheetRecord {
@Test
- public void testRecordLength() {
+ void testRecordLength() {
BoundSheetRecord record = new BoundSheetRecord("Sheet1");
assertEquals(18, record.getRecordSize());
}
@Test
- public void testWideRecordLength() {
+ void testWideRecordLength() {
BoundSheetRecord record = new BoundSheetRecord("Sheet\u20ac");
assertEquals(24, record.getRecordSize());
}
@Test
- public void testName() {
+ void testName() {
BoundSheetRecord record = new
BoundSheetRecord("1234567890223456789032345678904");
assertThrows(IllegalArgumentException.class, () ->
record.setSheetname("s//*s"));
}
@Test
- public void testDeserializeUnicode() {
+ void testDeserializeUnicode() {
byte[] data = HexRead.readFromString(""
+ "85 00 1A 00" // sid, length
@@ -76,7 +76,7 @@ public final class TestBoundSheetRecord
}
@Test
- public void testOrdering() {
+ void testOrdering() {
BoundSheetRecord bs1 = new BoundSheetRecord("SheetB");
BoundSheetRecord bs2 = new BoundSheetRecord("SheetC");
BoundSheetRecord bs3 = new BoundSheetRecord("SheetA");
@@ -97,7 +97,7 @@ public final class TestBoundSheetRecord
}
@Test
- public void testValidNames() {
+ void testValidNames() {
assertTrue(isValid("Sheet1"));
assertTrue(isValid("O'Brien's sales"));
assertTrue(isValid(" data # "));
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFHeaderRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFHeaderRecord.java?rev=1885281=1885280=1885281=diff
==
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFHeaderRecord.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFHeaderRecord.java
Fri Jan 8 23:50:02 2021
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
*/
public final class TestCFHeaderRecord {
@Test
- public void testCreateCFHeaderRecord () {
+ void testCreateCFHeaderRecord () {
CFHeaderRecord record = new CFHeaderRecord();
CellRangeAddress[] ranges = {
new CellRangeAddress(0,0x,5,5),
@@ -64,7 +64,7 @@ public final class TestCFHeaderRecord {
}
@Test
-public void testCreateCFHeader12Record () {
+void testCreateCFHeader12Record () {
CFHeader12Record record = new CFHeader12Record();
CellRangeAddress[] ranges = {
new CellRangeAddress(0,0x,5,5),
@@ -97,7 +97,7 @@ public final class TestCFHeaderRecord {
}
@Test
- public void testSerialization() {
+ void testSerialization() {
byte[] recordData =
{
(byte)0x03, (byte)0x00,
@@
svn commit: r1885281 [7/11] - in /poi/trunk/src: multimodule/poi/test9/ ooxml/testcases/org/apache/poi/xssf/streaming/ ooxml/testcases/org/apache/poi/xssf/usermodel/ testcases/org/apache/poi/ testcase
Modified: poi/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormat.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormat.java?rev=1885281=1885280=1885281=diff
==
--- poi/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormat.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormat.java Fri
Jan 8 23:50:02 2021
@@ -71,7 +71,7 @@ public class TestCellFormat {
}
@Test
-public void testSome() {
+void testSome() {
JLabel l = new JLabel();
CellFormat fmt = CellFormat.getInstance(
"\"$\"#,##0.00_);[Red]\\(\"$\"#,##0.00\\)");
@@ -79,56 +79,56 @@ public class TestCellFormat {
}
@Test
-public void testPositiveFormatHasOnePart() {
+void testPositiveFormatHasOnePart() {
CellFormat fmt = CellFormat.getInstance("0.00");
CellFormatResult result = fmt.apply(12.345);
assertEquals("12.35", result.text);
}
@Test
-public void testNegativeFormatHasOnePart() {
+void testNegativeFormatHasOnePart() {
CellFormat fmt = CellFormat.getInstance("0.00");
CellFormatResult result = fmt.apply(-12.345);
assertEquals("-12.35", result.text);
}
@Test
-public void testZeroFormatHasOnePart() {
+void testZeroFormatHasOnePart() {
CellFormat fmt = CellFormat.getInstance("0.00");
CellFormatResult result = fmt.apply(0.0);
assertEquals("0.00", result.text);
}
@Test
-public void testPositiveFormatHasPosAndNegParts() {
+void testPositiveFormatHasPosAndNegParts() {
CellFormat fmt = CellFormat.getInstance("0.00;-0.00");
CellFormatResult result = fmt.apply(12.345);
assertEquals("12.35", result.text);
}
@Test
-public void testNegativeFormatHasPosAndNegParts() {
+void testNegativeFormatHasPosAndNegParts() {
CellFormat fmt = CellFormat.getInstance("0.00;-0.00");
CellFormatResult result = fmt.apply(-12.345);
assertEquals("-12.35", result.text);
}
@Test
-public void testNegativeFormatHasPosAndNegParts2() {
+void testNegativeFormatHasPosAndNegParts2() {
CellFormat fmt = CellFormat.getInstance("0.00;(0.00)");
CellFormatResult result = fmt.apply(-12.345);
assertEquals("(12.35)", result.text);
}
@Test
-public void testZeroFormatHasPosAndNegParts() {
+void testZeroFormatHasPosAndNegParts() {
CellFormat fmt = CellFormat.getInstance("0.00;-0.00");
CellFormatResult result = fmt.apply(0.0);
assertEquals("0.00", result.text);
}
@Test
-public void testFormatWithThreeSections() {
+void testFormatWithThreeSections() {
CellFormat fmt = CellFormat.getInstance("0.00;-0.00;-");
assertEquals("12.35", fmt.apply(12.345).text);
@@ -138,7 +138,7 @@ public class TestCellFormat {
}
@Test
-public void testFormatWithFourSections() {
+void testFormatWithFourSections() {
CellFormat fmt = CellFormat.getInstance("0.00;-0.00;-; @ ");
assertEquals("12.35", fmt.apply(12.345).text);
@@ -148,7 +148,7 @@ public class TestCellFormat {
}
@Test
-public void testApplyCellForGeneralFormat() throws Exception {
+void testApplyCellForGeneralFormat() throws Exception {
// Create a workbook, row and cell to test with
Workbook wb = new HSSFWorkbook();
@@ -189,7 +189,7 @@ public class TestCellFormat {
}
@Test
-public void testApplyCellForAtFormat() throws Exception {
+void testApplyCellForAtFormat() throws Exception {
// Create a workbook, row and cell to test with
Workbook wb = new HSSFWorkbook();
@@ -230,7 +230,7 @@ public class TestCellFormat {
}
@Test
-public void testApplyCellForDateFormat() throws Exception {
+void testApplyCellForDateFormat() throws Exception {
// Create a workbook, row and cell to test with
Workbook wb = new HSSFWorkbook();
@@ -253,7 +253,7 @@ public class TestCellFormat {
}
@Test
-public void testApplyCellForTimeFormat() throws Exception {
+void testApplyCellForTimeFormat() throws Exception {
// Create a workbook, row and cell to test with
Workbook wb = new HSSFWorkbook();
@@ -271,7 +271,7 @@ public class TestCellFormat {
}
@Test
-public void testApplyCellForDateFormatAndNegativeFormat() throws Exception
{
+void testApplyCellForDateFormatAndNegativeFormat() throws Exception {
// Create a workbook, row and cell to test with
Workbook wb = new HSSFWorkbook();
@@ -294,7 +294,7 @@ public class TestCellFormat {
}
@Test
-public void testApplyJLabelCellForGeneralFormat() throws Exception {
+void testApplyJLabelCellForGeneralFormat() throws Exception {
svn commit: r1885281 [10/11] - in /poi/trunk/src: multimodule/poi/test9/ ooxml/testcases/org/apache/poi/xssf/streaming/ ooxml/testcases/org/apache/poi/xssf/usermodel/ testcases/org/apache/poi/ testcas
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java?rev=1885281=1885280=1885281=diff
==
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java
Fri Jan 8 23:50:02 2021
@@ -103,7 +103,7 @@ public abstract class BaseTestHyperlink
// copy a hyperlink via the copy constructor
@Test
-public void testCopyHyperlink() throws IOException {
+void testCopyHyperlink() throws IOException {
final Workbook wb = _testDataProvider.createWorkbook();
final CreationHelper createHelper = wb.getCreationHelper();
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java?rev=1885281=1885280=1885281=diff
==
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java
Fri Jan 8 23:50:02 2021
@@ -605,7 +605,7 @@ public abstract class BaseTestNamedRange
}
@Test
-public void testBug56930() throws IOException {
+void testBug56930() throws IOException {
Workbook wb = _testDataProvider.createWorkbook();
// x1 on sheet1 defines "x=1"
@@ -638,7 +638,7 @@ public abstract class BaseTestNamedRange
// bug 56781: name validation only checks for first character's validity
and presence of spaces
// bug 60246: validate name does not allow DOT in named ranges
@Test
-public void testValid() throws IOException {
+void testValid() throws IOException {
Workbook wb = _testDataProvider.createWorkbook();
Name name = wb.createName();
@@ -658,7 +658,7 @@ public abstract class BaseTestNamedRange
}
@Test
-public void testInvalid() {
+void testInvalid() {
Workbook wb = _testDataProvider.createWorkbook();
Name name = wb.createName();
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java?rev=1885281=1885280=1885281=diff
==
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java
Fri Jan 8 23:50:02 2021
@@ -104,7 +104,7 @@ public abstract class BaseTestPicture {
@Test
-public void testResizeNoColumns() throws IOException {
+void testResizeNoColumns() throws IOException {
try (Workbook wb = _testDataProvider.createWorkbook()) {
Sheet sheet = wb.createSheet();
@@ -115,7 +115,7 @@ public abstract class BaseTestPicture {
}
@Test
-public void testResizeWithColumns() throws IOException {
+void testResizeWithColumns() throws IOException {
try (Workbook wb = _testDataProvider.createWorkbook()) {
Sheet sheet = wb.createSheet();
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java?rev=1885281=1885280=1885281=diff
==
---
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java
Fri Jan 8 23:50:02 2021
@@ -90,7 +90,7 @@ public abstract class BaseTestRangeCopie
}
@Test
-public void testEmptyRow() {
+void testEmptyRow() {
// leave some rows empty in-between
Row row = sheet1.createRow(23);
row.createCell(0).setCellValue(1.2);
@@ -104,7 +104,7 @@ public abstract class BaseTestRangeCopie
}
@Test
-public void testSameSheet() {
+void testSameSheet() {
// leave some rows empty in-between
Row row = sheet1.createRow(23);
row.createCell(0).setCellValue(1.2);
@@ -119,7 +119,7 @@ public abstract class BaseTestRangeCopie
}
@Test
-public void testCopyStyles() {
+void testCopyStyles() {
String cellContent = "D6 aligned to the right";
HorizontalAlignment toTheRight = HorizontalAlignment.RIGHT;
// create cell with content aligned to the right
@@ -138,7 +138,7 @@ public abstract class BaseTestRangeCopie
}
@Test
-public void testMergedRanges() {
+void testMergedRanges() {
svn commit: r1885281 [11/11] - in /poi/trunk/src: multimodule/poi/test9/ ooxml/testcases/org/apache/poi/xssf/streaming/ ooxml/testcases/org/apache/poi/xssf/usermodel/ testcases/org/apache/poi/ testcas
Modified: poi/trunk/src/testcases/org/apache/poi/util/TestIntList.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestIntList.java?rev=1885281=1885280=1885281=diff
==
--- poi/trunk/src/testcases/org/apache/poi/util/TestIntList.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/util/TestIntList.java Fri Jan 8
23:50:02 2021
@@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test;
*/
public final class TestIntList {
@Test
-public void testConstructors() {
+void testConstructors() {
IntList list = new IntList();
assertTrue(list.isEmpty());
@@ -49,7 +49,7 @@ public final class TestIntList {
}
@Test
-public void testAdd() {
+void testAdd() {
IntList list = new IntList();
int[] testArray =
{
@@ -111,7 +111,7 @@ public final class TestIntList {
}
@Test
-public void testAddAll() {
+void testAddAll() {
IntList list = new IntList();
for (int j = 0; j < 5; j++) {
@@ -175,7 +175,7 @@ public final class TestIntList {
}
@Test
-public void testAddAllGrow() {
+void testAddAllGrow() {
IntList list = new IntList(0);
IntList addList = new IntList(0);
addList.add(1);
@@ -185,7 +185,7 @@ public final class TestIntList {
}
@Test
-public void testClear() {
+void testClear() {
IntList list = new IntList();
for (int j = 0; j < 500; j++) {
@@ -204,7 +204,7 @@ public final class TestIntList {
}
@Test
-public void testContains() {
+void testContains() {
IntList list = new IntList();
for (int j = 0; j < 1000; j += 2) {
@@ -220,7 +220,7 @@ public final class TestIntList {
}
@Test
-public void testContainsAll() {
+void testContainsAll() {
IntList list = new IntList();
assertTrue(list.containsAll(list));
@@ -240,7 +240,7 @@ public final class TestIntList {
}
@Test
-public void testEquals() {
+void testEquals() {
IntList list = new IntList();
assertEquals(list, list);
@@ -267,7 +267,7 @@ public final class TestIntList {
}
@Test
-public void testGet() {
+void testGet() {
IntList list = new IntList();
for (int j = 0; j < 1000; j++) {
@@ -281,7 +281,7 @@ public final class TestIntList {
}
@Test
-public void testIndexOf() {
+void testIndexOf() {
IntList list = new IntList();
for (int j = 0; j < 1000; j++) {
@@ -297,7 +297,7 @@ public final class TestIntList {
}
@Test
-public void testIsEmpty() {
+void testIsEmpty() {
IntList list1 = new IntList();
IntList list2 = new IntList(1000);
IntList list3 = new IntList(list1);
@@ -320,7 +320,7 @@ public final class TestIntList {
}
@Test
-public void testLastIndexOf() {
+void testLastIndexOf() {
IntList list = new IntList();
for (int j = 0; j < 1000; j++) {
@@ -336,7 +336,7 @@ public final class TestIntList {
}
@Test
-public void testRemove() {
+void testRemove() {
IntList list = new IntList();
for (int j = 0; j < 1000; j++) {
@@ -358,7 +358,7 @@ public final class TestIntList {
}
@Test
-public void testRemoveValue() {
+void testRemoveValue() {
IntList list = new IntList();
for (int j = 0; j < 1000; j++) {
@@ -374,7 +374,7 @@ public final class TestIntList {
}
@Test
-public void testRemoveAll() {
+void testRemoveAll() {
IntList list = new IntList();
for (int j = 0; j < 1000; j++) {
@@ -411,7 +411,7 @@ public final class TestIntList {
}
@Test
-public void testRetainAll() {
+void testRetainAll() {
IntList list = new IntList();
for (int j = 0; j < 1000; j++) {
@@ -447,7 +447,7 @@ public final class TestIntList {
}
@Test
-public void testSet() {
+void testSet() {
IntList list = new IntList();
for (int j = 0; j < 1000; j++) {
@@ -461,7 +461,7 @@ public final class TestIntList {
}
@Test
-public void testSize() {
+void testSize() {
IntList list = new IntList();
for (int j = 0; j < 1000; j++) {
@@ -477,7 +477,7 @@ public final class TestIntList {
}
@Test
-public void testToArray() {
+void testToArray() {
IntList list = new IntList();
for (int j = 0; j < 1000; j++) {
Modified: poi/trunk/src/testcases/org/apache/poi/util/TestIntegerField.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestIntegerField.java?rev=1885281=1885280=1885281=diff
==
--- poi/trunk/src/testcases/org/apache/poi/util/TestIntegerField.java (original)
svn commit: r1885281 [9/11] - in /poi/trunk/src: multimodule/poi/test9/ ooxml/testcases/org/apache/poi/xssf/streaming/ ooxml/testcases/org/apache/poi/xssf/usermodel/ testcases/org/apache/poi/ testcase
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSlope.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSlope.java?rev=1885281=1885280=1885281=diff
==
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSlope.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSlope.java
Fri Jan 8 23:50:02 2021
@@ -55,7 +55,7 @@ public final class TestSlope {
}
@Test
- public void testBasic() {
+ void testBasic() {
Double exp = Math.pow(10, 7.5);
ValueEval[] yValues = {
new NumberEval(3+exp),
@@ -84,7 +84,7 @@ public final class TestSlope {
* number of items in array is not limited to 30
*/
@Test
- public void testLargeArrays() {
+ void testLargeArrays() {
ValueEval[] yValues = createMockNumberArray(100, 3); //
[1,2,0,1,2,0,...,0,1]
yValues[0] = new NumberEval(2.0); // Changes first element to 2
ValueEval[] xValues = createMockNumberArray(100, 101); //
[1,2,3,4,...,99,100]
@@ -107,7 +107,7 @@ public final class TestSlope {
}
@Test
- public void testErrors() {
+ void testErrors() {
ValueEval[] xValues = {
ErrorEval.REF_INVALID,
new NumberEval(2),
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestStatsLib.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestStatsLib.java?rev=1885281=1885280=1885281=diff
==
---
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestStatsLib.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestStatsLib.java
Fri Jan 8 23:50:02 2021
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
public class TestStatsLib extends BaseTestNumeric {
@Test
-public void testDevsq() {
+void testDevsq() {
double[] v;
double d, x;
@@ -69,7 +69,7 @@ public class TestStatsLib extends BaseTe
}
@Test
-public void testKthLargest() {
+void testKthLargest() {
double[] v;
double d, x;
@@ -106,11 +106,11 @@ public class TestStatsLib extends BaseTe
@Test
@Disabled("... implement ...")
-public void testKthSmallest() {
+void testKthSmallest() {
}
@Test
-public void testAvedev() {
+void testAvedev() {
double[] v;
double d, x;
@@ -146,7 +146,7 @@ public class TestStatsLib extends BaseTe
}
@Test
-public void testMedian() {
+void testMedian() {
double[] v;
double d, x;
@@ -192,7 +192,7 @@ public class TestStatsLib extends BaseTe
}
@Test
-public void testMode() {
+void testMode() {
double[] v;
v = new double[] {1,2,3,4,5,6,7,8,9,10};
@@ -240,7 +240,7 @@ public class TestStatsLib extends BaseTe
}
@Test
-public void testStddev() {
+void testStddev() {
double[] v;
double d, x;
@@ -276,7 +276,7 @@ public class TestStatsLib extends BaseTe
}
@Test
-public void testVar() {
+void testVar() {
double[] v;
double d, x;
@@ -302,7 +302,7 @@ public class TestStatsLib extends BaseTe
}
@Test
-public void testVarp() {
+void testVarp() {
double[] v;
double d, x;
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSubstitute.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSubstitute.java?rev=1885281=1885280=1885281=diff
==
---
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSubstitute.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSubstitute.java
Fri Jan 8 23:50:02 2021
@@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Asse
public class TestSubstitute {
@Test
-public void testSubstitute() {
+void testSubstitute() {
Substitute fun = new Substitute();
assertEquals("ADEFC", ((StringValueEval)fun.evaluate(0, 1,
new StringEval("ABC"), new StringEval("B"), new
StringEval("DEF"))).getStringValue());
@@ -41,7 +41,7 @@ public class TestSubstitute {
}
@Test
-public void testSubstituteInvalidArg() {
+void testSubstituteInvalidArg() {
Substitute fun = new Substitute();
assertEquals(ErrorEval.valueOf(FormulaError.VALUE.getLongCode()),
fun.evaluate(0, 1,
@@ -59,7 +59,7 @@ public class TestSubstitute {
}
@Test
-public void
svn commit: r1885281 [4/11] - in /poi/trunk/src: multimodule/poi/test9/ ooxml/testcases/org/apache/poi/xssf/streaming/ ooxml/testcases/org/apache/poi/xssf/usermodel/ testcases/org/apache/poi/ testcase
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java?rev=1885281=1885280=1885281=diff
==
---
poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
Fri Jan 8 23:50:02 2021
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test;
public final class TestColumnInfoRecordsAggregate {
@Test
-public void testGetRecordSize() {
+void testGetRecordSize() {
ColumnInfoRecordsAggregate agg = new
ColumnInfoRecordsAggregate();
agg.insertColumn(createColInfo(1, 3));
agg.insertColumn(createColInfo(4, 7));
@@ -60,7 +60,7 @@ public final class TestColumnInfoRecords
}
@Test
- public void testGroupColumns_bug45639() {
+ void testGroupColumns_bug45639() {
ColumnInfoRecordsAggregate agg = new
ColumnInfoRecordsAggregate();
agg.groupColumnRange( 7, 9, true);
agg.groupColumnRange( 4, 12, true);
@@ -83,7 +83,7 @@ public final class TestColumnInfoRecords
* Check that an inner group remains hidden
*/
@Test
- public void testHiddenAfterExpanding() {
+ void testHiddenAfterExpanding() {
ColumnInfoRecordsAggregate agg = new
ColumnInfoRecordsAggregate();
agg.groupColumnRange(1, 15, true);
agg.groupColumnRange(4, 12, true);
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java?rev=1885281=1885280=1885281=diff
==
---
poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java
Fri Jan 8 23:50:02 2021
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test;
public final class TestFormulaRecordAggregate {
@Test
- public void testBasic() {
+ void testBasic() {
FormulaRecord f = new FormulaRecord();
f.setCachedResultTypeString();
StringRecord s = new StringRecord();
@@ -56,7 +56,7 @@ public final class TestFormulaRecordAggr
* the extra record. POI should do the same.
*/
@Test
- public void testExtraStringRecord_bug46213() {
+ void testExtraStringRecord_bug46213() {
FormulaRecord fr = new FormulaRecord();
fr.setValue(2.0);
StringRecord sr = new StringRecord();
@@ -71,7 +71,7 @@ public final class TestFormulaRecordAggr
}
@Test
- public void testArrayFormulas() {
+ void testArrayFormulas() {
int rownum = 4;
int colnum = 4;
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java?rev=1885281=1885280=1885281=diff
==
---
poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java
Fri Jan 8 23:50:02 2021
@@ -62,7 +62,7 @@ import org.junit.jupiter.api.Test;
*/
public final class TestPageSettingsBlock {
@Test
- public void testPrintSetup_bug46548() {
+ void testPrintSetup_bug46548() {
// PageSettingBlock in this file contains PLS (sid=x004D) record
// followed by ContinueRecord (sid=x003C)
HSSFWorkbook wb =
HSSFTestDataSamples.openSampleWorkbook("ex46548-23133.xls");
@@ -78,7 +78,7 @@ public final class TestPageSettingsBlock
* {@link PageSettingsBlock}.
*/
@Test
- public void testHeaderFooter_bug46840() {
+ void testHeaderFooter_bug46840() {
int rowIx = 5;
int colIx = 6;
@@ -115,7 +115,7 @@ public final class TestPageSettingsBlock
* Bug 46953 occurred because POI didn't handle late PSB records
properly.
*/
@Test
- public void testLateHeaderFooter_bug46953() {
+ void testLateHeaderFooter_bug46953() {
int rowIx = 5;
int colIx = 6;
@@ -160,7 +160,7 @@ public final class TestPageSettingsBlock
*
*/
svn commit: r1885281 [1/11] - in /poi/trunk/src: multimodule/poi/test9/ ooxml/testcases/org/apache/poi/xssf/streaming/ ooxml/testcases/org/apache/poi/xssf/usermodel/ testcases/org/apache/poi/ testcase
Author: kiwiwings Date: Fri Jan 8 23:50:02 2021 New Revision: 1885281 URL: http://svn.apache.org/viewvc?rev=1885281=rev Log: Sonar fixes JUnit5 test classes and methods should have default package visibility Removed: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/AllDataFilesTester.java Modified: poi/trunk/src/multimodule/poi/test9/module-info.class poi/trunk/src/multimodule/poi/test9/module-info.java poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFRow.java poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRows.java poi/trunk/src/testcases/org/apache/poi/TestJDK12.java poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherChildAnchorRecord.java poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherClientAnchorRecord.java poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherClientDataRecord.java poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherDgRecord.java poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherDggRecord.java poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherDump.java poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherOptRecord.java poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherProperty.java poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherPropertyFactory.java poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherSpRecord.java poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherSpgrRecord.java poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java poi/trunk/src/testcases/org/apache/poi/ddf/TestUnknownEscherRecord.java poi/trunk/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestBasic.java poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestClassID.java poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java poi/trunk/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java poi/trunk/src/testcases/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestEFBiffViewer.java poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestReSave.java poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestRecordLister.java poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java poi/trunk/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java poi/trunk/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingManager2.java poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java poi/trunk/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParserIf.java poi/trunk/src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java poi/trunk/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java poi/trunk/src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java poi/trunk/src/testcases/org/apache/poi/hssf/model/TestRowBlocksReader.java poi/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java poi/trunk/src/testcases/org/apache/poi/hssf/model/TestSheetAdditional.java poi/trunk/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java poi/trunk/src/testcases/org/apache/poi/hssf/record/TestArrayRecord.java poi/trunk/src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java poi/trunk/src/testcases/org
svn commit: r1885280 [2/2] - in /poi/trunk: src/multimodule/poi/test9/ src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/ src/ooxml/testcases/org/apache/poi/xssf/streaming/ src/ooxml/testcases/org
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java?rev=1885280=1885279=1885280=diff
==
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java Fri
Jan 8 22:56:05 2021
@@ -29,6 +29,8 @@ import java.io.IOException;
import org.apache.poi.ss.ITestDataProvider;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
/**
* @author Yegor Kozlov
@@ -41,113 +43,116 @@ public abstract class BaseTestFont {
_testDataProvider = testDataProvider;
}
+@SuppressWarnings("JUnit5MalformedParameterized")
+@ParameterizedTest
+@MethodSource("defaultFont")
protected final void baseTestDefaultFont(String defaultName, short
defaultSize, short defaultColor) throws IOException {
//get default font and check against default value
-Workbook workbook = _testDataProvider.createWorkbook();
-Font fontFind=workbook.findFont(false, defaultColor, defaultSize,
defaultName, false, false, Font.SS_NONE, Font.U_NONE);
-assertNotNull(fontFind);
-
-//get default font, then change 2 values and check against different
values (height changes)
-Font font=workbook.createFont();
-font.setBold(true);
-assertTrue(font.getBold());
-font.setUnderline(Font.U_DOUBLE);
-assertEquals(Font.U_DOUBLE, font.getUnderline());
-font.setFontHeightInPoints((short)15);
-assertEquals(15*20, font.getFontHeight());
-assertEquals(15, font.getFontHeightInPoints());
-fontFind=workbook.findFont(true, defaultColor, (short)(15*20),
defaultName, false, false, Font.SS_NONE, Font.U_DOUBLE);
-assertNotNull(fontFind);
-workbook.close();
+try (Workbook workbook = _testDataProvider.createWorkbook()) {
+Font fontFind = workbook.findFont(false, defaultColor,
defaultSize, defaultName, false, false, Font.SS_NONE, Font.U_NONE);
+assertNotNull(fontFind);
+
+//get default font, then change 2 values and check against
different values (height changes)
+Font font = workbook.createFont();
+font.setBold(true);
+assertTrue(font.getBold());
+font.setUnderline(Font.U_DOUBLE);
+assertEquals(Font.U_DOUBLE, font.getUnderline());
+font.setFontHeightInPoints((short) 15);
+assertEquals(15 * 20, font.getFontHeight());
+assertEquals(15, font.getFontHeightInPoints());
+fontFind = workbook.findFont(true, defaultColor, (short) (15 *
20), defaultName, false, false, Font.SS_NONE, Font.U_DOUBLE);
+assertNotNull(fontFind);
+}
}
@Test
public final void testGetNumberOfFonts() throws IOException {
-Workbook wb = _testDataProvider.createWorkbook();
-int num0 = wb.getNumberOfFonts();
+try (Workbook wb = _testDataProvider.createWorkbook()) {
+int num0 = wb.getNumberOfFonts();
-Font f1=wb.createFont();
-f1.setBold(true);
-int idx1 = f1.getIndex();
-wb.createCellStyle().setFont(f1);
-
-Font f2=wb.createFont();
-f2.setUnderline(Font.U_DOUBLE);
-int idx2 = f2.getIndex();
-wb.createCellStyle().setFont(f2);
-
-Font f3=wb.createFont();
-f3.setFontHeightInPoints((short)23);
-int idx3 = f3.getIndex();
-wb.createCellStyle().setFont(f3);
-
-assertEquals(num0 + 3,wb.getNumberOfFonts());
-assertTrue(wb.getFontAt(idx1).getBold());
-assertEquals(Font.U_DOUBLE,wb.getFontAt(idx2).getUnderline());
-assertEquals(23,wb.getFontAt(idx3).getFontHeightInPoints());
-wb.close();
- }
+Font f1 = wb.createFont();
+f1.setBold(true);
+int idx1 = f1.getIndex();
+wb.createCellStyle().setFont(f1);
+
+Font f2 = wb.createFont();
+f2.setUnderline(Font.U_DOUBLE);
+int idx2 = f2.getIndex();
+wb.createCellStyle().setFont(f2);
+
+Font f3 = wb.createFont();
+f3.setFontHeightInPoints((short) 23);
+int idx3 = f3.getIndex();
+wb.createCellStyle().setFont(f3);
+
+assertEquals(num0 + 3, wb.getNumberOfFonts());
+assertTrue(wb.getFontAt(idx1).getBold());
+assertEquals(Font.U_DOUBLE, wb.getFontAt(idx2).getUnderline());
+assertEquals(23, wb.getFontAt(idx3).getFontHeightInPoints());
+}
+}
/**
* Tests that we can define fonts to a new
- * file, save, load, and still see them
+ * file, save, load, and still see them
svn commit: r1885280 [1/2] - in /poi/trunk: src/multimodule/poi/test9/ src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/ src/ooxml/testcases/org/apache/poi/xssf/streaming/ src/ooxml/testcases/org
Author: kiwiwings
Date: Fri Jan 8 22:56:05 2021
New Revision: 1885280
URL: http://svn.apache.org/viewvc?rev=1885280=rev
Log:
Sonar fixes
Fixed offset of compare picture in resize_compare.xlsx
Modified:
poi/trunk/src/multimodule/poi/test9/module-info.class
poi/trunk/src/multimodule/poi/test9/module-info.java
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestDeferredSXSSFWorkbook.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFFormulaEvaluation.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPicture.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFEvaluationSheet.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFont.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestRow.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
poi/trunk/test-data/spreadsheet/resize_compare.xlsx
Modified: poi/trunk/src/multimodule/poi/test9/module-info.class
URL:
http://svn.apache.org/viewvc/poi/trunk/src/multimodule/poi/test9/module-info.class?rev=1885280=1885279=1885280=diff
==
Binary files - no diff available.
Modified: poi/trunk/src/multimodule/poi/test9/module-info.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/multimodule/poi/test9/module-info.java?rev=1885280=1885279=1885280=diff
==
--- poi/trunk/src/multimodule/poi/test9/module-info.java (original)
+++ poi/trunk/src/multimodule/poi/test9/module-info.java Fri Jan 8 22:56:05
2021
@@ -110,4 +110,5 @@ module org.apache.poi.poi {
opens org.apache.poi.hpsf.basic to org.junit.platform.commons;
opens org.apache.poi.hssf.record.pivot to org.junit.platform.commons;
opens org.apache.poi.hssf.dev to org.junit.platform.commons;
+opens org.apache.poi.ss.usermodel to org.junit.platform.commons;
}
\ No newline at end of file
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java?rev=1885280=1885279=1885280=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java
Fri Jan 8 22:56:05 2021
@@ -17,13 +17,10 @@
package org.apache.poi.ss.tests.usermodel;
-import java.io.IOException;
-
import org.apache.poi.ss.ITestDataProvider;
import org.apache.poi.ss.usermodel.BaseTestRow;
import org.apache.poi.xssf.streaming.SXSSFRow;
import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.junit.jupiter.api.Test;
/**
* Class for combined testing of XML-specific functionality of
@@ -36,14 +33,4 @@ public abstract class BaseTestXRow exten
protected BaseTestXRow(ITestDataProvider testDataProvider) {
super(testDataProvider);
}
-
-@Test
-public void testRowBounds() throws IOException {
-
baseTestRowBounds(_testDataProvider.getSpreadsheetVersion().getLastRowIndex());
-}
-
-@Test
-public void testCellBounds() throws IOException {
-
baseTestCellBounds
svn commit: r1885253 - in /poi/trunk/src/testcases/org/apache/poi/hssf/usermodel: TestCellStyle.java TestFormulaEvaluatorBugs.java TestFormulas.java TestHSSFChart.java
Author: kiwiwings
Date: Fri Jan 8 00:26:16 2021
New Revision: 1885253
URL: http://svn.apache.org/viewvc?rev=1885253=rev
Log:
Sonar fixes
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFChart.java
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java?rev=1885253=1885252=1885253=diff
==
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java
Fri Jan 8 00:26:16 2021
@@ -17,6 +17,8 @@
package org.apache.poi.hssf.usermodel;
+import static org.apache.poi.ss.usermodel.BorderStyle.*;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -30,6 +32,8 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Calendar;
import java.util.Date;
+import java.util.Random;
+import java.util.stream.Stream;
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.ss.usermodel.BorderStyle;
@@ -189,10 +193,10 @@ public final class TestCellStyle {
HSSFCellStyle cs = wb.createCellStyle();
HSSFCellStyle cs2 = wb.createCellStyle();
-cs.setBorderBottom(BorderStyle.THIN);
-cs.setBorderLeft(BorderStyle.THIN);
-cs.setBorderRight(BorderStyle.THIN);
-cs.setBorderTop(BorderStyle.THIN);
+cs.setBorderBottom(THIN);
+cs.setBorderLeft(THIN);
+cs.setBorderRight(THIN);
+cs.setBorderTop(THIN);
cs.setFillForegroundColor((short) 0xA);
cs.setFillPattern(FillPatternType.DIAMONDS);
fnt.setColor((short) 0xf);
@@ -359,45 +363,17 @@ public final class TestCellStyle {
@Test
public void testGetSetBorderHair() throws IOException {
- try (HSSFWorkbook wb = openSample("55341_CellStyleBorder.xls")) {
-HSSFSheet s = wb.getSheetAt(0);
-HSSFCellStyle cs;
-
-cs = s.getRow(0).getCell(0).getCellStyle();
-assertEquals(BorderStyle.HAIR, cs.getBorderRight());
-
-cs = s.getRow(1).getCell(1).getCellStyle();
-assertEquals(BorderStyle.DOTTED, cs.getBorderRight());
-
-cs = s.getRow(2).getCell(2).getCellStyle();
-assertEquals(BorderStyle.DASH_DOT_DOT, cs.getBorderRight());
-
-cs = s.getRow(3).getCell(3).getCellStyle();
-assertEquals(BorderStyle.DASHED, cs.getBorderRight());
-
-cs = s.getRow(4).getCell(4).getCellStyle();
-assertEquals(BorderStyle.THIN, cs.getBorderRight());
-
-cs = s.getRow(5).getCell(5).getCellStyle();
-assertEquals(BorderStyle.MEDIUM_DASH_DOT_DOT, cs.getBorderRight());
+BorderStyle[] bs = {
+HAIR, DOTTED, DASH_DOT_DOT, DASHED, THIN, MEDIUM_DASH_DOT_DOT,
SLANTED_DASH_DOT,
+MEDIUM_DASH_DOT, MEDIUM_DASHED, MEDIUM, THICK, DOUBLE
+};
-cs = s.getRow(6).getCell(6).getCellStyle();
-assertEquals(BorderStyle.SLANTED_DASH_DOT, cs.getBorderRight());
-
-cs = s.getRow(7).getCell(7).getCellStyle();
-assertEquals(BorderStyle.MEDIUM_DASH_DOT, cs.getBorderRight());
-
-cs = s.getRow(8).getCell(8).getCellStyle();
-assertEquals(BorderStyle.MEDIUM_DASHED, cs.getBorderRight());
-
-cs = s.getRow(9).getCell(9).getCellStyle();
-assertEquals(BorderStyle.MEDIUM, cs.getBorderRight());
-
-cs = s.getRow(10).getCell(10).getCellStyle();
-assertEquals(BorderStyle.THICK, cs.getBorderRight());
-
-cs = s.getRow(11).getCell(11).getCellStyle();
-assertEquals(BorderStyle.DOUBLE, cs.getBorderRight());
+try (HSSFWorkbook wb = openSample("55341_CellStyleBorder.xls")) {
+HSSFSheet s = wb.getSheetAt(0);
+for (int i = 0; i 0 && isDate, "cell "
+ idxCell + " is not a date.");
-}
+@Test
+public void test56563() {
+Stream.of("56563a.xls", "56563b.xls").parallel().forEach(fileName ->
assertDoesNotThrow(() -> {
+Random rand = new Random();
+for(int i=0; i<10; i++) {
+Thread.sleep(rand.nextInt(300));
+try (Workbook wb
svn commit: r1885215 - in /poi: site/src/documentation/content/xdocs/ trunk/src/scratchpad/src/org/apache/poi/hwmf/record/ trunk/src/scratchpad/testcases/org/apache/poi/hwmf/ trunk/test-data/slideshow
Author: kiwiwings
Date: Wed Jan 6 23:14:45 2021
New Revision: 1885215
URL: http://svn.apache.org/viewvc?rev=1885215=rev
Log:
#65063 - WMF parsing failed on closed empty polygon
Added:
poi/trunk/test-data/slideshow/empty-polygon-close.wmf (with props)
Modified:
poi/site/src/documentation/content/xdocs/changes.xml
poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfDraw.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwmf/TestHwmfParsing.java
Modified: poi/site/src/documentation/content/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/changes.xml?rev=1885215=1885214=1885215=diff
==
--- poi/site/src/documentation/content/xdocs/changes.xml (original)
+++ poi/site/src/documentation/content/xdocs/changes.xml Wed Jan 6 23:14:45
2021
@@ -128,6 +128,7 @@
Migrate
tests to Junit 5
Use SLF4J instead of commons-logging - use
jcl-over-slf4j
Handle
VmlDrawings containing spreadsheet-ml default namespace
+WMF parsing
failed on closed empty polygon
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfDraw.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfDraw.java?rev=1885215=1885214=1885215=diff
==
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfDraw.java
(original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfDraw.java Wed
Jan 6 23:14:45 2021
@@ -143,10 +143,10 @@ public final class HwmfDraw {
@Override
public int init(LittleEndianInputStream leis, long recordSize, int
recordFunction) throws IOException {
//A 16-bit signed integer that defines the number of points in the
array.
-int numberofPoints = leis.readShort();
+int numberOfPoints = leis.readShort();
-poly = new Path2D.Double(Path2D.WIND_EVEN_ODD, numberofPoints);
-for (int i=0; i 0 && addClose()) {
// polygons are closed / polylines not
poly.closePath();
}
-return
LittleEndianConsts.SHORT_SIZE+numberofPoints*LittleEndianConsts.INT_SIZE;
+return
LittleEndianConsts.SHORT_SIZE+numberOfPoints*LittleEndianConsts.INT_SIZE;
}
@Override
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwmf/TestHwmfParsing.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwmf/TestHwmfParsing.java?rev=1885215=1885214=1885215=diff
==
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwmf/TestHwmfParsing.java
(original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwmf/TestHwmfParsing.java
Wed Jan 6 23:14:45 2021
@@ -39,6 +39,8 @@ import org.apache.poi.util.LocaleUtil;
import org.apache.poi.util.RecordFormatException;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
public class TestHwmfParsing {
@@ -48,12 +50,17 @@ public class TestHwmfParsing {
// for manual mass parsing and rendering tests of .wmfs use
HemfPictureTest.paint() !
//
**
-@Test
-public void parse() throws IOException {
-try (InputStream fis = samples.openResourceAsStream("santa.wmf")) {
+@ParameterizedTest
+@CsvSource({
+"santa.wmf, 581",
+/* Bug 65063 */
+"empty-polygon-close.wmf, 272"
+})
+public void parse(String file, int recordCnt) throws IOException {
+try (InputStream fis = samples.openResourceAsStream(file)) {
HwmfPicture wmf = new HwmfPicture(fis);
List records = wmf.getRecords();
-assertEquals(581, records.size());
+assertEquals(recordCnt, records.size());
}
}
Added: poi/trunk/test-data/slideshow/empty-polygon-close.wmf
URL:
http://svn.apache.org/viewvc/poi/trunk/test-data/slideshow/empty-polygon-close.wmf?rev=1885215=auto
==
Binary file - no diff available.
Propchange: poi/trunk/test-data/slideshow/empty-polygon-close.wmf
--
svn:mime-type = application/octet-stream
-
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
svn commit: r1885197 - in /poi: site/src/documentation/content/xdocs/changes.xml trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java trunk/src/ooxml/testcases/org/apache/poi/xssf/us
Author: kiwiwings
Date: Wed Jan 6 12:39:02 2021
New Revision: 1885197
URL: http://svn.apache.org/viewvc?rev=1885197=rev
Log:
#65061 - Handle VmlDrawings containing spreadsheet-ml default namespace
Modified:
poi/site/src/documentation/content/xdocs/changes.xml
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java
Modified: poi/site/src/documentation/content/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/changes.xml?rev=1885197=1885196=1885197=diff
==
--- poi/site/src/documentation/content/xdocs/changes.xml (original)
+++ poi/site/src/documentation/content/xdocs/changes.xml Wed Jan 6 12:39:02
2021
@@ -127,6 +127,7 @@
Unable to
convert pptx to pdf
Migrate
tests to Junit 5
Use SLF4J instead of commons-logging - use
jcl-over-slf4j
+Handle
VmlDrawings containing spreadsheet-ml default namespace
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java?rev=1885197=1885196=1885197=diff
==
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java
Wed Jan 6 12:39:02 2021
@@ -18,6 +18,7 @@
package org.apache.poi.xssf.usermodel;
import static org.apache.poi.ooxml.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
+import static org.apache.poi.xssf.usermodel.XSSFRelation.NS_SPREADSHEETML;
import java.io.IOException;
import java.io.InputStream;
@@ -46,7 +47,6 @@ import com.microsoft.schemas.vml.CTShape
import com.microsoft.schemas.vml.STExt;
import com.microsoft.schemas.vml.STStrokeJoinStyle;
import org.apache.poi.ooxml.POIXMLDocumentPart;
-import org.apache.poi.ooxml.util.DocumentHelper;
import org.apache.poi.openxml4j.opc.PackagePart;
import org.apache.poi.schemas.vmldrawing.XmlDocument;
import org.apache.poi.util.ReplacingInputStream;
@@ -55,8 +55,6 @@ import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlOptions;
import org.openxmlformats.schemas.officeDocument.x2006.sharedTypes.STTrueFalse;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
/**
* Represents a SpreadsheetML VML drawing.
@@ -129,23 +127,26 @@ public final class XSSFVMLDrawing extend
protected void read(InputStream is) throws IOException, XmlException {
-Document doc;
-try {
-/*
- * This is a seriously sick fix for the fact that some .xlsx files
contain raw bits
- * of HTML, without being escaped or properly turned into XML.
- * The result is that they contain things like br, which
breaks the XML parsing.
- * This very sick InputStream wrapper attempts to spot these go
past, and fix them.
- */
-doc = DocumentHelper.readDocument(new ReplacingInputStream(is,
"", ""));
-} catch (SAXException e) {
-throw new XmlException(e.getMessage(), e);
-}
-
XmlOptions xopt = new XmlOptions(DEFAULT_XML_OPTIONS);
xopt.setLoadSubstituteNamespaces(Collections.singletonMap("",
QNAME_VMLDRAWING.getNamespaceURI()));
+xopt.setDocumentType(XmlDocument.type);
+
+/*
+ * This is a seriously sick fix for the fact that some .xlsx files
contain raw bits
+ * of HTML, without being escaped or properly turned into XML.
+ * The result is that they contain things like br, which
breaks the XML parsing.
+ * This very sick InputStream wrapper attempts to spot these go past,
and fix them.
+ *
+ * Furthermore some documents contain a default namespace of
+ * http://schemas.openxmlformats.org/spreadsheetml/2006/main for the
namespace-less "xml" document type.
+ * this definition is wrong and removed.
+ */
+root = XmlDocument.Factory.parse(
+new ReplacingInputStream(
+new ReplacingInputStream(is, "", ""),
+" xmlns=\""+NS_SPREADSHEETML+"\"", "")
+, xopt);
-root = XmlDocument.Factory.parse(doc, xopt);
XmlCursor cur = root.getXml().newCursor();
try {
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java?rev=1885197=1885196=1885197=diff
===
svn commit: r1885179 - in /poi/trunk/src/testcases/org/apache/poi/hssf: record/common/TestUnicodeString.java usermodel/TestBugs.java
Author: kiwiwings
Date: Tue Jan 5 23:40:36 2021
New Revision: 1885179
URL: http://svn.apache.org/viewvc?rev=1885179=rev
Log:
Sonar fixes
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java?rev=1885179=1885178=1885179=diff
==
---
poi/trunk/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java
Tue Jan 5 23:40:36 2021
@@ -17,6 +17,7 @@
package org.apache.poi.hssf.record.common;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayInputStream;
@@ -350,21 +351,20 @@ public final class TestUnicodeString {
@Test
public void unicodeStringsNullPointer() throws IOException {
-HSSFWorkbook wb = new HSSFWorkbook();
+try (HSSFWorkbook wb = new HSSFWorkbook()) {
-Sheet sheet = wb.createSheet("styles");
-Row row = sheet.createRow(0);
-Cell cell = row.createCell(0);
+Sheet sheet = wb.createSheet("styles");
+Row row = sheet.createRow(0);
+Cell cell = row.createCell(0);
-CellStyle style = wb.createCellStyle();
-style.setFont(wb.createFont());
-cell.setCellStyle(style);
+CellStyle style = wb.createCellStyle();
+style.setFont(wb.createFont());
+cell.setCellStyle(style);
-cell.setCellValue("test");
+cell.setCellValue("test");
-HSSFOptimiser.optimiseFonts(wb);
-
-wb.close();
+assertDoesNotThrow(() -> HSSFOptimiser.optimiseFonts(wb));
+}
}
@Test
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java?rev=1885179=1885178=1885179=diff
==
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java Tue Jan
5 23:40:36 2021
@@ -283,14 +283,11 @@ public final class TestBugs extends Base
@Test
public void bug27852() throws Exception {
try (HSSFWorkbook wb = openSampleWorkbook("27852.xls")) {
-
-for (int i = 0; i < wb.getNumberOfNames(); i++) {
-HSSFName name = wb.getNameAt(i);
-name.getNameName();
-if (name.isFunctionName()) {
-continue;
+for (HSSFName name : wb.getAllNames()) {
+assertNotNull(name.getNameName());
+if (!name.isFunctionName()) {
+assertNotNull(name.getRefersToFormula());
}
-name.getRefersToFormula();
}
}
}
@@ -305,9 +302,7 @@ public final class TestBugs extends Base
HSSFSheet sheet = wb.createSheet();
for (int i = 1; i < 400; i++) {
HSSFRow row = sheet.getRow(i);
-if (row != null) {
-row.getCell(0);
-}
+assertNull(row);
}
}
}
@@ -1970,6 +1965,7 @@ public final class TestBugs extends Base
try (HSSFWorkbook wb = openSampleWorkbook("46250.xls")) {
Sheet sh = wb.getSheet("Template");
Sheet cSh = wb.cloneSheet(wb.getSheetIndex(sh));
+int sIdx = wb.getSheetIndex(cSh);
HSSFPatriarch patriarch = (HSSFPatriarch)
cSh.createDrawingPatriarch();
HSSFTextbox tb = (HSSFTextbox) patriarch.getChildren().get(2);
@@ -1977,7 +1973,11 @@ public final class TestBugs extends Base
tb.setString(new HSSFRichTextString("POI test"));
tb.setAnchor(new HSSFClientAnchor(0, 0, 0, 0, (short) 0, 0,
(short) 10, 10));
-writeOutAndReadBack(wb).close();
+try (HSSFWorkbook wb2 = writeOutAndReadBack(wb)) {
+HSSFSheet sh2 = wb2.getSheetAt(sIdx);
+assertNotNull(sh2);
+assertNotNull(sh2.getDrawingPatriarch());
+}
}
}
@@ -1999,7 +1999,12 @@ public final class TestBugs extends Base
row.createCell(6).setCellValue("added cells.");
}
-writeOutAndReadBack(wb).close();
+try (HSSFWorkbook wb2 = writeOutAndReadBack(wb)) {
+
svn commit: r1885035 - in /poi/trunk/src: ooxml/testcases/org/apache/poi/xssf/usermodel/ testcases/org/apache/poi/hssf/eventmodel/ testcases/org/apache/poi/hssf/usermodel/ testcases/org/apache/poi/ss/
Author: kiwiwings
Date: Sat Jan 2 21:00:18 2021
New Revision: 1885035
URL: http://svn.apache.org/viewvc?rev=1885035=rev
Log:
Sonar fixes
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java?rev=1885035=1885034=1885035=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
Sat Jan 2 21:00:18 2021
@@ -139,15 +139,6 @@ public final class TestXSSFBugs extends
}
/**
- * test writing a file with large number of unique strings,
- * open resulting file in Excel to check results!
- */
-@Test
-public void bug15375_2() throws IOException {
-bug15375(1000);
-}
-
-/**
* Named ranges had the right reference, but
* the wrong sheet name
*/
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java?rev=1885035=1885034=1885035=diff
==
---
poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
Sat Jan 2 21:00:18 2021
@@ -114,16 +114,16 @@ public final class TestEventRecordFactor
assertArrayEquals(rec1, rec2);
}
-/**
+/*
* tests that the create record function returns a properly
* constructed record in the case of a continued record.
* TODO - need a real world example to put in a unit test
*/
-@NotImplemented
-@Test
-@Disabled
-public void testCreateContinuedRecord() {
-}
+// @NotImplemented
+// @Test
+// @Disabled
+// public void testCreateContinuedRecord() {
+// }
/**
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java?rev=1885035=1885034=1885035=diff
==
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java Sat Jan
2 21:00:18 2021
@@ -46,12 +46,10 @@ import java.util.stream.IntStream;
import javax.imageio.ImageIO;
-import org.apache.poi.EncryptedDocumentException;
import org.apache.poi.hpsf.PropertySet;
import org.apache.poi.hpsf.SummaryInformation;
import org.apache.poi.hssf.HSSFITestDataProvider;
import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.OldExcelFormatException;
import org.apache.poi.hssf.extractor.ExcelExtractor;
import org.apache.poi.hssf.model.InternalSheet;
import org.apache.poi.hssf.model.InternalWorkbook;
@@ -93,6 +91,8 @@ import org.junit.jupiter.api.Assumptions
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
/**
* Testcases for bugs entered in bugzilla
@@ -144,34 +144,6 @@ public final class TestBugs extends Base
}
-/**
- * Test reading AND writing a complicated workbook
- * Test opening resulting sheet in excel
- */
-@Test
-public void bug15228() throws Exception {
-simpleTest("15228.xls");
-}
-
-@Test
-public void bug13796() throws Exception {
-simpleTest("13796.xls");
-}
-
-/**
- * test reading of a formula with a name and a cell ref in one
- **/
-@Test
-public void bug14460() throws Exception {
-simpleTest("14460.xls");
-}
-
-@Test
-public void bug14330() throws Exception {
-simpleTest("14330-1.xls");
-simpleTest("14330-2.xls");
-}
-
private static void setCellText(HSSFCell cell, String text) {
cell.setCellValue(new HSSFRichTextString(text));
}
@@ -182,8 +154,8 @@ public final class TestBugs extends Base
*/
@Test
public void bug15375() throws Exception {
-try (HSSFWorkbook wb = openSampleWorkbook("15375.xls")) {
-HSSFSheet sheet = wb.getSheetAt(0)
svn commit: r1885022 - /poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDateValue.java
Author: kiwiwings
Date: Fri Jan 1 23:26:25 2021
New Revision: 1885022
URL: http://svn.apache.org/viewvc?rev=1885022=rev
Log:
forbidden-apis-fix
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDateValue.java
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDateValue.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDateValue.java?rev=1885022=1885021=1885022=diff
==
---
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDateValue.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDateValue.java
Fri Jan 1 23:26:25 2021
@@ -58,7 +58,7 @@ public final class TestDateValue {
try {
int days1900 = (int)ChronoUnit.DAYS.between(
LocalDate.of(1899, Month.DECEMBER, 31),
-LocalDate.of(Year.now().getValue(), Month.FEBRUARY, 1)
+
LocalDate.of(Year.now(LocaleUtil.getUserTimeZone().toZoneId()).getValue(),
Month.FEBRUARY, 1)
)+1;
confirmDateValue(new StringEval("2020-02-01"), 43862);
confirmDateValue(new StringEval("01-02-2020"), 43862);
-
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
svn commit: r1885021 - /poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDateValue.java
Author: kiwiwings
Date: Fri Jan 1 23:20:02 2021
New Revision: 1885021
URL: http://svn.apache.org/viewvc?rev=1885021=rev
Log:
fix year agnostic date/test values
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDateValue.java
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDateValue.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDateValue.java?rev=1885021=1885020=1885021=diff
==
---
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDateValue.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDateValue.java
Fri Jan 1 23:20:02 2021
@@ -19,6 +19,10 @@ package org.apache.poi.ss.formula.functi
import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.time.LocalDate;
+import java.time.Month;
+import java.time.Year;
+import java.time.temporal.ChronoUnit;
import java.util.Locale;
import org.apache.poi.ss.formula.eval.BlankEval;
@@ -52,14 +56,18 @@ public final class TestDateValue {
public void testDateValue() {
LocaleUtil.setUserLocale(Locale.ENGLISH);
try {
+int days1900 = (int)ChronoUnit.DAYS.between(
+LocalDate.of(1899, Month.DECEMBER, 31),
+LocalDate.of(Year.now().getValue(), Month.FEBRUARY, 1)
+)+1;
confirmDateValue(new StringEval("2020-02-01"), 43862);
confirmDateValue(new StringEval("01-02-2020"), 43862);
confirmDateValue(new StringEval("2020-FEB-01"), 43862);
confirmDateValue(new StringEval("2020-Feb-01"), 43862);
confirmDateValue(new StringEval("2020-FEBRUARY-01"), 43862);
-confirmDateValue(new StringEval("FEB-01"), 43862);
+confirmDateValue(new StringEval("FEB-01"), days1900);
confirmDateValue(new StringEval("2/1/2020"), 43862);
-confirmDateValue(new StringEval("2/1"), 43862);
+confirmDateValue(new StringEval("2/1"), days1900);
confirmDateValue(new StringEval("2020/2/1"), 43862);
confirmDateValue(new StringEval("2020/FEB/1"), 43862);
confirmDateValue(new StringEval("FEB/1/2020"), 43862);
-
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
svn commit: r1884974 - in /poi/trunk: src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java test-data/integration/stress022.pptx
Author: kiwiwings
Date: Wed Dec 30 23:33:05 2020
New Revision: 1884974
URL: http://svn.apache.org/viewvc?rev=1884974=rev
Log:
workaround NullPointerException when font family (of bullets) can't be
determined
Added:
poi/trunk/test-data/integration/stress022.pptx (with props)
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java?rev=1884974=1884973=1884974=diff
==
---
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
Wed Dec 30 23:33:05 2020
@@ -858,7 +858,8 @@ public class XSLFTextParagraph implement
@Override
public String getDefaultFontFamily() {
-return (_runs.isEmpty() ? "Arial" : _runs.get(0).getFontFamily());
+String family = (_runs.isEmpty() ? null :
_runs.get(0).getFontFamily());
+return (family == null) ? "Arial" : family;
}
@Override
Added: poi/trunk/test-data/integration/stress022.pptx
URL:
http://svn.apache.org/viewvc/poi/trunk/test-data/integration/stress022.pptx?rev=1884974=auto
==
Binary file - no diff available.
Propchange: poi/trunk/test-data/integration/stress022.pptx
--
--- svn:mime-type (added)
+++ svn:mime-type Wed Dec 30 23:33:05 2020
@@ -0,0 +1 @@
+application/vnd.openxmlformats-officedocument.presentationml.presentation
-
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
svn commit: r1884966 - in /poi/trunk: src/java/org/apache/poi/sl/draw/DrawTexturePaint.java test-data/integration/stress021.pptx
Author: kiwiwings
Date: Wed Dec 30 23:13:23 2020
New Revision: 1884966
URL: http://svn.apache.org/viewvc?rev=1884966=rev
Log:
workaround "Width (0) and height (0) cannot be <= 0" error while rendering text
with textures
Added:
poi/trunk/test-data/integration/stress021.pptx (with props)
Modified:
poi/trunk/src/java/org/apache/poi/sl/draw/DrawTexturePaint.java
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/DrawTexturePaint.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/DrawTexturePaint.java?rev=1884966=1884965=1884966=diff
==
--- poi/trunk/src/java/org/apache/poi/sl/draw/DrawTexturePaint.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/DrawTexturePaint.java Wed Dec 30
23:13:23 2020
@@ -102,7 +102,7 @@ import org.apache.poi.util.Dimension2DDo
final Insets2D insets = fill.getInsets();
final Insets2D stretch = fill.getStretch();
-if ((insets == null || INSETS_EMPTY.equals(insets)) && (stretch ==
null)) {
+if ((insets == null || INSETS_EMPTY.equals(insets)) && (stretch ==
null) || userBounds == null || userBounds.isEmpty()) {
return bi;
}
Added: poi/trunk/test-data/integration/stress021.pptx
URL:
http://svn.apache.org/viewvc/poi/trunk/test-data/integration/stress021.pptx?rev=1884966=auto
==
Binary file - no diff available.
Propchange: poi/trunk/test-data/integration/stress021.pptx
--
--- svn:mime-type (added)
+++ svn:mime-type Wed Dec 30 23:13:23 2020
@@ -0,0 +1 @@
+application/vnd.openxmlformats-officedocument.presentationml.presentation
-
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
svn commit: r1884962 - in /poi/trunk: ./ src/examples/src/org/apache/poi/examples/ss/ src/multimodule/ooxml-full/java9/ src/multimodule/ooxml-lite/java9/ src/ooxml/testcases/org/apache/poi/extractor/o
Author: kiwiwings
Date: Wed Dec 30 22:56:36 2020
New Revision: 1884962
URL: http://svn.apache.org/viewvc?rev=1884962=rev
Log:
add failing regression test files
fix ooxml-lite packaging
fix PP97 dual storage file handling in extractor
Added:
poi/trunk/test-data/integration/
poi/trunk/test-data/integration/stress001.docx (with props)
poi/trunk/test-data/integration/stress002.xlsx (with props)
poi/trunk/test-data/integration/stress003.docx (with props)
poi/trunk/test-data/integration/stress004.docx (with props)
poi/trunk/test-data/integration/stress005.docx (with props)
poi/trunk/test-data/integration/stress006.docx (with props)
poi/trunk/test-data/integration/stress007.docx (with props)
poi/trunk/test-data/integration/stress008.docx (with props)
poi/trunk/test-data/integration/stress009.docx (with props)
poi/trunk/test-data/integration/stress010.docx (with props)
poi/trunk/test-data/integration/stress011.docx (with props)
poi/trunk/test-data/integration/stress012.docx (with props)
poi/trunk/test-data/integration/stress013.pptx (with props)
poi/trunk/test-data/integration/stress014.docx (with props)
poi/trunk/test-data/integration/stress015.docx (with props)
poi/trunk/test-data/integration/stress016.docx (with props)
poi/trunk/test-data/integration/stress017.docx (with props)
poi/trunk/test-data/integration/stress018.docx (with props)
poi/trunk/test-data/integration/stress019.docx (with props)
poi/trunk/test-data/integration/stress020.xlsx (with props)
Modified:
poi/trunk/build.xml
poi/trunk/src/examples/src/org/apache/poi/examples/ss/ExcelComparator.java
poi/trunk/src/multimodule/ooxml-full/java9/module-info.java
poi/trunk/src/multimodule/ooxml-lite/java9/module-info.class
poi/trunk/src/multimodule/ooxml-lite/java9/module-info.java
poi/trunk/src/ooxml/testcases/org/apache/poi/extractor/ooxml/TestExtractorFactory.java
poi/trunk/src/scratchpad/src/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1884962=1884961=1884962=diff
==
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Wed Dec 30 22:56:36 2020
@@ -1753,16 +1753,23 @@ under the License.
+
+
+
+
+
+
+
-
-
-
+
+
+
@@ -1770,15 +1777,17 @@ under the License.
-
+
-
+
+
+
+
+
-
-
Modified:
poi/trunk/src/examples/src/org/apache/poi/examples/ss/ExcelComparator.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/examples/ss/ExcelComparator.java?rev=1884962=1884961=1884962=diff
==
--- poi/trunk/src/examples/src/org/apache/poi/examples/ss/ExcelComparator.java
(original)
+++ poi/trunk/src/examples/src/org/apache/poi/examples/ss/ExcelComparator.java
Wed Dec 30 22:56:36 2020
@@ -24,6 +24,7 @@ import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
+import java.util.Objects;
import org.apache.poi.ss.usermodel.BorderStyle;
import org.apache.poi.ss.usermodel.Cell;
@@ -477,7 +478,7 @@ public class ExcelComparator {
String col1 = getCellFillBackground(loc1);
String col2 = getCellFillBackground(loc2);
-if (!col1.equals(col2)) {
+if (!Objects.equals(col1, col2)) {
addMessage(loc1, loc2, "Cell Fill Color does not Match ::", col1,
col2);
}
}
Modified: poi/trunk/src/multimodule/ooxml-full/java9/module-info.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/multimodule/ooxml-full/java9/module-info.java?rev=1884962=1884961=1884962=diff
==
--- poi/trunk/src/multimodule/ooxml-full/java9/module-info.java (original)
+++ poi/trunk/src/multimodule/ooxml-full/java9/module-info.java Wed Dec 30
22:56:36 2020
@@ -21,6 +21,9 @@ open module org.apache.poi.ooxml.schemas
// see https://bugs.openjdk.java.net/browse/JDK-8240847
requires transitive org.apache.xmlbeans;
svn commit: r1884878 - /poi/trunk/build.xml
Author: kiwiwings Date: Mon Dec 28 14:49:29 2020 New Revision: 1884878 URL: http://svn.apache.org/viewvc?rev=1884878=rev Log: bump versions Modified: poi/trunk/build.xml Modified: poi/trunk/build.xml URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1884878=1884877=1884878=diff == --- poi/trunk/build.xml (original) +++ poi/trunk/build.xml Mon Dec 28 14:49:29 2020 @@ -281,13 +281,13 @@ under the License. - - + + - - - - + + + + @@ -295,11 +295,11 @@ under the License. - - - + + + - + @@ -316,7 +316,7 @@ under the License. - + @@ -329,8 +329,6 @@ under the License. - - @@ -644,6 +642,7 @@ under the License. + @@ -909,7 +908,7 @@ under the License. - + @@ -2452,9 +2451,9 @@ under the License. - - - + + + @@ -2468,11 +2467,11 @@ under the License. - - - - - + + + + + - To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org For additional commands, e-mail: commits-h...@poi.apache.org
svn commit: r1884874 - in /poi/trunk/src: integrationtest/org/apache/poi/stress/ ooxml/testcases/org/apache/poi/extractor/ooxml/ ooxml/testcases/org/apache/poi/xslf/ ooxml/testcases/org/apache/poi/xsl
Author: kiwiwings
Date: Mon Dec 28 14:06:24 2020
New Revision: 1884874
URL: http://svn.apache.org/viewvc?rev=1884874=rev
Log:
sonar fixes
Modified:
poi/trunk/src/integrationtest/org/apache/poi/stress/HPSFFileHandler.java
poi/trunk/src/integrationtest/org/apache/poi/stress/HWPFFileHandler.java
poi/trunk/src/integrationtest/org/apache/poi/stress/POIFileScanner.java
poi/trunk/src/ooxml/testcases/org/apache/poi/extractor/ooxml/TestExtractorFactory.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFExamples.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java
poi/trunk/src/testcases/org/apache/poi/TestJDK12.java
poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestClassID.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordInputStream.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java
Modified:
poi/trunk/src/integrationtest/org/apache/poi/stress/HPSFFileHandler.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/integrationtest/org/apache/poi/stress/HPSFFileHandler.java?rev=1884874=1884873=1884874=diff
==
--- poi/trunk/src/integrationtest/org/apache/poi/stress/HPSFFileHandler.java
(original)
+++ poi/trunk/src/integrationtest/org/apache/poi/stress/HPSFFileHandler.java
Mon Dec 28 14:06:24 2020
@@ -16,6 +16,7 @@
*/
package org.apache.poi.stress;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assumptions.assumeFalse;
@@ -108,7 +109,7 @@ public class HPSFFileHandler extends POI
try {
System.setOut(psNew);
CopyCompare.main(new String[]{file.getAbsolutePath(),
copyOutput.getAbsolutePath()});
-assertEquals("Equal" + NL, new String(bos.toByteArray(),
StandardCharsets.UTF_8));
+assertEquals("Equal" + NL,
bos.toString(StandardCharsets.UTF_8.name()));
} finally {
System.setOut(ps);
}
@@ -128,7 +129,8 @@ public class HPSFFileHandler extends POI
// a test-case to test this locally without executing the full TestAllFiles
@Test
-public void testExtractor() throws Exception {
-handleExtracting(new File("test-data/hpsf/TestBug44375.xls"));
+public void testExtractor() {
+File file = new File("test-data/hpsf/TestBug44375.xls");
+assertDoesNotThrow(() -> handleExtracting(file));
}
}
Modified:
poi/trunk/src/integrationtest/org/apache/poi/stress/HWPFFileHandler.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/integrationtest/org/apache/poi/stress/HWPFFileHandler.java?rev=1884874=1884873=1884874=diff
==
--- poi/trunk/src/integrationtest/org/apache/poi/stress/HWPFFileHandler.java
(original)
+++ poi/trunk/src/integrationtest/org/apache/poi/stress/HWPFFileHandler.java
Mon Dec 28 14:06:24 2020
@@ -16,6 +16,7 @@
*/
package org.apache.poi.stress;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.File;
@@ -64,8 +65,8 @@ public class HWPFFileHandler extends POI
}
@Test
-public void testExtractingOld() throws Exception {
+public void testExtractingOld() {
File file = new File("test-data/document/52117.doc");
-handleExtracting(file);
+assertDoesNotThrow(() -> handleExtracting(file));
}
}
Modified:
poi/trunk/src/integrationtest/org/apache/poi/stress/POIFileScanner.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/integrationtest/org/apache/poi/stress/POIFileScanner.java?rev=1884874=1884873=1884874=diff
==
--- poi/trunk/src/integrationtest/org/apache/poi/stress/POIFileScanner.java
(original)
+++ poi/trunk/src/integrationtest/org/apache/poi/stress/POIFileScanner.java Mon
Dec 28 14:06:24 2020
@@ -19,6 +19,7 @@
package org.apache.poi.stress;
+import static org.
svn commit: r1884873 - in /poi: site/src/documentation/content/xdocs/ site/src/documentation/content/xdocs/components/ trunk/ trunk/src/multimodule/ooxml/java9/ trunk/src/multimodule/ooxml/test9/ trun
Author: kiwiwings Date: Mon Dec 28 14:03:36 2020 New Revision: 1884873 URL: http://svn.apache.org/viewvc?rev=1884873=rev Log: github-207 - replace commons logging with slf4j - use jcl-over-slf4j Modified: poi/site/src/documentation/content/xdocs/changes.xml poi/site/src/documentation/content/xdocs/components/index.xml poi/site/src/documentation/content/xdocs/encryption.xml poi/trunk/build.xml poi/trunk/src/multimodule/ooxml/java9/module-info.class poi/trunk/src/multimodule/ooxml/java9/module-info.java poi/trunk/src/multimodule/ooxml/test9/module-info.class poi/trunk/src/multimodule/ooxml/test9/module-info.java poi/trunk/src/multimodule/poi/java9/module-info.class poi/trunk/src/multimodule/poi/java9/module-info.java poi/trunk/src/multimodule/poi/test9/module-info.class poi/trunk/src/multimodule/poi/test9/module-info.java Modified: poi/site/src/documentation/content/xdocs/changes.xml URL: http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/changes.xml?rev=1884873=1884872=1884873=diff == --- poi/site/src/documentation/content/xdocs/changes.xml (original) +++ poi/site/src/documentation/content/xdocs/changes.xml Mon Dec 28 14:03:36 2020 @@ -126,6 +126,7 @@ Upgrade OOXML schema to 5th edition (transitional) Unable to convert pptx to pdf Migrate tests to Junit 5 +Use SLF4J instead of commons-logging - use jcl-over-slf4j Modified: poi/site/src/documentation/content/xdocs/components/index.xml URL: http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/components/index.xml?rev=1884873=1884872=1884873=diff == --- poi/site/src/documentation/content/xdocs/components/index.xml (original) +++ poi/site/src/documentation/content/xdocs/components/index.xml Mon Dec 28 14:03:36 2020 @@ -291,7 +291,7 @@ poi - https://search.maven.org/#artifactdetails|commons-logging|commons-logging|1.2|jar">commons-logging, + https://search.maven.org/#artifactdetails|org.slf4j|jcl-over-slf4j|1.7.30|jar">jcl-over-slf4j (commons-logging replacement), https://search.maven.org/#artifactdetails|commons-codec|commons-codec|1.15|jar">commons-codec, https://search.maven.org/#artifactdetails|org.apache.commons|commons-collections4|4.4|jar">commons-collections, https://search.maven.org/#artifactdetails|org.apache.commons|commons-math3|3.6.1|jar">commons-math Modified: poi/site/src/documentation/content/xdocs/encryption.xml URL: http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/encryption.xml?rev=1884873=1884872=1884873=diff == --- poi/site/src/documentation/content/xdocs/encryption.xml (original) +++ poi/site/src/documentation/content/xdocs/encryption.xml Mon Dec 28 14:03:36 2020 @@ -388,8 +388,7 @@ The package relationsships (*.rels) will be specially handled, i.e. they will be filtered and only a subset will be processed - see https://www.ecma-international.org/activities/Office%20Open%20XML%20Formats/Draft%20ECMA-376%203rd%20edition,%20March%202011/Office%20Open%20XML%20Part%202%20-%20Open%20Packaging%20Conventions.pdf;>13.2.4.24 Relationships Transform Algorithm. -POI can use https://commons.apache.org/proper/commons-logging/;>commons logging -and Santuario (XmlSec) uses http://www.slf4j.org/;>SLF4J for logging. +POI and Santuario (XmlSec) use http://www.slf4j.org/;>SLF4J for logging. To get logging information and debug output ...: Modified: poi/trunk/build.xml URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1884873=1884872=1884873=diff == --- poi/trunk/build.xml (original) +++ poi/trunk/build.xml Mon Dec 28 14:03:36 2020 @@ -264,7 +264,7 @@ under the License. - + @@ -289,7 +289,7 @@ under the License. - + @@ -622,6 +622,7 @@ under the License. + Modified: poi/trunk/src/multimodule/ooxml/java9/module-info.class URL: http://svn.apache.org/viewvc/poi/trunk/src/multimodule/ooxml/java9/module-info.class?rev=1884873=1884872=1884873=diff == Binary files - no diff available. Modified: poi/trunk/src/multimodule/ooxml/java9/module-info.java URL: http://svn.apache.org/viewvc/poi/trunk/src/multimodule/ooxml/java9/module-info.java?rev=1884873=1884872=1884873=diff ==
svn commit: r1884859 - /poi/trunk/jenkins/create_jobs.groovy
Author: kiwiwings Date: Mon Dec 28 10:45:43 2020 New Revision: 1884859 URL: http://svn.apache.org/viewvc?rev=1884859=rev Log: sonarcloud.io phases out support for Java 8 Modified: poi/trunk/jenkins/create_jobs.groovy Modified: poi/trunk/jenkins/create_jobs.groovy URL: http://svn.apache.org/viewvc/poi/trunk/jenkins/create_jobs.groovy?rev=1884859=1884858=1884859=diff == --- poi/trunk/jenkins/create_jobs.groovy (original) +++ poi/trunk/jenkins/create_jobs.groovy Mon Dec 28 10:45:43 2020 @@ -64,7 +64,7 @@ def poijobs = [ ], [ name: 'POI-DSL-no-scratchpad', trigger: triggerSundays, noScratchpad: true ], -[ name: 'POI-DSL-SonarQube', trigger: 'H 7 * * *', maven: true, sonar: true, skipcigame: true, +[ name: 'POI-DSL-SonarQube', jdk: '1.11', trigger: 'H 7 * * *', maven: true, sonar: true, skipcigame: true, email: 'kiwiwi...@apache.org' ], // set trigger empty as it is not stable yet, we can remove the Sonar Maven run when this is fully working - To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org For additional commands, e-mail: commits-h...@poi.apache.org
svn commit: r1884850 - in /poi/trunk: build.xml src/multimodule/ooxml-lite-agent/java9/module-info.class src/multimodule/ooxml-lite-agent/java9/module-info.java src/ooxml/testcases/org/apache/poi/ooxm
Author: kiwiwings
Date: Mon Dec 28 00:47:23 2020
New Revision: 1884850
URL: http://svn.apache.org/viewvc?rev=1884850=rev
Log:
gather necessary .xsb for ooxml-lite jar via intercepting the calls to
SchemaTypeSystemImpl.XsbReader
Modified:
poi/trunk/build.xml
poi/trunk/src/multimodule/ooxml-lite-agent/java9/module-info.class
poi/trunk/src/multimodule/ooxml-lite-agent/java9/module-info.java
poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1884850=1884849=1884850=diff
==
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Mon Dec 28 00:47:23 2020
@@ -157,7 +157,7 @@ under the License.
-
+
@@ -1157,6 +1157,7 @@ under the License.
destdir="${basedir}/src/multimodule/ooxml-lite-agent/java9"
includeantruntime="false"
fork="true"
+ modulepath="${basedir}/lib/main-tests"
unless:true="${isJava8}">
@@ -1168,6 +1169,7 @@ under the License.
+
@@ -1711,7 +1713,7 @@ under the License.
-
+
@@ -1750,7 +1752,7 @@ under the License.
-
+
@@ -1758,62 +1760,22 @@ under the License.
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-org/apache/poi/schemas/ooxml/system/ooxml/index.xsb
-org/apache/poi/schemas/ooxml/system/ooxml/picelement.xsb
-org/apache/poi/schemas/ooxml/system/ooxml/groupelement.xsb
-org/apache/poi/schemas/ooxml/system/ooxml/group7d3fdoctype.xsb
-org/apache/poi/schemas/ooxml/system/ooxml/shapelayoutelement.xsb
-org/apache/poi/schemas/ooxml/system/ooxml/shapetypeelement.xsb
-org/apache/poi/schemas/ooxml/system/ooxml/shapetypeb89bdoctype.xsb
-org/apache/poi/schemas/ooxml/system/ooxml/shapeelement.xsb
-org/apache/poi/schemas/ooxml/system/ooxml/shapeaee1doctype.xsb
-org/apache/poi/schemas/ooxml/system/ooxml/tblelement.xsb
-org/apache/poi/schemas/ooxml/system/ooxml/tbleb1bdoctype.xsb
-org/apache/poi/schemas/ooxml/system/ooxml/relationshipreferenceelement.xsb
-org/apache/poi/schemas/ooxml/system/ooxml/qualifyingpropertieselement.xsb
-org/apache/poi/schemas/ooxml/system/ooxml/oleobjelement.xsb
-org/apache/poi/schemas/ooxml/system/ooxml/oleobj8482doctype.xsb
-org/apache/poi/schemas/ooxml/system/ooxml/stcellspans60f6type.xsb
-org/apache/poi/schemas/ooxml/system/ooxml/stcellspanf3a5type.xsb
-org/apache/poi/schemas/ooxml/system/ooxml/alternatecontentelement.xsb
-org/apache/poi/schemas/ooxml/system/ooxml/chartelement.xsb
-org/apache/poi/schemas/ooxml/system/ooxml/chartf85cdoctype.xsb
-org/apache/poi/schemas/ooxml/system/ooxml/rectelement.xsb
-org/apache/poi/schemas/ooxml/system/ooxml/rectaf36doctype.xsb
-
+
-
+
+
Modified: poi/trunk/src/multimodule/ooxml-lite-agent/java9/module-info.class
URL:
http://svn.apache.org/viewvc/poi/trunk/src/multimodule/ooxml-lite-agent/java9/module-info.class?rev=1884850=1884849=1884850=diff
==
Binary files - no diff available.
Modified: poi/trunk/src/multimodule/ooxml-lite-agent/java9/module-info.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/multimodule/ooxml-lite-agent/java9/module-info.java?rev=1884850=1884849=1884850=diff
==
--- poi/trunk/src/multimodule/ooxml-lite-agent/java9/module-info.java (original)
+++ poi/trunk/src/multimodule/ooxml-lite-agent/java9/module-info.java Mon Dec
28 00:47:23 2020
@@ -17,6 +17,7 @@
module org.apache.poi.ooxml_lite {
requires java.instrument;
+requires static net.bytebuddy.agent;
exports org.apache.poi.ooxml.lite;
}
\ No newline at end of file
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java?rev=1884850=1884849=1884850=diff
===
svn commit: r1884813 - /poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/DummyGraphics2d.java
Author: kiwiwings
Date: Sat Dec 26 09:09:17 2020
New Revision: 1884813
URL: http://svn.apache.org/viewvc?rev=1884813=rev
Log:
Forbidden-apis fix - Graphics2D.finalize() is deprecated by Java14
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/DummyGraphics2d.java
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/DummyGraphics2d.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/DummyGraphics2d.java?rev=1884813=1884812=1884813=diff
==
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/DummyGraphics2d.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/DummyGraphics2d.java Sat
Dec 26 09:09:17 2020
@@ -800,18 +800,6 @@ public class DummyGraphics2d extends Gra
g2D.fillRoundRect( x, y, width, height, arcWidth, arcHeight );
}
-// FIXME: should be protected
-// FindBugs, category MALICIOUS_CODE, FI_PUBLIC_SHOULD_BE_PROTECTED
-// A class's finalize() method should have protected access, not public
-@Internal
-@Override
-public final void finalize() {
-log.println( "finalize():" );
-g2D.dispose();
-dispose();
-super.finalize();
-}
-
public Shape getClip() {
log.println( "getClip():" );
return g2D.getClip();
-
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
svn commit: r1884807 [2/2] - in /poi/trunk/src: examples/src/org/apache/poi/examples/xslf/ excelant/java/org/apache/poi/ss/excelant/ java/org/apache/poi/extractor/ java/org/apache/poi/hssf/dev/ java/o
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java?rev=1884807=1884806=1884807=diff
==
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java
(original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java Sat
Dec 26 00:08:19 2020
@@ -46,11 +46,11 @@ public final class Picture {
private static final POILogger log = POILogFactory
.getLogger( Picture.class );
-public static final byte[] COMPRESSED1 = { (byte) 0xFE, 0x78, (byte) 0xDA
};
+private static final byte[] COMPRESSED1 = { (byte) 0xFE, 0x78, (byte) 0xDA
};
-public static final byte[] COMPRESSED2 = { (byte) 0xFE, 0x78, (byte) 0x9C
};
+private static final byte[] COMPRESSED2 = { (byte) 0xFE, 0x78, (byte) 0x9C
};
-public static final byte[] IHDR = new byte[] { 'I', 'H', 'D', 'R' };
+private static final byte[] IHDR = new byte[] { 'I', 'H', 'D', 'R' };
@Deprecated
private static final byte[] PNG = new byte[] { (byte) 0x89, 0x50, 0x4E,
@@ -119,7 +119,7 @@ public final class Picture {
} else {
_blipRecords = Collections.emptyList();
}
-
+
if ( fillBytes ) {
fillImageContent();
}
@@ -177,16 +177,16 @@ public final class Picture {
{
/*
* http://www.codecomments.com/archive281-2004-3-158083.html
- *
+ *
* Algorithm proposed by Patrick TJ McPhee:
- *
+ *
* read 2 bytes make sure they are 'ffd8'x repeatedly: read 2 bytes
make
* sure the first one is 'ff'x if the second one is 'd9'x stop else if
* the second one is c0 or c2 (or possibly other values ...) skip 2
* bytes read one byte into depth read two bytes into height read two
* bytes into width else read two bytes into length skip forward
* length-2 bytes
- *
+ *
* Also used Ruby code snippet from:
* http://www.bigbold.com/snippets/posts/show/805 for reference
*/
@@ -321,7 +321,7 @@ public final class Picture {
/**
* Gets the initial width of the picture, in twips, prior to cropping or
* scaling.
- *
+ *
* @return the initial width of the picture in twips
*/
public int getDxaGoal()
@@ -352,7 +352,7 @@ public final class Picture {
/**
* Gets the initial height of the picture, in twips, prior to cropping or
* scaling.
- *
+ *
* @return the initial width of the picture in twips
*/
public int getDyaGoal()
@@ -384,7 +384,7 @@ public final class Picture {
/**
* Returns the MIME type for the image
- *
+ *
* @return MIME-type for known types of image or "image/unknown" if unknown
*/
public String getMimeType()
@@ -395,7 +395,7 @@ public final class Picture {
/**
* Returns picture's content as stored in the Word file, i.e. possibly in
* compressed form.
- *
+ *
* @return picture's content as it stored in Word file or an empty byte
array
* if it cannot be read.
*/
@@ -416,14 +416,14 @@ public final class Picture {
EscherBlipRecord blip = ( (EscherBSERecord) escherRecord
).getBlipRecord();
if (blip != null) {
return blip.getPicturedata();
-
+
}
}
return new byte[0];
}
/**
- *
+ *
* @return size in bytes of the picture
*/
public int getSize()
@@ -460,10 +460,10 @@ public final class Picture {
}
return width;
}
-
+
/**
* returns the description stored in the alternative text
- *
+ *
* @return pictue description
*/
public String getDescription()
@@ -486,7 +486,7 @@ public final class Picture {
/**
* tries to suggest extension for picture's file by matching signatures of
* popular image formats to first bytes of picture's contents
- *
+ *
* @return suggested file extension
*/
public String suggestFileExtension()
@@ -498,7 +498,7 @@ public final class Picture {
* Tries to suggest a filename: hex representation of picture structure
* offset in "Data" stream plus extension that is tried to determine from
* first byte of picture's content.
- *
+ *
* @return suggested file name
*/
public String suggestFullFileName()
@@ -571,7 +571,7 @@ public final class Picture {
* Writes Picture's content bytes to specified OutputStream. Is useful when
* there is need to write picture bytes directly to stream, omitting its
* representation in memory as distinct byte array.
- *
+ *
* @param out
*
svn commit: r1884807 [1/2] - in /poi/trunk/src: examples/src/org/apache/poi/examples/xslf/ excelant/java/org/apache/poi/ss/excelant/ java/org/apache/poi/extractor/ java/org/apache/poi/hssf/dev/ java/o
Author: kiwiwings Date: Sat Dec 26 00:08:19 2020 New Revision: 1884807 URL: http://svn.apache.org/viewvc?rev=1884807=rev Log: Sonar fixes Modified: poi/trunk/src/examples/src/org/apache/poi/examples/xslf/LinkVideoToPptx.java poi/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunction.java poi/trunk/src/java/org/apache/poi/extractor/ExtractorFactory.java poi/trunk/src/java/org/apache/poi/extractor/MainExtractorFactory.java poi/trunk/src/java/org/apache/poi/hssf/dev/ReSave.java poi/trunk/src/java/org/apache/poi/hssf/model/InternalWorkbook.java poi/trunk/src/java/org/apache/poi/hssf/record/GridsetRecord.java poi/trunk/src/java/org/apache/poi/hssf/record/PageBreakRecord.java poi/trunk/src/java/org/apache/poi/hssf/record/PrecisionRecord.java poi/trunk/src/java/org/apache/poi/hssf/record/TabIdRecord.java poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java poi/trunk/src/java/org/apache/poi/hssf/record/common/PhRun.java poi/trunk/src/java/org/apache/poi/poifs/common/POIFSConstants.java poi/trunk/src/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java poi/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java poi/trunk/src/java/org/apache/poi/poifs/filesystem/FileMagic.java poi/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java poi/trunk/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java poi/trunk/src/java/org/apache/poi/sl/usermodel/SlideShowFactory.java poi/trunk/src/java/org/apache/poi/ss/formula/SheetIdentifier.java poi/trunk/src/java/org/apache/poi/ss/formula/SheetRangeIdentifier.java poi/trunk/src/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java poi/trunk/src/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java poi/trunk/src/java/org/apache/poi/ss/formula/functions/Trend.java poi/trunk/src/java/org/apache/poi/ss/usermodel/WorkbookFactory.java poi/trunk/src/java/org/apache/poi/ss/util/cellwalk/CellWalk.java poi/trunk/src/java/org/apache/poi/util/DrawingDump.java poi/trunk/src/java/org/apache/poi/util/IOUtils.java poi/trunk/src/ooxml/java/org/apache/poi/ooxml/extractor/POIXMLExtractorFactory.java poi/trunk/src/ooxml/java/org/apache/poi/ooxml/util/IdentifierManager.java poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureLine.java poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GeometryRowTypes.java poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/XDGFSectionTypes.java poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/DummyGraphics2d.java poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCellHeader.java poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java poi/trunk/src/ooxml/testcases/org/apache/poi/extractor/ooxml/TestExtractorFactory.java poi/trunk/src/scratchpad/src/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusDraw.java poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusObject.java poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextHeaderAtom.java poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/NameIdChunks.java poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/RecipientChunks.java poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBinaryRasterOp.java poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfHatchStyle.java poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPenStyle.java poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/FontReplacer.java poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBasics.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestNameIdChunks.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestSorters.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumifs.java Modified: poi/trunk/src/examples/src/org/apache/poi
svn commit: r1884804 - /poi/trunk/build.gradle
Author: kiwiwings
Date: Fri Dec 25 19:58:32 2020
New Revision: 1884804
URL: http://svn.apache.org/viewvc?rev=1884804=rev
Log:
try to fix gradle sonarqube job
Modified:
poi/trunk/build.gradle
Modified: poi/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1884804=1884803=1884804=diff
==
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Fri Dec 25 19:58:32 2020
@@ -277,8 +277,12 @@ project('ooxml') {
// we need to ensure that the custom ant tasks are compiled before we
import the build.xml file
ant.mkdir(dir: "../../build/poi-ant-contrib")
-ant.javac(srcdir: "../../src/excelant/poi-ant-contrib", destdir:
"../../build/poi-ant-contrib",
-classpath: configurations.antdep.asPath)
+ant.javac(srcdir: "../../src/excelant/poi-ant-contrib"
+, destdir: "../../build/poi-ant-contrib"
+, classpath: configurations.antdep.asPath
+, includeantruntime: "true"
+, excludes: "Junit5Progress.java"
+)
// for now import the ant-task for building the jars from build.xml
// we need to rename the tasks as e.g. task "jar" conflicts with :ooxml:jar
-
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
svn commit: r1884803 - in /poi/trunk: build.gradle jenkins/create_jobs.groovy
Author: kiwiwings
Date: Fri Dec 25 19:19:32 2020
New Revision: 1884803
URL: http://svn.apache.org/viewvc?rev=1884803=rev
Log:
try to fix gradle sonarqube job
Modified:
poi/trunk/build.gradle
poi/trunk/jenkins/create_jobs.groovy
Modified: poi/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1884803=1884802=1884803=diff
==
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Fri Dec 25 19:19:32 2020
@@ -40,17 +40,20 @@ if (project.hasProperty('enableSonar'))
// https://docs.gradle.org/current/userguide/ant.html
configurations {
-antLibs
+antLibs {
+attributes {
+attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling,
Bundling.EXTERNAL))
+}
+}
}
dependencies {
-antLibs("junit:junit:4.13.1")
-antLibs("org.apache.ant:ant-junit:1.10.9")
-antLibs("org.apache.ant:ant-junit4:1.10.9")
+antLibs("org.junit.jupiter:junit-jupiter:5.7.0")
+antLibs("org.apache.ant:ant-junitlauncher:1.10.9")
}
ant.taskdef(name: "junit",
-classname: "org.apache.tools.ant.taskdefs.optional.junit.JUnitTask",
+classname:
"org.apache.tools.ant.taskdefs.optional.junitlauncher.confined.JUnitLauncherTask",
classpath: configurations.antLibs.asPath)
wrapper {
@@ -112,7 +115,7 @@ subprojects {
commonsCompressVersion = '1.20'
commonsMathVersion = '3.6.1'
japicmpversion = '4.1.2'
-junitVersion = '4.13.1'
+junitVersion = '5.7.0'
mockitoVersion = '3.6.0'
slf4jVersion = '1.7.30'
xmlbeansVersion = '4.0.0'
@@ -123,6 +126,7 @@ subprojects {
}
sourceCompatibility = 1.8
+targetCompatibility = 1.8
repositories {
mavenCentral()
@@ -225,10 +229,12 @@ project('main') {
compile 'javax.activation:activation:1.1.1'
compile 'com.zaxxer:SparseBitSet:1.2'
-testCompile "junit:junit:${junitVersion}"
+testCompile "org.junit.jupiter:junit-jupiter:${junitVersion}"
testCompile "org.mockito:mockito-core:${mockitoVersion}"
testCompile 'org.reflections:reflections:0.9.12'
testRuntime "org.slf4j:slf4j-simple:${slf4jVersion}"
+
+testCompile 'org.hamcrest:hamcrest:2.2'
}
jar {
@@ -301,13 +307,13 @@ project('ooxml') {
compile 'de.rototor.pdfbox:graphics2d:0.30'
// for ooxml-lite, should we move this somewhere else?
-compile "junit:junit:${junitVersion}"
+compile "org.junit.jupiter:junit-jupiter:${junitVersion}"
compile project(':main')
compile project(':scratchpad') // TODO: get rid of this
dependency!
compile
files("../../build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version}.jar")
-testCompile "junit:junit:${junitVersion}"
+testCompile "org.junit.jupiter:junit-jupiter:${junitVersion}"
testCompile "org.mockito:mockito-core:${mockitoVersion}"
testCompile 'org.xmlunit:xmlunit-core:2.8.0'
testCompile 'org.reflections:reflections:0.9.12'
@@ -361,7 +367,7 @@ project('excelant') {
compile project(':ooxml')
testCompile project(path: ':main', configuration: 'tests')
-testCompile "junit:junit:${junitVersion}"
+testCompile "org.junit.jupiter:junit-jupiter:${junitVersion}"
}
jar {
@@ -384,7 +390,7 @@ project('integrationtest') {
compile project(':scratchpad')
compile project(':examples')
-testCompile "junit:junit:${junitVersion}"
+testCompile "org.junit.jupiter:junit-jupiter:${junitVersion}"
testCompile "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
@@ -426,7 +432,7 @@ project('scratchpad') {
// cyclic-dependency here: compile project(':ooxml')
-testCompile "junit:junit:${junitVersion}"
+testCompile "org.junit.jupiter:junit-jupiter:${junitVersion}"
testCompile "org.mockito:mockito-core:${mockitoVersion}"
testCompile project(path: ':main', configuration: 'tests')
}
Modified: poi/trunk/jenkins/create_jobs.groovy
URL:
http://svn.apache.org/viewvc/poi/trunk/jenkins/create_jobs.groovy?rev=1884803=1884802=1884803=diff
==
--- poi/trunk/jenkins/create_jobs.groovy (original)
+++ poi/trunk/jenkins/create_jobs.groovy Fri Dec 25 19:19:32 2020
@@ -401,6 +401,7 @@ poijobs.each { poijob ->
switches('-Dsonar.login=${POI_SONAR_TOKEN}')
switches('-Dsonar.organization=a
svn commit: r1884785 - in /poi/trunk: build.xml src/excelant/poi-ant-contrib/Junit5Progress.java
Author: kiwiwings
Date: Fri Dec 25 01:42:10 2020
New Revision: 1884785
URL: http://svn.apache.org/viewvc?rev=1884785=rev
Log:
try to fix distsourcebuild error
Modified:
poi/trunk/build.xml
poi/trunk/src/excelant/poi-ant-contrib/Junit5Progress.java
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1884785=1884784=1884785=diff
==
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Fri Dec 25 01:42:10 2020
@@ -1239,7 +1239,7 @@ under the License.
-
+
@@ -1255,6 +1255,7 @@ under the License.
+
@@ -1279,14 +1280,15 @@ under the License.
+
+
-
-
+
Modified: poi/trunk/src/excelant/poi-ant-contrib/Junit5Progress.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/excelant/poi-ant-contrib/Junit5Progress.java?rev=1884785=1884784=1884785=diff
==
--- poi/trunk/src/excelant/poi-ant-contrib/Junit5Progress.java (original)
+++ poi/trunk/src/excelant/poi-ant-contrib/Junit5Progress.java Fri Dec 25
01:42:10 2020
@@ -36,7 +36,7 @@ import org.junit.platform.launcher.TestP
**/
public class Junit5Progress implements TestExecutionListener {
-private StringWriter inMemoryWriter = new StringWriter();
+private final StringWriter inMemoryWriter = new StringWriter();
private int numSkippedInCurrentClass;
private int numAbortedInCurrentClass;
@@ -97,10 +97,14 @@ public class Junit5Progress implements T
}
/*
- * Append to file on disk since listener can't write to System.out
(becuase legacy listeners enabled)
+ * Append to file on disk since listener can't write to System.out
(because legacy listeners enabled)
+ *
+ * Implementing/using the TestResultFormatter - mentioned in the
junitlauncher ant manual -
+ * doesn't work currently, because the output is truncated/overwritten
with every test
*/
private void flushToDisk() {
-try (FileWriter writer = new
FileWriter("build/status-as-tests-run.txt", true)) {
+String outFile = System.getProperty("junit5.progress.file",
"build/status-as-tests-run.txt");
+try (FileWriter writer = new FileWriter(outFile, true)) {
writer.write(inMemoryWriter.toString());
} catch (IOException e) {
throw new UncheckedIOException(e);
-
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
svn commit: r1884783 [23/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/excelan
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java?rev=1884783=1884782=1884783=diff
==
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java
Thu Dec 24 18:42:29 2020
@@ -17,9 +17,9 @@
package org.apache.poi.hssf.record;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.poi.ss.formula.ptg.AttrPtg;
import org.apache.poi.ss.formula.ptg.FuncVarPtg;
@@ -28,7 +28,7 @@ import org.apache.poi.ss.formula.ptg.Ptg
import org.apache.poi.ss.formula.ptg.RefPtg;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.FormulaError;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link FormulaRecord}
@@ -83,17 +83,18 @@ public final class TestFormulaRecord {
};
FormulaRecord record = new
FormulaRecord(TestcaseRecordInputStream.create(FormulaRecord.sid, formulaByte));
- assertEquals("Row", 0, record.getRow());
- assertEquals("Column", 0, record.getColumn());
+ assertEquals(0, record.getRow(), "Row");
+ assertEquals(0, record.getColumn(), "Column");
//noinspection deprecation
assertEquals(CellType.ERROR.getCode(),
record.getCachedResultType());
assertEquals(CellType.ERROR, record.getCachedResultTypeEnum());
byte[] output = record.serialize();
- assertEquals("Output size", 33, output.length); //includes
sid+recordlength
+ // includes sid+recordlength
+ assertEquals(33, output.length, "Output size");
for (int i = 5; i < 13;i++) {
- assertEquals("FormulaByte NaN doesn't match",
formulaByte[i], output[i+4]);
+ assertEquals(formulaByte[i], output[i+4], "FormulaByte
NaN doesn't match");
}
}
@@ -111,11 +112,12 @@ public final class TestFormulaRecord {
formulaByte[20]=(byte)0x05;
formulaByte[22]=(byte)0x01;
FormulaRecord record = new
FormulaRecord(TestcaseRecordInputStream.create(FormulaRecord.sid, formulaByte));
- assertEquals("Row", 0, record.getRow());
- assertEquals("Column", 0, record.getColumn());
+ assertEquals(0, record.getRow(), "Row");
+ assertEquals(0, record.getColumn(), "Column");
byte[] output = record.serialize();
- assertEquals("Output size", 31, output.length); //includes
sid+recordlength
- assertEquals("Offset 22", 1, output[26]);
+ // includes sid+recordlength
+ assertEquals(31, output.length, "Output size");
+ assertEquals(1, output[26], "Offset 22");
}
@Test
@@ -191,7 +193,7 @@ public final class TestFormulaRecord {
fr0.setCachedResultBoolean(false);
fr1.setCachedResultBoolean(true);
- assertFalse("Identified bug 46479c",
fr0.getCachedBooleanValue() && !fr1.getCachedBooleanValue());
+ assertFalse(fr0.getCachedBooleanValue() &&
!fr1.getCachedBooleanValue(), "Identified bug 46479c");
assertFalse(fr0.getCachedBooleanValue());
assertTrue(fr1.getCachedBooleanValue());
}
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java?rev=1884783=1884782=1884783=diff
==
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java
Thu Dec 24 18:42:29 2020
@@ -18,10 +18,10 @@
package org.apache.poi.hssf.record;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the FtCblsSubRecord
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java
URL:
svn commit: r1884783 [36/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/excelan
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
Thu Dec 24 18:42:29 2020
@@ -19,12 +19,12 @@
package org.apache.poi.ss.usermodel;
-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 java.io.IOException;
@@ -34,7 +34,8 @@ import org.apache.poi.ss.ITestDataProvid
import org.apache.poi.ss.usermodel.ConditionalFormattingThreshold.RangeType;
import org.apache.poi.ss.usermodel.IconMultiStateFormatting.IconSet;
import org.apache.poi.ss.util.CellRangeAddress;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.function.Executable;
/**
* Base tests for Conditional Formatting, for both HSSF and XSSF
@@ -50,70 +51,47 @@ public abstract class BaseTestConditiona
return true;
}
-protected abstract void assertColour(String hexExpected, Color actual);
+protected abstract void assertColor(String hexExpected, Color actual);
@Test
-public void testBasic() throws IOException {
+public void testBasic() throws Throwable {
try (Workbook wb = _testDataProvider.createWorkbook()) {
Sheet sh = wb.createSheet();
SheetConditionalFormatting sheetCF =
sh.getSheetConditionalFormatting();
assertEquals(0, sheetCF.getNumConditionalFormattings());
-try {
-assertNull(sheetCF.getConditionalFormattingAt(0));
-fail("expected exception");
-} catch (IllegalArgumentException e) {
-assertTrue(e.getMessage().startsWith("Specified CF index 0 is
outside the allowable range"));
-}
+IllegalArgumentException e =
assertThrows(IllegalArgumentException.class, () ->
sheetCF.getConditionalFormattingAt(0));
+assertTrue(e.getMessage().startsWith("Specified CF index 0 is
outside the allowable range"));
-try {
-sheetCF.removeConditionalFormatting(0);
-fail("expected exception");
-} catch (IllegalArgumentException e) {
-assertTrue(e.getMessage().startsWith("Specified CF index 0 is
outside the allowable range"));
-}
+e = assertThrows(IllegalArgumentException.class, () ->
sheetCF.removeConditionalFormatting(0));
+assertTrue(e.getMessage().startsWith("Specified CF index 0 is
outside the allowable range"));
ConditionalFormattingRule rule1 =
sheetCF.createConditionalFormattingRule("1");
ConditionalFormattingRule rule2 =
sheetCF.createConditionalFormattingRule("2");
ConditionalFormattingRule rule3 =
sheetCF.createConditionalFormattingRule("3");
ConditionalFormattingRule rule4 =
sheetCF.createConditionalFormattingRule("4");
-try {
-sheetCF.addConditionalFormatting(null, rule1);
-fail("expected exception");
-} catch (IllegalArgumentException e) {
-assertTrue(e.getMessage().startsWith("regions must not be
null"));
-}
-try {
-sheetCF.addConditionalFormatting(
-new
CellRangeAddress[]{CellRangeAddress.valueOf("A1:A3")},
-(ConditionalFormattingRule) null);
-fail("expected exception");
-} catch (IllegalArgumentException e) {
-assertTrue(e.getMessage().startsWith("cfRules must not be
null"));
-}
-try {
+e = assertThrows(IllegalArgumentException.class, () ->
sheetCF.addConditionalFormatting(null, rule1));
+assertTrue(e.getMessage().startsWith("regions must not be null"));
+
+e = assertThrows(IllegalArgumentException.class, () ->
sheetCF.addConditionalFormatting(
+new CellRangeAddress[]{CellRangeAddress.valueOf("A1:A3")},
(ConditionalFormattingRule) null));
+assertTrue(e.getMessage().startsWith("cfRules must not be
svn commit: r1884783 [35/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/excelan
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestPercentPtg.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestPercentPtg.java?rev=1884783=1884782=1884783=diff
==
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestPercentPtg.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestPercentPtg.java
Thu Dec 24 18:42:29 2020
@@ -17,13 +17,13 @@
package org.apache.poi.ss.formula.ptg;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link PercentPtg}.
@@ -37,12 +37,12 @@ public final class TestPercentPtg extend
try (HSSFWorkbook workbook = loadWorkbook("PercentPtg.xls")) {
HSSFSheet sheet = workbook.getSheetAt(0);
-assertEquals("Wrong numeric value for original number", 53000.0,
- sheet.getRow(0).getCell(0).getNumericCellValue(),
0.0);
-assertEquals("Wrong numeric value for percent formula result",
5300.0,
- sheet.getRow(1).getCell(0).getNumericCellValue(),
0.0);
-assertEquals("Wrong formula string for percent formula", "A1*10%",
- sheet.getRow(1).getCell(0).getCellFormula());
+assertEquals(53000.0,
sheet.getRow(0).getCell(0).getNumericCellValue(), 0.0,
+ "Wrong numeric value for original number");
+assertEquals(5300.0,
sheet.getRow(1).getCell(0).getNumericCellValue(), 0.0,
+ "Wrong numeric value for percent formula result");
+assertEquals("A1*10%", sheet.getRow(1).getCell(0).getCellFormula(),
+ "Wrong formula string for percent formula");
}
}
}
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRangePtg.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRangePtg.java?rev=1884783=1884782=1884783=diff
==
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRangePtg.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRangePtg.java Thu
Dec 24 18:42:29 2020
@@ -17,13 +17,13 @@
package org.apache.poi.ss.formula.ptg;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link RangePtg}.
@@ -36,8 +36,8 @@ public final class TestRangePtg extends
public void testReading() throws IOException {
try (HSSFWorkbook workbook = loadWorkbook("RangePtg.xls")) {
HSSFCell cell = workbook.getSheetAt(0).getRow(3).getCell(1);
-assertEquals("Wrong cell value", 10.0, cell.getNumericCellValue(),
0.0);
-assertEquals("Wrong cell formula", "SUM(pineapple:B2)",
cell.getCellFormula());
+assertEquals(10.0, cell.getNumericCellValue(), 0.0, "Wrong cell
value");
+assertEquals("SUM(pineapple:B2)", cell.getCellFormula(), "Wrong
cell formula");
}
}
}
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java?rev=1884783=1884782=1884783=diff
==
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java Thu
Dec 24 18:42:29 2020
@@ -17,13 +17,13 @@
package org.apache.poi.ss.formula.ptg;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for Ref3DPtg
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestReferencePtg.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestReferencePtg.java?rev=1884783=1884782=1884783=diff
==
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestReferencePtg.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestReferencePtg.java
svn commit: r1884783 [33/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/excelan
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestHex2Dec.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestHex2Dec.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestHex2Dec.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestHex2Dec.java
Thu Dec 24 18:42:29 2020
@@ -17,7 +17,7 @@
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -27,7 +27,7 @@ import org.apache.poi.ss.formula.eval.Er
import org.apache.poi.ss.formula.eval.NumberEval;
import org.apache.poi.ss.formula.eval.StringEval;
import org.apache.poi.ss.formula.eval.ValueEval;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link Hex2Dec}
@@ -44,13 +44,13 @@ public final class TestHex2Dec {
private static void confirmValue(String msg, String number1, String
expected) {
ValueEval result = invokeValue(number1);
assertEquals(NumberEval.class, result.getClass());
- assertEquals(msg, expected, ((NumberEval)
result).getStringValue());
+ assertEquals(expected, ((NumberEval) result).getStringValue(),
msg);
}
private static void confirmValueError(String msg, String number1,
ErrorEval numError) {
ValueEval result = invokeValue(number1);
assertEquals(ErrorEval.class, result.getClass());
-assertEquals(msg, numError, result);
+assertEquals(numError, result, msg);
}
@Test
@@ -93,8 +93,7 @@ public final class TestHex2Dec {
wb.createSheet();
HSSFEvaluationWorkbook workbook = HSSFEvaluationWorkbook.create(wb);
WorkbookEvaluator workbookEvaluator = new WorkbookEvaluator(workbook,
(sheetIndex, rowIndex, columnIndex) -> true, null);
-return new OperationEvaluationContext(workbookEvaluator,
-workbook, 0, 0, 0, null);
+return new OperationEvaluationContext(workbookEvaluator, workbook, 0,
0, 0, null);
}
@Test
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java
Thu Dec 24 18:42:29 2020
@@ -17,16 +17,15 @@
package org.apache.poi.ss.formula.functions;
-import org.junit.runners.Parameterized.Parameters;
+import java.util.stream.Stream;
-import java.util.Collection;
+import org.junit.jupiter.params.provider.Arguments;
/**
* Tests IF() as loaded from a test data spreadsheet.
*/
public class TestIFFunctionFromSpreadsheet extends
BaseTestFunctionsFromSpreadsheet {
-@Parameters(name="{0}")
-public static Collection data() throws Exception {
+public static Stream data() throws Exception {
return data(TestIFFunctionFromSpreadsheet.class,
"IfFunctionTestCaseData.xls");
}
}
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIPMT.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIPMT.java?rev=1884783=1884782=1884783=diff
==
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIPMT.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIPMT.java
Thu Dec 24 18:42:29 2020
@@ -19,14 +19,14 @@
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for IPMT()
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java?rev=1884783=1884782=1884783=diff
==
svn commit: r1884783 [34/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/excelan
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java?rev=1884783=1884782=1884783=diff
==
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java
Thu Dec 24 18:42:29 2020
@@ -17,14 +17,16 @@
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.NumberEval;
import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.ss.usermodel.FormulaError;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestPmt {
@@ -40,9 +42,7 @@ public final class TestPmt {
*/
private static NumberEval invokeNormal(ValueEval[] args) {
ValueEval ev = invoke(args);
- if(ev instanceof ErrorEval) {
- fail("Normal evaluation failed with error code: " + ev);
- }
+ assertFalse(ev instanceof ErrorEval, "Normal evaluation failed
with error code: " + ev);
return (NumberEval) ev;
}
@@ -74,9 +74,7 @@ public final class TestPmt {
ValueEval ev = invoke(args);
if(ev instanceof ErrorEval) {
ErrorEval err = (ErrorEval) ev;
- if(err.getErrorCode() == FormulaError.VALUE.getCode()) {
- fail("Identified bug 44691");
- }
+ assertNotEquals(FormulaError.VALUE.getCode(),
err.getErrorCode(), "Identified bug 44691");
}
confirm(-44.3206, invokeNormal(args));
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPoisson.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPoisson.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPoisson.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPoisson.java
Thu Dec 24 18:42:29 2020
@@ -17,13 +17,13 @@
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.ss.formula.eval.BoolEval;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.NumberEval;
import org.apache.poi.ss.formula.eval.ValueEval;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for Excel function POISSON(x,mean,cumulative)
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestProduct.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestProduct.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestProduct.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestProduct.java
Thu Dec 24 18:42:29 2020
@@ -21,10 +21,10 @@ import org.apache.poi.ss.formula.eval.Mi
import org.apache.poi.ss.formula.eval.NumberEval;
import org.apache.poi.ss.formula.eval.StringEval;
import org.apache.poi.ss.formula.eval.ValueEval;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-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;
public class TestProduct {
@Test
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestQuotient.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestQuotient.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestQuotient.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestQuotient.java
Thu Dec 24 18:42:29 2020
@@ -16,13 +16,13 @@
*/
package org.apache.poi.ss.formula.functions;
-import static org.junit.Assert.assertEquals;
+import static
svn commit: r1884783 [18/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/excelan
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java
Thu Dec 24 18:42:29 2020
@@ -19,11 +19,11 @@
package org.apache.poi.hslf.usermodel;
-import static org.junit.Assert.assertEquals;
-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.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;
import java.util.List;
@@ -35,7 +35,7 @@ import org.apache.poi.hslf.record.Escher
import org.apache.poi.hslf.record.StyleTextProp9Atom;
import org.apache.poi.hslf.record.StyleTextPropAtom;
import org.apache.poi.sl.usermodel.AutoNumberingScheme;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
@@ -43,22 +43,20 @@ import org.junit.Test;
* if a paragraph has autonumber ()
* @see http://social.msdn.microsoft.com/Forums/mr-IN/os_binaryfile/thread/650888db-fabd-4b95-88dc-f0455f6e2d28;>
* PPT: Missing TextAutoNumberScheme structure providing the style of the
number bullets
- *
+ *
* @author Alex Nikiforov [mailto:ani...@gmail.com]
*/
public final class TestNumberedList3 {
-private static POIDataSamples _slTests =
POIDataSamples.getSlideShowInstance();
+private static final POIDataSamples _slTests =
POIDataSamples.getSlideShowInstance();
@Test
public void testNumberedList() throws IOException {
- HSLFSlideShow ppt = new
HSLFSlideShow(_slTests.openResourceAsStream("numbers3.ppt"));
- assertTrue("No Exceptions while reading file", true);
-
- final List slides = ppt.getSlides();
- assertEquals(1, slides.size());
- final HSLFSlide slide = slides.get(0);
- checkSlide(slide);
- ppt.close();
+ try (HSLFSlideShow ppt = new
HSLFSlideShow(_slTests.openResourceAsStream("numbers3.ppt"))) {
+ final List slides = ppt.getSlides();
+ assertEquals(1, slides.size());
+ final HSLFSlide slide = slides.get(0);
+ checkSlide(slide);
+ }
}
private void checkSlide(final HSLFSlide s) {
final StyleTextProp9Atom[] numberedListArray =
s.getNumberedListInfo();
@@ -68,9 +66,9 @@ public final class TestNumberedList3 {
assertNotNull(numberedListInfoForTextBox);
final TextPFException9[] autoNumbersOfTextBox0 =
numberedListInfoForTextBox.getAutoNumberTypes();
assertEquals(Short.valueOf((short)1),
autoNumbersOfTextBox0[0].getfBulletHasAutoNumber());
- assertEquals(Short.valueOf((short)1),
autoNumbersOfTextBox0[0].getAutoNumberStartNumber());//Default value = 1 will
be used
+ assertEquals(Short.valueOf((short)1),
autoNumbersOfTextBox0[0].getAutoNumberStartNumber());//Default value = 1 will
be used
assertSame(AutoNumberingScheme.arabicPeriod,
autoNumbersOfTextBox0[0].getAutoNumberScheme());
-
+
final List> textParass =
s.getTextParagraphs();
assertEquals(3, textParass.size());
assertEquals("Bulleted list\rMore bullets\rNo bullets here",
HSLFTextParagraph.getRawText(textParass.get(0)));
@@ -85,9 +83,9 @@ public final class TestNumberedList3 {
final TextPFException9[] autoNumbers =
textParass.get(1).get(0).getStyleTextProp9Atom().getAutoNumberTypes();
assertEquals(1, autoNumbers.length);
assertEquals(Short.valueOf((short)1),
autoNumbers[0].getfBulletHasAutoNumber());
- assertEquals(Short.valueOf((short)1),
autoNumbers[0].getAutoNumberStartNumber());//Default value = 1 will be used
+ assertEquals(Short.valueOf((short)1),
autoNumbers[0].getAutoNumberStartNumber());//Default value = 1 will be used
assertSame(AutoNumberingScheme.arabicPeriod,
autoNumbersOfTextBox0[0].getAutoNumberScheme());
-
+
int chCovered = 0;
for (HSLFTextParagraph htp : textParass.get(1)) {
for (HSLFTextRun htr : htp.getTextRuns()) {
@@ -96,9 +94,9 @@ public final class TestNumberedList3 {
}
svn commit: r1884783 [30/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/excelan
Modified:
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPropertySorter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPropertySorter.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPropertySorter.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPropertySorter.java
Thu Dec 24 18:42:29 2020
@@ -17,9 +17,9 @@
package org.apache.poi.poifs.filesystem;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -35,7 +35,7 @@ import java.util.stream.Stream;
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.poifs.property.DirectoryProperty;
import org.apache.poi.poifs.property.Property;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Verify the order of entries DirectoryProperty .
Modified:
poi/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java?rev=1884783=1884782=1884783=diff
==
--- poi/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java
Thu Dec 24 18:42:29 2020
@@ -21,13 +21,13 @@ import org.apache.poi.POIDataSamples;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.StringUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import static org.apache.poi.POITestCase.assertContains;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.File;
import java.io.FileInputStream;
@@ -52,7 +52,7 @@ public class TestVBAMacroReader {
}
String testMacroContents = new String(bytes, StringUtil.UTF8);
-
+
if (! testMacroContents.startsWith("Sub ")) {
throw new IllegalArgumentException("Not a macro");
}
@@ -73,7 +73,7 @@ public class TestVBAMacroReader {
}
expectedMacroContents =
Collections.unmodifiableMap(_expectedMacroContents);
}
-
+
From Stream /
@Test
public void HSSFFromStream() throws Exception {
@@ -83,7 +83,7 @@ public class TestVBAMacroReader {
public void XSSFFromStream() throws Exception {
fromStream(POIDataSamples.getSpreadSheetInstance(),
"SimpleMacro.xlsm");
}
-@Ignore("bug 59302: Found 0 macros; See
org.apache.poi.hslf.usermodel.TestBugs.getMacrosFromHSLF()" +
+@Disabled("bug 59302: Found 0 macros; See
org.apache.poi.hslf.usermodel.TestBugs.getMacrosFromHSLF()" +
"for an example of how to get macros out of ppt. TODO: make
integration across file formats more elegant")
@Test
public void HSLFFromStream() throws Exception {
@@ -101,7 +101,7 @@ public class TestVBAMacroReader {
public void XWPFFromStream() throws Exception {
fromStream(POIDataSamples.getDocumentInstance(), "SimpleMacro.docm");
}
-@Ignore("Found 0 macros")
+@Disabled("Found 0 macros")
@Test
public void HDGFFromStream() throws Exception {
fromStream(POIDataSamples.getDiagramInstance(), "SimpleMacro.vsd");
@@ -120,7 +120,7 @@ public class TestVBAMacroReader {
public void XSSFFromFile() throws Exception {
fromFile(POIDataSamples.getSpreadSheetInstance(), "SimpleMacro.xlsm");
}
-@Ignore("bug 59302: Found 0 macros; See
org.apache.poi.hslf.usermodel.TestBugs.getMacrosFromHSLF()" +
+@Disabled("bug 59302: Found 0 macros; See
org.apache.poi.hslf.usermodel.TestBugs.getMacrosFromHSLF()" +
"for an example of how to get macros out of ppt. TODO: make
integration across file formats more elegant")
@Test
public void HSLFFromFile() throws Exception {
@@ -138,7 +138,7 @@ public class TestVBAMacroReader {
public void XWPFFromFile() throws Exception {
fromFile(POIDataSamples.getDocumentInstance(), "SimpleMacro.docm");
}
-@Ignore("Found 0 macros")
+
svn commit: r1884783 [28/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/excelan
Modified:
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileMagic.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileMagic.java?rev=1884783=1884782=1884783=diff
==
--- poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileMagic.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileMagic.java
Thu Dec 24 18:42:29 2020
@@ -17,13 +17,13 @@
package org.apache.poi.poifs.filesystem;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-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.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.BufferedInputStream;
import java.io.File;
@@ -37,7 +37,7 @@ import java.util.Random;
import org.apache.poi.POIDataSamples;
import org.apache.poi.util.TempFile;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestFileMagic {
@Test
@@ -62,12 +62,7 @@ public class TestFileMagic {
assertEquals(FileMagic.UNKNOWN,
FileMagic.valueOf("something".getBytes(StandardCharsets.UTF_8)));
assertEquals(FileMagic.UNKNOWN, FileMagic.valueOf(new byte[0]));
-try {
-FileMagic.valueOf("some string");
-fail("Should catch exception here");
-} catch (IllegalArgumentException e) {
-// expected here
-}
+assertThrows(IllegalArgumentException.class, () ->
FileMagic.valueOf("some string"));
}
@Test
@@ -134,7 +129,7 @@ public class TestFileMagic {
}
}
-@Test(expected = IOException.class)
+@Test
public void testMarkRequired() throws IOException {
byte[] data = new byte[] { -1, -40, -1, -32, 0 };
@@ -148,7 +143,7 @@ public class TestFileMagic {
try (FileInputStream str = new FileInputStream(file)) {
assertFalse(str.markSupported());
-FileMagic.valueOf(str);
+assertThrows(IOException.class, () -> FileMagic.valueOf(str));
}
} finally {
assertTrue(file.delete());
Modified:
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java
Thu Dec 24 18:42:29 2020
@@ -17,8 +17,8 @@
package org.apache.poi.poifs.filesystem;
-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.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -30,8 +30,8 @@ import java.util.List;
import java.util.Map;
import org.apache.poi.POIDataSamples;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
/**
* Tests bugs for POIFSFileSystem
@@ -42,7 +42,7 @@ public final class TestFileSystemBugs {
private List openedFSs;
-@After
+@AfterEach
public void tearDown() {
if (openedFSs != null && !openedFSs.isEmpty()) {
for (POIFSFileSystem fs : openedFSs) {
Modified:
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java
Thu Dec 24 18:42:29 2020
@@ -18,11 +18,10 @@
package org.apache.poi.poifs.filesystem;
-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
svn commit: r1884783 [20/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/excelan
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java
Thu Dec 24 18:42:29 2020
@@ -18,12 +18,12 @@
package org.apache.poi.hwpf.usermodel;
import static org.apache.poi.hwpf.HWPFTestDataSamples.openSampleFile;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import org.apache.poi.hwpf.HWPFDocument;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test to see if Range.replaceText() works even if the Range contains a
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java
Thu Dec 24 18:42:29 2020
@@ -22,9 +22,9 @@ import java.io.IOException;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.HWPFTestDataSamples;
import org.apache.poi.hwpf.model.Ffn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
* API for processing of symbols, see Bugzilla 49908
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestTableRow.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestTableRow.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestTableRow.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestTableRow.java
Thu Dec 24 18:42:29 2020
@@ -16,18 +16,18 @@
*/
package org.apache.poi.hwpf.usermodel;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import java.io.InputStream;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hwpf.HWPFDocument;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestTableRow {
private static final POIDataSamples SAMPLES =
POIDataSamples.getDocumentInstance();
-
+
@Test
public void testInnerTableCellsDetection() throws IOException {
InputStream is = SAMPLES.openResourceAsStream( "innertable.doc" );
@@ -62,7 +62,7 @@ public class TestTableRow {
assertEquals( 3, outerTable.getRow( 0 ).numCells() );
assertEquals( 3, outerTable.getRow( 1 ).numCells() );
assertEquals( 3, outerTable.getRow( 2 ).numCells() );
-
+
hwpfDocument.close();
}
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/util/TestLittleEndianCP950Reader.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/util/TestLittleEndianCP950Reader.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/util/TestLittleEndianCP950Reader.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/util/TestLittleEndianCP950Reader.java
Thu Dec 24 18:42:29 2020
@@ -17,12 +17,12 @@
package org.apache.poi.hwpf.util;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import java.io.Reader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestLittleEndianCP950Reader {
@@ -63,6 +63,6 @@ public class TestLittleEndianCP950Reader
int c = reader.read();
assertEquals((int) expected, c);
int eof = reader.read();
-assertEquals("should be end of stream", -1, eof);
+assertEquals(-1, eof, "should be end of stream");
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/POITestCase.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/POITestCase.java?rev=1884783=1884782=1884783=diff
svn commit: r1884783 [31/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/excelan
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
Thu Dec 24 18:42:29 2020
@@ -17,11 +17,13 @@
package org.apache.poi.ss.formula;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
@@ -47,8 +49,8 @@ import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.util.CellRangeAddress;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Tests {@link WorkbookEvaluator}.
@@ -194,12 +196,9 @@ public class TestWorkbookEvaluator {
HSSFCell cell = row.createCell(0);
cell.setCellFormula("1+IF(1,,)");
HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-CellValue cv = null;
-try {
-cv = fe.evaluate(cell);
-} catch (RuntimeException e) {
-fail("Missing arg result not being handled correctly.");
-}
+assertDoesNotThrow(() -> fe.evaluate(cell), "Missing arg result not
being handled correctly.");
+
+CellValue cv = fe.evaluate(cell);
assertEquals(CellType.NUMERIC, cv.getCellType());
// adding blank to 1.0 gives 1.0
assertEquals(1.0, cv.getNumberValue(), 0.0);
@@ -260,7 +259,7 @@ public class TestWorkbookEvaluator {
public void testNamesInFormulas() throws IOException {
Workbook wb = new HSSFWorkbook();
Sheet sheet = wb.createSheet("Sheet1");
-
+
Name name1 = wb.createName();
name1.setNameName("aConstant");
name1.setRefersToFormula("3.14");
@@ -272,27 +271,27 @@ public class TestWorkbookEvaluator {
Name name3 = wb.createName();
name3.setNameName("aSet");
name3.setRefersToFormula("Sheet1!$A$2:$A$4");
-
+
Name name4 = wb.createName();
name4.setNameName("offsetFormula");
name4.setRefersToFormula("OFFSET(Sheet1!$A$1:$A$4,2,0,2,1)");
-
+
Name name5 = wb.createName();
name5.setNameName("rowFormula");
name5.setRefersToFormula("ROW()");
-
+
Row row0 = sheet.createRow(0);
Row row1 = sheet.createRow(1);
Row row2 = sheet.createRow(2);
Row row3 = sheet.createRow(3);
Row row4 = sheet.createRow(4);
Row row5 = sheet.createRow(5);
-
+
row0.createCell(0).setCellValue(2);
row1.createCell(0).setCellValue(5);
row2.createCell(0).setCellValue(3);
row3.createCell(0).setCellValue(7);
-
+
row0.createCell(2).setCellFormula("aConstant");
row1.createCell(2).setCellFormula("aFormula");
row2.createCell(2).setCellFormula("SUM(aSet)");
@@ -307,10 +306,10 @@ public class TestWorkbookEvaluator {
assertEquals(28.14, fe.evaluate(row3.getCell(2)).getNumberValue(),
EPSILON);
assertEquals(10.0, fe.evaluate(row4.getCell(2)).getNumberValue(),
EPSILON);
assertEquals(6.0, fe.evaluate(row5.getCell(2)).getNumberValue(),
EPSILON);
-
+
wb.close();
}
-
+
@Test
public void testIgnoreMissingWorkbooks() {
// TODO: update this test for meaningful functional behavior
@@ -336,9 +335,9 @@ public class TestWorkbookEvaluator {
evaluator.setDebugEvaluationOutputForNextEval(false);
assertFalse(evaluator.isDebugEvaluationOutputForNextEval());
}
-
+
// Test IF-Equals Formula Evaluation (bug 58591)
-
+
private Workbook testIFEqualsFormulaEvaluation_setup(String formula,
CellType a1CellType) {
Workbook wb = new HSSFWorkbook();
Sheet sheet = wb.createSheet("IFEquals");
@@ -347,7 +346,7 @@ public class TestWorkbookEvaluator {
Cell B1 = row.createCell(1);
Cell C1 = row.createCell(2);
Cell D1 = row.createCell(3);
-
+
switch (a1CellType) {
case NUMERIC:
svn commit: r1884783 [14/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/excelan
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java
Thu Dec 24 18:42:29 2020
@@ -25,7 +25,7 @@ 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;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTTable;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTTableColumn;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTTableStyleInfo;
@@ -38,10 +38,11 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
-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;
public final class TestXSSFTable {
@@ -72,11 +73,11 @@ public final class TestXSSFTable {
CTTable ctTable =
wb2.getSheetAt(0).getTables().get(0).getCTTable();
CTTableColumn[] ctTableColumnArray =
ctTable.getTableColumns().getTableColumnArray();
-assertEquals("number of headers in xml table should match number
of header cells in worksheet",
-headers.size(), ctTableColumnArray.length);
+assertEquals(headers.size(), ctTableColumnArray.length,
+"number of headers in xml table should match number of header
cells in worksheet");
for (int i = 0; i < headers.size(); i++) {
-assertEquals("header name in xml table should match number of
header cells in worksheet",
-headers.get(i), ctTableColumnArray[i].getName());
+assertEquals(headers.get(i), ctTableColumnArray[i].getName(),
+"header name in xml table should match number of header
cells in worksheet");
}
assertTrue(outputFile.delete());
wb2.close();
@@ -101,17 +102,15 @@ public final class TestXSSFTable {
XSSFWorkbook inputWorkbook =
XSSFTestDataSamples.writeOutAndReadBack(outputWorkbook);
List tables = inputWorkbook.getSheetAt(0).getTables();
-assertEquals("Tables number", 1, tables.size());
+assertEquals(1, tables.size(), "Tables number");
XSSFTable inputTable = tables.get(0);
-assertEquals("Table display name", outputTable.getDisplayName(),
inputTable.getDisplayName());
+assertEquals(outputTable.getDisplayName(),
inputTable.getDisplayName(), "Table display name");
CTTableStyleInfo inputStyleInfo =
inputTable.getCTTable().getTableStyleInfo();
-assertEquals("Style name", outputStyleInfo.getName(),
inputStyleInfo.getName());
-assertEquals("Show column stripes",
-outputStyleInfo.getShowColumnStripes(),
inputStyleInfo.getShowColumnStripes());
-assertEquals("Show row stripes",
-outputStyleInfo.getShowRowStripes(),
inputStyleInfo.getShowRowStripes());
+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();
@@ -123,12 +122,11 @@ public final class TestXSSFTable {
XSSFTable table = wb.getTable("\\_Prime.1");
assertNotNull(table);
-assertEquals("column header has special escaped characters",
-0, table.findColumnIndex("calc='#*'#"));
+assertEquals(0, table.findColumnIndex("calc='#*'#"), "column
header has special escaped characters");
assertEquals(1, table.findColumnIndex("Name"));
assertEquals(2, table.findColumnIndex("Number"));
-assertEquals("case insensitive", 2,
table.findColumnIndex("NuMbEr"));
+assertEquals(2, table.findColumnIndex("NuMbEr"), "case
insensitive");
// findColumnIndex should return -1 if no column header name
matches
assertEquals(-1,
svn commit: r1884783 [13/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/excelan
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
Thu Dec 24 18:42:29 2020
@@ -17,15 +17,17 @@
package org.apache.poi.xssf.usermodel;
+import static java.util.concurrent.TimeUnit.SECONDS;
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.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-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.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.util.Arrays;
@@ -55,6 +57,7 @@ import org.apache.poi.ss.usermodel.Index
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.util.AreaReference;
import org.apache.poi.ss.util.CellAddress;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.ss.util.CellReference;
@@ -67,7 +70,8 @@ import org.apache.poi.xssf.model.Comment
import org.apache.poi.xssf.model.StylesTable;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.apache.poi.xssf.usermodel.helpers.ColumnHelper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCalcPr;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCell;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCol;
@@ -289,8 +293,8 @@ public final class TestXSSFSheet extends
sheet.removeMergedRegion(1);
sheet.removeMergedRegion(0);
assertEquals(0, sheet.getNumMergedRegions());
-assertNull(" CTMergeCells should be deleted after removing the last
merged " +
-"region on the sheet.",
sheet.getCTWorksheet().getMergeCells());
+assertNull(sheet.getCTWorksheet().getMergeCells(),
+"CTMergeCells should be deleted after removing the last merged
region on the sheet.");
assertEquals(0, sheet.addMergedRegion(region_1));
assertEquals(1, sheet.addMergedRegion(region_2));
assertEquals(2, sheet.addMergedRegion(region_3));
@@ -415,23 +419,20 @@ public final class TestXSSFSheet extends
workbook.close();
}
-@Test(expected=IllegalArgumentException.class)
+@Test
public void setZoom() throws IOException {
-XSSFWorkbook workBook = new XSSFWorkbook();
-XSSFSheet sheet1 = workBook.createSheet("new sheet");
-sheet1.setZoom(75); // 75 percent magnification
-long zoom =
sheet1.getCTWorksheet().getSheetViews().getSheetViewArray(0).getZoomScale();
-assertEquals(zoom, 75);
-
-sheet1.setZoom(200);
-zoom =
sheet1.getCTWorksheet().getSheetViews().getSheetViewArray(0).getZoomScale();
-assertEquals(zoom, 200);
-
-// Valid scale values range from 10 to 400
-try {
-sheet1.setZoom(500);
-} finally {
-workBook.close();
+try (XSSFWorkbook workBook = new XSSFWorkbook()) {
+XSSFSheet sheet1 = workBook.createSheet("new sheet");
+sheet1.setZoom(75); // 75 percent magnification
+long zoom =
sheet1.getCTWorksheet().getSheetViews().getSheetViewArray(0).getZoomScale();
+assertEquals(zoom, 75);
+
+sheet1.setZoom(200);
+zoom =
sheet1.getCTWorksheet().getSheetViews().getSheetViewArray(0).getZoomScale();
+assertEquals(zoom, 200);
+
+// Valid scale values range from 10 to 400
+assertThrows(IllegalArgumentException.class, () ->
sheet1.setZoom(500));
}
}
@@ -443,118 +444,117 @@ public final class TestXSSFSheet extends
*/
@Test
public void setColumnGroupCollapsed() throws IOException {
-XSSFWorkbook wb1 = new XSSFWorkbook();
-XSSFSheet sheet1 = wb1.createSheet();
svn commit: r1884783 [15/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/excelan
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java
Thu Dec 24 18:42:29 2020
@@ -16,27 +16,27 @@
*/
package org.apache.poi.xwpf.usermodel;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import java.io.IOException;
import java.math.BigInteger;
import java.util.List;
import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFtnEdnRef;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR;
public class TestXWPFEndnote {
-
+
private XWPFDocument docOut;
private String p1Text;
private String p2Text;
private BigInteger endnoteId;
private XWPFEndnote endnote;
-@Before
+@BeforeEach
public void setUp() {
docOut = new XWPFDocument();
p1Text = "First paragraph in footnote";
@@ -46,115 +46,112 @@ public class TestXWPFEndnote {
// to XWPFEndnotes.createEndnote() so this tests
// both creation of new XWPFEndnotes in document
// and XWPFEndnotes.createEndnote();
-
+
// NOTE: Creating the endnote does not automatically
// create a first paragraph.
endnote = docOut.createEndnote();
endnoteId = endnote.getId();
-
+
}
@Test
public void testAddParagraphsToFootnote() throws IOException {
-// Add a run to the first paragraph:
-
+// Add a run to the first paragraph:
+
XWPFParagraph p1 = endnote.createParagraph();
p1.createRun().setText(p1Text);
-
+
// Create a second paragraph:
-
+
XWPFParagraph p = endnote.createParagraph();
-assertNotNull("Paragraph is null", p);
+assertNotNull(p, "Paragraph is null");
p.createRun().setText(p2Text);
XWPFDocument docIn = XWPFTestDataSamples.writeOutAndReadBack(docOut);
-
+
XWPFEndnote testEndnote = docIn.getEndnoteByID(endnoteId.intValue());
assertNotNull(testEndnote);
-
+
assertEquals(2, testEndnote.getParagraphs().size());
XWPFParagraph testP1 = testEndnote.getParagraphs().get(0);
assertEquals(p1Text, testP1.getText());
XWPFParagraph testP2 = testEndnote.getParagraphs().get(1);
-assertEquals(p2Text, testP2.getText());
-
+assertEquals(p2Text, testP2.getText());
+
// The first paragraph added using createParagraph() should
// have the required footnote reference added to the first
// run.
-
+
// Verify that we have a footnote reference in the first paragraph and
not
// in the second paragraph.
-
+
XWPFRun r1 = testP1.getRuns().get(0);
assertNotNull(r1);
-assertTrue("No endnote reference in testP1",
r1.getCTR().getEndnoteRefList().size() > 0);
-assertNotNull("No endnote reference in testP1",
r1.getCTR().getEndnoteRefArray(0));
+assertTrue(r1.getCTR().getEndnoteRefList().size() > 0, "No endnote
reference in testP1");
+assertNotNull(r1.getCTR().getEndnoteRefArray(0), "No endnote reference
in testP1");
XWPFRun r2 = testP2.getRuns().get(0);
-assertNotNull("Expected a run in testP2", r2);
-assertEquals("Found an endnote reference in testP2", 0,
r2.getCTR().getEndnoteRefList().size());
-
+assertNotNull(r2, "Expected a run in testP2");
+assertEquals(0, r2.getCTR().getEndnoteRefList().size(), "Found an
endnote reference in testP2");
+
}
-
+
@Test
public void testAddTableToFootnote() throws IOException {
XWPFTable table = endnote.createTable();
assertNotNull(table);
-
+
XWPFDocument docIn = XWPFTestDataSamples.writeOutAndReadBack(docOut);
-
+
XWPFEndnote testFootnote = docIn.getEndnoteByID(endnoteId.intValue());
XWPFTable testTable = testFootnote.getTableArray(0);
assertNotNull(testTable);
-
+
table = endnote.createTable(2, 3);
assertEquals(2, table.getNumberOfRows());
assertEquals(3, table.getRow(0).getTableCells().size());
-
+
// If the table is the first body element of the footnote then
// a paragraph with the footnote reference
svn commit: r1884783 [22/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/excelan
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java?rev=1884783=1884782=1884783=diff
==
--- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
Thu Dec 24 18:42:29 2020
@@ -17,11 +17,14 @@
package org.apache.poi.hssf.model;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
import java.util.Locale;
@@ -48,7 +51,7 @@ import org.apache.poi.ss.usermodel.Formu
import org.apache.poi.ss.usermodel.Name;
import org.apache.poi.util.HexRead;
import org.apache.poi.util.LittleEndianByteArrayInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test the low level formula parser functionality. High level tests are to
@@ -61,7 +64,7 @@ public final class TestFormulaParser {
*/
/* package */ static Ptg[] parseFormula(String formula) {
Ptg[] result = HSSFFormulaParser.parse(formula, null);
-assertNotNull("Ptg array should not be null", result);
+assertNotNull(result, "Ptg array should not be null");
return result;
}
private static String toFormulaString(Ptg[] ptgs) {
@@ -279,18 +282,18 @@ public final class TestFormulaParser {
String value = " hi ";
Ptg[] ptgs = parseFormula("\"" + value + "\"");
confirmTokenClasses(ptgs, StringPtg.class);
-assertEquals("ptg0 contains exact value", ((StringPtg)
ptgs[0]).getValue(), value);
+assertEquals(((StringPtg) ptgs[0]).getValue(), value, "ptg0 contains
exact value");
}
@Test
public void testLookupAndMatchFunctionArgs() {
Ptg[] ptgs = parseFormula("lookup(A1, A3:A52, B3:B52)");
confirmTokenClasses(ptgs, RefPtg.class, AreaPtg.class, AreaPtg.class,
FuncVarPtg.class);
-assertEquals("ptg0 has Value class", ptgs[0].getPtgClass(),
Ptg.CLASS_VALUE);
+assertEquals(ptgs[0].getPtgClass(), Ptg.CLASS_VALUE, "ptg0 has Value
class");
ptgs = parseFormula("match(A1, A3:A52)");
confirmTokenClasses(ptgs, RefPtg.class, AreaPtg.class,
FuncVarPtg.class);
-assertEquals("ptg0 has Value class", ptgs[0].getPtgClass(),
Ptg.CLASS_VALUE);
+assertEquals(ptgs[0].getPtgClass(), Ptg.CLASS_VALUE, "ptg0 has Value
class");
}
/** bug 33160*/
@@ -394,63 +397,63 @@ public final class TestFormulaParser {
cell.setCellFormula("1.3E21/3");
formula = cell.getCellFormula();
-assertEquals("Exponential formula string", "1.3E+21/3", formula);
+assertEquals("1.3E+21/3", formula);
cell.setCellFormula("-1.3E21/3");
formula = cell.getCellFormula();
-assertEquals("Exponential formula string", "-1.3E+21/3", formula);
+assertEquals("-1.3E+21/3", formula);
cell.setCellFormula("1322E21/3");
formula = cell.getCellFormula();
-assertEquals("Exponential formula string", "1.322E+24/3", formula);
+assertEquals("1.322E+24/3", formula);
cell.setCellFormula("-1322E21/3");
formula = cell.getCellFormula();
-assertEquals("Exponential formula string", "-1.322E+24/3", formula);
+assertEquals("-1.322E+24/3", formula);
cell.setCellFormula("1.3E1/3");
formula = cell.getCellFormula();
-assertEquals("Exponential formula string", "13/3", formula);
+assertEquals("13/3", formula);
cell.setCellFormula("-1.3E1/3");
formula = cell.getCellFormula();
-assertEquals("Exponential formula string", "-13/3", formula);
+assertEquals("-13/3", formula);
cell.setCellFormula("1.3E-4/3");
formula = cell.getCellFormula();
-assertEquals("Exponential formula string", "0.00013/3", formula);
+assertEquals("0.00013/3", formula);
cell.setCellFormula("-1.3E-4/3");
formula = cell.getCellFormula();
-assertEquals("Exponential formula string", "-0.00013/3", formula);
+assertEquals("-0.00013/3", formula);
cell.setCellFormula("13E-15/3");
svn commit: r1884783 [11/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/excelan
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
Thu Dec 24 18:42:29 2020
@@ -17,16 +17,16 @@
package org.apache.poi.xssf.usermodel;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCol;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCols;
@@ -52,26 +52,26 @@ public class TestXSSFColGrouping {
*/
@Test
public void testNoColsWithoutWidthWhenGrouping() throws IOException {
- XSSFWorkbook wb1 = new XSSFWorkbook();
- XSSFSheet sheet = wb1.createSheet("test");
+ try (XSSFWorkbook wb1 = new XSSFWorkbook()) {
+XSSFSheet sheet = wb1.createSheet("test");
-sheet.setColumnWidth(4, 5000);
-sheet.setColumnWidth(5, 5000);
+sheet.setColumnWidth(4, 5000);
+sheet.setColumnWidth(5, 5000);
-sheet.groupColumn((short) 4, (short) 7);
-sheet.groupColumn((short) 9, (short) 12);
+sheet.groupColumn((short) 4, (short) 7);
+sheet.groupColumn((short) 9, (short) 12);
-XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1,
"testNoColsWithoutWidthWhenGrouping");
-sheet = wb2.getSheet("test");
-
-CTCols cols = sheet.getCTWorksheet().getColsArray(0);
-logger.log(POILogger.DEBUG, "test52186/cols:" + cols);
-for (CTCol col : cols.getColArray()) {
- assertTrue("Col width attribute is unset: " + col,
col.isSetWidth());
- }
+try (XSSFWorkbook wb2 =
XSSFTestDataSamples.writeOutAndReadBack(wb1,
"testNoColsWithoutWidthWhenGrouping")) {
+sheet = wb2.getSheet("test");
-wb2.close();
-wb1.close();
+CTCols cols = sheet.getCTWorksheet().getColsArray(0);
+logger.log(POILogger.DEBUG, "test52186/cols:" + cols);
+for (CTCol col : cols.getColArray()) {
+assertTrue(col.isSetWidth(), "Col width attribute is
unset: " + col);
+}
+
+}
+}
}
/**
@@ -80,31 +80,31 @@ public class TestXSSFColGrouping {
*/
@Test
public void testNoColsWithoutWidthWhenGroupingAndCollapsing() throws
IOException {
- XSSFWorkbook wb1 = new XSSFWorkbook();
- XSSFSheet sheet = wb1.createSheet("test");
-
-sheet.setColumnWidth(4, 5000);
-sheet.setColumnWidth(5, 5000);
-
-sheet.groupColumn((short) 4, (short) 5);
-
-sheet.setColumnGroupCollapsed(4, true);
+ try (XSSFWorkbook wb1 = new XSSFWorkbook()) {
+XSSFSheet sheet = wb1.createSheet("test");
-CTCols cols = sheet.getCTWorksheet().getColsArray(0);
-logger.log(POILogger.DEBUG, "test52186_2/cols:" + cols);
+sheet.setColumnWidth(4, 5000);
+sheet.setColumnWidth(5, 5000);
-XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1,
"testNoColsWithoutWidthWhenGroupingAndCollapsing");
-sheet = wb2.getSheet("test");
+sheet.groupColumn((short) 4, (short) 5);
-for (int i = 4; i <= 5; i++) {
- assertEquals("Unexpected width of column "+ i, 5000,
sheet.getColumnWidth(i));
+sheet.setColumnGroupCollapsed(4, true);
+
+CTCols cols = sheet.getCTWorksheet().getColsArray(0);
+logger.log(POILogger.DEBUG, "test52186_2/cols:" + cols);
+
+try (XSSFWorkbook wb2 =
XSSFTestDataSamples.writeOutAndReadBack(wb1,
"testNoColsWithoutWidthWhenGroupingAndCollapsing")) {
+sheet = wb2.getSheet("test");
+
+for (int i = 4; i <= 5; i++) {
+assertEquals(5000, sheet.getColumnWidth(i), "Unexpected
width of column " + i);
+}
+cols = sheet.getCTWorksheet().getColsArray(0);
+for (CTCol col : cols.getColArray()) {
+assertTrue(col.isSetWidth(), "Col width attribute is
unset: " +
svn commit: r1884783 [2/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
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1884783=1884782=1884783=diff
==
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Thu Dec 24 18:42:29 2020
@@ -96,7 +96,7 @@ under the License.
-
+
@@ -271,7 +271,16 @@ under the License.
-
+
+
+
+
+
+
+
+
+
+
@@ -409,7 +418,14 @@ under the License.
-
+
+
+
+
+
+
+
+
@@ -507,9 +523,9 @@ under the License.
-
-
-
+
+
+
@@ -611,6 +627,7 @@ under the License.
+
@@ -640,7 +657,14 @@ under the License.
-
+
+
+
+
+
+
+
+
@@ -679,7 +703,14 @@ under the License.
-
+
+
+
+
+
+
+
+
@@ -1147,6 +1178,9 @@ under the License.
+
+
+
@@ -1166,6 +1200,23 @@ under the License.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1179,32 +1230,64 @@ under the License.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
@@ -1222,20 +1305,16 @@ under the License.
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -1461,19 +1540,15 @@ under the License.
-
-
-
-
-
-
-
-
-
-
-
-
+ modulepath-ref="test-main.modules" module1="poi"
outputDir="${main.reports.test}">
+
+
+
+
+
+
+
+
@@ -1521,17 +1596,13 @@ under the License.
-
-
-
-
-
-
-
-
-
-
+ modulepath-ref="test-scratchpad.modules" module1="scratchpad"
outputDir="${scratchpad.reports.test}">
+
+
+
+
+
svn commit: r1884783 [39/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/excelan
Modified: poi/trunk/src/testcases/org/apache/poi/util/TestArrayUtil.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestArrayUtil.java?rev=1884783=1884782=1884783=diff
==
--- poi/trunk/src/testcases/org/apache/poi/util/TestArrayUtil.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/util/TestArrayUtil.java Thu Dec 24
18:42:29 2020
@@ -18,12 +18,12 @@
package org.apache.poi.util;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.util.Arrays;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Unit test for ArrayUtil
@@ -83,19 +83,11 @@ public class TestArrayUtil {
}
// Check can't shift more than we have
- try {
- ArrayUtil.arrayMoveWithin(getIntsList(), 7, 3, 5);
- fail();
- } catch(IllegalArgumentException e) {
- // Good, we don't have 5 from 7 onwards
- }
+ assertThrows(IllegalArgumentException.class, () ->
ArrayUtil.arrayMoveWithin(getIntsList(), 7, 3, 5));
+ // Good, we don't have 5 from 7 onwards
// Check can't shift where would overshoot
- try {
- ArrayUtil.arrayMoveWithin(getIntsList(), 2, 7, 5);
- fail();
- } catch(IllegalArgumentException e) {
- // Good, we can't fit 5 in starting at 7
- }
+ assertThrows(IllegalArgumentException.class, () ->
ArrayUtil.arrayMoveWithin(getIntsList(), 2, 7, 5));
+ // Good, we can't fit 5 in starting at 7
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/util/TestBitField.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestBitField.java?rev=1884783=1884782=1884783=diff
==
--- poi/trunk/src/testcases/org/apache/poi/util/TestBitField.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/util/TestBitField.java Thu Dec 24
18:42:29 2020
@@ -17,11 +17,11 @@
package org.apache.poi.util;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Class to test BitField functionality
Modified: poi/trunk/src/testcases/org/apache/poi/util/TestByteField.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestByteField.java?rev=1884783=1884782=1884783=diff
==
--- poi/trunk/src/testcases/org/apache/poi/util/TestByteField.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/util/TestByteField.java Thu Dec 24
18:42:29 2020
@@ -18,13 +18,13 @@
package org.apache.poi.util;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Unit test for ByteField class
@@ -86,11 +86,11 @@ public final class TestByteField {
for (int j = 0; j < _test_array.length; j++) {
field.set(_test_array[ j ]);
-assertEquals("testing _1 " + j, _test_array[ j ], field.get());
+assertEquals(_test_array[ j ], field.get(), "testing _1 " + j);
field = new ByteField(0);
field.set(_test_array[ j ], array);
-assertEquals("testing _2 ", _test_array[ j ], field.get());
-assertEquals("testing _3 ", _test_array[ j ], array[ 0 ]);
+assertEquals(_test_array[ j ], field.get(), "testing _2 ");
+assertEquals(_test_array[ j ], array[ 0 ], "testing _3 ");
}
}
@@ -109,7 +109,7 @@ public final class TestByteField {
for (int j = 0; j < _test_array.length; j++) {
array[ 0 ] = _test_array[ j ];
field.readFromBytes(array);
-assertEquals("testing " + j, _test_array[ j ], field.get());
+assertEquals(_test_array[ j ], field.get(), "testing " + j);
}
}
@@ -120,7 +120,7 @@ public final class TestByteField {
for (int j = 0; j < _test_array.length; j++) {
field.readFromStream(stream);
-
svn commit: r1884783 [38/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/excelan
Modified: poi/trunk/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java?rev=1884783=1884782=1884783=diff
==
--- poi/trunk/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java Thu
Dec 24 18:42:29 2020
@@ -5,9 +5,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,11 +17,12 @@
package org.apache.poi.ss.util;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.util.HashMap;
@@ -39,7 +40,7 @@ import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.VerticalAlignment;
import org.apache.poi.ss.usermodel.Workbook;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests Spreadsheet CellUtil
@@ -52,30 +53,29 @@ public abstract class BaseTestCellUtil {
protected BaseTestCellUtil(ITestDataProvider testDataProvider) {
_testDataProvider = testDataProvider;
}
-
+
@Test
public void setCellStyleProperty() throws IOException {
-Workbook wb = _testDataProvider.createWorkbook();
-Sheet s = wb.createSheet();
-Row r = s.createRow(0);
-Cell c = r.createCell(0);
-
-// Add a border should create a new style
-int styCnt1 = wb.getNumCellStyles();
-CellUtil.setCellStyleProperty(c, CellUtil.BORDER_BOTTOM,
BorderStyle.THIN);
-int styCnt2 = wb.getNumCellStyles();
-assertEquals(styCnt1+1, styCnt2);
-
-// Add same border to another cell, should not create another style
-c = r.createCell(1);
-CellUtil.setCellStyleProperty(c, CellUtil.BORDER_BOTTOM,
BorderStyle.THIN);
-int styCnt3 = wb.getNumCellStyles();
-assertEquals(styCnt2, styCnt3);
+try (Workbook wb = _testDataProvider.createWorkbook()) {
+Sheet s = wb.createSheet();
+Row r = s.createRow(0);
+Cell c = r.createCell(0);
-wb.close();
+// Add a border should create a new style
+int styCnt1 = wb.getNumCellStyles();
+CellUtil.setCellStyleProperty(c, CellUtil.BORDER_BOTTOM,
BorderStyle.THIN);
+int styCnt2 = wb.getNumCellStyles();
+assertEquals(styCnt1 + 1, styCnt2);
+
+// Add same border to another cell, should not create another style
+c = r.createCell(1);
+CellUtil.setCellStyleProperty(c, CellUtil.BORDER_BOTTOM,
BorderStyle.THIN);
+int styCnt3 = wb.getNumCellStyles();
+assertEquals(styCnt2, styCnt3);
+}
}
-
-@Test(expected=RuntimeException.class)
+
+@Test
public void setCellStylePropertyWithInvalidValue() throws IOException {
try (Workbook wb = _testDataProvider.createWorkbook()) {
Sheet s = wb.createSheet();
@@ -83,127 +83,120 @@ public abstract class BaseTestCellUtil {
Cell c = r.createCell(0);
// An invalid BorderStyle constant
-CellUtil.setCellStyleProperty(c, CellUtil.BORDER_BOTTOM, 42);
+assertThrows(RuntimeException.class, () ->
CellUtil.setCellStyleProperty(c, CellUtil.BORDER_BOTTOM, 42));
}
}
-
+
@Test()
public void setCellStylePropertyBorderWithShortAndEnum() throws
IOException {
-Workbook wb = _testDataProvider.createWorkbook();
-Sheet s = wb.createSheet();
-Row r = s.createRow(0);
-Cell c = r.createCell(0);
-
-// A valid BorderStyle constant, as a Short
-CellUtil.setCellStyleProperty(c, CellUtil.BORDER_BOTTOM,
BorderStyle.DASH_DOT.getCode());
-assertEquals(BorderStyle.DASH_DOT, c.getCellStyle().getBorderBottom());
-
-// A valid BorderStyle constant, as an Enum
-
svn commit: r1884783 [10/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/excelan
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java
Thu Dec 24 18:42:29 2020
@@ -17,14 +17,15 @@
package org.apache.poi.xssf.usermodel;
-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.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import java.util.Locale;
+import java.util.stream.Stream;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.functions.BaseTestNumeric;
@@ -38,14 +39,11 @@ import org.apache.poi.util.LocaleUtil;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.junit.AfterClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
-@RunWith(Parameterized.class)
public final class TestMatrixFormulasFromXMLSpreadsheet {
private static final POILogger LOG =
POILogFactory.getLogger(TestMatrixFormulasFromXMLSpreadsheet.class);
@@ -96,21 +94,15 @@ public final class TestMatrixFormulasFro
}
-/* Parameters for test case */
-@Parameter(0)
-public String targetFunctionName;
-@Parameter(1)
-public int formulasRowIdx;
-@AfterClass
+@AfterAll
public static void closeResource() throws Exception {
LocaleUtil.setUserLocale(userLocale);
workbook.close();
}
/* generating parameter instances */
-@Parameters(name="{0}")
-public static Collection data() throws Exception {
+public static Stream data() throws Exception {
// Function "Text" uses custom-formats which are locale specific
// can't set the locale on a per-testrun execution, as some settings
have been
// already set, when we would try to change the locale by then
@@ -121,11 +113,11 @@ public final class TestMatrixFormulasFro
sheet = workbook.getSheetAt(0);
evaluator = new XSSFFormulaEvaluator(workbook);
-List data = new ArrayList();
+List data = new ArrayList<>();
processFunctionGroup(data, Navigator.START_OPERATORS_ROW_INDEX, null);
-return data;
+return data.stream();
}
/**
@@ -133,25 +125,27 @@ public final class TestMatrixFormulasFro
* @param testFocusFunctionName name of a single function/operator to test
alone.
* Typically pass null to test all functions
*/
-private static void processFunctionGroup(List data, int
startRowIndex, String testFocusFunctionName) {
+private static void processFunctionGroup(List data, int
startRowIndex, String testFocusFunctionName) {
for (int rowIndex = startRowIndex; true; rowIndex +=
Navigator.ROW_OFF_NEXT_OP) {
Row r = sheet.getRow(rowIndex);
String targetFunctionName = getTargetFunctionName(r);
-assertNotNull("Test spreadsheet cell empty on row ("
-+ (rowIndex) + "). Expected function name or '"
-+ Navigator.END_OF_TESTS + "'", targetFunctionName);
+assertNotNull(targetFunctionName,
+"Test spreadsheet cell empty on row ("
++ (rowIndex) + "). Expected function name or '"
++ Navigator.END_OF_TESTS + "'");
if(targetFunctionName.equals(Navigator.END_OF_TESTS)) {
// found end of functions list
break;
}
if(testFocusFunctionName == null ||
targetFunctionName.equalsIgnoreCase(testFocusFunctionName)) {
-data.add(new Object[]{targetFunctionName, rowIndex});
+data.add(Arguments.of(targetFunctionName, rowIndex));
}
}
}
-@Test
-public void processFunctionRow() {
+@ParameterizedTest
+@MethodSource("data")
+public void processFunctionRow(String
svn commit: r1884783 [40/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/excelan
Modified: poi/trunk/src/testcases/org/apache/poi/util/TestTempFile.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestTempFile.java?rev=1884783=1884782=1884783=diff
==
--- poi/trunk/src/testcases/org/apache/poi/util/TestTempFile.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/util/TestTempFile.java Thu Dec 24
18:42:29 2020
@@ -16,11 +16,11 @@
*/
package org.apache.poi.util;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.FileOutputStream;
@@ -28,20 +28,20 @@ import java.io.IOException;
import java.util.Arrays;
import org.apache.poi.poifs.dev.TestPOIFSDump;
-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;
public class TestTempFile {
private String previousTempDir;
private File tempDir;
-@Before
+@BeforeEach
public void setUp() throws IOException {
previousTempDir = System.getProperty(TempFile.JAVA_IO_TMPDIR);
if(previousTempDir != null) {
-assertTrue("Failed to create directory " + previousTempDir,
-new File(previousTempDir).exists() || new
File(previousTempDir).mkdirs());
+assertTrue(new File(previousTempDir).exists() || new
File(previousTempDir).mkdirs(),
+"Failed to create directory " + previousTempDir);
}
// use a separate tempdir for the tests to be able to check for
leftover files
@@ -51,19 +51,19 @@ public class TestTempFile {
System.setProperty(TempFile.JAVA_IO_TMPDIR, tempDir.getAbsolutePath());
}
-@After
+@AfterEach
public void tearDown() throws IOException {
if(tempDir != null) {
String[] files = tempDir.list();
assertNotNull(files);
// can have the "poifiles" subdir
if (files.length == 1) {
-assertEquals("Had: " + Arrays.toString(files),
DefaultTempFileCreationStrategy.POIFILES, files[0]);
+assertEquals(DefaultTempFileCreationStrategy.POIFILES,
files[0], "Had: " + Arrays.toString(files));
files = new File(tempDir, files[0]).list();
assertNotNull(files);
-assertEquals("Had: " + Arrays.toString(files), 0,
files.length);
+assertEquals(0, files.length, "Had: " +
Arrays.toString(files));
} else {
-assertEquals("Had: " + Arrays.toString(files), 0,
files.length);
+assertEquals(0, files.length, "Had: " +
Arrays.toString(files));
}
// remove the directory after the tests
@@ -92,41 +92,35 @@ public class TestTempFile {
FileOutputStream fos = new FileOutputStream(tempFile);
fos.write(1); //file can be written to
fos.close();
-assertTrue("temp file exists", tempFile.exists());
-assertTrue("temp file is a file", tempFile.isFile());
-assertTrue("temp file's name should start with test",
-tempFile.getName().startsWith("test"));
-assertTrue("temp file's name should end with .txt",
-tempFile.getName().endsWith(".txt"));
-assertEquals("temp file is saved in poifiles directory",
-DefaultTempFileCreationStrategy.POIFILES,
tempFile.getParentFile().getName());
+assertTrue(tempFile.exists());
+assertTrue(tempFile.isFile());
+assertTrue(tempFile.getName().startsWith("test"));
+assertTrue(tempFile.getName().endsWith(".txt"));
+assertEquals(DefaultTempFileCreationStrategy.POIFILES,
tempFile.getParentFile().getName());
// Can't think of a good way to check whether a file is actually
deleted since it would require the VM to stop.
// Solution: set TempFileCreationStrategy to something that the unit
test can trigger a deletion"
-assertTrue("Unable to delete temp file", tempFile.delete());
+assertTrue(tempFile.delete());
}
@Test
public void createTempFileWithDefaultSuffix() throws IOException {
File tempFile = TempFile.createTempFile("test", null);
-assertTrue("temp file's name should end with .tmp",
-
svn commit: r1884783 [32/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/excelan
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java
Thu Dec 24 18:42:29 2020
@@ -17,8 +17,10 @@
package org.apache.poi.ss.formula.function;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import java.lang.reflect.InvocationTargetException;
@@ -26,9 +28,9 @@ import org.apache.poi.hssf.HSSFTestDataS
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.util.RecordFormatException;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Tests reading from a sample spreadsheet some built-in functions that were
not properly
@@ -44,7 +46,7 @@ public final class TestReadMissingBuiltI
private static HSSFWorkbook wb;
private static HSSFSheet _sheet;
- @BeforeClass
+ @BeforeAll
public static void initSheet() {
wb =
HSSFTestDataSamples.openSampleWorkbook(SAMPLE_SPREADSHEET_FILE_NAME);
try {
@@ -54,9 +56,8 @@ public final class TestReadMissingBuiltI
InvocationTargetException ite = (InvocationTargetException)
e.getCause();
if(ite.getTargetException() instanceof RuntimeException) {
RuntimeException re = (RuntimeException)
ite.getTargetException();
-if(re.getMessage().equals("Invalid built-in function index
(189)")) {
-fail("DPRODUCT() registered with wrong index");
-}
+ assertNotEquals("Invalid built-in
function index (189)", re.getMessage(),
+ "DPRODUCT() registered with
wrong index");
}
}
// some other unexpected error
@@ -64,7 +65,7 @@ public final class TestReadMissingBuiltI
}
}
- @AfterClass
+ @AfterAll
public static void closeResources() throws Exception {
wb.close();
}
@@ -76,9 +77,8 @@ public final class TestReadMissingBuiltI
formula = getCellFormula(0);
} catch (IllegalStateException e) {
if(e.getMessage().startsWith("Too few arguments")) {
- if(e.getMessage().indexOf("AttrPtg") > 0) {
- fail("tAttrVolatile not supported in
FormulaParser.toFormulaString");
- }
+ assertFalse(e.getMessage().contains("AttrPtg"),
+ "tAttrVolatile not supported in
FormulaParser.toFormulaString");
fail("NOW() registered with 1 arg instead of
0");
}
if(e.getMessage().startsWith("too much stuff")) {
@@ -89,31 +89,25 @@ public final class TestReadMissingBuiltI
}
assertEquals("DATEDIF(NOW(),NOW(),\"d\")", formula);
}
-
+
@Test
public void testDdb() {
String formula = getCellFormula(1);
- if("externalflag(1,1,1,1,1)".equals(formula)) {
- fail("DDB() not registered");
- }
+ assertNotEquals("externalflag(1,1,1,1,1)", formula, "DDB() not
registered");
assertEquals("DDB(1,1,1,1,1)", formula);
}
-
+
@Test
public void testAtan() {
String formula = getCellFormula(2);
- if("ARCTAN(1)".equals(formula)) {
- fail("func ix 18 registered as ARCTAN() instead of
ATAN()");
- }
+ assertNotEquals("ARCTAN(1)", formula, "func ix 18 registered as
ARCTAN() instead of ATAN()");
assertEquals("ATAN(1)", formula);
}
@Test
public void testUsdollar() {
String formula = getCellFormula(3);
- if("YEN(1)".equals(formula)) {
- fail("func ix 204 registered as YEN() instead of
USDOLLAR()");
- }
+ assertNotEquals("YEN(1)", formula, "func
svn commit: r1884783 [17/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/excelan
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java
Thu Dec 24 18:42:29 2020
@@ -17,14 +17,14 @@
package org.apache.poi.hslf.record;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests that Document works properly (Also tests Environment while we're at
it)
@@ -37,7 +37,7 @@ public final class TestDocument {
// POIFS primed on the test data
private POIFSFileSystem pfs;
- @Before
+ @BeforeEach
public void setup() throws Exception {
pfs = new
POIFSFileSystem(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
ss = new HSLFSlideShowImpl(pfs);
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java
Thu Dec 24 18:42:29 2020
@@ -18,14 +18,14 @@
package org.apache.poi.hslf.record;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayOutputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests that DocumentAtom works properly
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java
Thu Dec 24 18:42:29 2020
@@ -18,11 +18,10 @@
package org.apache.poi.hslf.record;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -35,7 +34,6 @@ import org.apache.poi.hpsf.DocumentSumma
import org.apache.poi.hpsf.PropertySet;
import org.apache.poi.hpsf.PropertySetFactory;
import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hslf.exceptions.EncryptedPowerPointFileException;
import org.apache.poi.hslf.usermodel.HSLFPictureData;
import org.apache.poi.hslf.usermodel.HSLFSlide;
import org.apache.poi.hslf.usermodel.HSLFSlideShow;
@@ -48,7 +46,9 @@ import org.apache.poi.poifs.crypt.HashAl
import org.apache.poi.poifs.crypt.cryptoapi.CryptoAPIDecryptor;
import org.apache.poi.poifs.crypt.cryptoapi.CryptoAPIEncryptionHeader;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
/**
* Tests that DocumentEncryption works properly.
@@ -56,23 +56,18 @@ import org.junit.Test;
public class TestDocumentEncryption {
private static final POIDataSamples slTests =
POIDataSamples.getSlideShowInstance();
svn commit: r1884783 [29/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/excelan
Modified:
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSStream.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSStream.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSStream.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSStream.java
Thu Dec 24 18:42:29 2020
@@ -20,12 +20,14 @@ package org.apache.poi.poifs.filesystem;
import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.IsEqual.equalTo;
-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 static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -52,2803 +54,2740 @@ import org.apache.poi.poifs.storage.BATB
import org.apache.poi.poifs.storage.HeaderBlock;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.TempFile;
-import org.junit.Assume;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Tests {@link POIFSStream}
*/
public final class TestPOIFSStream {
- private static final POIDataSamples _inst =
POIDataSamples.getPOIFSInstance();
+private static final POIDataSamples _inst =
POIDataSamples.getPOIFSInstance();
- /**
-* Read a single block stream
-*/
- @Test
- public void testReadTinyStream() throws Exception {
- POIFSFileSystem fs = new
POIFSFileSystem(_inst.getFile("BlockSize512.zvi"));
-
- // 98 is actually the last block in a two block stream...
- POIFSStream stream = new POIFSStream(fs, 98);
- Iterator i = stream.getBlockIterator();
- assertTrue(i.hasNext());
- ByteBuffer b = i.next();
- assertFalse(i.hasNext());
-
- // Check the contents
- assertEquals((byte)0x81, b.get());
- assertEquals((byte)0x00, b.get());
- assertEquals((byte)0x00, b.get());
- assertEquals((byte)0x00, b.get());
- assertEquals((byte)0x82, b.get());
- assertEquals((byte)0x00, b.get());
- assertEquals((byte)0x00, b.get());
- assertEquals((byte)0x00, b.get());
-
- fs.close();
- }
-
- /**
-* Read a stream with only two blocks in it
-*/
- @Test
- public void testReadShortStream() throws Exception {
- POIFSFileSystem fs = new
POIFSFileSystem(_inst.getFile("BlockSize512.zvi"));
-
- // 97 -> 98 -> end
- POIFSStream stream = new POIFSStream(fs, 97);
- Iterator i = stream.getBlockIterator();
- assertTrue(i.hasNext());
- ByteBuffer b97 = i.next();
- assertTrue(i.hasNext());
- ByteBuffer b98 = i.next();
- assertFalse(i.hasNext());
-
- // Check the contents of the 1st block
- assertEquals((byte)0x01, b97.get());
- assertEquals((byte)0x00, b97.get());
- assertEquals((byte)0x00, b97.get());
- assertEquals((byte)0x00, b97.get());
- assertEquals((byte)0x02, b97.get());
- assertEquals((byte)0x00, b97.get());
- assertEquals((byte)0x00, b97.get());
- assertEquals((byte)0x00, b97.get());
-
- // Check the contents of the 2nd block
- assertEquals((byte)0x81, b98.get());
- assertEquals((byte)0x00, b98.get());
- assertEquals((byte)0x00, b98.get());
- assertEquals((byte)0x00, b98.get());
- assertEquals((byte)0x82, b98.get());
- assertEquals((byte)0x00, b98.get());
- assertEquals((byte)0x00, b98.get());
- assertEquals((byte)0x00, b98.get());
-
- fs.close();
- }
-
- /**
-* Read a stream with many blocks
-*/
- @Test
- public void testReadLongerStream() throws Exception {
- POIFSFileSystem fs = new
POIFSFileSystem(_inst.getFile("BlockSize512.zvi"));
-
- ByteBuffer b0 = null;
- ByteBuffer b1 = null;
- ByteBuffer b22 = null;
-
- // The stream at 0 has 23 blocks in it
- POIFSStream stream = new POIFSStream(fs, 0);
- Iterator i = stream.getBlockIterator();
- int count = 0;
- while(i.hasNext()) {
- ByteBuffer b = i.next();
- if(count == 0) {
-b0 = b;
- }
- if(count == 1) {
-b1 = b;
- }
-
svn commit: r1884783 [24/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/excelan
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java?rev=1884783=1884782=1884783=diff == --- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java Thu Dec 24 18:42:29 2020 @@ -19,10 +19,10 @@ package org.apache.poi.hssf.record.chart import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.poi.hssf.record.TestcaseRecordInputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the DefaultDataLabelTextPropertiesRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java?rev=1884783=1884782=1884783=diff == --- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java Thu Dec 24 18:42:29 2020 @@ -19,10 +19,10 @@ package org.apache.poi.hssf.record.chart import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.poi.hssf.record.TestcaseRecordInputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the FontBasisRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java?rev=1884783=1884782=1884783=diff == --- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java Thu Dec 24 18:42:29 2020 @@ -19,10 +19,10 @@ package org.apache.poi.hssf.record.chart import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.poi.hssf.record.TestcaseRecordInputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the FontIndexRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java?rev=1884783=1884782=1884783=diff == --- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java Thu Dec 24 18:42:29 2020 @@ -19,12 +19,12 @@ package org.apache.poi.hssf.record.chart import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.poi.hssf.record.TestcaseRecordInputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the serialization and deserialization of the FrameRecord Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java?rev=1884783=1884782=1884783=diff == --- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java Thu Dec 24 18:42:29 2020 @@ -18,12 +18,12 @@ package org.apache.poi.hssf.record.chart; import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding; -import static
svn commit: r1884783 [21/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/excelan
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java
Thu Dec 24 18:42:29 2020
@@ -17,8 +17,8 @@
package org.apache.poi.hssf.eventmodel;
-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.ByteArrayInputStream;
import java.io.IOException;
@@ -31,7 +31,7 @@ import org.apache.poi.hssf.record.BOFRec
import org.apache.poi.hssf.record.EOFRecord;
import org.apache.poi.hssf.record.Record;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link AbortableHSSFListener}
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
Thu Dec 24 18:42:29 2020
@@ -17,10 +17,10 @@
package org.apache.poi.hssf.eventmodel;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -40,8 +40,8 @@ import org.apache.poi.hssf.record.Standa
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
import org.apache.poi.hssf.record.UnknownRecord;
import org.apache.poi.util.NotImplemented;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* enclosing_type describe the purpose here
@@ -65,7 +65,7 @@ public final class TestEventRecordFactor
ERFListener listener = rec -> {
wascalled[0] = true;
-assertEquals("must be BOFRecord got SID=" + rec.getSid(),
rec.getSid(), BOFRecord.sid);
+assertEquals(rec.getSid(), BOFRecord.sid, "must be BOFRecord got
SID=" + rec.getSid());
return true;
};
EventRecordFactory factory = new EventRecordFactory(listener, new
short[] {BOFRecord.sid});
@@ -85,7 +85,7 @@ public final class TestEventRecordFactor
eof.serialize(offset,bytes);
factory.processRecords(new ByteArrayInputStream(bytes));
-assertTrue("The record listener must be called", wascalled[0]);
+assertTrue(wascalled[0], "The record listener must be called");
}
@@ -107,7 +107,7 @@ public final class TestEventRecordFactor
Record[] records =
RecordFactory.createRecord(TestcaseRecordInputStream.create(bytes));
-assertEquals("record.length must be 1, was =" + records.length, 1,
records.length);
+assertEquals(1, records.length, "record.length must be 1, was =" +
records.length);
byte[] rec1 = bof.serialize();
byte[] rec2 = records[0].serialize();
@@ -121,9 +121,8 @@ public final class TestEventRecordFactor
*/
@NotImplemented
@Test
-@Ignore
+@Disabled
public void testCreateContinuedRecord() {
- // fail("not implemented");
}
@@ -145,7 +144,7 @@ public final class TestEventRecordFactor
}
@Test
-@Ignore("same as testContinuedUnknownRecord but with SequenceInputStream
which causes the available() bug 59893")
+@Disabled("same as testContinuedUnknownRecord but with SequenceInputStream
which causes the available() bug 59893")
public void bug59893() {
Iterator iter =
Stream.of(CONTINUE_DATA).map(ByteArrayInputStream::new).iterator();
SequenceInputStream sis = new
SequenceInputStream(IteratorUtils.asEnumeration(iter));
@@ -164,6 +163,6 @@ public final class TestEventRecordFactor
};
EventRecordFactory factory = new EventRecordFactory(listener, new
short[] {-256, 0x3C});
factory.processRecords(data);
-assertFalse("left over input data", expectedData.hasNext());
+
svn commit: r1884783 [7/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
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java?rev=1884783=1884782=1884783=diff
==
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java
(original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java Thu Dec
24 18:42:29 2020
@@ -20,14 +20,14 @@ import static org.apache.poi.POITestCase
import static org.apache.poi.sl.draw.DrawTextParagraph.HYPERLINK_HREF;
import static org.apache.poi.sl.draw.DrawTextParagraph.HYPERLINK_LABEL;
import static org.apache.poi.xslf.XSLFTestDataSamples.openSampleDocument;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeFalse;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
import java.awt.Color;
import java.awt.Dimension;
@@ -104,9 +104,9 @@ import org.apache.poi.xslf.usermodel.XSL
import org.apache.poi.xslf.usermodel.XSLFTextParagraph;
import org.apache.poi.xslf.usermodel.XSLFTextRun;
import org.apache.poi.xslf.util.DummyGraphics2d;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.openxmlformats.schemas.drawingml.x2006.main.CTOuterShadowEffect;
import org.openxmlformats.schemas.presentationml.x2006.main.CTShape;
@@ -115,7 +115,7 @@ public class TestXSLFBugs {
private static boolean xslfOnly;
-@BeforeClass
+@BeforeAll
public static void checkHslf() {
try {
Class.forName("org.apache.poi.hslf.usermodel.HSLFSlideShow");
@@ -126,14 +126,14 @@ public class TestXSLFBugs {
@Test
public void bug62929() throws Exception {
-try(XMLSlideShow ss1 = openSampleDocument("missing-blip-fill.pptx")) {
+try (XMLSlideShow ss1 = openSampleDocument("missing-blip-fill.pptx")) {
assertEquals(1, ss1.getSlides().size());
XSLFSlide slide = ss1.getSlides().get(0);
assertEquals(slide.getShapes().size(), 1);
-XSLFPictureShape picture =
(XSLFPictureShape)slide.getShapes().get(0);
+XSLFPictureShape picture = (XSLFPictureShape)
slide.getShapes().get(0);
assertEquals(picture.getShapeId(), 662);
assertFalse(picture.isExternalLinkedPicture());
@@ -234,7 +234,7 @@ public class TestXSLFBugs {
XSLFSlide slide2 = src.createSlide();
XSLFTextBox shape = slide.createTextBox();
-shape.setAnchor(new Rectangle2D.Double(100,100,400,100));
+shape.setAnchor(new Rectangle2D.Double(100, 100, 400, 100));
XSLFTextParagraph p = shape.addNewTextParagraph();
XSLFTextRun r = p.addNewTextRun();
@@ -247,7 +247,7 @@ public class TestXSLFBugs {
r.createHyperlink().linkToSlide(slide2);
shape = slide2.createTextBox();
-shape.setAnchor(new Rectangle2D.Double(100,100,400,100));
+shape.setAnchor(new Rectangle2D.Double(100, 100, 400, 100));
shape.setText("slide 2");
dest.createSlide().importContent(slide);
@@ -258,7 +258,7 @@ public class TestXSLFBugs {
try (XMLSlideShow ppt = new XMLSlideShow(new
ByteArrayInputStream(bos.toByteArray( {
XSLFSlide slide = ppt.getSlides().get(0);
-XSLFTextBox shape = (XSLFTextBox)slide.getShapes().get(0);
+XSLFTextBox shape = (XSLFTextBox) slide.getShapes().get(0);
XSLFTextParagraph p = shape.getTextParagraphs().get(1);
XSLFHyperlink h1 = p.getTextRuns().get(0).getHyperlink();
assertNotNull(h1);
@@ -276,16 +276,16 @@ public class TestXSLFBugs {
public void bug62587() throws IOException {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
try (XMLSlideShow ppt = new XMLSlideShow()) {
-Slide slide = ppt.createSlide();
+Slide slide = ppt.createSlide();
XSLFPictureData pd = ppt.addPicture(slTests.getFile("wrench.emf"),
PictureType.EMF);
-PictureShape ps =
svn commit: r1884783 [12/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/excelan
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
Thu Dec 24 18:42:29 2020
@@ -17,11 +17,12 @@
package org.apache.poi.xssf.usermodel;
-import static org.junit.Assert.assertEquals;
-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.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.IOException;
import java.util.Arrays;
@@ -62,7 +63,7 @@ import org.apache.poi.ss.usermodel.Sheet
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.util.CellReference;
import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestXSSFFormulaParser {
private static Ptg[] parse(FormulaParsingWorkbook fpb, String fmla) {
@@ -80,38 +81,31 @@ public final class TestXSSFFormulaParser
ptgs = parse(fpb, "ABC10");
assertEquals(1, ptgs.length);
-assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof RefPtg);
+assertTrue(ptgs[0] instanceof RefPtg, "Had " + Arrays.toString(ptgs));
ptgs = parse(fpb, "A50");
assertEquals(1, ptgs.length);
-assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof RefPtg);
+assertTrue(ptgs[0] instanceof RefPtg, "Had " + Arrays.toString(ptgs));
ptgs = parse(fpb, "ABC50");
assertEquals(1, ptgs.length);
-assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof RefPtg);
+assertTrue(ptgs[0] instanceof RefPtg, "Had " + Arrays.toString(ptgs));
//highest allowed rows and column (XFD and 0x10)
ptgs = parse(fpb, "XFD1048576");
assertEquals(1, ptgs.length);
-assertTrue("Had " + Arrays.toString(ptgs), ptgs[0] instanceof RefPtg);
+assertTrue(ptgs[0] instanceof RefPtg, "Had " + Arrays.toString(ptgs));
//column greater than XFD
-try {
-/*ptgs =*/ parse(fpb, "XFE10");
-fail("expected exception");
-} catch (FormulaParseException e){
-assertEquals("Specified named range 'XFE10' does not exist in the
current workbook.", e.getMessage());
-}
+FormulaParseException e;
+e = assertThrows(FormulaParseException.class, () -> parse(fpb,
"XFE10"));
+assertEquals("Specified named range 'XFE10' does not exist in the
current workbook.", e.getMessage());
//row greater than 0x10
-try {
-/*ptgs =*/ parse(fpb, "XFD1048577");
-fail("expected exception");
-} catch (FormulaParseException e){
-assertEquals("Specified named range 'XFD1048577' does not exist in
the current workbook.", e.getMessage());
-}
-
+e = assertThrows(FormulaParseException.class, () -> parse(fpb,
"XFD1048577"));
+assertEquals("Specified named range 'XFD1048577' does not exist in the
current workbook.", e.getMessage());
+
// Formula referencing one cell
ptgs = parse(fpb, "ISEVEN(A1)");
assertEquals(3, ptgs.length);
@@ -121,7 +115,7 @@ public final class TestXSSFFormulaParser
assertEquals("ISEVEN", ptgs[0].toFormulaString());
assertEquals("A1", ptgs[1].toFormulaString());
assertEquals("#external#", ptgs[2].toFormulaString());
-
+
// Formula referencing an area
ptgs = parse(fpb, "SUM(A1:B3)");
assertEquals(2, ptgs.length);
@@ -129,7 +123,7 @@ public final class TestXSSFFormulaParser
assertEquals(AttrPtg.class, ptgs[1].getClass());
assertEquals("A1:B3", ptgs[0].toFormulaString());
assertEquals("SUM", ptgs[1].toFormulaString());
-
+
// Formula referencing one cell in a different sheet
ptgs = parse(fpb, "SUM(Sheet1!A1)");
assertEquals(2, ptgs.length);
@@ -137,7 +131,7 @@ public final class TestXSSFFormulaParser
assertEquals(AttrPtg.class, ptgs[1].getClass());
assertEquals("Sheet1!A1", ptgs[0].toFormulaString());
assertEquals("SUM", ptgs[1].toFormulaString());
-
+
// Formula referencing an
svn commit: r1884783 [9/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
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
Thu Dec 24 18:42:29 2020
@@ -16,12 +16,11 @@
*/
package org.apache.poi.xssf.streaming;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.IOException;
import java.util.Collections;
@@ -36,20 +35,19 @@ import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.ss.util.SheetUtil;
-import org.junit.After;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests the auto-sizing behaviour of {@link SXSSFSheet} when not all
* rows fit into the memory window size etc.
- *
+ *
* see Bug #57450 which reported the original misbehaviour
*/
public class TestAutoSizeColumnTracker {
-
+
private SXSSFSheet sheet;
private SXSSFWorkbook workbook;
private AutoSizeColumnTracker tracker;
@@ -63,15 +61,15 @@ public class TestAutoSizeColumnTracker {
}
private final static String SHORT_MESSAGE = "short";
private final static String LONG_MESSAGE = "This is a test of a long
message! This is a test of a long message!";
-
-@Before
+
+@BeforeEach
public void setUpSheetAndWorkbook() {
workbook = new SXSSFWorkbook();
sheet = workbook.createSheet();
tracker = new AutoSizeColumnTracker(sheet);
}
-
-@After
+
+@AfterEach
public void tearDownSheetAndWorkbook() throws IOException {
if (sheet != null) {
sheet.dispose();
@@ -80,7 +78,7 @@ public class TestAutoSizeColumnTracker {
workbook.close();
}
}
-
+
@Test
public void trackAndUntrackColumn() {
assumeTrue(tracker.getTrackedColumns().isEmpty());
@@ -91,7 +89,7 @@ public class TestAutoSizeColumnTracker {
tracker.untrackColumn(0);
assertTrue(tracker.getTrackedColumns().isEmpty());
}
-
+
@Test
public void trackAndUntrackColumns() {
assumeTrue(tracker.getTrackedColumns().isEmpty());
@@ -108,14 +106,14 @@ public class TestAutoSizeColumnTracker {
tracker.untrackColumns(columns);
assertTrue(tracker.getTrackedColumns().isEmpty());
}
-
+
@Test
public void trackAndUntrackAllColumns() {
createColumnsAndTrackThemAll();
tracker.untrackAllColumns();
assertTrue(tracker.getTrackedColumns().isEmpty());
}
-
+
@Test
public void isColumnTracked() {
assumeFalse(tracker.isColumnTracked(0));
@@ -140,7 +138,7 @@ public class TestAutoSizeColumnTracker {
@Test
public void getTrackedColumns() {
assumeTrue(tracker.getTrackedColumns().isEmpty());
-
+
for (int column : columns) {
tracker.trackColumn(column);
}
@@ -148,7 +146,7 @@ public class TestAutoSizeColumnTracker {
assertEquals(3, tracker.getTrackedColumns().size());
assertEquals(columns, tracker.getTrackedColumns());
}
-
+
@Test
public void isAllColumnsTracked() {
assertFalse(tracker.isAllColumnsTracked());
@@ -157,7 +155,7 @@ public class TestAutoSizeColumnTracker {
tracker.untrackAllColumns();
assertFalse(tracker.isAllColumnsTracked());
}
-
+
@Test
public void updateColumnWidths_and_getBestFitColumnWidth() {
tracker.trackAllColumns();
@@ -171,19 +169,19 @@ public class TestAutoSizeColumnTracker {
tracker.updateColumnWidths(row1);
tracker.updateColumnWidths(row2);
assertEquals(0,
sheet.addMergedRegion(CellRangeAddress.valueOf("D1:E1")));
-
+
assumeRequiredFontsAreInstalled(workbook,
row1.getCell(columns.iterator().next()));
-
+
// Excel 2013 and LibreOffice
svn commit: r1884783 [16/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/excelan
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java?rev=1884783=1884782=1884783=diff
==
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java
(original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java Thu
Dec 24 18:42:29 2020
@@ -17,10 +17,10 @@
package org.apache.poi.hslf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -33,8 +33,8 @@ import org.apache.poi.hslf.usermodel.HSL
import org.apache.poi.poifs.filesystem.DocumentEntry;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.TempFile;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests that HSLFSlideShow writes the powerpoint bit of data back out
@@ -52,11 +52,11 @@ public final class TestReWrite {
private POIFSFileSystem pfsB;
private POIFSFileSystem pfsC;
-@Before
+@BeforeEach
public void setUp() throws Exception {
POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
-
+
pfsA = new
POIFSFileSystem(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
hssA = new HSLFSlideShowImpl(pfsA);
@@ -72,39 +72,39 @@ public final class TestReWrite {
assertWritesOutTheSame(hssA, pfsA);
assertWritesOutTheSame(hssB, pfsB);
}
-
+
public void assertWritesOutTheSame(HSLFSlideShowImpl hss, POIFSFileSystem
pfs) throws Exception {
// Write out to a byte array, and to a temp file
ByteArrayOutputStream baos = new ByteArrayOutputStream();
hss.write(baos);
-
+
final File file = TempFile.createTempFile("TestHSLF", ".ppt");
final File file2 = TempFile.createTempFile("TestHSLF", ".ppt");
hss.write(file);
hss.write(file2);
-
+
// Build an input stream of it, and read back as a POIFS from the
stream
ByteArrayInputStream bais = new
ByteArrayInputStream(baos.toByteArray());
POIFSFileSystem npfS = new POIFSFileSystem(bais);
-
+
// And the same on the temp file
POIFSFileSystem npfF = new POIFSFileSystem(file);
-
+
// And another where we do an in-place write
POIFSFileSystem npfRF = new POIFSFileSystem(file2, false);
HSLFSlideShowImpl hssRF = new HSLFSlideShowImpl(npfRF);
hssRF.write();
hssRF.close();
npfRF = new POIFSFileSystem(file2);
-
+
// Check all of them in turn
for (POIFSFileSystem npf : new POIFSFileSystem[] { npfS, npfF, npfRF
}) {
// Check that the "PowerPoint Document" sections have the same size
DocumentEntry oProps =
(DocumentEntry)pfs.getRoot().getEntry(HSLFSlideShow.POWERPOINT_DOCUMENT);
DocumentEntry nProps =
(DocumentEntry)npf.getRoot().getEntry(HSLFSlideShow.POWERPOINT_DOCUMENT);
assertEquals(oProps.getSize(),nProps.getSize());
-
+
// Check that they contain the same data
byte[] _oData = new byte[oProps.getSize()];
byte[] _nData = new byte[nProps.getSize()];
@@ -155,7 +155,7 @@ public final class TestReWrite {
// We need to identify and fix that first
//assertSlideShowWritesOutTheSame(hssB, pfsB);
}
-
+
public void assertSlideShowWritesOutTheSame(HSLFSlideShowImpl hss,
POIFSFileSystem pfs) throws IOException {
// Create a slideshow covering it
@SuppressWarnings("resource")
@@ -190,7 +190,7 @@ public final class TestReWrite {
}
npfs.close();
}
-
+
@Test
public void test48593() throws IOException {
HSLFSlideShow ppt1 = new HSLFSlideShow();
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java
Thu Dec 24 18:42:29 2020
@@ -19,7 +19,7 @@ package org.apache.poi.hslf;
svn commit: r1884783 [6/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
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXCell.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXCell.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXCell.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXCell.java
Thu Dec 24 18:42:29 2020
@@ -17,7 +17,7 @@
package org.apache.poi.ss.tests.usermodel;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
@@ -30,7 +30,7 @@ import org.apache.poi.ss.usermodel.Sheet
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.streaming.SXSSFCell;
import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Class for combined testing of XML-specific functionality of
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java
Thu Dec 24 18:42:29 2020
@@ -23,7 +23,7 @@ import org.apache.poi.ss.ITestDataProvid
import org.apache.poi.ss.usermodel.BaseTestRow;
import org.apache.poi.xssf.streaming.SXSSFRow;
import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Class for combined testing of XML-specific functionality of
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/ConditionalFormattingEvalTest.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/ConditionalFormattingEvalTest.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/ConditionalFormattingEvalTest.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/ConditionalFormattingEvalTest.java
Thu Dec 24 18:42:29 2020
@@ -18,11 +18,10 @@
package org.apache.poi.ss.tests.usermodel;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
+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 java.io.IOException;
import java.util.Date;
import java.util.List;
@@ -32,13 +31,14 @@ import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Color;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.util.CellReference;
+import org.apache.poi.util.IOUtils;
import org.apache.poi.xssf.XSSFTestDataSamples;
import org.apache.poi.xssf.usermodel.XSSFColor;
import org.apache.poi.xssf.usermodel.XSSFFormulaEvaluator;
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;
public class ConditionalFormattingEvalTest {
@@ -49,25 +49,20 @@ public class ConditionalFormattingEvalTe
private CellReference ref;
private List rules;
-@Before
+@BeforeEach
public void openWB() {
wb =
XSSFTestDataSamples.openSampleWorkbook("ConditionalFormattingSamples.xlsx");
formulaEval = new XSSFFormulaEvaluator(wb);
cfe = new ConditionalFormattingEvaluator(wb, formulaEval);
}
-@After
+@AfterEach
public void closeWB() {
formulaEval = null;
cfe = null;
ref = null;
rules = null;
-try {
-if (wb != null) wb.close();
-} catch (IOException e) {
-// keep going, this shouldn't cancel things
-e.printStackTrace();
-}
+IOUtils.closeQuietly(wb);
}
@Test
@@ -75,25 +70,25 @@ public class ConditionalFormattingEvalTe
sheet = wb.getSheet("Products1");
getRulesFor(12, 1);
-assertEquals("wrong # of rules for " + ref, 1, rules.size());
-assertEquals("wrong bg color for " + ref, "EB9C",
getColor(rules.get(0).getRule().getPatternFormatting().getFillBackgroundColorColor()));
-assertFalse("should not be italic " + ref,
rules.get(0).getRule().getFontFormatting().isItalic());
+
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
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=1884782=1884783=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 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 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);
svn commit: r1884783 [3/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
Modified:
poi/trunk/src/integrationtest/org/apache/poi/stress/SlideShowHandler.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/integrationtest/org/apache/poi/stress/SlideShowHandler.java?rev=1884783=1884782=1884783=diff
==
--- poi/trunk/src/integrationtest/org/apache/poi/stress/SlideShowHandler.java
(original)
+++ poi/trunk/src/integrationtest/org/apache/poi/stress/SlideShowHandler.java
Thu Dec 24 18:42:29 2020
@@ -16,6 +16,18 @@
*/
package org.apache.poi.stress;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+
import org.apache.poi.sl.draw.Drawable;
import org.apache.poi.sl.usermodel.GroupShape;
import org.apache.poi.sl.usermodel.Notes;
@@ -29,18 +41,6 @@ import org.apache.poi.sl.usermodel.TextP
import org.apache.poi.sl.usermodel.TextRun;
import org.apache.poi.sl.usermodel.TextShape;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.lang.ref.WeakReference;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
public abstract class SlideShowHandler extends POIFSFileHandler {
public void handleSlideShow(SlideShow ss) throws IOException {
renderSlides(ss);
@@ -127,10 +127,8 @@ public abstract class SlideShowHandler e
private void readPictures(SlideShow ss) {
for (PictureData pd : ss.getPictureData()) {
Dimension dim = pd.getImageDimension();
-assertTrue("Expecting a valid height, but had an image with
height: " + dim.getHeight(),
-dim.getHeight() >= 0);
-assertTrue("Expecting a valid width, but had an image with width:
" + dim.getWidth(),
-dim.getWidth() >= 0);
+assertTrue( dim.getHeight() >= 0, "Expecting a valid height, but
had an image with height: " + dim.getHeight() );
+assertTrue( dim.getWidth() >= 0, "Expecting a valid width, but had
an image with width: " + dim.getWidth() );
}
}
Modified:
poi/trunk/src/integrationtest/org/apache/poi/stress/SpreadsheetHandler.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/integrationtest/org/apache/poi/stress/SpreadsheetHandler.java?rev=1884783=1884782=1884783=diff
==
--- poi/trunk/src/integrationtest/org/apache/poi/stress/SpreadsheetHandler.java
(original)
+++ poi/trunk/src/integrationtest/org/apache/poi/stress/SpreadsheetHandler.java
Thu Dec 24 18:42:29 2020
@@ -16,7 +16,7 @@
*/
package org.apache.poi.stress;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -37,10 +37,10 @@ public abstract class SpreadsheetHandler
public void handleWorkbook(Workbook wb) throws IOException {
// try to access some of the content
readContent(wb);
-
+
// write out the file
writeToArray(wb);
-
+
// access some more content (we had cases where writing
corrupts the data in memory)
readContent(wb);
@@ -51,11 +51,11 @@ public abstract class SpreadsheetHandler
Workbook read = WorkbookFactory.create(new
ByteArrayInputStream(out.toByteArray()));
assertNotNull(read);
-
+
readContent(read);
-
+
extractEmbedded(read);
-
+
modifyContent(read);
read.close();
@@ -68,7 +68,7 @@ public abstract class SpreadsheetHandler
} finally {
stream.close();
}
-
+
return stream;
}
@@ -84,7 +84,7 @@ public abstract class SpreadsheetHandler
if(sheet.getPhysicalNumberOfRows() > 1000) {
continue;
}
-
+
for(Row row : sheet) {
for(Cell cell : row) {
assertNotNull(cell.toString());
@@ -111,7 +111,7 @@ public abstract class SpreadsheetHandler
}
}
}
-
svn commit: r1884783 [5/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
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java
Thu Dec 24 18:42:29 2020
@@ -16,16 +16,17 @@
*/
package org.apache.poi.poifs.crypt.tests;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
+import java.util.stream.Stream;
import javax.crypto.Cipher;
@@ -39,55 +40,44 @@ import org.apache.poi.poifs.crypt.Encryp
import org.apache.poi.poifs.crypt.HashAlgorithm;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.IOUtils;
-import org.junit.Assume;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
-@RunWith(Parameterized.class)
public class TestAgileEncryptionParameters {
static byte[] testData;
-@Parameter(value = 0)
-public CipherAlgorithm ca;
-@Parameter(value = 1)
-public HashAlgorithm ha;
-@Parameter(value = 2)
-public ChainingMode cm;
-
-@Parameters(name="{0} {1} {2}")
-public static Collection data() {
+public static Stream data() {
CipherAlgorithm[] caList = {CipherAlgorithm.aes128,
CipherAlgorithm.aes192, CipherAlgorithm.aes256, CipherAlgorithm.rc2,
CipherAlgorithm.des, CipherAlgorithm.des3};
HashAlgorithm[] haList = {HashAlgorithm.sha1, HashAlgorithm.sha256,
HashAlgorithm.sha384, HashAlgorithm.sha512, HashAlgorithm.md5};
ChainingMode[] cmList = {ChainingMode.cbc, ChainingMode.cfb};
-List data = new ArrayList<>();
+List data = new ArrayList<>();
for (CipherAlgorithm ca : caList) {
for (HashAlgorithm ha : haList) {
for (ChainingMode cm : cmList) {
-data.add(new Object[]{ca,ha,cm});
+data.add(Arguments.of(ca,ha,cm));
}
}
}
-return data;
+return data.stream();
}
-@BeforeClass
+@BeforeAll
public static void initTestData() throws Exception {
InputStream testFile =
POIDataSamples.getDocumentInstance().openResourceAsStream("SampleDoc.docx");
testData = IOUtils.toByteArray(testFile);
testFile.close();
}
-@Test
-public void testAgileEncryptionModes() throws Exception {
+@ParameterizedTest
+@MethodSource("data")
+public void testAgileEncryptionModes(CipherAlgorithm ca, HashAlgorithm ha,
ChainingMode cm) throws Exception {
int maxKeyLen = Cipher.getMaxAllowedKeyLength(ca.jceId);
-Assume.assumeTrue("Please install JCE Unlimited Strength Jurisdiction
Policy files", maxKeyLen >= ca.defaultKeySize);
+assumeTrue(maxKeyLen >= ca.defaultKeySize, "Please install JCE
Unlimited Strength Jurisdiction Policy files");
ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -111,6 +101,6 @@ public class TestAgileEncryptionParamete
byte[] actualData = IOUtils.toByteArray(is);
is.close();
fsDec.close();
-assertArrayEquals("Failed roundtrip - "+ca+"-"+ha+"-"+cm, testData,
actualData);
+assertArrayEquals(testData, actualData, "Failed roundtrip -
"+ca+"-"+ha+"-"+cm);
}
}
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestDecryptor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestDecryptor.java?rev=1884783=1884782=1884783=diff
==
---
poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestDecryptor.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestDecryptor.java
Thu Dec 24 18:42:29
svn commit: r1884783 [4/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
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java?rev=1884783=1884782=1884783=diff
==
--- poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java
(original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java
Thu Dec 24 18:42:29 2020
@@ -22,13 +22,14 @@ import static org.apache.poi.openxml4j.O
import static
org.apache.poi.openxml4j.OpenXML4JTestDataSamples.getSampleFileName;
import static
org.apache.poi.openxml4j.OpenXML4JTestDataSamples.openSampleStream;
import static org.apache.poi.openxml4j.opc.PackagingURIHelper.createPartName;
-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.assertThrows;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+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.BufferedInputStream;
import java.io.ByteArrayInputStream;
@@ -70,12 +71,12 @@ import org.apache.poi.openxml4j.exceptio
import org.apache.poi.openxml4j.exceptions.NotOfficeXmlFileException;
import org.apache.poi.openxml4j.exceptions.ODFNotOfficeXmlFileException;
import org.apache.poi.openxml4j.exceptions.OLE2NotOfficeXmlFileException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
import org.apache.poi.openxml4j.opc.internal.ContentTypeManager;
import org.apache.poi.openxml4j.opc.internal.FileHelper;
import org.apache.poi.openxml4j.opc.internal.PackagePropertiesPart;
import org.apache.poi.openxml4j.opc.internal.ZipHelper;
import org.apache.poi.openxml4j.util.ZipSecureFile;
+import org.apache.poi.sl.usermodel.SlideShow;
import org.apache.poi.sl.usermodel.SlideShowFactory;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.usermodel.WorkbookFactory;
@@ -88,10 +89,9 @@ import org.apache.poi.xssf.streaming.SXS
import org.apache.poi.xssf.usermodel.XSSFRelation;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.apache.poi.xwpf.usermodel.XWPFRelation;
-import org.apache.xmlbeans.XmlException;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.function.ThrowingRunnable;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.function.Executable;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -288,7 +288,7 @@ public final class TestPackage {
for (int i = 0; i < nodeCount; i++) {
Element element = (Element) nodeList.item(i);
String value =
element.getAttribute(PackageRelationship.TARGET_ATTRIBUTE_NAME);
-assertTrue("Root target must not start with a leading slash ('/'):
" + value, value.charAt(0) != '/');
+assertTrue(value.charAt(0) != '/', "Root target must not start
with a leading slash ('/'): " + value);
}
}
@@ -340,11 +340,7 @@ public final class TestPackage {
StreamHelper.saveXmlInStream(doc, corePart.getOutputStream());
// Save and close
- try {
- pkg.close();
- } catch (IOException e) {
- fail();
- }
+ assertDoesNotThrow(pkg::close);
ZipFileAssert.assertEquals(expectedFile, targetFile);
assertTrue(targetFile.delete());
@@ -406,7 +402,7 @@ public final class TestPackage {
* TODO: fix and enable
*/
@Test
- @Ignore
+ @Disabled
public void removePartRecursive() throws IOException,
InvalidFormatException, URISyntaxException {
String originalFile =
getSampleFileName("TestPackageCommon.docx");
File targetFile =
getOutputFile("TestPackageRemovePartRecursiveOUTPUT.docx");
@@ -519,12 +515,8 @@ public final class TestPackage {
FileHelper.copyFile(origFile, tempFile);
try (OPCPackage p = OPCPackage.open(tempFile.toString(),
PackageAccess.READ_WRITE)) {
// Save it to the same file - not allowed
- try {
- p.save(tempFile);
- fail("You shouldn't be able to call save(File)
to overwrite the current file");
-
svn commit: r1884783 [1/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
Author: kiwiwings Date: Thu Dec 24 18:42:29 2020 New Revision: 1884783 URL: http://svn.apache.org/viewvc?rev=1884783=rev Log: #65026 - Migrate tests to Junit 5 Added: poi/trunk/src/excelant/poi-ant-contrib/Junit5Progress.java (with props) Removed: poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/AllOpenXML4JTests.java poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/AllPOIFSCryptoTests.java poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/AllXSSFTests.java poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/AllXSSFUsermodelTests.java poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/AllXWPFTests.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/AllHSLFTests.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/AllHSLFModelTests.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/AllHSLFRecordTests.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/AllHSLFUserModelTests.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/AllHSMFTests.java poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/AllHWPFTests.java poi/trunk/src/testcases/org/apache/poi/AllPOITests.java poi/trunk/src/testcases/org/apache/poi/ddf/AllPOIDDFTests.java poi/trunk/src/testcases/org/apache/poi/hpsf/basic/AllPOIHPSFBasicTests.java poi/trunk/src/testcases/org/apache/poi/hssf/HSSFTests.java poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/AllEventUserModelTests.java poi/trunk/src/testcases/org/apache/poi/hssf/model/AllModelTests.java poi/trunk/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/AllRecordAggregateTests.java poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/AllChartRecordTests.java poi/trunk/src/testcases/org/apache/poi/hssf/record/pivot/AllPivotRecordTests.java poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/AllUserModelTests.java poi/trunk/src/testcases/org/apache/poi/hssf/util/AllHSSFUtilTests.java poi/trunk/src/testcases/org/apache/poi/poifs/AllPOIFSTests.java poi/trunk/src/testcases/org/apache/poi/poifs/crypt/AllEncryptionTests.java poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/AllPOIFSFileSystemTests.java poi/trunk/src/testcases/org/apache/poi/poifs/property/AllPOIFSPropertyTests.java poi/trunk/src/testcases/org/apache/poi/poifs/storage/AllPOIFSStorageTests.java poi/trunk/src/testcases/org/apache/poi/ss/formula/AllSSFormulaTests.java poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestDateParser.java poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/AllFormulaEvalTests.java poi/trunk/src/testcases/org/apache/poi/ss/formula/function/AllFormulaFunctionTests.java poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/AllIndividualFunctionEvaluationTests.java poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/AllSpreadsheetBasedTests.java poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/AllFormulaTests.java poi/trunk/src/testcases/org/apache/poi/ss/util/AllSSUtilTests.java poi/trunk/src/testcases/org/apache/poi/util/AllPOIUtilTests.java Modified: poi/site/src/documentation/content/xdocs/changes.xml poi/trunk/build.xml poi/trunk/sonar/integration-test/pom.xml poi/trunk/sonar/ooxml/pom.xml poi/trunk/sonar/pom.xml poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/MockExcelAntWorkbookHandler.java poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestBuildFile.java poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntPrecision.java poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntSet.java poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntSetDoubleCell.java poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntUserDefinedFunction.java poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntEvaluationResult.java poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtilFactory.java poi/trunk/src/integrationtest/org/apache/poi/stress/AbstractFileHandler.java poi/trunk/src/integrationtest/org/apache/poi/stress/BaseIntegrationTest.java poi/trunk/src/integrationtest/org/apache/poi/stress/FileHandler.java poi/trunk/src/integrationtest/org/apache/poi/stress/HDGFFileHandler.java poi/trunk/src/integrationtest/org/apache/poi/stress/HMEFFileHandler.java poi/trunk/src/integrationtest/org/apache/poi/stress/HPBFFileHandler.java poi/trunk/src/integrationtest/org/apache/poi/stress/HPSFFileHandler.java poi/trunk/src/integrationtest/org/apache/poi/stress/HSLFFileHandler.java poi/trunk/src/integrationtest
svn commit: r1884782 - /poi/tags/before_junit5_update/
Author: kiwiwings Date: Thu Dec 24 18:25:13 2020 New Revision: 1884782 URL: http://svn.apache.org/viewvc?rev=1884782=rev Log: backup before applying junit5 migration Added: poi/tags/before_junit5_update/ (props changed) - copied from r1884781, poi/trunk/ Propchange: poi/tags/before_junit5_update/ -- --- svn:auto-props (added) +++ svn:auto-props Thu Dec 24 18:25:13 2020 @@ -0,0 +1 @@ +*.java = svn:eol-style=native Propchange: poi/tags/before_junit5_update/ -- --- svn:externals (added) +++ svn:externals Thu Dec 24 18:25:13 2020 @@ -0,0 +1 @@ +forrest.properties https://svn.apache.org/repos/asf/poi/site/forrest.properties Propchange: poi/tags/before_junit5_update/ -- --- svn:ignore (added) +++ svn:ignore Thu Dec 24 18:25:13 2020 @@ -0,0 +1,7 @@ +lib +build +bin +out +tmp +.gradle +.idea Propchange: poi/tags/before_junit5_update/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Dec 24 18:25:13 2020 @@ -0,0 +1,9 @@ +/poi/branches/common_sl:1661320-1691849 +/poi/branches/excelant:1069732-1073692 +/poi/branches/gsoc2012:1341450-1371650 +/poi/branches/hemf:1839876-1849038 +/poi/branches/hssf_cryptoapi:1753906-1762715 +/poi/branches/ss_border_property_template:1747847-1748074 +/poi/branches/xml_signature:1617139-1628347 +/poi/branches/xssf_structured_references:1747607-1747656 +/poi/trunk:693591-694881,695264-695420,695621,695649-711764 Propchange: poi/tags/before_junit5_update/ -- --- svnmerge-blocked (added) +++ svnmerge-blocked Thu Dec 24 18:25:13 2020 @@ -0,0 +1 @@ +/poi/trunk:638785,639487,639602,640057,642563,642567,642575,642737-642738,650915 Propchange: poi/tags/before_junit5_update/ -- --- svnmerge-integrated (added) +++ svnmerge-integrated Thu Dec 24 18:25:13 2020 @@ -0,0 +1 @@ +/poi/trunk:1-638784,638786-639486,639488-639601,639603-640056,640058-642562,642564-642566,642568-642574,642576-642736,642739-650914,650916-711764 - To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org For additional commands, e-mail: commits-h...@poi.apache.org
svn commit: r1884578 [2/2] - in /poi: site/src/documentation/content/xdocs/ site/src/documentation/content/xdocs/components/slideshow/ trunk/src/java/org/apache/poi/sl/draw/ trunk/src/ooxml/java/org/a
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java?rev=1884578=1884577=1884578=diff
==
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
Thu Dec 17 23:42:26 2020
@@ -19,6 +19,7 @@ package org.apache.poi.hslf.usermodel;
import static org.apache.poi.POITestCase.assertContains;
import static org.apache.poi.POITestCase.assertStartsWith;
+import static org.apache.poi.hslf.HSLFTestDataSamples.writeOutAndReadBack;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -35,9 +36,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.text.AttributedCharacterIterator;
-import java.text.AttributedCharacterIterator.Attribute;
-import java.text.CharacterIterator;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -66,12 +64,10 @@ import org.apache.poi.hslf.record.SlideL
import org.apache.poi.hslf.record.TextHeaderAtom;
import org.apache.poi.hslf.record.VBAInfoAtom;
import org.apache.poi.hslf.record.VBAInfoContainer;
-import org.apache.poi.hssf.usermodel.DummyGraphics2d;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.poifs.macros.VBAMacroReader;
import org.apache.poi.sl.draw.DrawFactory;
import org.apache.poi.sl.draw.DrawPaint;
-import org.apache.poi.sl.draw.DrawTextParagraph;
import org.apache.poi.sl.extractor.SlideShowExtractor;
import org.apache.poi.sl.usermodel.ColorStyle;
import org.apache.poi.sl.usermodel.PaintStyle;
@@ -86,9 +82,7 @@ import org.apache.poi.sl.usermodel.TextB
import org.apache.poi.sl.usermodel.TextParagraph;
import org.apache.poi.sl.usermodel.TextParagraph.TextAlign;
import org.apache.poi.sl.usermodel.TextRun;
-import org.apache.poi.util.IOUtils;
import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.NullPrintStream;
import org.apache.poi.util.StringUtil;
import org.apache.poi.util.Units;
import org.junit.Test;
@@ -103,16 +97,14 @@ public final class TestBugs {
*/
@Test
public void bug41384() throws IOException {
-HSLFSlideShow ppt = open("41384.ppt");
+try (HSLFSlideShow ppt = open("41384.ppt")) {
+assertEquals(1, ppt.getSlides().size());
-assertEquals(1, ppt.getSlides().size());
-
-List pict = ppt.getPictureData();
-assertEquals(2, pict.size());
-assertEquals(PictureType.JPEG, pict.get(0).getType());
-assertEquals(PictureType.JPEG, pict.get(1).getType());
-
-ppt.close();
+List pict = ppt.getPictureData();
+assertEquals(2, pict.size());
+assertEquals(PictureType.JPEG, pict.get(0).getType());
+assertEquals(PictureType.JPEG, pict.get(1).getType());
+}
}
/**
@@ -121,26 +113,25 @@ public final class TestBugs {
*/
@Test
public void bug42474_1() throws IOException {
-HSLFSlideShow ppt = open("42474-1.ppt");
-assertEquals(2, ppt.getSlides().size());
-
-List txrun;
-HSLFNotes notes;
+try (HSLFSlideShow ppt = open("42474-1.ppt")) {
+assertEquals(2, ppt.getSlides().size());
-notes = ppt.getSlides().get(0).getNotes();
-assertNotNull(notes);
-txrun = notes.getTextParagraphs().get(0);
-assertEquals("Notes-1", HSLFTextParagraph.getRawText(txrun));
-assertFalse(txrun.get(0).getTextRuns().get(0).isBold());
-
-//notes for the second slide are in bold
-notes = ppt.getSlides().get(1).getNotes();
-assertNotNull(notes);
-txrun = notes.getTextParagraphs().get(0);
-assertEquals("Notes-2", HSLFTextParagraph.getRawText(txrun));
-assertTrue(txrun.get(0).getTextRuns().get(0).isBold());
+List txrun;
+HSLFNotes notes;
-ppt.close();
+notes = ppt.getSlides().get(0).getNotes();
+assertNotNull(notes);
+txrun = notes.getTextParagraphs().get(0);
+assertEquals("Notes-1", HSLFTextParagraph.getRawText(txrun));
+assertFalse(txrun.get(0).getTextRuns().get(0).isBold());
+
+//notes for the second slide are in bold
+notes = ppt.getSlides().get(1).getNotes();
+assertNotNull(notes);
+txrun = notes.getTextParagraphs().get(0);
+assertEquals("Notes-2", HSLFTextParagraph.getRawText(txrun));
+assertTrue(txrun.get(0).getTextRuns().get(0).isBold());
+}
}
/**
@@ -148,29 +139,28 @@ public final class TestBugs {
*/
@Test
svn commit: r1884578 [1/2] - in /poi: site/src/documentation/content/xdocs/ site/src/documentation/content/xdocs/components/slideshow/ trunk/src/java/org/apache/poi/sl/draw/ trunk/src/ooxml/java/org/a
Author: kiwiwings
Date: Thu Dec 17 23:42:26 2020
New Revision: 1884578
URL: http://svn.apache.org/viewvc?rev=1884578=rev
Log:
#64876 - Unable to convert pptx to pdf
Added:
poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/DummyFormat.java (with
props)
poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/DummyGraphics2d.java
- copied, changed from r1884577,
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/DummyGraphics2d.java
Removed:
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/DummyGraphics2d.java
Modified:
poi/site/src/documentation/content/xdocs/changes.xml
poi/site/src/documentation/content/xdocs/components/slideshow/ppt-wmf-emf-renderer.xml
poi/trunk/src/java/org/apache/poi/sl/draw/DrawShape.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFShape.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java
poi/trunk/src/resources/devtools/findbugs-filters.xml
poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
Modified: poi/site/src/documentation/content/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/changes.xml?rev=1884578=1884577=1884578=diff
==
--- poi/site/src/documentation/content/xdocs/changes.xml (original)
+++ poi/site/src/documentation/content/xdocs/changes.xml Thu Dec 17 23:42:26
2020
@@ -124,6 +124,7 @@
Upgrade OOXML schema to 3rd edition
(transitional)
Change
artifact names of poi-/ooxml-schemas
Upgrade OOXML schema to 5th edition
(transitional)
+Unable to
convert pptx to pdf
Modified:
poi/site/src/documentation/content/xdocs/components/slideshow/ppt-wmf-emf-renderer.xml
URL:
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/components/slideshow/ppt-wmf-emf-renderer.xml?rev=1884578=1884577=1884578=diff
==
---
poi/site/src/documentation/content/xdocs/components/slideshow/ppt-wmf-emf-renderer.xml
(original)
+++
poi/site/src/documentation/content/xdocs/components/slideshow/ppt-wmf-emf-renderer.xml
Thu Dec 17 23:42:26 2020
@@ -42,7 +42,7 @@
-scale scale factor
-fixSidespecify side (long,short,width,height)
to fix - use as amount of pixels
-slide 1-based index of a slide to render
--format png,gif,jpg,svg,pdf (,null for testing)
+-format png,gif,jpg,svg,pdf (log,null for
testing)
-outdir output directory, defaults to origin of
the ppt/pptx file
-outfileoutput filename, defaults to
"${basename}-${slideno}.${format}"
-outpat output filename pattern, defaults to
"${basename}-${slideno}.${format}"
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/DrawShape.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/DrawShape.java?rev=1884578=1884577=1884578=diff
==
--- poi/trunk/src/java/org/apache/poi/sl/draw/DrawShape.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/DrawShape.java Thu Dec 17
23:42:26 2020
@@ -254,6 +254,6 @@ public class DrawShape implements Drawab
int lineJoin = BasicStroke.JOIN_ROUND;
-return new BasicStroke(lineWidth, lineCap, lineJoin, lineWidth,
dashPatF, dash_phase);
+return new BasicStroke(lineWidth, lineCap, lineJoin, 10, dashPatF,
dash_phase);
}
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFShape.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFShape.java?rev=1884578=1884577=1884578=diff
==
--- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFShape.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFShape.java Thu
Dec 17 23:42:26 2020
@@ -28,6 +28,8 @@ import java.util.Collection;
import java.util.List;
import java.util.Map.Entry;
+import com.microsoft.schemas.office.visio.x2012.main.ShapeSheetType;
+import com.microsoft.schemas.office.visio.x2012.main.TextType;
import org.apache.poi.ooxml.POIXMLException;
import org.apache.poi.util.Internal;
import org.apache.poi.xdgf.exceptions.XDGFException;
@@ -37,9 +39,6 @@ import org.apache.poi.xdgf.usermodel.sec
import org.apache.poi.xdgf.usermodel.shape.ShapeVisitor;
import org.apache.poi.xdgf.usermodel.shape.exceptions.StopVisitingThisBranch;
-import com.microsoft.schemas.office.visio.x2012.main.Sha
svn commit: r1884388 - /poi/trunk/build.gradle
Author: kiwiwings
Date: Sun Dec 13 18:46:14 2020
New Revision: 1884388
URL: http://svn.apache.org/viewvc?rev=1884388=rev
Log:
replace single with double quotes to enable variable substitution
Modified:
poi/trunk/build.gradle
Modified: poi/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1884388=1884387=1884388=diff
==
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Sun Dec 13 18:46:14 2020
@@ -302,7 +302,7 @@ project('ooxml') {
compile project(':main')
compile project(':scratchpad') // TODO: get rid of this
dependency!
-compile
files('../../build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version}.jar')
+compile
files("../../build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version}.jar")
testCompile "junit:junit:${junitVersion}"
testCompile "org.mockito:mockito-core:${mockitoVersion}"
@@ -338,7 +338,7 @@ project('examples') {
compile "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
-compile
files('../../build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version}.jar')
+compile
files("../../build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version}.jar")
compile "org.apache.commons:commons-compress:${commonsCompressVersion}"
}
@@ -385,7 +385,7 @@ project('integrationtest') {
testCompile "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
-testCompile
files('../../build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version}.jar')
+testCompile
files("../../build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version}.jar")
testCompile
files(this.project(':ooxml').sourceSets.test.runtimeClasspath)
}
-
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
svn commit: r1884387 - /poi/trunk/jenkins/create_jobs.groovy
Author: kiwiwings
Date: Sun Dec 13 18:11:48 2020
New Revision: 1884387
URL: http://svn.apache.org/viewvc?rev=1884387=rev
Log:
remove old ooxml beans
Modified:
poi/trunk/jenkins/create_jobs.groovy
Modified: poi/trunk/jenkins/create_jobs.groovy
URL:
http://svn.apache.org/viewvc/poi/trunk/jenkins/create_jobs.groovy?rev=1884387=1884386=1884387=diff
==
--- poi/trunk/jenkins/create_jobs.groovy (original)
+++ poi/trunk/jenkins/create_jobs.groovy Sun Dec 13 18:11:48 2020
@@ -253,6 +253,8 @@ poijobs.each { poijob ->
includePattern('**/lib/ooxml/xmlbeans*.jar')
includePattern('**/lib/ooxml/ooxml*.jar')
includePattern('sonar/*/target/**')
+/* remove ooxml-schemas while the builds migrate to 5th
edition */
+includePattern('build/xmlbean-*/**')
}
if(poijob.sonar) {
credentialsBinding {
-
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
svn commit: r1884386 - in /poi: site/src/documentation/content/xdocs/ site/src/documentation/content/xdocs/help/ trunk/maven/ trunk/src/examples/src/org/apache/poi/examples/xslf/ trunk/src/examples/sr
Author: kiwiwings
Date: Sun Dec 13 17:48:31 2020
New Revision: 1884386
URL: http://svn.apache.org/viewvc?rev=1884386=rev
Log:
#64981 - Upgrade OOXML schema to 5th edition (transitional)
Modified:
poi/site/src/documentation/content/xdocs/changes.xml
poi/site/src/documentation/content/xdocs/help/faq.xml
poi/trunk/maven/poi-ooxml-full.pom
poi/trunk/src/examples/src/org/apache/poi/examples/xslf/LinkVideoToPptx.java
poi/trunk/src/examples/src/org/apache/poi/examples/xssf/usermodel/BarChart.java
poi/trunk/src/examples/src/org/apache/poi/examples/xssf/usermodel/LineChart.java
poi/trunk/src/examples/src/org/apache/poi/examples/xssf/usermodel/ScatterChart.java
poi/trunk/src/multimodule/ooxml-full/java9/module-info.class
poi/trunk/src/multimodule/ooxml-full/java9/module-info.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellAlignment.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFAbstractSDT.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDefaultRunStyle.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java
poi/trunk/src/ooxml/resources/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Transitional.zip
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFExamples.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
Modified: poi/site/src/documentation/content/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/changes.xml?rev=1884386=1884385=1884386=diff
==
--- poi/site/src/documentation/content/xdocs/changes.xml (original)
+++ poi/site/src/documentation/content/xdocs/changes.xml Sun Dec 13 17:48:31
2020
@@ -72,7 +72,7 @@
-Upgrade to ECMA-376 3rd edition (transitional)
schemas - expect API breaks when using XmlBeans directly
+Upgrade to ECMA-376 5th edition (transitional)
schemas - expect API breaks when using XmlBeans directly
Change artifact names of poi-/ooxml-schemas to
poi-ooxml-lite/full
Upgrade to XMLSec 2.2.0
updated dependencies to Bouncycastle 1.67,
Commons-Codec 1.15, Commons-Compress 1.20
@@ -123,6 +123,7 @@
Change
some methods to return ints instead of shorts (Font and CellStyle)
Upgrade OOXML schema to 3rd edition
(transitional)
Change
artifact names of poi-/ooxml-schemas
+Upgrade OOXML schema to 5th edition
(transitional)
Modified: poi/site/src/documentation/content/xdocs/help/faq.xml
URL:
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/help/faq.xml?rev=1884386=1884385=1884386=diff
==
--- poi/site/src/documentation/content/xdocs/help/faq.xml (original)
+++ poi/site/src/documentation/content/xdocs/help/faq.xml Sun Dec 13 17:48:31
2020
@@ -138,7 +138,7 @@ System.out.println("POI Scratchpad came
poi-ooxml-full jar
POI 5.0.0 and newer
-Upgrade to ECMA-376 3rd edition - which is not downward
compatible
+Upgrade to ECMA-376 5th edition - which is not downward
compatible
Modified: poi/trunk/maven/poi-ooxml-full.pom
URL:
http://svn.apache.org/viewvc/poi/trunk/maven/poi-ooxml-full.pom?rev=1884386=1884385=1884386=diff
==
--- poi/trunk/maven/poi-ooxml-full.pom (original)
+++ poi/trunk/maven/poi-ooxml-full.pom Sun Dec 13 17:48:31 2020
@@ -28,7 +28,7 @@
@VERSION@
jar
Apache POI - OOXML schemas (full)
- XmlBeans generated from the Ecma supplied xsds (since POI
5.0.0, the 3rd edition is used):
+ XmlBeans generated from the Ecma supplied xsds (since POI
5.0.0, the 5th edition is used):
https://www.ecma-international.org/publications/standards/Ecma-376.htm
https://poi.apache.org/
Modified:
poi/trunk/src/examples/src/org/apache/poi/examples/xslf/LinkVideoToPptx.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/examples/xslf/LinkVideoToPptx.java?rev=1884386=1884385=1884386=diff
==
---
poi/trunk/src/examples/src/org/apache/poi/examples/xslf/LinkVideoToPptx.java
(original)
+++
poi/trunk/src/examples/src/org/apache/poi/examples/xslf/LinkVideoToPptx.java
Sun Dec 13 17:48:31 2020
@@ -107,7 +107,7 @@ public class LinkVideoToPptx {
ctn.setFill(STTLTimeNodeFillType.HOLD);
ctn.setDi
svn commit: r1884385 - /poi/site/src/documentation/content/xdocs/changes.xml
Author: kiwiwings Date: Sun Dec 13 16:00:53 2020 New Revision: 1884385 URL: http://svn.apache.org/viewvc?rev=1884385=rev Log: added summary items to 5.0.0 Modified: poi/site/src/documentation/content/xdocs/changes.xml Modified: poi/site/src/documentation/content/xdocs/changes.xml URL: http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/changes.xml?rev=1884385=1884384=1884385=diff == --- poi/site/src/documentation/content/xdocs/changes.xml (original) +++ poi/site/src/documentation/content/xdocs/changes.xml Sun Dec 13 16:00:53 2020 @@ -72,6 +72,8 @@ +Upgrade to ECMA-376 3rd edition (transitional) schemas - expect API breaks when using XmlBeans directly +Change artifact names of poi-/ooxml-schemas to poi-ooxml-lite/full Upgrade to XMLSec 2.2.0 updated dependencies to Bouncycastle 1.67, Commons-Codec 1.15, Commons-Compress 1.20 XWPF - improvements in table and paragraph @@ -100,7 +102,7 @@ RuntimeException on extracting text from Word 97-2004 Document CountryRecord not found Big POIFS stream result in OOM -Provide JigSaw modules +Provide JigSaw modules Synchronize code that initialises WorkbookFactory Support DateValue function Add an option for RangeCopier.copyRange() also clone styles @@ -119,7 +121,7 @@ Improve performance of cell merge Improve performance of SXSSF cell evaluation Change some methods to return ints instead of shorts (Font and CellStyle) -Upgrade OOXML schema to 3rd edition (transitional) +Upgrade OOXML schema to 3rd edition (transitional) Change artifact names of poi-/ooxml-schemas - To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org For additional commands, e-mail: commits-h...@poi.apache.org
