Merge from 1.5 branch

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

2 files changed, 14 insertions, 2 deletions

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
index f8c584839a..fe3414d1f7 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
@@ -115,5 +115,11 @@ public class TestHSSFRow
         assertEquals(-1, row.getLastCellNum());
         assertEquals(-1, row.getFirstCellNum());
 
+        // check the row record actually writes it out as 0's
+        byte[] data = new byte[100];
+        row.getRowRecord().serialize(0, data);
+        assertEquals(0, data[6]);
+        assertEquals(0, data[8]);
+
     }
 }
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
index 4868aee042..ddaedd922e 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
@@ -58,7 +58,6 @@ import junit.framework.TestCase;
 import org.apache.poi.hssf.model.Sheet;
 import org.apache.poi.hssf.record.VCenterRecord;
 import org.apache.poi.hssf.record.WSBoolRecord;
-import org.apache.poi.hssf.dev.BiffViewer;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -190,7 +189,14 @@ public class TestHSSFSheet
         tempFile.delete();
         assertNotNull(row);
         assertEquals(2, row.getPhysicalNumberOfCells());
+    }
 
-
+    public void testRemoveRow()
+    {
+        HSSFWorkbook workbook = new HSSFWorkbook();
+        HSSFSheet sheet = workbook.createSheet("Test boolean");
+        HSSFRow row = sheet.createRow((short) 2);
+        sheet.removeRow(row);
     }
+
 }