[camel] 08/21: Fixing tests

[coheigea]

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 8671e19b546f88b99dec1c1e90cd2d9cfc745c06
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Fri May 24 18:28:56 2019 +0100

    Fixing tests
---
 .../apache/camel/coap/CoAPComponentTLSTest.java    | 19 ++++++++++++++-----
 .../camel/coap/CoAPRestComponentTLSTest.java       | 22 +++++++++++++++-------
 2 files changed, 29 insertions(+), 12 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 dfd5664..d515e8e 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
@@ -21,9 +21,10 @@ import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.support.jsse.KeyStoreParameters;
+import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.jsse.KeyStoreParameters;
 import org.eclipse.californium.core.coap.CoAP;
 import org.eclipse.californium.core.coap.MediaTypeRegistry;
 import org.junit.Test;
@@ -32,7 +33,7 @@ public class CoAPComponentTLSTest extends CamelTestSupport {
     
     protected static final int PORT = AvailablePortFinder.getNextAvailable();
 
-    @Produce("direct:start")
+    @Produce(uri = "direct:start")
     protected ProducerTemplate sender;
     
     @Test
@@ -47,7 +48,9 @@ public class CoAPComponentTLSTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected JndiRegistry createRegistry() throws Exception {
+        JndiRegistry registry = super.createRegistry();
+
         KeyStoreParameters keystoreParameters = new KeyStoreParameters();
         keystoreParameters.setResource("service.jks");
         keystoreParameters.setPassword("security");
@@ -56,8 +59,14 @@ public class CoAPComponentTLSTest extends CamelTestSupport {
         truststoreParameters.setResource("truststore.jks");
         truststoreParameters.setPassword("storepass");
         
-        context.getRegistry().bind("keyParams", keystoreParameters);
-        context.getRegistry().bind("trustParams", truststoreParameters);
+        registry.bind("keyParams", keystoreParameters);
+        registry.bind("trustParams", truststoreParameters);
+
+        return registry;
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
         
         return new RouteBuilder() {
             @Override
diff --git 
a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTLSTest.java
 
b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTLSTest.java
index 8d94bce..a185c02 100644
--- 
a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTLSTest.java
+++ 
b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTLSTest.java
@@ -22,16 +22,17 @@ import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.support.jsse.KeyStoreParameters;
+import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.jsse.KeyStoreParameters;
 import org.eclipse.californium.core.coap.CoAP;
 import org.junit.Test;
 
 public class CoAPRestComponentTLSTest extends CamelTestSupport {
     protected static final int PORT = AvailablePortFinder.getNextAvailable();
 
-    @Produce("direct:start")
+    @Produce(uri = "direct:start")
     protected ProducerTemplate sender;
     
     @Test
@@ -53,10 +54,11 @@ public class CoAPRestComponentTLSTest extends 
CamelTestSupport {
         sender.sendBody("");
         assertMockEndpointsSatisfied();
     }
-    
+
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        
+    protected JndiRegistry createRegistry() throws Exception {
+        JndiRegistry registry = super.createRegistry();
+
         KeyStoreParameters keystoreParameters = new KeyStoreParameters();
         keystoreParameters.setResource("service.jks");
         keystoreParameters.setPassword("security");
@@ -65,8 +67,14 @@ public class CoAPRestComponentTLSTest extends 
CamelTestSupport {
         truststoreParameters.setResource("truststore.jks");
         truststoreParameters.setPassword("storepass");
         
-        context.getRegistry().bind("keystoreParameters", keystoreParameters);
-        context.getRegistry().bind("truststoreParameters", 
truststoreParameters);
+        registry.bind("keystoreParameters", keystoreParameters);
+        registry.bind("truststoreParameters", truststoreParameters);
+
+        return registry;
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
         
         return new RouteBuilder() {
             @Override