Migrate all junit tests to Junit 4

get rid of references to junit.framework
don't throw AssertionFailedErrors, but use Assert.fail instead
add try-with-resources where it was missing

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

1 files changed, 807 insertions, 880 deletions

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
index 6bcbcfa332..78d6756cb4 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
@@ -17,6 +17,8 @@
 
 package org.apache.poi.hssf.usermodel;
 
+import static org.apache.poi.hssf.HSSFTestDataSamples.writeOutAndReadBack;
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
@@ -27,6 +29,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.poi.ddf.EscherDgRecord;
@@ -35,27 +38,8 @@ import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.hssf.model.DrawingManager2;
 import org.apache.poi.hssf.model.InternalSheet;
 import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.record.AutoFilterInfoRecord;
-import org.apache.poi.hssf.record.CommonObjectDataSubRecord;
-import org.apache.poi.hssf.record.DimensionsRecord;
-import org.apache.poi.hssf.record.FtCblsSubRecord;
-import org.apache.poi.hssf.record.GridsetRecord;
-import org.apache.poi.hssf.record.HCenterRecord;
-import org.apache.poi.hssf.record.LbsDataSubRecord;
-import org.apache.poi.hssf.record.NameRecord;
-import org.apache.poi.hssf.record.ObjRecord;
-import org.apache.poi.hssf.record.ObjectProtectRecord;
-import org.apache.poi.hssf.record.PasswordRecord;
-import org.apache.poi.hssf.record.ProtectRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.SCLRecord;
-import org.apache.poi.hssf.record.ScenarioProtectRecord;
-import org.apache.poi.hssf.record.SubRecord;
-import org.apache.poi.hssf.record.VCenterRecord;
-import org.apache.poi.hssf.record.WSBoolRecord;
-import org.apache.poi.hssf.record.WindowTwoRecord;
+import org.apache.poi.hssf.record.*;
 import org.apache.poi.hssf.record.aggregates.WorksheetProtectionBlock;
-import org.apache.poi.hssf.usermodel.RecordInspector.RecordCollector;
 import org.apache.poi.ss.formula.ptg.Area3DPtg;
 import org.apache.poi.ss.formula.ptg.Ptg;
 import org.apache.poi.ss.usermodel.AutoFilter;
@@ -71,10 +55,6 @@ import org.junit.Test;
 
 /**
  * Tests HSSFSheet.  This test case is very incomplete at the moment.
- *
- *
- * @author Glen Stampoultzis (glens at apache.org)
- * @author Andrew C. Oliver (acoliver apache org)
  */
 public final class TestHSSFSheet extends BaseTestSheet {
 
@@ -88,14 +68,14 @@ public final class TestHSSFSheet extends BaseTestSheet {
      */
     @Test
     public void setRepeatingRowsAndColumnsBug29747() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        wb.createSheet();
-        wb.createSheet();
-        HSSFSheet sheet2 = wb.createSheet();
-        sheet2.setRepeatingRows(CellRangeAddress.valueOf("1:2"));
-        NameRecord nameRecord = wb.getWorkbook().getNameRecord(0);
-        assertEquals(3, nameRecord.getSheetNumber());
-        wb.close();
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            wb.createSheet();
+            wb.createSheet();
+            HSSFSheet sheet2 = wb.createSheet();
+            sheet2.setRepeatingRows(CellRangeAddress.valueOf("1:2"));
+            NameRecord nameRecord = wb.getWorkbook().getNameRecord(0);
+            assertEquals(3, nameRecord.getSheetNumber());
+        }
     }
 
     @Test
@@ -108,13 +88,13 @@ public final class TestHSSFSheet extends BaseTestSheet {
      */
     @Test
     public void backupRecord() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet s = wb.createSheet();
-        GridsetRecord gridsetRec = s.getSheet().getGridsetRecord();
-        assertTrue(gridsetRec.getGridset());
-        s.setGridsPrinted(true);
-        assertFalse(gridsetRec.getGridset());
-        wb.close();
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet s = wb.createSheet();
+            GridsetRecord gridsetRec = s.getSheet().getGridsetRecord();
+            assertTrue(gridsetRec.getGridset());
+            s.setGridsPrinted(true);
+            assertFalse(gridsetRec.getGridset());
+        }
     }
 
     /**
@@ -122,17 +102,16 @@ public final class TestHSSFSheet extends BaseTestSheet {
      */
     @Test
     public void verticallyCenter() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet s = wb.createSheet();
-        VCenterRecord record = s.getSheet().getPageSettings().getVCenter();
-
-        assertFalse(record.getVCenter());
-        assertFalse(s.getVerticallyCenter());
-        s.setVerticallyCenter(true);
-        assertTrue(record.getVCenter());
-        assertTrue(s.getVerticallyCenter());
-
-        wb.close();
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet s = wb.createSheet();
+            VCenterRecord record = s.getSheet().getPageSettings().getVCenter();
+
+            assertFalse(record.getVCenter());
+            assertFalse(s.getVerticallyCenter());
+            s.setVerticallyCenter(true);
+            assertTrue(record.getVCenter());
+            assertTrue(s.getVerticallyCenter());
+        }
     }
 
     /**
@@ -140,17 +119,16 @@ public final class TestHSSFSheet extends BaseTestSheet {
      */
     @Test
     public void horizontallyCenter() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet s = wb.createSheet();
-        HCenterRecord record = s.getSheet().getPageSettings().getHCenter();
-
-        assertFalse(record.getHCenter());
-        assertFalse(s.getHorizontallyCenter());
-        s.setHorizontallyCenter(true);
-        assertTrue(record.getHCenter());
-        assertTrue(s.getHorizontallyCenter());
-
-        wb.close();
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet s = wb.createSheet();
+            HCenterRecord record = s.getSheet().getPageSettings().getHCenter();
+
+            assertFalse(record.getHCenter());
+            assertFalse(s.getHorizontallyCenter());
+            s.setHorizontallyCenter(true);
+            assertTrue(record.getHCenter());
+            assertTrue(s.getHorizontallyCenter());
+        }
     }
 
 
@@ -159,51 +137,49 @@ public final class TestHSSFSheet extends BaseTestSheet {
      */
     @Test
     public void wsBool() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet s = wb.createSheet();
-        WSBoolRecord record =
-                (WSBoolRecord) s.getSheet().findFirstRecordBySid(WSBoolRecord.sid);
-
-        // Check defaults
-        assertNotNull(record);
-        assertTrue(record.getAlternateExpression());
-        assertTrue(record.getAlternateFormula());
-        assertFalse(record.getAutobreaks());
-        assertFalse(record.getDialog());
-        assertFalse(record.getDisplayGuts());
-        assertTrue(record.getFitToPage());
-        assertFalse(record.getRowSumsBelow());
-        assertFalse(record.getRowSumsRight());
-
-        // Alter
-        s.setAlternativeExpression(false);
-        s.setAlternativeFormula(false);
-        s.setAutobreaks(true);
-        s.setDialog(true);
-        s.setDisplayGuts(true);
-        s.setFitToPage(false);
-        s.setRowSumsBelow(true);
-        s.setRowSumsRight(true);
-
-        // Check
-        assertTrue(record.getAlternateExpression()); //sheet.setRowSumsBelow alters this field too
-        assertFalse(record.getAlternateFormula());
-        assertTrue(record.getAutobreaks());
-        assertTrue(record.getDialog());
-        assertTrue(record.getDisplayGuts());
-        assertFalse(record.getFitToPage());
-        assertTrue(record.getRowSumsBelow());
-        assertTrue(record.getRowSumsRight());
-        assertTrue(s.getAlternateExpression());
-        assertFalse(s.getAlternateFormula());
-        assertTrue(s.getAutobreaks());
-        assertTrue(s.getDialog());
-        assertTrue(s.getDisplayGuts());
-        assertFalse(s.getFitToPage());
-        assertTrue(s.getRowSumsBelow());
-        assertTrue(s.getRowSumsRight());
-        
-        wb.close();
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet s = wb.createSheet();
+            WSBoolRecord record = (WSBoolRecord) s.getSheet().findFirstRecordBySid(WSBoolRecord.sid);
+
+            // Check defaults
+            assertNotNull(record);
+            assertTrue(record.getAlternateExpression());
+            assertTrue(record.getAlternateFormula());
+            assertFalse(record.getAutobreaks());
+            assertFalse(record.getDialog());
+            assertFalse(record.getDisplayGuts());
+            assertTrue(record.getFitToPage());
+            assertFalse(record.getRowSumsBelow());
+            assertFalse(record.getRowSumsRight());
+
+            // Alter
+            s.setAlternativeExpression(false);
+            s.setAlternativeFormula(false);
+            s.setAutobreaks(true);
+            s.setDialog(true);
+            s.setDisplayGuts(true);
+            s.setFitToPage(false);
+            s.setRowSumsBelow(true);
+            s.setRowSumsRight(true);
+
+            // Check
+            assertTrue(record.getAlternateExpression()); //sheet.setRowSumsBelow alters this field too
+            assertFalse(record.getAlternateFormula());
+            assertTrue(record.getAutobreaks());
+            assertTrue(record.getDialog());
+            assertTrue(record.getDisplayGuts());
+            assertFalse(record.getFitToPage());
+            assertTrue(record.getRowSumsBelow());
+            assertTrue(record.getRowSumsRight());
+            assertTrue(s.getAlternateExpression());
+            assertFalse(s.getAlternateFormula());
+            assertTrue(s.getAutobreaks());
+            assertTrue(s.getDialog());
+            assertTrue(s.getDisplayGuts());
+            assertFalse(s.getFitToPage());
+            assertTrue(s.getRowSumsBelow());
+            assertTrue(s.getRowSumsRight());
+        }
     }
 
     /**
@@ -211,184 +187,174 @@ public final class TestHSSFSheet extends BaseTestSheet {
      */
     @Test
     public void printSetupLandscapeExisting() throws IOException {
-        HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("SimpleWithPageBreaks.xls");
-
-        assertEquals(3, wb1.getNumberOfSheets());
-
-        HSSFSheet sheetL = wb1.getSheetAt(0);
-        HSSFSheet sheetPM = wb1.getSheetAt(1);
-        HSSFSheet sheetLS = wb1.getSheetAt(2);
-
-        // Check two aspects of the print setup
-        assertFalse(sheetL.getPrintSetup().getLandscape());
-        assertTrue(sheetPM.getPrintSetup().getLandscape());
-        assertTrue(sheetLS.getPrintSetup().getLandscape());
-        assertEquals(1, sheetL.getPrintSetup().getCopies());
-        assertEquals(1, sheetPM.getPrintSetup().getCopies());
-        assertEquals(1, sheetLS.getPrintSetup().getCopies());
-
-        // Change one on each
-        sheetL.getPrintSetup().setLandscape(true);
-        sheetPM.getPrintSetup().setLandscape(false);
-        sheetPM.getPrintSetup().setCopies((short)3);
-
-        // Check taken
-        assertTrue(sheetL.getPrintSetup().getLandscape());
-        assertFalse(sheetPM.getPrintSetup().getLandscape());
-        assertTrue(sheetLS.getPrintSetup().getLandscape());
-        assertEquals(1, sheetL.getPrintSetup().getCopies());
-        assertEquals(3, sheetPM.getPrintSetup().getCopies());
-        assertEquals(1, sheetLS.getPrintSetup().getCopies());
-
-        // Save and re-load, and check still there
-        Workbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        sheetL = wb1.getSheetAt(0);
-        sheetPM = wb1.getSheetAt(1);
-        sheetLS = wb1.getSheetAt(2);
-        
-        assertTrue(sheetL.getPrintSetup().getLandscape());
-        assertFalse(sheetPM.getPrintSetup().getLandscape());
-        assertTrue(sheetLS.getPrintSetup().getLandscape());
-        assertEquals(1, sheetL.getPrintSetup().getCopies());
-        assertEquals(3, sheetPM.getPrintSetup().getCopies());
-        assertEquals(1, sheetLS.getPrintSetup().getCopies());
-        
-        wb2.close();
+        try (HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("SimpleWithPageBreaks.xls")) {
+
+            assertEquals(3, wb1.getNumberOfSheets());
+
+            HSSFSheet sheetL = wb1.getSheetAt(0);
+            HSSFSheet sheetPM = wb1.getSheetAt(1);
+            HSSFSheet sheetLS = wb1.getSheetAt(2);
+
+            // Check two aspects of the print setup
+            assertFalse(sheetL.getPrintSetup().getLandscape());
+            assertTrue(sheetPM.getPrintSetup().getLandscape());
+            assertTrue(sheetLS.getPrintSetup().getLandscape());
+            assertEquals(1, sheetL.getPrintSetup().getCopies());
+            assertEquals(1, sheetPM.getPrintSetup().getCopies());
+            assertEquals(1, sheetLS.getPrintSetup().getCopies());
+
+            // Change one on each
+            sheetL.getPrintSetup().setLandscape(true);
+            sheetPM.getPrintSetup().setLandscape(false);
+            sheetPM.getPrintSetup().setCopies((short) 3);
+
+            // Check taken
+            assertTrue(sheetL.getPrintSetup().getLandscape());
+            assertFalse(sheetPM.getPrintSetup().getLandscape());
+            assertTrue(sheetLS.getPrintSetup().getLandscape());
+            assertEquals(1, sheetL.getPrintSetup().getCopies());
+            assertEquals(3, sheetPM.getPrintSetup().getCopies());
+            assertEquals(1, sheetLS.getPrintSetup().getCopies());
+
+            // Save and re-load, and check still there
+            try (HSSFWorkbook wb2 = writeOutAndReadBack(wb1)) {
+                sheetL = wb2.getSheetAt(0);
+                sheetPM = wb2.getSheetAt(1);
+                sheetLS = wb2.getSheetAt(2);
+
+                assertTrue(sheetL.getPrintSetup().getLandscape());
+                assertFalse(sheetPM.getPrintSetup().getLandscape());
+                assertTrue(sheetLS.getPrintSetup().getLandscape());
+                assertEquals(1, sheetL.getPrintSetup().getCopies());
+                assertEquals(3, sheetPM.getPrintSetup().getCopies());
+                assertEquals(1, sheetLS.getPrintSetup().getCopies());
+            }
+        }
     }
 
     @Test
     public void groupRows() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet s = wb1.createSheet();
