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

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

commit 5fad37ed673af36e90e303b2dfa78ec6f692cb39
Author: tallison <[email protected]>
AuthorDate: Mon Jun 22 12:48:05 2020 -0400

    TIKA-3122 -- merge conflict
---
 .../src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java 
b/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
index 9e267dd..57b6eb2 100644
--- a/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
+++ b/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
@@ -1610,7 +1610,7 @@ public class PDFParserTest extends TikaTest {
         assertEquals("/image0.png", 
metadataList.get(1).get(RecursiveParserWrapperHandler.EMBEDDED_RESOURCE_PATH));
         assertEquals(261, 
(int)metadataList.get(1).getInt(Metadata.IMAGE_LENGTH));
         assertEquals(934, 
(int)metadataList.get(1).getInt(Metadata.IMAGE_WIDTH));
-        assertEquals("image0.png", 
metadataList.get(1).get(TikaCoreProperties.RESOURCE_NAME_KEY));
+        assertEquals("image0.png", 
metadataList.get(1).get(Metadata.RESOURCE_NAME_KEY));
     }
     /**
      * Simple class to count end of document events.  If functionality is 
useful,

Reply via email to