Author: davsclaus
Date: Fri Dec 21 12:49:31 2012
New Revision: 1424902

URL: http://svn.apache.org/viewvc?rev=1424902&view=rev
Log:
CAMEL-5904: Fixed tests to better stop and cleanup resources as Netty 3.6.0 is 
not as tolerant as older releases

Modified:
    
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLContextParametersTest.java
    
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java

Modified: 
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLContextParametersTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLContextParametersTest.java?rev=1424902&r1=1424901&r2=1424902&view=diff
==============================================================================
--- 
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLContextParametersTest.java
 (original)
+++ 
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLContextParametersTest.java
 Fri Dec 21 12:49:31 2012
@@ -18,8 +18,6 @@ package org.apache.camel.component.netty
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.apache.camel.Produce;
-import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.util.jsse.ClientAuthentication;
@@ -31,9 +29,7 @@ import org.apache.camel.util.jsse.TrustM
 import org.junit.Test;
 
 public class NettySSLContextParametersTest extends BaseNettyTest {
-    @Produce(uri = "direct:start")
-    protected ProducerTemplate producerTemplate;
-    
+
     @Override
     protected JndiRegistry createRegistry() throws Exception {
         
@@ -68,14 +64,6 @@ public class NettySSLContextParametersTe
         return false;
     }
 
-    private void sendRequest() throws Exception {
-        String response = producerTemplate.requestBody(
-            
"netty:tcp://localhost:{{port}}?sync=true&ssl=true&sslContextParameters=#sslContextParameters",
-            "Epitaph in Kohima, India marking the WWII Battle of Kohima and 
Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);    
    
-        assertEquals("When You Go Home, Tell Them Of Us And Say, For Your 
Tomorrow, We Gave Our Today.", response);
-    }
- 
-    
     @Test
     public void testSSLInOutWithNettyConsumer() throws Exception {
         // ibm jdks dont have sun security algorithms
@@ -94,9 +82,11 @@ public class NettySSLContextParametersTe
             }
         });
         context.start();
-        
-        sendRequest();
-        context.stop();
-    }    
+
+        String response = template.requestBody(
+                
"netty:tcp://localhost:{{port}}?sync=true&ssl=true&sslContextParameters=#sslContextParameters",
+                "Epitaph in Kohima, India marking the WWII Battle of Kohima 
and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);
+        assertEquals("When You Go Home, Tell Them Of Us And Say, For Your 
Tomorrow, We Gave Our Today.", response);
+    }
 
 }

Modified: 
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java?rev=1424902&r1=1424901&r2=1424902&view=diff
==============================================================================
--- 
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java
 (original)
+++ 
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java
 Fri Dec 21 12:49:31 2012
@@ -21,16 +21,12 @@ import java.io.File;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.apache.camel.Produce;
-import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.JndiRegistry;
 import org.junit.Test;
 
 public class NettySSLTest extends BaseNettyTest {
-    @Produce(uri = "direct:start")
-    protected ProducerTemplate producerTemplate;
-    
+
     @Override
     protected JndiRegistry createRegistry() throws Exception {
         JndiRegistry registry = super.createRegistry();
@@ -45,14 +41,6 @@ public class NettySSLTest extends BaseNe
         return false;
     }
 
-    private void sendRequest() throws Exception {
-        String response = producerTemplate.requestBody(
-            
"netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=#password&keyStoreFile=#ksf&trustStoreFile=#tsf",
-            "Epitaph in Kohima, India marking the WWII Battle of Kohima and 
Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);    
    
-        assertEquals("When You Go Home, Tell Them Of Us And Say, For Your 
Tomorrow, We Gave Our Today.", response);
-    }
- 
-    
     @Test
     public void testSSLInOutWithNettyConsumer() throws Exception {
         // ibm jdks dont have sun security algorithms
@@ -71,9 +59,11 @@ public class NettySSLTest extends BaseNe
             }
         });
         context.start();
-        
-        sendRequest();
-        context.stop();
-    }    
+
+        String response = template.requestBody(
+                
"netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=#password&keyStoreFile=#ksf&trustStoreFile=#tsf",
+                "Epitaph in Kohima, India marking the WWII Battle of Kohima 
and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);
+        assertEquals("When You Go Home, Tell Them Of Us And Say, For Your 
Tomorrow, We Gave Our Today.", response);
+    }
 
 }


Reply via email to