move trackColumnsForAutoSizingIfSXSSF into ITestDataProvider, replace ITestDataProvid...

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1730999 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/ooxml/testcases/org/apache/poi/xssf/SXSSFITestDataProvider.java b/src/ooxml/testcases/org/apache/poi/xssf/SXSSFITestDataProvider.java
index 5b5fe3f4479d19394ba86d3d0665b21efbad0484..4f2eb40f911b82bf9b95fb1b2b5fdeca06e3f330 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/xssf/SXSSFITestDataProvider.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/SXSSFITestDataProvider.java
@@ -95,13 +95,6 @@ public final class SXSSFITestDataProvider implements ITestDataProvider {
         return wb;
     }
     
-    @Override
-    public void trackColumnsForAutosizing(Sheet sheet, int...columns) {
-        for (int cn : columns) {
-            ((SXSSFSheet)sheet).trackColumnForAutoSizing(cn);
-        }
-    }
-    
     @Override
     public void trackAllColumnsForAutosizing(Sheet sheet) {
         ((SXSSFSheet)sheet).trackAllColumnsForAutoSizing();

diff --git a/src/ooxml/testcases/org/apache/poi/xssf/XSSFITestDataProvider.java b/src/ooxml/testcases/org/apache/poi/xssf/XSSFITestDataProvider.java
index b8eb9ebb1ccb624a745624e74cb57fa5ba451b19..e0ba6617cabe81305c9418ea528da628169c9515 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/xssf/XSSFITestDataProvider.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/XSSFITestDataProvider.java
@@ -60,8 +60,6 @@ public final class XSSFITestDataProvider implements ITestDataProvider {
         return createWorkbook();
     }
     
-    @Override
-    public void trackColumnsForAutosizing(Sheet sheet, int...columns) {}
     @Override
     public void trackAllColumnsForAutosizing(Sheet sheet) {}
     //************ End SXSSF-specific methods ***************//

diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java
index 8c67676d0c9b16242448d7a85534a709c3421153..0f37da3ba4432779c604a6ab4f6b85fc2e140093 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java
@@ -33,12 +33,6 @@ public final class TestSXSSFBugs extends BaseTestBugzillaIssues {
     public TestSXSSFBugs() {
         super(SXSSFITestDataProvider.instance);
     }
-    
-    @Override
-    protected void trackColumnsForAutoSizingIfSXSSF(Sheet sheet) {
-        SXSSFSheet sxSheet = (SXSSFSheet) sheet;
-        sxSheet.trackAllColumnsForAutoSizing();
-    }
 
     // override some tests which do not work for SXSSF
     @Override @Ignore("cloneSheet() not implemented") @Test public void bug18800() { /* cloneSheet() not implemented */ }

diff --git a/src/testcases/org/apache/poi/hssf/HSSFITestDataProvider.java b/src/testcases/org/apache/poi/hssf/HSSFITestDataProvider.java
index 58e6327eb4a908a11ccafb119d1a962357434dcb..5d80a26d53c1bdf3b0885c99a32b82667edd1a36 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/HSSFITestDataProvider.java
+++ b/src/testcases/org/apache/poi/hssf/HSSFITestDataProvider.java
@@ -66,8 +66,6 @@ public final class HSSFITestDataProvider implements ITestDataProvider {
         return createWorkbook();
     }
     
-    @Override
-    public void trackColumnsForAutosizing(Sheet sheet, int...columns) {}
     @Override
     public void trackAllColumnsForAutosizing(Sheet sheet) {}
     //************ End SXSSF-specific methods ***************//

diff --git a/src/testcases/org/apache/poi/ss/ITestDataProvider.java b/src/testcases/org/apache/poi/ss/ITestDataProvider.java
index c88794854e04ce16f80489ad1baed1233faf2cd2..e258e1a4a225ef1f8a8aae5287bbf302777fbb28 100644 (file)
--- a/src/testcases/org/apache/poi/ss/ITestDataProvider.java
+++ b/src/testcases/org/apache/poi/ss/ITestDataProvider.java
@@ -60,7 +60,6 @@ public interface ITestDataProvider {
      * Only matters for SXSSF - enables tracking of the column
      *  widths so that autosizing can work. No-op on others.
      */
-    void trackColumnsForAutosizing(Sheet sheet, int...columns);
     void trackAllColumnsForAutosizing(Sheet sheet);
     //************ End SXSSF-specific methods ***************//
 

diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
index e5991adf9adb730622b4ea4196fef0e7006152a4..99c07c0c6c6ca5909126bf52b6055d15b0d6db90 100644 (file)
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
+++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
@@ -55,10 +55,6 @@ public abstract class BaseTestBugzillaIssues {
     protected BaseTestBugzillaIssues(ITestDataProvider testDataProvider) {
         _testDataProvider = testDataProvider;
     }
-    
-    protected void trackColumnsForAutoSizingIfSXSSF(Sheet sheet) {
-        // do nothing for Sheet base class. This will be overridden for SXSSFSheets.
-    }
 
     /**
      * Unlike org.junit.Assert.assertEquals(double expected, double actual, double delta),
@@ -377,7 +373,7 @@ public abstract class BaseTestBugzillaIssues {
         Workbook wb = _testDataProvider.createWorkbook();
         BaseTestSheetAutosizeColumn.fixFonts(wb);
         Sheet sheet = wb.createSheet("Sheet1");
-        trackColumnsForAutoSizingIfSXSSF(sheet);
+        _testDataProvider.trackAllColumnsForAutosizing(sheet);
         Row row = sheet.createRow(0);
         Cell cell0 = row.createCell(0);
 
@@ -434,7 +430,7 @@ public abstract class BaseTestBugzillaIssues {
         Workbook wb = _testDataProvider.createWorkbook();
         BaseTestSheetAutosizeColumn.fixFonts(wb);
         Sheet sheet = wb.createSheet();
-        trackColumnsForAutoSizingIfSXSSF(sheet);
+        _testDataProvider.trackAllColumnsForAutosizing(sheet);
         Row row = sheet.createRow(0);
         Cell cell0 = row.createCell(0);
         Cell cell1 = row.createCell(1);
@@ -670,7 +666,7 @@ public abstract class BaseTestBugzillaIssues {
         d2Percent.setDataFormat(format.getFormat("0.00%"));
 
         Sheet s = wb.createSheet();
-        trackColumnsForAutoSizingIfSXSSF(s);
+        _testDataProvider.trackAllColumnsForAutosizing(s);
         Row r1 = s.createRow(0);
 
         for (int i=0; i<3; i++) {
@@ -1393,7 +1389,7 @@ public abstract class BaseTestBugzillaIssues {
         cell.setCellValue((String)null);
         assertEquals(Cell.CELL_TYPE_BLANK, cell.getCellType());
         
-        _testDataProvider.trackColumnsForAutosizing(s, 0);
+        _testDataProvider.trackAllColumnsForAutosizing(s);
         
         s.autoSizeColumn(0);
         assertEquals(2048, s.getColumnWidth(0));
@@ -1480,11 +1476,11 @@ public abstract class BaseTestBugzillaIssues {
         }
     }
     
-    public long time() {
+    protected long time() {
         final long currentTime = System.currentTimeMillis();
         return currentTime;
     }
-    public double delta(long startTimeMillis) {
+    protected double delta(long startTimeMillis) {
         return time() - startTimeMillis;
     }
 }