This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 897cb74 CAMEL-13678: Avoid using attachments api in tests
897cb74 is described below
commit 897cb74564bab3a278ad72357890f2fa8742d345
Author: Claus Ibsen <[email protected]>
AuthorDate: Sun Jul 7 17:35:23 2019 +0200
CAMEL-13678: Avoid using attachments api in tests
---
.../java/org/apache/camel/component/freemarker/FreemarkerTest.java | 6 ------
.../test/java/org/apache/camel/component/ldap/LdapRouteTest.java | 7 +------
.../apache/camel/component/sql/SqlProducerOutputAttachment.java | 7 +------
.../apache/camel/component/stringtemplate/StringTemplateTest.java | 6 ------
4 files changed, 2 insertions(+), 24 deletions(-)
diff --git
a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerTest.java
b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerTest.java
index ad19fe7..fd4870f 100644
---
a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerTest.java
+++
b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerTest.java
@@ -19,8 +19,6 @@ package org.apache.camel.component.freemarker;
import java.util.HashMap;
import java.util.Map;
-import javax.activation.DataHandler;
-
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -34,11 +32,9 @@ public class FreemarkerTest extends CamelTestSupport {
@Test
public void testFreemarkerLetter() throws Exception {
- final DataHandler dataHandler = new DataHandler("my attachment",
"text/plain");
Exchange exchange = template.request("direct:a", new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
- exchange.getIn().addAttachment("item", dataHandler);
exchange.getIn().setBody("Monday");
exchange.getIn().setHeader("name", "Christian");
exchange.setProperty("item", "7");
@@ -47,10 +43,8 @@ public class FreemarkerTest extends CamelTestSupport {
assertEquals("Dear Christian. You ordered item 7 on Monday.",
exchange.getOut().getBody());
assertEquals("Christian", exchange.getOut().getHeader("name"));
- assertSame(dataHandler, exchange.getOut().getAttachment("item"));
}
-
@Test
public void testFreemarkerDataModel() throws Exception {
Exchange exchange = template.request("direct:a", new Processor() {
diff --git
a/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTest.java
b/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTest.java
index 70164b1..d679550 100644
---
a/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTest.java
+++
b/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.ldap;
import java.util.Collection;
-import javax.activation.DataHandler;
import javax.naming.directory.Attributes;
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
@@ -46,7 +45,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
@RunWith(FrameworkRunner.class)
@@ -144,16 +142,14 @@ public class LdapRouteTest extends AbstractLdapTestUnit {
}
@Test
- public void testLdapRoutePreserveHeaderAndAttachments() throws Exception {
+ public void testLdapRoutePreserveHeader() throws Exception {
camel.addRoutes(createRouteBuilder("ldap:localhost:" + port +
"?base=ou=system"));
camel.start();
- final DataHandler dataHandler = new DataHandler("test", "text");
Exchange out = template.request("direct:start", new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setBody("(!(ou=test1))");
exchange.getIn().setHeader("ldapTest", "Camel");
- exchange.getIn().addAttachment("ldapAttachment", dataHandler);
}
});
@@ -164,7 +160,6 @@ public class LdapRouteTest extends AbstractLdapTestUnit {
assertTrue(contains("uid=testNoOU,ou=test,ou=system", searchResults));
assertTrue(contains("uid=tcruise,ou=actors,ou=system", searchResults));
assertEquals("Camel", out.getOut().getHeader("ldapTest"));
- assertSame(dataHandler, out.getOut().getAttachment("ldapAttachment"));
}
@SuppressWarnings("unchecked")
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputAttachment.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputAttachment.java
index ee4c4b6..3306ae3 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputAttachment.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputAttachment.java
@@ -17,8 +17,6 @@
package org.apache.camel.component.sql;
import java.net.MalformedURLException;
-import java.net.URL;
-import javax.activation.DataHandler;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
@@ -54,10 +52,9 @@ public class SqlProducerOutputAttachment extends
CamelTestSupport {
}
@Test
- public void testHeaderAndAttachmentAreAvailableAfterProducer()
+ public void testHeaderAreAvailableAfterProducer()
throws InterruptedException, MalformedURLException {
MockEndpoint mock = getMockEndpoint("mock:query");
- DataHandler content = new DataHandler(new URL("http://www.nu.nl";));
mock.expectedMessageCount(1);
mock.expectedHeaderReceived(SqlConstants.SQL_ROW_COUNT, 1);
@@ -66,7 +63,6 @@ public class SqlProducerOutputAttachment extends
CamelTestSupport {
mock.expects(() -> {
assertThat(mock.getReceivedExchanges().get(0).getIn().getAttachments().size(),
is(1));
assertThat(mock.getReceivedExchanges().get(0).getIn().getAttachment("att1"),
notNullValue());
-
assertThat(mock.getReceivedExchanges().get(0).getIn().getAttachment("att1"),
is(content));
});
mock.message(0).body().isEqualTo("Hi there!");
@@ -74,7 +70,6 @@ public class SqlProducerOutputAttachment extends
CamelTestSupport {
exchange.getIn().setBody("Hi there!");
exchange.getIn().setHeader("myProject", "Camel");
exchange.getIn().setHeader("maintain", "this");
- exchange.getIn().addAttachment("att1", content);
template.send("direct:query", exchange);
assertMockEndpointsSatisfied();
diff --git
a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateTest.java
b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateTest.java
index c8dd9a9..62c1ed5 100644
---
a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateTest.java
+++
b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateTest.java
@@ -19,8 +19,6 @@ package org.apache.camel.component.stringtemplate;
import java.util.HashMap;
import java.util.Map;
-import javax.activation.DataHandler;
-
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -31,11 +29,8 @@ public class StringTemplateTest extends CamelTestSupport {
@Test
public void test() throws Exception {
- final DataHandler dataHandler = new DataHandler("my attachment",
"text/plain");
-
Exchange response = template.request("direct:a", new Processor() {
public void process(Exchange exchange) throws Exception {
- exchange.getIn().addAttachment("item", dataHandler);
exchange.getIn().setBody("Monday");
exchange.getIn().setHeader("name", "Christian");
exchange.setProperty("item", "7");
@@ -45,7 +40,6 @@ public class StringTemplateTest extends CamelTestSupport {
assertEquals("Dear Christian. You ordered item 7 on Monday.",
response.getOut().getBody());
assertEquals("org/apache/camel/component/stringtemplate/template.tm",
response.getOut().getHeader(StringTemplateConstants.STRINGTEMPLATE_RESOURCE_URI));
assertEquals("Christian", response.getOut().getHeader("name"));
- assertSame(dataHandler, response.getOut().getAttachment("item"));
}
@Test
