From 0b0e30c06c1f32e34a7d8d0b54ced37504e3d178 Mon Sep 17 00:00:00 2001
From: Javen O'Neal <onealj@apache.org>
Date: Fri, 23 Oct 2015 08:38:14 +0000
Subject: [PATCH] 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
---
 .../org/apache/poi/xssf/usermodel/TestXSSFSheet.java      | 8 --------
 .../org/apache/poi/hssf/usermodel/TestHSSFSheet.java      | 8 --------
 .../org/apache/poi/ss/usermodel/BaseTestSheet.java        | 8 ++++++++
 3 files changed, 8 insertions(+), 16 deletions(-)

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 a3de1b2e51..a2f80efa49 100644
--- 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 3f5b8aca9f..4fa9865a61 100644
--- 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 5c1df69dac..24c596b4ff 100644
--- 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();
+    }
 }
-- 
2.39.5