camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [09/12] camel git commit: Fixed test
Date Thu, 19 Nov 2015 07:13:18 GMT
Fixed test


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/009b90d0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/009b90d0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/009b90d0

Branch: refs/heads/camel-2.16.x
Commit: 009b90d074ae44be011754b4a31e52fdede1fda4
Parents: a56e2d8
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Thu Nov 19 07:42:59 2015 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Thu Nov 19 08:12:18 2015 +0100

----------------------------------------------------------------------
 .../camel/coap/CoAPRestComponentTest.java       | 28 +++-----------------
 1 file changed, 4 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/009b90d0/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTest.java
b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTest.java
index d201578..a104804 100644
--- a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTest.java
+++ b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTest.java
@@ -16,15 +16,9 @@
  */
 package org.apache.camel.coap;
 
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.URLConnection;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.converter.IOConverter;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.eclipse.californium.core.CoapClient;
@@ -35,28 +29,13 @@ import org.junit.Test;
 
 public class CoAPRestComponentTest extends CamelTestSupport {
     static int coapport = AvailablePortFinder.getNextAvailable();
-    static int jettyport = AvailablePortFinder.getNextAvailable();
-    
-    
-    /*
-    public boolean isCreateCamelContextPerClass() {
-        return true;
-    } 
-    */   
-    
+
     @Test
     public void testCoAP() throws Exception {
         NetworkConfig.createStandardWithoutFile();
         CoapClient client;
         CoapResponse rsp;
-        
-        
-        URL url = new URL("http://localhost:" + jettyport + "/TestResource/Ducky");
-        URLConnection connect = url.openConnection();
-        InputStream ins = connect.getInputStream();
-        assertEquals("Hello Ducky", IOConverter.toString(new InputStreamReader(ins)));
 
-        
         client = new CoapClient("coap://localhost:" + coapport + "/TestResource/Ducky");
         client.setTimeout(1000000);
         rsp = client.get();
@@ -71,7 +50,6 @@ public class CoAPRestComponentTest extends CamelTestSupport {
         rsp = client.post("data", MediaTypeRegistry.TEXT_PLAIN);
         assertEquals("Hello Ducky: data", rsp.getResponseText());
         assertEquals(MediaTypeRegistry.TEXT_PLAIN, rsp.getOptions().getContentFormat());
-        
     }
 
     @Override
@@ -80,10 +58,11 @@ public class CoAPRestComponentTest extends CamelTestSupport {
             @Override
             public void configure() throws Exception {
                 restConfiguration("coap").host("localhost").port(coapport);
-                restConfiguration("jetty").host("localhost").port(jettyport);
+
                 rest("/TestParms")
                     .get().to("direct:get1")
                     .post().to("direct:post1");
+
                 rest("/TestResource")
                     .get("/{id}").to("direct:get1")
                     .post("/{id}").to("direct:post1");
@@ -94,6 +73,7 @@ public class CoAPRestComponentTest extends CamelTestSupport {
                         exchange.getOut().setBody("Hello " + id);
                     }
                 });
+
                 from("direct:post1").process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         String id = exchange.getIn().getHeader("id", String.class);


Mime
View raw message