-        HSSFRow r1 = s.createRow(0);
-        HSSFRow r2 = s.createRow(1);
-        HSSFRow r3 = s.createRow(2);
-        HSSFRow r4 = s.createRow(3);
-        HSSFRow r5 = s.createRow(4);
-
-        assertEquals(0, r1.getOutlineLevel());
-        assertEquals(0, r2.getOutlineLevel());
-        assertEquals(0, r3.getOutlineLevel());
-        assertEquals(0, r4.getOutlineLevel());
-        assertEquals(0, r5.getOutlineLevel());
-
-        s.groupRow(2,3);
-
-        assertEquals(0, r1.getOutlineLevel());
-        assertEquals(0, r2.getOutlineLevel());
-        assertEquals(1, r3.getOutlineLevel());
-        assertEquals(1, r4.getOutlineLevel());
-        assertEquals(0, r5.getOutlineLevel());
-
-        // Save and re-open
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        s = wb2.getSheetAt(0);
-        r1 = s.getRow(0);
-        r2 = s.getRow(1);
-        r3 = s.getRow(2);
-        r4 = s.getRow(3);
-        r5 = s.getRow(4);
-
-        assertEquals(0, r1.getOutlineLevel());
-        assertEquals(0, r2.getOutlineLevel());
-        assertEquals(1, r3.getOutlineLevel());
-        assertEquals(1, r4.getOutlineLevel());
-        assertEquals(0, r5.getOutlineLevel());
-        wb2.close();
+        try (HSSFWorkbook wb1 = new HSSFWorkbook()) {
+            HSSFSheet s = wb1.createSheet();
+            HSSFRow r1 = s.createRow(0);
+            HSSFRow r2 = s.createRow(1);
+            HSSFRow r3 = s.createRow(2);
+            HSSFRow r4 = s.createRow(3);
+            HSSFRow r5 = s.createRow(4);
+
+            assertEquals(0, r1.getOutlineLevel());
+            assertEquals(0, r2.getOutlineLevel());
+            assertEquals(0, r3.getOutlineLevel());
+            assertEquals(0, r4.getOutlineLevel());
+            assertEquals(0, r5.getOutlineLevel());
+
+            s.groupRow(2, 3);
+
+            assertEquals(0, r1.getOutlineLevel());
+            assertEquals(0, r2.getOutlineLevel());
+            assertEquals(1, r3.getOutlineLevel());
+            assertEquals(1, r4.getOutlineLevel());
+            assertEquals(0, r5.getOutlineLevel());
+
+            // Save and re-open
+            try (HSSFWorkbook wb2 = writeOutAndReadBack(wb1)) {
+                s = wb2.getSheetAt(0);
+                r1 = s.getRow(0);
+                r2 = s.getRow(1);
+                r3 = s.getRow(2);
+                r4 = s.getRow(3);
+                r5 = s.getRow(4);
+
+                assertEquals(0, r1.getOutlineLevel());
+                assertEquals(0, r2.getOutlineLevel());
+                assertEquals(1, r3.getOutlineLevel());
+                assertEquals(1, r4.getOutlineLevel());
+                assertEquals(0, r5.getOutlineLevel());
+            }
+        }
     }
 
     @Test
     public void groupRowsExisting() throws IOException {
-        HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("NoGutsRecords.xls");
-
-        HSSFSheet s = wb1.getSheetAt(0);
-        HSSFRow r1 = s.getRow(0);
-        HSSFRow r2 = s.getRow(1);
-        HSSFRow r3 = s.getRow(2);
-        HSSFRow r4 = s.getRow(3);
-        HSSFRow r5 = s.getRow(4);
-        HSSFRow r6 = s.getRow(5);
-
-        assertEquals(0, r1.getOutlineLevel());
-        assertEquals(0, r2.getOutlineLevel());
-        assertEquals(0, r3.getOutlineLevel());
-        assertEquals(0, r4.getOutlineLevel());
-        assertEquals(0, r5.getOutlineLevel());
-        assertEquals(0, r6.getOutlineLevel());
-
-        // This used to complain about lacking guts records
-        s.groupRow(2, 4);
-
-        assertEquals(0, r1.getOutlineLevel());
-        assertEquals(0, r2.getOutlineLevel());
-        assertEquals(1, r3.getOutlineLevel());
-        assertEquals(1, r4.getOutlineLevel());
-        assertEquals(1, r5.getOutlineLevel());
-        assertEquals(0, r6.getOutlineLevel());
-
-        // Save and re-open
-        HSSFWorkbook wb2 = null;
-        try {
-            wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        } catch (OutOfMemoryError e) {
-            fail("Identified bug 39903");
+        try (HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("NoGutsRecords.xls")) {
+
+            HSSFSheet s = wb1.getSheetAt(0);
+            HSSFRow r1 = s.getRow(0);
+            HSSFRow r2 = s.getRow(1);
+            HSSFRow r3 = s.getRow(2);
+            HSSFRow r4 = s.getRow(3);
+            HSSFRow r5 = s.getRow(4);
+            HSSFRow r6 = s.getRow(5);
+
+            assertEquals(0, r1.getOutlineLevel());
+            assertEquals(0, r2.getOutlineLevel());
+            assertEquals(0, r3.getOutlineLevel());
+            assertEquals(0, r4.getOutlineLevel());
+            assertEquals(0, r5.getOutlineLevel());
+            assertEquals(0, r6.getOutlineLevel());
+
+            // This used to complain about lacking guts records
+            s.groupRow(2, 4);
+
+            assertEquals(0, r1.getOutlineLevel());
+            assertEquals(0, r2.getOutlineLevel());
+            assertEquals(1, r3.getOutlineLevel());
+            assertEquals(1, r4.getOutlineLevel());
+            assertEquals(1, r5.getOutlineLevel());
+            assertEquals(0, r6.getOutlineLevel());
+
+            // Save and re-open
+            try (HSSFWorkbook wb2 = writeOutAndReadBack(wb1)) {
+                // OutOfMemoryError -> Identified bug 39903
+                s = wb2.getSheetAt(0);
+                r1 = s.getRow(0);
+                r2 = s.getRow(1);
+                r3 = s.getRow(2);
+                r4 = s.getRow(3);
+                r5 = s.getRow(4);
+                r6 = s.getRow(5);
+
+                assertEquals(0, r1.getOutlineLevel());
+                assertEquals(0, r2.getOutlineLevel());
+                assertEquals(1, r3.getOutlineLevel());
+                assertEquals(1, r4.getOutlineLevel());
+                assertEquals(1, r5.getOutlineLevel());
+                assertEquals(0, r6.getOutlineLevel());
+            }
         }
-
-        s = wb2.getSheetAt(0);
-        r1 = s.getRow(0);
-        r2 = s.getRow(1);
-        r3 = s.getRow(2);
-        r4 = s.getRow(3);
-        r5 = s.getRow(4);
-        r6 = s.getRow(5);
-
-        assertEquals(0, r1.getOutlineLevel());
-        assertEquals(0, r2.getOutlineLevel());
-        assertEquals(1, r3.getOutlineLevel());
-        assertEquals(1, r4.getOutlineLevel());
-        assertEquals(1, r5.getOutlineLevel());
-        assertEquals(0, r6.getOutlineLevel());
-
-        wb2.close();
-        wb1.close();
     }
 
     @Test
     public void createDrawings() throws IOException {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet sheet = workbook.createSheet();
-        HSSFPatriarch p1 = sheet.createDrawingPatriarch();
-        HSSFPatriarch p2 = sheet.createDrawingPatriarch();
-        assertSame(p1, p2);
-        workbook.close();
+        try (HSSFWorkbook workbook = new HSSFWorkbook()) {
+            HSSFSheet sheet = workbook.createSheet();
+            HSSFPatriarch p1 = sheet.createDrawingPatriarch();
+            HSSFPatriarch p2 = sheet.createDrawingPatriarch();
+            assertSame(p1, p2);
+        }
     }
 
     @Test
     public void getDrawings() throws IOException {
-        HSSFWorkbook wb1c = HSSFTestDataSamples.openSampleWorkbook("WithChart.xls");
-        HSSFWorkbook wb2c = HSSFTestDataSamples.openSampleWorkbook("WithTwoCharts.xls");
-
-        // 1 chart sheet -> data on 1st, chart on 2nd
-        assertNotNull(wb1c.getSheetAt(0).getDrawingPatriarch());
-        assertSame(wb1c.getSheetAt(0).getDrawingPatriarch(), wb1c.getSheetAt(0).getDrawingPatriarch());
-        assertNotNull(wb1c.getSheetAt(1).getDrawingPatriarch());
-        assertSame(wb1c.getSheetAt(1).getDrawingPatriarch(), wb1c.getSheetAt(1).getDrawingPatriarch());
-        assertFalse(wb1c.getSheetAt(0).getDrawingPatriarch().containsChart());
-        assertTrue(wb1c.getSheetAt(1).getDrawingPatriarch().containsChart());
-
-        // 2 chart sheet -> data on 1st, chart on 2nd+3rd
-        assertNotNull(wb2c.getSheetAt(0).getDrawingPatriarch());
-        assertNotNull(wb2c.getSheetAt(1).getDrawingPatriarch());
-        assertNotNull(wb2c.getSheetAt(2).getDrawingPatriarch());
-        assertFalse(wb2c.getSheetAt(0).getDrawingPatriarch().containsChart());
-        assertTrue(wb2c.getSheetAt(1).getDrawingPatriarch().containsChart());
-        assertTrue(wb2c.getSheetAt(2).getDrawingPatriarch().containsChart());
-        wb2c.close();
-        wb1c.close();
+        try (HSSFWorkbook wb1c = HSSFTestDataSamples.openSampleWorkbook("WithChart.xls");
+            HSSFWorkbook wb2c = HSSFTestDataSamples.openSampleWorkbook("WithTwoCharts.xls")) {
+
+            // 1 chart sheet -> data on 1st, chart on 2nd
+            assertNotNull(wb1c.getSheetAt(0).getDrawingPatriarch());
+            assertSame(wb1c.getSheetAt(0).getDrawingPatriarch(), wb1c.getSheetAt(0).getDrawingPatriarch());
+            assertNotNull(wb1c.getSheetAt(1).getDrawingPatriarch());
+            assertSame(wb1c.getSheetAt(1).getDrawingPatriarch(), wb1c.getSheetAt(1).getDrawingPatriarch());
+            assertFalse(wb1c.getSheetAt(0).getDrawingPatriarch().containsChart());
+            assertTrue(wb1c.getSheetAt(1).getDrawingPatriarch().containsChart());
+
+            // 2 chart sheet -> data on 1st, chart on 2nd+3rd
+            assertNotNull(wb2c.getSheetAt(0).getDrawingPatriarch());
+            assertNotNull(wb2c.getSheetAt(1).getDrawingPatriarch());
+            assertNotNull(wb2c.getSheetAt(2).getDrawingPatriarch());
+            assertFalse(wb2c.getSheetAt(0).getDrawingPatriarch().containsChart());
+            assertTrue(wb2c.getSheetAt(1).getDrawingPatriarch().containsChart());
+            assertTrue(wb2c.getSheetAt(2).getDrawingPatriarch().containsChart());
+        }
     }
 
     /**
@@ -400,42 +366,43 @@ public final class TestHSSFSheet extends BaseTestSheet {
         int expectedHashA = -6810;
         String passwordB = "admin";
         int expectedHashB = -14556;
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet hssfSheet = workbook.createSheet();
-        assertFalse(hssfSheet.getObjectProtect());
-        hssfSheet.protectSheet(passwordA);
-        assertTrue(hssfSheet.getObjectProtect());
-        assertEquals(expectedHashA, hssfSheet.getPassword());
-
-        assertEquals(expectedHashA, hssfSheet.getSheet().getProtectionBlock().getPasswordHash());
-
-        // Clone the sheet, and make sure the password hash is preserved
-        HSSFSheet sheet2 = workbook.cloneSheet(0);
-        assertTrue(hssfSheet.getObjectProtect());
-        assertEquals(expectedHashA, sheet2.getSheet().getProtectionBlock().getPasswordHash());
-
-        // change the password on the first sheet
-        hssfSheet.protectSheet(passwordB);
-        assertTrue(hssfSheet.getObjectProtect());
-        assertEquals(expectedHashB, hssfSheet.getSheet().getProtectionBlock().getPasswordHash());
-        assertEquals(expectedHashB, hssfSheet.getPassword());
-        // but the cloned sheet's password should remain unchanged
-        assertEquals(expectedHashA, sheet2.getSheet().getProtectionBlock().getPasswordHash());
-        workbook.close();
+
+        try (HSSFWorkbook workbook = new HSSFWorkbook()) {
+            HSSFSheet hssfSheet = workbook.createSheet();
+            assertFalse(hssfSheet.getObjectProtect());
+            hssfSheet.protectSheet(passwordA);
+            assertTrue(hssfSheet.getObjectProtect());
+            assertEquals(expectedHashA, hssfSheet.getPassword());
+
+            assertEquals(expectedHashA, hssfSheet.getSheet().getProtectionBlock().getPasswordHash());
+
+            // Clone the sheet, and make sure the password hash is preserved
+            HSSFSheet sheet2 = workbook.cloneSheet(0);
+            assertTrue(hssfSheet.getObjectProtect());
+            assertEquals(expectedHashA, sheet2.getSheet().getProtectionBlock().getPasswordHash());
+
+            // change the password on the first sheet
+            hssfSheet.protectSheet(passwordB);
+            assertTrue(hssfSheet.getObjectProtect());
+            assertEquals(expectedHashB, hssfSheet.getSheet().getProtectionBlock().getPasswordHash());
+            assertEquals(expectedHashB, hssfSheet.getPassword());
+            // but the cloned sheet's password should remain unchanged
+            assertEquals(expectedHashA, sheet2.getSheet().getProtectionBlock().getPasswordHash());
+        }
     }
 
     @Test
     public void protectSheetA() throws IOException {
         int expectedHash = (short)0xfef1;
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet s = wb.createSheet();
-        s.protectSheet("abcdefghij");
-        WorksheetProtectionBlock pb = s.getSheet().getProtectionBlock();
-        assertTrue("protection should be on", pb.isSheetProtected());
-        assertTrue("object protection should be on",pb.isObjectProtected());
-        assertTrue("scenario protection should be on",pb.isScenarioProtected());
-        assertEquals("well known value for top secret hash should be "+Integer.toHexString(expectedHash).substring(4), expectedHash, pb.getPasswordHash());
-        wb.close();
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet s = wb.createSheet();
+            s.protectSheet("abcdefghij");
+            WorksheetProtectionBlock pb = s.getSheet().getProtectionBlock();
+            assertTrue("protection should be on", pb.isSheetProtected());
+            assertTrue("object protection should be on", pb.isObjectProtected());
+            assertTrue("scenario protection should be on", pb.isScenarioProtected());
+            assertEquals("well known value for top secret hash should be " + Integer.toHexString(expectedHash).substring(4), expectedHash, pb.getPasswordHash());
+        }
     }
 
     /**
@@ -444,32 +411,21 @@ public final class TestHSSFSheet extends BaseTestSheet {
      */
     @Test
     public void protectSheetRecordOrder_bug47363a() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet s = wb.createSheet();
-        s.protectSheet("secret");
-        RecordCollector rc = new RecordCollector();
-        s.getSheet().visitContainedRecords(rc, 0);
-        Record[] recs = rc.getRecords();
-        int nRecs = recs.length;
-        if (recs[nRecs-2] instanceof PasswordRecord && recs[nRecs-5] instanceof DimensionsRecord) {
-           fail("Identified bug 47363a - PASSWORD after DIMENSION");
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet s = wb.createSheet();
+            s.protectSheet("secret");
+            List<Record> recs = new ArrayList<>();
+            s.getSheet().visitContainedRecords(recs::add, 0);
+            int nRecs = recs.size();
+
+            // Check that protection block is together, and before DIMENSION
+            // PASSWORD must be before DIMENSION
+            Class<?>[] exp = {ProtectRecord.class, ObjectProtectRecord.class, ScenarioProtectRecord.class,
+                    PasswordRecord.class, DefaultColWidthRecord.class, DimensionsRecord.class, WindowTwoRecord.class,
+                    SelectionRecord.class, EOFRecord.class };
+            Class<?>[] act = recs.subList(nRecs - 9, nRecs).stream().map(Object::getClass).toArray(Class[]::new);
+            assertArrayEquals(exp, act);
         }
-        // Check that protection block is together, and before DIMENSION
-        confirmRecordClass(recs, nRecs-4, DimensionsRecord.class);
-        confirmRecordClass(recs, nRecs-9, ProtectRecord.class);
-        confirmRecordClass(recs, nRecs-8, ObjectProtectRecord.class);
-        confirmRecordClass(recs, nRecs-7, ScenarioProtectRecord.class);
-        confirmRecordClass(recs, nRecs-6, PasswordRecord.class);
-        
-        wb.close();
-    }
-
-    private static void confirmRecordClass(Record[] recs, int index, Class<? extends Record> cls) {
-        if (recs.length <= index) {
-            fail("Expected (" + cls.getName() + ") at index "
-                + index + " but array length is " + recs.length + ".");
-        }
-        assertEquals(cls, recs[index].getClass());
     }
 
     /**
@@ -477,82 +433,71 @@ public final class TestHSSFSheet extends BaseTestSheet {
      */
     @Test
     public void dvProtectionOrder_bug47363b() throws IOException {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet sheet = workbook.createSheet("Sheet1");
-        sheet.protectSheet("secret");
-
-        DataValidationHelper dataValidationHelper = sheet.getDataValidationHelper();
-        DataValidationConstraint dvc = dataValidationHelper.createIntegerConstraint(DataValidationConstraint.OperatorType.BETWEEN, "10", "100");
-        CellRangeAddressList numericCellAddressList = new CellRangeAddressList(0, 0, 1, 1);
-        DataValidation dv = dataValidationHelper.createValidation(dvc,numericCellAddressList);
-        try {
+        try (HSSFWorkbook workbook = new HSSFWorkbook()) {
+            HSSFSheet sheet = workbook.createSheet("Sheet1");
+            sheet.protectSheet("secret");
+
+            DataValidationHelper dataValidationHelper = sheet.getDataValidationHelper();
+            DataValidationConstraint dvc = dataValidationHelper.createIntegerConstraint(DataValidationConstraint.OperatorType.BETWEEN, "10", "100");
+            CellRangeAddressList numericCellAddressList = new CellRangeAddressList(0, 0, 1, 1);
+            DataValidation dv = dataValidationHelper.createValidation(dvc, numericCellAddressList);
+
+            // bug 47363b: Unexpected (org.apache.poi.hssf.record.PasswordRecord) while looking for DV Table insert pos
             sheet.addValidationData(dv);
-        } catch (IllegalStateException e) {
-            String expMsg = "Unexpected (org.apache.poi.hssf.record.PasswordRecord) while looking for DV Table insert pos";
-            if (expMsg.equals(e.getMessage())) {
-                fail("Identified bug 47363b");
-            }
-            workbook.close();
-            throw e;
+
+            int[] nRecsWithProtection = { 0 };
+            sheet.getSheet().visitContainedRecords(r -> nRecsWithProtection[0]++, 0);
+
+            sheet.protectSheet(null);
+            int[] nRecsWithoutProtection = { 0 };
+            sheet.getSheet().visitContainedRecords(r -> nRecsWithoutProtection[0]++, 0);
+
+            assertEquals(4, nRecsWithProtection[0] - nRecsWithoutProtection[0]);
         }
-        RecordCollector rc;
-        rc = new RecordCollector();
-        sheet.getSheet().visitContainedRecords(rc, 0);
-        int nRecsWithProtection = rc.getRecords().length;
-
-        sheet.protectSheet(null);
-        rc = new RecordCollector();
-        sheet.getSheet().visitContainedRecords(rc, 0);
-        int nRecsWithoutProtection = rc.getRecords().length;
-
-        assertEquals(4, nRecsWithProtection - nRecsWithoutProtection);
-        
-        workbook.close();
     }
 
     @Test
     public void zoom() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-        assertEquals(-1, sheet.getSheet().findFirstRecordLocBySid(SCLRecord.sid));
-        sheet.setZoom(75);
-        assertTrue(sheet.getSheet().findFirstRecordLocBySid(SCLRecord.sid) > 0);
-        SCLRecord sclRecord = (SCLRecord) sheet.getSheet().findFirstRecordBySid(SCLRecord.sid);
-        assertNotNull(sclRecord);
-        short numerator = sclRecord.getNumerator();
-        assertEquals(75, 100* numerator /sclRecord.getDenominator());
-
-        int sclLoc = sheet.getSheet().findFirstRecordLocBySid(SCLRecord.sid);
-        int window2Loc = sheet.getSheet().findFirstRecordLocBySid(WindowTwoRecord.sid);
-        assertEquals(sclLoc, window2Loc + 1);
-        
-        // verify limits
-        try {
-            sheet.setZoom(0);
-            fail("Should catch Exception here");
-        } catch (IllegalArgumentException e) {
-            assertEquals("Numerator must be greater than 0 and less than 65536", e.getMessage());
-        }
-        try {
-            sheet.setZoom(65536);
-            fail("Should catch Exception here");
-        } catch (IllegalArgumentException e) {
-            assertEquals("Numerator must be greater than 0 and less than 65536", e.getMessage());
-        }
-        try {
-            sheet.setZoom(2, 0);
-            fail("Should catch Exception here");
-        } catch (IllegalArgumentException e) {
-            assertEquals("Denominator must be greater than 0 and less than 65536", e.getMessage());
-        }
-        try {
-            sheet.setZoom(2, 65536);
-            fail("Should catch Exception here");
-        } catch (IllegalArgumentException e) {
-            assertEquals("Denominator must be greater than 0 and less than 65536", e.getMessage());
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet sheet = wb.createSheet();
+            assertEquals(-1, sheet.getSheet().findFirstRecordLocBySid(SCLRecord.sid));
+            sheet.setZoom(75);
+            assertTrue(sheet.getSheet().findFirstRecordLocBySid(SCLRecord.sid) > 0);
+            SCLRecord sclRecord = (SCLRecord) sheet.getSheet().findFirstRecordBySid(SCLRecord.sid);
+            assertNotNull(sclRecord);
+            short numerator = sclRecord.getNumerator();
+            assertEquals(75, 100 * numerator / sclRecord.getDenominator());
+
+            int sclLoc = sheet.getSheet().findFirstRecordLocBySid(SCLRecord.sid);
+            int window2Loc = sheet.getSheet().findFirstRecordLocBySid(WindowTwoRecord.sid);
+            assertEquals(sclLoc, window2Loc + 1);
+
+            // verify limits
+            try {
+                sheet.setZoom(0);
+                fail("Should catch Exception here");
+            } catch (IllegalArgumentException e) {
+                assertEquals("Numerator must be greater than 0 and less than 65536", e.getMessage());
+            }
+            try {
+                sheet.setZoom(65536);
+                fail("Should catch Exception here");
+            } catch (IllegalArgumentException e) {
+                assertEquals("Numerator must be greater than 0 and less than 65536", e.getMessage());
+            }
+            try {
+                sheet.setZoom(2, 0);
+                fail("Should catch Exception here");
+            } catch (IllegalArgumentException e) {
+                assertEquals("Denominator must be greater than 0 and less than 65536", e.getMessage());
+            }
+            try {
+                sheet.setZoom(2, 65536);
+                fail("Should catch Exception here");
+            } catch (IllegalArgumentException e) {
+                assertEquals("Denominator must be greater than 0 and less than 65536", e.getMessage());
+            }
         }
-        
-        wb.close();
     }
 
 
