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 d1c38e7 Fixed tests to use correct option name
d1c38e7 is described below
commit d1c38e71183ea0ff2e2bb04d2fcd3c68bd72cd2c
Author: Claus Ibsen <[email protected]>
AuthorDate: Sat Feb 15 09:01:26 2020 +0100
Fixed tests to use correct option name
---
.../apache/camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java | 4 ++--
.../camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java | 8 ++++----
.../org/apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java | 4 ++--
.../component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java | 4 ++--
.../org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java | 4 ++--
.../camel/component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java | 4 ++--
.../org/apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java | 4 ++--
.../java/org/apache/camel/component/hl7/HL7NettyRouteTest.java | 8 ++++----
.../camel/component/syslog/NettyRfc5425LongMessageTest.java | 2 +-
.../java/org/apache/camel/component/syslog/NettyRfc5425Test.java | 2 +-
10 files changed, 22 insertions(+), 22 deletions(-)
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java
index f5e82ef..57565a5 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java
@@ -55,7 +55,7 @@ public class HL7MLLPNettyCodecBoundaryTest extends
HL7TestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
+ from("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoders=#hl7decoder&encoders=#hl7encoder").process(new Processor()
{
public void process(Exchange exchange) throws Exception {
// check presence of correct message type
exchange.getIn().getBody(MDM_T02.class);
@@ -79,7 +79,7 @@ public class HL7MLLPNettyCodecBoundaryTest extends
HL7TestSupport {
assertEquals(1022, message.length());
MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
mockEndpoint.expectedMessageCount(1);
- template.requestBody("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", message);
+ template.requestBody("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoders=#hl7decoder&encoders=#hl7encoder", message);
mockEndpoint.assertIsSatisfied();
}
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java
index cac06a0..9a06460 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java
@@ -64,7 +64,7 @@ public class HL7MLLPNettyCodecByteArrayRouteTest extends
HL7TestSupport {
in.append("\r");
in.append(line2);
- String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort()
+ "?sync=true&encoder=#hl7encoder&decoder=#hl7decoder", in.toString(),
String.class);
+ String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort()
+ "?sync=true&encoders=#hl7encoder&decoders=#hl7decoder", in.toString(),
String.class);
String[] lines = out.split("\r");
assertEquals("MSH|^~\\&|MYSENDER||||200701011539||ADR^A19||||123|||||UNICODE
UTF-8", lines[0]);
@@ -87,7 +87,7 @@ public class HL7MLLPNettyCodecByteArrayRouteTest extends
HL7TestSupport {
in.append("\r");
in.append(line2);
- String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort()
+ "?sync=true&encoder=#hl7encoder&decoder=#hl7decoder", in.toString(),
String.class);
+ String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort()
+ "?sync=true&encoders=#hl7encoder&decoders=#hl7decoder", in.toString(),
String.class);
String[] lines = out.split("\r");
assertEquals("MSH|^~\\&|MYSENDER||||200701011539||ADT^A01||||123|||||UNICODE
UTF-8", lines[0]);
assertEquals("PID|||123||Döe^John", lines[1]);
@@ -109,7 +109,7 @@ public class HL7MLLPNettyCodecByteArrayRouteTest extends
HL7TestSupport {
in.append("\r");
in.append(line2);
- template.requestBody("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&encoder=#hl7encoder&decoder=#hl7decoder", in.toString());
+ template.requestBody("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&encoders=#hl7encoder&decoders=#hl7decoder", in.toString());
assertMockEndpointsSatisfied();
}
@@ -122,7 +122,7 @@ public class HL7MLLPNettyCodecByteArrayRouteTest extends
HL7TestSupport {
DataFormat hl7 = new HL7DataFormat();
// we setup or HL7 listener on port 8888 (using the hl7codec)
// and in sync mode so we can return a response
- from("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&encoder=#hl7encoder&decoder=#hl7decoder")
+ from("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&encoders=#hl7encoder&decoders=#hl7decoder")
// we use the HL7 data format to unmarshal from HL7 stream
// to the HAPI Message model
// this ensures that the camel message has been enriched
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java
index 2bd4599..b8cca51 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java
@@ -54,7 +54,7 @@ public class HL7MLLPNettyCodecLongTest extends HL7TestSupport
{
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&encoder=#hl7encoder&decoder=#hl7decoder").process(new Processor() {
+ from("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&encoders=#hl7encoder&decoders=#hl7decoder").process(new Processor()
{
public void process(Exchange exchange) throws Exception {
assertEquals(70010,
exchange.getIn().getBody(byte[].class).length);
MDM_T02 input =
(MDM_T02)exchange.getIn().getBody(Message.class);
@@ -81,7 +81,7 @@ public class HL7MLLPNettyCodecLongTest extends HL7TestSupport
{
}
message = message.substring(0, message.length() - 1);
assertEquals(70010, message.length());
- String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort()
+ "?sync=true&encoder=#hl7encoder&decoder=#hl7decoder", message, String.class);
+ String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort()
+ "?sync=true&encoders=#hl7encoder&decoders=#hl7decoder", message,
String.class);
assertEquals("some response", out);
// END SNIPPET: e2
}
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java
index b753277..49b6b4a 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java
@@ -62,7 +62,7 @@ public class HL7MLLPNettyCodecStandAndEndBytesTest extends
HL7TestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
+ from("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoders=#hl7decoder&encoders=#hl7encoder").process(new Processor()
{
public void process(Exchange exchange) throws Exception {
Message input =
exchange.getIn().getBody(Message.class);
@@ -88,7 +88,7 @@ public class HL7MLLPNettyCodecStandAndEndBytesTest extends
HL7TestSupport {
in.append("\r");
in.append(line2);
- String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort()
+ "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", in.toString(),
String.class);
+ String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort()
+ "?sync=true&decoders=#hl7decoder&encoders=#hl7encoder", in.toString(),
String.class);
String[] lines = out.split("\r");
assertEquals("MSH|^~\\&|MYSENDER||||200701011539||ADR^A19||||123",
lines[0]);
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java
index 9a2736d..051c4c8 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java
@@ -54,7 +54,7 @@ public class HL7MLLPNettyCodecTest extends HL7TestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
+ from("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoders=#hl7decoder&encoders=#hl7encoder").process(new Processor()
{
public void process(Exchange exchange) throws Exception {
Message input =
exchange.getIn().getBody(Message.class);
@@ -81,7 +81,7 @@ public class HL7MLLPNettyCodecTest extends HL7TestSupport {
in.append("\n");
in.append(line2);
- String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort()
+ "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", in.toString(),
String.class);
+ String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort()
+ "?sync=true&decoders=#hl7decoder&encoders=#hl7encoder", in.toString(),
String.class);
// END SNIPPET: e2
String[] lines = out.split("\r");
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java
index dd8c407..2fc7285 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java
@@ -44,7 +44,7 @@ public class HL7MLLPNettyDecoderResourceLeakTest extends
HL7TestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty:tcp://127.0.0.1:" + getPort() +
"?decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
+ from("netty:tcp://127.0.0.1:" + getPort() +
"?decoders=#hl7decoder&encoders=#hl7encoder").process(new Processor() {
public void process(Exchange exchange) throws Exception {
Message input =
exchange.getIn().getBody(Message.class);
exchange.getOut().setBody(input.generateACK());
@@ -59,7 +59,7 @@ public class HL7MLLPNettyDecoderResourceLeakTest extends
HL7TestSupport {
String message =
"MSH|^~\\&|MYSENDER|MYRECEIVER|MYAPPLICATION||200612211200||QRY^A19|1234|P|2.4";
for (int i = 0; i < 10; i++) {
- template.sendBody("netty:tcp://127.0.0.1:" + getPort() +
"?decoder=#hl7decoder&encoder=#hl7encoder", message);
+ template.sendBody("netty:tcp://127.0.0.1:" + getPort() +
"?decoders=#hl7decoder&encoders=#hl7encoder", message);
}
}
}
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java
index af09670..c9a26ad 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java
@@ -54,12 +54,12 @@ public class HL7MLLPNettyRouteToTest extends HL7TestSupport
{
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("direct:start").to("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder")
+ from("direct:start").to("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoders=#hl7decoder&encoders=#hl7encoder")
// because HL7 message contains a bunch of control chars
// then the logger do not log all of the data
.log("HL7 message: ${body}").to("mock:result");
- from("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
+ from("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoders=#hl7decoder&encoders=#hl7encoder").process(new Processor()
{
public void process(Exchange exchange) throws Exception {
Message input =
exchange.getIn().getBody(Message.class);
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java
index 5052470..613d3c6 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java
@@ -68,7 +68,7 @@ public class HL7NettyRouteTest extends HL7TestSupport {
in.append("\r");
in.append(line2);
- String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort()
+ "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", in.toString(),
String.class);
+ String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort()
+ "?sync=true&decoders=#hl7decoder&encoders=#hl7encoder", in.toString(),
String.class);
String[] lines = out.split("\r");
assertEquals("MSH|^~\\&|MYSENDER||||200701011539||ADR^A19||||123",
lines[0]);
@@ -91,7 +91,7 @@ public class HL7NettyRouteTest extends HL7TestSupport {
in.append("\r");
in.append(line2);
- String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort()
+ "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", in.toString(),
String.class);
+ String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort()
+ "?sync=true&decoders=#hl7decoder&encoders=#hl7encoder", in.toString(),
String.class);
String[] lines = out.split("\r");
assertEquals("MSH|^~\\&|MYSENDER||||200701011539||ADT^A01||||123",
lines[0]);
assertEquals("PID|||123||Doe^John", lines[1]);
@@ -113,7 +113,7 @@ public class HL7NettyRouteTest extends HL7TestSupport {
in.append("\r");
in.append(line2);
- template.requestBody("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", in.toString());
+ template.requestBody("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoders=#hl7decoder&encoders=#hl7encoder", in.toString());
assertMockEndpointsSatisfied();
}
@@ -126,7 +126,7 @@ public class HL7NettyRouteTest extends HL7TestSupport {
DataFormat hl7 = new HL7DataFormat();
// we setup or HL7 listener on port 8888 (using the hl7codec)
// and in sync mode so we can return a response
- from("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder")
+ from("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoders=#hl7decoder&encoders=#hl7encoder")
// we use the HL7 data format to unmarshal from HL7 stream
// to the HAPI Message model
// this ensures that the camel message has been enriched
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
index 42d7ed6..8e19654 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
@@ -56,7 +56,7 @@ public class NettyRfc5425LongMessageTest extends
CamelTestSupport {
@BeforeClass
public static void initPort() {
serverPort = AvailablePortFinder.getNextAvailable();
- uri = "netty:tcp://localhost:" + serverPort +
"?sync=false&allowDefaultCodec=false&decoders=#decoder&encoder=#encoder";
+ uri = "netty:tcp://localhost:" + serverPort +
"?sync=false&allowDefaultCodec=false&decoders=#decoder&encoders=#encoder";
}
@Test
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
index bc4043f..6813e8e 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
@@ -49,7 +49,7 @@ public class NettyRfc5425Test extends CamelTestSupport {
@BeforeClass
public static void initPort() {
serverPort = AvailablePortFinder.getNextAvailable();
- uri = "netty:tcp://localhost:" + serverPort +
"?sync=false&allowDefaultCodec=false&decoders=#decoder&encoder=#encoder";
+ uri = "netty:tcp://localhost:" + serverPort +
"?sync=false&allowDefaultCodec=false&decoders=#decoder&encoders=#encoder";
uriClient = uri + "&useByteBuf=true";
}
