Fix ONOS-4587 and similar issue.
Change-Id: I4ccbfd1ddffe7c86eee0ec7333494538167eae2e
diff --git a/apps/pce/pcerest/src/test/java/org/onosproject/pcerest/PceResourceTest.java b/apps/pce/pcerest/src/test/java/org/onosproject/pcerest/PceResourceTest.java
index 18fa46b..6c96b59 100644
--- a/apps/pce/pcerest/src/test/java/org/onosproject/pcerest/PceResourceTest.java
+++ b/apps/pce/pcerest/src/test/java/org/onosproject/pcerest/PceResourceTest.java
@@ -17,6 +17,7 @@
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
+import org.glassfish.jersey.test.TestProperties;
/**
* Base class for pce rest api tests. Performs common configuration operations.
@@ -24,9 +25,17 @@
public class PceResourceTest extends JerseyTest {
/**
+ * Use first available port.
+ *
+ * @see TestProperties#CONTAINER_PORT
+ */
+ protected static final int EPHEMERAL_PORT = 0;
+
+ /**
* Creates a new web-resource test.
*/
public PceResourceTest() {
super(ResourceConfig.forApplicationClass(PceWebApplication.class));
+ set(TestProperties.CONTAINER_PORT, EPHEMERAL_PORT);
}
}
diff --git a/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImplTest.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImplTest.java
index 8aa53ef..aad0441 100644
--- a/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImplTest.java
+++ b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImplTest.java
@@ -30,7 +30,6 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.onlab.junit.TestTools;
import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.core.CoreService;
import org.onosproject.net.device.DeviceServiceAdapter;
@@ -60,6 +59,13 @@
*/
public class OpenFlowControllerImplTest {
+ /**
+ * Let system pick ephemeral port.
+ *
+ * @see InetSocketAddress#InetSocketAddress(int)
+ */
+ private static final int EPHEMERAL_PORT = 0;
+
OpenFlowSwitch switch1;
Dpid dpid1;
OpenFlowSwitch switch2;
@@ -149,7 +155,7 @@
ComponentContext mockContext = EasyMock.createMock(ComponentContext.class);
Dictionary<String, Object> properties = new Hashtable<>();
properties.put("openflowPorts",
- Integer.toString(TestTools.findAvailablePort(0)));
+ Integer.toString(EPHEMERAL_PORT));
expect(mockContext.getProperties()).andReturn(properties);
replay(mockContext);
controller.activate(mockContext);