@@ -562,43 +507,42 @@ public final class TestHSSFSheet extends BaseTestSheet {
      */
     @Test
     public void pageBreakFiles() throws IOException {
-        HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("SimpleWithPageBreaks.xls");
+        try (HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("SimpleWithPageBreaks.xls")) {
 
-        HSSFSheet sheet = wb1.getSheetAt(0);
-        assertNotNull(sheet);
+            HSSFSheet sheet = wb1.getSheetAt(0);
+            assertNotNull(sheet);
 
-        assertEquals("1 row page break", 1, sheet.getRowBreaks().length);
-        assertEquals("1 column page break", 1, sheet.getColumnBreaks().length);
+            assertEquals("1 row page break", 1, sheet.getRowBreaks().length);
+            assertEquals("1 column page break", 1, sheet.getColumnBreaks().length);
 
-        assertTrue("No row page break", sheet.isRowBroken(22));
-        assertTrue("No column page break", sheet.isColumnBroken((short)4));
+            assertTrue("No row page break", sheet.isRowBroken(22));
+            assertTrue("No column page break", sheet.isColumnBroken((short) 4));
 
-        sheet.setRowBreak(10);
-        sheet.setColumnBreak((short)13);
+            sheet.setRowBreak(10);
+            sheet.setColumnBreak((short) 13);
 
-        assertEquals("row breaks number", 2, sheet.getRowBreaks().length);
-        assertEquals("column breaks number", 2, sheet.getColumnBreaks().length);
+            assertEquals("row breaks number", 2, sheet.getRowBreaks().length);
+            assertEquals("column breaks number", 2, sheet.getColumnBreaks().length);
 
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sheet = wb2.getSheetAt(0);
+            try (HSSFWorkbook wb2 = writeOutAndReadBack(wb1)) {
+                sheet = wb2.getSheetAt(0);
 
-        assertTrue("No row page break", sheet.isRowBroken(22));
-        assertTrue("No column page break", sheet.isColumnBroken((short)4));
+                assertTrue("No row page break", sheet.isRowBroken(22));
+                assertTrue("No column page break", sheet.isColumnBroken((short) 4));
 
-        assertEquals("row breaks number", 2, sheet.getRowBreaks().length);
-        assertEquals("column breaks number", 2, sheet.getColumnBreaks().length);
-        
-        wb2.close();
+                assertEquals("row breaks number", 2, sheet.getRowBreaks().length);
+                assertEquals("column breaks number", 2, sheet.getColumnBreaks().length);
+            }
+        }
     }
 
     @Test
     public void dbcsName () throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("DBCSSheetName.xls");
-        wb.getSheetAt(1);
-        assertEquals ("DBCS Sheet Name 2", wb.getSheetName(1),"\u090f\u0915" );
-        assertEquals("DBCS Sheet Name 1", wb.getSheetName(0),"\u091c\u093e");
-        wb.close();
+        try (HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("DBCSSheetName.xls")) {
+            wb.getSheetAt(1);
+            assertEquals("DBCS Sheet Name 2", wb.getSheetName(1), "\u090f\u0915");
+            assertEquals("DBCS Sheet Name 1", wb.getSheetName(0), "\u091c\u093e");
+        }
     }
 
     /**
@@ -608,87 +552,84 @@ public final class TestHSSFSheet extends BaseTestSheet {
      */
     @Test
     public void topRow() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("SimpleWithPageBreaks.xls");
