This is an automated email from the ASF dual-hosted git repository.
coheigea 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 4b00090 Cleanup of testcode
4b00090 is described below
commit 4b00090c13806357278f39270498c231bc1b24e6
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Tue Apr 30 11:08:13 2019 +0100
Cleanup of testcode
---
.../apache/camel/coap/CoAPComponentTLSTest.java | 72 +++++++++++++++-------
1 file changed, 49 insertions(+), 23 deletions(-)
diff --git
a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTest.java
b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTest.java
index 277110a..da98983 100644
---
a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTest.java
+++
b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTest.java
@@ -237,60 +237,86 @@ public class CoAPComponentTLSTest extends
CamelTestSupport {
@Override
public void configure() throws Exception {
-
fromF("coaps://localhost:%d/TestResource?alias=service&password=security&" +
"keyStoreParameters=#keyParams", PORT).transform(body().prepend("Hello "));
+
fromF("coaps://localhost:%d/TestResource?alias=service&password=security&keyStoreParameters=#keyParams",
PORT)
+ .transform(body().prepend("Hello "));
-
fromF("coaps://localhost:%d/TestResource?alias=selfsigned&password=security&" +
"keyStoreParameters=#keyParams2", PORT2).transform(body().prepend("Hello "));
+
fromF("coaps://localhost:%d/TestResource?alias=selfsigned&password=security&keyStoreParameters=#keyParams2",
PORT2)
+ .transform(body().prepend("Hello "));
-
fromF("coaps://localhost:%d/TestResource?alias=service&password=security&" +
"trustStoreParameters=#trustParams&"
- +
"keyStoreParameters=#keyParams&clientAuthentication=REQUIRE",
PORT3).transform(body().prepend("Hello "));
+
fromF("coaps://localhost:%d/TestResource?alias=service&password=security&trustStoreParameters=#trustParams&"
+ +
"keyStoreParameters=#keyParams&clientAuthentication=REQUIRE", PORT3)
+ .transform(body().prepend("Hello "));
-
fromF("coaps://localhost:%d/TestResource?alias=service&password=security&" +
"keyStoreParameters=#keyParams&cipherSuites=TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8",
PORT4)
+
fromF("coaps://localhost:%d/TestResource?alias=service&password=security&keyStoreParameters=#keyParams&cipherSuites=TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8",
PORT4)
.transform(body().prepend("Hello "));
-
fromF("coaps://localhost:%d/TestResource?privateKey=#privateKey&publicKey=#publicKey",
PORT5).transform(body().prepend("Hello "));
+
fromF("coaps://localhost:%d/TestResource?privateKey=#privateKey&publicKey=#publicKey",
PORT5)
+ .transform(body().prepend("Hello "));
-
fromF("coaps://localhost:%d/TestResource?privateKey=#privateKey&publicKey=#publicKey&"
+ "clientAuthentication=REQUIRE&trustedRpkStore=#trustedRpkStore", PORT6)
+
fromF("coaps://localhost:%d/TestResource?privateKey=#privateKey&publicKey=#publicKey&clientAuthentication=REQUIRE&trustedRpkStore=#trustedRpkStore",
PORT6)
.transform(body().prepend("Hello "));
- fromF("coaps://localhost:%d/TestResource?pskStore=#pskStore",
PORT7).transform(body().prepend("Hello "));
+ fromF("coaps://localhost:%d/TestResource?pskStore=#pskStore",
PORT7)
+ .transform(body().prepend("Hello "));
-
fromF("coaps://localhost:%d/TestResource?alias=service&password=security&" +
"keyStoreParameters=#keyParams&pskStore=#pskStore", PORT8)
+
fromF("coaps://localhost:%d/TestResource?alias=service&password=security&keyStoreParameters=#keyParams&pskStore=#pskStore",
PORT8)
.transform(body().prepend("Hello "));
-
from("direct:start").toF("coaps://localhost:%d/TestResource?trustStoreParameters=#trustParams",
PORT).to("mock:result");
+ from("direct:start")
+
.toF("coaps://localhost:%d/TestResource?trustStoreParameters=#trustParams",
PORT)
+ .to("mock:result");
-
from("direct:notruststore").toF("coaps://localhost:%d/TestResource",
PORT).to("mock:result");
+ from("direct:notruststore")
+ .toF("coaps://localhost:%d/TestResource", PORT)
+ .to("mock:result");
-
from("direct:failedtrust").toF("coaps://localhost:%d/TestResource?trustStoreParameters=#trustParams2",
PORT).to("mock:result");
+ from("direct:failedtrust")
+
.toF("coaps://localhost:%d/TestResource?trustStoreParameters=#trustParams2",
PORT)
+ .to("mock:result");
-
from("direct:selfsigned").toF("coaps://localhost:%d/TestResource?trustStoreParameters=#keyParams2",
PORT2).to("mock:result");
+ from("direct:selfsigned")
+
.toF("coaps://localhost:%d/TestResource?trustStoreParameters=#keyParams2",
PORT2)
+ .to("mock:result");
from("direct:clientauth")
-
.toF("coaps://localhost:%d/TestResource?trustStoreParameters=#trustParams&" +
"keyStoreParameters=#keyParams3&alias=client&password=security", PORT3)
+
.toF("coaps://localhost:%d/TestResource?trustStoreParameters=#trustParams&keyStoreParameters=#keyParams3&alias=client&password=security",
PORT3)
.to("mock:result");
from("direct:failedclientauth")
-
.toF("coaps://localhost:%d/TestResource?trustStoreParameters=#trustParams&" +
"keyStoreParameters=#keyParams2&alias=selfsigned&password=security", PORT3)
+
.toF("coaps://localhost:%d/TestResource?trustStoreParameters=#trustParams&keyStoreParameters=#keyParams2&alias=selfsigned&password=security",
PORT3)
.to("mock:result");
-
from("direct:ciphersuites").toF("coaps://localhost:%d/TestResource?trustStoreParameters=#trustParams&"
+ "cipherSuites=TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8", PORT4)
+ from("direct:ciphersuites")
+
.toF("coaps://localhost:%d/TestResource?trustStoreParameters=#trustParams&cipherSuites=TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8",
PORT4)
.to("mock:result");
-
from("direct:rpk").toF("coaps://localhost:%d/TestResource?trustedRpkStore=#trustedRpkStore",
PORT5).to("mock:result");
+ from("direct:rpk")
+
.toF("coaps://localhost:%d/TestResource?trustedRpkStore=#trustedRpkStore",
PORT5)
+ .to("mock:result");
-
from("direct:rpknotruststore").toF("coaps://localhost:%d/TestResource",
PORT5).to("mock:result");
+ from("direct:rpknotruststore")
+ .toF("coaps://localhost:%d/TestResource", PORT5)
+ .to("mock:result");
-
from("direct:rpkfailedtrust").toF("coaps://localhost:%d/TestResource?trustedRpkStore=#failedTrustedRpkStore",
PORT5).to("mock:result");
+ from("direct:rpkfailedtrust")
+
.toF("coaps://localhost:%d/TestResource?trustedRpkStore=#failedTrustedRpkStore",
PORT5)
+ .to("mock:result");
-
from("direct:rpkclientauth").toF("coaps://localhost:%d/TestResource?trustedRpkStore=#trustedRpkStore&"
+ "privateKey=#privateKey&publicKey=#publicKey", PORT6)
+ from("direct:rpkclientauth")
+
.toF("coaps://localhost:%d/TestResource?trustedRpkStore=#trustedRpkStore&privateKey=#privateKey&publicKey=#publicKey",
PORT6)
.to("mock:result");
-
from("direct:psk").toF("coaps://localhost:%d/TestResource?pskStore=#pskStore",
PORT7).to("mock:result");
+ from("direct:psk")
+
.toF("coaps://localhost:%d/TestResource?pskStore=#pskStore", PORT7)
+ .to("mock:result");
-
from("direct:pskciphersuite").toF("coaps://localhost:%d/TestResource?pskStore=#pskStore&"
+ "cipherSuites=TLS_PSK_WITH_AES_128_CBC_SHA256", PORT7)
+ from("direct:pskciphersuite")
+
.toF("coaps://localhost:%d/TestResource?pskStore=#pskStore&cipherSuites=TLS_PSK_WITH_AES_128_CBC_SHA256",
PORT7)
.to("mock:result");
-
from("direct:pskx509").toF("coaps://localhost:%d/TestResource?pskStore=#pskStore&trustStoreParameters=#trustParams",
PORT8).to("mock:result");
+ from("direct:pskx509")
+
.toF("coaps://localhost:%d/TestResource?pskStore=#pskStore&trustStoreParameters=#trustParams",
PORT8)
+ .to("mock:result");
}
};
}
