Return-Path: X-Original-To: apmail-poi-commits-archive@minotaur.apache.org Delivered-To: apmail-poi-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6293318BBA for ; Fri, 31 Jul 2015 22:16:54 +0000 (UTC) Received: (qmail 41710 invoked by uid 500); 31 Jul 2015 22:16:54 -0000 Delivered-To: apmail-poi-commits-archive@poi.apache.org Received: (qmail 41675 invoked by uid 500); 31 Jul 2015 22:16:54 -0000 Mailing-List: contact commits-help@poi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@poi.apache.org Delivered-To: mailing list commits@poi.apache.org Received: (qmail 41665 invoked by uid 99); 31 Jul 2015 22:16:54 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Jul 2015 22:16:54 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id E0873AC010E for ; Fri, 31 Jul 2015 22:16:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1693663 - in /poi/trunk/src/ooxml/testcases/org/apache/poi/xssf: streaming/TestSXSSFWorkbook.java usermodel/TestSXSSFBugs.java Date: Fri, 31 Jul 2015 22:16:53 -0000 To: commits@poi.apache.org From: nick@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150731221653.E0873AC010E@hades.apache.org> Author: nick Date: Fri Jul 31 22:16:53 2015 New Revision: 1693663 URL: http://svn.apache.org/r1693663 Log: Re-enable some SXSSF skipped tests, but not all, for our limited evaluation support #58200 Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java 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=1693663&r1=1693662&r2=1693663&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 Fri Jul 31 22:16:53 2015 @@ -42,6 +42,7 @@ import org.apache.poi.xssf.SXSSFITestDat 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 ext } /** - * 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 ext @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 ext wb = new SXSSFWorkbook(); wb.setCompressTempFiles(true); - sh = (SXSSFSheet)wb.createSheet(); + sh = wb.createSheet(); wr = sh.getSheetDataWriter(); assertTrue(wr.getClass() == GZIPSheetDataWriter.class); tmp = wr.getTempFile(); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java?rev=1693663&r1=1693662&r2=1693663&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java Fri Jul 31 22:16:53 2015 @@ -34,15 +34,11 @@ public final class TestSXSSFBugs extends } // 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 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org For additional commands, e-mail: commits-help@poi.apache.org