-
-        HSSFSheet sheet = wb.getSheetAt(0);
-        assertNotNull(sheet);
-
-        short toprow = (short) 100;
-        short leftcol = (short) 50;
-        sheet.showInPane(toprow,leftcol);
-        assertEquals("HSSFSheet.getTopRow()", toprow, sheet.getTopRow());
-        assertEquals("HSSFSheet.getLeftCol()", leftcol, sheet.getLeftCol());
-        
-        wb.close();
+        try (HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("SimpleWithPageBreaks.xls")) {
+            HSSFSheet sheet = wb.getSheetAt(0);
+            assertNotNull(sheet);
+
+            short toprow = (short) 100;
+            short leftcol = (short) 50;
+            sheet.showInPane(toprow, leftcol);
+            assertEquals("HSSFSheet.getTopRow()", toprow, sheet.getTopRow());
+            assertEquals("HSSFSheet.getLeftCol()", leftcol, sheet.getLeftCol());
+        }
     }
 
     @Test
     public void addEmptyRow() throws IOException {
         //try to add 5 empty rows to a new sheet
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet sheet = wb1.createSheet();
-        for (int i = 0; i < 5; i++) {
-            sheet.createRow(i);
-        }
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet sheet = wb.createSheet();
+            for (int i = 0; i < 5; i++) {
+                sheet.createRow(i);
+            }
 
-        HSSFTestDataSamples.writeOutAndReadBack(wb1).close();
-        wb1.close();
+            writeOutAndReadBack(wb).close();
+        }
 
