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 6efea4f4d6039d53dc31edca6a1977b9710031a0 Author: tallison <[email protected]> AuthorDate: Wed May 5 12:42:30 2021 -0400 TIKA-3386 -- fix conflicts --- .../src/test/java/org/apache/tika/parser/mock/MockParserTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tika-core/src/test/java/org/apache/tika/parser/mock/MockParserTest.java b/tika-core/src/test/java/org/apache/tika/parser/mock/MockParserTest.java index ade8b90..8268ea1 100644 --- a/tika-core/src/test/java/org/apache/tika/parser/mock/MockParserTest.java +++ b/tika-core/src/test/java/org/apache/tika/parser/mock/MockParserTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.apache.tika.TikaTest; import org.apache.tika.metadata.Metadata; -import org.apache.tika.metadata.TikaCoreProperties; +import org.apache.tika.sax.AbstractRecursiveParserWrapperHandler; public class MockParserTest extends TikaTest { @@ -36,6 +36,6 @@ public class MockParserTest extends TikaTest { public void testTimes() throws Exception { List<Metadata> metadataList = getRecursiveMetadata("mock_times.xml"); assertContainsCount("hello", - metadataList.get(0).get(TikaCoreProperties.TIKA_CONTENT), 30); + metadataList.get(0).get(AbstractRecursiveParserWrapperHandler.TIKA_CONTENT), 30); } }
