Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Munilla2019-07-15 08:56:38 -0400
committerChristophe Munilla2019-07-15 08:56:38 -0400
commit789f0a78c55006276d321dab30244fe8d1c791d2 (patch)
tree7f9c5d33a3cb04ca55375514b03f9cbe41e5f9d4
parent91e9633383184f9f4e5f4924b39fcd0b9043a07c (diff)
downloadorg.eclipse.sensinact.gateway-789f0a78c55006276d321dab30244fe8d1c791d2.tar.gz
org.eclipse.sensinact.gateway-789f0a78c55006276d321dab30244fe8d1c791d2.tar.xz
org.eclipse.sensinact.gateway-789f0a78c55006276d321dab30244fe8d1c791d2.zip
Update ports used for tests
Try to avoid 'already bind exception' by using a different port when testing
-rw-r--r--platform/northbound/geo-filtering/geojson-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/geojson/test/TestGeoJsonFiltering.java4
-rw-r--r--platform/northbound/geo-filtering/geojson-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/geojson/ws/test/WsServiceTestClient.java2
-rw-r--r--platform/northbound/http-tools/src/test/java/org/eclipse/sensinact/gateway/nthbnd/forward/test/TestForwardingService.java4
-rw-r--r--platform/northbound/jsonpath-filtering/jsonpath-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/jsonpath/test/TestJsonPathFiltering.java4
-rw-r--r--platform/northbound/jsonpath-filtering/jsonpath-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/jsonpath/ws/test/WsServiceTestClient.java2
-rw-r--r--platform/northbound/ldap-filtering/ldap-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/jsonpath/test/TestLdapFiltering.java4
-rw-r--r--platform/northbound/rest-access/src/test/java/org/eclipse/sensinact/gateway/nthbnd/rest/TestRestAccess.java4
-rw-r--r--platform/northbound/rest-access/src/test/java/org/eclipse/sensinact/gateway/nthbnd/rest/TestRestSUBSCRIBE_UNSUBSCRIBEAccess.java6
-rw-r--r--platform/northbound/rest-access/src/test/java/org/eclipse/sensinact/gateway/nthbnd/rest/ws/test/WsServiceTestClient.java2
-rw-r--r--platform/protocol/http/src/test/java/org/eclipse/sensinact/gateway/protocol/http/test/TestHttpProtocol.java2
-rw-r--r--platform/protocol/http/src/test/java/org/eclipse/sensinact/gateway/protocol/http/test/TestHttpProtocolJetty.java2
-rw-r--r--platform/sensinact-generic/src/test/java/org/eclipse/sensinact/gateway/generic/test/TestGenericImplementation.java2
-rw-r--r--platform/sensinact-security/sensinact-security-core/src/test/java/org/eclipse/sensinact/gateway/core/security/test/TestUserManager.java4
-rw-r--r--platform/southbound/http/http-device/extra-src/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle1/Activator.java4
-rw-r--r--platform/southbound/http/http-device/extra-src2/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle2/Activator.java2
-rw-r--r--platform/southbound/http/http-device/extra-src3/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle3/Activator.java2
-rw-r--r--platform/southbound/http/http-device/extra-src4/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle4/Activator.java6
-rw-r--r--platform/southbound/http/http-device/extra-src5/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle5/Activator.java4
-rw-r--r--platform/southbound/http/http-device/src/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/TestHttpDevice.java7
19 files changed, 34 insertions, 33 deletions
diff --git a/platform/northbound/geo-filtering/geojson-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/geojson/test/TestGeoJsonFiltering.java b/platform/northbound/geo-filtering/geojson-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/geojson/test/TestGeoJsonFiltering.java
index 9fbb88a3..3fd35b35 100644
--- a/platform/northbound/geo-filtering/geojson-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/geojson/test/TestGeoJsonFiltering.java
+++ b/platform/northbound/geo-filtering/geojson-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/geojson/test/TestGeoJsonFiltering.java
@@ -40,7 +40,7 @@ public class TestGeoJsonFiltering extends MidOSGiTest {
// STATIC DECLARATIONS //
//********************************************************************//
- protected static final String HTTP_ROOTURL = "http://localhost:8898";
+ protected static final String HTTP_ROOTURL = "http://localhost:54460";
protected static final String WS_ROOTURL = "/sensinact";
//********************************************************************//
@@ -115,7 +115,7 @@ public class TestGeoJsonFiltering extends MidOSGiTest {
configuration.put("org.eclipse.sensinact.gateway.location.latitude", "45.2d");
configuration.put("org.eclipse.sensinact.gateway.location.longitude", "5.7d");
- configuration.put("org.osgi.service.http.port", "8898");
+ configuration.put("org.osgi.service.http.port", "54460");
configuration.put("org.apache.felix.http.jettyEnabled", true);
configuration.put("org.apache.felix.http.whiteboardEnabled", true);
diff --git a/platform/northbound/geo-filtering/geojson-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/geojson/ws/test/WsServiceTestClient.java b/platform/northbound/geo-filtering/geojson-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/geojson/ws/test/WsServiceTestClient.java
index 46551074..02e1d480 100644
--- a/platform/northbound/geo-filtering/geojson-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/geojson/ws/test/WsServiceTestClient.java
+++ b/platform/northbound/geo-filtering/geojson-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/geojson/ws/test/WsServiceTestClient.java
@@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
@WebSocket(maxTextMessageSize = 64 * 1024)
public class WsServiceTestClient implements Runnable {
- String destUri = "ws://localhost:8898/ws";
+ String destUri = "ws://localhost:54460/ws";
WebSocketClient client = null;
Session session;
AtomicBoolean available;
diff --git a/platform/northbound/http-tools/src/test/java/org/eclipse/sensinact/gateway/nthbnd/forward/test/TestForwardingService.java b/platform/northbound/http-tools/src/test/java/org/eclipse/sensinact/gateway/nthbnd/forward/test/TestForwardingService.java
index c610bca5..5d66ae3d 100644
--- a/platform/northbound/http-tools/src/test/java/org/eclipse/sensinact/gateway/nthbnd/forward/test/TestForwardingService.java
+++ b/platform/northbound/http-tools/src/test/java/org/eclipse/sensinact/gateway/nthbnd/forward/test/TestForwardingService.java
@@ -40,7 +40,7 @@ public class TestForwardingService extends MidOSGiTest {
// STATIC DECLARATIONS //
//********************************************************************//
- protected static final String HTTP_ROOTURL = "http://localhost:8898";
+ protected static final String HTTP_ROOTURL = "http://localhost:54460";
//********************************************************************//
// INSTANCE DECLARATIONS //
@@ -115,7 +115,7 @@ public class TestForwardingService extends MidOSGiTest {
configuration.put("org.eclipse.sensinact.gateway.location.latitude", "45.2d");
configuration.put("org.eclipse.sensinact.gateway.location.longitude", "5.7d");
- configuration.put("org.osgi.service.http.port", "8898");
+ configuration.put("org.osgi.service.http.port", "54460");
configuration.put("org.apache.felix.http.jettyEnabled", "true");
configuration.put("org.apache.felix.http.whiteboardEnabled", "true");
diff --git a/platform/northbound/jsonpath-filtering/jsonpath-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/jsonpath/test/TestJsonPathFiltering.java b/platform/northbound/jsonpath-filtering/jsonpath-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/jsonpath/test/TestJsonPathFiltering.java
index 8ae95e89..af72b759 100644
--- a/platform/northbound/jsonpath-filtering/jsonpath-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/jsonpath/test/TestJsonPathFiltering.java
+++ b/platform/northbound/jsonpath-filtering/jsonpath-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/jsonpath/test/TestJsonPathFiltering.java
@@ -40,7 +40,7 @@ public class TestJsonPathFiltering extends MidOSGiTest {
// STATIC DECLARATIONS //
//********************************************************************//
- protected static final String HTTP_ROOTURL = "http://localhost:8898";
+ protected static final String HTTP_ROOTURL = "http://localhost:54460";
protected static final String WS_ROOTURL = "/sensinact";
//********************************************************************//
@@ -117,7 +117,7 @@ public class TestJsonPathFiltering extends MidOSGiTest {
configuration.put("org.eclipse.sensinact.gateway.location.latitude", "45.2d");
configuration.put("org.eclipse.sensinact.gateway.location.longitude", "5.7d");
- configuration.put("org.osgi.service.http.port", "8898");
+ configuration.put("org.osgi.service.http.port", "54460");
configuration.put("org.apache.felix.http.jettyEnabled", true);
configuration.put("org.apache.felix.http.whiteboardEnabled", true);
diff --git a/platform/northbound/jsonpath-filtering/jsonpath-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/jsonpath/ws/test/WsServiceTestClient.java b/platform/northbound/jsonpath-filtering/jsonpath-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/jsonpath/ws/test/WsServiceTestClient.java
index b1d3a04f..ae4df696 100644
--- a/platform/northbound/jsonpath-filtering/jsonpath-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/jsonpath/ws/test/WsServiceTestClient.java
+++ b/platform/northbound/jsonpath-filtering/jsonpath-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/jsonpath/ws/test/WsServiceTestClient.java
@@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
@WebSocket(maxTextMessageSize = 64 * 1024)
public class WsServiceTestClient implements Runnable {
- String destUri = "ws://localhost:8898/ws";
+ String destUri = "ws://localhost:54460/ws";
WebSocketClient client = null;
Session session;
AtomicBoolean available;
diff --git a/platform/northbound/ldap-filtering/ldap-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/jsonpath/test/TestLdapFiltering.java b/platform/northbound/ldap-filtering/ldap-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/jsonpath/test/TestLdapFiltering.java
index d7ca30e4..712e588e 100644
--- a/platform/northbound/ldap-filtering/ldap-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/jsonpath/test/TestLdapFiltering.java
+++ b/platform/northbound/ldap-filtering/ldap-filter/src/test/java/org/eclipse/sensinact/gateway/nthbnd/filter/jsonpath/test/TestLdapFiltering.java
@@ -44,7 +44,7 @@ public class TestLdapFiltering extends MidOSGiTest {
// STATIC DECLARATIONS //
//********************************************************************//
- protected static final String HTTP_ROOTURL = "http://localhost:8898";
+ protected static final String HTTP_ROOTURL = "http://localhost:54460";
protected static final String WS_ROOTURL = "/sensinact";
//********************************************************************//
@@ -119,7 +119,7 @@ public class TestLdapFiltering extends MidOSGiTest {
configuration.put("org.eclipse.sensinact.gateway.location.latitude", "45.2d");
configuration.put("org.eclipse.sensinact.gateway.location.longitude", "5.7d");
- configuration.put("org.osgi.service.http.port", "8898");
+ configuration.put("org.osgi.service.http.port", "54460");
configuration.put("org.apache.felix.http.jettyEnabled", true);
configuration.put("org.apache.felix.http.whiteboardEnabled", true);
diff --git a/platform/northbound/rest-access/src/test/java/org/eclipse/sensinact/gateway/nthbnd/rest/TestRestAccess.java b/platform/northbound/rest-access/src/test/java/org/eclipse/sensinact/gateway/nthbnd/rest/TestRestAccess.java
index a0ed1b03..525cdc8e 100644
--- a/platform/northbound/rest-access/src/test/java/org/eclipse/sensinact/gateway/nthbnd/rest/TestRestAccess.java
+++ b/platform/northbound/rest-access/src/test/java/org/eclipse/sensinact/gateway/nthbnd/rest/TestRestAccess.java
@@ -34,7 +34,7 @@ public class TestRestAccess extends MidOSGiTest {
// STATIC DECLARATIONS //
//********************************************************************//
- protected static final String HTTP_ROOTURL = "http://localhost:8898/sensinact";
+ protected static final String HTTP_ROOTURL = "http://localhost:54460/sensinact";
protected static final String WS_ROOTURL = "/sensinact";
//********************************************************************//
@@ -108,7 +108,7 @@ public class TestRestAccess extends MidOSGiTest {
configuration.put("org.eclipse.sensinact.gateway.location.latitude", "45.2d");
configuration.put("org.eclipse.sensinact.gateway.location.longitude", "5.7d");
- configuration.put("org.osgi.service.http.port", "8898");
+ configuration.put("org.osgi.service.http.port", "54460");
configuration.put("org.apache.felix.http.jettyEnabled", true);
configuration.put("org.apache.felix.http.whiteboardEnabled", true);
diff --git a/platform/northbound/rest-access/src/test/java/org/eclipse/sensinact/gateway/nthbnd/rest/TestRestSUBSCRIBE_UNSUBSCRIBEAccess.java b/platform/northbound/rest-access/src/test/java/org/eclipse/sensinact/gateway/nthbnd/rest/TestRestSUBSCRIBE_UNSUBSCRIBEAccess.java
index 53aaab5d..f9adb4e4 100644
--- a/platform/northbound/rest-access/src/test/java/org/eclipse/sensinact/gateway/nthbnd/rest/TestRestSUBSCRIBE_UNSUBSCRIBEAccess.java
+++ b/platform/northbound/rest-access/src/test/java/org/eclipse/sensinact/gateway/nthbnd/rest/TestRestSUBSCRIBE_UNSUBSCRIBEAccess.java
@@ -41,7 +41,7 @@ public class TestRestSUBSCRIBE_UNSUBSCRIBEAccess extends TestRestAccess {
}
server = null;
}
- server = new JettyTestServer(54460);
+ server = new JettyTestServer(54461);
new Thread(server).start();
server.join();
}
@@ -64,7 +64,7 @@ public class TestRestSUBSCRIBE_UNSUBSCRIBEAccess extends TestRestAccess {
String simulated;
simulated = HttpServiceTestClient.newRequest(mediator, HTTP_ROOTURL +
"/providers/slider/services/cursor/resources/position/SUBSCRIBE",
- "{\"parameters\" : [{\"name\":\"callback\", \"type\":\"string\",\"value\":\"http://localhost:54460\"}]}", "POST");
+ "{\"parameters\" : [{\"name\":\"callback\", \"type\":\"string\",\"value\":\"http://localhost:54461\"}]}", "POST");
//System.out.println(simulated);
response = new JSONObject(simulated);
@@ -126,7 +126,7 @@ public class TestRestSUBSCRIBE_UNSUBSCRIBEAccess extends TestRestAccess {
MidProxy<SliderSetterItf> sliderProxy = new MidProxy<SliderSetterItf>(classloader, this, SliderSetterItf.class);
SliderSetterItf slider = sliderProxy.buildProxy();
- simulated = HttpServiceTestClient.newRequest(mediator, HTTP_ROOTURL + "/providers/slider/services/cursor/resources/position/SUBSCRIBE", "{\"parameters\" : [{\"name\":\"callback\", \"type\":\"string\",\"value\":\"http://127.0.0.1:54460\"}," + "{\"name\":\"conditions\",\"type\":\"array\",\"value\":" + "[{\"operator\":\"<\",\"operand\":200, \"type\":\"int\", \"complement\":false}]}]}", "POST");
+ simulated = HttpServiceTestClient.newRequest(mediator, HTTP_ROOTURL + "/providers/slider/services/cursor/resources/position/SUBSCRIBE", "{\"parameters\" : [{\"name\":\"callback\", \"type\":\"string\",\"value\":\"http://127.0.0.1:54461\"}," + "{\"name\":\"conditions\",\"type\":\"array\",\"value\":" + "[{\"operator\":\"<\",\"operand\":200, \"type\":\"int\", \"complement\":false}]}]}", "POST");
//System.out.println(simulated);
diff --git a/platform/northbound/rest-access/src/test/java/org/eclipse/sensinact/gateway/nthbnd/rest/ws/test/WsServiceTestClient.java b/platform/northbound/rest-access/src/test/java/org/eclipse/sensinact/gateway/nthbnd/rest/ws/test/WsServiceTestClient.java
index 5a1504e1..728ee48b 100644
--- a/platform/northbound/rest-access/src/test/java/org/eclipse/sensinact/gateway/nthbnd/rest/ws/test/WsServiceTestClient.java
+++ b/platform/northbound/rest-access/src/test/java/org/eclipse/sensinact/gateway/nthbnd/rest/ws/test/WsServiceTestClient.java
@@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
@WebSocket(maxTextMessageSize = 64 * 1024)
public class WsServiceTestClient implements Runnable {
- String destUri = "ws://localhost:8898/ws";
+ String destUri = "ws://localhost:54460/ws";
WebSocketClient client = null;
Session session;
AtomicBoolean available;
diff --git a/platform/protocol/http/src/test/java/org/eclipse/sensinact/gateway/protocol/http/test/TestHttpProtocol.java b/platform/protocol/http/src/test/java/org/eclipse/sensinact/gateway/protocol/http/test/TestHttpProtocol.java
index 6cfaea68..e4e5a684 100644
--- a/platform/protocol/http/src/test/java/org/eclipse/sensinact/gateway/protocol/http/test/TestHttpProtocol.java
+++ b/platform/protocol/http/src/test/java/org/eclipse/sensinact/gateway/protocol/http/test/TestHttpProtocol.java
@@ -35,7 +35,7 @@ public class TestHttpProtocol {
//********************************************************************//
// STATIC DECLARATIONS //
//********************************************************************//
- public static int HTTP_PORT = 8898;
+ public static int HTTP_PORT = 54460;
public static String HTTP_ROOTURL = "http://127.0.0.1:" + HTTP_PORT;
public static String newRequest(String configuration) throws IOException {
diff --git a/platform/protocol/http/src/test/java/org/eclipse/sensinact/gateway/protocol/http/test/TestHttpProtocolJetty.java b/platform/protocol/http/src/test/java/org/eclipse/sensinact/gateway/protocol/http/test/TestHttpProtocolJetty.java
index c1dc003b..a7214202 100644
--- a/platform/protocol/http/src/test/java/org/eclipse/sensinact/gateway/protocol/http/test/TestHttpProtocolJetty.java
+++ b/platform/protocol/http/src/test/java/org/eclipse/sensinact/gateway/protocol/http/test/TestHttpProtocolJetty.java
@@ -101,7 +101,7 @@ public class TestHttpProtocolJetty {
//********************************************************************//
// STATIC DECLARATIONS //
//********************************************************************//
- public static int HTTP_PORT = 8898;
+ public static int HTTP_PORT = 54460;
public static String HTTP_ROOTURL = "http://127.0.0.1:" + HTTP_PORT;
public static String newRequest(String configuration) throws IOException {
diff --git a/platform/sensinact-generic/src/test/java/org/eclipse/sensinact/gateway/generic/test/TestGenericImplementation.java b/platform/sensinact-generic/src/test/java/org/eclipse/sensinact/gateway/generic/test/TestGenericImplementation.java
index 73b3d2de..faef58e9 100644
--- a/platform/sensinact-generic/src/test/java/org/eclipse/sensinact/gateway/generic/test/TestGenericImplementation.java
+++ b/platform/sensinact-generic/src/test/java/org/eclipse/sensinact/gateway/generic/test/TestGenericImplementation.java
@@ -650,7 +650,7 @@ public class TestGenericImplementation extends MidOSGiTest {
configuration.put("org.eclipse.sensinact.gateway.location.latitude", "45.2d");
configuration.put("org.eclipse.sensinact.gateway.location.longitude", "5.7d");
- configuration.put("org.osgi.service.http.port", "8898");
+ configuration.put("org.osgi.service.http.port", "54460");
configuration.put("org.apache.felix.http.jettyEnabled", true);
configuration.put("org.apache.felix.http.whiteboardEnabled", true);
diff --git a/platform/sensinact-security/sensinact-security-core/src/test/java/org/eclipse/sensinact/gateway/core/security/test/TestUserManager.java b/platform/sensinact-security/sensinact-security-core/src/test/java/org/eclipse/sensinact/gateway/core/security/test/TestUserManager.java
index 231c081e..2e3d1c62 100644
--- a/platform/sensinact-security/sensinact-security-core/src/test/java/org/eclipse/sensinact/gateway/core/security/test/TestUserManager.java
+++ b/platform/sensinact-security/sensinact-security-core/src/test/java/org/eclipse/sensinact/gateway/core/security/test/TestUserManager.java
@@ -63,7 +63,7 @@ public class TestUserManager extends MidOSGiTest {
// STATIC DECLARATIONS //
//********************************************************************//
- public static int HTTP_PORT = 8898;
+ public static int HTTP_PORT = 54460;
public static String HTTP_ROOTURL = "http://127.0.0.1:" + HTTP_PORT;
public static String newRequest(String url, String content, String method) {
@@ -220,7 +220,7 @@ public class TestUserManager extends MidOSGiTest {
configuration.put("mail.account.connector.password","478569LM");
configuration.put("org.osgi.service.http.host","localhost");
- configuration.put("org.osgi.service.http.port","8898");
+ configuration.put("org.osgi.service.http.port","54460");
configuration.put("org.apache.felix.http.enable","true");
}
diff --git a/platform/southbound/http/http-device/extra-src/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle1/Activator.java b/platform/southbound/http/http-device/extra-src/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle1/Activator.java
index dd2e77a8..1e957f54 100644
--- a/platform/southbound/http/http-device/extra-src/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle1/Activator.java
+++ b/platform/southbound/http/http-device/extra-src/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle1/Activator.java
@@ -24,14 +24,14 @@ import org.eclipse.sensinact.gateway.sthbnd.http.smpl.HttpActivator;
commands = Task.CommandType.GET,
configuration = @HttpTaskConfiguration(
host = "127.0.0.1",
- port="8898",
+ port="54461",
path = "/get")
),
@SimpleHttpTask(
commands = Task.CommandType.SET,
configuration = @HttpTaskConfiguration(
host = "127.0.0.1",
- port="8898",
+ port="54461",
httpMethod = "POST",
path = "/set",
content=ContentBuilderImpl.class)
diff --git a/platform/southbound/http/http-device/extra-src2/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle2/Activator.java b/platform/southbound/http/http-device/extra-src2/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle2/Activator.java
index 8881d6a8..6358296d 100644
--- a/platform/southbound/http/http-device/extra-src2/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle2/Activator.java
+++ b/platform/southbound/http/http-device/extra-src2/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle2/Activator.java
@@ -24,7 +24,7 @@ import org.eclipse.sensinact.gateway.sthbnd.http.smpl.HttpActivator;
timeout = 20000,
recurrence = @HttpTaskConfiguration(
host = "127.0.0.1",
- port="8898",
+ port="54461",
path = "/get")
)
})
diff --git a/platform/southbound/http/http-device/extra-src3/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle3/Activator.java b/platform/southbound/http/http-device/extra-src3/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle3/Activator.java
index b01e5e22..9e75de12 100644
--- a/platform/southbound/http/http-device/extra-src3/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle3/Activator.java
+++ b/platform/southbound/http/http-device/extra-src3/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle3/Activator.java
@@ -23,7 +23,7 @@ import org.eclipse.sensinact.gateway.sthbnd.http.smpl.HttpActivator;
configuration =
@HttpTaskConfiguration(
host = "127.0.0.1",
- port="8898"),
+ port="54461"),
chain = {
@HttpChildTaskConfiguration(
identifier="serviceProviderId",
diff --git a/platform/southbound/http/http-device/extra-src4/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle4/Activator.java b/platform/southbound/http/http-device/extra-src4/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle4/Activator.java
index 1a228b5f..5e0dbb13 100644
--- a/platform/southbound/http/http-device/extra-src4/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle4/Activator.java
+++ b/platform/southbound/http/http-device/extra-src4/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle4/Activator.java
@@ -25,7 +25,7 @@ import org.eclipse.sensinact.gateway.sthbnd.http.smpl.HttpActivator;
commands = {Task.CommandType.GET, Task.CommandType.SERVICES_ENUMERATION},
configuration = @HttpTaskConfiguration(
host = "127.0.0.1",
- port="8898",
+ port="54461",
path = "/get")
),
// another way to do it
@@ -33,14 +33,14 @@ import org.eclipse.sensinact.gateway.sthbnd.http.smpl.HttpActivator;
// commands = CommandType.SERVICES_ENUMERATION ,
// configuration = @HttpTaskConfiguration(
// host = "127.0.0.1",
-// port=8898,
+// port=54461,
// path = "/get/@context[task.serviceProvider]/services")
// ),
@SimpleHttpTask(
commands = Task.CommandType.SET,
configuration = @HttpTaskConfiguration(
host = "127.0.0.1",
- port="8898",
+ port="54461",
httpMethod = "POST",
path = "/set",
content=ContentBuilderImpl.class)
diff --git a/platform/southbound/http/http-device/extra-src5/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle5/Activator.java b/platform/southbound/http/http-device/extra-src5/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle5/Activator.java
index ab1f0a80..97f4b5d6 100644
--- a/platform/southbound/http/http-device/extra-src5/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle5/Activator.java
+++ b/platform/southbound/http/http-device/extra-src5/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/bundle5/Activator.java
@@ -24,14 +24,14 @@ import org.eclipse.sensinact.gateway.sthbnd.http.smpl.HttpActivator;
commands = Task.CommandType.GET,
configuration = @HttpTaskConfiguration(
host = "127.0.0.1",
- port="8898",
+ port="54461",
path = "/req@context[task.path]/get")
),
@SimpleHttpTask(
commands = Task.CommandType.SET,
configuration = @HttpTaskConfiguration(
host = "127.0.0.1",
- port="8898",
+ port="54461",
httpMethod = "POST",
path = "/req@context[task.path]/set",
content=ContentBuilderImpl.class)
diff --git a/platform/southbound/http/http-device/src/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/TestHttpDevice.java b/platform/southbound/http/http-device/src/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/TestHttpDevice.java
index 5866b734..ba74f215 100644
--- a/platform/southbound/http/http-device/src/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/TestHttpDevice.java
+++ b/platform/southbound/http/http-device/src/test/java/org/eclipse/sensinact/gateway/sthbnd/http/test/TestHttpDevice.java
@@ -52,7 +52,8 @@ public class TestHttpDevice extends MidOSGiTest {
//********************************************************************//
// STATIC DECLARATIONS //
//********************************************************************//
- public static int HTTP_PORT = 8898;
+ public static int HTTP_PORT = 54460;
+ public static int SERVER_PORT = 54461;
public static String HTTP_ROOTURL = "http://127.0.0.1:" + HTTP_PORT;
public static String newRequest(String configuration) throws IOException {
@@ -108,7 +109,7 @@ public class TestHttpDevice extends MidOSGiTest {
}
server = null;
}
- server = new JettyTestServer(HTTP_PORT);
+ server = new JettyTestServer(SERVER_PORT);
new Thread(server).start();
server.join();
@@ -355,7 +356,7 @@ public class TestHttpDevice extends MidOSGiTest {
configuration.put("org.eclipse.sensinact.gateway.location.latitude", "45.2d");
configuration.put("org.eclipse.sensinact.gateway.location.longitude", "5.7d");
- configuration.put("org.osgi.service.http.port", "8898");
+ configuration.put("org.osgi.service.http.port", "54460");
configuration.put("org.apache.felix.http.jettyEnabled", true);
configuration.put("org.apache.felix.http.whiteboardEnabled", true);

Back to the top