From: Yegor Kozlov <yegor@apache.org>
Date: Sun, 21 Aug 2011 15:01:23 +0000 (+0000)
Subject: removed test document referenced in Bug 51524 because it cannot be distributed with... 
X-Git-Tag: REL_3_8_BETA4~1^2~18
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e11ec7dd93d17a495f5240d196357c2de6e0a9da;p=poi.git

removed test document referenced in Bug 51524 because it cannot be distributed with AL2 projects

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1159993 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java b/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java
index 4f0f81457e..891acc5838 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java
+++ b/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java
@@ -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);
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java
index b19622ff35..5566caf468 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java
+++ b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java
@@ -511,14 +511,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();
+        }
+
     }
 }
diff --git a/test-data/document/Bug51524.zip b/test-data/document/Bug51524.zip
deleted file mode 100644
index 4e5281f0cb..0000000000
Binary files a/test-data/document/Bug51524.zip and /dev/null differ