You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2015/05/12 08:27:11 UTC
svn commit: r1678874 - in /poi/trunk/src:
java/org/apache/poi/hssf/record/RowRecord.java
testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
testcases/org/apache/poi/ss/usermodel/BaseTestRow.java
Author: centic
Date: Tue May 12 06:27:11 2015
New Revision: 1678874
URL: http://svn.apache.org/r1678874
Log:
Adjust error message to have the same error across different types of Workbook and revert test to check on common error message again
Modified:
poi/trunk/src/java/org/apache/poi/hssf/record/RowRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestRow.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/RowRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/RowRecord.java?rev=1678874&r1=1678873&r2=1678874&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/RowRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/RowRecord.java Tue May 12 06:27:11 2015
@@ -65,7 +65,7 @@ public final class RowRecord extends Sta
public RowRecord(int rowNumber) {
if(rowNumber < 0) {
- throw new IllegalArgumentException("Invalid row number " + rowNumber + " specified");
+ throw new IllegalArgumentException("Invalid row number (" + rowNumber + ")");
}
field_1_row_number = rowNumber;
field_4_height = (short)0xFF;
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java?rev=1678874&r1=1678873&r2=1678874&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java Tue May 12 06:27:11 2015
@@ -17,6 +17,8 @@
package org.apache.poi.hssf.usermodel;
+import java.io.IOException;
+
import junit.framework.AssertionFailedError;
import org.apache.poi.hssf.HSSFITestDataProvider;
@@ -71,7 +73,7 @@ public final class TestHSSFRow extends B
assertEquals(-1, row.getLastCellNum());
}
- public void testMoveCell() {
+ public void testMoveCell() throws IOException {
HSSFWorkbook workbook = new HSSFWorkbook();
HSSFSheet sheet = workbook.createSheet();
HSSFRow row = sheet.createRow(0);
@@ -115,9 +117,11 @@ public final class TestHSSFRow extends B
assertEquals(5, cellB2.getColumnIndex());
assertEquals(2, row.getFirstCellNum());
assertEquals(6, row.getLastCellNum());
+
+ workbook.close();
}
- public void testRowHeight(){
+ public void testRowHeight() throws IOException{
HSSFWorkbook workbook = new HSSFWorkbook();
HSSFSheet sheet = workbook.createSheet();
HSSFRow row = sheet.createRow(0);
@@ -132,5 +136,7 @@ public final class TestHSSFRow extends B
row.setHeight((short) -1);
assertEquals(row.getHeight(), sheet.getDefaultRowHeight());
assertEquals(row.getRowRecord().getBadFontHeight(), false);
+
+ workbook.close();
}
}
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=1678874&r1=1678873&r2=1678874&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 Tue May 12 06:27:11 2015
@@ -17,6 +17,7 @@
package org.apache.poi.ss.usermodel;
+import java.io.IOException;
import java.util.Iterator;
import junit.framework.TestCase;
@@ -138,7 +139,7 @@ public abstract class BaseTestRow extend
} catch (IllegalArgumentException e) {
// expected during successful test
assertTrue("Did not find expected error message, had: " + e,
- e.getMessage().startsWith("Invalid row number -1"));
+ e.getMessage().startsWith("Invalid row number (-1)"));
}
//Test high row bound
@@ -285,7 +286,7 @@ public abstract class BaseTestRow extend
assertEquals(Cell.CELL_TYPE_NUMERIC, row.getCell(5).getCellType());
}
- public void testRowHeight() {
+ public void testRowHeight() throws IOException {
Workbook workbook = _testDataProvider.createWorkbook();
Sheet sheet = workbook.createSheet();
Row row1 = sheet.createRow(0);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org