You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2016/03/22 19:19:39 UTC

tika git commit: TIKA-1855 -- test file ending in .bin was git-ignored and fix inputstream call in TestEmbedStandardInputStream

Repository: tika
Updated Branches:
  refs/heads/2.x 7bc3eae94 -> 4390fba13


TIKA-1855 -- test file ending in .bin was git-ignored and fix inputstream call in TestEmbedStandardInputStream


Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/4390fba1
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/4390fba1
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/4390fba1

Branch: refs/heads/2.x
Commit: 4390fba1317d5ee72af6a76f227311cc338043f5
Parents: 7bc3eae
Author: tballison <ta...@mitre.org>
Authored: Tue Mar 22 14:19:33 2016 -0400
Committer: tballison <ta...@mitre.org>
Committed: Tue Mar 22 14:19:33 2016 -0400

----------------------------------------------------------------------
 .gitignore                                           |   2 +-
 .../apache/tika/embedder/ExternalEmbedderTest.java   |   6 +++++-
 .../test-documents/test-malformed-header.html.bin    | Bin 0 -> 305 bytes
 3 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tika/blob/4390fba1/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 7da9077..abdf3ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@ target
 *.iml
 *.ipr
 *.iws
-*.bin
+ner-*.bin
 nbactions.xml
 nb-configuration.xml
 /bin/

http://git-wip-us.apache.org/repos/asf/tika/blob/4390fba1/tika-app/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java
----------------------------------------------------------------------
diff --git a/tika-app/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java b/tika-app/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java
index 45f68cc..8453941 100644
--- a/tika-app/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java
+++ b/tika-app/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java
@@ -127,7 +127,11 @@ public class ExternalEmbedderTest extends TikaTest {
      * @return a fresh input stream
      */
     protected InputStream getSourceStandardInputStream() {
-        return this.getClass().getResourceAsStream(TEST_TXT_PATH);
+        try {
+            return Files.newInputStream(TMP_TEST_TXT);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/tika/blob/4390fba1/tika-test-resources/src/test/resources/test-documents/test-malformed-header.html.bin
----------------------------------------------------------------------
diff --git a/tika-test-resources/src/test/resources/test-documents/test-malformed-header.html.bin b/tika-test-resources/src/test/resources/test-documents/test-malformed-header.html.bin
new file mode 100644
index 0000000..069ee51
Binary files /dev/null and b/tika-test-resources/src/test/resources/test-documents/test-malformed-header.html.bin differ