-        //try adding empty rows in an existing worksheet
-        HSSFWorkbook wb2 = HSSFTestDataSamples.openSampleWorkbook("Simple.xls");
+            //try adding empty rows in an existing worksheet
+        try (HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("Simple.xls")) {
 
-        sheet = wb2.getSheetAt(0);
-        for (int i = 3; i < 10; i++) sheet.createRow(i);
+            HSSFSheet sheet = wb.getSheetAt(0);
+            for (int i = 3; i < 10; i++) sheet.createRow(i);
 
-        HSSFTestDataSamples.writeOutAndReadBack(wb2).close();
-        wb2.close();
+            writeOutAndReadBack(wb).close();
+        }
     }
 
     @Test
     public void autoSizeColumn() throws IOException {
-        HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("43902.xls");
-        String sheetName = "my sheet";
-        HSSFSheet sheet = wb1.getSheet(sheetName);
-
-        // Can't use literal numbers for column sizes, as
-        //  will come out with different values on different
-        //  machines based on the fonts available.
-        // So, we use ranges, which are pretty large, but
-        //  thankfully don't overlap!
-        int minWithRow1And2 = 6400;
-        int maxWithRow1And2 = 7800;
-        int minWithRow1Only = 2750;
-        int maxWithRow1Only = 3400;
-
-        // autoSize the first column and check its size before the merged region (1,0,1,1) is set:
-        // it has to be based on the 2nd row width
-        sheet.autoSizeColumn((short)0);
-        assertTrue("Column autosized with only one row: wrong width", sheet.getColumnWidth(0) >= minWithRow1And2);
-        assertTrue("Column autosized with only one row: wrong width", sheet.getColumnWidth(0) <= maxWithRow1And2);
-
-        //create a region over the 2nd row and auto size the first column
-        assertEquals(1, sheet.addMergedRegion(new CellRangeAddress(1,1,0,1)));
-        assertNotNull(sheet.getMergedRegion(0));
-        sheet.autoSizeColumn((short)0);
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-
-        // check that the autoSized column width has ignored the 2nd row
-        // because it is included in a merged region (Excel like behavior)
-        HSSFSheet sheet2 = wb2.getSheet(sheetName);
-        assertTrue(sheet2.getColumnWidth(0) >= minWithRow1Only);
-        assertTrue(sheet2.getColumnWidth(0) <= maxWithRow1Only);
-
-        // remove the 2nd row merged region and check that the 2nd row value is used to the autoSizeColumn width
-        sheet2.removeMergedRegion(1);
-        sheet2.autoSizeColumn((short)0);
-        HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2);
-        HSSFSheet sheet3 = wb3.getSheet(sheetName);
-        assertTrue(sheet3.getColumnWidth(0) >= minWithRow1And2);
-        assertTrue(sheet3.getColumnWidth(0) <= maxWithRow1And2);
-        
-        wb3.close();
-        wb2.close();
-        wb1.close();
+        try (HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("43902.xls")) {
+            String sheetName = "my sheet";
+            HSSFSheet sheet = wb1.getSheet(sheetName);
+
+            // Can't use literal numbers for column sizes, as
+            //  will come out with different values on different
+            //  machines based on the fonts available.
+            // So, we use ranges, which are pretty large, but
+            //  thankfully don't overlap!
+            int minWithRow1And2 = 6400;
+            int maxWithRow1And2 = 7800;
+            int minWithRow1Only = 2750;
+            int maxWithRow1Only = 3400;
+
+            // autoSize the first column and check its size before the merged region (1,0,1,1) is set:
+            // it has to be based on the 2nd row width
+            sheet.autoSizeColumn((short) 0);
+            assertTrue("Column autosized with only one row: wrong width", sheet.getColumnWidth(0) >= minWithRow1And2);
+            assertTrue("Column autosized with only one row: wrong width", sheet.getColumnWidth(0) <= maxWithRow1And2);
+
+            //create a region over the 2nd row and auto size the first column
+            assertEquals(1, sheet.addMergedRegion(new CellRangeAddress(1, 1, 0, 1)));
+            assertNotNull(sheet.getMergedRegion(0));
+            sheet.autoSizeColumn((short) 0);
+            try (HSSFWorkbook wb2 = writeOutAndReadBack(wb1)) {
+
+                // check that the autoSized column width has ignored the 2nd row
+                // because it is included in a merged region (Excel like behavior)
+                HSSFSheet sheet2 = wb2.getSheet(sheetName);
+                assertTrue(sheet2.getColumnWidth(0) >= minWithRow1Only);
+                assertTrue(sheet2.getColumnWidth(0) <= maxWithRow1Only);
+
+                // remove the 2nd row merged region and check that the 2nd row value is used to the autoSizeColumn width
+                sheet2.removeMergedRegion(1);
+                sheet2.autoSizeColumn((short) 0);
+                try (HSSFWorkbook wb3 = writeOutAndReadBack(wb2)) {
+                    HSSFSheet sheet3 = wb3.getSheet(sheetName);
+                    assertTrue(sheet3.getColumnWidth(0) >= minWithRow1And2);
+                    assertTrue(sheet3.getColumnWidth(0) <= maxWithRow1And2);
+                }
+            }
+        }
     }
 
     /**
@@ -696,148 +637,144 @@ public final class TestHSSFSheet extends BaseTestSheet {
      */
     @Test
     public void forceRecalculation() throws IOException {
-        HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("UncalcedRecord.xls");
-
-        HSSFSheet sheet = wb1.getSheetAt(0);
-        HSSFSheet sheet2 = wb1.getSheetAt(0);
-        HSSFRow row = sheet.getRow(0);
-        row.createCell(0).setCellValue(5);
-        row.createCell(1).setCellValue(8);
-        assertFalse(sheet.getForceFormulaRecalculation());
-        assertFalse(sheet2.getForceFormulaRecalculation());
-
-        // Save and manually verify that on column C we have 0, value in template
-        HSSFTestDataSamples.writeOutAndReadBack(wb1).close();
-        sheet.setForceFormulaRecalculation(true);
-        assertTrue(sheet.getForceFormulaRecalculation());
-
-        // Save and manually verify that on column C we have now 13, calculated value
-        // Try it can be opened
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        // And check correct sheet settings found
-        sheet = wb2.getSheetAt(0);
-        sheet2 = wb2.getSheetAt(1);
-        assertTrue(sheet.getForceFormulaRecalculation());
-        assertFalse(sheet2.getForceFormulaRecalculation());
-
-        // Now turn if back off again
-        sheet.setForceFormulaRecalculation(false);
-
-        HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2);
-        wb2.close();
-
-        assertFalse(wb3.getSheetAt(0).getForceFormulaRecalculation());
-        assertFalse(wb3.getSheetAt(1).getForceFormulaRecalculation());
-        assertFalse(wb3.getSheetAt(2).getForceFormulaRecalculation());
-
-        // Now add a new sheet, and check things work
-        //  with old ones unset, new one set
-        HSSFSheet s4 = wb3.createSheet();
-        s4.setForceFormulaRecalculation(true);
-
-        assertFalse(sheet.getForceFormulaRecalculation());
-        assertFalse(sheet2.getForceFormulaRecalculation());
-        assertTrue(s4.getForceFormulaRecalculation());
-
-        HSSFWorkbook wb4 = HSSFTestDataSamples.writeOutAndReadBack(wb3);
-        wb3.close();
-        
-        assertFalse(wb4.getSheetAt(0).getForceFormulaRecalculation());
-        assertFalse(wb4.getSheetAt(1).getForceFormulaRecalculation());
-        assertFalse(wb4.getSheetAt(2).getForceFormulaRecalculation());
-        assertTrue(wb4.getSheetAt(3).getForceFormulaRecalculation());
-        wb4.close();
+        try (HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("UncalcedRecord.xls")) {
+
+            HSSFSheet sheet = wb1.getSheetAt(0);
+            HSSFSheet sheet2 = wb1.getSheetAt(0);
+            HSSFRow row = sheet.getRow(0);
+            row.createCell(0).setCellValue(5);
+            row.createCell(1).setCellValue(8);
+            assertFalse(sheet.getForceFormulaRecalculation());
+            assertFalse(sheet2.getForceFormulaRecalculation());
+
+            // Save and manually verify that on column C we have 0, value in template
+            writeOutAndReadBack(wb1).close();
+            sheet.setForceFormulaRecalculation(true);
+            assertTrue(sheet.getForceFormulaRecalculation());
+
+            // Save and manually verify that on column C we have now 13, calculated value
+            // Try it can be opened
+            try (HSSFWorkbook wb2 = writeOutAndReadBack(wb1)) {
+                // And check correct sheet settings found
+                sheet = wb2.getSheetAt(0);
+                sheet2 = wb2.getSheetAt(1);
+                assertTrue(sheet.getForceFormulaRecalculation());
+                assertFalse(sheet2.getForceFormulaRecalculation());
+
+                // Now turn if back off again
+                sheet.setForceFormulaRecalculation(false);
+
+                try (HSSFWorkbook wb3 = writeOutAndReadBack(wb2)) {
+                    assertFalse(wb3.getSheetAt(0).getForceFormulaRecalculation());
+                    assertFalse(wb3.getSheetAt(1).getForceFormulaRecalculation());
+                    assertFalse(wb3.getSheetAt(2).getForceFormulaRecalculation());
+
+                    // Now add a new sheet, and check things work
+                    //  with old ones unset, new one set
+                    HSSFSheet s4 = wb3.createSheet();
+                    s4.setForceFormulaRecalculation(true);
+
+                    assertFalse(sheet.getForceFormulaRecalculation());
+                    assertFalse(sheet2.getForceFormulaRecalculation());
+                    assertTrue(s4.getForceFormulaRecalculation());
+
+                    try (HSSFWorkbook wb4 = writeOutAndReadBack(wb3)) {
+                        assertFalse(wb4.getSheetAt(0).getForceFormulaRecalculation());
+                        assertFalse(wb4.getSheetAt(1).getForceFormulaRecalculation());
+                        assertFalse(wb4.getSheetAt(2).getForceFormulaRecalculation());
+                        assertTrue(wb4.getSheetAt(3).getForceFormulaRecalculation());
+                    }
+                }
+            }
+        }
     }
 
     @Test
     public void columnWidthA() throws IOException {
-        //check we can correctly read column widths from a reference workbook
-        HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("colwidth.xls");
+        // check we can correctly read column widths from a reference workbook
+        try (HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("colwidth.xls")) {
 
-        //reference values
-        int[] ref = {365, 548, 731, 914, 1097, 1280, 1462, 1645, 1828, 2011, 2194, 2377, 2560, 2742, 2925, 3108, 3291, 3474, 3657};
+            //reference values
+            int[] ref = {365, 548, 731, 914, 1097, 1280, 1462, 1645, 1828, 2011, 2194, 2377, 2560, 2742, 2925, 3108, 3291, 3474, 3657};
 
-        HSSFSheet sh = wb1.getSheetAt(0);
-        for (char i = 'A'; i <= 'S'; i++) {
-            int idx = i - 'A';
-            int w = sh.getColumnWidth(idx);
-            assertEquals(ref[idx], w);
-        }
+            HSSFSheet sh = wb.getSheetAt(0);
+            for (char i = 'A'; i <= 'S'; i++) {
+                int idx = i - 'A';
+                int w = sh.getColumnWidth(idx);
+                assertEquals(ref[idx], w);
+            }
 
-        //the second sheet doesn't have overridden column widths
-        sh = wb1.getSheetAt(1);
-        int def_width = sh.getDefaultColumnWidth();
-        for (char i = 'A'; i <= 'S'; i++) {
-            int idx = i - 'A';
-            int w = sh.getColumnWidth(idx);
-            //getDefaultColumnWidth returns width measured in characters
-            //getColumnWidth returns width measured in 1/256th units
-            assertEquals(def_width*256, w);
-        }
-        wb1.close();
-
-        //test new workbook
-        HSSFWorkbook wb2 = new HSSFWorkbook();
-        sh = wb2.createSheet();
-        sh.setDefaultColumnWidth(10);
-        assertEquals(10, sh.getDefaultColumnWidth());
-        assertEquals(256*10, sh.getColumnWidth(0));
-        assertEquals(256*10, sh.getColumnWidth(1));
-        assertEquals(256*10, sh.getColumnWidth(2));
-        for (char i = 'D'; i <= 'F'; i++) {
-            short w = (256*12);
-            sh.setColumnWidth(i, w);
-            assertEquals(w, sh.getColumnWidth(i));
+            //the second sheet doesn't have overridden column widths
+            sh = wb.getSheetAt(1);
+            int def_width = sh.getDefaultColumnWidth();
+            for (char i = 'A'; i <= 'S'; i++) {
+                int idx = i - 'A';
+                int w = sh.getColumnWidth(idx);
+                //getDefaultColumnWidth returns width measured in characters
+                //getColumnWidth returns width measured in 1/256th units
+                assertEquals(def_width * 256, w);
+            }
         }
 
-        //serialize and read again
-        HSSFWorkbook wb3 = HSSFTestDataSamples.writeOutAndReadBack(wb2);
-        wb2.close();
-
-        sh = wb3.getSheetAt(0);
-        assertEquals(10, sh.getDefaultColumnWidth());
-        //columns A-C have default width
-        assertEquals(256*10, sh.getColumnWidth(0));
-        assertEquals(256*10, sh.getColumnWidth(1));
-        assertEquals(256*10, sh.getColumnWidth(2));
-        //columns D-F have custom width
-        for (char i = 'D'; i <= 'F'; i++) {
-            short w = (256*12);
-            assertEquals(w, sh.getColumnWidth(i));
-        }
+        // test new workbook
+        try (HSSFWorkbook wb1 = new HSSFWorkbook()) {
+            HSSFSheet sh = wb1.createSheet();
+            sh.setDefaultColumnWidth(10);
+            assertEquals(10, sh.getDefaultColumnWidth());
+            assertEquals(256 * 10, sh.getColumnWidth(0));
+            assertEquals(256 * 10, sh.getColumnWidth(1));
+            assertEquals(256 * 10, sh.getColumnWidth(2));
+            for (char i = 'D'; i <= 'F'; i++) {
+                short w = (256 * 12);
+                sh.setColumnWidth(i, w);
+                assertEquals(w, sh.getColumnWidth(i));
+            }
 
-        // check for 16-bit signed/unsigned error:
-        sh.setColumnWidth(0, 40000);
-        assertEquals(40000, sh.getColumnWidth(0));
-        wb3.close();
+            //serialize and read again
+            try (HSSFWorkbook wb2 = writeOutAndReadBack(wb1)) {
+                sh = wb2.getSheetAt(0);
+                assertEquals(10, sh.getDefaultColumnWidth());
+                //columns A-C have default width
+                assertEquals(256 * 10, sh.getColumnWidth(0));
+                assertEquals(256 * 10, sh.getColumnWidth(1));
+                assertEquals(256 * 10, sh.getColumnWidth(2));
+                //columns D-F have custom width
+                for (char i = 'D'; i <= 'F'; i++) {
+                    short w = (256 * 12);
+                    assertEquals(w, sh.getColumnWidth(i));
+                }
+
+                // check for 16-bit signed/unsigned error:
+                sh.setColumnWidth(0, 40000);
+                assertEquals(40000, sh.getColumnWidth(0));
+            }
+        }
     }
 
 
     @Test
     public void defaultColumnWidth() throws IOException {
-        HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook( "12843-1.xls" );
-        HSSFSheet sheet = wb1.getSheetAt( 7 );
-        // shall not be NPE
-        assertEquals(8, sheet.getDefaultColumnWidth());
-        assertEquals(8*256, sheet.getColumnWidth(0));
-
-        assertEquals(0xFF, sheet.getDefaultRowHeight());
-        
-        wb1.close();
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.openSampleWorkbook( "34775.xls" );
-        // second and third sheets miss DefaultColWidthRecord
-        for(int i = 1; i <= 2; i++){
-            int dw = wb2.getSheetAt( i ).getDefaultColumnWidth();
-            assertEquals(8, dw);
-            int cw = wb2.getSheetAt( i ).getColumnWidth(0);
-            assertEquals(8*256, cw);
+        try (HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook( "12843-1.xls" )) {
+            HSSFSheet sheet = wb1.getSheetAt(7);
+            // shall not be NPE
+            assertEquals(8, sheet.getDefaultColumnWidth());
+            assertEquals(8 * 256, sheet.getColumnWidth(0));
 
             assertEquals(0xFF, sheet.getDefaultRowHeight());
         }
-        wb2.close();
+
+        try (HSSFWorkbook wb2 = HSSFTestDataSamples.openSampleWorkbook( "34775.xls" )) {
+            // second and third sheets miss DefaultColWidthRecord
+            for (int i = 1; i <= 2; i++) {
+                HSSFSheet sheet = wb2.getSheetAt(i);
+                int dw = sheet.getDefaultColumnWidth();
+                assertEquals(8, dw);
+                int cw = sheet.getColumnWidth(0);
+                assertEquals(8 * 256, cw);
+
+                assertEquals(0xFF, sheet.getDefaultRowHeight());
+            }
+        }
     }
 
     /**
@@ -847,21 +784,19 @@ public final class TestHSSFSheet extends BaseTestSheet {
      */
     @Test
     public void missingRowRecords_bug41187() throws IOException {
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("ex41187-19267.xls");
-
-        HSSFSheet sheet = wb.getSheetAt(0);
-        HSSFRow row = sheet.getRow(0);
-        assertNotNull("Identified bug 41187 a", row);
+        try (HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("ex41187-19267.xls")) {
+            HSSFSheet sheet = wb.getSheetAt(0);
+            HSSFRow row = sheet.getRow(0);
+            assertNotNull("Identified bug 41187 a", row);
 
-        assertNotEquals("Identified bug 41187 b", (short)0, row.getHeight());
+            assertNotEquals("Identified bug 41187 b", (short) 0, row.getHeight());
 
-        assertEquals("Hi Excel!", row.getCell(0).getRichStringCellValue().getString());
-        // check row height for 'default' flag
-        assertEquals((short)0xFF, row.getHeight());
+            assertEquals("Hi Excel!", row.getCell(0).getRichStringCellValue().getString());
+            // check row height for 'default' flag
+            assertEquals((short) 0xFF, row.getHeight());
 
-        HSSFTestDataSamples.writeOutAndReadBack(wb).close();
-        
-        wb.close();
+            writeOutAndReadBack(wb).close();
+        }
     }
 
     /**
@@ -872,34 +807,32 @@ public final class TestHSSFSheet extends BaseTestSheet {
      */
     @Test
     public void cloneSheetWithDrawings() throws IOException {
-        HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("45720.xls");
-
-        HSSFSheet sheet1 = wb1.getSheetAt(0);
+        try (HSSFWorkbook wb1 = HSSFTestDataSamples.openSampleWorkbook("45720.xls")) {
+            HSSFSheet sheet1 = wb1.getSheetAt(0);
 
-        DrawingManager2 dm1 = wb1.getWorkbook().findDrawingGroup();
-        int maxDrawingGroupId1 = dm1.getDgg().getMaxDrawingGroupId();
-        wb1.cloneSheet(0);
+            DrawingManager2 dm1 = wb1.getWorkbook().findDrawingGroup();
+            int maxDrawingGroupId1 = dm1.getDgg().getMaxDrawingGroupId();
+            wb1.cloneSheet(0);
 
-        //check EscherDggRecord - a workbook-level registry of drawing objects
-        assertEquals(maxDrawingGroupId1 + 1, dm1.getDgg().getMaxDrawingGroupId());
+            //check EscherDggRecord - a workbook-level registry of drawing objects
+            assertEquals(maxDrawingGroupId1 + 1, dm1.getDgg().getMaxDrawingGroupId());
 
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        
-        DrawingManager2 dm2 = wb2.getWorkbook().findDrawingGroup();
-        assertEquals(maxDrawingGroupId1 + 1, dm2.getDgg().getMaxDrawingGroupId());
+            try (HSSFWorkbook wb2 = writeOutAndReadBack(wb1)) {
+                DrawingManager2 dm2 = wb2.getWorkbook().findDrawingGroup();
+                assertEquals(maxDrawingGroupId1 + 1, dm2.getDgg().getMaxDrawingGroupId());
 
-        HSSFSheet sheet2 = wb2.getSheetAt(1);
+                HSSFSheet sheet2 = wb2.getSheetAt(1);
 
-        //check that id of the drawing group was updated
-        EscherDgRecord dg1 = (EscherDgRecord)sheet1.getDrawingPatriarch().getBoundAggregate().findFirstWithId(EscherDgRecord.RECORD_ID);
-        EscherDgRecord dg2 = (EscherDgRecord)sheet2.getDrawingPatriarch().getBoundAggregate().findFirstWithId(EscherDgRecord.RECORD_ID);
-        int dg_id_1 = dg1.getOptions() >> 4;
-        int dg_id_2 = dg2.getOptions() >> 4;
-        assertEquals(dg_id_1 + 1, dg_id_2);
+                //check that id of the drawing group was updated
+                EscherDgRecord dg1 = (EscherDgRecord) sheet1.getDrawingPatriarch().getBoundAggregate().findFirstWithId(EscherDgRecord.RECORD_ID);
+                EscherDgRecord dg2 = (EscherDgRecord) sheet2.getDrawingPatriarch().getBoundAggregate().findFirstWithId(EscherDgRecord.RECORD_ID);
+                int dg_id_1 = dg1.getOptions() >> 4;
+                int dg_id_2 = dg2.getOptions() >> 4;
+                assertEquals(dg_id_1 + 1, dg_id_2);
 
-        //TODO: check shapeId in the cloned sheet
-        wb2.close();
+                //TODO: check shapeId in the cloned sheet
+            }
+        }
     }
 
     /**
@@ -909,18 +842,18 @@ public final class TestHSSFSheet extends BaseTestSheet {
      */
     @Test
     public void longSheetNames() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        final String SAME_PREFIX = "A123456789B123456789C123456789"; // 30 chars
-
-        wb.createSheet(SAME_PREFIX + "Dxxxx");
-        try {
-            wb.createSheet(SAME_PREFIX + "Dyyyy"); // identical up to the 32nd char
-            fail("Expected exception not thrown");
-        } catch (IllegalArgumentException e) {
-            assertEquals("The workbook already contains a sheet named 'A123456789B123456789C123456789Dyyyy'", e.getMessage());
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            final String SAME_PREFIX = "A123456789B123456789C123456789"; // 30 chars
+
+            wb.createSheet(SAME_PREFIX + "Dxxxx");
+            try {
+                wb.createSheet(SAME_PREFIX + "Dyyyy"); // identical up to the 32nd char
+                fail("Expected exception not thrown");
+            } catch (IllegalArgumentException e) {
+                assertEquals("The workbook already contains a sheet named 'A123456789B123456789C123456789Dyyyy'", e.getMessage());
+            }
+            wb.createSheet(SAME_PREFIX + "Exxxx"); // OK - differs in the 31st char
         }
-        wb.createSheet(SAME_PREFIX + "Exxxx"); // OK - differs in the 31st char
-        wb.close();
     }
 
     /**
@@ -928,45 +861,42 @@ public final class TestHSSFSheet extends BaseTestSheet {
      */
     @Test
     public void readColumnStyles() throws IOException {
-        HSSFWorkbook wbNone = HSSFTestDataSamples.openSampleWorkbook("ColumnStyleNone.xls");
-        HSSFWorkbook wbSimple = HSSFTestDataSamples.openSampleWorkbook("ColumnStyle1dp.xls");
-        HSSFWorkbook wbComplex = HSSFTestDataSamples.openSampleWorkbook("ColumnStyle1dpColoured.xls");
-
-        // Presence / absence checks
-        assertNull(wbNone.getSheetAt(0).getColumnStyle(0));
-        assertNull(wbNone.getSheetAt(0).getColumnStyle(1));
-
-        assertNull(wbSimple.getSheetAt(0).getColumnStyle(0));
-        assertNotNull(wbSimple.getSheetAt(0).getColumnStyle(1));
-
-        assertNull(wbComplex.getSheetAt(0).getColumnStyle(0));
-        assertNotNull(wbComplex.getSheetAt(0).getColumnStyle(1));
-
-        // Details checks
-        HSSFCellStyle bs = wbSimple.getSheetAt(0).getColumnStyle(1);
-        assertNotNull(bs);
-        assertEquals(62, bs.getIndex());
-        assertEquals("#,##0.0_ ;\\-#,##0.0\\ ", bs.getDataFormatString());
-        assertEquals("Calibri", bs.getFont(wbSimple).getFontName());
-        assertEquals(11*20, bs.getFont(wbSimple).getFontHeight());
-        assertEquals(8, bs.getFont(wbSimple).getColor());
-        assertFalse(bs.getFont(wbSimple).getItalic());
-        assertFalse(bs.getFont(wbSimple).getBold());
-
-
-        HSSFCellStyle cs = wbComplex.getSheetAt(0).getColumnStyle(1);
-        assertNotNull(cs);
-        assertEquals(62, cs.getIndex());
-        assertEquals("#,##0.0_ ;\\-#,##0.0\\ ", cs.getDataFormatString());
-        assertEquals("Arial", cs.getFont(wbComplex).getFontName());
-        assertEquals(8*20, cs.getFont(wbComplex).getFontHeight());
-        assertEquals(10, cs.getFont(wbComplex).getColor());
-        assertFalse(cs.getFont(wbComplex).getItalic());
-        assertTrue(cs.getFont(wbComplex).getBold());
-        
-        wbComplex.close();
-        wbSimple.close();
-        wbNone.close();
+        try (HSSFWorkbook wbNone = HSSFTestDataSamples.openSampleWorkbook("ColumnStyleNone.xls");
+            HSSFWorkbook wbSimple = HSSFTestDataSamples.openSampleWorkbook("ColumnStyle1dp.xls");
+            HSSFWorkbook wbComplex = HSSFTestDataSamples.openSampleWorkbook("ColumnStyle1dpColoured.xls")) {
+
+            // Presence / absence checks
+            assertNull(wbNone.getSheetAt(0).getColumnStyle(0));
+            assertNull(wbNone.getSheetAt(0).getColumnStyle(1));
+
+            assertNull(wbSimple.getSheetAt(0).getColumnStyle(0));
+            assertNotNull(wbSimple.getSheetAt(0).getColumnStyle(1));
+
+            assertNull(wbComplex.getSheetAt(0).getColumnStyle(0));
+            assertNotNull(wbComplex.getSheetAt(0).getColumnStyle(1));
+
+            // Details checks
+            HSSFCellStyle bs = wbSimple.getSheetAt(0).getColumnStyle(1);
+            assertNotNull(bs);
+            assertEquals(62, bs.getIndex());
+            assertEquals("#,##0.0_ ;\\-#,##0.0\\ ", bs.getDataFormatString());
+            assertEquals("Calibri", bs.getFont(wbSimple).getFontName());
+            assertEquals(11 * 20, bs.getFont(wbSimple).getFontHeight());
+            assertEquals(8, bs.getFont(wbSimple).getColor());
+            assertFalse(bs.getFont(wbSimple).getItalic());
+            assertFalse(bs.getFont(wbSimple).getBold());
+
+
+            HSSFCellStyle cs = wbComplex.getSheetAt(0).getColumnStyle(1);
+            assertNotNull(cs);
+            assertEquals(62, cs.getIndex());
+            assertEquals("#,##0.0_ ;\\-#,##0.0\\ ", cs.getDataFormatString());
+            assertEquals("Arial", cs.getFont(wbComplex).getFontName());
+            assertEquals(8 * 20, cs.getFont(wbComplex).getFontHeight());
+            assertEquals(10, cs.getFont(wbComplex).getColor());
+            assertFalse(cs.getFont(wbComplex).getItalic());
+            assertTrue(cs.getFont(wbComplex).getBold());
+        }
     }
 
     /**
@@ -974,227 +904,224 @@ public final class TestHSSFSheet extends BaseTestSheet {
      */
     @Test
     public void arabic() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet s = wb.createSheet();
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet s = wb.createSheet();
 
-        assertFalse(s.isRightToLeft());
-        s.setRightToLeft(true);
-        assertTrue(s.isRightToLeft());
-        wb.close();
+            assertFalse(s.isRightToLeft());
+            s.setRightToLeft(true);
+            assertTrue(s.isRightToLeft());
+        }
     }
 
     @Test
     public void autoFilter() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        HSSFSheet sh = wb1.createSheet();
