[tika] branch master updated: TIKA-2957 -- fix test broken by diff image handling in Java 11

[tallison]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new b044774  TIKA-2957 -- fix test broken by diff image handling in Java 11
b044774 is described below

commit b04477493d3f5f31b695af7f9f505ae8e1f47aa7
Author: tballison <talli...@apache.org>
AuthorDate: Fri Oct 4 09:29:50 2019 -0400

    TIKA-2957 -- fix test broken by diff image handling in Java 11
---
 .../src/test/java/org/apache/tika/server/UnpackerResourceTest.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git 
a/tika-server/src/test/java/org/apache/tika/server/UnpackerResourceTest.java 
b/tika-server/src/test/java/org/apache/tika/server/UnpackerResourceTest.java
index e589a12..64b8ab9 100644
--- a/tika-server/src/test/java/org/apache/tika/server/UnpackerResourceTest.java
+++ b/tika-server/src/test/java/org/apache/tika/server/UnpackerResourceTest.java
@@ -205,6 +205,11 @@ public class UnpackerResourceTest extends CXFTestBase {
                 .put(ClassLoader.getSystemResourceAsStream("testOCR.pdf"));
         Map<String, String> results = 
readZipArchive((InputStream)response.getEntity());
         assertTrue(results.containsKey("image0.png"));
-        assertEquals("7c2f14acbb737672a1245f4ceb50622a", 
results.get("image0.png"));
+        String md5 = results.get("image0.png");
+        assertTrue(
+                //pre Java 11
+                md5.equals("7c2f14acbb737672a1245f4ceb50622a") ||
+                //Java 11 -- underlying image libraries generate a diff image 
in Java 11
+                md5.equals("58b8269d1a584b7e8c1adcb936123923"));
     }
 }