Add assertions, remove Sonar warnings

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

diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/GZIPSheetDataWriter.java b/src/ooxml/java/org/apache/poi/xssf/streaming/GZIPSheetDataWriter.java
index 8b72ad48d9ee58d22b0bbb2466a0d27b64f5aae3..4008940c80ad502758864e358498bccc582ea6db 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/GZIPSheetDataWriter.java
+++ b/src/ooxml/java/org/apache/poi/xssf/streaming/GZIPSheetDataWriter.java
@@ -51,9 +51,8 @@ public class GZIPSheetDataWriter extends SheetDataWriter {
      * @return temp file to write sheet data\r
      */\r
     @Override\r
-       public File createTempFile()throws IOException {\r
-        File fd = File.createTempFile("poi-sxssf-sheet-xml", ".gz");\r
-        return fd;\r
+    public File createTempFile()throws IOException {\r
+        return File.createTempFile("poi-sxssf-sheet-xml", ".gz");\r
     }\r
 \r
     /**\r

diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java b/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
index b7cecfe81b5493e9ce1f41f94f161c3e1d90a15c..43f7e72e68002bde95cfd47c453cd5a5602327fe 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
+++ b/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
@@ -75,8 +75,7 @@ public class SheetDataWriter {
      * @return temp file to write sheet data\r
      */\r
     public File createTempFile()throws IOException {\r
-        File fd = File.createTempFile("poi-sxssf-sheet", ".xml");\r
-        return fd;\r
+        return File.createTempFile("poi-sxssf-sheet", ".xml");\r
     }\r
 \r
     /**\r

diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
index 3a7a0849941a5933d2fd99e3304995b6f95a669e..ce217e234424b81581e6f588fd245087dd252f69 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
@@ -93,14 +93,14 @@ public final class TestSXSSFWorkbook extends BaseTestWorkbook {
        xssfWorkbook.createSheet("S1");
        SXSSFWorkbook wb = new SXSSFWorkbook(xssfWorkbook);
        xssfWorkbook = (XSSFWorkbook) SXSSFITestDataProvider.instance.writeOutAndReadBack(wb);
-       wb.dispose();
+       assertTrue(wb.dispose());
 
         wb = new SXSSFWorkbook(xssfWorkbook);
        assertEquals(1, wb.getNumberOfSheets());
        Sheet sheet  = wb.getSheetAt(0);
        assertNotNull(sheet);
        assertEquals("S1", sheet.getSheetName());
-        wb.dispose();
+        assertTrue(wb.dispose());
 
     }
 
@@ -151,7 +151,7 @@ public final class TestSXSSFWorkbook extends BaseTestWorkbook {
        cell.setCellValue("value 2_1_1");
        SXSSFWorkbook wb = new SXSSFWorkbook(xssfWorkbook);
        xssfWorkbook = (XSSFWorkbook) SXSSFITestDataProvider.instance.writeOutAndReadBack(wb);
-        wb.dispose();
+        assertTrue(wb.dispose());
 
         wb = new SXSSFWorkbook(xssfWorkbook);
 
@@ -218,7 +218,7 @@ public final class TestSXSSFWorkbook extends BaseTestWorkbook {
         File tmp = wr.getTempFile();
         assertTrue(tmp.getName().startsWith("poi-sxssf-sheet"));
         assertTrue(tmp.getName().endsWith(".xml"));
-        wb.dispose();
+        assertTrue(wb.dispose());
 
         wb = new SXSSFWorkbook();
         wb.setCompressTempFiles(true);
@@ -228,7 +228,7 @@ public final class TestSXSSFWorkbook extends BaseTestWorkbook {
         tmp = wr.getTempFile();
         assertTrue(tmp.getName().startsWith("poi-sxssf-sheet-xml"));
         assertTrue(tmp.getName().endsWith(".gz"));
-        wb.dispose();
+        assertTrue(wb.dispose());
 
         //Test escaping of Unicode control characters
         wb = new SXSSFWorkbook();
@@ -237,7 +237,7 @@ public final class TestSXSSFWorkbook extends BaseTestWorkbook {
         Cell cell = xssfWorkbook.getSheet("S1").getRow(0).getCell(0);
         assertEquals("value?", cell.getStringCellValue());
 
-        wb.dispose();
+        assertTrue(wb.dispose());
 
     }
 
@@ -280,7 +280,7 @@ public final class TestSXSSFWorkbook extends BaseTestWorkbook {
             }
         }
 
-        wb.dispose();
+        assertTrue(wb.dispose());
 
     }
 
@@ -366,10 +366,10 @@ public final class TestSXSSFWorkbook extends BaseTestWorkbook {
                                }
 
                                wb.write(outSteam);
-                               // wb.dispose();
+                               // assertTrue(wb.dispose());
                                outSteam.close();
                        } finally {
-                               wb.dispose();
+                               assertTrue(wb.dispose());
                        }
                }
                out.delete();