-        InternalWorkbook iwb = wb1.getWorkbook();
-        InternalSheet ish = sh.getSheet();
-
-        assertNull( iwb.getSpecificBuiltinRecord(NameRecord.BUILTIN_FILTER_DB, 1) );
-        assertNull( ish.findFirstRecordBySid(AutoFilterInfoRecord.sid) );
-
-        CellRangeAddress range = CellRangeAddress.valueOf("A1:B10");
-        sh.setAutoFilter(range);
-
-        NameRecord name = iwb.getSpecificBuiltinRecord(NameRecord.BUILTIN_FILTER_DB, 1);
-        assertNotNull( name );
-
-        // The built-in name for auto-filter must consist of a single Area3d Ptg.
-        Ptg[] ptg = name.getNameDefinition();
-        assertEquals("The built-in name for auto-filter must consist of a single Area3d Ptg", 1, ptg.length);
-        assertTrue("The built-in name for auto-filter must consist of a single Area3d Ptg", ptg[0] instanceof Area3DPtg);
-
-        Area3DPtg aref = (Area3DPtg)ptg[0];
-        assertEquals(range.getFirstColumn(), aref.getFirstColumn());
-        assertEquals(range.getFirstRow(), aref.getFirstRow());
-        assertEquals(range.getLastColumn(), aref.getLastColumn());
-        assertEquals(range.getLastRow(), aref.getLastRow());
-
-        // verify  AutoFilterInfoRecord
-        AutoFilterInfoRecord afilter = (AutoFilterInfoRecord)ish.findFirstRecordBySid(AutoFilterInfoRecord.sid);
-        assertNotNull(afilter );
-        assertEquals(2, afilter.getNumEntries()); //filter covers two columns
-
-        HSSFPatriarch dr = sh.getDrawingPatriarch();
-        assertNotNull(dr);
-        HSSFSimpleShape comboBoxShape = (HSSFSimpleShape)dr.getChildren().get(0);
-        assertEquals(comboBoxShape.getShapeType(),  HSSFSimpleShape.OBJECT_TYPE_COMBO_BOX);
-
-        assertNull( ish.findFirstRecordBySid(ObjRecord.sid) ); // ObjRecord will appear after serializetion
-
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        sh = wb2.getSheetAt(0);
-        ish = sh.getSheet();
-        ObjRecord objRecord = (ObjRecord)ish.findFirstRecordBySid(ObjRecord.sid);
-        assertNotNull(objRecord);
-        List<SubRecord> subRecords = objRecord.getSubRecords();
-        assertEquals(3, subRecords.size());
-        assertTrue(subRecords.get(0) instanceof CommonObjectDataSubRecord );
-        assertTrue(subRecords.get(1) instanceof FtCblsSubRecord ); // must be present, see Bug 51481
-        assertTrue(subRecords.get(2) instanceof LbsDataSubRecord );
-        wb2.close();
+        try (HSSFWorkbook wb1 = new HSSFWorkbook()) {
+            HSSFSheet sh = wb1.createSheet();
+            InternalWorkbook iwb = wb1.getWorkbook();
+            InternalSheet ish = sh.getSheet();
+
+            assertNull(iwb.getSpecificBuiltinRecord(NameRecord.BUILTIN_FILTER_DB, 1));
+            assertNull(ish.findFirstRecordBySid(AutoFilterInfoRecord.sid));
+
+            CellRangeAddress range = CellRangeAddress.valueOf("A1:B10");
+            sh.setAutoFilter(range);
+
+            NameRecord name = iwb.getSpecificBuiltinRecord(NameRecord.BUILTIN_FILTER_DB, 1);
+            assertNotNull(name);
+
+            // The built-in name for auto-filter must consist of a single Area3d Ptg.
+            Ptg[] ptg = name.getNameDefinition();
+            assertEquals("The built-in name for auto-filter must consist of a single Area3d Ptg", 1, ptg.length);
+            assertTrue("The built-in name for auto-filter must consist of a single Area3d Ptg", ptg[0] instanceof Area3DPtg);
+
+            Area3DPtg aref = (Area3DPtg) ptg[0];
+            assertEquals(range.getFirstColumn(), aref.getFirstColumn());
+            assertEquals(range.getFirstRow(), aref.getFirstRow());
+            assertEquals(range.getLastColumn(), aref.getLastColumn());
+            assertEquals(range.getLastRow(), aref.getLastRow());
+
+            // verify  AutoFilterInfoRecord
+            AutoFilterInfoRecord afilter = (AutoFilterInfoRecord) ish.findFirstRecordBySid(AutoFilterInfoRecord.sid);
+            assertNotNull(afilter);
+            assertEquals(2, afilter.getNumEntries()); //filter covers two columns
+
+            HSSFPatriarch dr = sh.getDrawingPatriarch();
+            assertNotNull(dr);
+            HSSFSimpleShape comboBoxShape = (HSSFSimpleShape) dr.getChildren().get(0);
+            assertEquals(comboBoxShape.getShapeType(), HSSFSimpleShape.OBJECT_TYPE_COMBO_BOX);
+
+            assertNull(ish.findFirstRecordBySid(ObjRecord.sid)); // ObjRecord will appear after serializetion
+
+            try (HSSFWorkbook wb2 = writeOutAndReadBack(wb1)) {
+                sh = wb2.getSheetAt(0);
+                ish = sh.getSheet();
+                ObjRecord objRecord = (ObjRecord) ish.findFirstRecordBySid(ObjRecord.sid);
+                assertNotNull(objRecord);
+                List<SubRecord> subRecords = objRecord.getSubRecords();
+                assertEquals(3, subRecords.size());
+                assertTrue(subRecords.get(0) instanceof CommonObjectDataSubRecord);
+                assertTrue(subRecords.get(1) instanceof FtCblsSubRecord); // must be present, see Bug 51481
+                assertTrue(subRecords.get(2) instanceof LbsDataSubRecord);
+            }
+        }
     }
 
     @Test
     public void getSetColumnHiddenShort() throws IOException {
-        Workbook workbook = new HSSFWorkbook();
-        Sheet sheet = workbook.createSheet("Sheet 1");
-        sheet.setColumnHidden((short)2, true);
-        assertTrue(sheet.isColumnHidden((short)2));
-        workbook.close();
+        try (Workbook workbook = new HSSFWorkbook()) {
+            Sheet sheet = workbook.createSheet("Sheet 1");
+            sheet.setColumnHidden((short) 2, true);
+            assertTrue(sheet.isColumnHidden((short) 2));
+        }
     }
 
     @Test
     public void columnWidthShort() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        Sheet sheet = wb1.createSheet();
