bug 33174: Use common unit test for testNoMergedRegionsIsEmptyList

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

diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
index a3de1b2e51f146c7b02d20c374ee1ac2f122c36c..a2f80efa49f88cf802d5dedcb8f511bcf6ac5f03 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
@@ -1435,12 +1435,4 @@ public final class TestXSSFSheet extends BaseTestSheet {
         assertNotNull(sheet.createComment());
         wb.close();
     }
-
-    @Test
-    public void testNoMergedRegionsIsEmptyList() throws IOException {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet();
-        assertTrue(sheet.getMergedRegions().isEmpty());
-        wb.close();
-    }
 }
\ No newline at end of file

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
index 3f5b8aca9fa8e6156279695d8aea8fbfada63ef6..4fa9865a612eb90bb270b0a85564584fbf6b0ed0 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
@@ -697,14 +697,6 @@ public final class TestHSSFSheet extends BaseTestSheet {
         wb2.close();
         wb1.close();
     }
-
-    @Test
-    public void testNoMergedRegionsIsEmptyList() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet s = wb.createSheet("Sheet1");
-        assertTrue(s.getMergedRegions().isEmpty());
-        wb.close();
-    }
     
     @Test
     public void autoSizeDate() throws IOException {

diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java
index 5c1df69dac5e5c23ee6e4cb4016ce90d02a21c93..24c596b4ffc1207d6fd6b8f4d366ee4f4d2ec7d5 100644 (file)
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java
+++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java
@@ -1045,4 +1045,12 @@ public abstract class BaseTestSheet {
         
         wb.close();
     }
+    
+    @Test
+    public void testNoMergedRegionsIsEmptyList() throws IOException {
+        Workbook wb = _testDataProvider.createWorkbook();
+        Sheet sheet = wb.createSheet();
+        assertTrue(sheet.getMergedRegions().isEmpty());
+        wb.close();
+    }
 }