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 01C7418916 for ; Sun, 20 Sep 2015 20:16:27 +0000 (UTC) Received: (qmail 1703 invoked by uid 500); 20 Sep 2015 20:16:26 -0000 Delivered-To: apmail-poi-commits-archive@poi.apache.org Received: (qmail 1663 invoked by uid 500); 20 Sep 2015 20:16:26 -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 1654 invoked by uid 99); 20 Sep 2015 20:16:26 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 20 Sep 2015 20:16:26 +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 6E8961A22A2 for ; Sun, 20 Sep 2015 20:16:26 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 4.3 X-Spam-Level: **** X-Spam-Status: No, score=4.3 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RDNS_NONE=2.5] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 9e7GCPL-zDeq for ; Sun, 20 Sep 2015 20:16:25 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (unknown [209.188.14.139]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with ESMTP id E050644158 for ; Sun, 20 Sep 2015 20:16:24 +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 3DE76E071D for ; Sun, 20 Sep 2015 20:16:24 +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 063413A043D for ; Sun, 20 Sep 2015 20:16:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1704186 - in /poi/trunk/src: ooxml/testcases/org/apache/poi/xssf/streaming/ ooxml/testcases/org/apache/poi/xssf/usermodel/ testcases/org/apache/poi/hssf/usermodel/ testcases/org/apache/poi/ss/usermodel/ Date: Sun, 20 Sep 2015 20:16:23 -0000 To: commits@poi.apache.org From: centic@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150920201624.063413A043D@svn01-us-west.apache.org> Author: centic Date: Sun Sep 20 20:16:17 2015 New Revision: 1704186 URL: http://svn.apache.org/viewvc?rev=1704186&view=rev Log: Bug 58333: Apply patch to verify behavior on row-index before and after the limits set by the specification Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheet.java poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java 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=1704186&r1=1704185&r2=1704186&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 Sep 20 20:16:17 2015 @@ -24,6 +24,7 @@ import static org.junit.Assert.fail; import java.io.IOException; +import org.apache.poi.ss.SpreadsheetVersion; import org.apache.poi.ss.usermodel.BaseTestSheet; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; @@ -146,6 +147,10 @@ public class TestSXSSFSheet extends Base } finally { wb.close(); } + } + @Test + public void createRowAfterLastRow() { + createRowAfterLastRow(SpreadsheetVersion.EXCEL2007); } } 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=1704186&r1=1704185&r2=1704186&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 Sep 20 20:16:17 2015 @@ -33,6 +33,7 @@ import org.apache.poi.POIXMLException; import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.poifs.crypt.CryptoFunctions; 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.Cell; @@ -994,6 +995,11 @@ public final class TestXSSFSheet extends assertEquals(3, xrow[2].getR()); } + + @Test + public void createRowAfterLastRow() { + createRowAfterLastRow(SpreadsheetVersion.EXCEL2007); + } @Test public void setAutoFilter() { Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java?rev=1704186&r1=1704185&r2=1704186&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java Sun Sep 20 20:16:17 2015 @@ -57,6 +57,7 @@ import org.apache.poi.hssf.record.WSBool import org.apache.poi.hssf.record.WindowTwoRecord; import org.apache.poi.hssf.record.aggregates.WorksheetProtectionBlock; import org.apache.poi.hssf.usermodel.RecordInspector.RecordCollector; +import org.apache.poi.ss.SpreadsheetVersion; import org.apache.poi.ss.formula.ptg.Area3DPtg; import org.apache.poi.ss.formula.ptg.Ptg; import org.apache.poi.ss.usermodel.AutoFilter; @@ -84,7 +85,11 @@ public final class TestHSSFSheet extends public TestHSSFSheet() { super(HSSFITestDataProvider.instance); } - + + @Test + public void createRowAfterLastRow() { + createRowAfterLastRow(SpreadsheetVersion.EXCEL97); + } /** * Test for Bugzilla #29747. 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=1704186&r1=1704185&r2=1704186&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 Sep 20 20:16:17 2015 @@ -87,6 +87,31 @@ public abstract class BaseTestSheet { assertSame(row2_ovrewritten, row2_ovrewritten_ref); assertEquals(100.0, row2_ovrewritten_ref.getCell(0).getNumericCellValue(), 0.0); } + + @Test + public void createRowBeforeFirstRow() { + final Workbook workbook = _testDataProvider.createWorkbook(); + final Sheet sh = workbook.createSheet(); + sh.createRow(0); + try { + sh.createRow(-1); + fail("Negative rows not allowed"); + } catch (final IllegalArgumentException e) { + // expected + } + } + + protected void createRowAfterLastRow(SpreadsheetVersion version) { + final Workbook workbook = _testDataProvider.createWorkbook(); + final Sheet sh = workbook.createSheet(); + sh.createRow(version.getLastRowIndex()); + try { + sh.createRow(version.getLastRowIndex() + 1); + fail("Row number must be between 0 and " + version.getLastColumnIndex()); + } catch (final IllegalArgumentException e) { + // expected + } + } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org For additional commands, e-mail: commits-help@poi.apache.org