Fix #48: use a single server in tests

jboss-fuse · May 21, 2019 · 41aa261 · 41aa261
1 parent 78ef402
commit 41aa261
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/camel-knative/src/test/java/org/apache/camel/component/knative/CloudEventsV01Test.java b/camel-knative/src/test/java/org/apache/camel/component/knative/CloudEventsV01Test.java
@@ -117,16 +117,15 @@ public void configure() throws Exception {
 
     @Test
     void testProduceDefaultEventType() throws Exception {
-        final int port1 = AvailablePortFinder.getNextAvailable();
-        final int port2 = AvailablePortFinder.getNextAvailable();
+        final int port = AvailablePortFinder.getNextAvailable();
 
         KnativeEnvironment env = new KnativeEnvironment(Arrays.asList(
                 new KnativeEnvironment.KnativeServiceDefinition(
                         Knative.Type.endpoint,
                         Knative.Protocol.http,
                         "myEndpoint",
                         "localhost",
-                        port1,
+                        port,
                         KnativeSupport.mapOf(
                                 Knative.SERVICE_META_PATH, "/",
                                 Knative.CONTENT_TYPE, "text/plain"
@@ -136,9 +135,9 @@ void testProduceDefaultEventType() throws Exception {
                         Knative.Protocol.http,
                         "myEndpoint2",
                         "localhost",
-                        port2,
+                        port,
                         KnativeSupport.mapOf(
-                                Knative.SERVICE_META_PATH, "/",
+                                Knative.SERVICE_META_PATH, "/2",
                                 Knative.CONTENT_TYPE, "text/plain"
                         ))
         ));
@@ -156,10 +155,10 @@ public void configure() throws Exception {
                 from("direct:source2")
                         .to("knative:endpoint/myEndpoint2?cloudEventsType=my.type");
 
-                fromF("netty4-http:http://localhost:%d/", port1)
+                fromF("netty4-http:http://localhost:%d/", port)
                         .to("mock:ce");
 
-                fromF("netty4-http:http://localhost:%d/", port2)
+                fromF("netty4-http:http://localhost:%d/2", port)
                         .to("mock:ce2");
             }
         });

diff --git a/camel-knative/src/test/java/org/apache/camel/component/knative/CloudEventsV02Test.java b/camel-knative/src/test/java/org/apache/camel/component/knative/CloudEventsV02Test.java
@@ -117,16 +117,15 @@ public void configure() throws Exception {
 
     @Test
     void testProduceDefaultEventType() throws Exception {
-        final int port1 = AvailablePortFinder.getNextAvailable();
-        final int port2 = AvailablePortFinder.getNextAvailable();
+        final int port = AvailablePortFinder.getNextAvailable();
 
         KnativeEnvironment env = new KnativeEnvironment(Arrays.asList(
                 new KnativeEnvironment.KnativeServiceDefinition(
                         Knative.Type.endpoint,
                         Knative.Protocol.http,
                         "myEndpoint",
                         "localhost",
-                        port1,
+                        port,
                         KnativeSupport.mapOf(
                                 Knative.SERVICE_META_PATH, "/",
                                 Knative.CONTENT_TYPE, "text/plain"
@@ -136,9 +135,9 @@ void testProduceDefaultEventType() throws Exception {
                         Knative.Protocol.http,
                         "myEndpoint2",
                         "localhost",
-                        port2,
+                        port,
                         KnativeSupport.mapOf(
-                                Knative.SERVICE_META_PATH, "/",
+                                Knative.SERVICE_META_PATH, "/2",
                                 Knative.CONTENT_TYPE, "text/plain"
                         ))
         ));
@@ -156,10 +155,10 @@ public void configure() throws Exception {
                 from("direct:source2")
                         .to("knative:endpoint/myEndpoint2?cloudEventsType=my.type");
 
-                fromF("netty4-http:http://localhost:%d/", port1)
+                fromF("netty4-http:http://localhost:%d/", port)
                         .to("mock:ce");
 
-                fromF("netty4-http:http://localhost:%d/", port2)
+                fromF("netty4-http:http://localhost:%d/2", port)
                         .to("mock:ce2");
             }
         });