You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2021/01/09 18:24:52 UTC

svn commit: r1885308 [1/4] - in /poi/trunk/src: ooxml/testcases/org/apache/poi/xssf/streaming/ ooxml/testcases/org/apache/poi/xssf/usermodel/ testcases/org/apache/poi/ testcases/org/apache/poi/ddf/ testcases/org/apache/poi/hpsf/ testcases/org/apache/po...

Author: kiwiwings
Date: Sat Jan  9 18:24:51 2021
New Revision: 1885308

URL: http://svn.apache.org/viewvc?rev=1885308&view=rev
Log:
Sonar fixes
JUnit5 test classes and methods should have default package visibility

Modified:
    poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestDeferredSXSSFWorkbook.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMissingWorkbookOnXSSF.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
    poi/trunk/src/testcases/org/apache/poi/POITestCase.java
    poi/trunk/src/testcases/org/apache/poi/TestPOIDocumentMain.java
    poi/trunk/src/testcases/org/apache/poi/TestPOITestCase.java
    poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherDump.java
    poi/trunk/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java
    poi/trunk/src/testcases/org/apache/poi/hpsf/basic/POIFile.java
    poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestBasic.java
    poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestClassID.java
    poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java
    poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java
    poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java
    poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java
    poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java
    poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java
    poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
    poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java
    poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingManager2.java
    poi/trunk/src/testcases/org/apache/poi/hssf/model/TestRVA.java
    poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java
    poi/trunk/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java
    poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java
    poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
    poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCryptoAPI.java
    poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java
    poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics.java
    poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java
    poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFontDetails.java
    poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java
    poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
    poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java
    poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
    poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java
    poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java
    poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRangeCopier.java
    poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
    poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftColumns.java
    poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
    poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestMatrixFormulasFromBinarySpreadsheet.java
    poi/trunk/src/testcases/org/apache/poi/hssf/util/TestCellReference.java
    poi/trunk/src/testcases/org/apache/poi/poifs/crypt/TestBiff8DecryptingStream.java
    poi/trunk/src/testcases/org/apache/poi/poifs/crypt/TestCipherAlgorithm.java
    poi/trunk/src/testcases/org/apache/poi/poifs/crypt/TestXorEncryption.java
    poi/trunk/src/testcases/org/apache/poi/poifs/crypt/binaryrc4/TestBinaryRC4.java
    poi/trunk/src/testcases/org/apache/poi/poifs/dev/TestPOIFSDump.java
    poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java
    poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java
    poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java
    poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSStream.java
    poi/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java
    poi/trunk/src/testcases/org/apache/poi/poifs/property/TestPropertyTable.java
    poi/trunk/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShow.java
    poi/trunk/src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java
    poi/trunk/src/testcases/org/apache/poi/ss/formula/BaseTestMissingWorkbook.java
    poi/trunk/src/testcases/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java
    poi/trunk/src/testcases/org/apache/poi/ss/formula/TestFunctionRegistry.java
    poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java
    poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java
    poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java
    poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java
    poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java
    poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEOMonth.java
    poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java
    poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestGeomean.java
    poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunction.java
    poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMultiOperandNumericFunction.java
    poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestProduct.java
    poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTime.java
    poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java
    poi/trunk/src/testcases/org/apache/poi/ss/formula/udf/TestAggregatingUDFFinder.java
    poi/trunk/src/testcases/org/apache/poi/ss/formula/udf/TestDefaultUDFFinder.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCellComment.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataValidation.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftColumns.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestXEvaluationSheet.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/TestDateUtil.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/TestFractionFormat.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/TestIndexedColors.java
    poi/trunk/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java
    poi/trunk/src/testcases/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java
    poi/trunk/src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java
    poi/trunk/src/testcases/org/apache/poi/ss/util/TestCellRangeAddress.java
    poi/trunk/src/testcases/org/apache/poi/ss/util/TestCellReference.java
    poi/trunk/src/testcases/org/apache/poi/ss/util/TestPropertyTemplate.java
    poi/trunk/src/testcases/org/apache/poi/ss/util/TestRegionUtil.java
    poi/trunk/src/testcases/org/apache/poi/util/MemoryLeakVerifier.java
    poi/trunk/src/testcases/org/apache/poi/util/TestHexDump.java
    poi/trunk/src/testcases/org/apache/poi/util/TestLocaleUtil.java
    poi/trunk/src/testcases/org/apache/poi/util/TestRLEDecompressingInputStream.java
    poi/trunk/src/testcases/org/apache/poi/util/TestStringUtil.java
    poi/trunk/src/testcases/org/apache/poi/util/TestTempFile.java

Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestDeferredSXSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestDeferredSXSSFWorkbook.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestDeferredSXSSFWorkbook.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestDeferredSXSSFWorkbook.java Sat Jan  9 18:24:51 2021
@@ -58,8 +58,8 @@ public final class TestDeferredSXSSFWork
      */
     @Override
     @Test
