You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by on...@apache.org on 2016/04/17 10:40:27 UTC
svn commit: r1739552 - in /poi/trunk/src:
ooxml/testcases/org/apache/poi/ss/usermodel/
ooxml/testcases/org/apache/poi/xssf/streaming/
ooxml/testcases/org/apache/poi/xssf/usermodel/
testcases/org/apache/poi/hssf/usermodel/ testcases/org/apache/poi/ss/us...
Author: onealj
Date: Sun Apr 17 08:40:27 2016
New Revision: 1739552
URL: http://svn.apache.org/viewvc?rev=1739552&view=rev
Log:
consolidate duplicates between TestXSSF* and TestSXSSF*
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXRow.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFRow.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRow.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/TestHSSFSheet.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.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
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXRow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXRow.java?rev=1739552&r1=1739551&r2=1739552&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXRow.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXRow.java Sun Apr 17 08:40:27 2016
@@ -17,9 +17,12 @@
package org.apache.poi.ss.usermodel;
+import java.io.IOException;
+
import org.apache.poi.ss.ITestDataProvider;
import org.apache.poi.xssf.streaming.SXSSFRow;
import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.junit.Test;
/**
* Class for combined testing of XML-specific functionality of
@@ -32,4 +35,14 @@ 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(_testDataProvider.getSpreadsheetVersion().getLastColumnIndex());
+ }
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFRow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFRow.java?rev=1739552&r1=1739551&r2=1739552&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFRow.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFRow.java Sun Apr 17 08:40:27 2016
@@ -19,9 +19,6 @@
package org.apache.poi.xssf.streaming;
-import java.io.IOException;
-
-import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.ss.usermodel.BaseTestXRow;
import org.apache.poi.xssf.SXSSFITestDataProvider;
import org.junit.After;
@@ -42,14 +39,4 @@ public final class TestSXSSFRow extends
((SXSSFITestDataProvider) _testDataProvider).cleanup();
}
- @Test
- public void testRowBounds() throws IOException {
- baseTestRowBounds(SpreadsheetVersion.EXCEL2007.getLastRowIndex());
- }
-
- @Test
- public void testCellBounds() throws IOException {
- baseTestCellBounds(SpreadsheetVersion.EXCEL2007.getLastColumnIndex());
- }
-
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheet.java?rev=1739552&r1=1739551&r2=1739552&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheet.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheet.java Sun Apr 17 08:40:27 2016
@@ -24,7 +24,6 @@ import static org.junit.Assert.fail;
import java.io.IOException;
-import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.ss.usermodel.BaseTestXSheet;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
@@ -155,9 +154,4 @@ public final class TestSXSSFSheet extend
template.close();
}
}
-
- @Test(expected=IllegalArgumentException.class)
- public void createRowAfterLastRow() throws IOException {
- createRowAfterLastRow(SpreadsheetVersion.EXCEL2007);
- }
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java?rev=1739552&r1=1739551&r2=1739552&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java Sun Apr 17 08:40:27 2016
@@ -33,7 +33,6 @@ import java.io.IOException;
import org.apache.poi.POIDataSamples;
import org.apache.poi.POITestCase;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.ss.usermodel.BaseTestXWorkbook;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
@@ -307,7 +306,7 @@ public final class TestSXSSFWorkbook ext
xwb.close();
}
- static void assertWorkbookDispose(SXSSFWorkbook wb)
+ protected static void assertWorkbookDispose(SXSSFWorkbook wb)
{
int rowNum = 1000;
int sheetNum = 5;
@@ -455,12 +454,7 @@ public final class TestSXSSFWorkbook ext
workBook.close();
}
- @Test
- @Override
- public void getSpreadsheetVersion() throws IOException {
- verifySpreadsheetVersion(SpreadsheetVersion.EXCEL2007);
- }
-
+
@Test
public void closeDoesNotModifyWorkbook() throws IOException, InvalidFormatException {
final String filename = "SampleSS.xlsx";
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRow.java?rev=1739552&r1=1739551&r2=1739552&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRow.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRow.java Sun Apr 17 08:40:27 2016
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertSam
import java.io.IOException;
-import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.ss.usermodel.BaseTestXRow;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellCopyPolicy;
@@ -40,17 +39,8 @@ public final class TestXSSFRow extends B
public TestXSSFRow() {
super(XSSFITestDataProvider.instance);
}
-
- @Test
- public void testRowBounds() throws IOException {
- baseTestRowBounds(SpreadsheetVersion.EXCEL2007.getLastRowIndex());
- }
-
- @Test
- public void testCellBounds() throws IOException {
- baseTestCellBounds(SpreadsheetVersion.EXCEL2007.getLastColumnIndex());
- }
+ @Test
public void testCopyRowFrom() throws IOException {
final XSSFWorkbook workbook = new XSSFWorkbook();
final XSSFSheet sheet = workbook.createSheet("test");
@@ -65,6 +55,7 @@ public final class TestXSSFRow extends B
workbook.close();
}
+ @Test
public void testCopyRowFromExternalSheet() throws IOException {
final XSSFWorkbook workbook = new XSSFWorkbook();
final Sheet srcSheet = workbook.createSheet("src");
@@ -159,6 +150,7 @@ public final class TestXSSFRow extends B
workbook.close();
}
+ @Test
public void testCopyRowOverwritesExistingRow() throws IOException {
final XSSFWorkbook workbook = new XSSFWorkbook();
final XSSFSheet sheet1 = workbook.createSheet("Sheet1");
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=1739552&r1=1739551&r2=1739552&view=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 Sun Apr 17 08:40:27 2016
@@ -1054,11 +1054,6 @@ public final class TestXSSFSheet extends
wb2.close();
}
-
- @Test(expected=IllegalArgumentException.class)
- public void createRowAfterLastRow() throws IOException {
- createRowAfterLastRow(SpreadsheetVersion.EXCEL2007);
- }
@Test
public void setAutoFilter() throws IOException {
@@ -1603,7 +1598,7 @@ public final class TestXSSFSheet extends
wb.close();
}
- public void testCopyMultipleRows(String copyRowsTestWorkbook) throws IOException {
+ protected void testCopyMultipleRows(String copyRowsTestWorkbook) throws IOException {
final double FLOAT_PRECISION = 1e-9;
final XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook(copyRowsTestWorkbook);
final XSSFSheet sheet = wb.getSheetAt(0);
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java?rev=1739552&r1=1739551&r2=1739552&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java Sun Apr 17 08:40:27 2016
@@ -773,7 +773,7 @@ public final class TestXSSFWorkbook exte
}
}
- public void setPivotData(XSSFWorkbook wb){
+ protected void setPivotData(XSSFWorkbook wb){
XSSFSheet sheet = wb.createSheet();
Row row1 = sheet.createRow(0);
@@ -948,8 +948,6 @@ public final class TestXSSFWorkbook exte
workbook.close();
}
- @SuppressWarnings("unchecked")
- @Test
/**
* Iterator<XSSFSheet> XSSFWorkbook.iterator was committed in r700472 on 2008-09-30
* and has been replaced with Iterator<Sheet> XSSFWorkbook.iterator
@@ -965,6 +963,8 @@ public final class TestXSSFWorkbook exte
* upgrade their code with either of the following options presented in this test case.
*
*/
+ @SuppressWarnings("unchecked")
+ @Test
public void bug58245_XSSFSheetIterator() throws IOException {
final XSSFWorkbook wb = new XSSFWorkbook();
wb.createSheet();
@@ -1066,12 +1066,6 @@ public final class TestXSSFWorkbook exte
}
@Test
- @Override
- public void getSpreadsheetVersion() throws IOException {
- verifySpreadsheetVersion(SpreadsheetVersion.EXCEL2007);
- }
-
- @Test
public void closeDoesNotModifyWorkbook() throws IOException, InvalidFormatException {
final String filename = "SampleSS.xlsx";
final File file = POIDataSamples.getSpreadSheetInstance().getFile(filename);
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java?rev=1739552&r1=1739551&r2=1739552&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java Sun Apr 17 08:40:27 2016
@@ -56,7 +56,6 @@ import org.apache.poi.hssf.record.WSBool
import org.apache.poi.hssf.record.WindowTwoRecord;
import org.apache.poi.hssf.record.aggregates.WorksheetProtectionBlock;
import org.apache.poi.hssf.usermodel.RecordInspector.RecordCollector;
-import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.ss.formula.ptg.Area3DPtg;
import org.apache.poi.ss.formula.ptg.Ptg;
import org.apache.poi.ss.usermodel.AutoFilter;
@@ -83,11 +82,6 @@ public final class TestHSSFSheet extends
public TestHSSFSheet() {
super(HSSFITestDataProvider.instance);
}
-
- @Test(expected=IllegalArgumentException.class)
- public void createRowAfterLastRow() throws IOException {
- createRowAfterLastRow(SpreadsheetVersion.EXCEL97);
- }
/**
* Test for Bugzilla #29747.
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java?rev=1739552&r1=1739551&r2=1739552&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java Sun Apr 17 08:40:27 2016
@@ -53,7 +53,6 @@ import org.apache.poi.poifs.filesystem.D
import org.apache.poi.poifs.filesystem.DirectoryNode;
import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.ss.formula.ptg.Area3DPtg;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress;
@@ -216,7 +215,6 @@ public final class TestHSSFWorkbook exte
wb.close();
}
- @SuppressWarnings("unused")
@Test
public void selectMultiple() throws IOException {
HSSFWorkbook wb=new HSSFWorkbook();
@@ -1195,12 +1193,6 @@ public final class TestHSSFWorkbook exte
}
@Test
- @Override
- public void getSpreadsheetVersion() throws IOException {
- verifySpreadsheetVersion(SpreadsheetVersion.EXCEL97);
- }
-
- @Test
public void closeDoesNotModifyWorkbook() throws IOException {
final String filename = "SampleSS.xls";
final File file = POIDataSamples.getSpreadSheetInstance().getFile(filename);
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestRow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestRow.java?rev=1739552&r1=1739551&r2=1739552&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestRow.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestRow.java Sun Apr 17 08:40:27 2016
@@ -72,6 +72,7 @@ public abstract class BaseTestRow {
* Make sure that there is no cross-talk between rows especially with getFirstCellNum and getLastCellNum
* This test was added in response to bug report 44987.
*/
+ @Test
public void testBoundsInMultipleRows() throws IOException {
Workbook workbook = _testDataProvider.createWorkbook();
Sheet sheet = workbook.createSheet();
@@ -97,6 +98,7 @@ public abstract class BaseTestRow {
workbook.close();
}
+ @Test
public void testRemoveCell() throws IOException {
Workbook wb1 = _testDataProvider.createWorkbook();
{
@@ -139,7 +141,7 @@ public abstract class BaseTestRow {
wb2.close();
}
- public void baseTestRowBounds(int maxRowNum) throws IOException {
+ protected void baseTestRowBounds(int maxRowNum) throws IOException {
Workbook workbook = _testDataProvider.createWorkbook();
Sheet sheet = workbook.createSheet();
//Test low row bound
@@ -168,7 +170,7 @@ public abstract class BaseTestRow {
workbook.close();
}
- public void baseTestCellBounds(int maxCellNum) throws IOException {
+ protected void baseTestCellBounds(int maxCellNum) throws IOException {
Workbook wb1 = _testDataProvider.createWorkbook();
Sheet sheet = wb1.createSheet();
@@ -211,6 +213,7 @@ public abstract class BaseTestRow {
* Prior to patch 43901, POI was producing files with the wrong last-column
* number on the row
*/
+ @Test
public void testLastCellNumIsCorrectAfterAddCell_bug43901() throws IOException {
Workbook workbook = _testDataProvider.createWorkbook();
Sheet sheet = workbook.createSheet("test");
@@ -234,6 +237,7 @@ public abstract class BaseTestRow {
/**
* Tests for the missing/blank cell policy stuff
*/
+ @Test
public void testGetCellPolicy() throws IOException {
Workbook workbook = _testDataProvider.createWorkbook();
Sheet sheet = workbook.createSheet("test");
@@ -305,6 +309,7 @@ public abstract class BaseTestRow {
workbook.close();
}
+ @Test
public void testRowHeight() throws IOException {
Workbook wb1 = _testDataProvider.createWorkbook();
Sheet sheet = wb1.createSheet();
@@ -360,6 +365,7 @@ public abstract class BaseTestRow {
/**
* Test adding cells to a row in various places and see if we can find them again.
*/
+ @Test
public void testCellIterator() throws IOException {
Workbook wb = _testDataProvider.createWorkbook();
Sheet sheet = wb.createSheet();
@@ -417,6 +423,7 @@ public abstract class BaseTestRow {
wb.close();
}
+ @Test
public void testRowStyle() throws IOException {
Workbook wb1 = _testDataProvider.createWorkbook();
Sheet sheet = wb1.createSheet("test");
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java?rev=1739552&r1=1739551&r2=1739552&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java Sun Apr 17 08:40:27 2016
@@ -116,7 +116,9 @@ public abstract class BaseTestSheet {
}
}
- protected void createRowAfterLastRow(SpreadsheetVersion version) throws IOException {
+ @Test(expected=IllegalArgumentException.class)
+ public void createRowAfterLastRow() throws IOException {
+ final SpreadsheetVersion version = _testDataProvider.getSpreadsheetVersion();
final Workbook workbook = _testDataProvider.createWorkbook();
final Sheet sh = workbook.createSheet();
sh.createRow(version.getLastRowIndex());
@@ -128,7 +130,6 @@ public abstract class BaseTestSheet {
}
}
-
@Test
public void removeRow() throws IOException {
Workbook workbook = _testDataProvider.createWorkbook();
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java?rev=1739552&r1=1739551&r2=1739552&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java Sun Apr 17 08:40:27 2016
@@ -33,7 +33,6 @@ import java.util.Iterator;
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.ss.ITestDataProvider;
-import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.ss.util.CellRangeAddress;
import org.junit.Test;
@@ -743,7 +742,7 @@ public abstract class BaseTestWorkbook {
wb2.close();
}
- public void changeSheetNameWithSharedFormulas(String sampleFile) throws IOException {
+ protected void changeSheetNameWithSharedFormulas(String sampleFile) throws IOException {
Workbook wb = _testDataProvider.openSampleWorkbook(sampleFile);
FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
@@ -827,11 +826,9 @@ public abstract class BaseTestWorkbook {
}
@Test
- public abstract void getSpreadsheetVersion() throws IOException;
-
- protected void verifySpreadsheetVersion(SpreadsheetVersion expected) throws IOException {
+ public void getSpreadsheetVersion() throws IOException {
final Workbook wb = _testDataProvider.createWorkbook();
- assertEquals(expected, wb.getSpreadsheetVersion());
+ assertEquals(_testDataProvider.getSpreadsheetVersion(), wb.getSpreadsheetVersion());
wb.close();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org