From: Dominik Stadler <centic@apache.org>
Date: Sat, 15 Feb 2014 00:18:34 +0000 (+0000)
Subject: Add assertions, remove Sonar warnings
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2b85b00690ec98f3473345acd751a2a05fab3744;p=poi.git

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 8b72ad48d9..4008940c80 100644
--- 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
      */
     @Override
-	public File createTempFile()throws IOException {
-        File fd = File.createTempFile("poi-sxssf-sheet-xml", ".gz");
-        return fd;
+    public File createTempFile()throws IOException {
+        return File.createTempFile("poi-sxssf-sheet-xml", ".gz");
     }
 
     /**
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 b7cecfe81b..43f7e72e68 100644
--- 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
      */
     public File createTempFile()throws IOException {
-        File fd = File.createTempFile("poi-sxssf-sheet", ".xml");
-        return fd;
+        return File.createTempFile("poi-sxssf-sheet", ".xml");
     }
 
     /**
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 3a7a084994..ce217e2344 100644
--- 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();