You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2020/01/03 23:30:37 UTC
svn commit: r1872302 [1/2] - in /poi/trunk/src:
java/org/apache/poi/hssf/record/ testcases/org/apache/poi/hssf/extractor/
testcases/org/apache/poi/hssf/model/ testcases/org/apache/poi/hssf/record/
testcases/org/apache/poi/hssf/record/chart/ testcases/o...
Author: kiwiwings
Date: Fri Jan 3 23:30:36 2020
New Revision: 1872302
URL: http://svn.apache.org/viewvc?rev=1872302&view=rev
Log:
Sonar fixes - Tests should include assertions
Modified:
poi/trunk/src/java/org/apache/poi/hssf/record/OldSheetRecord.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/TestFormulaParser.java
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestBOFRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestExtendedFormatRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestExternalNameRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFontRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNameCommentRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNameRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestObjRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPaneRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecalcIdRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestStyleRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSubRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSupBookRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestTableRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestWriteAccessRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesToChartGroupRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/OldSheetRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/OldSheetRecord.java?rev=1872302&r1=1872301&r2=1872302&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/OldSheetRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/OldSheetRecord.java Fri Jan 3 23:30:36 2020
@@ -17,8 +17,11 @@
package org.apache.poi.hssf.record;
+import java.io.IOException;
+
import org.apache.poi.util.HexDump;
import org.apache.poi.util.IOUtils;
+import org.apache.poi.util.RecordFormatException;
/**
* Title: Bound Sheet Record (aka BundleSheet) (0x0085) for BIFF 5<P>
@@ -44,6 +47,17 @@ public final class OldSheetRecord {
field_2_visibility = in.readUByte();
field_3_type = in.readUByte();
int field_4_sheetname_length = in.readUByte();
+ in.mark(1);
+ byte b = in.readByte();
+ // if the sheet name starts with a 0, we need to skip one byte, otherwise the following records will
+ // fail with a LeftOverDataException
+ if (b != 0) {
+ try {
+ in.reset();
+ } catch (IOException e) {
+ throw new RecordFormatException(e);
+ }
+ }
field_5_sheetname = IOUtils.safelyAllocate(field_4_sheetname_length, MAX_RECORD_LENGTH);
in.read(field_5_sheetname, 0, field_4_sheetname_length);
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java?rev=1872302&r1=1872301&r2=1872302&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java Fri Jan 3 23:30:36 2020
@@ -30,19 +30,19 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
+import java.security.Permission;
import org.apache.poi.EmptyFileException;
import org.apache.poi.EncryptedDocumentException;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.poifs.filesystem.OfficeXmlFileException;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.RecordFormatException;
-import org.junit.Ignore;
import org.junit.Test;
/**
- * Unit tests for the Excel 5/95 and Excel 4 (and older) text
+ * Unit tests for the Excel 5/95 and Excel 4 (and older) text
* extractor
*/
public final class TestOldExcelExtractor {
@@ -53,168 +53,163 @@ public final class TestOldExcelExtractor
@Test
public void testSimpleExcel3() throws IOException {
- OldExcelExtractor extractor = createExtractor("testEXCEL_3.xls");
+ try (OldExcelExtractor extractor = createExtractor("testEXCEL_3.xls")) {
+
+ // Check we can call getText without error
+ String text = extractor.getText();
- // Check we can call getText without error
- String text = extractor.getText();
+ // Check we find a few words we expect in there
+ assertContains(text, "Season beginning August");
+ assertContains(text, "USDA");
+
+ // Check we find a few numbers we expect in there
+ assertContains(text, "347");
+ assertContains(text, "228");
- // Check we find a few words we expect in there
- assertContains(text, "Season beginning August");
- assertContains(text, "USDA");
-
- // Check we find a few numbers we expect in there
- assertContains(text, "347");
- assertContains(text, "228");
-
- // Check we find a few string-literal dates in there
- assertContains(text, "1981/82");
-
- // Check the type
- assertEquals(3, extractor.getBiffVersion());
- assertEquals(0x10, extractor.getFileType());
+ // Check we find a few string-literal dates in there
+ assertContains(text, "1981/82");
+
+ // Check the type
+ assertEquals(3, extractor.getBiffVersion());
+ assertEquals(0x10, extractor.getFileType());
- extractor.close();
+ }
}
-
+
@Test
public void testSimpleExcel3NoReading() throws IOException {
- OldExcelExtractor extractor = createExtractor("testEXCEL_3.xls");
- assertNotNull(extractor);
-
- extractor.close();
+ try (OldExcelExtractor extractor = createExtractor("testEXCEL_3.xls")) {
+ assertNotNull(extractor);
+ }
}
@Test
public void testSimpleExcel4() throws IOException {
- OldExcelExtractor extractor = createExtractor("testEXCEL_4.xls");
-
- // Check we can call getText without error
- String text = extractor.getText();
+ try (OldExcelExtractor extractor = createExtractor("testEXCEL_4.xls")) {
- // Check we find a few words we expect in there
- assertContains(text, "Size");
- assertContains(text, "Returns");
-
- // Check we find a few numbers we expect in there
- assertContains(text, "11");
- assertContains(text, "784");
-
- // Check the type
- assertEquals(4, extractor.getBiffVersion());
- assertEquals(0x10, extractor.getFileType());
-
- extractor.close();
- }
-
- @Test
- public void testSimpleExcel5() throws IOException {
- for (String ver : new String[] {"5", "95"}) {
- OldExcelExtractor extractor = createExtractor("testEXCEL_"+ver+".xls");
-
// Check we can call getText without error
String text = extractor.getText();
-
+
// Check we find a few words we expect in there
- assertContains(text, "Sample Excel");
- assertContains(text, "Written and saved");
-
+ assertContains(text, "Size");
+ assertContains(text, "Returns");
+
// Check we find a few numbers we expect in there
- assertContains(text, "15");
- assertContains(text, "169");
-
- // Check we got the sheet names (new formats only)
- assertContains(text, "Sheet: Feuil3");
-
+ assertContains(text, "11");
+ assertContains(text, "784");
+
// Check the type
- assertEquals(5, extractor.getBiffVersion());
- assertEquals(0x05, extractor.getFileType());
+ assertEquals(4, extractor.getBiffVersion());
+ assertEquals(0x10, extractor.getFileType());
- extractor.close();
}
}
@Test
- public void testStrings() throws IOException {
- OldExcelExtractor extractor = createExtractor("testEXCEL_4.xls");
- String text = extractor.getText();
+ public void testSimpleExcel5() throws IOException {
+ for (String ver : new String[] {"5", "95"}) {
+ try (OldExcelExtractor extractor = createExtractor("testEXCEL_"+ver+".xls")) {
+
+ // Check we can call getText without error
+ String text = extractor.getText();
- // Simple strings
- assertContains(text, "Table 10 -- Examination Coverage:");
- assertContains(text, "Recommended and Average Recommended Additional Tax After");
- assertContains(text, "Individual income tax returns, total");
-
- // More complicated strings
- assertContains(text, "$100,000 or more");
- assertContains(text, "S corporation returns, Form 1120S [10,15]");
- assertContains(text, "individual income tax return \u201Cshort forms.\u201D");
-
- // Formula based strings
- // TODO Find some then test
+ // Check we find a few words we expect in there
+ assertContains(text, "Sample Excel");
+ assertContains(text, "Written and saved");
+
+ // Check we find a few numbers we expect in there
+ assertContains(text, "15");
+ assertContains(text, "169");
+
+ // Check we got the sheet names (new formats only)
+ assertContains(text, "Sheet: Feuil3");
+
+ // Check the type
+ assertEquals(5, extractor.getBiffVersion());
+ assertEquals(0x05, extractor.getFileType());
- extractor.close();
+ }
+ }
}
@Test
- public void testFormattedNumbersExcel4() throws IOException {
- OldExcelExtractor extractor = createExtractor("testEXCEL_4.xls");
- String text = extractor.getText();
+ public void testStrings() throws IOException {
+ try (OldExcelExtractor extractor = createExtractor("testEXCEL_4.xls")) {
+ String text = extractor.getText();
- // Simple numbers
- assertContains(text, "151");
- assertContains(text, "784");
-
- // Numbers which come from formulas
- assertContains(text, "0.398"); // TODO Rounding
- assertContains(text, "624");
-
- // Formatted numbers
- // TODO
-// assertContains(text, "55,624");
-// assertContains(text, "11,743,477");
+ // Simple strings
+ assertContains(text, "Table 10 -- Examination Coverage:");
+ assertContains(text, "Recommended and Average Recommended Additional Tax After");
+ assertContains(text, "Individual income tax returns, total");
+
+ // More complicated strings
+ assertContains(text, "$100,000 or more");
+ assertContains(text, "S corporation returns, Form 1120S [10,15]");
+ assertContains(text, "individual income tax return \u201Cshort forms.\u201D");
- extractor.close();
+ // Formula based strings
+ // TODO Find some then test
+ }
}
-
+
@Test
- public void testFormattedNumbersExcel5() throws IOException {
- for (String ver : new String[] {"5", "95"}) {
- OldExcelExtractor extractor = createExtractor("testEXCEL_"+ver+".xls");
+ public void testFormattedNumbersExcel4() throws IOException {
+ try (OldExcelExtractor extractor = createExtractor("testEXCEL_4.xls")) {
String text = extractor.getText();
-
+
// Simple numbers
- assertContains(text, "1");
-
+ assertContains(text, "151");
+ assertContains(text, "784");
+
// Numbers which come from formulas
- assertContains(text, "13");
- assertContains(text, "169");
-
+ assertContains(text, "0.398"); // TODO Rounding
+ assertContains(text, "624");
+
// Formatted numbers
// TODO
-// assertContains(text, "100.00%");
-// assertContains(text, "155.00%");
-// assertContains(text, "1,125");
-// assertContains(text, "189,945");
-// assertContains(text, "1,234,500");
-// assertContains(text, "$169.00");
-// assertContains(text, "$1,253.82");
+ // assertContains(text, "55,624");
+ // assertContains(text, "11,743,477");
+ }
+ }
+
+ @Test
+ public void testFormattedNumbersExcel5() throws IOException {
+ for (String ver : new String[] {"5", "95"}) {
+ try (OldExcelExtractor extractor = createExtractor("testEXCEL_"+ver+".xls")) {
+ String text = extractor.getText();
- extractor.close();
+ // Simple numbers
+ assertContains(text, "1");
+
+ // Numbers which come from formulas
+ assertContains(text, "13");
+ assertContains(text, "169");
+
+ // Formatted numbers
+ // TODO
+ // assertContains(text, "100.00%");
+ // assertContains(text, "155.00%");
+ // assertContains(text, "1,125");
+ // assertContains(text, "189,945");
+ // assertContains(text, "1,234,500");
+ // assertContains(text, "$169.00");
+ // assertContains(text, "$1,253.82");
+ }
}
}
-
+
@Test
public void testFromFile() throws IOException {
for (String ver : new String[] {"4", "5", "95"}) {
String filename = "testEXCEL_"+ver+".xls";
File f = HSSFTestDataSamples.getSampleFile(filename);
-
- OldExcelExtractor extractor = new OldExcelExtractor(f);
- String text = extractor.getText();
- assertNotNull(text);
- assertTrue(text.length() > 100);
- extractor.close();
+ try (OldExcelExtractor extractor = new OldExcelExtractor(f)) {
+ String text = extractor.getText();
+ assertNotNull(text);
+ assertTrue(text.length() > 100);
+ }
}
}
@@ -224,12 +219,11 @@ public final class TestOldExcelExtractor
String filename = "testEXCEL_"+ver+".xls";
File f = HSSFTestDataSamples.getSampleFile(filename);
- try (InputStream stream = new FileInputStream(f)) {
- OldExcelExtractor extractor = new OldExcelExtractor(stream);
+ try (InputStream stream = new FileInputStream(f);
+ OldExcelExtractor extractor = new OldExcelExtractor(stream)) {
String text = extractor.getText();
assertNotNull(text);
assertTrue(text.length() > 100);
- extractor.close();
}
}
}
@@ -237,14 +231,14 @@ public final class TestOldExcelExtractor
@Test(expected=OfficeXmlFileException.class)
public void testOpenInvalidFile1() throws IOException {
// a file that exists, but is a different format
- createExtractor("WithVariousData.xlsx");
+ createExtractor("WithVariousData.xlsx").close();
}
-
-
+
+
@Test(expected=RecordFormatException.class)
public void testOpenInvalidFile2() throws IOException {
// a completely different type of file
- createExtractor("48936-strings.txt");
+ createExtractor("48936-strings.txt").close();
}
@Test(expected=FileNotFoundException.class)
@@ -258,71 +252,72 @@ public final class TestOldExcelExtractor
@Test(expected=EmptyFileException.class)
public void testOpenNonExistingFile() throws IOException {
// a file that exists, but is a different format
- OldExcelExtractor extractor = new OldExcelExtractor(new File("notexistingfile.xls"));
- extractor.close();
+ new OldExcelExtractor(new File("notexistingfile.xls")).close();
}
-
+
@Test
public void testInputStream() throws IOException {
File file = HSSFTestDataSamples.getSampleFile("testEXCEL_3.xls");
- try (InputStream stream = new FileInputStream(file)) {
- OldExcelExtractor extractor = new OldExcelExtractor(stream);
+ try (InputStream stream = new FileInputStream(file);
+ OldExcelExtractor extractor = new OldExcelExtractor(stream);) {
String text = extractor.getText();
assertNotNull(text);
- extractor.close();
}
}
@Test
public void testInputStreamNPOIHeader() throws IOException {
File file = HSSFTestDataSamples.getSampleFile("FormulaRefs.xls");
- try (InputStream stream = new FileInputStream(file)) {
- OldExcelExtractor extractor = new OldExcelExtractor(stream);
- extractor.close();
+ try (InputStream stream = new FileInputStream(file);
+ OldExcelExtractor extractor = new OldExcelExtractor(stream)) {
+ String text = extractor.getText();
+ assertNotNull(text);
}
}
@Test
public void testPOIFSFileSystem() throws IOException {
File file = HSSFTestDataSamples.getSampleFile("FormulaRefs.xls");
- try (POIFSFileSystem fs = new POIFSFileSystem(file)) {
- OldExcelExtractor extractor = new OldExcelExtractor(fs);
- extractor.close();
+ try (POIFSFileSystem fs = new POIFSFileSystem(file);
+ OldExcelExtractor extractor = new OldExcelExtractor(fs)){
+ String text = extractor.getText();
+ assertNotNull(text);
}
}
@Test
public void testDirectoryNode() throws IOException {
File file = HSSFTestDataSamples.getSampleFile("FormulaRefs.xls");
- try (POIFSFileSystem fs = new POIFSFileSystem(file)) {
- OldExcelExtractor extractor = new OldExcelExtractor(fs.getRoot());
- extractor.close();
+ try (POIFSFileSystem fs = new POIFSFileSystem(file);
+ OldExcelExtractor extractor = new OldExcelExtractor(fs.getRoot())) {
+ String text = extractor.getText();
+ assertNotNull(text);
}
}
- @Test
+ @Test(expected = FileNotFoundException.class)
public void testDirectoryNodeInvalidFile() throws IOException {
File file = POIDataSamples.getDocumentInstance().getFile("test.doc");
- try (POIFSFileSystem fs = new POIFSFileSystem(file)) {
- OldExcelExtractor extractor = new OldExcelExtractor(fs.getRoot());
- extractor.close();
- fail("Should catch exception here");
- } catch (FileNotFoundException e) {
- // expected here
+ try (POIFSFileSystem fs = new POIFSFileSystem(file);
+ OldExcelExtractor extractor = new OldExcelExtractor(fs.getRoot())) {
+ fail("Should throw exception here");
}
}
- @Ignore("Calls System.exit()")
- @Test
+ @Test(expected = ExitException.class)
public void testMainUsage() throws IOException {
PrintStream save = System.err;
+ SecurityManager sm = System.getSecurityManager();
+ System.setSecurityManager(new NoExitSecurityManager());
try {
try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
PrintStream str = new PrintStream(out, false, "UTF-8");
System.setErr(str);
+ // calls System.exit()
OldExcelExtractor.main(new String[]{});
}
} finally {
+ System.setSecurityManager(sm);
System.setErr(save);
}
}
@@ -333,34 +328,49 @@ public final class TestOldExcelExtractor
PrintStream save = System.out;
try {
ByteArrayOutputStream out = new ByteArrayOutputStream();
- try {
- PrintStream str = new PrintStream(out, false, "UTF-8");
- System.setOut(str);
- OldExcelExtractor.main(new String[] {file.getAbsolutePath()});
- } finally {
- out.close();
- }
+ PrintStream str = new PrintStream(out, false, "UTF-8");
+ System.setOut(str);
+ OldExcelExtractor.main(new String[] {file.getAbsolutePath()});
String string = out.toString("UTF-8");
- assertTrue("Had: " + string,
- string.contains("Table C-13--Lemons"));
+ assertTrue("Had: " + string, string.contains("Table C-13--Lemons"));
} finally {
System.setOut(save);
}
}
- @Test
+ @Test(expected = EncryptedDocumentException.class)
public void testEncryptionException() throws IOException {
//test file derives from Common Crawl
File file = HSSFTestDataSamples.getSampleFile("60284.xls");
- OldExcelExtractor ex = new OldExcelExtractor(file);
- assertEquals(5, ex.getBiffVersion());
- assertEquals(5, ex.getFileType());
- try {
+
+ try (OldExcelExtractor ex = new OldExcelExtractor(file)) {
+ assertEquals(5, ex.getBiffVersion());
+ assertEquals(5, ex.getFileType());
ex.getText();
- fail();
- } catch (EncryptedDocumentException e) {
- assertTrue("correct exception thrown", true);
}
- ex.close();
+ }
+
+ private static class NoExitSecurityManager extends SecurityManager {
+ @Override
+ public void checkPermission(Permission perm) {
+ // allow anything.
+ }
+ @Override
+ public void checkPermission(Permission perm, Object context) {
+ // allow anything.
+ }
+ @Override
+ public void checkExit(int status) {
+ super.checkExit(status);
+ throw new ExitException(status);
+ }
+ }
+
+ private static class ExitException extends SecurityException {
+ public final int status;
+ public ExitException(int status) {
+ super("There is no escape!");
+ this.status = status;
+ }
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java?rev=1872302&r1=1872301&r2=1872302&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java Fri Jan 3 23:30:36 2020
@@ -27,10 +27,8 @@ import static org.junit.Assert.fail;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.FilenameFilter;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -178,15 +176,10 @@ public class TestDrawingAggregate {
@Test
public void testAllTestSamples() throws IOException {
File[] xls = new File(System.getProperty("POI.testdata.path"), "spreadsheet").listFiles(
- new FilenameFilter() {
- @Override
- public boolean accept(File dir, String name) {
- return name.endsWith(".xls");
- }
- }
+ (dir, name) -> name.endsWith(".xls")
);
assertNotNull(
- "Need to find files in test-data path, had path: " + new File(System.getProperty("POI.testdata.path"), "spreadsheet"),
+ "Need to find files in test-data path, had path: " + new File(System.getProperty("POI.testdata.path"), "spreadsheet"),
xls);
for(File file : xls) {
HSSFWorkbook wb;
@@ -203,7 +196,7 @@ public class TestDrawingAggregate {
String filename = file.getName();
System.out.println("Drawing Aggregate re-write test failed for " + filename);
e.printStackTrace(System.out);
-
+
fail("Error when writing and re-reading workbook " + filename + "\n" + e);
}
wb.close();
@@ -246,12 +239,17 @@ public class TestDrawingAggregate {
*/
@Test
public void testFailing() throws IOException {
- HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("15573.xls");
- HSSFSheet sh = wb.getSheetAt(0);
- sh.getDrawingPatriarch();
-
- HSSFTestDataSamples.writeOutAndReadBack(wb).close();
- wb.close();
+ try (HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("15573.xls")) {
+ HSSFSheet sh = wb.getSheetAt(0);
+ HSSFPatriarch dp = sh.getDrawingPatriarch();
+ assertNotNull(dp);
+
+ try (HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb)) {
+ HSSFSheet sh2 = wb2.getSheetAt(0);
+ HSSFPatriarch dp2 = sh2.getDrawingPatriarch();
+ assertNotNull(dp2);
+ }
+ }
}
private static byte[] toByteArray(List<RecordBase> records) {
@@ -269,76 +267,81 @@ public class TestDrawingAggregate {
@Test
public void testSolverContainerMustBeSavedDuringSerialization() throws IOException{
- HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("SolverContainerAfterSPGR.xls");
- HSSFSheet sh = wb1.getSheetAt(0);
- InternalSheet ish = HSSFTestHelper.getSheetForTest(sh);
- List<RecordBase> records = ish.getRecords();
- // records to be aggregated
- List<RecordBase> dgRecords = records.subList(19, 22);
- byte[] dgBytes = toByteArray(dgRecords);
- sh.getDrawingPatriarch();
- EscherAggregate agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
- assertEquals(agg.getEscherRecords().get(0).getChildRecords().size(), 3);
- assertEquals(agg.getEscherRecords().get(0).getChild(2).getRecordId(), EscherContainerRecord.SOLVER_CONTAINER);
- HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
- wb1.close();
- sh = wb2.getSheetAt(0);
- sh.getDrawingPatriarch();
- ish = HSSFTestHelper.getSheetForTest(sh);
- agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
- assertEquals(agg.getEscherRecords().get(0).getChildRecords().size(), 3);
- assertEquals(agg.getEscherRecords().get(0).getChild(2).getRecordId(), EscherContainerRecord.SOLVER_CONTAINER);
-
-
- // collect drawing records into a byte buffer.
- agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
- byte[] dgBytesAfterSave = agg.serialize();
- assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
- assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
- wb2.close();
+ try (HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("SolverContainerAfterSPGR.xls")) {
+ HSSFSheet sh = wb1.getSheetAt(0);
+ InternalSheet ish = HSSFTestHelper.getSheetForTest(sh);
+ List<RecordBase> records = ish.getRecords();
+ // records to be aggregated
+ List<RecordBase> dgRecords = records.subList(19, 22);
+ byte[] dgBytes = toByteArray(dgRecords);
+ sh.getDrawingPatriarch();
+ EscherAggregate agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
+ assertNotNull(agg);
+ assertEquals(agg.getEscherRecords().get(0).getChildRecords().size(), 3);
+ assertEquals(agg.getEscherRecords().get(0).getChild(2).getRecordId(), EscherContainerRecord.SOLVER_CONTAINER);
+ try (HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1)) {
+ sh = wb2.getSheetAt(0);
+ sh.getDrawingPatriarch();
+ ish = HSSFTestHelper.getSheetForTest(sh);
+ agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
+ assertNotNull(agg);
+ assertEquals(agg.getEscherRecords().get(0).getChildRecords().size(), 3);
+ assertEquals(agg.getEscherRecords().get(0).getChild(2).getRecordId(), EscherContainerRecord.SOLVER_CONTAINER);
+
+
+ // collect drawing records into a byte buffer.
+ agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
+ assertNotNull(agg);
+ byte[] dgBytesAfterSave = agg.serialize();
+ assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
+ assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
+ }
+ }
}
@Test
public void testFileWithTextbox() throws IOException{
- HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("text.xls");
- HSSFSheet sh = wb.getSheetAt(0);
- InternalSheet ish = HSSFTestHelper.getSheetForTest(sh);
- List<RecordBase> records = ish.getRecords();
- // records to be aggregated
- List<RecordBase> dgRecords = records.subList(19, 23);
- byte[] dgBytes = toByteArray(dgRecords);
- sh.getDrawingPatriarch();
-
- // collect drawing records into a byte buffer.
- EscherAggregate agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
- byte[] dgBytesAfterSave = agg.serialize();
- assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
- assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
- wb.close();
+ try (HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("text.xls")) {
+ HSSFSheet sh = wb.getSheetAt(0);
+ InternalSheet ish = HSSFTestHelper.getSheetForTest(sh);
+ List<RecordBase> records = ish.getRecords();
+ // records to be aggregated
+ List<RecordBase> dgRecords = records.subList(19, 23);
+ byte[] dgBytes = toByteArray(dgRecords);
+ sh.getDrawingPatriarch();
+
+ // collect drawing records into a byte buffer.
+ EscherAggregate agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
+ assertNotNull(agg);
+ byte[] dgBytesAfterSave = agg.serialize();
+ assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
+ assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
+ }
}
@Test
public void testFileWithCharts() throws IOException {
- HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("49581.xls");
- HSSFSheet sh = wb.getSheetAt(0);
- InternalSheet ish = HSSFTestHelper.getSheetForTest(sh);
- List<RecordBase> records = ish.getRecords();
- // records to be aggregated
- List<RecordBase> dgRecords = records.subList(19, 21);
- byte[] dgBytes = toByteArray(dgRecords);
- sh.getDrawingPatriarch();
-
- // collect drawing records into a byte buffer.
- EscherAggregate agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
- byte[] dgBytesAfterSave = agg.serialize();
- assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
- for (int i=0; i< dgBytes.length; i++){
- if (dgBytes[i] != dgBytesAfterSave[i]){
- System.out.println("pos = " + i);
+ try (HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("49581.xls")) {
+ HSSFSheet sh = wb.getSheetAt(0);
+ InternalSheet ish = HSSFTestHelper.getSheetForTest(sh);
+ List<RecordBase> records = ish.getRecords();
+ // records to be aggregated
+ List<RecordBase> dgRecords = records.subList(19, 21);
+ byte[] dgBytes = toByteArray(dgRecords);
+ sh.getDrawingPatriarch();
+
+ // collect drawing records into a byte buffer.
+ EscherAggregate agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
+ assertNotNull(agg);
+ byte[] dgBytesAfterSave = agg.serialize();
+ assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
+ for (int i = 0; i < dgBytes.length; i++) {
+ if (dgBytes[i] != dgBytesAfterSave[i]) {
+ System.out.println("pos = " + i);
+ }
}
+ assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
}
- assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
- wb.close();
}
/**
@@ -346,62 +349,62 @@ public class TestDrawingAggregate {
*/
@Test
public void test45129() throws IOException {
- HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("45129.xls");
- HSSFSheet sh = wb.getSheetAt(0);
+ try (HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("45129.xls")) {
+ HSSFSheet sh = wb.getSheetAt(0);
- InternalWorkbook iworkbook = HSSFTestHelper.getWorkbookForTest(wb);
- InternalSheet isheet = HSSFTestHelper.getSheetForTest(sh);
+ InternalWorkbook iworkbook = HSSFTestHelper.getWorkbookForTest(wb);
+ InternalSheet isheet = HSSFTestHelper.getSheetForTest(sh);
- List<RecordBase> records = isheet.getRecords();
+ List<RecordBase> records = isheet.getRecords();
- // the sheet's drawing is not aggregated
- assertEquals("wrong size of sheet records stream", 394, records.size());
- // the last record before the drawing block
- assertTrue(
- "records.get(18) is expected to be RowRecordsAggregate but was " + records.get(18).getClass().getSimpleName(),
- records.get(18) instanceof RowRecordsAggregate);
-
- // records to be aggregated
- List<RecordBase> dgRecords = records.subList(19, 389);
- // collect drawing records into a byte buffer.
- byte[] dgBytes = toByteArray(dgRecords);
+ // the sheet's drawing is not aggregated
+ assertEquals("wrong size of sheet records stream", 394, records.size());
+ // the last record before the drawing block
+ assertTrue(
+ "records.get(18) is expected to be RowRecordsAggregate but was " + records.get(18).getClass().getSimpleName(),
+ records.get(18) instanceof RowRecordsAggregate);
- for (RecordBase rb : dgRecords) {
- Record r = (Record) rb;
- short sid = r.getSid();
- // we expect that drawing block consists of either
- // DrawingRecord or ContinueRecord or ObjRecord or TextObjectRecord
- assertTrue(
- sid == DrawingRecord.sid ||
- sid == ContinueRecord.sid ||
- sid == ObjRecord.sid ||
- sid == TextObjectRecord.sid);
- }
-
- // the first record after the drawing block
- assertTrue(
- "records.get(389) is expected to be Window2",
- records.get(389) instanceof WindowTwoRecord);
-
- // aggregate drawing records.
- // The subrange [19, 388] is expected to be replaced with a EscherAggregate object
- DrawingManager2 drawingManager = iworkbook.findDrawingGroup();
- int loc = isheet.aggregateDrawingRecords(drawingManager, false);
- EscherAggregate agg = (EscherAggregate) records.get(loc);
-
- assertEquals("wrong size of the aggregated sheet records stream", 25, records.size());
- assertTrue(
- "records.get(18) is expected to be RowRecordsAggregate but was " + records.get(18).getClass().getSimpleName(),
- records.get(18) instanceof RowRecordsAggregate);
- assertTrue("records.get(19) is expected to be EscherAggregate but was " + records.get(19).getClass().getSimpleName(),
- records.get(19) instanceof EscherAggregate);
- assertTrue("records.get(20) is expected to be Window2 but was " + records.get(20).getClass().getSimpleName(),
- records.get(20) instanceof WindowTwoRecord);
-
- byte[] dgBytesAfterSave = agg.serialize();
- assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
- assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
- wb.close();
+ // records to be aggregated
+ List<RecordBase> dgRecords = records.subList(19, 389);
+ // collect drawing records into a byte buffer.
+ byte[] dgBytes = toByteArray(dgRecords);
+
+ for (RecordBase rb : dgRecords) {
+ Record r = (Record) rb;
+ short sid = r.getSid();
+ // we expect that drawing block consists of either
+ // DrawingRecord or ContinueRecord or ObjRecord or TextObjectRecord
+ assertTrue(
+ sid == DrawingRecord.sid ||
+ sid == ContinueRecord.sid ||
+ sid == ObjRecord.sid ||
+ sid == TextObjectRecord.sid);
+ }
+
+ // the first record after the drawing block
+ assertTrue(
+ "records.get(389) is expected to be Window2",
+ records.get(389) instanceof WindowTwoRecord);
+
+ // aggregate drawing records.
+ // The subrange [19, 388] is expected to be replaced with a EscherAggregate object
+ DrawingManager2 drawingManager = iworkbook.findDrawingGroup();
+ int loc = isheet.aggregateDrawingRecords(drawingManager, false);
+ EscherAggregate agg = (EscherAggregate) records.get(loc);
+
+ assertEquals("wrong size of the aggregated sheet records stream", 25, records.size());
+ assertTrue(
+ "records.get(18) is expected to be RowRecordsAggregate but was " + records.get(18).getClass().getSimpleName(),
+ records.get(18) instanceof RowRecordsAggregate);
+ assertTrue("records.get(19) is expected to be EscherAggregate but was " + records.get(19).getClass().getSimpleName(),
+ records.get(19) instanceof EscherAggregate);
+ assertTrue("records.get(20) is expected to be Window2 but was " + records.get(20).getClass().getSimpleName(),
+ records.get(20) instanceof WindowTwoRecord);
+
+ byte[] dgBytesAfterSave = agg.serialize();
+ assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
+ assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
+ }
}
/**
@@ -414,208 +417,207 @@ public class TestDrawingAggregate {
*/
@Test
public void testSerializeDrawingBigger8k() throws IOException {
- HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("DrawingContinue.xls");
- InternalWorkbook iworkbook = HSSFTestHelper.getWorkbookForTest(wb);
- HSSFSheet sh = wb.getSheetAt(0);
- InternalSheet isheet = HSSFTestHelper.getSheetForTest(sh);
-
-
- List<RecordBase> records = isheet.getRecords();
-
- // the sheet's drawing is not aggregated
- assertEquals("wrong size of sheet records stream", 32, records.size());
- // the last record before the drawing block
- assertTrue(
- "records.get(18) is expected to be RowRecordsAggregate but was " + records.get(18).getClass().getSimpleName(),
- records.get(18) instanceof RowRecordsAggregate);
-
- // records to be aggregated
- List<RecordBase> dgRecords = records.subList(19, 26);
- for (RecordBase rb : dgRecords) {
- Record r = (Record) rb;
- short sid = r.getSid();
- // we expect that drawing block consists of either
- // DrawingRecord or ContinueRecord or ObjRecord or TextObjectRecord
- assertTrue(
- sid == DrawingRecord.sid ||
- sid == ContinueRecord.sid ||
- sid == ObjRecord.sid ||
- sid == NoteRecord.sid ||
- sid == TextObjectRecord.sid);
- }
- // collect drawing records into a byte buffer.
- byte[] dgBytes = toByteArray(dgRecords);
-
- // the first record after the drawing block
- assertTrue(
- "records.get(26) is expected to be Window2",
- records.get(26) instanceof WindowTwoRecord);
-
- // aggregate drawing records.
- // The subrange [19, 38] is expected to be replaced with a EscherAggregate object
- DrawingManager2 drawingManager = iworkbook.findDrawingGroup();
- int loc = isheet.aggregateDrawingRecords(drawingManager, false);
- EscherAggregate agg = (EscherAggregate) records.get(loc);
-
- assertEquals("wrong size of the aggregated sheet records stream", 26, records.size());
- assertTrue(
- "records.get(18) is expected to be RowRecordsAggregate but was " + records.get(18).getClass().getSimpleName(),
- records.get(18) instanceof RowRecordsAggregate);
- assertTrue("records.get(19) is expected to be EscherAggregate but was " + records.get(19).getClass().getSimpleName(),
- records.get(19) instanceof EscherAggregate);
- assertTrue("records.get(20) is expected to be Window2 but was " + records.get(20).getClass().getSimpleName(),
- records.get(20) instanceof WindowTwoRecord);
-
- byte[] dgBytesAfterSave = agg.serialize();
- assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
- assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
- wb.close();
+ try (HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("DrawingContinue.xls")) {
+ InternalWorkbook iworkbook = HSSFTestHelper.getWorkbookForTest(wb);
+ HSSFSheet sh = wb.getSheetAt(0);
+ InternalSheet isheet = HSSFTestHelper.getSheetForTest(sh);
+
+
+ List<RecordBase> records = isheet.getRecords();
+
+ // the sheet's drawing is not aggregated
+ assertEquals("wrong size of sheet records stream", 32, records.size());
+ // the last record before the drawing block
+ assertTrue(
+ "records.get(18) is expected to be RowRecordsAggregate but was " + records.get(18).getClass().getSimpleName(),
+ records.get(18) instanceof RowRecordsAggregate);
+
+ // records to be aggregated
+ List<RecordBase> dgRecords = records.subList(19, 26);
+ for (RecordBase rb : dgRecords) {
+ Record r = (Record) rb;
+ short sid = r.getSid();
+ // we expect that drawing block consists of either
+ // DrawingRecord or ContinueRecord or ObjRecord or TextObjectRecord
+ assertTrue(
+ sid == DrawingRecord.sid ||
+ sid == ContinueRecord.sid ||
+ sid == ObjRecord.sid ||
+ sid == NoteRecord.sid ||
+ sid == TextObjectRecord.sid);
+ }
+ // collect drawing records into a byte buffer.
+ byte[] dgBytes = toByteArray(dgRecords);
+
+ // the first record after the drawing block
+ assertTrue(
+ "records.get(26) is expected to be Window2",
+ records.get(26) instanceof WindowTwoRecord);
+
+ // aggregate drawing records.
+ // The subrange [19, 38] is expected to be replaced with a EscherAggregate object
+ DrawingManager2 drawingManager = iworkbook.findDrawingGroup();
+ int loc = isheet.aggregateDrawingRecords(drawingManager, false);
+ EscherAggregate agg = (EscherAggregate) records.get(loc);
+
+ assertEquals("wrong size of the aggregated sheet records stream", 26, records.size());
+ assertTrue(
+ "records.get(18) is expected to be RowRecordsAggregate but was " + records.get(18).getClass().getSimpleName(),
+ records.get(18) instanceof RowRecordsAggregate);
+ assertTrue("records.get(19) is expected to be EscherAggregate but was " + records.get(19).getClass().getSimpleName(),
+ records.get(19) instanceof EscherAggregate);
+ assertTrue("records.get(20) is expected to be Window2 but was " + records.get(20).getClass().getSimpleName(),
+ records.get(20) instanceof WindowTwoRecord);
+
+ byte[] dgBytesAfterSave = agg.serialize();
+ assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
+ assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
+ }
}
@Test
public void testSerializeDrawingBigger8k_noAggregation() throws IOException {
- HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("DrawingContinue.xls");
-
- InternalSheet isheet = HSSFTestHelper.getSheetForTest(wb1.getSheetAt(0));
- List<RecordBase> records = isheet.getRecords();
+ try (HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("DrawingContinue.xls")) {
+ InternalSheet isheet = HSSFTestHelper.getSheetForTest(wb1.getSheetAt(0));
+ List<RecordBase> records = isheet.getRecords();
- HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
- wb1.close();
- InternalSheet isheet2 = HSSFTestHelper.getSheetForTest(wb2.getSheetAt(0));
- List<RecordBase> records2 = isheet2.getRecords();
-
- assertEquals(records.size(), records2.size());
- for (int i = 0; i < records.size(); i++) {
- RecordBase r1 = records.get(i);
- RecordBase r2 = records2.get(i);
- assertSame(r1.getClass(), r2.getClass());
- assertEquals(r1.getRecordSize(), r2.getRecordSize());
- if (r1 instanceof Record) {
- assertEquals(((Record) r1).getSid(), ((Record) r2).getSid());
- assertArrayEquals(((Record) r1).serialize(), ((Record) r2).serialize());
+ try (HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1)) {
+ InternalSheet isheet2 = HSSFTestHelper.getSheetForTest(wb2.getSheetAt(0));
+ List<RecordBase> records2 = isheet2.getRecords();
+
+ assertEquals(records.size(), records2.size());
+ for (int i = 0; i < records.size(); i++) {
+ RecordBase r1 = records.get(i);
+ RecordBase r2 = records2.get(i);
+ assertSame(r1.getClass(), r2.getClass());
+ assertEquals(r1.getRecordSize(), r2.getRecordSize());
+ if (r1 instanceof Record) {
+ assertEquals(((Record) r1).getSid(), ((Record) r2).getSid());
+ assertArrayEquals(((Record) r1).serialize(), ((Record) r2).serialize());
+ }
+ }
}
}
- wb2.close();
}
@Test
public void testSerializeDrawingWithComments() throws IOException {
- HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("DrawingAndComments.xls");
- HSSFSheet sh = wb.getSheetAt(0);
- InternalWorkbook iworkbook = HSSFTestHelper.getWorkbookForTest(wb);
- InternalSheet isheet = HSSFTestHelper.getSheetForTest(sh);
-
- List<RecordBase> records = isheet.getRecords();
-
- // the sheet's drawing is not aggregated
- assertEquals("wrong size of sheet records stream", 46, records.size());
- // the last record before the drawing block
- assertTrue(
- "records.get(18) is expected to be RowRecordsAggregate but was " + records.get(18).getClass().getSimpleName(),
- records.get(18) instanceof RowRecordsAggregate);
-
- // records to be aggregated
- List<RecordBase> dgRecords = records.subList(19, 39);
- for (RecordBase rb : dgRecords) {
- Record r = (Record) rb;
- short sid = r.getSid();
- // we expect that drawing block consists of either
- // DrawingRecord or ContinueRecord or ObjRecord or TextObjectRecord
- assertTrue(
- sid == DrawingRecord.sid ||
- sid == ContinueRecord.sid ||
- sid == ObjRecord.sid ||
- sid == NoteRecord.sid ||
- sid == TextObjectRecord.sid);
- }
- // collect drawing records into a byte buffer.
- byte[] dgBytes = toByteArray(dgRecords);
-
- // the first record after the drawing block
- assertTrue(
- "records.get(39) is expected to be Window2",
- records.get(39) instanceof WindowTwoRecord);
-
- // aggregate drawing records.
- // The subrange [19, 38] is expected to be replaced with a EscherAggregate object
- DrawingManager2 drawingManager = iworkbook.findDrawingGroup();
- int loc = isheet.aggregateDrawingRecords(drawingManager, false);
- EscherAggregate agg = (EscherAggregate) records.get(loc);
-
- assertEquals("wrong size of the aggregated sheet records stream", 27, records.size());
- assertTrue(
- "records.get(18) is expected to be RowRecordsAggregate but was " + records.get(18).getClass().getSimpleName(),
- records.get(18) instanceof RowRecordsAggregate);
- assertTrue("records.get(19) is expected to be EscherAggregate but was " + records.get(19).getClass().getSimpleName(),
- records.get(19) instanceof EscherAggregate);
- assertTrue("records.get(20) is expected to be Window2 but was " + records.get(20).getClass().getSimpleName(),
- records.get(20) instanceof WindowTwoRecord);
-
- byte[] dgBytesAfterSave = agg.serialize();
- assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
- assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
- wb.close();
+ try (HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("DrawingAndComments.xls")) {
+ HSSFSheet sh = wb.getSheetAt(0);
+ InternalWorkbook iworkbook = HSSFTestHelper.getWorkbookForTest(wb);
+ InternalSheet isheet = HSSFTestHelper.getSheetForTest(sh);
+
+ List<RecordBase> records = isheet.getRecords();
+
+ // the sheet's drawing is not aggregated
+ assertEquals("wrong size of sheet records stream", 46, records.size());
+ // the last record before the drawing block
+ assertTrue(
+ "records.get(18) is expected to be RowRecordsAggregate but was " + records.get(18).getClass().getSimpleName(),
+ records.get(18) instanceof RowRecordsAggregate);
+
+ // records to be aggregated
+ List<RecordBase> dgRecords = records.subList(19, 39);
+ for (RecordBase rb : dgRecords) {
+ Record r = (Record) rb;
+ short sid = r.getSid();
+ // we expect that drawing block consists of either
+ // DrawingRecord or ContinueRecord or ObjRecord or TextObjectRecord
+ assertTrue(
+ sid == DrawingRecord.sid ||
+ sid == ContinueRecord.sid ||
+ sid == ObjRecord.sid ||
+ sid == NoteRecord.sid ||
+ sid == TextObjectRecord.sid);
+ }
+ // collect drawing records into a byte buffer.
+ byte[] dgBytes = toByteArray(dgRecords);
+
+ // the first record after the drawing block
+ assertTrue(
+ "records.get(39) is expected to be Window2",
+ records.get(39) instanceof WindowTwoRecord);
+
+ // aggregate drawing records.
+ // The subrange [19, 38] is expected to be replaced with a EscherAggregate object
+ DrawingManager2 drawingManager = iworkbook.findDrawingGroup();
+ int loc = isheet.aggregateDrawingRecords(drawingManager, false);
+ EscherAggregate agg = (EscherAggregate) records.get(loc);
+
+ assertEquals("wrong size of the aggregated sheet records stream", 27, records.size());
+ assertTrue(
+ "records.get(18) is expected to be RowRecordsAggregate but was " + records.get(18).getClass().getSimpleName(),
+ records.get(18) instanceof RowRecordsAggregate);
+ assertTrue("records.get(19) is expected to be EscherAggregate but was " + records.get(19).getClass().getSimpleName(),
+ records.get(19) instanceof EscherAggregate);
+ assertTrue("records.get(20) is expected to be Window2 but was " + records.get(20).getClass().getSimpleName(),
+ records.get(20) instanceof WindowTwoRecord);
+
+ byte[] dgBytesAfterSave = agg.serialize();
+ assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
+ assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
+ }
}
@Test
public void testFileWithPictures() throws IOException {
- HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("ContinueRecordProblem.xls");
- HSSFSheet sh = wb.getSheetAt(0);
+ try (HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("ContinueRecordProblem.xls")) {
+ HSSFSheet sh = wb.getSheetAt(0);
- InternalWorkbook iworkbook = HSSFTestHelper.getWorkbookForTest(wb);
- InternalSheet isheet = HSSFTestHelper.getSheetForTest(sh);
+ InternalWorkbook iworkbook = HSSFTestHelper.getWorkbookForTest(wb);
+ InternalSheet isheet = HSSFTestHelper.getSheetForTest(sh);
- List<RecordBase> records = isheet.getRecords();
+ List<RecordBase> records = isheet.getRecords();
- // the sheet's drawing is not aggregated
- assertEquals("wrong size of sheet records stream", 315, records.size());
- // the last record before the drawing block
- assertTrue(
- "records.get(21) is expected to be RowRecordsAggregate but was " + records.get(21).getClass().getSimpleName(),
- records.get(21) instanceof RowRecordsAggregate);
-
- // records to be aggregated
- List<RecordBase> dgRecords = records.subList(22, 300);
- for (RecordBase rb : dgRecords) {
- Record r = (Record) rb;
- short sid = r.getSid();
- // we expect that drawing block consists of either
- // DrawingRecord or ContinueRecord or ObjRecord or TextObjectRecord
- assertTrue(
- sid == DrawingRecord.sid ||
- sid == ContinueRecord.sid ||
- sid == ObjRecord.sid ||
- sid == TextObjectRecord.sid);
- }
- // collect drawing records into a byte buffer.
- byte[] dgBytes = toByteArray(dgRecords);
-
- // the first record after the drawing block
- assertTrue(
- "records.get(300) is expected to be Window2",
- records.get(300) instanceof WindowTwoRecord);
-
- // aggregate drawing records.
- // The subrange [19, 299] is expected to be replaced with a EscherAggregate object
- DrawingManager2 drawingManager = iworkbook.findDrawingGroup();
- int loc = isheet.aggregateDrawingRecords(drawingManager, false);
- EscherAggregate agg = (EscherAggregate) records.get(loc);
-
- assertEquals("wrong size of the aggregated sheet records stream", 38, records.size());
- assertTrue(
- "records.get(21) is expected to be RowRecordsAggregate but was " + records.get(21).getClass().getSimpleName(),
- records.get(21) instanceof RowRecordsAggregate);
- assertTrue("records.get(22) is expected to be EscherAggregate but was " + records.get(22).getClass().getSimpleName(),
- records.get(22) instanceof EscherAggregate);
- assertTrue("records.get(23) is expected to be Window2 but was " + records.get(23).getClass().getSimpleName(),
- records.get(23) instanceof WindowTwoRecord);
-
- byte[] dgBytesAfterSave = agg.serialize();
- assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
- assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
- wb.close();
+ // the sheet's drawing is not aggregated
+ assertEquals("wrong size of sheet records stream", 315, records.size());
+ // the last record before the drawing block
+ assertTrue(
+ "records.get(21) is expected to be RowRecordsAggregate but was " + records.get(21).getClass().getSimpleName(),
+ records.get(21) instanceof RowRecordsAggregate);
+
+ // records to be aggregated
+ List<RecordBase> dgRecords = records.subList(22, 300);
+ for (RecordBase rb : dgRecords) {
+ Record r = (Record) rb;
+ short sid = r.getSid();
+ // we expect that drawing block consists of either
+ // DrawingRecord or ContinueRecord or ObjRecord or TextObjectRecord
+ assertTrue(
+ sid == DrawingRecord.sid ||
+ sid == ContinueRecord.sid ||
+ sid == ObjRecord.sid ||
+ sid == TextObjectRecord.sid);
+ }
+ // collect drawing records into a byte buffer.
+ byte[] dgBytes = toByteArray(dgRecords);
+
+ // the first record after the drawing block
+ assertTrue(
+ "records.get(300) is expected to be Window2",
+ records.get(300) instanceof WindowTwoRecord);
+
+ // aggregate drawing records.
+ // The subrange [19, 299] is expected to be replaced with a EscherAggregate object
+ DrawingManager2 drawingManager = iworkbook.findDrawingGroup();
+ int loc = isheet.aggregateDrawingRecords(drawingManager, false);
+ EscherAggregate agg = (EscherAggregate) records.get(loc);
+
+ assertEquals("wrong size of the aggregated sheet records stream", 38, records.size());
+ assertTrue(
+ "records.get(21) is expected to be RowRecordsAggregate but was " + records.get(21).getClass().getSimpleName(),
+ records.get(21) instanceof RowRecordsAggregate);
+ assertTrue("records.get(22) is expected to be EscherAggregate but was " + records.get(22).getClass().getSimpleName(),
+ records.get(22) instanceof EscherAggregate);
+ assertTrue("records.get(23) is expected to be Window2 but was " + records.get(23).getClass().getSimpleName(),
+ records.get(23) instanceof WindowTwoRecord);
+
+ byte[] dgBytesAfterSave = agg.serialize();
+ assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
+ assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
+ }
}
@Test
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=1872302&r1=1872301&r2=1872302&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java Fri Jan 3 23:30:36 2020
@@ -17,7 +17,11 @@
package org.apache.poi.hssf.model;
-import static org.junit.Assert.*;
+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 java.io.IOException;
import java.util.Locale;
@@ -37,45 +41,10 @@ import org.apache.poi.ss.formula.Formula
import org.apache.poi.ss.formula.FormulaParser;
import org.apache.poi.ss.formula.FormulaType;
import org.apache.poi.ss.formula.constant.ErrorConstant;
-import org.apache.poi.ss.formula.ptg.AbstractFunctionPtg;
-import org.apache.poi.ss.formula.ptg.AddPtg;
-import org.apache.poi.ss.formula.ptg.Area3DPtg;
-import org.apache.poi.ss.formula.ptg.AreaI;
-import org.apache.poi.ss.formula.ptg.AreaPtg;
-import org.apache.poi.ss.formula.ptg.AreaPtgBase;
-import org.apache.poi.ss.formula.ptg.ArrayPtg;
-import org.apache.poi.ss.formula.ptg.AttrPtg;
-import org.apache.poi.ss.formula.ptg.BoolPtg;
-import org.apache.poi.ss.formula.ptg.ConcatPtg;
-import org.apache.poi.ss.formula.ptg.DividePtg;
-import org.apache.poi.ss.formula.ptg.EqualPtg;
-import org.apache.poi.ss.formula.ptg.ErrPtg;
-import org.apache.poi.ss.formula.ptg.FuncPtg;
-import org.apache.poi.ss.formula.ptg.FuncVarPtg;
-import org.apache.poi.ss.formula.ptg.GreaterThanPtg;
-import org.apache.poi.ss.formula.ptg.IntPtg;
-import org.apache.poi.ss.formula.ptg.IntersectionPtg;
-import org.apache.poi.ss.formula.ptg.MemAreaPtg;
-import org.apache.poi.ss.formula.ptg.MemFuncPtg;
-import org.apache.poi.ss.formula.ptg.MissingArgPtg;
-import org.apache.poi.ss.formula.ptg.MultiplyPtg;
-import org.apache.poi.ss.formula.ptg.NamePtg;
-import org.apache.poi.ss.formula.ptg.NameXPtg;
-import org.apache.poi.ss.formula.ptg.NumberPtg;
-import org.apache.poi.ss.formula.ptg.ParenthesisPtg;
-import org.apache.poi.ss.formula.ptg.PercentPtg;
-import org.apache.poi.ss.formula.ptg.PowerPtg;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.ptg.RangePtg;
-import org.apache.poi.ss.formula.ptg.Ref3DPtg;
-import org.apache.poi.ss.formula.ptg.RefPtg;
-import org.apache.poi.ss.formula.ptg.StringPtg;
-import org.apache.poi.ss.formula.ptg.SubtractPtg;
-import org.apache.poi.ss.formula.ptg.UnaryMinusPtg;
-import org.apache.poi.ss.formula.ptg.UnaryPlusPtg;
-import org.apache.poi.ss.formula.ptg.UnionPtg;
+import org.apache.poi.ss.formula.ptg.*;
import org.apache.poi.ss.usermodel.BaseTestBugzillaIssues;
import org.apache.poi.ss.usermodel.FormulaError;
+import org.apache.poi.ss.usermodel.FormulaEvaluator;
import org.apache.poi.ss.usermodel.Name;
import org.apache.poi.util.HexRead;
import org.apache.poi.util.LittleEndianByteArrayInputStream;
@@ -211,7 +180,7 @@ public final class TestFormulaParser {
}
}
}
-
+
private static void assertEqualsIgnoreCase(String expected, String actual) {
assertEquals(expected.toLowerCase(Locale.ROOT), actual.toLowerCase(Locale.ROOT));
}
@@ -230,22 +199,30 @@ public final class TestFormulaParser {
@Test
public void testWorksheetReferences() throws IOException {
- HSSFWorkbook wb = new HSSFWorkbook();
+ try (HSSFWorkbook wb = new HSSFWorkbook()) {
- wb.createSheet("NoQuotesNeeded");
- wb.createSheet("Quotes Needed Here &#$@");
+ HSSFSheet sheet1 = wb.createSheet("NoQuotesNeeded");
+ sheet1.createRow(0).createCell(0).setCellValue("NoQuotesNeeded");
+ HSSFSheet sheet2 = wb.createSheet("Quotes Needed Here &#$@");
+ sheet2.createRow(0).createCell(0).setCellValue("Quotes Needed Here &#$@");
- HSSFSheet sheet = wb.createSheet("Test");
- HSSFRow row = sheet.createRow(0);
- HSSFCell cell;
-
- cell = row.createCell(0);
- cell.setCellFormula("NoQuotesNeeded!A1");
+ HSSFSheet sheet = wb.createSheet("Test");
+ HSSFRow row = sheet.createRow(0);
- cell = row.createCell(1);
- cell.setCellFormula("'Quotes Needed Here &#$@'!A1");
-
- wb.close();
+ FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
+ HSSFCell cell;
+ String act;
+
+ cell = row.createCell(0);
+ cell.setCellFormula("NoQuotesNeeded!A1");
+ act = evaluator.evaluate(cell).getStringValue();
+ assertEquals("NoQuotesNeeded", act);
+
+ cell = row.createCell(1);
+ cell.setCellFormula("'Quotes Needed Here &#$@'!A1");
+ act = evaluator.evaluate(cell).getStringValue();
+ assertEquals("Quotes Needed Here &#$@", act);
+ }
}
@Test
@@ -330,18 +307,21 @@ public final class TestFormulaParser {
/** bug 35027, underscore in sheet name */
@Test
public void testUnderscore() throws IOException {
- HSSFWorkbook wb = new HSSFWorkbook();
+ try (HSSFWorkbook wb = new HSSFWorkbook()) {
+ HSSFSheet sheet1 = wb.createSheet("Cash_Flow");
+ sheet1.createRow(0).createCell(0).setCellValue("Cash_Flow");
- wb.createSheet("Cash_Flow");
+ HSSFSheet sheet = wb.createSheet("Test");
+ HSSFRow row = sheet.createRow(0);
+ HSSFCell cell;
- HSSFSheet sheet = wb.createSheet("Test");
- HSSFRow row = sheet.createRow(0);
- HSSFCell cell;
+ cell = row.createCell(0);
+ cell.setCellFormula("Cash_Flow!A1");
- cell = row.createCell(0);
- cell.setCellFormula("Cash_Flow!A1");
-
- wb.close();
+ FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
+ String act = evaluator.evaluate(cell).getStringValue();
+ assertEquals("Cash_Flow", act);
+ }
}
/** bug 49725, defined names with underscore */
@@ -387,7 +367,7 @@ public final class TestFormulaParser {
cell.setCellFormula("INDEX(DA6_LEO_WBS_Name,MATCH($A3,DA6_LEO_WBS_Number,0))");
assertEquals("INDEX(DA6_LEO_WBS_Name,MATCH($A3,DA6_LEO_WBS_Number,0))", cell.getCellFormula());
-
+
wb.close();
}
@@ -469,7 +449,7 @@ public final class TestFormulaParser {
cell.setCellFormula("-10E-1/3.1E2*4E3/3E4");
formula = cell.getCellFormula();
assertEquals("Exponential formula string", "-1/310*4000/30000", formula);
-
+
wb.close();
}
@@ -511,7 +491,7 @@ public final class TestFormulaParser {
cell.setCellFormula("10E-1");
formula = cell.getCellFormula();
assertEquals("1", formula);
-
+
wb.close();
}
@@ -537,7 +517,7 @@ public final class TestFormulaParser {
cell.setCellFormula("A1...A2");
formula = cell.getCellFormula();
assertEquals("A1:A2", formula);
-
+
wb.close();
}
@@ -547,51 +527,51 @@ public final class TestFormulaParser {
wb.createSheet("Cash_Flow");
wb.createSheet("Test Sheet");
-
+
HSSFSheet sheet = wb.createSheet("Test");
HSSFRow row = sheet.createRow(0);
HSSFCell cell = row.createCell(0);
String formula;
-
+
// References to a single cell:
-
+
// One sheet
cell.setCellFormula("Cash_Flow!A1");
formula = cell.getCellFormula();
assertEquals("Cash_Flow!A1", formula);
-
+
// Then the other
cell.setCellFormula("\'Test Sheet\'!A1");
formula = cell.getCellFormula();
assertEquals("\'Test Sheet\'!A1", formula);
-
+
// Now both
cell.setCellFormula("Cash_Flow:\'Test Sheet\'!A1");
formula = cell.getCellFormula();
assertEquals("Cash_Flow:\'Test Sheet\'!A1", formula);
-
+
// References to a range (area) of cells:
-
+
// One sheet
cell.setCellFormula("Cash_Flow!A1:B2");
formula = cell.getCellFormula();
assertEquals("Cash_Flow!A1:B2", formula);
-
+
// Then the other
cell.setCellFormula("\'Test Sheet\'!A1:B2");
formula = cell.getCellFormula();
assertEquals("\'Test Sheet\'!A1:B2", formula);
-
+
// Now both
cell.setCellFormula("Cash_Flow:\'Test Sheet\'!A1:B2");
formula = cell.getCellFormula();
assertEquals("Cash_Flow:\'Test Sheet\'!A1:B2", formula);
-
+
wb.close();
}
-
+
/**
* Test for bug observable at svn revision 618865 (5-Feb-2008)<br>
* a formula consisting of a single no-arg function got rendered without the function braces
@@ -604,7 +584,7 @@ public final class TestFormulaParser {
FuncPtg.create(10),
};
assertEquals("NA()", HSSFFormulaParser.toFormulaString(book, ptgs));
-
+
book.close();
}
@@ -758,7 +738,7 @@ public final class TestFormulaParser {
StringPtg sp = (StringPtg) parseSingleToken(formula, StringPtg.class);
assertEquals(expectedValue, sp.getValue());
}
-
+
@Test
public void testParseStringLiterals_bug28754() throws IOException {
@@ -813,7 +793,7 @@ public final class TestFormulaParser {
formulaString = toFormulaString(ptgs);
assertEquals("IF(1<2,SUM(5,2,IF(3>2,SUM(A1:A2),6)),4)", formulaString);
}
-
+
@Test
public void testParserErrors() {
parseExpectedException(" 12 . 345 ");
@@ -827,12 +807,12 @@ public final class TestFormulaParser {
parseExpectedException("IF(TRUE)");
parseExpectedException("countif(A1:B5, C1, D1)");
-
+
parseExpectedException("(");
parseExpectedException(")");
parseExpectedException("+");
parseExpectedException("42+");
-
+
parseExpectedException("IF(");
}
@@ -860,7 +840,7 @@ public final class TestFormulaParser {
fail("Identified bug 44539");
}
assertEquals("SUM(A32769:A32770)", cell.getCellFormula());
-
+
wb.close();
}
@@ -1048,7 +1028,7 @@ public final class TestFormulaParser {
book.close();
}
-
+
@Test
public void testParseArray() {
Ptg[] ptgs;
@@ -1135,7 +1115,7 @@ public final class TestFormulaParser {
wb.setSheetName(0, "A1...A2");
cell.setCellFormula("A1...A2!B1");
assertEquals("A1...A2!B1", cell.getCellFormula());
-
+
wb.close();
}
@@ -1147,7 +1127,7 @@ public final class TestFormulaParser {
cell.setCellFormula("'true'!B2");
assertEquals("'true'!B2", cell.getCellFormula());
-
+
wb.close();
}
@@ -1172,10 +1152,10 @@ public final class TestFormulaParser {
// try setting the same formula in a cell
cell.setCellFormula("[multibookFormulaB.xls]AnotherSheet!B1");
assertEquals("[multibookFormulaB.xls]AnotherSheet!B1", cell.getCellFormula());
-
+
wbA.close();
}
-
+
private static void confirmSingle3DRef(Ptg[] ptgs, int expectedExternSheetIndex) {
assertEquals(1, ptgs.length);
Ptg ptg0 = ptgs[0];
@@ -1207,7 +1187,7 @@ public final class TestFormulaParser {
// We don't check the type of the operands.
confirmTokenClasses("1,2", MemAreaPtg.class, IntPtg.class, IntPtg.class, UnionPtg.class);
-
+
wb.close();
}
@@ -1235,38 +1215,38 @@ public final class TestFormulaParser {
// This used to be an error but now parses. Union has the same behaviour.
confirmTokenClasses("1 2", MemAreaPtg.class, IntPtg.class, IntPtg.class, IntersectionPtg.class);
-
+
wb.close();
}
-
+
@Test
public void testComparisonInParen() {
- confirmTokenClasses("(A1 > B2)",
- RefPtg.class,
- RefPtg.class,
- GreaterThanPtg.class,
+ confirmTokenClasses("(A1 > B2)",
+ RefPtg.class,
+ RefPtg.class,
+ GreaterThanPtg.class,
ParenthesisPtg.class
);
}
-
+
@Test
public void testUnionInParen() {
- confirmTokenClasses("(A1:B2,B2:C3)",
- MemAreaPtg.class,
- AreaPtg.class,
- AreaPtg.class,
- UnionPtg.class,
+ confirmTokenClasses("(A1:B2,B2:C3)",
+ MemAreaPtg.class,
+ AreaPtg.class,
+ AreaPtg.class,
+ UnionPtg.class,
ParenthesisPtg.class
);
}
@Test
public void testIntersectionInParen() {
- confirmTokenClasses("(A1:B2 B2:C3)",
- MemAreaPtg.class,
- AreaPtg.class,
- AreaPtg.class,
- IntersectionPtg.class,
+ confirmTokenClasses("(A1:B2 B2:C3)",
+ MemAreaPtg.class,
+ AreaPtg.class,
+ AreaPtg.class,
+ IntersectionPtg.class,
ParenthesisPtg.class
);
}
@@ -1348,7 +1328,7 @@ public final class TestFormulaParser {
HSSFCell cell_D1 = row.createCell(2);
cell_D1.setCellFormula("NOT(POI\\2009=\"3.5-final\")");
assertEquals("NOT(POI\\2009=\"3.5-final\")", cell_D1.getCellFormula());
-
+
wb.close();
}
@@ -1366,7 +1346,7 @@ public final class TestFormulaParser {
}
// the exact example from the bugzilla description:
HSSFFormulaParser.parse("SUMPRODUCT(A!C7:A!C67, B8:B68) / B69", wb);
-
+
wb.close();
}
@@ -1429,7 +1409,7 @@ public final class TestFormulaParser {
Area3DPtg.class,
UnionPtg.class
);
-
+
wb.close();
}
@@ -1563,7 +1543,7 @@ public final class TestFormulaParser {
throw e;
}
confirmTokenClasses(result, IntPtg.class, NamePtg.class, AddPtg.class);
-
+
wb.close();
}
@@ -1607,7 +1587,7 @@ public final class TestFormulaParser {
n.setRefersToFormula("1+1");
ptgs = HSSFFormulaParser.parse("B0", wb);
confirmTokenClasses(ptgs, NamePtg.class);
-
+
wb.close();
}
@@ -1618,9 +1598,9 @@ public final class TestFormulaParser {
@Test
public void test57196_Formula() throws IOException {
HSSFWorkbook wb = new HSSFWorkbook();
- Ptg[] ptgs = HSSFFormulaParser.parse("DEC2HEX(HEX2DEC(O8)-O2+D2)", wb, FormulaType.CELL, -1);
+ Ptg[] ptgs = HSSFFormulaParser.parse("DEC2HEX(HEX2DEC(O8)-O2+D2)", wb, FormulaType.CELL, -1);
assertNotNull("Ptg array should not be null", ptgs);
-
+
confirmTokenClasses(ptgs,
NameXPtg.class, // ??
NameXPtg.class, // ??
@@ -1645,7 +1625,7 @@ public final class TestFormulaParser {
assertEquals("O2", o2.toFormulaString());
assertEquals("D2", d2.toFormulaString());
assertEquals(255, dec2Hex.getFunctionIndex());
-
+
wb.close();
- }
+ }
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java?rev=1872302&r1=1872301&r2=1872302&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java Fri Jan 3 23:30:36 2020
@@ -202,15 +202,15 @@ public final class TestSheet {
assertEquals("Should be no more merged regions", 0, sheet.getNumMergedRegions());
}
- @Test
- public void testGetMergedRegionAt() {
- //TODO
- }
+ // @Test
+ // public void testGetMergedRegionAt() {
+ // TODO
+ // }
- @Test
- public void testGetNumMergedRegions() {
- //TODO
- }
+ // @Test
+ // public void testGetNumMergedRegions() {
+ // TODO
+ // }
/**
* Makes sure all rows registered for this sheet are aggregated, they were being skipped
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestBOFRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestBOFRecord.java?rev=1872302&r1=1872301&r2=1872302&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestBOFRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestBOFRecord.java Fri Jan 3 23:30:36 2020
@@ -17,17 +17,25 @@
package org.apache.poi.hssf.record;
+import static org.junit.Assert.assertEquals;
+
import java.io.IOException;
import org.apache.poi.hssf.HSSFTestDataSamples;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Sheet;
import org.junit.Test;
-/**
- *
- */
+
public final class TestBOFRecord {
@Test
public void testBOFRecord() throws IOException {
// This used to throw an error before - #42794
- HSSFTestDataSamples.openSampleWorkbook("bug_42794.xls").close();
+ try (HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("bug_42794.xls")) {
+ Sheet sh = wb.getSheetAt(0);
+ for (int i=1; i<=10; i++) {
+ double act = sh.getRow(i).getCell(0).getNumericCellValue();
+ assertEquals(i, act, 0);
+ }
+ }
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java?rev=1872302&r1=1872301&r2=1872302&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java Fri Jan 3 23:30:36 2020
@@ -73,6 +73,7 @@ public final class TestCFRuleRecord {
}
}
+ @SuppressWarnings("squid:S2699")
@Test
public void testCreateCFRuleRecord() throws IOException {
try (HSSFWorkbook workbook = new HSSFWorkbook()) {
@@ -96,6 +97,7 @@ public final class TestCFRuleRecord {
}
}
+ @SuppressWarnings("squid:S2699")
@Test
public void testCreateCFRule12Record() throws IOException {
try (HSSFWorkbook workbook = new HSSFWorkbook()) {
@@ -422,7 +424,7 @@ public final class TestCFRuleRecord {
assertTrue(refNPtg.isRowRelative());
byte[] data = rr.serialize();
- TestcaseRecordInputStream.confirmRecordEncoding(CFRuleRecord.sid, DATA_REFN, data);
+ confirmRecordEncoding(CFRuleRecord.sid, DATA_REFN, data);
}
@Test
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java?rev=1872302&r1=1872301&r2=1872302&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java Fri Jan 3 23:30:36 2020
@@ -56,6 +56,7 @@ public final class TestCommonObjectDataS
assertEquals(18, record.getDataSize());
}
+ @SuppressWarnings("squid:S2699")
@Test
public void testStore() {
CommonObjectDataSubRecord record = new CommonObjectDataSubRecord();
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java?rev=1872302&r1=1872301&r2=1872302&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java Fri Jan 3 23:30:36 2020
@@ -72,6 +72,7 @@ public final class TestEmbeddedObjectRef
assertArrayEquals(ser, ser2);
}
+ @SuppressWarnings("squid:S2699")
@Test
public void testCameraTool_bug45912() {
/*
@@ -95,6 +96,7 @@ public final class TestEmbeddedObjectRef
/**
* tests various examples of OLE controls
*/
+ @SuppressWarnings("squid:S2699")
@Test
public void testVarious() {
String[] rawData = {
@@ -125,9 +127,10 @@ public final class TestEmbeddedObjectRef
EmbeddedObjectRefSubRecord rec = new EmbeddedObjectRefSubRecord(in, data.length);
byte[] ser2 = rec.serialize();
- TestcaseRecordInputStream.confirmRecordEncoding("Test record " + i, EORSR_SID, data, ser2);
+ confirmRecordEncoding("Test record " + i, EORSR_SID, data, ser2);
}
+ @SuppressWarnings("squid:S2699")
@Test
public void testVisioDrawing_bug46199() {
/*
@@ -146,6 +149,6 @@ public final class TestEmbeddedObjectRef
// bug 22860 - Not enough data (3) to read requested (4) bytes
EmbeddedObjectRefSubRecord rec = new EmbeddedObjectRefSubRecord(in, data46199.length);
byte[] ser2 = rec.serialize();
- TestcaseRecordInputStream.confirmRecordEncoding(EORSR_SID, data46199, ser2);
+ confirmRecordEncoding(EORSR_SID, data46199, ser2);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestExtendedFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestExtendedFormatRecord.java?rev=1872302&r1=1872301&r2=1872302&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestExtendedFormatRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestExtendedFormatRecord.java Fri Jan 3 23:30:36 2020
@@ -57,6 +57,7 @@ public final class TestExtendedFormatRec
}
+ @SuppressWarnings("squid:S2699")
@Test
public void testStore() {
// .fontindex = 0
@@ -122,6 +123,7 @@ public final class TestExtendedFormatRec
+ @SuppressWarnings("squid:S2699")
@Test
public void testCloneOnto() {
ExtendedFormatRecord base = createEFR();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org