You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2015/09/29 08:08:08 UTC
svn commit: r1705804 - in /poi/trunk/src:
integrationtest/org/apache/poi/stress/XSLFFileHandler.java
ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java
Author: centic
Date: Tue Sep 29 06:08:08 2015
New Revision: 1705804
URL: http://svn.apache.org/viewvc?rev=1705804&view=rev
Log:
Verify that bug 45541 can be resolved, add some more checks in XSLFFileHandler
Modified:
poi/trunk/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java
Modified: poi/trunk/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java?rev=1705804&r1=1705803&r2=1705804&view=diff
==============================================================================
--- poi/trunk/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java (original)
+++ poi/trunk/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java Tue Sep 29 06:08:08 2015
@@ -16,13 +16,16 @@
==================================================================== */
package org.apache.poi.stress;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
+import org.apache.poi.extractor.ExtractorFactory;
import org.apache.poi.xslf.XSLFSlideShow;
+import org.apache.poi.xslf.extractor.XSLFPowerPointExtractor;
import org.apache.poi.xslf.usermodel.XMLSlideShow;
import org.junit.Test;
@@ -43,7 +46,25 @@ public class XSLFFileHandler extends Sli
slide.close();
}
- // a test-case to test this locally without executing the full TestAllFiles
+ public void handleExtracting(File file) throws Exception {
+ super.handleExtracting(file);
+
+
+ // additionally try the other getText() methods
+
+ XSLFPowerPointExtractor extractor = (XSLFPowerPointExtractor) ExtractorFactory.createExtractor(file);
+ try {
+ assertNotNull(extractor);
+
+ assertNotNull(extractor.getText(true, true, true));
+ assertEquals("With all options disabled we should not get text",
+ "", extractor.getText(false, false, false));
+ } finally {
+ extractor.close();
+ }
+ }
+
+ // a test-case to test this locally without executing the full TestAllFiles
@Test
public void test() throws Exception {
InputStream stream = new FileInputStream("test-data/slideshow/ae.ac.uaeu.faculty_nafaachbili_GeomLec1.pptx");
@@ -58,5 +79,5 @@ public class XSLFFileHandler extends Sli
@Test
public void testExtractor() throws Exception {
handleExtracting(new File("test-data/slideshow/ae.ac.uaeu.faculty_nafaachbili_GeomLec1.pptx"));
- }
+ }
}
\ No newline at end of file
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java?rev=1705804&r1=1705803&r2=1705804&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java Tue Sep 29 06:08:08 2015
@@ -16,11 +16,14 @@
==================================================================== */
package org.apache.poi.xslf.extractor;
-import junit.framework.TestCase;
import org.apache.poi.POIDataSamples;
+import org.apache.poi.POITextExtractor;
+import org.apache.poi.extractor.ExtractorFactory;
import org.apache.poi.openxml4j.opc.OPCPackage;
import org.apache.poi.xslf.XSLFSlideShow;
+import junit.framework.TestCase;
+
/**
* Tests for HXFPowerPointExtractor
*/
@@ -279,4 +282,36 @@ public class TestXSLFPowerPointExtractor
extractor.close();
}
}
+
+ public void test45541() throws Exception {
+ // extract text from a powerpoint that has a header in the notes-element
+ POITextExtractor extr = ExtractorFactory.createExtractor(slTests
+ .openResourceAsStream("45541_Header.pptx"));
+ String text = extr.getText();
+ assertNotNull(text);
+ assertFalse("Had: " + text, text.contains("testdoc"));
+
+ text = ((XSLFPowerPointExtractor)extr).getText(false, true);
+ assertNotNull(text);
+ assertTrue("Had: " + text, text.contains("testdoc"));
+ extr.close();
+ assertNotNull(text);
+
+ // extract text from a powerpoint that has a footer in the master-slide
+ extr = ExtractorFactory.createExtractor(slTests
+ .openResourceAsStream("45541_Footer.pptx"));
+ text = extr.getText();
+ assertNotNull(text);
+ assertFalse("Had " + text, text.contains("testdoc"));
+
+ text = ((XSLFPowerPointExtractor)extr).getText(false, true);
+ assertNotNull(text);
+ assertFalse("Had: " + text, text.contains("testdoc"));
+
+ text = ((XSLFPowerPointExtractor)extr).getText(false, false, true);
+ assertNotNull(text);
+ assertFalse("Had: " + text, text.contains("testdoc"));
+
+ extr.close();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org