-    public void cloneSheet() throws IOException {
-        RuntimeException e = assertThrows(RuntimeException.class, super::cloneSheet);
+    protected void cloneSheet() throws IOException {
+        RuntimeException e = assertThrows(RuntimeException.class, () -> super.cloneSheet());
         assertEquals("Not Implemented", e.getMessage());
     }
 
@@ -68,8 +68,8 @@ public final class TestDeferredSXSSFWork
      */
     @Override
     @Test
-    public void sheetClone() throws IOException {
-        RuntimeException e = assertThrows(RuntimeException.class, super::sheetClone);
+    protected void sheetClone() throws IOException {
+        RuntimeException e = assertThrows(RuntimeException.class, () -> super.sheetClone());
         assertEquals("Not Implemented", e.getMessage());
     }
 
@@ -78,17 +78,14 @@ public final class TestDeferredSXSSFWork
      */
     @Override
     @Disabled("SXSSF doesn't update formulas on sheet name changes, as most cells probably aren't in memory at the time")
-    @Test
-    public void setSheetName() {}
+    protected void setSheetName() {}
 
     @Override
     @Disabled("DeferredSXSSF code disposes rows in a way that breaks this test")
-    @Test
     public void parentReferences() {}
 
     @Override
     @Disabled("DeferredSXSSF code disposes rows in a way that breaks this test")
-    @Test
     public void unicodeInAll() {}
 
     @Test

Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java Sat Jan  9 18:24:51 2021
@@ -138,7 +138,7 @@ public class TestSXSSFCell extends BaseT
      */
     @Override
     @Disabled
-    public void setBlank_removesArrayFormula_ifCellIsPartOfAnArrayFormulaGroupContainingOnlyThisCell() {
+    protected void setBlank_removesArrayFormula_ifCellIsPartOfAnArrayFormulaGroupContainingOnlyThisCell() {
     }
 
     /**
@@ -147,33 +147,29 @@ public class TestSXSSFCell extends BaseT
      */
     @Override
     @Disabled
-    @Test // <- annotation is necessary to override expected exception
-    public void setBlank_throwsISE_ifCellIsPartOfAnArrayFormulaGroupContainingOtherCells() {
+    protected void setBlank_throwsISE_ifCellIsPartOfAnArrayFormulaGroupContainingOtherCells() {
     }
 
     @Override
     @Disabled
-    @Test
-    public void setCellFormula_throwsISE_ifCellIsPartOfAnArrayFormulaGroupContainingOtherCells() {
+    protected void setCellFormula_throwsISE_ifCellIsPartOfAnArrayFormulaGroupContainingOtherCells() {
     }
 
     @Override
     @Disabled
-    public void removeFormula_turnsCellToBlank_whenFormulaWasASingleCellArrayFormula() {
+    protected void removeFormula_turnsCellToBlank_whenFormulaWasASingleCellArrayFormula() {
     }
 
     @Override
     @Disabled
-    public void setCellFormula_onASingleCellArrayFormulaCell_preservesTheValue() {
+    protected void setCellFormula_onASingleCellArrayFormulaCell_preservesTheValue() {
     }
 
-    @Test
     @Disabled
-    public void setCellFormula_isExceptionSafe_onBlankCell() {
+    protected void setCellFormula_isExceptionSafe_onBlankCell() {
     }
 
-    @Test
     @Disabled
-    public void setCellType_FORMULA_onAnArrayFormulaCell_doesNothing() {
+    protected void setCellType_FORMULA_onAnArrayFormulaCell_doesNothing() {
     }
 }

Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheet.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheet.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheet.java Sat Jan  9 18:24:51 2021
@@ -58,15 +58,15 @@ public final class TestSXSSFSheet extend
      */
     @Override
     @Test
-    public void cloneSheet() {
-        RuntimeException ex = assertThrows(RuntimeException.class, super::cloneSheet);
+    protected void cloneSheet() {
+        RuntimeException ex = assertThrows(RuntimeException.class, () -> super.cloneSheet());
         assertEquals("Not Implemented", ex.getMessage());
     }
 
     @Override
     @Test
-    public void cloneSheetMultipleTimes() {
-        RuntimeException ex = assertThrows(RuntimeException.class, super::cloneSheetMultipleTimes);
+    protected void cloneSheetMultipleTimes() {
+        RuntimeException ex = assertThrows(RuntimeException.class, () -> super.cloneSheetMultipleTimes());
         assertEquals("Not Implemented", ex.getMessage());
     }
 
@@ -75,8 +75,8 @@ public final class TestSXSSFSheet extend
      */
     @Override
     @Test
-    public void shiftMerged() {
-        RuntimeException ex = assertThrows(RuntimeException.class, super::shiftMerged);
+    protected void shiftMerged() {
+        RuntimeException ex = assertThrows(RuntimeException.class, () -> super.shiftMerged());
         assertEquals("Not Implemented", ex.getMessage());
     }
 
@@ -87,14 +87,13 @@ public final class TestSXSSFSheet extend
      */
     @Override
     @Test
-    public void bug35084() {
-        RuntimeException ex = assertThrows(RuntimeException.class, super::bug35084);
+    protected void bug35084() {
+        RuntimeException ex = assertThrows(RuntimeException.class, () -> super.bug35084());
         assertEquals("Not Implemented", ex.getMessage());
     }
 
     @Override
-    @Test
-    public void getCellComment() {
+    protected void getCellComment() {
         // TODO: reading cell comments via Sheet does not work currently as it tries
         // to access the underlying sheet for this, but comments are stored as
         // properties on Cells...

Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java Sat Jan  9 18:24:51 2021
@@ -72,8 +72,8 @@ public final class TestSXSSFWorkbook ext
      */
     @Override
     @Test
-    public void cloneSheet() throws IOException {
-        RuntimeException e = assertThrows(RuntimeException.class, super::cloneSheet);
+    protected void cloneSheet() throws IOException {
+        RuntimeException e = assertThrows(RuntimeException.class, () -> super.cloneSheet());
         assertEquals("Not Implemented", e.getMessage());
     }
 
@@ -82,8 +82,8 @@ public final class TestSXSSFWorkbook ext
      */
     @Override
     @Test
-    public void sheetClone() throws IOException {
-        RuntimeException e = assertThrows(RuntimeException.class, super::sheetClone);
+    protected void sheetClone() {
+        RuntimeException e = assertThrows(RuntimeException.class, () -> super.sheetClone());
         assertEquals("Not Implemented", e.getMessage());
     }
 

Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMissingWorkbookOnXSSF.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMissingWorkbookOnXSSF.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMissingWorkbookOnXSSF.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMissingWorkbookOnXSSF.java Sat Jan  9 18:24:51 2021
@@ -34,7 +34,7 @@ public final class TestMissingWorkbookOn
 
     @Override
     @BeforeEach
-    public void setUp() {
+    protected void setUp() {
         mainWorkbook = XSSFTestDataSamples.openSampleWorkbook(MAIN_WORKBOOK_FILENAME);
         sourceWorkbook = HSSFTestDataSamples.openSampleWorkbook(SOURCE_WORKBOOK_FILENAME);
 

Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java Sat Jan  9 18:24:51 2021
@@ -54,15 +54,15 @@ public final class TestSXSSFBugs extends
 
     // override some tests which do not work for SXSSF
     @Override @Disabled("cloneSheet() not implemented") @Test
-    public void bug18800() { /* cloneSheet() not implemented */ }
+    protected void bug18800() { /* cloneSheet() not implemented */ }
     @Override @Disabled("cloneSheet() not implemented") @Test
-    public void bug22720() { /* cloneSheet() not implemented */ }
+    protected void bug22720() { /* cloneSheet() not implemented */ }
     @Override @Disabled("Evaluation is not fully supported") @Test
-    public void bug47815() { /* Evaluation is not supported */ }
+    protected void bug47815() { /* Evaluation is not supported */ }
     @Override @Disabled("Evaluation is not fully supported") @Test
-    public void bug46729_testMaxFunctionArguments() { /* Evaluation is not supported */ }
+    protected void bug46729_testMaxFunctionArguments() { /* Evaluation is not supported */ }
     @Override @Disabled("Reading data is not supported") @Test
-    public void bug57798() { /* Reading data is not supported */ }
+    protected void bug57798() { /* Reading data is not supported */ }
 
     /**
      * Setting repeating rows and columns shouldn't break
@@ -105,7 +105,7 @@ public final class TestSXSSFBugs extends
     // bug 60197: setSheetOrder should update sheet-scoped named ranges to maintain references to the sheets before the re-order
     @Test
     @Override
-    public void bug60197_NamedRangesReferToCorrectSheetWhenSheetOrderIsChanged() throws Exception {
+    protected void bug60197_NamedRangesReferToCorrectSheetWhenSheetOrderIsChanged() throws Exception {
         try {
             super.bug60197_NamedRangesReferToCorrectSheetWhenSheetOrderIsChanged();
         } catch (final RuntimeException e) {

Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java Sat Jan  9 18:24:51 2021
@@ -96,125 +96,121 @@ public final class TestXSSFSheet extends
 
     //TODO column styles are not yet supported by XSSF
     @Override
-    @Test
-    public void defaultColumnStyle() {
+    protected void defaultColumnStyle() {
         //super.defaultColumnStyle();
     }
 
     @Test
     public void existingHeaderFooter() throws IOException {
-        XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("45540_classic_Header.xlsx");
-        XSSFOddHeader hdr;
-        XSSFOddFooter ftr;
-
-        // Sheet 1 has a header with center and right text
-        XSSFSheet s1 = wb1.getSheetAt(0);
-        assertNotNull(s1.getHeader());
-        assertNotNull(s1.getFooter());
-        hdr = (XSSFOddHeader) s1.getHeader();
-        ftr = (XSSFOddFooter) s1.getFooter();
-
-        assertEquals("&Ctestdoc&Rtest phrase", hdr.getText());
-        assertNull(ftr.getText());
-
-        assertEquals("", hdr.getLeft());
-        assertEquals("testdoc", hdr.getCenter());
-        assertEquals("test phrase", hdr.getRight());
-
-        assertEquals("", ftr.getLeft());
-        assertEquals("", ftr.getCenter());
-        assertEquals("", ftr.getRight());
-
-        // Sheet 2 has a footer, but it's empty
-        XSSFSheet s2 = wb1.getSheetAt(1);
-        assertNotNull(s2.getHeader());
-        assertNotNull(s2.getFooter());
-        hdr = (XSSFOddHeader) s2.getHeader();
-        ftr = (XSSFOddFooter) s2.getFooter();
-
-        assertNull(hdr.getText());
-        assertEquals("&L&F", ftr.getText());
-
-        assertEquals("", hdr.getLeft());
-        assertEquals("", hdr.getCenter());
-        assertEquals("", hdr.getRight());
-
-        assertEquals("&F", ftr.getLeft());
-        assertEquals("", ftr.getCenter());
-        assertEquals("", ftr.getRight());
-
-        // Save and reload
-        XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1);
-        wb1.close();
-
-        hdr = (XSSFOddHeader) wb2.getSheetAt(0).getHeader();
-        ftr = (XSSFOddFooter) wb2.getSheetAt(0).getFooter();
+        try (XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("45540_classic_Header.xlsx")) {
+            XSSFOddHeader hdr;
+            XSSFOddFooter ftr;
+
+            // Sheet 1 has a header with center and right text
+            XSSFSheet s1 = wb1.getSheetAt(0);
+            assertNotNull(s1.getHeader());
+            assertNotNull(s1.getFooter());
+            hdr = (XSSFOddHeader) s1.getHeader();
+            ftr = (XSSFOddFooter) s1.getFooter();
+
+            assertEquals("&Ctestdoc&Rtest phrase", hdr.getText());
+            assertNull(ftr.getText());
+
+            assertEquals("", hdr.getLeft());
+            assertEquals("testdoc", hdr.getCenter());
+            assertEquals("test phrase", hdr.getRight());
+
+            assertEquals("", ftr.getLeft());
+            assertEquals("", ftr.getCenter());
+            assertEquals("", ftr.getRight());
+
+            // Sheet 2 has a footer, but it's empty
+            XSSFSheet s2 = wb1.getSheetAt(1);
+            assertNotNull(s2.getHeader());
+            assertNotNull(s2.getFooter());
+            hdr = (XSSFOddHeader) s2.getHeader();
+            ftr = (XSSFOddFooter) s2.getFooter();
+
+            assertNull(hdr.getText());
+            assertEquals("&L&F", ftr.getText());
+
+            assertEquals("", hdr.getLeft());
+            assertEquals("", hdr.getCenter());
+            assertEquals("", hdr.getRight());
+
+            assertEquals("&F", ftr.getLeft());
+            assertEquals("", ftr.getCenter());
+            assertEquals("", ftr.getRight());
 
-        assertEquals("", hdr.getLeft());
-        assertEquals("testdoc", hdr.getCenter());
-        assertEquals("test phrase", hdr.getRight());
-
-        assertEquals("", ftr.getLeft());
-        assertEquals("", ftr.getCenter());
-        assertEquals("", ftr.getRight());
+            // Save and reload
+            try (XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1)) {
+                hdr = (XSSFOddHeader) wb2.getSheetAt(0).getHeader();
+                ftr = (XSSFOddFooter) wb2.getSheetAt(0).getFooter();
 
-        wb2.close();
+                assertEquals("", hdr.getLeft());
+                assertEquals("testdoc", hdr.getCenter());
+                assertEquals("test phrase", hdr.getRight());
+
+                assertEquals("", ftr.getLeft());
+                assertEquals("", ftr.getCenter());
+                assertEquals("", ftr.getRight());
+            }
+        }
     }
 
     @Test
     public void getAllHeadersFooters() throws IOException {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFSheet sheet = workbook.createSheet("Sheet 1");
-        assertNotNull(sheet.getOddFooter());
-        assertNotNull(sheet.getEvenFooter());
-        assertNotNull(sheet.getFirstFooter());
-        assertNotNull(sheet.getOddHeader());
-        assertNotNull(sheet.getEvenHeader());
-        assertNotNull(sheet.getFirstHeader());
-
-        assertEquals("", sheet.getOddFooter().getLeft());
-        sheet.getOddFooter().setLeft("odd footer left");
-        assertEquals("odd footer left", sheet.getOddFooter().getLeft());
-
-        assertEquals("", sheet.getEvenFooter().getLeft());
-        sheet.getEvenFooter().setLeft("even footer left");
-        assertEquals("even footer left", sheet.getEvenFooter().getLeft());
-
-        assertEquals("", sheet.getFirstFooter().getLeft());
-        sheet.getFirstFooter().setLeft("first footer left");
-        assertEquals("first footer left", sheet.getFirstFooter().getLeft());
-
-        assertEquals("", sheet.getOddHeader().getLeft());
-        sheet.getOddHeader().setLeft("odd header left");
-        assertEquals("odd header left", sheet.getOddHeader().getLeft());
-
-        assertEquals("", sheet.getOddHeader().getRight());
-        sheet.getOddHeader().setRight("odd header right");
-        assertEquals("odd header right", sheet.getOddHeader().getRight());
-
-        assertEquals("", sheet.getOddHeader().getCenter());
-        sheet.getOddHeader().setCenter("odd header center");
-        assertEquals("odd header center", sheet.getOddHeader().getCenter());
-
-        // Defaults are odd
-        assertEquals("odd footer left", sheet.getFooter().getLeft());
-        assertEquals("odd header center", sheet.getHeader().getCenter());
-
-        workbook.close();
+        try (XSSFWorkbook workbook = new XSSFWorkbook()) {
+            XSSFSheet sheet = workbook.createSheet("Sheet 1");
+            assertNotNull(sheet.getOddFooter());
+            assertNotNull(sheet.getEvenFooter());
+            assertNotNull(sheet.getFirstFooter());
+            assertNotNull(sheet.getOddHeader());
+            assertNotNull(sheet.getEvenHeader());
+            assertNotNull(sheet.getFirstHeader());
+
+            assertEquals("", sheet.getOddFooter().getLeft());
+            sheet.getOddFooter().setLeft("odd footer left");
+            assertEquals("odd footer left", sheet.getOddFooter().getLeft());
+
+            assertEquals("", sheet.getEvenFooter().getLeft());
+            sheet.getEvenFooter().setLeft("even footer left");
+            assertEquals("even footer left", sheet.getEvenFooter().getLeft());
+
+            assertEquals("", sheet.getFirstFooter().getLeft());
+            sheet.getFirstFooter().setLeft("first footer left");
+            assertEquals("first footer left", sheet.getFirstFooter().getLeft());
+
+            assertEquals("", sheet.getOddHeader().getLeft());
+            sheet.getOddHeader().setLeft("odd header left");
+            assertEquals("odd header left", sheet.getOddHeader().getLeft());
+
+            assertEquals("", sheet.getOddHeader().getRight());
+            sheet.getOddHeader().setRight("odd header right");
+            assertEquals("odd header right", sheet.getOddHeader().getRight());
+
+            assertEquals("", sheet.getOddHeader().getCenter());
+            sheet.getOddHeader().setCenter("odd header center");
+            assertEquals("odd header center", sheet.getOddHeader().getCenter());
+
+            // Defaults are odd
+            assertEquals("odd footer left", sheet.getFooter().getLeft());
+            assertEquals("odd header center", sheet.getHeader().getCenter());
+        }
     }
 
     @Test
     public void autoSizeColumn() throws IOException {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFSheet sheet = workbook.createSheet("Sheet 1");
-        sheet.createRow(0).createCell(13).setCellValue("test");
-
-        sheet.autoSizeColumn(13);
-
-        ColumnHelper columnHelper = sheet.getColumnHelper();
-        CTCol col = columnHelper.getColumn(13, false);
-        assertTrue(col.getBestFit());
-        workbook.close();
+        try (XSSFWorkbook workbook = new XSSFWorkbook()) {
+            XSSFSheet sheet = workbook.createSheet("Sheet 1");
+            sheet.createRow(0).createCell(13).setCellValue("test");
+
+            sheet.autoSizeColumn(13);
+
+            ColumnHelper columnHelper = sheet.getColumnHelper();
+            CTCol col = columnHelper.getColumn(13, false);
+            assertTrue(col.getBestFit());
+        }
     }
 
 
@@ -925,7 +921,7 @@ public final class TestXSSFSheet extends
      */
     @Override
     @Test
-    public void createRow() throws IOException {
+    protected void createRow() throws IOException {
         XSSFWorkbook wb1 = new XSSFWorkbook();
         XSSFSheet sheet = wb1.createSheet();
         CTWorksheet wsh = sheet.getCTWorksheet();

Modified: poi/trunk/src/testcases/org/apache/poi/POITestCase.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/POITestCase.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/POITestCase.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/POITestCase.java Sat Jan  9 18:24:51 2021
@@ -151,7 +151,7 @@ public final class POITestCase {
      * }
      *
      * {@literal @}Test
-     * public void knownFailingUnitTest() {
+     * void knownFailingUnitTest() {
      *     try {
      *         assertEquals(2, add(1,1));
      *         // this test fails because the assumption that this bug had not been fixed is false
@@ -164,7 +164,7 @@ public final class POITestCase {
      *
      * Once passing, this unit test can be rewritten as:
      * {@literal @}Test
-     * public void knownPassingUnitTest() {
+     * void knownPassingUnitTest() {
      *     assertEquals(2, add(1,1));
      * }
      *
@@ -177,7 +177,7 @@ public final class POITestCase {
      * a clear message that it is a good thing to no longer get the expected
      * exception once the test passes.
      * {@literal @}Test(expected=UnsupportedOperationException.class)
-     * public void knownFailingUnitTest() {
+     * void knownFailingUnitTest() {
      *     assertEquals(2, add(1,1));
      * }
      *

Modified: poi/trunk/src/testcases/org/apache/poi/TestPOIDocumentMain.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/TestPOIDocumentMain.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/TestPOIDocumentMain.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/TestPOIDocumentMain.java Sat Jan  9 18:24:51 2021
@@ -50,13 +50,13 @@ public final class TestPOIDocumentMain {
      * Set things up, two spreadsheets for our testing
      */
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         doc = HSSFTestDataSamples.openSampleWorkbook("DateFormats.xls");
         doc2 = HSSFTestDataSamples.openSampleWorkbook("StringFormulas.xls");
     }
 
     @Test
-    public void readProperties() {
+    void readProperties() {
         readPropertiesHelper(doc);
     }
 
@@ -71,7 +71,7 @@ public final class TestPOIDocumentMain {
     }
 
     @Test
-    public void readProperties2() {
+    void readProperties2() {
         // Check again on the word one
         assertNotNull(doc2.getDocumentSummaryInformation());
         assertNotNull(doc2.getSummaryInformation());
@@ -82,7 +82,7 @@ public final class TestPOIDocumentMain {
     }
 
     @Test
-    public void writeProperties() throws IOException {
+    void writeProperties() throws IOException {
         // Just check we can write them back out into a filesystem
         POIFSFileSystem outFS = new POIFSFileSystem();
         doc.readProperties();
@@ -98,7 +98,7 @@ public final class TestPOIDocumentMain {
     }
 
     @Test
-    public void WriteReadProperties() throws IOException {
+    void WriteReadProperties() throws IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
         // Write them out
@@ -121,7 +121,7 @@ public final class TestPOIDocumentMain {
     }
 
     @Test
-    public void createNewProperties() throws IOException {
+    void createNewProperties() throws IOException {
         POIDocument doc = new HSSFWorkbook();
 
         // New document won't have them
@@ -149,7 +149,7 @@ public final class TestPOIDocumentMain {
     }
 
     @Test
-    public void createNewPropertiesOnExistingFile() throws IOException {
+    void createNewPropertiesOnExistingFile() throws IOException {
         POIDocument doc = new HSSFWorkbook();
 
         // New document won't have them

Modified: poi/trunk/src/testcases/org/apache/poi/TestPOITestCase.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/TestPOITestCase.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/TestPOITestCase.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/TestPOITestCase.java Sat Jan  9 18:24:51 2021
@@ -33,41 +33,41 @@ import org.junit.jupiter.api.Test;
  */
 public final class TestPOITestCase {
     @Test
-    public void assertStartsWith() {
+    void assertStartsWith() {
         POITestCase.assertStartsWith("Apache POI", "");
         POITestCase.assertStartsWith("Apache POI", "Apache");
         POITestCase.assertStartsWith("Apache POI", "Apache POI");
     }
 
     @Test
-    public void assertEndsWith() {
+    void assertEndsWith() {
         POITestCase.assertEndsWith("Apache POI", "");
         POITestCase.assertEndsWith("Apache POI", "POI");
         POITestCase.assertEndsWith("Apache POI", "Apache POI");
     }
 
     @Test
-    public void assertContains() {
+    void assertContains() {
         POITestCase.assertContains("There is a needle in this haystack", "needle");
     }
 
     @Test
-    public void assertContainsIgnoreCase_Locale() {
+    void assertContainsIgnoreCase_Locale() {
         POITestCase.assertContainsIgnoreCase("There is a Needle in this haystack", "needlE", Locale.ROOT);
     }
 
     @Test
-    public void assertContainsIgnoreCase() {
+    void assertContainsIgnoreCase() {
         POITestCase.assertContainsIgnoreCase("There is a Needle in this haystack", "needlE");
     }
 
     @Test
-    public void assertNotContained() {
+    void assertNotContained() {
         POITestCase.assertNotContained("There is a needle in this haystack", "gold");
     }
 
     @Test
-    public void assertMapContains() {
+    void assertMapContains() {
         Map<String, String> haystack = Collections.singletonMap("needle", "value");
         POITestCase.assertContains(haystack, "needle");
     }
@@ -78,7 +78,7 @@ public final class TestPOITestCase {
      * Only use this method in test cases!!!
      */
     @Test
-    public void getFieldValue() throws IOException {
+    void getFieldValue() throws IOException {
         try (POIFSFileSystem fs = new POIFSFileSystem()) {
             PropertyTable actual = POITestCase.getFieldValue(POIFSFileSystem.class, fs, PropertyTable.class, "_property_table");
             assertNotNull(actual);

Modified: poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherDump.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherDump.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherDump.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherDump.java Sat Jan  9 18:24:51 2021
@@ -68,7 +68,7 @@ public class TestEscherDump {
     private PrintStream stream;
 
     @BeforeEach
-    public void setup() throws UnsupportedEncodingException {
+    void setup() throws UnsupportedEncodingException {
         stream = new PrintStream(baos, true, StandardCharsets.UTF_8.name());
     }
 

Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java Sat Jan  9 18:24:51 2021
@@ -72,7 +72,7 @@ public class TestVariantSupport {
     }
 
     @Test
-    public void newNumberTypes() throws Exception {
+    void newNumberTypes() throws Exception {
         ClipboardData cd = new ClipboardData();
         cd.setValue(new byte[10]);
 

Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/POIFile.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/POIFile.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/POIFile.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/POIFile.java Sat Jan  9 18:24:51 2021
@@ -35,7 +35,7 @@ public class POIFile
      *
      * @param name The POI file's name.
      */
-    public void setName(final String name)
+    void setName(final String name)
     {
         this.name = name;
     }
@@ -55,7 +55,7 @@ public class POIFile
      *
      * @param path The POI file's path.
      */
-    public void setPath(final POIFSDocumentPath path)
+    void setPath(final POIFSDocumentPath path)
     {
         this.path = path;
     }
@@ -75,7 +75,7 @@ public class POIFile
      *
      * @param bytes The POI file's content bytes.
      */
-    public void setBytes(final byte[] bytes)
+    void setBytes(final byte[] bytes)
     {
         this.bytes = bytes;
     }

Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestBasic.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestBasic.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestBasic.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestBasic.java Sat Jan  9 18:24:51 2021
@@ -77,7 +77,7 @@ public final class TestBasic {
      * @exception IOException if any other I/O exception occurs.
      */
     @BeforeEach
-    public void setUp() throws IOException {
+    void setUp() throws IOException {
         final File data = samples.getFile("TestGermanWord90.doc");
         poiFiles = Util.readPOIFiles(data);
     }
@@ -177,7 +177,7 @@ public final class TestBasic {
     }
 
     @Test
-    public void bug52117LastPrinted() throws IOException, HPSFException {
+    void bug52117LastPrinted() throws IOException, HPSFException {
         File f = samples.getFile("TestBug52117.doc");
         POIFile poiFile = Util.readPOIFiles(f, new String[]{POI_FILES[0]}).get(0);
         InputStream in = new ByteArrayInputStream(poiFile.getBytes());
@@ -189,7 +189,7 @@ public final class TestBasic {
     }
 
     @Test
-    public void bug61809() throws IOException, HPSFException {
+    void bug61809() throws IOException, HPSFException {
         InputStream is_si = new ByteArrayInputStream(poiFiles.get(0).getBytes());
         final SummaryInformation si = (SummaryInformation)PropertySetFactory.create(is_si);
         final Section s_si = si.getSections().get(0);

Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestClassID.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestClassID.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestClassID.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestClassID.java Sat Jan  9 18:24:51 2021
@@ -78,7 +78,7 @@ public final class TestClassID {
     }
 
     @Test
-    public void checkUUIDConversion() {
+    void checkUUIDConversion() {
         String exp = "EABCECDB-CC1C-4A6F-B4E3-7F888A5ADFC8";
         ClassID clsId = ClassIDPredefined.EXCEL_V14_ODS.getClassID();
         assertEquals(exp, clsId.toUUIDString());

Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java Sat Jan  9 18:24:51 2021
@@ -70,7 +70,7 @@ public final class TestEmptyProperties {
      * @exception IOException if an I/O exception occurs
      */
     @BeforeEach
-    public void setUp() throws IOException {
+    void setUp() throws IOException {
         final File data = samples.getFile(POI_FS);
         poiFiles = Util.readPOIFiles(data);
     }

Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java Sat Jan  9 18:24:51 2021
@@ -172,7 +172,7 @@ public final class TestHPSFBugs {
    }
 
     @Test
-    public void bug62451() throws IOException {
+    void bug62451() throws IOException {
         final long millis = 920355314183864L;
         try (HSSFWorkbook wb = new HSSFWorkbook()) {
             wb.createSheet().createRow(0).createCell(0).setCellValue("foo");

Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java Sat Jan  9 18:24:51 2021
@@ -53,7 +53,7 @@ public final class TestMetaDataIPI {
 	private SummaryInformation si;
 
 	@AfterEach
-	public void tearDown() throws Exception {
+	void tearDown() throws Exception {
 	    poifs.close();
 	}
 
@@ -62,7 +62,7 @@ public final class TestMetaDataIPI {
 	 * SummaryInformation to reasonable values
 	 */
 	@BeforeEach
-    public void setUp() throws Exception {
+    void setUp() throws Exception {
         poifs = new POIFSFileSystem();
         dsi = PropertySetFactory.newDocumentSummaryInformation();
         si = PropertySetFactory.newSummaryInformation();

Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java Sat Jan  9 18:24:51 2021
@@ -70,7 +70,7 @@ public class TestReadAllFiles {
      */
     @ParameterizedTest
     @MethodSource("files")
-    public void read(File file) throws IOException, NoPropertySetStreamException, MarkUnsupportedException {
+    void read(File file) throws IOException, NoPropertySetStreamException, MarkUnsupportedException {
         /* Read the POI filesystem's property set streams: */
         for (POIFile pf : Util.readPropertySets(file)) {
             try (InputStream in = new ByteArrayInputStream(pf.getBytes())) {
@@ -96,7 +96,7 @@ public class TestReadAllFiles {
      */
     @ParameterizedTest
     @MethodSource("files")
-    public void recreate(File file) throws IOException, HPSFException {
+    void recreate(File file) throws IOException, HPSFException {
         /* Read the POI filesystem's property set streams: */
         Map<String,PropertySet> psMap = new HashMap<>();
 
@@ -142,7 +142,7 @@ public class TestReadAllFiles {
      */
     @ParameterizedTest
     @MethodSource("files")
-    public void readDocumentSummaryInformation(File file) throws Exception {
+    void readDocumentSummaryInformation(File file) throws Exception {
         /* Read a test document <em>doc</em> into a POI filesystem. */
         try (POIFSFileSystem poifs = new POIFSFileSystem(file, true)) {
             final DirectoryEntry dir = poifs.getRoot();
@@ -185,7 +185,7 @@ public class TestReadAllFiles {
      */
     @ParameterizedTest
     @MethodSource("files")
-    public void readCustomPropertiesFromFiles(File file) throws Exception {
+    void readCustomPropertiesFromFiles(File file) throws Exception {
         /* Read a test document <em>doc</em> into a POI filesystem. */
         try (POIFSFileSystem poifs = new POIFSFileSystem(file)) {
             /*

Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java Sat Jan  9 18:24:51 2021
@@ -56,7 +56,7 @@ public class TestUnicode {
      * @exception IOException if any other I/O exception occurs
      */
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         POIDataSamples samples = POIDataSamples.getHPSFInstance();
         data = samples.getFile(POI_FS);
     }

Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java Sat Jan  9 18:24:51 2021
@@ -123,7 +123,7 @@ public class TestWrite {
      * @exception IOException if an I/O exception occurs
      */
     @Test
-    public void withoutAFormatID() throws Exception {
+    void withoutAFormatID() throws Exception {
         final File filename = TempFile.createTempFile(POI_FS, ".doc");
 
         /* Create a mutable property set with a section that does not have the
@@ -150,7 +150,7 @@ public class TestWrite {
      * a variant type to be written
      */
     @Test
-    public void writeEmptyPropertySet()
+    void writeEmptyPropertySet()
     throws IOException, UnsupportedVariantTypeException {
         final File dataDir = _samples.getFile("");
         final File filename = new File(dataDir, POI_FS);
@@ -186,7 +186,7 @@ public class TestWrite {
      * a variant type to be written
      */
     @Test
-    public void writeSimplePropertySet()
+    void writeSimplePropertySet()
     throws IOException, UnsupportedVariantTypeException {
         final String AUTHOR = "Rainer Klute";
         final String TITLE = "Test Document";
@@ -239,7 +239,7 @@ public class TestWrite {
      * a variant type to be written
      */
     @Test
-    public void writeTwoSections() throws WritingNotSupportedException, IOException {
+    void writeTwoSections() throws WritingNotSupportedException, IOException {
         final String STREAM_NAME = "PropertySetStream";
         final String SECTION1 = "Section 1";
         final String SECTION2 = "Section 2";
@@ -297,7 +297,7 @@ public class TestWrite {
      * stuff that has been read back equals the stuff that was written.
      */
     @Test
-    public void variantTypes() throws Exception {
+    void variantTypes() throws Exception {
         final int codepage = CODEPAGE_DEFAULT;
         Assumptions.assumeTrue(hasProperDefaultCharset(), IMPROPER_DEFAULT_CHARSET_MESSAGE);
 
@@ -330,7 +330,7 @@ public class TestWrite {
      * was written.
      */
     @Test
-    public void codepages() throws UnsupportedVariantTypeException, IOException
+    void codepages() throws UnsupportedVariantTypeException, IOException
     {
         final int[] validCodepages = {CODEPAGE_DEFAULT, CodePageUtil.CP_UTF8, CodePageUtil.CP_UNICODE, CodePageUtil.CP_WINDOWS_1252};
         for (final int cp : validCodepages) {
@@ -363,7 +363,7 @@ public class TestWrite {
      * Tests whether writing 8-bit characters to a Unicode property succeeds.
      */
     @Test
-    public void unicodeWrite8Bit() throws WritingNotSupportedException, IOException, NoPropertySetStreamException {
+    void unicodeWrite8Bit() throws WritingNotSupportedException, IOException, NoPropertySetStreamException {
         final String TITLE = "This is a sample title";
         final PropertySet mps = new PropertySet();
         final Section ms = mps.getSections().get(0);
@@ -422,7 +422,7 @@ public class TestWrite {
      * <p>Tests writing and reading back a proper dictionary.</p>
      */
     @Test
-    public void dictionary() throws IOException, HPSFException {
+    void dictionary() throws IOException, HPSFException {
         final File copy = TempFile.createTempFile("Test-HPSF", "ole2");
         copy.deleteOnExit();
 
@@ -465,7 +465,7 @@ public class TestWrite {
      *  without needing to stream in + out the whole kitchen sink
      */
     @Test
-    public void inPlacePOIFSWrite() throws Exception {
+    void inPlacePOIFSWrite() throws Exception {
         // We need to work on a File for in-place changes, so create a temp one
         final File copy = TempFile.createTempFile("Test-HPSF", "ole2");
         copy.deleteOnExit();
@@ -673,7 +673,7 @@ public class TestWrite {
      * codepage. (HPSF writes Unicode dictionaries only.)
      */
     @Test
-    public void dictionaryWithInvalidCodepage() throws IOException, HPSFException {
+    void dictionaryWithInvalidCodepage() throws IOException, HPSFException {
         final File copy = TempFile.createTempFile("Test-HPSF", "ole2");
         copy.deleteOnExit();
 

Modified: poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java Sat Jan  9 18:24:51 2021
@@ -145,7 +145,7 @@ public final class TestEventRecordFactor
 
     @Test
     @Disabled("same as testContinuedUnknownRecord but with SequenceInputStream which causes the available() bug 59893")
-    public void bug59893() {
+    void bug59893() {
         Iterator<ByteArrayInputStream> iter = Stream.of(CONTINUE_DATA).map(ByteArrayInputStream::new).iterator();
         SequenceInputStream sis = new SequenceInputStream(IteratorUtils.asEnumeration(iter));
         continueHelper(sis);

Modified: poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java Sat Jan  9 18:24:51 2021
@@ -47,7 +47,7 @@ public final class TestEventWorkbookBuil
     private SheetRecordCollectingListener listener;
 
     @BeforeEach
-    public void setUp() throws IOException {
+    void setUp() throws IOException {
         HSSFRequest req = new HSSFRequest();
         fRecs.clear();
         listener = new SheetRecordCollectingListener(this::addFormulaRecord);

Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingManager2.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingManager2.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingManager2.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingManager2.java Sat Jan  9 18:24:51 2021
@@ -29,7 +29,7 @@ public final class TestDrawingManager2 {
     private EscherDggRecord dgg;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         dgg = new EscherDggRecord();
         dgg.setFileIdClusters( new EscherDggRecord.FileIdCluster[0] );
         drawingManager2 = new DrawingManager2( dgg );

Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestRVA.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestRVA.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestRVA.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestRVA.java Sat Jan  9 18:24:51 2021
@@ -84,7 +84,7 @@ public final class TestRVA {
 
 	@ParameterizedTest
 	@MethodSource("data")
-	public void confirmCell(HSSFCell formulaCell, String formula) {
+	void confirmCell(HSSFCell formulaCell, String formula) {
 		Ptg[] excelPtgs = FormulaExtractor.getPtgs(formulaCell);
 		Ptg[] poiPtgs = HSSFFormulaParser.parse(formula, workbook);
 		int nExcelTokens = excelPtgs.length;

Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java Sat Jan  9 18:24:51 2021
@@ -61,7 +61,7 @@ public final class TestRecordFactoryInpu
 	 * Makes sure that a default password mismatch condition is represented with {@link EncryptedDocumentException}
 	 */
 	@Test
-	public void defaultPasswordWrong() {
+	void defaultPasswordWrong() {
 		// This encodng depends on docId, password and stream position
 		final String SAMPLE_WINDOW1_ENCR1 = "3D 00 12 00"
 			+ "C4, 9B, 02, 50, 86, E0, DF, 34, FB, 57, 0E, 8C, CE, 25, 45, E3, 80, 01";
@@ -80,7 +80,7 @@ public final class TestRecordFactoryInpu
 	}
 
     @Test
-    public void defaultPasswordOK() {
+    void defaultPasswordOK() {
         // This encodng depends on docId, password and stream position
         final String SAMPLE_WINDOW1_ENCR1 = "3D 00 12 00"
             + "C4, 9B, 02, 50, 86, E0, DF, 34, FB, 57, 0E, 8C, CE, 25, 45, E3, 80, 01";
@@ -100,7 +100,7 @@ public final class TestRecordFactoryInpu
 	 * Makes sure that an incorrect user supplied password condition is represented with {@link EncryptedDocumentException}
 	 */
 	@Test
-	public void suppliedPasswordWrong() {
+	void suppliedPasswordWrong() {
 		// This encoding depends on docId, password and stream position
 		final String SAMPLE_WINDOW1_ENCR2 = "3D 00 12 00"
 			+ "45, B9, 90, FE, B6, C6, EC, 73, EE, 3F, 52, 45, 97, DB, E3, C1, D6, FE";
@@ -124,7 +124,7 @@ public final class TestRecordFactoryInpu
 	}
 
     @Test
-    public void suppliedPasswordOK() {
+    void suppliedPasswordOK() {
         // This encoding depends on docId, password and stream position
         final String SAMPLE_WINDOW1_ENCR2 = "3D 00 12 00"
             + "45, B9, 90, FE, B6, C6, EC, 73, EE, 3F, 52, 45, 97, DB, E3, C1, D6, FE";

Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java Sat Jan  9 18:24:51 2021
@@ -80,7 +80,7 @@ public final class TestUnicodeString {
     }
 
     @Test
-    public void smallStringSize() {
+    void smallStringSize() {
         //Test a basic string
         UnicodeString s = makeUnicodeString("Test");
         confirmSize(7, s);
@@ -127,7 +127,7 @@ public final class TestUnicodeString {
     }
 
     @Test
-    public void perfectStringSize() {
+    void perfectStringSize() {
       //Test a basic string
       UnicodeString s = makeUnicodeString(MAX_DATA_SIZE-2-1);
       confirmSize(MAX_DATA_SIZE, s);
@@ -141,7 +141,7 @@ public final class TestUnicodeString {
     }
 
     @Test
-    public void perfectRichStringSize() {
+    void perfectRichStringSize() {
       //Test a rich text string
       UnicodeString s = makeUnicodeString(MAX_DATA_SIZE-2-1-8-2);
       s.addFormatRun(new FormatRun((short)1,(short)0));
@@ -160,7 +160,7 @@ public final class TestUnicodeString {
     }
 
     @Test
-    public void continuedStringSize() {
+    void continuedStringSize() {
       //Test a basic string
       UnicodeString s = makeUnicodeString(MAX_DATA_SIZE-2-1+20);
       confirmSize(MAX_DATA_SIZE+4+1+20, s);
@@ -168,7 +168,7 @@ public final class TestUnicodeString {
 
     /** Tests that a string size calculation that fits neatly in two records, the second being a continue*/
     @Test
-    public void perfectContinuedStringSize() {
+    void perfectContinuedStringSize() {
       //Test a basic string
       int strSize = MAX_DATA_SIZE*2;
       //String overhead
@@ -182,7 +182,7 @@ public final class TestUnicodeString {
     }
 
     @Test
-    public void formatRun() {
+    void formatRun() {
        FormatRun fr = new FormatRun((short)4, (short)0x15c);
        assertEquals(4, fr.getCharacterPos());
        assertEquals(0x15c, fr.getFontIndex());
@@ -208,7 +208,7 @@ public final class TestUnicodeString {
     }
 
     @Test
-    public void extRstFromEmpty() {
+    void extRstFromEmpty() {
        ExtRst ext = new ExtRst();
 
        assertEquals(0, ext.getNumberOfRuns());
@@ -272,7 +272,7 @@ public final class TestUnicodeString {
     }
 
     @Test
-    public void extRstFromData() {
+    void extRstFromData() {
        byte[] data = new byte[] {
                1, 0, 0x0C, 0,
                0, 0, 0x37, 0,
@@ -296,7 +296,7 @@ public final class TestUnicodeString {
     }
 
     @Test
-    public void corruptExtRstDetection() {
+    void corruptExtRstDetection() {
        byte[] data = new byte[] {
              0x79, 0x79, 0x11, 0x11,
              0x22, 0x22, 0x33, 0x33,
@@ -323,7 +323,7 @@ public final class TestUnicodeString {
     }
 
     @Test
-    public void extRstEqualsAndHashCode() {
+    void extRstEqualsAndHashCode() {
         byte[] buf = new byte[200];
         LittleEndianByteArrayOutputStream bos = new LittleEndianByteArrayOutputStream(buf, 0);
         String str = "\u1d02\u1d12\u1d22";
@@ -350,7 +350,7 @@ public final class TestUnicodeString {
     }
 
     @Test
-    public void unicodeStringsNullPointer() throws IOException {
+    void unicodeStringsNullPointer() throws IOException {
         try (HSSFWorkbook wb = new HSSFWorkbook()) {
 
             Sheet sheet = wb.createSheet("styles");
@@ -368,7 +368,7 @@ public final class TestUnicodeString {
     }
 
     @Test
-    public void copyExtRst() {
+    void copyExtRst() {
         ExtRst ext = new ExtRst();
 
         assertEquals(0, ext.getNumberOfRuns());
@@ -389,7 +389,7 @@ public final class TestUnicodeString {
     }
 
     @Test
-    public void copyExtRstFromData() {
+    void copyExtRstFromData() {
         byte[] data = new byte[]{
                 1, 0, 0x0C, 0,
                 0, 0, 0x37, 0,

Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java?rev=1885308&r1=1885307&r2=1885308&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java Sat Jan  9 18:24:51 2021
@@ -191,7 +191,7 @@ public class SanityChecker {
         checkRecordOrder(records, sheetRecords);
     }
 
-    public void checkHSSFWorkbook(HSSFWorkbook wb) {
+    void checkHSSFWorkbook(HSSFWorkbook wb) {
         checkWorkbookRecords(wb.getWorkbook());
         for (int i = 0; i < wb.getNumberOfSheets(); i++)
             checkSheetRecords(wb.getSheetAt(i).getSheet());



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org