[tika] branch TIKA-2849 updated: TIKA-2849 -- update non-test timing

[tallison]

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch TIKA-2849
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/TIKA-2849 by this push:
     new 4dc119a  TIKA-2849 -- update non-test timing
4dc119a is described below

commit 4dc119af2ea07e02c16cad25d6fbc6dfaf02d76f
Author: TALLISON <talli...@apache.org>
AuthorDate: Fri Apr 19 15:19:22 2019 -0400

    TIKA-2849 -- update non-test timing
---
 .../tika/parser/pkg/ZipContainerDetectorTest.java  | 25 +++++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git 
a/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ZipContainerDetectorTest.java
 
b/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ZipContainerDetectorTest.java
index 8c92986..0e3ff97 100644
--- 
a/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ZipContainerDetectorTest.java
+++ 
b/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ZipContainerDetectorTest.java
@@ -122,7 +122,7 @@ public class ZipContainerDetectorTest extends TikaTest {
         long nonTikaStream = 0;
         long tikaStream = 0;
         long tikaStreamWFile = 0;
-        for (int i = 0; i < 10; i++) {
+        for (int i = 0; i < 20; i++) {
             for (File z : zips) {
                 long start = System.currentTimeMillis();
                 try (InputStream is = new BufferedInputStream(new 
FileInputStream(z))) {
@@ -147,7 +147,8 @@ public class ZipContainerDetectorTest extends TikaTest {
                 tikaStreamWFile += System.currentTimeMillis()-start;
             }
         }
-        System.out.println("tika stream: "+tikaStream + " tika stream w file: 
"+tikaStreamWFile + " non tika stream:"+nonTikaStream);
+        System.out.println("tika stream: "+tikaStream + "\ntika stream w file: 
"
+                +tikaStreamWFile + "\nnon tika stream:"+nonTikaStream);
     }
 
     @Test
@@ -160,23 +161,31 @@ public class ZipContainerDetectorTest extends TikaTest {
         List<File> zips = getTestZipBasedFiles(detector, registry);
         System.out.println("zips size: "+zips.size());
         Set<MediaType> mediaTypeSet = new HashSet<>();
-        long stream = 0;
-        long file = 0;
-        for (int i = 0; i < 20; i++) {
+        long nonTikaStream = 0;
+        long tikaStream = 0;
+        long tikaStreamWFile = 0;
+        for (int i = 0; i < 10; i++) {
             for (File z : zips) {
                 long start = System.currentTimeMillis();
                 try (InputStream is = new BufferedInputStream(new 
FileInputStream(z))) {
                     getRecursiveMetadata(is, true);
                 }
-                stream += System.currentTimeMillis()-start;
+                nonTikaStream += System.currentTimeMillis()-start;
+                start = System.currentTimeMillis();
+                try (InputStream is = TikaInputStream.get(
+                        new BufferedInputStream(new FileInputStream(z)))) {
+                    getRecursiveMetadata(is, true);
+                }
+                tikaStream += System.currentTimeMillis()-start;
                 start = System.currentTimeMillis();
                 try (InputStream is = TikaInputStream.get(z)) {
                     getRecursiveMetadata(is, true);
                 }
-                file += System.currentTimeMillis()-start;
+                tikaStreamWFile += System.currentTimeMillis()-start;
+
             }
         }
-        System.out.println("stream: "+stream + " file: "+file);
+        System.out.println("tika stream: "+tikaStream + "\ntika stream w file: 
"+tikaStreamWFile + "\nnon tika stream:"+nonTikaStream);
     }
 
     //TODO -- we need to find a dwg+xps file for testing