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 9721518247 for ; Sun, 17 Apr 2016 08:06:37 +0000 (UTC) Received: (qmail 6417 invoked by uid 500); 17 Apr 2016 08:06:37 -0000 Delivered-To: apmail-poi-commits-archive@poi.apache.org Received: (qmail 6381 invoked by uid 500); 17 Apr 2016 08:06:37 -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 6372 invoked by uid 99); 17 Apr 2016 08:06:37 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 Apr 2016 08:06:37 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id C9D861A049D for ; Sun, 17 Apr 2016 08:06:36 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.799 X-Spam-Level: * X-Spam-Status: No, score=1.799 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id EVcGEVOIoSbP for ; Sun, 17 Apr 2016 08:06:33 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with ESMTP id 23C615F3F5 for ; Sun, 17 Apr 2016 08:06:33 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 00C52E01D9 for ; Sun, 17 Apr 2016 08:06:31 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id A263B3A0099 for ; Sun, 17 Apr 2016 08:06:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1739550 - 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/ss/usermodel/ Date: Sun, 17 Apr 2016 08:06:31 -0000 To: commits@poi.apache.org From: onealj@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160417080631.A263B3A0099@svn01-us-west.apache.org> Author: onealj Date: Sun Apr 17 08:06:30 2016 New Revision: 1739550 URL: http://svn.apache.org/viewvc?rev=1739550&view=rev Log: add junit test classes for combined testing of XML-specific functionality of (S)XSSF Workbook, Sheet, and Row Added: poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXRow.java - copied, changed from r1739548, poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXCell.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXSheet.java - copied, changed from r1739548, poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXCell.java poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXWorkbook.java - copied, changed from r1739548, poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXCell.java Modified: 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/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 Copied: poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXRow.java (from r1739548, poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXCell.java) URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXRow.java?p2=poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXRow.java&p1=poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXCell.java&r1=1739548&r2=1739550&rev=1739550&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXCell.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXRow.java Sun Apr 17 08:06:30 2016 @@ -17,56 +17,19 @@ package org.apache.poi.ss.usermodel; -import static org.junit.Assert.assertEquals; - -import java.io.IOException; -import java.util.Calendar; -import java.util.Date; - -import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.ss.ITestDataProvider; -import org.apache.poi.xssf.streaming.SXSSFCell; -import org.apache.poi.xssf.usermodel.XSSFCell; -import org.junit.Test; +import org.apache.poi.xssf.streaming.SXSSFRow; +import org.apache.poi.xssf.usermodel.XSSFRow; /** * Class for combined testing of XML-specific functionality of - * {@link XSSFCell} and {@link SXSSFCell}. + * {@link XSSFRow} and {@link SXSSFRow}. * - * Any test that is applicable for {@link HSSFCell} as well should go into - * the common base class {@link BaseTestCell}. + * Any test that is applicable for {@link org.apache.poi.hssf.usermodel.HSSFRow} as well should go into + * the common base class {@link BaseTestRow}. */ -public abstract class BaseTestXCell extends BaseTestCell { - protected BaseTestXCell(ITestDataProvider testDataProvider) { +public abstract class BaseTestXRow extends BaseTestRow { + protected BaseTestXRow(ITestDataProvider testDataProvider) { super(testDataProvider); } - - @Test - public void testXmlEncoding() throws IOException { - Workbook wb1 = _testDataProvider.createWorkbook(); - Sheet sh = wb1.createSheet(); - Row row = sh.createRow(0); - Cell cell = row.createCell(0); - String sval = "\u0000\u0002\u0012<>\t\n\u00a0 &\"POI\'\u2122"; - cell.setCellValue(sval); - - Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1); - wb1.close(); - - // invalid characters are replaced with question marks - assertEquals("???<>\t\n\u00a0 &\"POI\'\u2122", wb2.getSheetAt(0).getRow(0).getCell(0).getStringCellValue()); - wb2.close(); - } - - @Test - public void testSetNullValues() { - Workbook wb = _testDataProvider.createWorkbook(); - Cell cell = wb.createSheet("test").createRow(0).createCell(0); - - cell.setCellValue((Calendar)null); - cell.setCellValue((Date)null); - cell.setCellValue((String)null); - cell.setCellValue((RichTextString) null); - cell.setCellValue((String)null); - } } Copied: poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXSheet.java (from r1739548, poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXCell.java) URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXSheet.java?p2=poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXSheet.java&p1=poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXCell.java&r1=1739548&r2=1739550&rev=1739550&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXCell.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXSheet.java Sun Apr 17 08:06:30 2016 @@ -17,56 +17,19 @@ package org.apache.poi.ss.usermodel; -import static org.junit.Assert.assertEquals; - -import java.io.IOException; -import java.util.Calendar; -import java.util.Date; - -import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.ss.ITestDataProvider; -import org.apache.poi.xssf.streaming.SXSSFCell; -import org.apache.poi.xssf.usermodel.XSSFCell; -import org.junit.Test; +import org.apache.poi.xssf.streaming.SXSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFSheet; /** * Class for combined testing of XML-specific functionality of - * {@link XSSFCell} and {@link SXSSFCell}. + * {@link XSSFSheet} and {@link SXSSFSheet}. * - * Any test that is applicable for {@link HSSFCell} as well should go into - * the common base class {@link BaseTestCell}. + * Any test that is applicable for {@link org.apache.poi.hssf.usermodel.HSSFSheet} as well should go into + * the common base class {@link BaseTestSheet}. */ -public abstract class BaseTestXCell extends BaseTestCell { - protected BaseTestXCell(ITestDataProvider testDataProvider) { +public abstract class BaseTestXSheet extends BaseTestSheet { + protected BaseTestXSheet(ITestDataProvider testDataProvider) { super(testDataProvider); } - - @Test - public void testXmlEncoding() throws IOException { - Workbook wb1 = _testDataProvider.createWorkbook(); - Sheet sh = wb1.createSheet(); - Row row = sh.createRow(0); - Cell cell = row.createCell(0); - String sval = "\u0000\u0002\u0012<>\t\n\u00a0 &\"POI\'\u2122"; - cell.setCellValue(sval); - - Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1); - wb1.close(); - - // invalid characters are replaced with question marks - assertEquals("???<>\t\n\u00a0 &\"POI\'\u2122", wb2.getSheetAt(0).getRow(0).getCell(0).getStringCellValue()); - wb2.close(); - } - - @Test - public void testSetNullValues() { - Workbook wb = _testDataProvider.createWorkbook(); - Cell cell = wb.createSheet("test").createRow(0).createCell(0); - - cell.setCellValue((Calendar)null); - cell.setCellValue((Date)null); - cell.setCellValue((String)null); - cell.setCellValue((RichTextString) null); - cell.setCellValue((String)null); - } } Copied: poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXWorkbook.java (from r1739548, poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXCell.java) URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXWorkbook.java?p2=poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXWorkbook.java&p1=poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXCell.java&r1=1739548&r2=1739550&rev=1739550&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXCell.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/BaseTestXWorkbook.java Sun Apr 17 08:06:30 2016 @@ -17,56 +17,19 @@ package org.apache.poi.ss.usermodel; -import static org.junit.Assert.assertEquals; - -import java.io.IOException; -import java.util.Calendar; -import java.util.Date; - -import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.ss.ITestDataProvider; -import org.apache.poi.xssf.streaming.SXSSFCell; -import org.apache.poi.xssf.usermodel.XSSFCell; -import org.junit.Test; +import org.apache.poi.xssf.streaming.SXSSFWorkbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; /** * Class for combined testing of XML-specific functionality of - * {@link XSSFCell} and {@link SXSSFCell}. + * {@link XSSFWorkbook} and {@link SXSSFWorkbook}. * - * Any test that is applicable for {@link HSSFCell} as well should go into - * the common base class {@link BaseTestCell}. + * Any test that is applicable for {@link org.apache.poi.hssf.usermodel.HSSFWorkbook} as well should go into + * the common base class {@link BaseTestWorkbook}. */ -public abstract class BaseTestXCell extends BaseTestCell { - protected BaseTestXCell(ITestDataProvider testDataProvider) { +public abstract class BaseTestXWorkbook extends BaseTestWorkbook { + protected BaseTestXWorkbook(ITestDataProvider testDataProvider) { super(testDataProvider); } - - @Test - public void testXmlEncoding() throws IOException { - Workbook wb1 = _testDataProvider.createWorkbook(); - Sheet sh = wb1.createSheet(); - Row row = sh.createRow(0); - Cell cell = row.createCell(0); - String sval = "\u0000\u0002\u0012<>\t\n\u00a0 &\"POI\'\u2122"; - cell.setCellValue(sval); - - Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1); - wb1.close(); - - // invalid characters are replaced with question marks - assertEquals("???<>\t\n\u00a0 &\"POI\'\u2122", wb2.getSheetAt(0).getRow(0).getCell(0).getStringCellValue()); - wb2.close(); - } - - @Test - public void testSetNullValues() { - Workbook wb = _testDataProvider.createWorkbook(); - Cell cell = wb.createSheet("test").createRow(0).createCell(0); - - cell.setCellValue((Calendar)null); - cell.setCellValue((Date)null); - cell.setCellValue((String)null); - cell.setCellValue((RichTextString) null); - cell.setCellValue((String)null); - } } 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=1739550&r1=1739549&r2=1739550&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:06:30 2016 @@ -22,7 +22,7 @@ package org.apache.poi.xssf.streaming; import java.io.IOException; import org.apache.poi.ss.SpreadsheetVersion; -import org.apache.poi.ss.usermodel.BaseTestRow; +import org.apache.poi.ss.usermodel.BaseTestXRow; import org.apache.poi.xssf.SXSSFITestDataProvider; import org.junit.After; import org.junit.Test; @@ -30,7 +30,7 @@ import org.junit.Test; /** * Tests for XSSFRow */ -public final class TestSXSSFRow extends BaseTestRow { +public final class TestSXSSFRow extends BaseTestXRow { public TestSXSSFRow() { super(SXSSFITestDataProvider.instance); @@ -39,7 +39,7 @@ public final class TestSXSSFRow extends @After public void tearDown() { - SXSSFITestDataProvider.instance.cleanup(); + ((SXSSFITestDataProvider) _testDataProvider).cleanup(); } @Test 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=1739550&r1=1739549&r2=1739550&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:06:30 2016 @@ -23,11 +23,9 @@ import static org.junit.Assert.assertEqu import static org.junit.Assert.fail; import java.io.IOException; -import java.util.SortedSet; -import java.util.TreeSet; import org.apache.poi.ss.SpreadsheetVersion; -import org.apache.poi.ss.usermodel.BaseTestSheet; +import org.apache.poi.ss.usermodel.BaseTestXSheet; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.SXSSFITestDataProvider; @@ -36,7 +34,7 @@ import org.junit.After; import org.junit.Test; -public class TestSXSSFSheet extends BaseTestSheet { +public final class TestSXSSFSheet extends BaseTestXSheet { public TestSXSSFSheet() { super(SXSSFITestDataProvider.instance); 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=1739550&r1=1739549&r2=1739550&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:06:30 2016 @@ -32,11 +32,9 @@ import java.io.IOException; import org.apache.poi.POIDataSamples; import org.apache.poi.POITestCase; -import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; -import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.ss.SpreadsheetVersion; -import org.apache.poi.ss.usermodel.BaseTestWorkbook; +import org.apache.poi.ss.usermodel.BaseTestXWorkbook; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; @@ -52,16 +50,15 @@ import org.junit.Assume; import org.junit.Ignore; import org.junit.Test; -public final class TestSXSSFWorkbook extends BaseTestWorkbook { - private static final SXSSFITestDataProvider _testDataProvider = SXSSFITestDataProvider.instance; +public final class TestSXSSFWorkbook extends BaseTestXWorkbook { public TestSXSSFWorkbook() { - super(_testDataProvider); - } + super(SXSSFITestDataProvider.instance); + } @After public void tearDown(){ - _testDataProvider.cleanup(); + ((SXSSFITestDataProvider)_testDataProvider).cleanup(); } /** 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=1739550&r1=1739549&r2=1739550&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:06:30 2016 @@ -24,7 +24,7 @@ import static org.junit.Assert.assertSam import java.io.IOException; import org.apache.poi.ss.SpreadsheetVersion; -import org.apache.poi.ss.usermodel.BaseTestRow; +import org.apache.poi.ss.usermodel.BaseTestXRow; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellCopyPolicy; import org.apache.poi.ss.usermodel.Row; @@ -35,7 +35,7 @@ import org.junit.Test; /** * Tests for XSSFRow */ -public final class TestXSSFRow extends BaseTestRow { +public final class TestXSSFRow extends BaseTestXRow { public TestXSSFRow() { super(XSSFITestDataProvider.instance); 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=1739550&r1=1739549&r2=1739550&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:06:30 2016 @@ -26,7 +26,6 @@ import static org.junit.Assert.assertNot import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import java.io.IOException; import java.util.Arrays; @@ -43,7 +42,7 @@ import org.apache.poi.poifs.crypt.Crypto import org.apache.poi.poifs.crypt.HashAlgorithm; import org.apache.poi.ss.SpreadsheetVersion; import org.apache.poi.ss.usermodel.AutoFilter; -import org.apache.poi.ss.usermodel.BaseTestSheet; +import org.apache.poi.ss.usermodel.BaseTestXSheet; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellCopyPolicy; import org.apache.poi.ss.usermodel.ClientAnchor; @@ -82,7 +81,7 @@ import org.openxmlformats.schemas.spread import org.openxmlformats.schemas.spreadsheetml.x2006.main.STPane; -public final class TestXSSFSheet extends BaseTestSheet { +public final class TestXSSFSheet extends BaseTestXSheet { public TestXSSFSheet() { super(XSSFITestDataProvider.instance); 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=1739550&r1=1739549&r2=1739550&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:06:30 2016 @@ -53,7 +53,7 @@ import org.apache.poi.openxml4j.opc.inte import org.apache.poi.openxml4j.opc.internal.MemoryPackagePart; import org.apache.poi.openxml4j.opc.internal.PackagePropertiesPart; import org.apache.poi.ss.SpreadsheetVersion; -import org.apache.poi.ss.usermodel.BaseTestWorkbook; +import org.apache.poi.ss.usermodel.BaseTestXWorkbook; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.Font; @@ -77,11 +77,10 @@ import org.openxmlformats.schemas.spread import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorkbookPr; import org.openxmlformats.schemas.spreadsheetml.x2006.main.STCalcMode; -public final class TestXSSFWorkbook extends BaseTestWorkbook { - private static final XSSFITestDataProvider _testDataProvider = XSSFITestDataProvider.instance; +public final class TestXSSFWorkbook extends BaseTestXWorkbook { public TestXSSFWorkbook() { - super(_testDataProvider); + super(XSSFITestDataProvider.instance); } /** 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=1739550&r1=1739549&r2=1739550&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:06:30 2016 @@ -36,7 +36,7 @@ import org.junit.Test; */ public abstract class BaseTestRow { - private final ITestDataProvider _testDataProvider; + protected final ITestDataProvider _testDataProvider; protected BaseTestRow(ITestDataProvider testDataProvider) { _testDataProvider = testDataProvider; 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=1739550&r1=1739549&r2=1739550&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:06:30 2016 @@ -51,10 +51,10 @@ public abstract class BaseTestSheet { @Rule public ExpectedException thrown = ExpectedException.none(); - private final ITestDataProvider _testDataProvider; + protected final ITestDataProvider _testDataProvider; protected BaseTestSheet(ITestDataProvider testDataProvider) { - _testDataProvider = testDataProvider; + _testDataProvider = testDataProvider; } protected void trackColumnsForAutoSizingIfSXSSF(Sheet sheet) { 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=1739550&r1=1739549&r2=1739550&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:06:30 2016 @@ -39,10 +39,10 @@ import org.junit.Test; public abstract class BaseTestWorkbook { - private final ITestDataProvider _testDataProvider; + protected final ITestDataProvider _testDataProvider; protected BaseTestWorkbook(ITestDataProvider testDataProvider) { - _testDataProvider = testDataProvider; + _testDataProvider = testDataProvider; } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org For additional commands, e-mail: commits-help@poi.apache.org