Author: fanningpj
Date: Mon Jul 6 08:25:57 2020
New Revision: 1879539
URL: http://svn.apache.org/viewvc?rev=1879539&view=rev
Log:
DeferredSXSSFITestDataProvider
Added:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/DeferredSXSSFITestDataProvider.java
- copied, changed from r1879517,
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/SXSSFITestDataProvider.java
Copied:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/DeferredSXSSFITestDataProvider.java
(from r1879517,
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/SXSSFITestDataProvider.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/DeferredSXSSFITestDataProvider.java?p2=poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/DeferredSXSSFITestDataProvider.java&p1=poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/SXSSFITestDataProvider.java&r1=1879517&r2=1879539&rev=1879539&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/SXSSFITestDataProvider.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/DeferredSXSSFITestDataProvider.java
Mon Jul 6 08:25:57 2020
@@ -19,42 +19,40 @@
package org.apache.poi.xssf;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-
import org.apache.poi.POIDataSamples;
import org.apache.poi.ss.ITestDataProvider;
import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.ss.usermodel.FormulaEvaluator;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.streaming.SXSSFSheet;
+import org.apache.poi.xssf.streaming.DeferredSXSSFSheet;
+import org.apache.poi.xssf.streaming.DeferredSXSSFWorkbook;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.apache.poi.xssf.usermodel.XSSFFormulaEvaluator;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-/**
- * @author Yegor Kozlov
- */
-public final class SXSSFITestDataProvider implements ITestDataProvider {
- public static final SXSSFITestDataProvider instance = new
SXSSFITestDataProvider();
-
- // an instance of all SXSSFWorkbooks opened by this TestDataProvider,
- // so that the temporary files created can be disposed up by cleanup()
- private final Collection<SXSSFWorkbook> instances = new ArrayList<>();
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+
+public final class DeferredSXSSFITestDataProvider implements ITestDataProvider
{
+ public static final DeferredSXSSFITestDataProvider instance = new
DeferredSXSSFITestDataProvider();
+
+ // an instance of all DeferredSXSSFWorkbooks opened by this
TestDataProvider,
+ // so that the temporary files created can be disposed up by cleanup()
+ private final Collection<DeferredSXSSFWorkbook> instances = new
ArrayList<>();
- private SXSSFITestDataProvider() {
+ private DeferredSXSSFITestDataProvider() {
// enforce singleton
}
@Override
public Workbook openSampleWorkbook(String sampleFileName) {
XSSFWorkbook xssfWorkbook =
XSSFITestDataProvider.instance.openSampleWorkbook(sampleFileName);
- SXSSFWorkbook swb = new SXSSFWorkbook(xssfWorkbook);
+ DeferredSXSSFWorkbook swb = new DeferredSXSSFWorkbook(xssfWorkbook);
instances.add(swb);
return swb;
}
@@ -68,7 +66,7 @@ public final class SXSSFITestDataProvide
// since workbooks must be able to be written out and read back
// several times in succession
if(!(wb instanceof SXSSFWorkbook || wb instanceof XSSFWorkbook)) {
- throw new IllegalArgumentException("Expected an instance of
SXSSFWorkbook");
+ throw new IllegalArgumentException("Expected an instance of
XSSFWorkbook");
}
XSSFWorkbook result;
@@ -84,29 +82,29 @@ public final class SXSSFITestDataProvide
}
@Override
- public SXSSFWorkbook createWorkbook() {
- SXSSFWorkbook wb = new SXSSFWorkbook();
+ public DeferredSXSSFWorkbook createWorkbook() {
+ DeferredSXSSFWorkbook wb = new DeferredSXSSFWorkbook();
instances.add(wb);
return wb;
}
//************ SXSSF-specific methods ***************//
@Override
- public SXSSFWorkbook createWorkbook(int rowAccessWindowSize) {
- SXSSFWorkbook wb = new SXSSFWorkbook(rowAccessWindowSize);
+ public DeferredSXSSFWorkbook createWorkbook(int rowAccessWindowSize) {
+ DeferredSXSSFWorkbook wb = new
DeferredSXSSFWorkbook(rowAccessWindowSize);
instances.add(wb);
return wb;
}
@Override
public void trackAllColumnsForAutosizing(Sheet sheet) {
- ((SXSSFSheet)sheet).trackAllColumnsForAutoSizing();
+ ((DeferredSXSSFSheet)sheet).trackAllColumnsForAutoSizing();
}
//************ End SXSSF-specific methods ***************//
@Override
public FormulaEvaluator createFormulaEvaluator(Workbook wb) {
- return new XSSFFormulaEvaluator(((SXSSFWorkbook)
wb).getXSSFWorkbook());
+ return new XSSFFormulaEvaluator(((DeferredSXSSFWorkbook)
wb).getXSSFWorkbook());
}
@Override
@@ -126,7 +124,7 @@ public final class SXSSFITestDataProvide
public synchronized boolean cleanup() {
boolean ok = true;
- for(final SXSSFWorkbook wb : instances) {
+ for(final DeferredSXSSFWorkbook wb : instances) {
ok = ok && wb.dispose();
}
instances.clear();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
