From: Javen O'Neal Date: Sun, 17 Apr 2016 21:51:16 +0000 (+0000) Subject: whitespace X-Git-Tag: REL_3_15_BETA2~289 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6af8f42b3a386e5a5f24d608f75cffbc9a461ab8;p=poi.git whitespace git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1739661 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java b/src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java index d5a2b60a09..10e6225706 100644 --- a/src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java +++ b/src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java @@ -41,87 +41,87 @@ import org.junit.Test; * @author Nick Burch (nick at torchbox dot com) */ public final class TestReWrite { - // HSLFSlideShow primed on the test data - private HSLFSlideShowImpl hssA; - private HSLFSlideShowImpl hssB; - private HSLFSlideShowImpl hssC; - // POIFS primed on the test data - private POIFSFileSystem pfsA; - private POIFSFileSystem pfsB; - private POIFSFileSystem pfsC; - - @Before - public void setUp() throws Exception { + // HSLFSlideShow primed on the test data + private HSLFSlideShowImpl hssA; + private HSLFSlideShowImpl hssB; + private HSLFSlideShowImpl hssC; + // POIFS primed on the test data + private POIFSFileSystem pfsA; + private POIFSFileSystem pfsB; + private POIFSFileSystem pfsC; + + @Before + public void setUp() throws Exception { POIDataSamples slTests = POIDataSamples.getSlideShowInstance(); - pfsA = new POIFSFileSystem(slTests.openResourceAsStream("basic_test_ppt_file.ppt")); - hssA = new HSLFSlideShowImpl(pfsA); + pfsA = new POIFSFileSystem(slTests.openResourceAsStream("basic_test_ppt_file.ppt")); + hssA = new HSLFSlideShowImpl(pfsA); pfsB = new POIFSFileSystem(slTests.openResourceAsStream("ParagraphStylesShorterThanCharStyles.ppt")); - hssB = new HSLFSlideShowImpl(pfsB); + hssB = new HSLFSlideShowImpl(pfsB); pfsC = new POIFSFileSystem(slTests.openResourceAsStream("WithMacros.ppt")); - hssC = new HSLFSlideShowImpl(pfsC); + hssC = new HSLFSlideShowImpl(pfsC); } - @Test + @Test public void testWritesOutTheSame() throws Exception { - assertWritesOutTheSame(hssA, pfsA); - assertWritesOutTheSame(hssB, pfsB); + assertWritesOutTheSame(hssA, pfsA); + assertWritesOutTheSame(hssB, pfsB); } - + public void assertWritesOutTheSame(HSLFSlideShowImpl hss, POIFSFileSystem pfs) throws Exception { - // Write out to a byte array - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - hss.write(baos); - - // Build an input stream of it - ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); - - // Use POIFS to query that lot - POIFSFileSystem npfs = new POIFSFileSystem(bais); - - // Check that the "PowerPoint Document" sections have the same size - DocumentEntry oProps = (DocumentEntry)pfs.getRoot().getEntry("PowerPoint Document"); - DocumentEntry nProps = (DocumentEntry)npfs.getRoot().getEntry("PowerPoint Document"); - assertEquals(oProps.getSize(),nProps.getSize()); - - // Check that they contain the same data - byte[] _oData = new byte[oProps.getSize()]; - byte[] _nData = new byte[nProps.getSize()]; - pfs.createDocumentInputStream("PowerPoint Document").read(_oData); - npfs.createDocumentInputStream("PowerPoint Document").read(_nData); + // Write out to a byte array + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + hss.write(baos); + + // Build an input stream of it + ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); + + // Use POIFS to query that lot + POIFSFileSystem npfs = new POIFSFileSystem(bais); + + // Check that the "PowerPoint Document" sections have the same size + DocumentEntry oProps = (DocumentEntry)pfs.getRoot().getEntry("PowerPoint Document"); + DocumentEntry nProps = (DocumentEntry)npfs.getRoot().getEntry("PowerPoint Document"); + assertEquals(oProps.getSize(),nProps.getSize()); + + // Check that they contain the same data + byte[] _oData = new byte[oProps.getSize()]; + byte[] _nData = new byte[nProps.getSize()]; + pfs.createDocumentInputStream("PowerPoint Document").read(_oData); + npfs.createDocumentInputStream("PowerPoint Document").read(_nData); for(int i=0; i<_oData.length; i++) { - //System.out.println(i + "\t" + Integer.toHexString(i)); - assertEquals(_oData[i], _nData[i]); - } - npfs.close(); - } + //System.out.println(i + "\t" + Integer.toHexString(i)); + assertEquals(_oData[i], _nData[i]); + } + npfs.close(); + } @Test public void testWithMacroStreams() throws IOException { - // Check that they're apparently the same - assertSlideShowWritesOutTheSame(hssC, pfsC); - - // Currently has a Macros stream - assertNotNull( pfsC.getRoot().getEntry("Macros") ); - - // Write out normally, will loose the macro stream - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - hssC.write(baos); - ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); - POIFSFileSystem pfsNew = new POIFSFileSystem(bais); - assertFalse(pfsNew.getRoot().hasEntry("Macros")); - pfsNew.close(); - - // But if we write out with nodes preserved, will be there - baos.reset(); - hssC.write(baos, true); - bais = new ByteArrayInputStream(baos.toByteArray()); - pfsNew = new POIFSFileSystem(bais); - assertTrue( pfsNew.getRoot().hasEntry("Macros") ); - pfsNew.close(); + // Check that they're apparently the same + assertSlideShowWritesOutTheSame(hssC, pfsC); + + // Currently has a Macros stream + assertNotNull( pfsC.getRoot().getEntry("Macros") ); + + // Write out normally, will loose the macro stream + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + hssC.write(baos); + ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); + POIFSFileSystem pfsNew = new POIFSFileSystem(bais); + assertFalse(pfsNew.getRoot().hasEntry("Macros")); + pfsNew.close(); + + // But if we write out with nodes preserved, will be there + baos.reset(); + hssC.write(baos, true); + bais = new ByteArrayInputStream(baos.toByteArray()); + pfsNew = new POIFSFileSystem(bais); + assertTrue( pfsNew.getRoot().hasEntry("Macros") ); + pfsNew.close(); } /** @@ -130,62 +130,62 @@ public final class TestReWrite { */ @Test public void testSlideShowWritesOutTheSame() throws Exception { - assertSlideShowWritesOutTheSame(hssA, pfsA); + assertSlideShowWritesOutTheSame(hssA, pfsA); - // Some bug in StyleTextPropAtom rewriting means this will fail - // We need to identify and fix that first - //assertSlideShowWritesOutTheSame(hssB, pfsB); + // Some bug in StyleTextPropAtom rewriting means this will fail + // We need to identify and fix that first + //assertSlideShowWritesOutTheSame(hssB, pfsB); } public void assertSlideShowWritesOutTheSame(HSLFSlideShowImpl hss, POIFSFileSystem pfs) throws IOException { - // Create a slideshow covering it - @SuppressWarnings("resource") + // Create a slideshow covering it + @SuppressWarnings("resource") HSLFSlideShow ss = new HSLFSlideShow(hss); - ss.getSlides(); - ss.getNotes(); - - // Now write out to a byte array - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - hss.write(baos); - - // Build an input stream of it - ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); - - // Use POIFS to query that lot - POIFSFileSystem npfs = new POIFSFileSystem(bais); - - // Check that the "PowerPoint Document" sections have the same size - DocumentEntry oProps = (DocumentEntry)pfs.getRoot().getEntry("PowerPoint Document"); - DocumentEntry nProps = (DocumentEntry)npfs.getRoot().getEntry("PowerPoint Document"); - assertEquals(oProps.getSize(),nProps.getSize()); - - // Check that they contain the same data - byte[] _oData = new byte[oProps.getSize()]; - byte[] _nData = new byte[nProps.getSize()]; - pfs.createDocumentInputStream("PowerPoint Document").read(_oData); - npfs.createDocumentInputStream("PowerPoint Document").read(_nData); - for(int i=0; i<_oData.length; i++) { - if(_oData[i] != _nData[i]) - System.out.println(i + "\t" + Integer.toHexString(i)); - assertEquals(_oData[i], _nData[i]); - } - npfs.close(); - } + ss.getSlides(); + ss.getNotes(); + + // Now write out to a byte array + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + hss.write(baos); + + // Build an input stream of it + ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); + + // Use POIFS to query that lot + POIFSFileSystem npfs = new POIFSFileSystem(bais); + + // Check that the "PowerPoint Document" sections have the same size + DocumentEntry oProps = (DocumentEntry)pfs.getRoot().getEntry("PowerPoint Document"); + DocumentEntry nProps = (DocumentEntry)npfs.getRoot().getEntry("PowerPoint Document"); + assertEquals(oProps.getSize(),nProps.getSize()); + + // Check that they contain the same data + byte[] _oData = new byte[oProps.getSize()]; + byte[] _nData = new byte[nProps.getSize()]; + pfs.createDocumentInputStream("PowerPoint Document").read(_oData); + npfs.createDocumentInputStream("PowerPoint Document").read(_nData); + for(int i=0; i<_oData.length; i++) { + if(_oData[i] != _nData[i]) + System.out.println(i + "\t" + Integer.toHexString(i)); + assertEquals(_oData[i], _nData[i]); + } + npfs.close(); + } @Test public void test48593() throws IOException { - HSLFSlideShow ppt1 = new HSLFSlideShow(); - ppt1.createSlide(); - HSLFSlideShow ppt2 = HSLFTestDataSamples.writeOutAndReadBack(ppt1); - ppt2.createSlide(); - HSLFSlideShow ppt3 = HSLFTestDataSamples.writeOutAndReadBack(ppt2); - ppt3.createSlide(); - HSLFSlideShow ppt4 = HSLFTestDataSamples.writeOutAndReadBack(ppt3); - ppt4.createSlide(); - HSLFTestDataSamples.writeOutAndReadBack(ppt4).close(); - ppt4.close(); - ppt3.close(); - ppt2.close(); - ppt1.close(); + HSLFSlideShow ppt1 = new HSLFSlideShow(); + ppt1.createSlide(); + HSLFSlideShow ppt2 = HSLFTestDataSamples.writeOutAndReadBack(ppt1); + ppt2.createSlide(); + HSLFSlideShow ppt3 = HSLFTestDataSamples.writeOutAndReadBack(ppt2); + ppt3.createSlide(); + HSLFSlideShow ppt4 = HSLFTestDataSamples.writeOutAndReadBack(ppt3); + ppt4.createSlide(); + HSLFTestDataSamples.writeOutAndReadBack(ppt4).close(); + ppt4.close(); + ppt3.close(); + ppt2.close(); + ppt1.close(); } }