-
-        //default column width measured in characters
-        sheet.setDefaultColumnWidth((short)10);
-        assertEquals(10, sheet.getDefaultColumnWidth());
-        //columns A-C have default width
-        assertEquals(256*10, sheet.getColumnWidth((short)0));
-        assertEquals(256*10, sheet.getColumnWidth((short)1));
-        assertEquals(256*10, sheet.getColumnWidth((short)2));
-
-        //set custom width for D-F
-        for (char i = 'D'; i <= 'F'; i++) {
-            //Sheet#setColumnWidth accepts the width in units of 1/256th of a character width
-            int w = 256*12;
-            sheet.setColumnWidth((short)i, w);
-            assertEquals(w, sheet.getColumnWidth((short)i));
-        }
-        //reset the default column width, columns A-C change, D-F still have custom width
-        sheet.setDefaultColumnWidth((short)20);
-        assertEquals(20, sheet.getDefaultColumnWidth());
-        assertEquals(256*20, sheet.getColumnWidth((short)0));
-        assertEquals(256*20, sheet.getColumnWidth((short)1));
-        assertEquals(256*20, sheet.getColumnWidth((short)2));
-        for (char i = 'D'; i <= 'F'; i++) {
-            int w = 256*12;
-            assertEquals(w, sheet.getColumnWidth((short)i));
-        }
+        try (HSSFWorkbook wb1 = new HSSFWorkbook()) {
+            Sheet sheet = wb1.createSheet();
+
+            //default column width measured in characters
+            sheet.setDefaultColumnWidth((short) 10);
+            assertEquals(10, sheet.getDefaultColumnWidth());
+            //columns A-C have default width
+            assertEquals(256 * 10, sheet.getColumnWidth((short) 0));
+            assertEquals(256 * 10, sheet.getColumnWidth((short) 1));
+            assertEquals(256 * 10, sheet.getColumnWidth((short) 2));
+
+            //set custom width for D-F
+            for (char i = 'D'; i <= 'F'; i++) {
+                //Sheet#setColumnWidth accepts the width in units of 1/256th of a character width
+                int w = 256 * 12;
+                sheet.setColumnWidth((short) i, w);
+                assertEquals(w, sheet.getColumnWidth((short) i));
+            }
+            //reset the default column width, columns A-C change, D-F still have custom width
+            sheet.setDefaultColumnWidth((short) 20);
+            assertEquals(20, sheet.getDefaultColumnWidth());
+            assertEquals(256 * 20, sheet.getColumnWidth((short) 0));
+            assertEquals(256 * 20, sheet.getColumnWidth((short) 1));
+            assertEquals(256 * 20, sheet.getColumnWidth((short) 2));
+            for (char i = 'D'; i <= 'F'; i++) {
+                int w = 256 * 12;
+                assertEquals(w, sheet.getColumnWidth((short) i));
+            }
 
-        // check for 16-bit signed/unsigned error:
-        sheet.setColumnWidth((short)10, 40000);
-        assertEquals(40000, sheet.getColumnWidth((short)10));
+            // check for 16-bit signed/unsigned error:
+            sheet.setColumnWidth((short) 10, 40000);
+            assertEquals(40000, sheet.getColumnWidth((short) 10));
 
-        //The maximum column width for an individual cell is 255 characters
-        try {
-            sheet.setColumnWidth((short)9, 256*256);
-            fail("expected exception");
-        } catch(IllegalArgumentException e){
-            assertEquals("The maximum column width for an individual cell is 255 characters.", e.getMessage());
-        }
+            //The maximum column width for an individual cell is 255 characters
+            try {
+                sheet.setColumnWidth((short) 9, 256 * 256);
+                fail("expected exception");
+            } catch (IllegalArgumentException e) {
+                assertEquals("The maximum column width for an individual cell is 255 characters.", e.getMessage());
+            }
 
-        //serialize and read again
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        sheet = wb2.getSheetAt(0);
-        assertEquals(20, sheet.getDefaultColumnWidth());
-        //columns A-C have default width
-        assertEquals(256*20, sheet.getColumnWidth((short)0));
-        assertEquals(256*20, sheet.getColumnWidth((short)1));
-        assertEquals(256*20, sheet.getColumnWidth((short)2));
-        //columns D-F have custom width
-        for (char i = 'D'; i <= 'F'; i++) {
-            short w = (256*12);
-            assertEquals(w, sheet.getColumnWidth((short)i));
+            //serialize and read again
+            try (HSSFWorkbook wb2 = writeOutAndReadBack(wb1)) {
+                sheet = wb2.getSheetAt(0);
+                assertEquals(20, sheet.getDefaultColumnWidth());
+                //columns A-C have default width
+                assertEquals(256 * 20, sheet.getColumnWidth((short) 0));
+                assertEquals(256 * 20, sheet.getColumnWidth((short) 1));
+                assertEquals(256 * 20, sheet.getColumnWidth((short) 2));
+                //columns D-F have custom width
+                for (char i = 'D'; i <= 'F'; i++) {
+                    short w = (256 * 12);
+                    assertEquals(w, sheet.getColumnWidth((short) i));
+                }
+                assertEquals(40000, sheet.getColumnWidth((short) 10));
+            }
         }
-        assertEquals(40000, sheet.getColumnWidth((short)10));
-        
-        wb2.close();
     }
 
     @Test
     public void showInPane() throws IOException {
-        Workbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-        sheet.showInPane(2, 3);
-        
-        thrown.expect(IllegalArgumentException.class);
-        thrown.expectMessage("Maximum row number is 65535");
-        sheet.showInPane(Integer.MAX_VALUE, 3);
-        wb.close();
+        try (Workbook wb = new HSSFWorkbook()) {
+            Sheet sheet = wb.createSheet();
+            sheet.showInPane(2, 3);
+
+            thrown.expect(IllegalArgumentException.class);
+            thrown.expectMessage("Maximum row number is 65535");
+            sheet.showInPane(Integer.MAX_VALUE, 3);
+        }
     }
