This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 1feb0ed8a70 camel-tika: Fix incorrect mock endpoint usage in tests
1feb0ed8a70 is described below
commit 1feb0ed8a70b7ea51fabee9cbfb763ccf8e3b5b3
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Fri Jan 31 09:48:54 2025 +0000
camel-tika: Fix incorrect mock endpoint usage in tests
---
.../camel/component/tika/TikaDetectTest.java | 14 +++---
.../apache/camel/component/tika/TikaParseTest.java | 52 +++++++++-------------
2 files changed, 28 insertions(+), 38 deletions(-)
diff --git
a/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaDetectTest.java
b/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaDetectTest.java
index dd9e90bc11b..d9e638797de 100644
---
a/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaDetectTest.java
+++
b/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaDetectTest.java
@@ -37,11 +37,7 @@ public class TikaDetectTest extends CamelTestSupport {
@Test
public void testDocumentDetect() throws Exception {
- File document = new File("src/test/resources/test.doc");
- template.sendBody("direct:start", document);
-
resultEndpoint.setExpectedMessageCount(1);
-
resultEndpoint.expectedMessagesMatches(new Predicate() {
@Override
public boolean matches(Exchange exchange) {
@@ -51,16 +47,15 @@ public class TikaDetectTest extends CamelTestSupport {
return true;
}
});
+
+ File document = new File("src/test/resources/test.doc");
+ template.sendBody("direct:start", document);
resultEndpoint.assertIsSatisfied();
}
@Test
public void testImageDetect() throws Exception {
- File document = new File("src/test/resources/testGIF.gif");
- template.sendBody("direct:start", document);
-
resultEndpoint.setExpectedMessageCount(1);
-
resultEndpoint.expectedMessagesMatches(new Predicate() {
@Override
public boolean matches(Exchange exchange) {
@@ -70,6 +65,9 @@ public class TikaDetectTest extends CamelTestSupport {
return true;
}
});
+
+ File document = new File("src/test/resources/testGIF.gif");
+ template.sendBody("direct:start", document);
resultEndpoint.assertIsSatisfied();
}
diff --git
a/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaParseTest.java
b/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaParseTest.java
index d84ae1a91fc..174d452bd00 100644
---
a/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaParseTest.java
+++
b/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaParseTest.java
@@ -49,46 +49,38 @@ public class TikaParseTest extends CamelTestSupport {
@Test
public void testDocumentParse() throws Exception {
-
- File document = new File("src/test/resources/test.doc");
- template.sendBody("direct:start", document);
-
resultEndpoint.setExpectedMessageCount(1);
-
resultEndpoint.expectedMessagesMatches(new Predicate() {
@Override
public boolean matches(Exchange exchange) {
- Object body = exchange.getIn().getBody(String.class);
+ String body = exchange.getIn().getBody(String.class);
Map<String, Object> headerMap = exchange.getIn().getHeaders();
assertThat(body, instanceOf(String.class));
Charset detectedCharset = null;
try {
- InputStream bodyIs = new ByteArrayInputStream(((String)
body).getBytes());
+ InputStream bodyIs = new
ByteArrayInputStream(body.getBytes());
UniversalEncodingDetector encodingDetector = new
UniversalEncodingDetector();
detectedCharset = encodingDetector.detect(bodyIs, new
Metadata());
} catch (IOException e1) {
fail();
}
- assertThat(detectedCharset.name(),
startsWith(Charset.defaultCharset().name()));
-
- assertThat((String) body, containsString("test"));
- assertThat(headerMap.get(Exchange.CONTENT_TYPE),
equalTo("application/msword"));
+ assertThat(detectedCharset,
equalTo(StandardCharsets.ISO_8859_1));
+ assertThat(body, containsString("<body/>"));
+ assertThat(headerMap.get(Exchange.CONTENT_TYPE),
equalTo("application/x-tika-msoffice"));
return true;
}
});
+
+ File document = new File("src/test/resources/test.doc");
+ template.sendBody("direct:start", document);
resultEndpoint.assertIsSatisfied();
}
@Test
public void testDocumentParseWithEncoding() throws Exception {
-
- File document = new File("src/test/resources/testOpenOffice2.odt");
- template.sendBody("direct:start4", document);
-
resultEndpoint.setExpectedMessageCount(1);
-
resultEndpoint.expectedMessagesMatches(new Predicate() {
@Override
public boolean matches(Exchange exchange) {
@@ -110,16 +102,15 @@ public class TikaParseTest extends CamelTestSupport {
return true;
}
});
+
+ File document = new File("src/test/resources/testOpenOffice2.odt");
+ template.sendBody("direct:start4", document);
resultEndpoint.assertIsSatisfied();
}
@Test
public void testImageParse() throws Exception {
- File document = new File("src/test/resources/testGIF.gif");
- template.sendBody("direct:start", document);
-
resultEndpoint.setExpectedMessageCount(1);
-
resultEndpoint.expectedMessagesMatches(new Predicate() {
@Override
public boolean matches(Exchange exchange) {
@@ -131,16 +122,15 @@ public class TikaParseTest extends CamelTestSupport {
return true;
}
});
+
+ File document = new File("src/test/resources/testGIF.gif");
+ template.sendBody("direct:start", document);
resultEndpoint.assertIsSatisfied();
}
@Test
public void testEmptyConfigDocumentParse() throws Exception {
- File document = new File("src/test/resources/test.doc");
- template.sendBody("direct:start3", document);
-
resultEndpoint.setExpectedMessageCount(1);
-
resultEndpoint.expectedMessagesMatches(new Predicate() {
@Override
public boolean matches(Exchange exchange) {
@@ -148,20 +138,19 @@ public class TikaParseTest extends CamelTestSupport {
Map<String, Object> headerMap = exchange.getIn().getHeaders();
assertThat(body, instanceOf(String.class));
assertThat((String) body, containsString("<body/>"));
- assertThat(headerMap.get(Exchange.CONTENT_TYPE),
equalTo("application/msword"));
+ assertThat(headerMap.get(Exchange.CONTENT_TYPE),
equalTo("application/x-tika-msoffice"));
return true;
}
});
+
+ File document = new File("src/test/resources/test.doc");
+ template.sendBody("direct:start3", document);
resultEndpoint.assertIsSatisfied();
}
@Test
public void testRegistryConfigDocumentParse() throws Exception {
- File document = new File("src/test/resources/test.doc");
- template.sendBody("direct:start3", document);
-
resultEndpoint.setExpectedMessageCount(1);
-
resultEndpoint.expectedMessagesMatches(new Predicate() {
@Override
public boolean matches(Exchange exchange) {
@@ -169,10 +158,13 @@ public class TikaParseTest extends CamelTestSupport {
Map<String, Object> headerMap = exchange.getIn().getHeaders();
assertThat(body, instanceOf(String.class));
assertThat((String) body, containsString("<body/>"));
- assertThat(headerMap.get(Exchange.CONTENT_TYPE),
equalTo("application/msword"));
+ assertThat(headerMap.get(Exchange.CONTENT_TYPE),
equalTo("application/x-tika-msoffice"));
return true;
}
});
+
+ File document = new File("src/test/resources/test.doc");
+ template.sendBody("direct:start3", document);
resultEndpoint.assertIsSatisfied();
}
