Optimizing performance of HostId.
diff --git a/core/api/src/test/java/org/onlab/onos/net/DefaultEdgeLinkTest.java b/core/api/src/test/java/org/onlab/onos/net/DefaultEdgeLinkTest.java
index fd63797..9fb9570 100644
--- a/core/api/src/test/java/org/onlab/onos/net/DefaultEdgeLinkTest.java
+++ b/core/api/src/test/java/org/onlab/onos/net/DefaultEdgeLinkTest.java
@@ -18,8 +18,8 @@
private static final ProviderId PID = new ProviderId("of", "foo");
private static final DeviceId DID1 = deviceId("of:foo");
- private static final HostId HID1 = hostId("nic:foobar");
- private static final HostId HID2 = hostId("nic:barfoo");
+ private static final HostId HID1 = hostId("00:00:00:00:00:01/-1");
+ private static final HostId HID2 = hostId("00:00:00:00:00:01/-1");
private static final PortNumber P0 = portNumber(0);
private static final PortNumber P1 = portNumber(1);
@@ -35,12 +35,8 @@
EdgeLink l4 = new DefaultEdgeLink(PID, cp(HID2, P0),
new HostLocation(DID1, P1, 123L), false);
- EdgeLink l5 = new DefaultEdgeLink(PID, cp(HID1, P0),
- new HostLocation(DID1, P1, 123L), false);
-
new EqualsTester().addEqualityGroup(l1, l2)
.addEqualityGroup(l3, l4)
- .addEqualityGroup(l5)
.testEquals();
}
diff --git a/core/api/src/test/java/org/onlab/onos/net/DeviceIdTest.java b/core/api/src/test/java/org/onlab/onos/net/DeviceIdTest.java
index eaee54c..295955e 100644
--- a/core/api/src/test/java/org/onlab/onos/net/DeviceIdTest.java
+++ b/core/api/src/test/java/org/onlab/onos/net/DeviceIdTest.java
@@ -8,7 +8,7 @@
/**
* Test of the device identifier.
*/
-public class DeviceIdTest extends ElementIdTest {
+public class DeviceIdTest {
@Test
public void basics() {
diff --git a/core/api/src/test/java/org/onlab/onos/net/ElementIdTest.java b/core/api/src/test/java/org/onlab/onos/net/ElementIdTest.java
deleted file mode 100644
index cf209b3..0000000
--- a/core/api/src/test/java/org/onlab/onos/net/ElementIdTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.onlab.onos.net;
-
-import com.google.common.testing.EqualsTester;
-import org.junit.Test;
-
-import java.net.URI;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Test of the network element identifier.
- */
-public class ElementIdTest {
-
- private static class FooId extends ElementId {
- public FooId(URI uri) {
- super(uri);
- }
- }
-
- public static URI uri(String str) {
- return URI.create(str);
- }
-
- @Test
- public void basics() {
- new EqualsTester()
- .addEqualityGroup(new FooId(uri("of:foo")),
- new FooId(uri("of:foo")))
- .addEqualityGroup(new FooId(uri("of:bar")))
- .testEquals();
- assertEquals("wrong uri", uri("ofcfg:foo"),
- new FooId(uri("ofcfg:foo")).uri());
- }
-
-}
diff --git a/core/api/src/test/java/org/onlab/onos/net/HostIdTest.java b/core/api/src/test/java/org/onlab/onos/net/HostIdTest.java
index 712f6b2..40efeb1 100644
--- a/core/api/src/test/java/org/onlab/onos/net/HostIdTest.java
+++ b/core/api/src/test/java/org/onlab/onos/net/HostIdTest.java
@@ -11,20 +11,18 @@
/**
* Test for the host identifier.
*/
-public class HostIdTest extends ElementIdTest {
+public class HostIdTest {
private static final MacAddress MAC1 = MacAddress.valueOf("00:11:00:00:00:01");
private static final MacAddress MAC2 = MacAddress.valueOf("00:22:00:00:00:02");
private static final VlanId VLAN1 = VlanId.vlanId((short) 11);
private static final VlanId VLAN2 = VlanId.vlanId((short) 22);
- @Override
@Test
public void basics() {
new EqualsTester()
- .addEqualityGroup(hostId("nic:00:11:00:00:00:01-11"),
- hostId(MAC1, VLAN1))
- .addEqualityGroup(hostId(MAC2, VLAN2))
+ .addEqualityGroup(hostId(MAC1, VLAN1), hostId(MAC1, VLAN1))
+ .addEqualityGroup(hostId(MAC2, VLAN2), hostId(MAC2, VLAN2))
.testEquals();
}
diff --git a/core/api/src/test/java/org/onlab/onos/net/NetTestTools.java b/core/api/src/test/java/org/onlab/onos/net/NetTestTools.java
index ce64e46..379ec7a 100644
--- a/core/api/src/test/java/org/onlab/onos/net/NetTestTools.java
+++ b/core/api/src/test/java/org/onlab/onos/net/NetTestTools.java
@@ -31,7 +31,7 @@
// Short-hand for producing a host id from a string
public static HostId hid(String id) {
- return hostId("nic:" + id);
+ return hostId(id);
}
// Crates a new device with the specified id
diff --git a/core/api/src/test/java/org/onlab/onos/net/PortNumberTest.java b/core/api/src/test/java/org/onlab/onos/net/PortNumberTest.java
index 528ad09..d942a98 100644
--- a/core/api/src/test/java/org/onlab/onos/net/PortNumberTest.java
+++ b/core/api/src/test/java/org/onlab/onos/net/PortNumberTest.java
@@ -10,9 +10,8 @@
/**
* Test of the port number.
*/
-public class PortNumberTest extends ElementIdTest {
+public class PortNumberTest {
- @Override
@Test
public void basics() {
new EqualsTester()