Author: yegor
Date: Sun Aug 21 15:01:23 2011
New Revision: 1159993
URL: http://svn.apache.org/viewvc?rev=1159993&view=rev
Log:
removed test document referenced in Bug 51524 because it cannot be distributed
with AL2 projects
Removed:
poi/trunk/test-data/document/Bug51524.zip
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java?rev=1159993&r1=1159992&r2=1159993&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java
Sun Aug 21 15:01:23 2011
@@ -20,6 +20,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.net.URL;
import java.util.zip.ZipInputStream;
import org.apache.poi.POIDataSamples;
@@ -90,6 +91,58 @@ public class HWPFTestDataSamples {
}
}
+ /**
+ * Open a remote sample from URL. opening is performd in two phases:
+ * (1) download content into a byte array
+ * (2) construct HWPFDocument
+ *
+ * @param sampleFileUrl the url to open
+ */
+ public static HWPFDocument openRemoteFile( String sampleFileUrl )
+ {
+ final long start = System.currentTimeMillis();
+ try
+ {
+ InputStream is = new URL( sampleFileUrl ).openStream();
+ try
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ try
+ {
+ IOUtils.copy( is, baos );
+ }
+ finally
+ {
+ baos.close();
+ }
+
+ final long endDownload = System.currentTimeMillis();
+ byte[] byteArray = baos.toByteArray();
+
+ logger.log( POILogger.DEBUG, "Downloaded in ",
+ Long.valueOf( endDownload - start ), " ms -- ",
+ Long.valueOf( byteArray.length ), " byte(s)" );
+
+ ByteArrayInputStream bais = new ByteArrayInputStream(
byteArray );
+ HWPFDocument doc = new HWPFDocument( bais );
+ final long endParse = System.currentTimeMillis();
+
+ logger.log( POILogger.DEBUG, "Parsed in ",
+ Long.valueOf( endParse - start ), " ms" );
+
+ return doc;
+ }
+ finally
+ {
+ is.close();
+ }
+ }
+ catch ( IOException e )
+ {
+ throw new RuntimeException( e );
+ }
+ }
+
public static HWPFOldDocument openOldSampleFile(String sampleFileName) {
try {
InputStream is =
POIDataSamples.getDocumentInstance().openResourceAsStream(sampleFileName);
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java?rev=1159993&r1=1159992&r2=1159993&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java
Sun Aug 21 15:01:23 2011
@@ -512,14 +512,6 @@ public class TestBugs extends TestCase
}
/**
- * Bug 51524 - PapBinTable constructor is slow
- */
- public void test51524()
- {
- HWPFTestDataSamples.openSampleFileFromArchive( "Bug51524.zip" );
- }
-
- /**
* [RESOLVED FIXED] Bug 51604 - replace text fails for doc ( poi 3.8 beta
* release from download site )
*/
@@ -649,13 +641,22 @@ public class TestBugs extends TestCase
}
+
/**
* Bug 51678 - Extracting text from Bug51524.zip is slow
+ * Bug 51524 - PapBinTable constructor is slow
*/
- public void test51678()
+ public void test51678And51524()
{
- HWPFDocument hwpfDocument =
HWPFTestDataSamples.openSampleFileFromArchive( "Bug51524.zip" );
- WordExtractor wordExtractor = new WordExtractor( hwpfDocument );
- wordExtractor.getText();
+ // YK: the test will run only if the poi.test.remote system property
is set.
+ // TODO: refactor into something nicer!
+ if(System.getProperty("poi.test.remote") != null) {
+ String href =
"http://domex.nps.edu/corp/files/govdocs1/007/007488.doc";;
+ HWPFDocument hwpfDocument = HWPFTestDataSamples.openRemoteFile(
href );
+
+ WordExtractor wordExtractor = new WordExtractor( hwpfDocument );
+ wordExtractor.getText();
+ }
+
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
