Modified: poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSStream.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSStream.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSStream.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSStream.java Sat Jan 9 18:24:51 2021 @@ -1183,7 +1183,7 @@ public final class TestPOIFSStream { } @Test - public void basicOpen() throws IOException { + void basicOpen() throws IOException { POIFSFileSystem fsA, fsB; // With a simple 512 block file @@ -1206,7 +1206,7 @@ public final class TestPOIFSStream { } @Test - public void propertiesAndFatOnRead() throws IOException { + void propertiesAndFatOnRead() throws IOException { POIFSFileSystem fsA, fsB; // With a simple 512 block file @@ -1341,7 +1341,7 @@ public final class TestPOIFSStream { * out what the next one is */ @Test - public void nextBlock() throws IOException { + void nextBlock() throws IOException { POIFSFileSystem fsA = new POIFSFileSystem(_inst.getFile("BlockSize512.zvi")); POIFSFileSystem fsB = new POIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi")); for (POIFSFileSystem fs : new POIFSFileSystem[]{fsA, fsB}) { @@ -1403,7 +1403,7 @@ public final class TestPOIFSStream { * Check we get the right data back for each block */ @Test - public void getBlock() throws IOException { + void getBlock() throws IOException { POIFSFileSystem fsA = new POIFSFileSystem(_inst.getFile("BlockSize512.zvi")); POIFSFileSystem fsB = new POIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi")); for (POIFSFileSystem fs : new POIFSFileSystem[]{fsA, fsB}) { @@ -1477,7 +1477,7 @@ public final class TestPOIFSStream { * to be had from the FAT */ @Test - public void getFreeBlockWithSpare() throws IOException { + void getFreeBlockWithSpare() throws IOException { POIFSFileSystem fs = new POIFSFileSystem(_inst.getFile("BlockSize512.zvi")); // Our first BAT block has spares @@ -1508,7 +1508,7 @@ public final class TestPOIFSStream { * file needs to be extended and another BAT/XBAT added */ @Test - public void getFreeBlockWithNoneSpare() throws IOException { + void getFreeBlockWithNoneSpare() throws IOException { POIFSFileSystem fs1 = new POIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi")); int free; @@ -1637,7 +1637,7 @@ public final class TestPOIFSStream { * entries, and the details on the files in them */ @Test - public void listEntries() throws IOException { + void listEntries() throws IOException { for (POIFSFileSystem fs : get512and4kFileAndInput()) { DirectoryEntry root = fs.getRoot(); assertEquals(5, root.getEntryCount()); @@ -1676,7 +1676,7 @@ public final class TestPOIFSStream { * a document in the filesystem */ @Test - public void getDocumentEntry() throws Exception { + void getDocumentEntry() throws Exception { for (POIFSFileSystem fs : get512and4kFileAndInput()) { DirectoryEntry root = fs.getRoot(); Entry si = root.getEntry("\u0005SummaryInformation"); @@ -1722,7 +1722,7 @@ public final class TestPOIFSStream { * Then, alter+add some streams, write and read */ @Test - public void readWriteRead() throws Exception { + void readWriteRead() throws Exception { SummaryInformation sinf; DocumentSummaryInformation dinf; DirectoryEntry root, testDir; @@ -1996,7 +1996,7 @@ public final class TestPOIFSStream { * Then, add some streams, write and read */ @Test - public void createWriteRead() throws IOException { + void createWriteRead() throws IOException { POIFSFileSystem fs1 = new POIFSFileSystem(); DocumentEntry miniDoc; DocumentEntry normDoc; @@ -2239,7 +2239,7 @@ public final class TestPOIFSStream { } @Test - public void addBeforeWrite() throws IOException { + void addBeforeWrite() throws IOException { POIFSFileSystem fs1 = new POIFSFileSystem(); DocumentEntry miniDoc; DocumentEntry normDoc; @@ -2392,7 +2392,7 @@ public final class TestPOIFSStream { } @Test - public void readZeroLengthEntries() throws IOException { + void readZeroLengthEntries() throws IOException { POIFSFileSystem fs = new POIFSFileSystem(_inst.getFile("only-zero-byte-streams.ole2")); DirectoryNode testDir = fs.getRoot(); assertEquals(3, testDir.getEntryCount()); @@ -2423,7 +2423,7 @@ public final class TestPOIFSStream { } @Test - public void writeZeroLengthEntries() throws IOException { + void writeZeroLengthEntries() throws IOException { POIFSFileSystem fs1 = new POIFSFileSystem(); DirectoryNode testDir = fs1.getRoot(); DocumentEntry miniDoc; @@ -2526,7 +2526,7 @@ public final class TestPOIFSStream { * write it out, read it with POIFS, and see the original data */ @Test - public void POIFSReadCopyWritePOIFSRead() throws IOException { + void POIFSReadCopyWritePOIFSRead() throws IOException { File testFile = POIDataSamples.getSpreadSheetInstance().getFile("Simple.xls"); POIFSFileSystem src = new POIFSFileSystem(testFile); byte[] wbDataExp = IOUtils.toByteArray(src.createDocumentInputStream("Workbook")); @@ -2551,7 +2551,7 @@ public final class TestPOIFSStream { * contents */ @Test - public void RecursiveDelete() throws IOException { + void RecursiveDelete() throws IOException { File testFile = POIDataSamples.getSpreadSheetInstance().getFile("SimpleMacro.xls"); POIFSFileSystem src = new POIFSFileSystem(testFile); @@ -2619,7 +2619,7 @@ public final class TestPOIFSStream { */ @Test @Disabled("Work in progress test for #60670") - public void creationAndExtensionPast2GB() throws Exception { + void creationAndExtensionPast2GB() throws Exception { File big = TempFile.createTempFile("poi-test-", ".ole2"); assumeTrue(big.getFreeSpace() > 2.5 * 1024 * 1024 * 1024, "2.5gb of free space is required on your tmp/temp partition/disk to run large file tests"); @@ -2739,7 +2739,7 @@ public final class TestPOIFSStream { @Disabled("Takes a long time to run") @Test - public void performance() throws Exception { + void performance() throws Exception { int iterations = 200;//1_000; System.out.println("NPOI:");
Modified: poi/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java Sat Jan 9 18:24:51 2021 @@ -76,95 +76,95 @@ public class TestVBAMacroReader { //////////////////////////////// From Stream ///////////////////////////// @Test - public void HSSFFromStream() throws Exception { + void HSSFFromStream() throws Exception { fromStream(POIDataSamples.getSpreadSheetInstance(), "SimpleMacro.xls"); } @Test - public void XSSFFromStream() throws Exception { + void XSSFFromStream() throws Exception { fromStream(POIDataSamples.getSpreadSheetInstance(), "SimpleMacro.xlsm"); } @Disabled("bug 59302: Found 0 macros; See org.apache.poi.hslf.usermodel.TestBugs.getMacrosFromHSLF()" + "for an example of how to get macros out of ppt. TODO: make integration across file formats more elegant") @Test - public void HSLFFromStream() throws Exception { + void HSLFFromStream() throws Exception { fromStream(POIDataSamples.getSlideShowInstance(), "SimpleMacro.ppt"); } @Test - public void XSLFFromStream() throws Exception { + void XSLFFromStream() throws Exception { fromStream(POIDataSamples.getSlideShowInstance(), "SimpleMacro.pptm"); } @Test - public void HWPFFromStream() throws Exception { + void HWPFFromStream() throws Exception { fromStream(POIDataSamples.getDocumentInstance(), "SimpleMacro.doc"); } @Test - public void XWPFFromStream() throws Exception { + void XWPFFromStream() throws Exception { fromStream(POIDataSamples.getDocumentInstance(), "SimpleMacro.docm"); } @Disabled("Found 0 macros") @Test - public void HDGFFromStream() throws Exception { + void HDGFFromStream() throws Exception { fromStream(POIDataSamples.getDiagramInstance(), "SimpleMacro.vsd"); } @Test - public void XDGFFromStream() throws Exception { + void XDGFFromStream() throws Exception { fromStream(POIDataSamples.getDiagramInstance(), "SimpleMacro.vsdm"); } //////////////////////////////// From File ///////////////////////////// @Test - public void HSSFFromFile() throws Exception { + void HSSFFromFile() throws Exception { fromFile(POIDataSamples.getSpreadSheetInstance(), "SimpleMacro.xls"); } @Test - public void XSSFFromFile() throws Exception { + void XSSFFromFile() throws Exception { fromFile(POIDataSamples.getSpreadSheetInstance(), "SimpleMacro.xlsm"); } @Disabled("bug 59302: Found 0 macros; See org.apache.poi.hslf.usermodel.TestBugs.getMacrosFromHSLF()" + "for an example of how to get macros out of ppt. TODO: make integration across file formats more elegant") @Test - public void HSLFFromFile() throws Exception { + void HSLFFromFile() throws Exception { fromFile(POIDataSamples.getSlideShowInstance(), "SimpleMacro.ppt"); } @Test - public void XSLFFromFile() throws Exception { + void XSLFFromFile() throws Exception { fromFile(POIDataSamples.getSlideShowInstance(), "SimpleMacro.pptm"); } @Test - public void HWPFFromFile() throws Exception { + void HWPFFromFile() throws Exception { fromFile(POIDataSamples.getDocumentInstance(), "SimpleMacro.doc"); } @Test - public void XWPFFromFile() throws Exception { + void XWPFFromFile() throws Exception { fromFile(POIDataSamples.getDocumentInstance(), "SimpleMacro.docm"); } @Disabled("Found 0 macros") @Test - public void HDGFFromFile() throws Exception { + void HDGFFromFile() throws Exception { fromFile(POIDataSamples.getDiagramInstance(), "SimpleMacro.vsd"); } @Test - public void XDGFFromFile() throws Exception { + void XDGFFromFile() throws Exception { fromFile(POIDataSamples.getDiagramInstance(), "SimpleMacro.vsdm"); } //////////////////////////////// From POIFS ///////////////////////////// @Test - public void HSSFFromPOIFS() throws Exception { + void HSSFFromPOIFS() throws Exception { fromPOIFS(POIDataSamples.getSpreadSheetInstance(), "SimpleMacro.xls"); } @Disabled("bug 59302: Found 0 macros") @Test - public void HSLFFromPOIFS() throws Exception { + void HSLFFromPOIFS() throws Exception { fromPOIFS(POIDataSamples.getSlideShowInstance(), "SimpleMacro.ppt"); } @Test - public void HWPFFromPOIFS() throws Exception { + void HWPFFromPOIFS() throws Exception { fromPOIFS(POIDataSamples.getDocumentInstance(), "SimpleMacro.doc"); } @Disabled("Found 0 macros") @Test - public void HDGFFromPOIFS() throws Exception { + void HDGFFromPOIFS() throws Exception { fromPOIFS(POIDataSamples.getDiagramInstance(), "SimpleMacro.vsd"); } @@ -230,7 +230,7 @@ public class TestVBAMacroReader { } @Test - public void bug59830() throws IOException { + void bug59830() throws IOException { //test file is "609751.xls" in govdocs1 File f = POIDataSamples.getSpreadSheetInstance().getFile("59830.xls"); VBAMacroReader r = new VBAMacroReader(f); @@ -242,7 +242,7 @@ public class TestVBAMacroReader { } @Test - public void bug59858() throws IOException { + void bug59858() throws IOException { File f = POIDataSamples.getSpreadSheetInstance().getFile("59858.xls"); VBAMacroReader r = new VBAMacroReader(f); Map<String, String> macros = r.readMacros(); @@ -253,7 +253,7 @@ public class TestVBAMacroReader { } @Test - public void bug60158() throws IOException { + void bug60158() throws IOException { File f = POIDataSamples.getDocumentInstance().getFile("60158.docm"); VBAMacroReader r = new VBAMacroReader(f); Map<String, String> macros = r.readMacros(); @@ -264,7 +264,7 @@ public class TestVBAMacroReader { } @Test - public void bug60273() throws IOException { + void bug60273() throws IOException { //test file derives from govdocs1 147240.xls File f = POIDataSamples.getSpreadSheetInstance().getFile("60273.xls"); VBAMacroReader r = new VBAMacroReader(f); @@ -276,7 +276,7 @@ public class TestVBAMacroReader { } @Test - public void bug60279() throws IOException { + void bug60279() throws IOException { File f = POIDataSamples.getDocumentInstance().getFile("60279.doc"); VBAMacroReader r = new VBAMacroReader(f); Map<String, String> macros = r.readMacros(); @@ -288,7 +288,7 @@ public class TestVBAMacroReader { } @Test - public void bug62624() throws IOException { + void bug62624() throws IOException { //macro comes from Common Crawl: HRLOXHGMGLFIJQQU27RIWXOARRHAAAAS File f = POIDataSamples.getSpreadSheetInstance().getFile("62624.bin"); VBAMacroReader r = new VBAMacroReader(f); @@ -302,7 +302,7 @@ public class TestVBAMacroReader { } @Test - public void bug62625() throws IOException { + void bug62625() throws IOException { //macro comes from Common Crawl: 4BZ22N5QG5R2SUU2MNN47PO7VBQLNYIQ //A REFERENCE_NAME can sometimes only have an ascii string without //a reserved byte followed by the unicode string. Modified: poi/trunk/src/testcases/org/apache/poi/poifs/property/TestPropertyTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/property/TestPropertyTable.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/property/TestPropertyTable.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/property/TestPropertyTable.java Sat Jan 9 18:24:51 2021 @@ -44,35 +44,20 @@ import org.junit.jupiter.api.Test; */ public final class TestPropertyTable { - private static class MyPOIFSStream extends POIFSStream { + private static void confirmBlockEncoding(String expectedDataStr, PropertyTable table) throws IOException { final ByteArrayOutputStream bos = new ByteArrayOutputStream(); + byte[] expectedData = RawDataUtil.decompress(expectedDataStr); - MyPOIFSStream() { - super(null); - } - - public void write(byte[] b, int off, int len) { - bos.write(b, off, len); - } - - @Override - public OutputStream getOutputStream() { - return bos; - } - } - - private static void confirmBlockEncoding(String expectedDataStr, PropertyTable table) throws IOException { + POIFSStream stream = new POIFSStream(null) { + @Override + public OutputStream getOutputStream() { + return bos; + } + }; - byte[] expectedData = RawDataUtil.decompress(expectedDataStr); - MyPOIFSStream stream = new MyPOIFSStream(); - try { - table.write(stream); - } catch (IOException e) { - throw new RuntimeException(e); - } - byte[] output = stream.bos.toByteArray(); + table.write(stream); - assertArrayEquals(expectedData, output); + assertArrayEquals(expectedData, bos.toByteArray()); } /** @@ -93,7 +78,7 @@ public final class TestPropertyTable { void testWriterPropertyTable() throws IOException { // create the PropertyTable - HeaderBlock headerBlock = new HeaderBlock(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS); + HeaderBlock headerBlock = new HeaderBlock(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS); PropertyTable table = new PropertyTable(headerBlock); // create three DocumentProperty instances and add them to the Modified: poi/trunk/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShow.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShow.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShow.java (original) +++ poi/trunk/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShow.java Sat Jan 9 18:24:51 2021 @@ -47,7 +47,7 @@ public abstract class BaseTestSlideShow< public abstract SlideShow<S,P> reopen(SlideShow<S,P> show) throws IOException; @Test - public void addPicture_File() throws IOException { + void addPicture_File() throws IOException { SlideShow<S,P> show = createSlideShow(); File f = slTests.getFile("clock.jpg"); @@ -60,7 +60,7 @@ public abstract class BaseTestSlideShow< } @Test - public void addPicture_Stream() throws IOException { + void addPicture_Stream() throws IOException { try (SlideShow<S,P> show = createSlideShow(); InputStream stream = slTests.openResourceAsStream("clock.jpg")) { assertEquals(0, show.getPictureData().size()); @@ -71,7 +71,7 @@ public abstract class BaseTestSlideShow< } @Test - public void addPicture_ByteArray() throws IOException { + void addPicture_ByteArray() throws IOException { SlideShow<S,P> show = createSlideShow(); byte[] data = slTests.readFile("clock.jpg"); @@ -84,7 +84,7 @@ public abstract class BaseTestSlideShow< } @Test - public void findPicture() throws IOException { + void findPicture() throws IOException { SlideShow<S,P> show = createSlideShow(); byte[] data = slTests.readFile("clock.jpg"); @@ -98,7 +98,7 @@ public abstract class BaseTestSlideShow< } @Test - public void addTabStops() throws IOException { + void addTabStops() throws IOException { try (final SlideShow<S,P> show1 = createSlideShow()) { // first set the TabStops in the Master sheet final MasterSheet<S,P> master1 = show1.getSlideMasters().get(0); @@ -158,7 +158,7 @@ public abstract class BaseTestSlideShow< } @Test - public void shapeAndSlideName() throws IOException { + void shapeAndSlideName() throws IOException { final String file = "SampleShow.ppt"+(getClass().getSimpleName().contains("XML")?"x":""); //noinspection unchecked try (final InputStream is = slTests.openResourceAsStream(file); @@ -178,7 +178,7 @@ public abstract class BaseTestSlideShow< } @Test - public void addFont() throws IOException { + void addFont() throws IOException { try (SlideShow<S,P> ppt = createSlideShow()) { ppt.createSlide(); try (InputStream fontData = slTests.openResourceAsStream("font.fntdata")) { Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java Sat Jan 9 18:24:51 2021 @@ -136,7 +136,7 @@ public abstract class BaseTestExternalFu * @param testFile either atp.xls or atp.xlsx */ @Test - public void baseTestInvokeATP() throws IOException { + void baseTestInvokeATP() throws IOException { Workbook wb = _testDataProvider.openSampleWorkbook(atpFile); FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator(); Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/BaseTestMissingWorkbook.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/BaseTestMissingWorkbook.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/BaseTestMissingWorkbook.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/BaseTestMissingWorkbook.java Sat Jan 9 18:24:51 2021 @@ -55,7 +55,7 @@ public abstract class BaseTestMissingWor } @BeforeEach - public void setUp() throws Exception { + protected void setUp() throws Exception { mainWorkbook = HSSFTestDataSamples.openSampleWorkbook(MAIN_WORKBOOK_FILENAME); sourceWorkbook = HSSFTestDataSamples.openSampleWorkbook(SOURCE_WORKBOOK_FILENAME); @@ -64,7 +64,7 @@ public abstract class BaseTestMissingWor } @AfterEach - public void tearDown() throws Exception { + void tearDown() throws Exception { if(mainWorkbook != null) { mainWorkbook.close(); } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java Sat Jan 9 18:24:51 2021 @@ -23,42 +23,42 @@ import org.junit.jupiter.api.Test; public class SheetRangeAndWorkbookIndexFormatterTest { @Test - public void noDelimiting_ifASingleSheetNameDoesntNeedDelimiting() { + void noDelimiting_ifASingleSheetNameDoesntNeedDelimiting() { StringBuilder sb = new StringBuilder(); String result = SheetRangeAndWorkbookIndexFormatter.format(sb, 0, "noDelimiting", null); assertEquals("[0]noDelimiting", result); } @Test - public void everythingIsScreened_ifASingleSheetNameNeedsDelimiting() { + void everythingIsScreened_ifASingleSheetNameNeedsDelimiting() { StringBuilder sb = new StringBuilder(); String result = SheetRangeAndWorkbookIndexFormatter.format(sb, 0, "1delimiting", null); assertEquals("'[0]1delimiting'", result); } @Test - public void noDelimiting_ifBothSheetNamesDontNeedDelimiting() { + void noDelimiting_ifBothSheetNamesDontNeedDelimiting() { StringBuilder sb = new StringBuilder(); String result = SheetRangeAndWorkbookIndexFormatter.format(sb, 0, "noDelimiting1", "noDelimiting2"); assertEquals("[0]noDelimiting1:noDelimiting2", result); } @Test - public void everythingIsScreened_ifFirstSheetNamesNeedsDelimiting() { + void everythingIsScreened_ifFirstSheetNamesNeedsDelimiting() { StringBuilder sb = new StringBuilder(); String result = SheetRangeAndWorkbookIndexFormatter.format(sb, 0, "1delimiting", "noDelimiting"); assertEquals("'[0]1delimiting:noDelimiting'", result); } @Test - public void everythingIsScreened_ifLastSheetNamesNeedsDelimiting() { + void everythingIsScreened_ifLastSheetNamesNeedsDelimiting() { StringBuilder sb = new StringBuilder(); String result = SheetRangeAndWorkbookIndexFormatter.format(sb, 0, "noDelimiting", "1delimiting"); assertEquals("'[0]noDelimiting:1delimiting'", result); } @Test - public void everythingIsScreened_ifBothSheetNamesNeedDelimiting() { + void everythingIsScreened_ifBothSheetNamesNeedDelimiting() { StringBuilder sb = new StringBuilder(); String result = SheetRangeAndWorkbookIndexFormatter.format(sb, 0, "1delimiting", "2delimiting"); assertEquals("'[0]1delimiting:2delimiting'", result); Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/TestFunctionRegistry.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/TestFunctionRegistry.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/TestFunctionRegistry.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/TestFunctionRegistry.java Sat Jan 9 18:24:51 2021 @@ -51,7 +51,7 @@ public class TestFunctionRegistry { HSSFFormulaEvaluator fe; @BeforeEach - public void setup() { + void setup() { wb = new HSSFWorkbook(); sheet = wb.createSheet("Sheet1"); row = sheet.createRow(0); @@ -59,7 +59,7 @@ public class TestFunctionRegistry { } @AfterEach - public void teardown() throws IOException { + void teardown() throws IOException { wb.close(); wb = null; sheet = null; Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java Sat Jan 9 18:24:51 2021 @@ -41,7 +41,7 @@ public class TestRandBetween { private Cell formulaCell; @BeforeEach - public void setUp() throws Exception { + void setUp() { Workbook wb = HSSFTestDataSamples.openSampleWorkbook("TestRandBetween.xls"); evaluator = wb.getCreationHelper().createFormulaEvaluator(); Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java Sat Jan 9 18:24:51 2021 @@ -151,7 +151,7 @@ public final class TestFormulasFromSprea @ParameterizedTest @MethodSource("data") - public void processFunctionRow(String targetFunctionName, int formulasRowIdx, int expectedValuesRowIdx) { + void processFunctionRow(String targetFunctionName, int formulasRowIdx, int expectedValuesRowIdx) { Row formulasRow = sheet.getRow(formulasRowIdx); Row expectedValuesRow = sheet.getRow(expectedValuesRowIdx); Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java Sat Jan 9 18:24:51 2021 @@ -133,7 +133,7 @@ public abstract class BaseTestFunctionsF @ParameterizedTest @MethodSource("data") - public void processFunctionRow( + void processFunctionRow( String testName, String filename, HSSFSheet sheet, int formulasRowIdx, HSSFFormulaEvaluator evaluator, int precisionColumnIndex ) throws Exception { HSSFRow r = sheet.getRow(formulasRowIdx); Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java Sat Jan 9 18:24:51 2021 @@ -37,7 +37,7 @@ public final class TestCalendarFieldFunc private HSSFFormulaEvaluator evaluator; @BeforeEach - public void setUp() { + void setUp() { HSSFWorkbook wb = new HSSFWorkbook(); HSSFSheet sheet = wb.createSheet("new sheet"); cell11 = sheet.createRow(0).createCell(0); Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java Sat Jan 9 18:24:51 2021 @@ -38,7 +38,7 @@ public final class TestDate { private HSSFFormulaEvaluator evaluator; @BeforeEach - public void setUp() { + void setUp() { HSSFWorkbook wb = new HSSFWorkbook(); HSSFSheet sheet = wb.createSheet("new sheet"); cell11 = sheet.createRow(0).createCell(0); Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEOMonth.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEOMonth.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEOMonth.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEOMonth.java Sat Jan 9 18:24:51 2021 @@ -94,7 +94,7 @@ public class TestEOMonth { } @Test - public void checkOffset() { + void checkOffset() { for (int offset=-12; offset<=12; offset++) { Calendar cal = LocaleUtil.getLocaleCalendar(); Date startDate = cal.getTime(); Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java Sat Jan 9 18:24:51 2021 @@ -43,7 +43,7 @@ public final class TestFixed { private HSSFFormulaEvaluator evaluator; @BeforeEach - public void setUp() throws IOException { + void setUp() throws IOException { try (HSSFWorkbook wb = new HSSFWorkbook()) { HSSFSheet sheet = wb.createSheet("new sheet"); cell11 = sheet.createRow(0).createCell(0); Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestGeomean.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestGeomean.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestGeomean.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestGeomean.java Sat Jan 9 18:24:51 2021 @@ -41,7 +41,7 @@ import org.junit.jupiter.api.Test; */ public class TestGeomean { @Test - public void acceptanceTest() { + void acceptanceTest() { Function geomean = getInstance(); final ValueEval result = geomean.evaluate(new ValueEval[]{new NumberEval(2), new NumberEval(3)}, 0, 0); @@ -49,35 +49,35 @@ public class TestGeomean { } @Test - public void booleansByValueAreCoerced() { + void booleansByValueAreCoerced() { final ValueEval[] args = {BoolEval.TRUE}; final ValueEval result = getInstance().evaluate(args, 0, 0); verifyNumericResult(1.0, result); } @Test - public void stringsByValueAreCoerced() { + void stringsByValueAreCoerced() { final ValueEval[] args = {new StringEval("2")}; final ValueEval result = getInstance().evaluate(args, 0, 0); verifyNumericResult(2.0, result); } @Test - public void nonCoerceableStringsByValueCauseValueInvalid() { + void nonCoerceableStringsByValueCauseValueInvalid() { final ValueEval[] args = {new StringEval("foo")}; final ValueEval result = getInstance().evaluate(args, 0, 0); assertEquals(ErrorEval.VALUE_INVALID, result); } @Test - public void booleansByReferenceAreSkipped() { + void booleansByReferenceAreSkipped() { final ValueEval[] args = new ValueEval[]{new NumberEval(2.0), EvalFactory.createRefEval("A1", BoolEval.TRUE)}; final ValueEval result = getInstance().evaluate(args, 0, 0); verifyNumericResult(2.0, result); } @Test - public void booleansStringsAndBlanksByReferenceAreSkipped() { + void booleansStringsAndBlanksByReferenceAreSkipped() { ValueEval ref = EvalFactory.createAreaEval("A1:A3", new ValueEval[]{new StringEval("foo"), BoolEval.FALSE, BlankEval.instance}); final ValueEval[] args = {ref, new NumberEval(2.0)}; final ValueEval result = getInstance().evaluate(args, 0, 0); @@ -85,14 +85,14 @@ public class TestGeomean { } @Test - public void stringsByValueAreCounted() { + void stringsByValueAreCounted() { final ValueEval[] args = {new StringEval("2.0")}; final ValueEval result = getInstance().evaluate(args, 0, 0); verifyNumericResult(2.0, result); } @Test - public void missingArgCountAsZero() { + void missingArgCountAsZero() { // and, naturally, produces a NUM_ERROR final ValueEval[] args = {new NumberEval(1.0), MissingArgEval.instance}; final ValueEval result = getInstance().evaluate(args, 0, 0); @@ -103,21 +103,21 @@ public class TestGeomean { * Implementation-specific: the math lib returns 0 for the input [1.0, 0.0], but a NUM_ERROR should be returned. */ @Test - public void sequence_1_0_shouldReturnError() { + void sequence_1_0_shouldReturnError() { final ValueEval[] args = {new NumberEval(1.0), new NumberEval(0)}; final ValueEval result = getInstance().evaluate(args, 0, 0); assertEquals(ErrorEval.NUM_ERROR, result); } @Test - public void minusOneShouldReturnError() { + void minusOneShouldReturnError() { final ValueEval[] args = {new NumberEval(1.0), new NumberEval(-1.0)}; final ValueEval result = getInstance().evaluate(args, 0, 0); assertEquals(ErrorEval.NUM_ERROR, result); } @Test - public void firstErrorPropagates() { + void firstErrorPropagates() { final ValueEval[] args = {ErrorEval.DIV_ZERO, ErrorEval.NUM_ERROR}; final ValueEval result = getInstance().evaluate(args, 0, 0); assertEquals(ErrorEval.DIV_ZERO, result); Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunction.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunction.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunction.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunction.java Sat Jan 9 18:24:51 2021 @@ -45,7 +45,7 @@ public class TestLogicalFunction { private Cell cell2; @BeforeEach - public void setUp() throws IOException { + void setUp() throws IOException { try (Workbook wb = new HSSFWorkbook()) { buildWorkbook(wb); } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMultiOperandNumericFunction.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMultiOperandNumericFunction.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMultiOperandNumericFunction.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMultiOperandNumericFunction.java Sat Jan 9 18:24:51 2021 @@ -42,7 +42,7 @@ public class TestMultiOperandNumericFunc } @Test - public void missingArgEvalsAreCountedAsZeroIfPolicyIsCoerce() { + void missingArgEvalsAreCountedAsZeroIfPolicyIsCoerce() { MultiOperandNumericFunction instance = new Stub(true, true, MultiOperandNumericFunction.Policy.COERCE); ValueEval result = instance.evaluate(new ValueEval[]{MissingArgEval.instance}, 0, 0); assertTrue(result instanceof NumberEval); @@ -50,7 +50,7 @@ public class TestMultiOperandNumericFunc } @Test - public void missingArgEvalsAreSkippedIfZeroIfPolicyIsSkipped() { + void missingArgEvalsAreSkippedIfZeroIfPolicyIsSkipped() { MultiOperandNumericFunction instance = new Stub(true, true, MultiOperandNumericFunction.Policy.SKIP); ValueEval result = instance.evaluate(new ValueEval[]{new NumberEval(1), MissingArgEval.instance}, 0, 0); assertTrue(result instanceof NumberEval); Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestProduct.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestProduct.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestProduct.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestProduct.java Sat Jan 9 18:24:51 2021 @@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Asse public class TestProduct { @Test - public void missingArgsAreIgnored() { + void missingArgsAreIgnored() { ValueEval result = getInstance().evaluate(new ValueEval[]{new NumberEval(2.0), MissingArgEval.instance}, 0, 0); assertTrue(result instanceof NumberEval); assertEquals(2, ((NumberEval)result).getNumberValue(), 0); @@ -39,21 +39,22 @@ public class TestProduct { * However, PRODUCT(,) is a valid call (which should return 0). So it makes sense to * assert that PRODUCT() is also 0 (at least, nothing explodes). */ - public void missingArgEvalReturns0() { + @Test + void missingArgEvalReturns0() { ValueEval result = getInstance().evaluate(new ValueEval[0], 0, 0); assertTrue(result instanceof NumberEval); assertEquals(0, ((NumberEval)result).getNumberValue(), 0); } @Test - public void twoMissingArgEvalsReturn0() { + void twoMissingArgEvalsReturn0() { ValueEval result = getInstance().evaluate(new ValueEval[]{MissingArgEval.instance, MissingArgEval.instance}, 0, 0); assertTrue(result instanceof NumberEval); assertEquals(0, ((NumberEval)result).getNumberValue(), 0); } @Test - public void acceptanceTest() { + void acceptanceTest() { final ValueEval[] args = { new NumberEval(2.0), MissingArgEval.instance, Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTime.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTime.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTime.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTime.java Sat Jan 9 18:24:51 2021 @@ -46,7 +46,7 @@ public final class TestTime { private HSSFCellStyle style; @BeforeEach - public void setUp() { + void setUp() { wb = new HSSFWorkbook(); HSSFSheet sheet = wb.createSheet("new sheet"); style = wb.createCellStyle(); Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java Sat Jan 9 18:24:51 2021 @@ -35,7 +35,7 @@ public final class TestAreaPtg { AreaPtg absolute; @BeforeEach - public void setUp() { + void setUp() { short firstRow=5; short lastRow=13; short firstCol=7; Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/udf/TestAggregatingUDFFinder.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/udf/TestAggregatingUDFFinder.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/udf/TestAggregatingUDFFinder.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/udf/TestAggregatingUDFFinder.java Sat Jan 9 18:24:51 2021 @@ -26,12 +26,12 @@ public class TestAggregatingUDFFinder ex } @Test - public void findFunction() { + void findFunction() { confirmFindFunction("BESSELJ"); } @Test - public void add() { + void add() { ((AggregatingUDFFinder)_instance).add(AnalysisToolPak.instance); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/udf/TestDefaultUDFFinder.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/udf/TestDefaultUDFFinder.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/udf/TestDefaultUDFFinder.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/udf/TestDefaultUDFFinder.java Sat Jan 9 18:24:51 2021 @@ -29,7 +29,7 @@ public class TestDefaultUDFFinder extend } @Test - public void findFunction() { + void findFunction() { confirmFindFunction("NotImplemented"); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java Sat Jan 9 18:24:51 2021 @@ -143,7 +143,7 @@ public abstract class BaseTestBugzillaIs * Merged regions were being removed from the parent in cloned sheets */ @Test - public void bug22720() throws IOException { + protected void bug22720() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { wb.createSheet("TEST"); Sheet template = wb.getSheetAt(0); @@ -276,7 +276,7 @@ public abstract class BaseTestBugzillaIs } @Test - public void bug18800() throws IOException { + protected void bug18800() throws IOException { try (Workbook wb1 = _testDataProvider.createWorkbook()) { wb1.createSheet("TEST"); Sheet sheet = wb1.cloneSheet(0); @@ -307,7 +307,7 @@ public abstract class BaseTestBugzillaIs } @Test - public void bug43093() throws IOException { + void bug43093() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { addNewSheetWithCellsA1toD4(wb, 1); @@ -329,7 +329,7 @@ public abstract class BaseTestBugzillaIs } @Test - public void bug46729_testMaxFunctionArguments() throws IOException { + protected void bug46729_testMaxFunctionArguments() throws IOException { String[] func = {"COUNT", "AVERAGE", "MAX", "MIN", "OR", "SUBTOTAL", "SKEW"}; SpreadsheetVersion ssVersion = _testDataProvider.getSpreadsheetVersion(); @@ -524,7 +524,7 @@ public abstract class BaseTestBugzillaIs * CreateFreezePane column/row order check */ @Test - public void bug49381() throws IOException { + void bug49381() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { int colSplit = 1; int rowSplit = 2; @@ -578,7 +578,7 @@ public abstract class BaseTestBugzillaIs * open resulting file in excel, and check that there is a link to Google */ @Test - public void bug15353() throws IOException { + void bug15353() throws IOException { String hyperlinkF = "HYPERLINK(\"http://google.com\",\"Google\";)"; try (Workbook wb1 = _testDataProvider.createWorkbook()) { @@ -604,7 +604,7 @@ public abstract class BaseTestBugzillaIs * HLookup and VLookup with optional arguments */ @Test - public void bug51024() throws IOException { + void bug51024() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet s = wb.createSheet(); Row r1 = s.createRow(0); @@ -640,7 +640,7 @@ public abstract class BaseTestBugzillaIs } @Test - public void stackoverflow23114397() throws IOException { + void stackoverflow23114397() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { DataFormat format = wb.getCreationHelper().createDataFormat(); @@ -709,7 +709,7 @@ public abstract class BaseTestBugzillaIs * =ISNUMBER(SEARCH("AM",A1)) evaluation */ @Test - public void stackoverflow26437323() throws IOException { + void stackoverflow26437323() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet s = wb.createSheet(); Row r1 = s.createRow(0); @@ -866,7 +866,7 @@ public abstract class BaseTestBugzillaIs */ @Disabled("Fix this to evaluate for XSSF, Fix this to work at all for HSSF") @Test - public void bug46670() throws IOException { + void bug46670() throws IOException { try (Workbook wb1 = _testDataProvider.createWorkbook()) { Sheet s = wb1.createSheet(); Row r1 = s.createRow(0); @@ -981,7 +981,7 @@ public abstract class BaseTestBugzillaIs * that it now is again */ @Test - public void bug48718() throws IOException { + void bug48718() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { int startingFonts = wb instanceof HSSFWorkbook ? 4 : 1; @@ -1004,7 +1004,7 @@ public abstract class BaseTestBugzillaIs } @Test - public void bug57430() throws IOException { + void bug57430() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { wb.createSheet("Sheet1"); @@ -1015,7 +1015,7 @@ public abstract class BaseTestBugzillaIs } @Test - public void bug56981() throws IOException { + void bug56981() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { CellStyle vertTop = wb.createCellStyle(); vertTop.setVerticalAlignment(VerticalAlignment.TOP); @@ -1098,7 +1098,7 @@ public abstract class BaseTestBugzillaIs * kind of value from a Formula cell */ @Test - public void bug47815() throws IOException { + protected void bug47815() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet s = wb.createSheet(); Row r = s.createRow(0); @@ -1186,7 +1186,7 @@ public abstract class BaseTestBugzillaIs * Mid in it, can give #VALUE in Excel */ @Test - public void bug55747() throws IOException { + void bug55747() throws IOException { try (Workbook wb1 = _testDataProvider.createWorkbook()) { FormulaEvaluator ev = wb1.getCreationHelper().createFormulaEvaluator(); Sheet s = wb1.createSheet(); @@ -1249,7 +1249,7 @@ public abstract class BaseTestBugzillaIs } @Test - public void bug58260() throws IOException { + void bug58260() throws IOException { //Create workbook and worksheet try (Workbook wb = _testDataProvider.createWorkbook()) { //Sheet worksheet = wb.createSheet("sample"); @@ -1443,7 +1443,7 @@ public abstract class BaseTestBugzillaIs @Disabled("bug 59393") @Test - public void bug59393_commentsCanHaveSameAnchor() throws IOException { + void bug59393_commentsCanHaveSameAnchor() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet sheet = wb.createSheet(); @@ -1486,7 +1486,7 @@ public abstract class BaseTestBugzillaIs @Test - public void bug57798() throws Exception { + protected void bug57798() throws Exception { String fileName = "57798." + _testDataProvider.getStandardFileNameExtension(); try (Workbook workbook = _testDataProvider.openSampleWorkbook(fileName)) { @@ -1615,7 +1615,7 @@ public abstract class BaseTestBugzillaIs // bug 60197: setSheetOrder should update sheet-scoped named ranges to maintain references to the sheets before the re-order @Test - public void bug60197_NamedRangesReferToCorrectSheetWhenSheetOrderIsChanged() throws Exception { + protected void bug60197_NamedRangesReferToCorrectSheetWhenSheetOrderIsChanged() throws Exception { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet sheet1 = wb.createSheet("Sheet1"); Sheet sheet2 = wb.createSheet("Sheet2"); Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java Sat Jan 9 18:24:51 2021 @@ -971,7 +971,7 @@ public abstract class BaseTestCell { * Tests that the setAsActiveCell and getActiveCell function pairs work together */ @Test - public void setAsActiveCell() throws IOException { + void setAsActiveCell() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet sheet = wb.createSheet(); Row row = sheet.createRow(0); @@ -987,7 +987,7 @@ public abstract class BaseTestCell { } @Test - public void getCellComment() throws IOException { + void getCellComment() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet sheet = wb.createSheet(); CreationHelper factory = wb.getCreationHelper(); @@ -1120,7 +1120,7 @@ public abstract class BaseTestCell { } @Test - public void getDateCellValue_returnsNull_onABlankCell() throws IOException { + void getDateCellValue_returnsNull_onABlankCell() throws IOException { try (Workbook workbook = _testDataProvider.createWorkbook()) { Cell cell = workbook.createSheet().createRow(0).createCell(0); assertEquals(CellType.BLANK, cell.getCellType()); @@ -1130,7 +1130,7 @@ public abstract class BaseTestCell { } @Test - public void getBooleanCellValue_returnsFalse_onABlankCell() throws IOException { + void getBooleanCellValue_returnsFalse_onABlankCell() throws IOException { try (Workbook workbook = _testDataProvider.createWorkbook()) { Cell cell = workbook.createSheet().createRow(0).createCell(0); assertEquals(CellType.BLANK, cell.getCellType()); @@ -1140,7 +1140,7 @@ public abstract class BaseTestCell { } @Test - public void setStringCellValue_ifThrows_shallNotChangeCell() throws IOException { + void setStringCellValue_ifThrows_shallNotChangeCell() throws IOException { try (Workbook workbook = _testDataProvider.createWorkbook()) { Cell cell = workbook.createSheet().createRow(0).createCell(0); @@ -1163,7 +1163,7 @@ public abstract class BaseTestCell { } @Test - public void setStringCellValueWithRichTextString_ifThrows_shallNotChangeCell() throws IOException { + void setStringCellValueWithRichTextString_ifThrows_shallNotChangeCell() throws IOException { try (Workbook workbook = _testDataProvider.createWorkbook()) { Cell cell = workbook.createSheet().createRow(0).createCell(0); @@ -1187,7 +1187,7 @@ public abstract class BaseTestCell { } @Test - public void setCellType_null_throwsIAE() throws IOException { + void setCellType_null_throwsIAE() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Cell cell = getInstance(wb); assertThrows(IllegalArgumentException.class, () -> cell.setCellType(null)); @@ -1195,7 +1195,7 @@ public abstract class BaseTestCell { } @Test - public void setCellType_NONE_throwsIAE() throws IOException { + void setCellType_NONE_throwsIAE() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Cell cell = getInstance(wb); assertThrows(IllegalArgumentException.class, () -> cell.setCellType(CellType._NONE)); @@ -1204,7 +1204,7 @@ public abstract class BaseTestCell { @Test - public void setBlank_removesArrayFormula_ifCellIsPartOfAnArrayFormulaGroupContainingOnlyThisCell() throws IOException { + protected void setBlank_removesArrayFormula_ifCellIsPartOfAnArrayFormulaGroupContainingOnlyThisCell() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Cell cell = getInstance(wb); @@ -1221,7 +1221,7 @@ public abstract class BaseTestCell { } @Test - public void setBlank_throwsISE_ifCellIsPartOfAnArrayFormulaGroupContainingOtherCells() throws IOException { + protected void setBlank_throwsISE_ifCellIsPartOfAnArrayFormulaGroupContainingOtherCells() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Cell cell = getInstance(wb); cell.getSheet().setArrayFormula("1", CellRangeAddress.valueOf("A1:B1")); @@ -1231,7 +1231,7 @@ public abstract class BaseTestCell { } @Test - public void setCellFormula_throwsISE_ifCellIsPartOfAnArrayFormulaGroupContainingOtherCells() throws IOException { + protected void setCellFormula_throwsISE_ifCellIsPartOfAnArrayFormulaGroupContainingOtherCells() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Cell cell = getInstance(wb); @@ -1244,7 +1244,7 @@ public abstract class BaseTestCell { } @Test - public void removeFormula_preservesValue() throws IOException { + void removeFormula_preservesValue() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Cell cell = getInstance(wb); @@ -1275,7 +1275,7 @@ public abstract class BaseTestCell { } @Test - public void removeFormula_turnsCellToBlank_whenFormulaWasASingleCellArrayFormula() throws IOException { + protected void removeFormula_turnsCellToBlank_whenFormulaWasASingleCellArrayFormula() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Cell cell = getInstance(wb); @@ -1302,7 +1302,7 @@ public abstract class BaseTestCell { } @Test - public void setCellFormula_onABlankCell_setsValueToZero() throws IOException { + void setCellFormula_onABlankCell_setsValueToZero() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Cell cell = getInstance(wb); cell.setCellFormula("\"foo\""); @@ -1314,7 +1314,7 @@ public abstract class BaseTestCell { @Test - public void setCellFormula_onANonBlankCell_preservesTheValue() throws IOException { + void setCellFormula_onANonBlankCell_preservesTheValue() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Cell cell = getInstance(wb); cell.setCellValue(true); @@ -1326,7 +1326,7 @@ public abstract class BaseTestCell { } @Test - public void setCellFormula_onAFormulaCell_changeFormula_preservesTheValue() throws IOException { + void setCellFormula_onAFormulaCell_changeFormula_preservesTheValue() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Cell cell = getInstance(wb); cell.setCellFormula("\"foo\""); @@ -1343,7 +1343,7 @@ public abstract class BaseTestCell { } @Test - public void setCellFormula_onASingleCellArrayFormulaCell_preservesTheValue() throws IOException { + protected void setCellFormula_onASingleCellArrayFormulaCell_preservesTheValue() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Cell cell = getInstance(wb); cell.getSheet().setArrayFormula("\"foo\"", CellRangeAddress.valueOf("A1")); @@ -1364,7 +1364,7 @@ public abstract class BaseTestCell { } @Test - public void setCellType_FORMULA_onANonFormulaCell_throwsIllegalArgumentException() throws IOException { + void setCellType_FORMULA_onANonFormulaCell_throwsIllegalArgumentException() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Cell cell = getInstance(wb); assertThrows(IllegalArgumentException.class, () -> cell.setCellType(CellType.FORMULA)); @@ -1372,7 +1372,7 @@ public abstract class BaseTestCell { } @Test - public void setCellType_FORMULA_onAFormulaCell_doesNothing() throws IOException { + void setCellType_FORMULA_onAFormulaCell_doesNothing() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Cell cell = getInstance(wb); cell.setCellFormula("3"); @@ -1387,7 +1387,7 @@ public abstract class BaseTestCell { } @Test - public void setCellType_FORMULA_onAnArrayFormulaCell_doesNothing() throws IOException { + void setCellType_FORMULA_onAnArrayFormulaCell_doesNothing() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Cell cell = getInstance(wb); cell.getSheet().setArrayFormula("3", CellRangeAddress.valueOf("A1:A2")); Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCellComment.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCellComment.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCellComment.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCellComment.java Sat Jan 9 18:24:51 2021 @@ -251,7 +251,7 @@ public abstract class BaseTestCellCommen * code from the quick guide */ @Test - public void quickGuide() throws IOException { + void quickGuide() throws IOException { Workbook wb1 = _testDataProvider.createWorkbook(); CreationHelper factory = wb1.getCreationHelper(); @@ -286,7 +286,7 @@ public abstract class BaseTestCellCommen } @Test - public void getClientAnchor() throws IOException { + void getClientAnchor() throws IOException { Workbook wb = _testDataProvider.createWorkbook(); Sheet sheet = wb.createSheet(); @@ -361,7 +361,7 @@ public abstract class BaseTestCellCommen } @Test - public void attemptToSave2CommentsWithSameCoordinates() throws IOException { + void attemptToSave2CommentsWithSameCoordinates() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet sh = wb.createSheet(); CreationHelper factory = wb.getCreationHelper(); @@ -386,7 +386,7 @@ public abstract class BaseTestCellCommen } @Test - public void getAddress() { + void getAddress() { Workbook wb = _testDataProvider.createWorkbook(); Sheet sh = wb.createSheet(); CreationHelper factory = wb.getCreationHelper(); @@ -400,7 +400,7 @@ public abstract class BaseTestCellCommen } @Test - public void setAddress() { + void setAddress() { Workbook wb = _testDataProvider.createWorkbook(); Sheet sh = wb.createSheet(); CreationHelper factory = wb.getCreationHelper(); Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java Sat Jan 9 18:24:51 2021 @@ -32,7 +32,7 @@ public abstract class BaseTestColumnShif protected ColumnShifter columnShifter; @BeforeEach - public void init() { + void init() { int rowIndex = 0; sheet1 = wb.createSheet("sheet1"); Row row = sheet1.createRow(rowIndex++); Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java Sat Jan 9 18:24:51 2021 @@ -40,7 +40,7 @@ public abstract class BaseTestDataFormat _testDataProvider = testDataProvider; } - public void assertNotBuiltInFormat(String customFmt) { + void assertNotBuiltInFormat(String customFmt) { //check it is not in built-in formats assertEquals(-1, BuiltinFormats.getBuiltinFormat(customFmt)); } Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataValidation.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataValidation.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataValidation.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataValidation.java Sat Jan 9 18:24:51 2021 @@ -66,7 +66,7 @@ public abstract class BaseTestDataValida _validationType = validationType; _currentRowIndex = fSheet.getPhysicalNumberOfRows(); } - public void addValidation(int operatorType, String firstFormula, String secondFormula, + void addValidation(int operatorType, String firstFormula, String secondFormula, int errorStyle, String ruleDescr, String promptDescr, boolean allowEmpty, boolean inputBox, boolean errorBox) { String[] explicitListValues = null; @@ -168,7 +168,7 @@ public abstract class BaseTestDataValida cell.setCellStyle(style); setCellValue(cell, strStettings); } - public void addListValidation(String[] explicitListValues, String listFormula, String listValsDescr, + void addListValidation(String[] explicitListValues, String listFormula, String listValsDescr, boolean allowEmpty, boolean suppressDropDown) { String promptDescr = (allowEmpty ? "empty ok" : "not empty") + ", " + (suppressDropDown ? "no drop-down" : "drop-down"); @@ -256,7 +256,7 @@ public abstract class BaseTestDataValida _currentSheet = _wb.createSheet(sheetName); return _currentSheet; } - public void createDVTypeRow(String strTypeDescription) { + void createDVTypeRow(String strTypeDescription) { Sheet sheet = _currentSheet; Row row = sheet.createRow(sheet.getPhysicalNumberOfRows()); sheet.addMergedRegion(new CellRangeAddress(sheet.getPhysicalNumberOfRows()-1, sheet.getPhysicalNumberOfRows()-1, 0, 5)); @@ -266,7 +266,7 @@ public abstract class BaseTestDataValida row = sheet.createRow(sheet.getPhysicalNumberOfRows()); } - public void createHeaderRow() { + void createHeaderRow() { Sheet sheet = _currentSheet; Row row = sheet.createRow(sheet.getPhysicalNumberOfRows()); row.setHeight((short) 400); @@ -298,7 +298,7 @@ public abstract class BaseTestDataValida return new ValidationAdder(_currentSheet, _style_1, _style_2, cellStyle, dataValidationType); } - public void createDVDescriptionRow(String strTypeDescription) { + void createDVDescriptionRow(String strTypeDescription) { Sheet sheet = _currentSheet; Row row = sheet.getRow(sheet.getPhysicalNumberOfRows()-1); sheet.addMergedRegion(new CellRangeAddress(sheet.getPhysicalNumberOfRows()-1, sheet.getPhysicalNumberOfRows()-1, 0, 5)); Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java Sat Jan 9 18:24:51 2021 @@ -334,7 +334,7 @@ public abstract class BaseTestFormulaEva } @Test - public void evaluateInCellReturnsSameCell() throws IOException { + void evaluateInCellReturnsSameCell() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { wb.createSheet().createRow(0).createCell(0); FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator(); Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java Sat Jan 9 18:24:51 2021 @@ -693,7 +693,7 @@ public abstract class BaseTestNamedRange // bug 60260: renaming a sheet with a named range referring to a unicode (non-ASCII) sheet name @Test - public void renameSheetWithNamedRangeReferringToUnicodeSheetName() { + void renameSheetWithNamedRangeReferringToUnicodeSheetName() { Workbook wb = _testDataProvider.createWorkbook(); wb.createSheet("Sheet\u30FB1"); Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java Sat Jan 9 18:24:51 2021 @@ -57,7 +57,7 @@ public abstract class BaseTestPicture { protected abstract Picture getPictureShape(Drawing<?> pat, int picIdx); @Test - public void resize() throws IOException { + void resize() throws IOException { String fileName = "resize_compare.xls" + (getClass().getName().contains("xssf") ? "x" : ""); double scaleX = 2; double scaleY = 2; @@ -159,7 +159,7 @@ public abstract class BaseTestPicture { } @Test - public void bug64213() throws IOException { + void bug64213() throws IOException { int[] input = { 200, 50 * 256, -1, 400, 50 * 256, -1, Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java Sat Jan 9 18:24:51 2021 @@ -44,7 +44,7 @@ public abstract class BaseTestRangeCopie } @Test - public void copySheetRangeWithoutFormulas() { + void copySheetRangeWithoutFormulas() { CellRangeAddress rangeToCopy = CellRangeAddress.valueOf("B1:C2"); //2x2 CellRangeAddress destRange = CellRangeAddress.valueOf("C2:D3"); //2x2 rangeCopier.copyRange(rangeToCopy, destRange); @@ -53,7 +53,7 @@ public abstract class BaseTestRangeCopie } @Test - public void tileTheRangeAway() { + void tileTheRangeAway() { CellRangeAddress tileRange = CellRangeAddress.valueOf("C4:D5"); CellRangeAddress destRange = CellRangeAddress.valueOf("F4:K5"); rangeCopier.copyRange(tileRange, destRange); @@ -67,7 +67,7 @@ public abstract class BaseTestRangeCopie } @Test - public void tileTheRangeOver() { + void tileTheRangeOver() { CellRangeAddress tileRange = CellRangeAddress.valueOf("C4:D5"); CellRangeAddress destRange = CellRangeAddress.valueOf("A4:C5"); rangeCopier.copyRange(tileRange, destRange); @@ -77,7 +77,7 @@ public abstract class BaseTestRangeCopie } @Test - public void copyRangeToOtherSheet() { + void copyRangeToOtherSheet() { Sheet destSheet = sheet2; CellRangeAddress tileRange = CellRangeAddress.valueOf("C4:D5"); // on sheet1 CellRangeAddress destRange = CellRangeAddress.valueOf("F4:J6"); // on sheet2 Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java?rev=1885308&r1=1885307&r2=1885308&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java Sat Jan 9 18:24:51 2021 @@ -65,7 +65,7 @@ public abstract class BaseTestSheet { } @Test - public void createRow() throws IOException { + protected void createRow() throws IOException { try (Workbook workbook = _testDataProvider.createWorkbook()) { Sheet sheet = workbook.createSheet(); assertEquals(0, sheet.getPhysicalNumberOfRows()); @@ -106,7 +106,7 @@ public abstract class BaseTestSheet { } @Test - public void createRowBeforeFirstRow() throws IOException { + void createRowBeforeFirstRow() throws IOException { try (Workbook workbook = _testDataProvider.createWorkbook()) { final Sheet sh = workbook.createSheet(); sh.createRow(0); @@ -116,7 +116,7 @@ public abstract class BaseTestSheet { } @Test - public void createRowAfterLastRow() throws IOException { + void createRowAfterLastRow() throws IOException { final SpreadsheetVersion version = _testDataProvider.getSpreadsheetVersion(); try (Workbook workbook = _testDataProvider.createWorkbook()) { final Sheet sh = workbook.createSheet(); @@ -127,7 +127,7 @@ public abstract class BaseTestSheet { } @Test - public void removeRow() throws IOException { + void removeRow() throws IOException { try (Workbook workbook = _testDataProvider.createWorkbook()) { Sheet sheet1 = workbook.createSheet(); assertEquals(0, sheet1.getPhysicalNumberOfRows()); @@ -170,7 +170,7 @@ public abstract class BaseTestSheet { } @Test - public void cloneSheet() throws IOException { + protected void cloneSheet() throws IOException { try (Workbook workbook = _testDataProvider.createWorkbook()) { CreationHelper factory = workbook.getCreationHelper(); Sheet sheet = workbook.createSheet("Test Clone"); @@ -204,7 +204,7 @@ public abstract class BaseTestSheet { * BUG 37416 */ @Test - public void cloneSheetMultipleTimes() throws IOException { + protected void cloneSheetMultipleTimes() throws IOException { try (Workbook workbook = _testDataProvider.createWorkbook()) { CreationHelper factory = workbook.getCreationHelper(); Sheet sheet = workbook.createSheet("Test Clone"); @@ -233,7 +233,7 @@ public abstract class BaseTestSheet { * Setting landscape and portrait stuff on new sheets */ @Test - public void printSetupLandscapeNew() throws IOException { + void printSetupLandscapeNew() throws IOException { try (Workbook wb1 = _testDataProvider.createWorkbook()) { Sheet sheetL = wb1.createSheet("LandscapeS"); Sheet sheetP = wb1.createSheet("LandscapeP"); @@ -272,7 +272,7 @@ public abstract class BaseTestSheet { * as this results in a corrupted workbook */ @Test - public void addOverlappingMergedRegions() throws IOException { + void addOverlappingMergedRegions() throws IOException { try (final Workbook wb = _testDataProvider.createWorkbook()) { final Sheet sheet = wb.createSheet(); @@ -320,7 +320,7 @@ public abstract class BaseTestSheet { * Bug 56345: Reject single-cell merged regions */ @Test - public void addMergedRegionWithSingleCellShouldFail() throws IOException { + void addMergedRegionWithSingleCellShouldFail() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { final Sheet sheet = wb.createSheet(); @@ -339,7 +339,7 @@ public abstract class BaseTestSheet { * */ @Test - public void addMerged() throws IOException { + void addMerged() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet sheet = wb.createSheet(); assertEquals(0, sheet.getNumMergedRegions()); @@ -376,7 +376,7 @@ public abstract class BaseTestSheet { * */ @Test - public void removeMerged() throws IOException { + void removeMerged() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet sheet = wb.createSheet(); CellRangeAddress region = new CellRangeAddress(0, 1, 0, 1); @@ -415,7 +415,7 @@ public abstract class BaseTestSheet { * Remove multiple merged regions */ @Test - public void removeMergedRegions() throws IOException { + void removeMergedRegions() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet sheet = wb.createSheet(); @@ -441,7 +441,7 @@ public abstract class BaseTestSheet { } @Test - public void shiftMerged() throws IOException { + protected void shiftMerged() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { CreationHelper factory = wb.getCreationHelper(); Sheet sheet = wb.createSheet(); @@ -472,7 +472,7 @@ public abstract class BaseTestSheet { * can be skipped (unsafe) and run in O(1). */ @Test - public void addMergedRegionUnsafe() throws IOException { + void addMergedRegionUnsafe() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet sh = wb.createSheet(); CellRangeAddress region1 = CellRangeAddress.valueOf("A1:B2"); @@ -515,7 +515,7 @@ public abstract class BaseTestSheet { * Tests the display of gridlines, formulas, and rowcolheadings. */ @Test - public void displayOptions() throws IOException { + void displayOptions() throws IOException { try (Workbook wb1 = _testDataProvider.createWorkbook()) { Sheet sheet = wb1.createSheet(); @@ -541,7 +541,7 @@ public abstract class BaseTestSheet { } @Test - public void columnWidth() throws IOException { + void columnWidth() throws IOException { try (Workbook wb1 = _testDataProvider.createWorkbook()) { Sheet sheet1 = wb1.createSheet(); @@ -602,7 +602,7 @@ public abstract class BaseTestSheet { @Test - public void defaultRowHeight() throws IOException { + void defaultRowHeight() throws IOException { try (Workbook workbook = _testDataProvider.createWorkbook()) { Sheet sheet = workbook.createSheet(); sheet.setDefaultRowHeightInPoints(15); @@ -632,7 +632,7 @@ public abstract class BaseTestSheet { /** cell with formula becomes null on cloning a sheet*/ @Test - public void bug35084() throws IOException { + protected void bug35084() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet s = wb.createSheet("Sheet1"); Row r = s.createRow(0); @@ -649,7 +649,7 @@ public abstract class BaseTestSheet { /** test that new default column styles get applied */ @Test - public void defaultColumnStyle() throws IOException { + protected void defaultColumnStyle() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { CellStyle style = wb.createCellStyle(); Sheet sheet = wb.createSheet(); @@ -666,7 +666,7 @@ public abstract class BaseTestSheet { } @Test - public void outlineProperties() throws IOException { + void outlineProperties() throws IOException { try (Workbook wb1 = _testDataProvider.createWorkbook()) { Sheet sheet = wb1.createSheet(); @@ -698,7 +698,7 @@ public abstract class BaseTestSheet { * Test basic display and print properties */ @Test - public void sheetProperties() throws IOException { + void sheetProperties() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet sheet = wb.createSheet(); @@ -799,7 +799,7 @@ public abstract class BaseTestSheet { } @Test - public void rowBreaks() throws IOException { + void rowBreaks() throws IOException { try (Workbook workbook = _testDataProvider.createWorkbook()) { Sheet sheet = workbook.createSheet(); //Sheet#getRowBreaks() returns an empty array if no row breaks are defined @@ -829,7 +829,7 @@ public abstract class BaseTestSheet { } @Test - public void columnBreaks() throws IOException { + void columnBreaks() throws IOException { try (Workbook workbook = _testDataProvider.createWorkbook()) { Sheet sheet = workbook.createSheet(); assertNotNull(sheet.getColumnBreaks()); @@ -858,7 +858,7 @@ public abstract class BaseTestSheet { } @Test - public void getFirstLastRowNum() throws IOException { + void getFirstLastRowNum() throws IOException { try (Workbook workbook = _testDataProvider.createWorkbook()) { Sheet sheet = workbook.createSheet("Sheet 1"); sheet.createRow(9); @@ -870,7 +870,7 @@ public abstract class BaseTestSheet { } @Test - public void getFooter() throws IOException { + void getFooter() throws IOException { try (Workbook workbook = _testDataProvider.createWorkbook()) { Sheet sheet = workbook.createSheet("Sheet 1"); assertNotNull(sheet.getFooter()); @@ -880,7 +880,7 @@ public abstract class BaseTestSheet { } @Test - public void getSetColumnHidden() throws IOException { + void getSetColumnHidden() throws IOException { try (Workbook workbook = _testDataProvider.createWorkbook()) { Sheet sheet = workbook.createSheet("Sheet 1"); sheet.setColumnHidden(2, true); @@ -889,7 +889,7 @@ public abstract class BaseTestSheet { } @Test - public void protectSheet() throws IOException { + void protectSheet() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet sheet = wb.createSheet(); assertFalse(sheet.getProtect()); @@ -901,7 +901,7 @@ public abstract class BaseTestSheet { } @Test - public void createFreezePane() throws IOException { + void createFreezePane() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { // create a workbook Sheet sheet = wb.createSheet(); @@ -953,7 +953,7 @@ public abstract class BaseTestSheet { @Test - public void getRepeatingRowsAndColumns() throws IOException { + void getRepeatingRowsAndColumns() throws IOException { try (Workbook wb = _testDataProvider.openSampleWorkbook( "RepeatingRowsCols." + _testDataProvider.getStandardFileNameExtension())) { @@ -967,7 +967,7 @@ public abstract class BaseTestSheet { @Test - public void setRepeatingRowsAndColumnsBug47294() throws IOException { + void setRepeatingRowsAndColumnsBug47294() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet sheet1 = wb.createSheet(); sheet1.setRepeatingRows(CellRangeAddress.valueOf("1:4")); @@ -981,7 +981,7 @@ public abstract class BaseTestSheet { } @Test - public void setRepeatingRowsAndColumns() throws IOException { + void setRepeatingRowsAndColumns() throws IOException { try (Workbook wb1 = _testDataProvider.createWorkbook()) { Sheet sheet1 = wb1.createSheet("Sheet1"); Sheet sheet2 = wb1.createSheet("Sheet2"); @@ -1033,7 +1033,7 @@ public abstract class BaseTestSheet { } @Test - public void baseZoom() throws IOException { + void baseZoom() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet sheet = wb.createSheet(); @@ -1044,7 +1044,7 @@ public abstract class BaseTestSheet { } @Test - public void baseShowInPane() throws IOException { + void baseShowInPane() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet sheet = wb.createSheet(); sheet.showInPane(2, 3); @@ -1052,7 +1052,7 @@ public abstract class BaseTestSheet { } @Test - public void bug55723() throws IOException { + void bug55723() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet sheet = wb.createSheet(); @@ -1069,7 +1069,7 @@ public abstract class BaseTestSheet { } @Test - public void bug55723_Rows() throws IOException { + void bug55723_Rows() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet sheet = wb.createSheet(); @@ -1080,7 +1080,7 @@ public abstract class BaseTestSheet { } @Test - public void bug55723d_RowsOver65k() throws IOException { + void bug55723d_RowsOver65k() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet sheet = wb.createSheet(); @@ -1094,7 +1094,7 @@ public abstract class BaseTestSheet { * XSSFSheet autoSizeColumn() on empty RichTextString fails */ @Test - public void bug48325() throws IOException { + void bug48325() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet sheet = wb.createSheet("Test"); trackColumnsForAutoSizingIfSXSSF(sheet); @@ -1115,7 +1115,7 @@ public abstract class BaseTestSheet { } @Test - public void getCellComment() throws IOException { + protected void getCellComment() throws IOException { try (Workbook workbook = _testDataProvider.createWorkbook()) { Sheet sheet = workbook.createSheet(); Drawing<?> dg = sheet.createDrawingPatriarch(); @@ -1133,7 +1133,7 @@ public abstract class BaseTestSheet { } @Test - public void getCellComments() throws IOException { + void getCellComments() throws IOException { try (Workbook wb1 = _testDataProvider.createWorkbook()) { Sheet sheet = wb1.createSheet("TEST"); @@ -1185,7 +1185,7 @@ public abstract class BaseTestSheet { } @Test - public void getHyperlink() throws IOException { + void getHyperlink() throws IOException { try (Workbook workbook = _testDataProvider.createWorkbook()) { Hyperlink hyperlink = workbook.getCreationHelper().createHyperlink(HyperlinkType.URL); hyperlink.setAddress("https://poi.apache.org/";); @@ -1206,7 +1206,7 @@ public abstract class BaseTestSheet { } @Test - public void removeAllHyperlinks() throws IOException { + void removeAllHyperlinks() throws IOException { try (Workbook workbook = _testDataProvider.createWorkbook()) { Hyperlink hyperlink = workbook.getCreationHelper().createHyperlink(HyperlinkType.URL); hyperlink.setAddress("https://poi.apache.org/";); @@ -1234,7 +1234,7 @@ public abstract class BaseTestSheet { @Test - public void newMergedRegionAt() throws IOException { + void newMergedRegionAt() throws IOException { try (Workbook workbook = _testDataProvider.createWorkbook()) { Sheet sheet = workbook.createSheet(); CellRangeAddress region = CellRangeAddress.valueOf("B2:D4"); @@ -1247,7 +1247,7 @@ public abstract class BaseTestSheet { } @Test - public void showInPaneManyRowsBug55248() throws IOException { + void showInPaneManyRowsBug55248() throws IOException { try (Workbook wb1 = _testDataProvider.createWorkbook()) { Sheet sheet = wb1.createSheet("Sheet 1"); @@ -1301,7 +1301,7 @@ public abstract class BaseTestSheet { * Tests that the setAsActiveCell and getActiveCell function pairs work together */ @Test - public void setActiveCell() throws IOException { + void setActiveCell() throws IOException { try (Workbook wb1 = _testDataProvider.createWorkbook()) { Sheet sheet = wb1.createSheet(); CellAddress B42 = new CellAddress("B42"); @@ -1322,7 +1322,7 @@ public abstract class BaseTestSheet { @Test - public void autoSizeDate() throws IOException { + void autoSizeDate() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { Sheet s = wb.createSheet("Sheet1"); Row r = s.createRow(0); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org For additional commands, e-mail: commits-h...@poi.apache.org
