Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java Thu Dec 24 18:42:29 2020 @@ -17,14 +17,14 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import org.apache.poi.POIDataSamples; import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl; import org.apache.poi.poifs.filesystem.POIFSFileSystem; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests that Document works properly (Also tests Environment while we're at it) @@ -37,7 +37,7 @@ public final class TestDocument { // POIFS primed on the test data private POIFSFileSystem pfs; - @Before + @BeforeEach public void setup() throws Exception { pfs = new POIFSFileSystem(slTests.openResourceAsStream("basic_test_ppt_file.ppt")); ss = new HSLFSlideShowImpl(pfs);
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java Thu Dec 24 18:42:29 2020 @@ -18,14 +18,14 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayOutputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that DocumentAtom works properly Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java Thu Dec 24 18:42:29 2020 @@ -18,11 +18,10 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -35,7 +34,6 @@ import org.apache.poi.hpsf.DocumentSumma import org.apache.poi.hpsf.PropertySet; import org.apache.poi.hpsf.PropertySetFactory; import org.apache.poi.hpsf.SummaryInformation; -import org.apache.poi.hslf.exceptions.EncryptedPowerPointFileException; import org.apache.poi.hslf.usermodel.HSLFPictureData; import org.apache.poi.hslf.usermodel.HSLFSlide; import org.apache.poi.hslf.usermodel.HSLFSlideShow; @@ -48,7 +46,9 @@ import org.apache.poi.poifs.crypt.HashAl import org.apache.poi.poifs.crypt.cryptoapi.CryptoAPIDecryptor; import org.apache.poi.poifs.crypt.cryptoapi.CryptoAPIEncryptionHeader; import org.apache.poi.poifs.filesystem.POIFSFileSystem; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; /** * Tests that DocumentEncryption works properly. @@ -56,23 +56,18 @@ import org.junit.Test; public class TestDocumentEncryption { private static final POIDataSamples slTests = POIDataSamples.getSlideShowInstance(); - @Test - public void cryptoAPIDecryptionOther() throws Exception { - String[] encPpts = { - "Password_Protected-56-hello.ppt", - "Password_Protected-hello.ppt", - "Password_Protected-np-hello.ppt", - }; - + @ParameterizedTest + @ValueSource(strings = { + "Password_Protected-56-hello.ppt", + "Password_Protected-hello.ppt", + "Password_Protected-np-hello.ppt" + }) + public void cryptoAPIDecryptionOther(String pptFile) throws Exception { Biff8EncryptionKey.setCurrentUserPassword("hello"); try { - for (String pptFile : encPpts) { - try (POIFSFileSystem fs = new POIFSFileSystem(slTests.getFile(pptFile), true); - HSLFSlideShow ppt = new HSLFSlideShow(fs)) { - assertTrue(ppt.getSlides().size() > 0); - } catch (EncryptedPowerPointFileException e) { - fail(pptFile + " can't be decrypted"); - } + try (POIFSFileSystem fs = new POIFSFileSystem(slTests.getFile(pptFile), true); + HSLFSlideShow ppt = new HSLFSlideShow(fs)) { + assertTrue(ppt.getSlides().size() > 0); } } finally { Biff8EncryptionKey.setCurrentUserPassword(null); @@ -140,10 +135,10 @@ public class TestDocumentEncryption { } finally { Biff8EncryptionKey.setCurrentUserPassword(null); } - + assertArrayEquals(expected.toByteArray(), actual.toByteArray()); - } - + } + @Test public void cryptoAPIDecryption() throws Exception { // taken from a msdn blog: Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java Thu Dec 24 18:42:29 2020 @@ -18,11 +18,11 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that DocumentEncryptionAtom works properly. Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExControl.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExControl.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExControl.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExControl.java Thu Dec 24 18:42:29 2020 @@ -18,13 +18,13 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.ByteArrayOutputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that {@link org.apache.poi.hslf.record.ExControl} works properly Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java Thu Dec 24 18:42:29 2020 @@ -18,9 +18,9 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -30,7 +30,7 @@ import java.util.List; import org.apache.poi.POIDataSamples; import org.apache.poi.hslf.usermodel.HSLFSlideShow; import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that ExHyperlink works properly. @@ -45,14 +45,14 @@ public final class TestExHyperlink { ); ExHyperlink exHyperlink = new ExHyperlink(exHyperlinkBytes, 0, exHyperlinkBytes.length); - + assertEquals(4055l, exHyperlink.getRecordType()); assertEquals(3, exHyperlink.getExHyperlinkAtom().getNumber()); String expURL = "http://jakarta.apache.org/poi/hssf/";; assertEquals(expURL, exHyperlink.getLinkURL()); assertEquals(expURL, exHyperlink._getDetailsA()); assertEquals(expURL, exHyperlink._getDetailsB()); - + ByteArrayOutputStream baos = new ByteArrayOutputStream(); exHyperlink.writeOut(baos); assertArrayEquals(exHyperlinkBytes, baos.toByteArray()); Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlinkAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlinkAtom.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlinkAtom.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlinkAtom.java Thu Dec 24 18:42:29 2020 @@ -18,12 +18,12 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayOutputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that ExHyperlinkAtom works properly. Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExMediaAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExMediaAtom.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExMediaAtom.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExMediaAtom.java Thu Dec 24 18:42:29 2020 @@ -18,14 +18,14 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayOutputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that {@link org.apache.poi.hslf.record.HeadersFootersAtom} works properly Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java Thu Dec 24 18:42:29 2020 @@ -18,12 +18,12 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import org.apache.poi.POIDataSamples; import org.apache.poi.hslf.usermodel.HSLFSlideShow; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that ExObjList works properly. Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjListAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjListAtom.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjListAtom.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjListAtom.java Thu Dec 24 18:42:29 2020 @@ -18,12 +18,12 @@ package org.apache.poi.hslf.record; -import static org.apache.poi.ss.formula.functions.BaseTestNumeric.assertEquals; -import static org.junit.Assert.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; import java.io.ByteArrayOutputStream; -import org.junit.Test; +import org.apache.poi.ss.formula.functions.BaseTestNumeric; +import org.junit.jupiter.api.Test; /** * Tests that ExObjListAtom works properly. @@ -42,7 +42,7 @@ public class TestExObjListAtom { @Test public void testRecordType() { ExObjListAtom eoa = new ExObjListAtom(data_a, 0, data_a.length); - assertEquals(1034L, eoa.getRecordType()); + BaseTestNumeric.assertDouble(1034L, eoa.getRecordType()); } @Test @@ -50,8 +50,8 @@ public class TestExObjListAtom { ExObjListAtom eoa = new ExObjListAtom(data_a, 0, data_a.length); ExObjListAtom eob = new ExObjListAtom(data_b, 0, data_b.length); - assertEquals(1, eoa.getObjectIDSeed()); - assertEquals(4, eob.getObjectIDSeed()); + BaseTestNumeric.assertDouble(1, eoa.getObjectIDSeed()); + BaseTestNumeric.assertDouble(4, eob.getObjectIDSeed()); } @Test Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjAtom.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjAtom.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjAtom.java Thu Dec 24 18:42:29 2020 @@ -17,12 +17,12 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayOutputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that {@link ExOleObjAtom} works properly Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjStg.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjStg.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjStg.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjStg.java Thu Dec 24 18:42:29 2020 @@ -18,10 +18,9 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -29,8 +28,8 @@ import java.io.InputStream; import org.apache.poi.poifs.filesystem.DocumentEntry; import org.apache.poi.poifs.filesystem.POIFSFileSystem; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** * Tests that {@link ExOleObjStg} works properly @@ -40,8 +39,8 @@ public final class TestExOleObjStg { // From a real file (embedded SWF control) // <ExOleObjStg info="16" type="4113" size="347" offset="4322" header="10 00 11 10 5B 01 00 00 ">.... private static byte[] data; - - @BeforeClass + + @BeforeAll public static void init() throws IOException { data = org.apache.poi.poifs.storage.RawDataUtil.decompress( "H4sIAAAAAAAAAAFjAZz+EAAREFsBAAAADgAAeJy7cF7wwcKNUg8Z0IAdAzPDv/+cDGxIYoxAzATjCDAwsEDF/"+ @@ -62,12 +61,10 @@ public final class TestExOleObjStg { byte[] oledata = readAll(record.getData()); assertEquals(len, oledata.length); - POIFSFileSystem fs = new POIFSFileSystem(record.getData()); - assertTrue("Constructed POIFS from ExOleObjStg data", true); - DocumentEntry doc = (DocumentEntry)fs.getRoot().getEntry("Contents"); - assertNotNull(doc); - assertTrue("Fetched the Contents stream containing OLE properties", true); - fs.close(); + try (POIFSFileSystem fs = new POIFSFileSystem(record.getData())) { + DocumentEntry doc = (DocumentEntry) fs.getRoot().getEntry("Contents"); + assertNotNull(doc); + } } @Test Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExVideoContainer.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExVideoContainer.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExVideoContainer.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExVideoContainer.java Thu Dec 24 18:42:29 2020 @@ -18,14 +18,14 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.ByteArrayOutputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that {@link HeadersFootersAtom} works properly Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestFontCollection.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestFontCollection.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestFontCollection.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestFontCollection.java Thu Dec 24 18:42:29 2020 @@ -17,9 +17,9 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -30,19 +30,19 @@ import org.apache.poi.hslf.usermodel.HSL import org.apache.poi.hslf.usermodel.HSLFFontInfoPredefined; import org.apache.poi.hslf.usermodel.HSLFSlideShow; import org.apache.poi.poifs.storage.RawDataUtil; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** * Tests {@code FontCollection} and {@code FontEntityAtom} records */ public final class TestFontCollection { private static final POIDataSamples _slTests = POIDataSamples.getSlideShowInstance(); - + // From a real file private static byte[] data; - - @BeforeClass + + @BeforeAll public static void init() throws IOException { data = RawDataUtil.decompress( "H4sIAAAAAAAAAONnuMruwwAC2/ldgGQIQyZDLkMqQzGDAoMfkC4H0kEM+U"+ @@ -92,7 +92,7 @@ public final class TestFontCollection { byte[] recdata = out.toByteArray(); assertArrayEquals(recdata, data); } - + @Test public void bug61881() throws IOException { try (InputStream is = _slTests.openResourceAsStream("bug61881.ppt")) { Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersAtom.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersAtom.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersAtom.java Thu Dec 24 18:42:29 2020 @@ -18,14 +18,14 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayOutputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that {@link HeadersFootersAtom} works properly Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersContainer.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersContainer.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersContainer.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersContainer.java Thu Dec 24 18:42:29 2020 @@ -18,14 +18,14 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.ByteArrayOutputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that {@link HeadersFootersContainer} works properly Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfo.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfo.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfo.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfo.java Thu Dec 24 18:42:29 2020 @@ -21,12 +21,12 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayOutputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that InteractiveInfoAtom works properly. Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java Thu Dec 24 18:42:29 2020 @@ -18,12 +18,12 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayOutputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that InteractiveInfoAtom works properly. Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestNotesAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestNotesAtom.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestNotesAtom.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestNotesAtom.java Thu Dec 24 18:42:29 2020 @@ -18,13 +18,13 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import java.io.ByteArrayOutputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that NotesAtom works properly Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java Thu Dec 24 18:42:29 2020 @@ -18,18 +18,18 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; import java.io.IOException; import java.io.InputStream; import org.apache.poi.POIDataSamples; import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests that the helper methods on RecordContainer work properly @@ -39,7 +39,7 @@ public final class TestRecordContainer { private RecordContainer recordContainer; private static final POIDataSamples slTests = POIDataSamples.getSlideShowInstance(); - @Before + @BeforeEach public void setUp() throws IOException { // Find a real RecordContainer record InputStream is = slTests.openResourceAsStream("basic_test_ppt_file.ppt"); @@ -54,12 +54,12 @@ public final class TestRecordContainer { } } } - - @After + + @AfterEach public void closeResources() throws IOException { hss.close(); } - + @Test public void testIsAnAtom() { assertFalse( recordContainer.isAnAtom() ); Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordTypes.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordTypes.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordTypes.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordTypes.java Thu Dec 24 18:42:29 2020 @@ -18,10 +18,10 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.poi.ddf.EscherRecordTypes; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that RecordTypes returns the right records and classes when asked Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java Thu Dec 24 18:42:29 2020 @@ -17,10 +17,10 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -29,7 +29,7 @@ import org.apache.poi.hslf.HSLFTestDataS import org.apache.poi.hslf.record.SlideAtomLayout.SlideLayoutType; import org.apache.poi.hslf.usermodel.HSLFSlide; import org.apache.poi.hslf.usermodel.HSLFSlideShow; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that SlideAtom works properly @@ -45,7 +45,7 @@ public final class TestSlideAtom { SlideAtom sa = new SlideAtom(data_a, 0, data_a.length); assertEquals(1007l, sa.getRecordType()); } - + @Test public void testFlags() { SlideAtom sa = new SlideAtom(data_a, 0, data_a.length); @@ -79,7 +79,7 @@ public final class TestSlideAtom { sa.writeOut(baos); assertArrayEquals(data_a, baos.toByteArray()); } - + @Test public void testSSSlideInfoAtom() throws IOException { HSLFSlideShow ss1 = new HSLFSlideShow(); Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlidePersistAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlidePersistAtom.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlidePersistAtom.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlidePersistAtom.java Thu Dec 24 18:42:29 2020 @@ -18,13 +18,13 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayOutputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that SlidePersistAtom works properly Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java Thu Dec 24 18:42:29 2020 @@ -17,15 +17,15 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.IOException; import org.apache.poi.POIDataSamples; import org.apache.poi.hslf.usermodel.HSLFSlideShow; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests Sound-related records: SoundCollection(2020), Sound(2022) and @@ -59,7 +59,7 @@ public final class TestSound { k++; } } - + assertNotNull(sound); assertEquals(1, k); Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java Thu Dec 24 18:42:29 2020 @@ -17,7 +17,7 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -26,7 +26,7 @@ import java.util.List; import org.apache.poi.hslf.exceptions.HSLFException; import org.apache.poi.hslf.model.textproperties.*; import org.apache.poi.util.HexDump; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that StyleTextPropAtom works properly @@ -37,17 +37,17 @@ public final class TestStyleTextPropAtom /** From a real file: a paragraph with 4 different styles */ private static final byte[] data_a = new byte[] { 0, 0, 0xA1-256, 0x0F, 0x2A, 0, 0, 0, - 0x36, 00, 00, 00, // paragraph is 54 long - 00, 00, // (paragraph reserved field) - 00, 00, 00, 00, // it doesn't have any styles - 0x15, 00, 00, 00, // first char run is 21 long - 00, 00, 00, 00, // it doesn't have any styles - 0x11, 00, 00, 00, // second char run is 17 long - 00, 00, 0x04, 00, // font.color only - 00, 00, 00, 0x05, // blue - 0x10, 00, 00, 00, // third char run is 16 long - 00, 00, 0x04, 00, // font.color only - 0xFF-256, 0x33, 00, 0xFE-256 // red + 0x36, 0, 0, 0, // paragraph is 54 long + 0, 0, // (paragraph reserved field) + 0, 0, 0, 0, // it doesn't have any styles + 0x15, 0, 0, 0, // first char run is 21 long + 0, 0, 0, 0, // it doesn't have any styles + 0x11, 0, 0, 0, // second char run is 17 long + 0, 0, 0x04, 0, // font.color only + 0, 0, 0, 0x05, // blue + 0x10, 0, 0, 0, // third char run is 16 long + 0, 0, 0x04, 0, // font.color only + 0xFF-256, 0x33, 0, 0xFE-256 // red }; private static final int data_a_text_len = 0x36-1; @@ -61,51 +61,51 @@ public final class TestStyleTextPropAtom */ private static final byte[] data_b = new byte[] { 0, 0, 0xA1-256, 0x0F, 0x80-256, 0, 0, 0, - 0x1E, 00, 00, 00, // paragraph is 30 long - 00, 00, // paragraph reserved field - 00, 0x18, 00, 00, // mask is 0x1800 - 00, 00, // left aligned - 0x50, 00, // line spacing 80 - 0x1C, 00, 00, 00, // paragprah is 28 long - 00, 00, // paragraph reserved field - 00, 0x10, 00, 00, // mask is 0x1000 - 0x50, 00, // line spacing 80 - 0x19, 00, 00, 00, // paragraph is 25 long - 00, 00, // paragraph reserved field - 00, 0x18, 00, 00, // mask is 0x1800 - 02, 00, // right aligned - 0x50, 00, // line spacing 80 - 0x61, 00, 00, 00, // paragraph is 97 long - 00, 00, // paragraph reserved field - 00, 0x18, 00, 00, // mask is 0x1800 - 00, 00, // left aligned - 0x50, 00, // line spacing 80 - - 0x1E, 00, 00, 00, // character run is 30 long - 01, 00, 02, 00, // mask is 0x020001 - 01, 00, // char flags 0x0001 = bold - 0x14, 00, // font size 20 - 0x1C, 00, 00, 00, // character run is 28 long - 02, 00, 06, 00, // mask is 0x060002 - 02, 00, // char flags 0x0002 = italic - 0x14, 00, // font size 20 - 00, 00, 00, 05, // colour blue - 0x19, 00, 00, 00, // character run is 25 long - 00, 00, 06, 00, // char flags 0x060000 - 0x14, 00, // font size 20 - 0xFF-256, 0x33, 00, 0xFE-256, // colour red - 0x60, 00, 00, 00, // character run is 96 long - 04, 00, 03, 00, // mask is 0x030004 - 04, 00, // char flags 0x0004 = underlined - 01, 00, // font index is 1 - 0x18, 00, // font size 24 - - 01, 00, 00, 00, // character run is 1 long - 04, 00, 07, 00, // mask is 0x070004 - 04, 00, // char flags 0x0004 = underlined - 01, 00, // font index is 1 - 0x18, 00, // font size 24 - 0xFF-256, 0x33, 00, 0xFE-256 // colour red + 0x1E, 0, 0, 0, // paragraph is 30 long + 0, 0, // paragraph reserved field + 0, 0x18, 0, 0, // mask is 0x1800 + 0, 0, // left aligned + 0x50, 0, // line spacing 80 + 0x1C, 0, 0, 0, // paragprah is 28 long + 0, 0, // paragraph reserved field + 0, 0x10, 0, 0, // mask is 0x1000 + 0x50, 0, // line spacing 80 + 0x19, 0, 0, 0, // paragraph is 25 long + 0, 0, // paragraph reserved field + 0, 0x18, 0, 0, // mask is 0x1800 + 0x02, 0, // right aligned + 0x50, 0, // line spacing 80 + 0x61, 0, 0, 0, // paragraph is 97 long + 0, 0, // paragraph reserved field + 0, 0x18, 0, 0, // mask is 0x1800 + 0, 0, // left aligned + 0x50, 0, // line spacing 80 + + 0x1E, 0, 0, 0, // character run is 30 long + 0x01, 0, 0x02, 0, // mask is 0x020001 + 0x01, 0, // char flags 0x0001 = bold + 0x14, 0, // font size 20 + 0x1C, 0, 0, 0, // character run is 28 long + 0x02, 0, 0x06, 0, // mask is 0x060002 + 0x02, 0, // char flags 0x0002 = italic + 0x14, 0, // font size 20 + 0, 0, 0, 0x05, // colour blue + 0x19, 0, 0, 0, // character run is 25 long + 0, 0, 0x06, 0, // char flags 0x060000 + 0x14, 0, // font size 20 + 0xFF-256, 0x33, 0, 0xFE-256, // colour red + 0x60, 0, 0, 0, // character run is 96 long + 0x04, 0, 0x03, 0, // mask is 0x030004 + 0x04, 0, // char flags 0x0004 = underlined + 0x01, 0, // font index is 1 + 0x18, 0, // font size 24 + + 0x01, 0, 0, 0, // character run is 1 long + 0x04, 0, 0x07, 0, // mask is 0x070004 + 0x04, 0, // char flags 0x0004 = underlined + 0x01, 0, // font index is 1 + 0x18, 0, // font size 24 + 0xFF-256, 0x33, 0, 0xFE-256 // colour red }; private static final int data_b_text_len = 0xB3; @@ -376,7 +376,7 @@ public final class TestStyleTextPropAtom assertEquals(0x0003, cf_4_1.getValue()); } - @Test(expected=HSLFException.class) + @Test public void testFindAddTextProp() { StyleTextPropAtom stpb = new StyleTextPropAtom(data_b,0,data_b.length); stpb.setParentTextSize(data_b_text_len); @@ -429,7 +429,7 @@ public final class TestStyleTextPropAtom assertEquals(new_sa, b_p_2.getTextPropList().get(2)); // Check we get an error with a made up one - b_p_2.addWithName("madeUpOne"); + assertThrows(HSLFException.class, () -> b_p_2.addWithName("madeUpOne")); } /** @@ -692,8 +692,8 @@ public final class TestStyleTextPropAtom byte[] bytes = out.toByteArray(); assertEquals(expected.length, bytes.length); - assertArrayEquals("Had: " + HexDump.toHex(expected) + "\nand: " + HexDump.toHex(bytes), - expected, bytes); + assertArrayEquals(expected, bytes, + "Had: " + HexDump.toHex(expected) + "\nand: " + HexDump.toHex(bytes)); } @Test Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextBytesAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextBytesAtom.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextBytesAtom.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextBytesAtom.java Thu Dec 24 18:42:29 2020 @@ -18,13 +18,13 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayOutputStream; import java.nio.charset.StandardCharsets; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that TextBytesAtom works properly Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextCharsAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextCharsAtom.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextCharsAtom.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextCharsAtom.java Thu Dec 24 18:42:29 2020 @@ -18,12 +18,12 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayOutputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that TextCharsAtom works properly Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextHeaderAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextHeaderAtom.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextHeaderAtom.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextHeaderAtom.java Thu Dec 24 18:42:29 2020 @@ -18,13 +18,13 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayOutputStream; import org.apache.poi.sl.usermodel.TextShape.TextPlaceholder; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that TextHeaderAtom works properly Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextRulerAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextRulerAtom.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextRulerAtom.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextRulerAtom.java Thu Dec 24 18:42:29 2020 @@ -17,15 +17,15 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.ByteArrayOutputStream; import java.util.List; import org.apache.poi.hslf.model.textproperties.HSLFTabStop; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class TestTextRulerAtom { Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java Thu Dec 24 18:42:29 2020 @@ -17,12 +17,12 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayOutputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests TextSpecInfoAtom Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java Thu Dec 24 18:42:29 2020 @@ -18,12 +18,12 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayOutputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that TxInteractiveInfoAtom works properly. Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java Thu Dec 24 18:42:29 2020 @@ -17,10 +17,10 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; import java.util.ArrayList; import java.util.List; @@ -29,8 +29,8 @@ import org.apache.poi.hslf.model.textpro import org.apache.poi.hslf.model.textproperties.TextPropCollection; import org.apache.poi.hslf.usermodel.HSLFSlideShow; import org.apache.poi.sl.usermodel.TextShape.TextPlaceholder; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** @@ -41,7 +41,7 @@ import org.junit.Test; public final class TestTxMasterStyleAtom { private HSLFSlideShow _ppt; - @Before + @BeforeEach public void setUp() { _ppt = new HSLFSlideShow(); } @@ -116,10 +116,8 @@ public final class TestTxMasterStyleAtom List<TextPropCollection> prstyles = txmaster.getParagraphStyles(); List<TextPropCollection> chstyles = txmaster.getCharacterStyles(); - assertEquals("TxMasterStyleAtom for TextHeaderAtom.BODY_TYPE " + - "must contain styles for 5 indentation levels", 5, prstyles.size()); - assertEquals("TxMasterStyleAtom for TextHeaderAtom.BODY_TYPE " + - "must contain styles for 5 indentation levels", 5, chstyles.size()); + assertEquals(5, prstyles.size(), "TxMasterStyleAtom for TextHeaderAtom.BODY_TYPE must contain styles for 5 indentation levels"); + assertEquals(5, chstyles.size(), "TxMasterStyleAtom for TextHeaderAtom.BODY_TYPE must contain styles for 5 indentation levels"); //paragraph styles props = prstyles.get(0); @@ -129,8 +127,8 @@ public final class TestTxMasterStyleAtom for (int i = 0; i < prstyles.size(); i++) { - assertNotNull("text.offset is null for indentation level " + i, prstyles.get(i).findByName("text.offset")); - assertNotNull("bullet.offset is null for indentation level " + i, prstyles.get(i).findByName("bullet.offset")); + assertNotNull(prstyles.get(i).findByName("text.offset"), "text.offset is null for indentation level " + i); + assertNotNull(prstyles.get(i).findByName("bullet.offset"), "bullet.offset is null for indentation level " + i); } //character styles @@ -217,22 +215,22 @@ public final class TestTxMasterStyleAtom cnt++; } } - assertEquals("MainMaster must contain 7 TxMasterStyleAtoms ", 7, cnt); + assertEquals(7, cnt, "MainMaster must contain 7 TxMasterStyleAtoms "); } else if(coreRec.getRecordType() == RecordTypes.Document.typeID){ TxMasterStyleAtom txstyle = null; Document doc = (Document)coreRec; Record[] rec = doc.getEnvironment().getChildRecords(); for (final Record atom : rec) { if (atom instanceof TxMasterStyleAtom) { - assertNull("Document.Environment must contain 1 TxMasterStyleAtom", txstyle); + assertNull(txstyle, "Document.Environment must contain 1 TxMasterStyleAtom"); txstyle = (TxMasterStyleAtom)atom; } } - assertNotNull("TxMasterStyleAtom not found in Document.Environment", txstyle); + assertNotNull(txstyle, "TxMasterStyleAtom not found in Document.Environment"); - assertEquals("Document.Environment must contain TxMasterStyleAtom with type=TextHeaderAtom.OTHER_TYPE", - TextPlaceholder.OTHER.nativeId, txstyle.getTextType()); + assertEquals(TextPlaceholder.OTHER.nativeId, txstyle.getTextType(), + "Document.Environment must contain TxMasterStyleAtom with type=TextHeaderAtom.OTHER_TYPE"); lst.add(txstyle); } } Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestUserEditAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestUserEditAtom.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestUserEditAtom.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestUserEditAtom.java Thu Dec 24 18:42:29 2020 @@ -18,12 +18,12 @@ package org.apache.poi.hslf.record; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayOutputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that UserEditAtom works properly Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java Thu Dec 24 18:42:29 2020 @@ -17,12 +17,12 @@ package org.apache.poi.hslf.usermodel; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.List; @@ -32,9 +32,9 @@ import org.apache.poi.hslf.record.Docume import org.apache.poi.hslf.record.Record; import org.apache.poi.hslf.record.RecordTypes; import org.apache.poi.hslf.record.UserEditAtom; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests that SlideShow adds additional sheets properly @@ -52,14 +52,14 @@ public final class TestAddingSlides { /** * Create/open the slideshows */ - @Before + @BeforeEach public void setUp() throws IOException { ss_empty = new HSLFSlideShow(); ss_one = HSLFTestDataSamples.getSlideShow("Single_Coloured_Page.ppt"); ss_two = HSLFTestDataSamples.getSlideShow("basic_test_ppt_file.ppt"); } - @After + @AfterEach public void tearDown() throws IOException { ss_two.close(); ss_one.close(); @@ -230,17 +230,8 @@ public final class TestAddingSlides { List<HSLFSlide> s1 = ss_empty.getSlides(); assertEquals(2, s1.size()); - try { - ss_empty.removeSlide(-1); - fail("expected exception"); - } catch (Exception e) { - } - - try { - ss_empty.removeSlide(2); - fail("expected exception"); - } catch (Exception e) { - } + assertThrows(Exception.class, () -> ss_empty.removeSlide(-1)); + assertThrows(Exception.class, () -> ss_empty.removeSlide(2)); assertEquals(1, slide1.getSlideNumber()); @@ -252,12 +243,9 @@ public final class TestAddingSlides { assertEquals(0, slide2.getSlideNumber()); - HSLFSlideShow ss_read = HSLFTestDataSamples - .writeOutAndReadBack(ss_empty); - - List<HSLFSlide> s3 = ss_read.getSlides(); - assertEquals(1, s3.size()); - ss_read.close(); + try (HSLFSlideShow ss_read = HSLFTestDataSamples.writeOutAndReadBack(ss_empty)) { + assertEquals(1, ss_read.getSlides().size()); + } } @Test Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBackground.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBackground.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBackground.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBackground.java Thu Dec 24 18:42:29 2020 @@ -17,8 +17,8 @@ package org.apache.poi.hslf.usermodel; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.awt.Color; import java.io.IOException; @@ -35,7 +35,7 @@ import org.apache.poi.hslf.HSLFTestDataS import org.apache.poi.hslf.record.Document; import org.apache.poi.sl.usermodel.PictureData.PictureType; import org.apache.poi.sl.usermodel.ShapeType; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java Thu Dec 24 18:42:29 2020 @@ -20,11 +20,12 @@ package org.apache.poi.hslf.usermodel; import static org.apache.poi.POITestCase.assertContains; import static org.apache.poi.POITestCase.assertStartsWith; import static org.apache.poi.hslf.HSLFTestDataSamples.writeOutAndReadBack; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.awt.Color; import java.awt.Graphics2D; @@ -85,7 +86,7 @@ import org.apache.poi.sl.usermodel.TextR import org.apache.poi.util.LittleEndian; import org.apache.poi.util.StringUtil; import org.apache.poi.util.Units; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Testcases for bugs entered in bugzilla @@ -207,8 +208,6 @@ public final class TestBugs { @Test public void bug41381() throws IOException { try (HSLFSlideShow ppt = open("alterman_security.ppt")) { - assertTrue("No Exceptions while reading file", true); - assertEquals(1, ppt.getSlideMasters().size()); assertEquals(1, ppt.getTitleMasters().size()); boolean isFirst = true; @@ -304,7 +303,7 @@ public final class TestBugs { for (List<HSLFTextParagraph> para : paras) { String text = HSLFTextParagraph.getRawText(para); - assertTrue(text, expected.contains(text)); + assertTrue(expected.contains(text), text); } } } @@ -397,13 +396,13 @@ public final class TestBugs { /** * PowerPoint 95 files should throw a more helpful exception */ - @Test(expected=OldPowerPointFormatException.class) + @Test public void bug41711() throws IOException { // New file is fine open("SampleShow.ppt").close(); // PowerPoint 95 gives an old format exception - open("PPT95.ppt").close(); + assertThrows(OldPowerPointFormatException.class, () -> open("PPT95.ppt").close()); } /** @@ -898,11 +897,11 @@ public final class TestBugs { public void bug59302() throws IOException { //add extraction from PPT Map<String, String> macros = getMacrosFromHSLF("59302.ppt"); - assertNotNull("couldn't find macros", macros); - assertNotNull("couldn't find second module", macros.get("Module2")); + assertNotNull(macros, "couldn't find macros"); + assertNotNull(macros.get("Module2"), "couldn't find second module"); assertContains(macros.get("Module2"), "newMacro in Module2"); - assertNotNull("couldn't find first module", macros.get("Module1")); + assertNotNull(macros.get("Module1"), "couldn't find first module"); assertContains(macros.get("Module1"), "Italicize"); macros = getMacrosFromHSLF("SimpleMacro.ppt"); Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java Thu Dec 24 18:42:29 2020 @@ -18,13 +18,13 @@ package org.apache.poi.hslf.usermodel; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.util.List; import org.apache.poi.hslf.HSLFTestDataSamples; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that SlideShow returns the right number of Sheets and MetaSheets @@ -33,7 +33,7 @@ public final class TestCounts { @Test public void testSheetsCount() throws IOException { HSLFSlideShow ppt = HSLFTestDataSamples.getSlideShow("basic_test_ppt_file.ppt"); - + List<HSLFSlide> slides = ppt.getSlides(); // Two sheets - master sheet is separate assertEquals(2, slides.size()); @@ -49,14 +49,14 @@ public final class TestCounts { // These are slides 1+2 -> 256+257 assertEquals(256, slides.get(0)._getSheetNumber()); assertEquals(257, slides.get(1)._getSheetNumber()); - + ppt.close(); } @Test public void testNotesCount() throws IOException { HSLFSlideShow ppt = HSLFTestDataSamples.getSlideShow("basic_test_ppt_file.ppt"); - + List<HSLFNotes> notes = ppt.getNotes(); // Two sheets -> two notes // Note: there are also notes on the slide master @@ -73,7 +73,7 @@ public final class TestCounts { // They happen to go between the two slides in Ref terms assertEquals(5, notes.get(0)._getSheetRefId()); assertEquals(7, notes.get(1)._getSheetRefId()); - + ppt.close(); } } Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java Thu Dec 24 18:42:29 2020 @@ -17,8 +17,8 @@ package org.apache.poi.hslf.usermodel; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import java.awt.Color; import java.awt.Dimension; @@ -43,13 +43,13 @@ import javax.imageio.ImageIO; import org.apache.poi.POIDataSamples; import org.apache.poi.sl.draw.Drawable; import org.apache.poi.util.TempFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test font rendering of alternative and fallback fonts */ public class TestFontRendering { - private static POIDataSamples slTests = POIDataSamples.getSlideShowInstance(); + private static final POIDataSamples slTests = POIDataSamples.getSlideShowInstance(); // @Ignore2("This fails on some systems because fonts are rendered slightly different") @Test @@ -64,36 +64,36 @@ public class TestFontRendering { // for the junit test not all chars are rendered {"build/scratchpad-test-resources/mona.ttf", "fallback", "Cabin"} }; - + // setup fonts (especially needed, when run under *nix systems) GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); Map<String,String> fontMap = new HashMap<>(); Map<String,String> fallbackMap = new HashMap<>(); - + for (String[] fontFile : fontFiles) { File f = new File(fontFile[0]); - assumeTrue("necessary font file "+f.getName()+" not downloaded.", f.exists()); - + assumeTrue(f.exists(), "necessary font file "+f.getName()+" not downloaded."); + Font font = Font.createFont(Font.TRUETYPE_FONT, f); ge.registerFont(font); - + Map<String,String> map = ("mapped".equals(fontFile[1]) ? fontMap : fallbackMap); map.put(fontFile[2], font.getFamily()); } - + InputStream is = slTests.openResourceAsStream("bug55902-mixedFontChineseCharacters.ppt"); HSLFSlideShow ss = new HSLFSlideShow(is); is.close(); - + Dimension pgsize = ss.getPageSize(); - + HSLFSlide slide = ss.getSlides().get(0); - + // render it double zoom = 1; AffineTransform at = new AffineTransform(); at.setToScale(zoom, zoom); - + BufferedImage imgActual = new BufferedImage((int)Math.ceil(pgsize.width*zoom), (int)Math.ceil(pgsize.height*zoom), BufferedImage.TYPE_3BYTE_BGR); Graphics2D graphics = imgActual.createGraphics(); graphics.setRenderingHint(Drawable.FONT_FALLBACK, fallbackMap); @@ -102,23 +102,23 @@ public class TestFontRendering { graphics.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC); graphics.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON); - graphics.setTransform(at); + graphics.setTransform(at); graphics.setPaint(Color.white); graphics.fill(new Rectangle2D.Float(0, 0, pgsize.width, pgsize.height)); - slide.draw(graphics); - + slide.draw(graphics); + BufferedImage imgExpected = ImageIO.read(slTests.getFile("bug55902-mixedChars.png")); DataBufferByte expectedDB = (DataBufferByte)imgExpected.getRaster().getDataBuffer(); DataBufferByte actualDB = (DataBufferByte)imgActual.getRaster().getDataBuffer(); byte[] expectedData = expectedDB.getData(0); byte[] actualData = actualDB.getData(0); - + // allow to find out what the actual difference is in CI where this fails currently if(!Arrays.equals(expectedData, actualData)) { ImageIO.write(imgActual, "PNG", TempFile.createTempFile("TestFontRendering", ".png")); } - - assertArrayEquals("Expected to have matching raster-arrays, but found differences", expectedData, actualData); + + assertArrayEquals(expectedData, actualData, "Expected to have matching raster-arrays, but found differences"); ss.close(); } } Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestHSLFSlideShow.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestHSLFSlideShow.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestHSLFSlideShow.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestHSLFSlideShow.java Thu Dec 24 18:42:29 2020 @@ -16,8 +16,7 @@ ==================================================================== */ package org.apache.poi.hslf.usermodel; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -25,29 +24,24 @@ import java.io.IOException; import org.apache.poi.sl.usermodel.BaseTestSlideShow; import org.apache.poi.sl.usermodel.SlideShow; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class TestHSLFSlideShow extends BaseTestSlideShow<HSLFShape,HSLFTextParagraph> { +public class TestHSLFSlideShow extends BaseTestSlideShow<HSLFShape, HSLFTextParagraph> { @Override public HSLFSlideShow createSlideShow() { return new HSLFSlideShow(); } - + // make sure junit4 executes this test class @Test public void dummy() { assertNotNull(createSlideShow()); } - public HSLFSlideShow reopen(SlideShow<HSLFShape,HSLFTextParagraph> show) { - try { - BufAccessBAOS bos = new BufAccessBAOS(); - show.write(bos); - return new HSLFSlideShow(new ByteArrayInputStream(bos.getBuf())); - } catch (IOException e) { - fail(e.getMessage()); - return null; - } + public HSLFSlideShow reopen(SlideShow<HSLFShape, HSLFTextParagraph> show) throws IOException { + BufAccessBAOS bos = new BufAccessBAOS(); + show.write(bos); + return new HSLFSlideShow(new ByteArrayInputStream(bos.getBuf())); } private static class BufAccessBAOS extends ByteArrayOutputStream { Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestHSLFSlideShowFactory.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestHSLFSlideShowFactory.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestHSLFSlideShowFactory.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestHSLFSlideShowFactory.java Thu Dec 24 18:42:29 2020 @@ -18,7 +18,7 @@ package org.apache.poi.hslf.usermodel; import org.apache.poi.sl.usermodel.BaseTestSlideShowFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class TestHSLFSlideShowFactory extends BaseTestSlideShowFactory { @Test Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java Thu Dec 24 18:42:29 2020 @@ -18,12 +18,11 @@ package org.apache.poi.hslf.usermodel; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.poi.POIDataSamples; -import org.apache.poi.hslf.record.Record; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests that SlideShow finds the right records as its most recent ones @@ -34,7 +33,7 @@ public final class TestMostRecentRecords // SlideShow primed on the test data private HSLFSlideShow ss; - @Before + @BeforeEach public void setup() throws Exception { POIDataSamples slTests = POIDataSamples.getSlideShowInstance(); hss = new HSLFSlideShowImpl(slTests.openResourceAsStream("basic_test_ppt_file.ppt")); Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java Thu Dec 24 18:42:29 2020 @@ -18,11 +18,11 @@ package org.apache.poi.hslf.usermodel; -import static org.junit.Assert.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; import org.apache.poi.POIDataSamples; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests that SlideShow returns MetaSheets which have the right text in them @@ -31,7 +31,7 @@ public final class TestNotesText { // SlideShow primed on the test data private HSLFSlideShow ss; - @Before + @BeforeEach public void setup() throws Exception { POIDataSamples slTests = POIDataSamples.getSlideShowInstance(); HSLFSlideShowImpl hss = new HSLFSlideShowImpl(slTests.openResourceAsStream("basic_test_ppt_file.ppt")); Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java Thu Dec 24 18:42:29 2020 @@ -19,21 +19,27 @@ package org.apache.poi.hslf.usermodel; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; import java.util.List; import org.apache.poi.POIDataSamples; import org.apache.poi.hslf.model.textproperties.TextPFException9; import org.apache.poi.hslf.model.textproperties.TextPropCollection; -import org.apache.poi.hslf.record.*; +import org.apache.poi.hslf.record.EscherTextboxWrapper; +import org.apache.poi.hslf.record.StyleTextProp9Atom; +import org.apache.poi.hslf.record.StyleTextPropAtom; import org.apache.poi.sl.usermodel.AutoNumberingScheme; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test that checks numbered list functionality. - * + * * @author Alex Nikiforov [mailto:ani...@gmail.com] */ public final class TestNumberedList { @@ -64,7 +70,7 @@ public final class TestNumberedList { assertSame(AutoNumberingScheme.arabicPeriod, autoNumbers[0].getAutoNumberScheme()); assertNull(autoNumbers[1].getAutoNumberScheme()); assertSame(AutoNumberingScheme.alphaLcParenRight, autoNumbers[2].getAutoNumberScheme()); - + List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs(); assertEquals(2, textParass.size()); @@ -80,7 +86,7 @@ public final class TestNumberedList { "Second paragraph first line c) ;\r" + "Second paragraph second line d) . \r"; assertEquals(expected, HSLFTextParagraph.getRawText(textParass.get(1))); - + final EscherTextboxWrapper[] styleAtoms = s.getTextboxWrappers(); assertEquals(textParass.size(), styleAtoms.length); final EscherTextboxWrapper wrapper = styleAtoms[1]; @@ -120,15 +126,15 @@ public final class TestNumberedList { "follows the design pattern\r" + "Just a test\rWithout any paragraph\r" + "Second paragraph first line c) ;\r" + - "Second paragraph second line d) . \r"; + "Second paragraph second line d) . \r"; assertEquals(expected, HSLFTextParagraph.getRawText(textParass.get(1))); - + final EscherTextboxWrapper[] styleAtoms = s.getTextboxWrappers(); assertEquals(textParass.size(), styleAtoms.length); final EscherTextboxWrapper wrapper = styleAtoms[1]; final StyleTextPropAtom styleTextPropAtom = wrapper.getStyleTextPropAtom(); final List<TextPropCollection> textProps = styleTextPropAtom.getCharacterStyles(); - + assertEquals(33, textProps.get(0).getCharactersCovered()); assertEquals(61, textProps.get(1).getCharactersCovered()); assertEquals(68, textProps.get(2).getCharactersCovered()); Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java Thu Dec 24 18:42:29 2020 @@ -19,10 +19,10 @@ package org.apache.poi.hslf.usermodel; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.List; @@ -34,7 +34,7 @@ import org.apache.poi.hslf.record.Escher import org.apache.poi.hslf.record.StyleTextProp9Atom; import org.apache.poi.hslf.record.StyleTextPropAtom; import org.apache.poi.sl.usermodel.AutoNumberingScheme; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** @@ -44,19 +44,16 @@ import org.junit.Test; * PPT: Missing TextAutoNumberScheme structure providing the style of the number bullets</a> */ public final class TestNumberedList2 { - private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance(); + private static final POIDataSamples _slTests = POIDataSamples.getSlideShowInstance(); @Test public void testNumberedList() throws IOException { - HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("numbers2.ppt")); - assertTrue("No Exceptions while reading file", true); - - final List<HSLFSlide> slides = ppt.getSlides(); - assertEquals(2, slides.size()); - checkSlide0(slides.get(0)); - checkSlide1(slides.get(1)); - - ppt.close(); + try (HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("numbers2.ppt"))) { + final List<HSLFSlide> slides = ppt.getSlides(); + assertEquals(2, slides.size()); + checkSlide0(slides.get(0)); + checkSlide1(slides.get(1)); + } } private void checkSlide0(final HSLFSlide s) { @@ -69,14 +66,14 @@ public final class TestNumberedList2 { assertNotNull(numberedListInfoForTextBox1); final TextPFException9[] autoNumbersOfTextBox0 = numberedListInfoForTextBox0.getAutoNumberTypes(); assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getfBulletHasAutoNumber()); - assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getAutoNumberStartNumber());//Default value = 1 will be used + assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getAutoNumberStartNumber());//Default value = 1 will be used assertSame(AutoNumberingScheme.arabicPeriod, autoNumbersOfTextBox0[0].getAutoNumberScheme()); final TextPFException9[] autoNumbersOfTextBox1 = numberedListInfoForTextBox1.getAutoNumberTypes(); assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox1[0].getfBulletHasAutoNumber()); - assertEquals(Short.valueOf((short)6), autoNumbersOfTextBox1[0].getAutoNumberStartNumber());//Default value = 1 will be used + assertEquals(Short.valueOf((short)6), autoNumbersOfTextBox1[0].getAutoNumberStartNumber());//Default value = 1 will be used assertSame(AutoNumberingScheme.arabicPeriod, autoNumbersOfTextBox1[0].getAutoNumberScheme()); - + List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs(); assertEquals(2, textParass.size()); @@ -90,13 +87,13 @@ public final class TestNumberedList2 { "This would be used as a continuation list on another page\r" + "This list should start with #6"; assertEquals(expected, HSLFTextParagraph.getRawText(textParass.get(1))); - + final EscherTextboxWrapper[] styleAtoms = s.getTextboxWrappers(); assertEquals(textParass.size(), styleAtoms.length); checkSingleRunWrapper(44, styleAtoms[0]); checkSingleRunWrapper(130, styleAtoms[1]); } - + private void checkSlide1(final HSLFSlide s) { final StyleTextProp9Atom[] numberedListArray = s.getNumberedListInfo(); assertNotNull(numberedListArray); @@ -105,9 +102,9 @@ public final class TestNumberedList2 { assertNotNull(numberedListInfoForTextBox); final TextPFException9[] autoNumbersOfTextBox = numberedListInfoForTextBox.getAutoNumberTypes(); assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox[0].getfBulletHasAutoNumber()); - assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox[0].getAutoNumberStartNumber());//Default value = 1 will be used + assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox[0].getAutoNumberStartNumber());//Default value = 1 will be used assertSame(AutoNumberingScheme.arabicPeriod, autoNumbersOfTextBox[0].getAutoNumberScheme()); - + List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs(); assertEquals(3, textParass.size()); @@ -120,14 +117,14 @@ public final class TestNumberedList2 { assertEquals(expected, HSLFTextParagraph.getRawText(textParass.get(1))); expected = "Second bulleted list \u2013 should appear after numbered list\rMore bullets"; assertEquals(expected, HSLFTextParagraph.getRawText(textParass.get(2))); - + final EscherTextboxWrapper[] styleAtoms = s.getTextboxWrappers(); assertEquals(textParass.size(), styleAtoms.length); checkSingleRunWrapper(27, styleAtoms[0]); checkSingleRunWrapper(67, styleAtoms[1]); checkSingleRunWrapper(70, styleAtoms[2]); } - + private void checkSingleRunWrapper(final int exceptedLength, final EscherTextboxWrapper wrapper) { final StyleTextPropAtom styleTextPropAtom = wrapper.getStyleTextPropAtom(); final List<TextPropCollection> textProps = styleTextPropAtom.getCharacterStyles(); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org For additional commands, e-mail: commits-h...@poi.apache.org
