You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2020/08/13 21:08:25 UTC
svn commit: r1880839 [3/3] - in /poi/trunk/src:
integrationtest/org/apache/poi/stress/ java/org/apache/poi/extractor/
java/org/apache/poi/hpsf/extractor/ java/org/apache/poi/hssf/extractor/
java/org/apache/poi/sl/extractor/ java/org/apache/poi/ss/extra...
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java?rev=1880839&r1=1880838&r2=1880839&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java Thu Aug 13 21:08:24 2020
@@ -42,7 +42,6 @@ import org.apache.poi.hsmf.datatypes.Pro
import org.apache.poi.hsmf.datatypes.PropertyValue.LongPropertyValue;
import org.apache.poi.hsmf.datatypes.PropertyValue.TimePropertyValue;
import org.apache.poi.hsmf.dev.HSMFDump;
-import org.apache.poi.hsmf.extractor.OutlookTextExtactor;
import org.apache.poi.hsmf.extractor.OutlookTextExtractor;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.LocaleUtil;
@@ -74,23 +73,23 @@ public final class TestFixedSizedPropert
fsMessageFails = new POIFSFileSystem(samples.getFile(messageFails));
mapiMessageSucceeds = new MAPIMessage(fsMessageSucceeds);
- mapiMessageFails = new MAPIMessage(fsMessageFails);
-
+ mapiMessageFails = new MAPIMessage(fsMessageFails);
+
messageDateFormat = new SimpleDateFormat("E, d MMM yyyy HH:mm:ss", Locale.ROOT);
- messageDateFormat.setTimeZone(LocaleUtil.TIMEZONE_UTC);
+ messageDateFormat.setTimeZone(LocaleUtil.TIMEZONE_UTC);
userTimeZone = LocaleUtil.getUserTimeZone();
LocaleUtil.setUserTimeZone(LocaleUtil.TIMEZONE_UTC);
}
-
-
+
+
@AfterClass
public static void closeFS() throws Exception {
LocaleUtil.setUserTimeZone(userTimeZone);
fsMessageSucceeds.close();
fsMessageFails.close();
}
-
+
/**
* Check we can find a sensible number of properties on a few
* of our test files
@@ -98,21 +97,21 @@ public final class TestFixedSizedPropert
@Test
public void testPropertiesFound() {
Map<MAPIProperty,List<PropertyValue>> props;
-
+
props = mapiMessageSucceeds.getMainChunks().getProperties();
assertTrue(props.toString(), props.size() > 10);
-
+
props = mapiMessageFails.getMainChunks().getProperties();
assertTrue(props.toString(), props.size() > 10);
}
-
+
/**
* Check we find properties of a variety of different types
*/
@Test
public void testPropertyValueTypes() {
Chunks mainChunks = mapiMessageSucceeds.getMainChunks();
-
+
// Ask to have the values looked up
Map<MAPIProperty,List<PropertyValue>> props = mainChunks.getProperties();
HashSet<Class<? extends PropertyValue>> seenTypes =
@@ -126,7 +125,7 @@ public final class TestFixedSizedPropert
assertTrue(seenTypes.toString(), seenTypes.contains(LongPropertyValue.class));
assertTrue(seenTypes.toString(), seenTypes.contains(TimePropertyValue.class));
assertFalse(seenTypes.toString(), seenTypes.contains(ChunkBasedPropertyValue.class));
-
+
// Ask for the raw values
seenTypes.clear();
for (PropertyValue pv : mainChunks.getRawProperties().values()) {
@@ -144,31 +143,21 @@ public final class TestFixedSizedPropert
@Test
public void testReadMessageDateSucceedsWithOutlookTextExtractor() throws Exception {
OutlookTextExtractor ext = new OutlookTextExtractor(mapiMessageSucceeds);
- ext.setFilesystem(null); // Don't close re-used test resources here
-
+ ext.setCloseFilesystem(false);
+
String text = ext.getText();
assertContains(text, "Date: Fri, 22 Jun 2012 18:32:54 +0000\n");
ext.close();
}
- @Test
- public void testReadMessageDateSucceedsWithOutlookTextExtactor() throws Exception {
- OutlookTextExtactor ext = new OutlookTextExtactor(mapiMessageSucceeds);
- ext.setFilesystem(null); // Don't close re-used test resources here
-
- String text = ext.getText();
- assertContains(text, "Date: Fri, 22 Jun 2012 18:32:54 +0000\n");
- ext.close();
- }
-
/**
* Test to see if we can read the Date Chunk with OutlookTextExtractor.
*/
@Test
public void testReadMessageDateFailsWithOutlookTextExtractor() throws Exception {
OutlookTextExtractor ext = new OutlookTextExtractor(mapiMessageFails);
- ext.setFilesystem(null); // Don't close re-used test resources here
-
+ ext.setCloseFilesystem(false);
+
String text = ext.getText();
assertContains(text, "Date: Thu, 21 Jun 2012 14:14:04 +0000\n");
ext.close();
@@ -182,7 +171,7 @@ public final class TestFixedSizedPropert
PrintStream stream = new PrintStream(new ByteArrayOutputStream());
HSMFDump dump = new HSMFDump(fsMessageSucceeds);
dump.dump(stream);
- }
+ }
/**
* Test to see if we can read the Date Chunk with HSMFDump.
@@ -202,19 +191,19 @@ public final class TestFixedSizedPropert
// Check via the message date
Calendar clientSubmitTime = mapiMessageSucceeds.getMessageDate();
assertEquals(
- "Fri, 22 Jun 2012 18:32:54",
+ "Fri, 22 Jun 2012 18:32:54",
messageDateFormat.format(clientSubmitTime.getTime()));
-
+
// Fetch the property value directly
Map<MAPIProperty,List<PropertyValue>> props =
mapiMessageSucceeds.getMainChunks().getProperties();
- List<PropertyValue> pv = props.get(MAPIProperty.CLIENT_SUBMIT_TIME);
+ List<PropertyValue> pv = props.get(MAPIProperty.CLIENT_SUBMIT_TIME);
assertNotNull(pv);
assertEquals(1, pv.size());
-
+
clientSubmitTime = (Calendar)pv.get(0).getValue();
assertEquals(
- "Fri, 22 Jun 2012 18:32:54",
+ "Fri, 22 Jun 2012 18:32:54",
messageDateFormat.format(clientSubmitTime.getTime()));
}
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java?rev=1880839&r1=1880838&r2=1880839&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java Thu Aug 13 21:08:24 2020
@@ -20,7 +20,6 @@ package org.apache.poi.hsmf.extractor;
import static org.apache.poi.POITestCase.assertContains;
import static org.apache.poi.POITestCase.assertNotContained;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import java.io.FileInputStream;
import java.text.SimpleDateFormat;
@@ -57,68 +56,62 @@ public final class TestOutlookTextExtrac
@Test
public void testQuick() throws Exception {
- POIFSFileSystem poifs = new POIFSFileSystem(samples.getFile("quick.msg"), true);
- MAPIMessage msg = new MAPIMessage(poifs);
-
- OutlookTextExtractor ext = new OutlookTextExtractor(msg);
- String text = ext.getText();
-
- assertContains(text, "From: Kevin Roast\n");
- assertContains(text, "To: Kevin Roast <ke...@alfresco.org>\n");
- assertNotContained(text, "CC:");
- assertNotContained(text, "BCC:");
- assertNotContained(text, "Attachment:");
- assertContains(text, "Subject: Test the content transformer\n");
- Calendar cal = LocaleUtil.getLocaleCalendar(2007, 5, 14, 9, 42, 55);
- SimpleDateFormat f = new SimpleDateFormat("E, d MMM yyyy HH:mm:ss Z", Locale.ROOT);
- f.setTimeZone(LocaleUtil.getUserTimeZone());
- String dateText = f.format(cal.getTime());
- assertContains(text, "Date: " + dateText + "\n");
- assertContains(text, "The quick brown fox jumps over the lazy dog");
+ try (POIFSFileSystem poifs = new POIFSFileSystem(samples.getFile("quick.msg"), true);
+ MAPIMessage msg = new MAPIMessage(poifs);
+ OutlookTextExtractor ext = new OutlookTextExtractor(msg)) {
+ String text = ext.getText();
- ext.close();
- poifs.close();
+ assertContains(text, "From: Kevin Roast\n");
+ assertContains(text, "To: Kevin Roast <ke...@alfresco.org>\n");
+ assertNotContained(text, "CC:");
+ assertNotContained(text, "BCC:");
+ assertNotContained(text, "Attachment:");
+ assertContains(text, "Subject: Test the content transformer\n");
+ Calendar cal = LocaleUtil.getLocaleCalendar(2007, 5, 14, 9, 42, 55);
+ SimpleDateFormat f = new SimpleDateFormat("E, d MMM yyyy HH:mm:ss Z", Locale.ROOT);
+ f.setTimeZone(LocaleUtil.getUserTimeZone());
+ String dateText = f.format(cal.getTime());
+ assertContains(text, "Date: " + dateText + "\n");
+ assertContains(text, "The quick brown fox jumps over the lazy dog");
+ }
}
@Test
public void testSimple() throws Exception {
- POIFSFileSystem poifs = new POIFSFileSystem(samples.getFile("simple_test_msg.msg"), true);
- MAPIMessage msg = new MAPIMessage(poifs);
-
- OutlookTextExtractor ext = new OutlookTextExtractor(msg);
- String text = ext.getText();
-
- assertContains(text, "From: Travis Ferguson\n");
- assertContains(text, "To: travis@overwrittenstack.com\n");
- assertNotContained(text, "CC:");
- assertNotContained(text, "BCC:");
- assertContains(text, "Subject: test message\n");
- assertContains(text, "Date: Fri, 6 Jul 2007 05:27:17 +0000\n");
- assertContains(text, "This is a test message.");
+ try (POIFSFileSystem poifs = new POIFSFileSystem(samples.getFile("simple_test_msg.msg"), true);
+ MAPIMessage msg = new MAPIMessage(poifs);
+ OutlookTextExtractor ext = new OutlookTextExtractor(msg)) {
+ String text = ext.getText();
- ext.close();
- poifs.close();
+ assertContains(text, "From: Travis Ferguson\n");
+ assertContains(text, "To: travis@overwrittenstack.com\n");
+ assertNotContained(text, "CC:");
+ assertNotContained(text, "BCC:");
+ assertContains(text, "Subject: test message\n");
+ assertContains(text, "Date: Fri, 6 Jul 2007 05:27:17 +0000\n");
+ assertContains(text, "This is a test message.");
+ }
}
@Test
public void testConstructors() throws Exception {
- FileInputStream fis = new FileInputStream(samples.getFile("simple_test_msg.msg"));
- OutlookTextExtractor ext = new OutlookTextExtractor(fis);
- String inp = ext.getText();
- ext.close();
- fis.close();
-
- POIFSFileSystem poifs = new POIFSFileSystem(samples.getFile("simple_test_msg.msg"), true);
- ext = new OutlookTextExtractor(poifs);
- String poifsTxt = ext.getText();
- ext.close();
- poifs.close();
-
- fis = new FileInputStream(samples.getFile("simple_test_msg.msg"));
- ext = new OutlookTextExtractor(new MAPIMessage(fis));
- String mapi = ext.getText();
- ext.close();
- fis.close();
+ String inp;
+ try (FileInputStream fis = new FileInputStream(samples.getFile("simple_test_msg.msg"));
+ OutlookTextExtractor ext = new OutlookTextExtractor(fis)) {
+ inp = ext.getText();
+ }
+
+ String poifsTxt;
+ try (POIFSFileSystem poifs = new POIFSFileSystem(samples.getFile("simple_test_msg.msg"), true);
+ OutlookTextExtractor ext = new OutlookTextExtractor(poifs)){
+ poifsTxt = ext.getText();
+ }
+
+ String mapi;
+ try (FileInputStream fis = new FileInputStream(samples.getFile("simple_test_msg.msg"));
+ OutlookTextExtractor ext = new OutlookTextExtractor(new MAPIMessage(fis))) {
+ mapi = ext.getText();
+ }
assertEquals(inp, poifsTxt);
assertEquals(inp, mapi);
@@ -142,25 +135,22 @@ public final class TestOutlookTextExtrac
"example_sent_regular.msg", "example_sent_unicode.msg"
};
for (String file : files) {
- POIFSFileSystem poifs = new POIFSFileSystem(samples.getFile(file), true);
- MAPIMessage msg = new MAPIMessage(poifs);
-
- OutlookTextExtractor ext = new OutlookTextExtractor(msg);
- String text = ext.getText();
-
- assertContains(text, "From: Mike Farman\n");
- assertContains(text, "To: 'Ashutosh Dandavate' <as...@alfresco.com>; " +
- "'Paul Holmes-Higgin' <pa...@alfresco.com>; 'Mike Farman' <mi...@alfresco.com>\n");
- assertContains(text, "CC: 'nickb@alfresco.com' <ni...@alfresco.com>; " +
- "'nick.burch@alfresco.com' <ni...@alfresco.com>; 'Roy Wetherall' <ro...@alfresco.com>\n");
- assertContains(text, "BCC: 'David Caruana' <da...@alfresco.com>; " +
- "'Vonka Jan' <ja...@alfresco.com>\n");
- assertContains(text, "Subject: This is a test message please ignore\n");
- assertContains(text, "Date:");
- assertContains(text, "The quick brown fox jumps over the lazy dog");
-
- ext.close();
- poifs.close();
+ try (POIFSFileSystem poifs = new POIFSFileSystem(samples.getFile(file), true);
+ MAPIMessage msg = new MAPIMessage(poifs);
+ OutlookTextExtractor ext = new OutlookTextExtractor(msg)) {
+ String text = ext.getText();
+
+ assertContains(text, "From: Mike Farman\n");
+ assertContains(text, "To: 'Ashutosh Dandavate' <as...@alfresco.com>; " +
+ "'Paul Holmes-Higgin' <pa...@alfresco.com>; 'Mike Farman' <mi...@alfresco.com>\n");
+ assertContains(text, "CC: 'nickb@alfresco.com' <ni...@alfresco.com>; " +
+ "'nick.burch@alfresco.com' <ni...@alfresco.com>; 'Roy Wetherall' <ro...@alfresco.com>\n");
+ assertContains(text, "BCC: 'David Caruana' <da...@alfresco.com>; " +
+ "'Vonka Jan' <ja...@alfresco.com>\n");
+ assertContains(text, "Subject: This is a test message please ignore\n");
+ assertContains(text, "Date:");
+ assertContains(text, "The quick brown fox jumps over the lazy dog");
+ }
}
}
@@ -182,25 +172,21 @@ public final class TestOutlookTextExtrac
"example_received_regular.msg", "example_received_unicode.msg"
};
for (String file : files) {
- POIFSFileSystem poifs = new POIFSFileSystem(samples.getFile(file), true);
- MAPIMessage msg = new MAPIMessage(poifs);
-
-
- OutlookTextExtractor ext = new OutlookTextExtractor(msg);
- String text = ext.getText();
-
- assertContains(text, "From: Mike Farman\n");
- assertContains(text, "To: 'Ashutosh Dandavate' <as...@alfresco.com>; " +
- "'Paul Holmes-Higgin' <pa...@alfresco.com>; 'Mike Farman' <mi...@alfresco.com>\n");
- assertContains(text, "CC: nickb@alfresco.com; " +
- "nick.burch@alfresco.com; 'Roy Wetherall' <ro...@alfresco.com>\n");
- assertNotContained(text, "BCC:");
- assertContains(text, "Subject: This is a test message please ignore\n");
- assertContains(text, "Date: Mon, 11 Jan 2010 16:2"); // Exact times differ slightly
- assertContains(text, "The quick brown fox jumps over the lazy dog");
-
- ext.close();
- poifs.close();
+ try (POIFSFileSystem poifs = new POIFSFileSystem(samples.getFile(file), true);
+ MAPIMessage msg = new MAPIMessage(poifs);
+ OutlookTextExtractor ext = new OutlookTextExtractor(msg)) {
+ String text = ext.getText();
+
+ assertContains(text, "From: Mike Farman\n");
+ assertContains(text, "To: 'Ashutosh Dandavate' <as...@alfresco.com>; " +
+ "'Paul Holmes-Higgin' <pa...@alfresco.com>; 'Mike Farman' <mi...@alfresco.com>\n");
+ assertContains(text, "CC: nickb@alfresco.com; " +
+ "nick.burch@alfresco.com; 'Roy Wetherall' <ro...@alfresco.com>\n");
+ assertNotContained(text, "BCC:");
+ assertContains(text, "Subject: This is a test message please ignore\n");
+ assertContains(text, "Date: Mon, 11 Jan 2010 16:2"); // Exact times differ slightly
+ assertContains(text, "The quick brown fox jumps over the lazy dog");
+ }
}
}
@@ -210,85 +196,59 @@ public final class TestOutlookTextExtrac
@SuppressWarnings("JavadocReference")
@Test
public void testWithAttachments() throws Exception {
- POIFSFileSystem poifs = new POIFSFileSystem(samples.getFile("attachment_test_msg.msg"), true);
- MAPIMessage msg = new MAPIMessage(poifs);
- OutlookTextExtractor ext = new OutlookTextExtractor(msg);
-
- // Check the normal bits
- String text = ext.getText();
-
- assertContains(text, "From: Nicolas1");
- assertContains(text, "To: 'nicolas1.23456@free.fr'");
- assertNotContained(text, "CC:");
- assertNotContained(text, "BCC:");
- assertContains(text, "Subject: test");
- assertContains(text, "Date: Wed, 22 Apr");
- assertContains(text, "Attachment: test-unicode.doc\n");
- assertContains(text, "Attachment: pj1.txt\n");
- assertContains(text, "contenu");
+ try (POIFSFileSystem poifs = new POIFSFileSystem(samples.getFile("attachment_test_msg.msg"), true);
+ MAPIMessage msg = new MAPIMessage(poifs);
+ OutlookTextExtractor ext = new OutlookTextExtractor(msg)) {
+
+ // Check the normal bits
+ String text = ext.getText();
- // Embeded bits are checked in
- // TestExtractorFactory
+ assertContains(text, "From: Nicolas1");
+ assertContains(text, "To: 'nicolas1.23456@free.fr'");
+ assertNotContained(text, "CC:");
+ assertNotContained(text, "BCC:");
+ assertContains(text, "Subject: test");
+ assertContains(text, "Date: Wed, 22 Apr");
+ assertContains(text, "Attachment: test-unicode.doc\n");
+ assertContains(text, "Attachment: pj1.txt\n");
+ assertContains(text, "contenu");
- ext.close();
- poifs.close();
+ // Embeded bits are checked in
+ // TestExtractorFactory
+ }
}
@Test
public void testWithAttachedMessage() throws Exception {
- POIFSFileSystem poifs = new POIFSFileSystem(samples.getFile("58214_with_attachment.msg"), true);
- MAPIMessage msg = new MAPIMessage(poifs);
- OutlookTextExtractor ext = new OutlookTextExtractor(msg);
- String text = ext.getText();
-
- // Check we got bits from the main message
- assertContains(text, "Master mail");
- assertContains(text, "ante in lacinia euismod");
-
- // But not the attached message
- assertNotContained(text, "Test mail attachment");
- assertNotContained(text, "Lorem ipsum dolor sit");
+ try (POIFSFileSystem poifs = new POIFSFileSystem(samples.getFile("58214_with_attachment.msg"), true);
+ MAPIMessage msg = new MAPIMessage(poifs);
+ OutlookTextExtractor ext = new OutlookTextExtractor(msg)) {
+ String text = ext.getText();
- ext.close();
- poifs.close();
+ // Check we got bits from the main message
+ assertContains(text, "Master mail");
+ assertContains(text, "ante in lacinia euismod");
+
+ // But not the attached message
+ assertNotContained(text, "Test mail attachment");
+ assertNotContained(text, "Lorem ipsum dolor sit");
+ }
}
@Test
public void testEncodings() throws Exception {
- POIFSFileSystem poifs = new POIFSFileSystem(samples.getFile("chinese-traditional.msg"), true);
- MAPIMessage msg = new MAPIMessage(poifs);
- OutlookTextExtractor ext = new OutlookTextExtractor(msg);
- String text = ext.getText();
-
- // Check the english bits
- assertContains(text, "From: Tests Chang@FT");
- assertContains(text, "tests.chang@fengttt.com");
-
- // And check some chinese bits
- assertContains(text, "(\u5f35\u6bd3\u502b)");
- assertContains(text, "( MSG \u683c\u5f0f\u6e2c\u8a66 )");
-
- ext.close();
- poifs.close();
- }
-
- @Test
- public void testEncodingsDeprecatedClass() throws Exception {
- POIFSFileSystem poifs = new POIFSFileSystem(samples.getFile("chinese-traditional.msg"), true);
- MAPIMessage msg = new MAPIMessage(poifs);
- OutlookTextExtactor ext = new OutlookTextExtactor(msg);
- assertTrue("OutlookTextExtactor instanceof OutlookTextExtractor", ext instanceof OutlookTextExtractor);
- String text = ext.getText();
-
- // Check the english bits
- assertContains(text, "From: Tests Chang@FT");
- assertContains(text, "tests.chang@fengttt.com");
-
- // And check some chinese bits
- assertContains(text, "(\u5f35\u6bd3\u502b)");
- assertContains(text, "( MSG \u683c\u5f0f\u6e2c\u8a66 )");
+ try (POIFSFileSystem poifs = new POIFSFileSystem(samples.getFile("chinese-traditional.msg"), true);
+ MAPIMessage msg = new MAPIMessage(poifs);
+ OutlookTextExtractor ext = new OutlookTextExtractor(msg)) {
+ String text = ext.getText();
- ext.close();
- poifs.close();
+ // Check the english bits
+ assertContains(text, "From: Tests Chang@FT");
+ assertContains(text, "tests.chang@fengttt.com");
+
+ // And check some chinese bits
+ assertContains(text, "(\u5f35\u6bd3\u502b)");
+ assertContains(text, "( MSG \u683c\u5f0f\u6e2c\u8a66 )");
+ }
}
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java?rev=1880839&r1=1880838&r2=1880839&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java Thu Aug 13 21:08:24 2020
@@ -17,16 +17,16 @@
package org.apache.poi.hwpf.extractor;
-import org.apache.poi.POIDataSamples;
-import org.apache.poi.extractor.POITextExtractor;
-import org.apache.poi.extractor.OLE2ExtractorFactory;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
import java.io.IOException;
import java.io.InputStream;
-import static org.junit.Assert.assertNotNull;
+import org.apache.poi.POIDataSamples;
+import org.apache.poi.extractor.ExtractorFactory;
+import org.apache.poi.extractor.POITextExtractor;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.junit.Test;
/**
* Tests for bugs with the WordExtractor
@@ -61,7 +61,7 @@ public final class TestWordExtractorBugs
@Test
public void testBug60374() throws Exception {
POIFSFileSystem fs = new POIFSFileSystem(SAMPLES.openResourceAsStream("cn.orthodox.www_divenbog_APRIL_30-APRIL.DOC"));
- final POITextExtractor extractor = OLE2ExtractorFactory.createExtractor(fs);
+ final POITextExtractor extractor = ExtractorFactory.createExtractor(fs);
// Check it gives text without error
assertNotNull(extractor.getText());
Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java?rev=1880839&r1=1880838&r2=1880839&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java Thu Aug 13 21:08:24 2020
@@ -25,7 +25,7 @@ import java.io.IOException;
import java.io.InputStream;
import org.apache.poi.POIDataSamples;
-import org.apache.poi.hpsf.*;
+import org.apache.poi.hpsf.Thumbnail;
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.extractor.ExcelExtractor;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -101,42 +101,31 @@ public final class TestHPSFPropertiesExt
@Test
public void testConstructors() throws IOException {
- POIFSFileSystem fs;
- HSSFWorkbook wb;
- try {
- fs = new POIFSFileSystem(_samples.openResourceAsStream("TestUnicode.xls"));
- wb = new HSSFWorkbook(fs);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- ExcelExtractor excelExt = new ExcelExtractor(wb);
-
final String fsText;
- HPSFPropertiesExtractor fsExt = new HPSFPropertiesExtractor(fs);
- fsExt.setFilesystem(null); // Don't close re-used test resources!
- try {
- fsText = fsExt.getText();
- } finally {
- fsExt.close();
- }
-
final String hwText;
- HPSFPropertiesExtractor hwExt = new HPSFPropertiesExtractor(wb);
- hwExt.setFilesystem(null); // Don't close re-used test resources!
- try {
- hwText = hwExt.getText();
- } finally {
- hwExt.close();
- }
-
final String eeText;
- HPSFPropertiesExtractor eeExt = new HPSFPropertiesExtractor(excelExt);
- eeExt.setFilesystem(null); // Don't close re-used test resources!
- try {
- eeText = eeExt.getText();
- } finally {
- eeExt.close();
- wb.close();
+
+ try (POIFSFileSystem fs = new POIFSFileSystem(_samples.openResourceAsStream("TestUnicode.xls"));
+ HSSFWorkbook wb = new HSSFWorkbook(fs);
+ ExcelExtractor excelExt = new ExcelExtractor(wb)) {
+
+ try (HPSFPropertiesExtractor fsExt = new HPSFPropertiesExtractor(fs)) {
+ // Don't close re-used test resources!
+ fsExt.setCloseFilesystem(false);
+ fsText = fsExt.getText();
+ }
+
+ try (HPSFPropertiesExtractor hwExt = new HPSFPropertiesExtractor(wb)) {
+ // Don't close re-used test resources!
+ hwExt.setCloseFilesystem(false);
+ hwText = hwExt.getText();
+ }
+
+ try (HPSFPropertiesExtractor eeExt = new HPSFPropertiesExtractor(excelExt)) {
+ // Don't close re-used test resources!
+ eeExt.setCloseFilesystem(false);
+ eeText = eeExt.getText();
+ }
}
assertEquals(fsText, hwText);
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java?rev=1880839&r1=1880838&r2=1880839&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java Thu Aug 13 21:08:24 2020
@@ -43,9 +43,7 @@ public final class TestExcelExtractor {
private static ExcelExtractor createExtractor(String sampleFileName) throws IOException {
File file = HSSFTestDataSamples.getSampleFile(sampleFileName);
POIFSFileSystem fs = new POIFSFileSystem(file);
- ExcelExtractor extractor = new ExcelExtractor(fs);
- extractor.setFilesystem(fs);
- return extractor;
+ return new ExcelExtractor(fs);
}
@Test
@@ -223,16 +221,16 @@ public final class TestExcelExtractor {
extractor.setIncludeBlankCells(false);
extractor.setIncludeSheetNames(false);
String text = extractor.getText();
-
+
// Note - not all the formats in the file
// actually quite match what they claim to
// be, as some are auto-local builtins...
-
+
assertStartsWith(text, "Dates, all 24th November 2006\n");
assertContains(text, "yyyy/mm/dd\t2006/11/24\n");
assertContains(text, "yyyy-mm-dd\t2006-11-24\n");
assertContains(text, "dd-mm-yy\t24-11-06\n");
-
+
assertContains(text, "nn.nn\t10.52\n");
assertContains(text, "nn.nnn\t10.520\n");
assertContains(text, "\u00a3nn.nn\t\u00a310.52\n");
@@ -247,7 +245,7 @@ public final class TestExcelExtractor {
@Test
public void testWithEmbeded() throws Exception {
POIFSFileSystem fs = null;
-
+
HSSFWorkbook wbA = null, wbB = null;
ExcelExtractor exA = null, exB = null;
@@ -257,7 +255,7 @@ public final class TestExcelExtractor {
DirectoryNode objPool = (DirectoryNode) fs.getRoot().getEntry("ObjectPool");
DirectoryNode dirA = (DirectoryNode) objPool.getEntry("_1269427460");
DirectoryNode dirB = (DirectoryNode) objPool.getEntry("_1269427461");
-
+
wbA = new HSSFWorkbook(dirA, fs, true);
exA = new ExcelExtractor(wbA);
wbB = new HSSFWorkbook(dirB, fs, true);
@@ -299,10 +297,10 @@ public final class TestExcelExtractor {
exB = new ExcelExtractor(wbB);
assertEquals("Sheet1\nTest excel file\nThis is the first file\nSheet2\nSheet3\n", exA.getText());
assertEquals("Sample Excel", exA.getSummaryInformation().getTitle());
-
+
assertEquals("Sheet1\nAnother excel file\nThis is the second file\nSheet2\nSheet3\n", exB.getText());
assertEquals("Sample Excel 2", exB.getSummaryInformation().getTitle());
-
+
// And the base file too
ex = new ExcelExtractor(fs);
assertEquals("Sheet1\nI have lots of embeded files in me\nSheet2\nSheet3\n", ex.getText());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org