-    
+
     @Test
     public void drawingRecords() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet();
-
-        /* TODO: NPE?
-        sheet.dumpDrawingRecords(false);
-        sheet.dumpDrawingRecords(true);*/
-        assertNull(sheet.getDrawingEscherAggregate());
-        wb.close();
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet sheet = wb.createSheet();
+
+            /* TODO: NPE?
+            sheet.dumpDrawingRecords(false);
+            sheet.dumpDrawingRecords(true);*/
+            assertNull(sheet.getDrawingEscherAggregate());
+        }
     }
 
     @Test
     public void bug55723b() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        Sheet sheet = wb.createSheet();
-
-        // stored with a special name
-        assertNull(wb.getWorkbook().getSpecificBuiltinRecord(NameRecord.BUILTIN_FILTER_DB, 1));
-
-        CellRangeAddress range = CellRangeAddress.valueOf("A:B");
-        AutoFilter filter = sheet.setAutoFilter(range);
-        assertNotNull(filter);
-        
-        // stored with a special name
-        NameRecord record = wb.getWorkbook().getSpecificBuiltinRecord(NameRecord.BUILTIN_FILTER_DB, 1);
-        assertNotNull(record);
-        wb.close();
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            Sheet sheet = wb.createSheet();
+
+            // stored with a special name
+            assertNull(wb.getWorkbook().getSpecificBuiltinRecord(NameRecord.BUILTIN_FILTER_DB, 1));
+
+            CellRangeAddress range = CellRangeAddress.valueOf("A:B");
+            AutoFilter filter = sheet.setAutoFilter(range);
+            assertNotNull(filter);
+
+            // stored with a special name
+            NameRecord record = wb.getWorkbook().getSpecificBuiltinRecord(NameRecord.BUILTIN_FILTER_DB, 1);
+            assertNotNull(record);
+        }
     }
-    
+
     @Test
     public void test58746() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        
-        HSSFSheet first = wb.createSheet("first");
-        first.createRow(0).createCell(0).setCellValue(1);
-        
-        HSSFSheet second = wb.createSheet("second");
-        second.createRow(0).createCell(0).setCellValue(2);
-        
-        HSSFSheet third = wb.createSheet("third");
-        HSSFRow row = third.createRow(0);
-        row.createCell(0).setCellFormula("first!A1");
-        row.createCell(1).setCellFormula("second!A1");
-
-        // re-order for sheet "third"
-        wb.setSheetOrder("third", 0);
-        
-        // verify results
-        assertEquals("third", wb.getSheetAt(0).getSheetName());
-        assertEquals("first", wb.getSheetAt(1).getSheetName());
-        assertEquals("second", wb.getSheetAt(2).getSheetName());
-        
-        assertEquals("first!A1", wb.getSheetAt(0).getRow(0).getCell(0).getCellFormula());
-        assertEquals("second!A1", wb.getSheetAt(0).getRow(0).getCell(1).getCellFormula());
-        
-        wb.close();
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+
+            HSSFSheet first = wb.createSheet("first");
+            first.createRow(0).createCell(0).setCellValue(1);
+
+            HSSFSheet second = wb.createSheet("second");
+            second.createRow(0).createCell(0).setCellValue(2);
+
+            HSSFSheet third = wb.createSheet("third");
+            HSSFRow row = third.createRow(0);
+            row.createCell(0).setCellFormula("first!A1");
+            row.createCell(1).setCellFormula("second!A1");
+
+            // re-order for sheet "third"
+            wb.setSheetOrder("third", 0);
+
+            // verify results
+            assertEquals("third", wb.getSheetAt(0).getSheetName());
+            assertEquals("first", wb.getSheetAt(1).getSheetName());
+            assertEquals("second", wb.getSheetAt(2).getSheetName());
+
+            assertEquals("first!A1", wb.getSheetAt(0).getRow(0).getCell(0).getCellFormula());
+            assertEquals("second!A1", wb.getSheetAt(0).getRow(0).getCell(1).getCellFormula());
+        }
     }
 
     @Test
     public void bug59135() throws IOException {
-        HSSFWorkbook wb1 = new HSSFWorkbook();
-        wb1.createSheet().protectSheet("1111.2222.3333.1234");
-        HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-        
-        assertEquals((short)0xb86b, wb2.getSheetAt(0).getPassword());
-        wb2.close();
-
-        HSSFWorkbook wb3 = new HSSFWorkbook();
-        wb3.createSheet().protectSheet("1111.2222.3333.12345");
-        HSSFWorkbook wb4 = HSSFTestDataSamples.writeOutAndReadBack(wb3);
-        wb3.close();
-        
-        assertEquals((short)0xbecc, wb4.getSheetAt(0).getPassword());
-        wb4.close();
+        try (HSSFWorkbook wb1 = new HSSFWorkbook()) {
+            wb1.createSheet().protectSheet("1111.2222.3333.1234");
+            try (HSSFWorkbook wb2 = writeOutAndReadBack(wb1)) {
+
+                assertEquals((short) 0xb86b, wb2.getSheetAt(0).getPassword());
+            }
+        }
+
+        try (HSSFWorkbook wb1 = new HSSFWorkbook()) {
+            wb1.createSheet().protectSheet("1111.2222.3333.12345");
+            try (HSSFWorkbook wb2 = writeOutAndReadBack(wb1)) {
+
+                assertEquals((short) 0xbecc, wb2.getSheetAt(0).getPassword());
+            }
+        }
     }
 }