Re-enable some SXSSF skipped tests, but not all, for our limited evaluation support #58200

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

2 files changed, 9 insertions, 19 deletions

diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
index 81d8557476..2cbca15520 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
@@ -42,6 +42,7 @@ import org.apache.poi.xssf.SXSSFITestDataProvider;
 import org.apache.poi.xssf.model.SharedStringsTable;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.junit.After;
+import org.junit.Assume;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -72,20 +73,13 @@ public final class TestSXSSFWorkbook extends BaseTestWorkbook {
     }
 
     /**
-     * this test involves evaluation of formulas which isn't supported for SXSSF
+     * Skip this test, as SXSSF doesn't update formulas on sheet name
+     *  changes.
      */
     @Override
     @Test
     public void setSheetName() {
-        try {
-            super.setSheetName();
-            fail("expected exception");
-        } catch (ClassCastException e) { // TODO Temporary workaround during #58200
-        } catch (Exception e){
-            assertEquals(
-                    "Unexpected type of cell: class org.apache.poi.xssf.streaming.SXSSFCell. " +
-                    "Only XSSFCells can be evaluated.", e.getMessage());
-        }
+        Assume.assumeTrue("SXSSF doesn't update formulas on sheet name changes, as most cells probably aren't in memory at the time", false);
     }
 
     @Test
@@ -217,7 +211,7 @@ public final class TestSXSSFWorkbook extends BaseTestWorkbook {
     @Test
     public void sheetdataWriter(){
         SXSSFWorkbook wb = new SXSSFWorkbook();
-        SXSSFSheet sh = (SXSSFSheet)wb.createSheet();
+        SXSSFSheet sh = wb.createSheet();
         SheetDataWriter wr = sh.getSheetDataWriter();
         assertTrue(wr.getClass() == SheetDataWriter.class);
         File tmp = wr.getTempFile();
@@ -227,7 +221,7 @@ public final class TestSXSSFWorkbook extends BaseTestWorkbook {
 
         wb = new SXSSFWorkbook();
         wb.setCompressTempFiles(true);
-        sh = (SXSSFSheet)wb.createSheet();
+        sh = wb.createSheet();
         wr = sh.getSheetDataWriter();
         assertTrue(wr.getClass() == GZIPSheetDataWriter.class);
         tmp = wr.getTempFile();
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 0de42aa5b3..228e6af80a 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java
@@ -34,15 +34,11 @@ public final class TestSXSSFBugs extends BaseTestBugzillaIssues {
     }

 

     // override some tests which do not work for SXSSF

-    // TODO Re-enable some of these when #58200 is implemented

     @Override @Ignore("cloneSheet() not implemented") @Test public void bug18800() { /* cloneSheet() not implemented */ }

     @Override @Ignore("cloneSheet() not implemented") @Test public void bug22720() { /* cloneSheet() not implemented */ }

-    @Override @Ignore("Evaluation is not supported") @Test public void bug43093() { /* Evaluation is not supported */ }

-    @Override @Ignore("Evaluation is not supported") @Test public void bug51024() { /* Evaluation is not supported */ }

-    @Override @Ignore("Evaluation is not supported") @Test public void bug46729_testMaxFunctionArguments() { /* Evaluation is not supported */ }

-    @Override @Ignore("Evaluation is not supported") @Test public void stackoverflow26437323() { /* Evaluation is not supported */ }

-    @Override @Ignore("Evaluation is not supported") @Test public void bug47815() { /* Evaluation is not supported */ }

-    @Override @Ignore("Evaluation is not supported") @Test public void test58113() { /* Evaluation is not supported */ }

+    @Override @Ignore("Evaluation is not fully supported") @Test public void bug47815() { /* Evaluation is not supported */ }

+    @Override @Ignore("Evaluation is not fully supported") @Test public void test58113() { /* Evaluation is not supported */ }

+    @Override @Ignore("Evaluation is not fully supported") @Test public void bug46729_testMaxFunctionArguments() { /* Evaluation is not supported */ }

     

     /**

      * Setting repeating rows and columns shouldn't break