Modified UI model objects to be backed merely by IDs of the core model objects.
Change-Id: I4ca81fb1c877ee4ce4209d405fd8c6645c8f5d20
diff --git a/core/api/src/test/java/org/onosproject/ui/model/AbstractUiModelTest.java b/core/api/src/test/java/org/onosproject/ui/model/AbstractUiModelTest.java
index 15b3870..e25aa4a 100644
--- a/core/api/src/test/java/org/onosproject/ui/model/AbstractUiModelTest.java
+++ b/core/api/src/test/java/org/onosproject/ui/model/AbstractUiModelTest.java
@@ -16,9 +16,11 @@
package org.onosproject.ui.model;
+import org.onlab.packet.IpAddress;
import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.ClusterServiceAdapter;
import org.onosproject.cluster.ControllerNode;
+import org.onosproject.cluster.DefaultControllerNode;
import org.onosproject.cluster.NodeId;
import org.onosproject.mastership.MastershipService;
import org.onosproject.net.device.DeviceService;
@@ -88,10 +90,21 @@
}
};
- private static final ClusterService MOCK_CLUSTER = new MockClusterService();
+ protected static final ClusterService MOCK_CLUSTER = new MockClusterService();
+ protected static final NodeId NODE_ID = NodeId.nodeId("Node-1");
+ protected static final IpAddress NODE_IP = IpAddress.valueOf("1.2.3.4");
+
+ protected static final ControllerNode CNODE_1 =
+ new DefaultControllerNode(NODE_ID, NODE_IP);
private static class MockClusterService extends ClusterServiceAdapter {
+
+ @Override
+ public ControllerNode getNode(NodeId nodeId) {
+ return CNODE_1;
+ }
+
@Override
public ControllerNode.State getState(NodeId nodeId) {
// For now, a hardcoded state of ACTIVE (but not READY)
diff --git a/core/api/src/test/java/org/onosproject/ui/model/topo/UiClusterMemberTest.java b/core/api/src/test/java/org/onosproject/ui/model/topo/UiClusterMemberTest.java
index f29e8dd..2e26989 100644
--- a/core/api/src/test/java/org/onosproject/ui/model/topo/UiClusterMemberTest.java
+++ b/core/api/src/test/java/org/onosproject/ui/model/topo/UiClusterMemberTest.java
@@ -18,10 +18,6 @@
import org.junit.Before;
import org.junit.Test;
-import org.onlab.packet.IpAddress;
-import org.onosproject.cluster.ControllerNode;
-import org.onosproject.cluster.DefaultControllerNode;
-import org.onosproject.cluster.NodeId;
import org.onosproject.ui.model.AbstractUiModelTest;
import static org.junit.Assert.assertEquals;
@@ -31,18 +27,12 @@
*/
public class UiClusterMemberTest extends AbstractUiModelTest {
- private static final NodeId NODE_ID = NodeId.nodeId("Node-1");
- private static final IpAddress NODE_IP = IpAddress.valueOf("1.2.3.4");
-
- private static final ControllerNode CNODE_1 =
- new DefaultControllerNode(NODE_ID, NODE_IP);
-
private UiTopology topo;
private UiClusterMember member;
@Before
public void setUp() {
- topo = new UiTopology();
+ topo = new UiTopology(MOCK_SERVICES);
}
@Test
diff --git a/core/api/src/test/java/org/onosproject/ui/model/topo/UiTopologyTest.java b/core/api/src/test/java/org/onosproject/ui/model/topo/UiTopologyTest.java
index 5df0a9f..cb6a316 100644
--- a/core/api/src/test/java/org/onosproject/ui/model/topo/UiTopologyTest.java
+++ b/core/api/src/test/java/org/onosproject/ui/model/topo/UiTopologyTest.java
@@ -25,7 +25,7 @@
import org.onosproject.net.PortNumber;
import org.onosproject.net.provider.ProviderId;
import org.onosproject.net.region.RegionId;
-import org.onosproject.ui.AbstractUiTest;
+import org.onosproject.ui.model.AbstractUiModelTest;
import java.util.ArrayList;
import java.util.Collections;
@@ -38,7 +38,7 @@
/**
* Unit tests for {@link UiTopology}.
*/
-public class UiTopologyTest extends AbstractUiTest {
+public class UiTopologyTest extends AbstractUiModelTest {
private static final DeviceId DEV_X = deviceId("dev-X");
private static final DeviceId DEV_Y = deviceId("dev-Y");
@@ -79,7 +79,7 @@
@Before
public void setUp() {
- topo = new UiTopology();
+ topo = new UiTopology(MOCK_SERVICES);
devLink = new UiDeviceLink(null, DX1_DY2);
devLink.attachBackingLink(LINK_X1_TO_Y2);
}