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 2024/03/23 12:49:38 UTC
(tika) branch TIKA-4207 updated: TIKA-4207 -- fix unit tests
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch TIKA-4207
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/TIKA-4207 by this push:
new 7e1bdee33 TIKA-4207 -- fix unit tests
7e1bdee33 is described below
commit 7e1bdee337980310c5b01ef37136a72b65a2437f
Author: tallison <ta...@apache.org>
AuthorDate: Sat Mar 23 08:49:25 2024 -0400
TIKA-4207 -- fix unit tests
---
.../src/main/java/org/apache/tika/example/ExtractEmbeddedFiles.java | 2 +-
.../src/test/java/org/apache/tika/async/cli/AsyncProcessorTest.java | 6 ++++--
.../test/java/org/apache/tika/server/standard/TikaPipesTest.java | 4 +---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tika-example/src/main/java/org/apache/tika/example/ExtractEmbeddedFiles.java b/tika-example/src/main/java/org/apache/tika/example/ExtractEmbeddedFiles.java
index 091facc21..43c0b1d3a 100644
--- a/tika-example/src/main/java/org/apache/tika/example/ExtractEmbeddedFiles.java
+++ b/tika-example/src/main/java/org/apache/tika/example/ExtractEmbeddedFiles.java
@@ -64,7 +64,7 @@ public class ExtractEmbeddedFiles {
private int fileCount = 0;
private MyEmbeddedDocumentExtractor(Path outputDir, ParseContext context) {
- super(context);
+ super(context, 1000000l);
this.outputDir = outputDir;
}
diff --git a/tika-pipes/tika-async-cli/src/test/java/org/apache/tika/async/cli/AsyncProcessorTest.java b/tika-pipes/tika-async-cli/src/test/java/org/apache/tika/async/cli/AsyncProcessorTest.java
index d5a6527f6..4bcdacb9e 100644
--- a/tika-pipes/tika-async-cli/src/test/java/org/apache/tika/async/cli/AsyncProcessorTest.java
+++ b/tika-pipes/tika-async-cli/src/test/java/org/apache/tika/async/cli/AsyncProcessorTest.java
@@ -101,6 +101,8 @@ public class AsyncProcessorTest extends TikaTest {
new EmbeddedDocumentBytesConfig(true);
embeddedDocumentBytesConfig.setIncludeOriginal(true);
embeddedDocumentBytesConfig.setEmitter("bytes");
+ embeddedDocumentBytesConfig.setSuffixStrategy(EmbeddedDocumentBytesConfig.SUFFIX_STRATEGY.NONE);
+ embeddedDocumentBytesConfig.setEmbeddedIdPrefix("-");
FetchEmitTuple t = new FetchEmitTuple("myId-1",
new FetchKey("fs", "mock.xml"),
@@ -119,10 +121,10 @@ public class AsyncProcessorTest extends TikaTest {
}
processor.close();
- String container = Files.readString(bytesDir.resolve("emit-1-0"));
+ String container = Files.readString(bytesDir.resolve("emit-1/emit-1-0"));
assertContains("\"dc:creator\">Nikolai Lobachevsky", container);
- String xmlEmbedded = Files.readString(bytesDir.resolve("emit-1-1"));
+ String xmlEmbedded = Files.readString(bytesDir.resolve("emit-1/emit-1-1"));
assertContains("name=\"dc:creator\"", xmlEmbedded);
assertContains(">embeddedAuthor</metadata>", xmlEmbedded);
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaPipesTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaPipesTest.java
index 110c3f7e8..391e67fee 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaPipesTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaPipesTest.java
@@ -16,12 +16,10 @@
*/
package org.apache.tika.server.standard;
-import static org.apache.tika.TikaTest.debug;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import java.io.ByteArrayInputStream;
-import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
@@ -116,7 +114,7 @@ public class TikaPipesTest extends CXFTestBase {
"</emitter>" + "<emitter class=\"org.apache.tika.pipes.emitter.fs.FileSystemEmitter\">" +
"<params>" + "<name>bytes</name>" + "<basePath>" +
TMP_BYTES_DIR.toAbsolutePath() + "</basePath>" + "</params>" +
- "</emitter>" +"</emitters>" + "<pipes><params><tikaConfig>" +
+ "</emitter>" + "</emitters>" + "<pipes><params><tikaConfig>" +
ProcessUtils.escapeCommandLine(
TIKA_CONFIG_PATH.toAbsolutePath().toString()) +
"</tikaConfig><numClients>10</numClients>" + "<forkedJvmArgs>" +