Add GossipLinkStoreTest
Change-Id: If3d9777583a38d911b19bb1bc50212ccb621918a
diff --git a/core/store/trivial/src/test/java/org/onlab/onos/store/trivial/impl/SimpleDeviceStoreTest.java b/core/store/trivial/src/test/java/org/onlab/onos/store/trivial/impl/SimpleDeviceStoreTest.java
index f43ae10..cc65052 100644
--- a/core/store/trivial/src/test/java/org/onlab/onos/store/trivial/impl/SimpleDeviceStoreTest.java
+++ b/core/store/trivial/src/test/java/org/onlab/onos/store/trivial/impl/SimpleDeviceStoreTest.java
@@ -23,6 +23,7 @@
import static org.onlab.onos.net.Device.Type.SWITCH;
import static org.onlab.onos.net.DeviceId.deviceId;
import static org.onlab.onos.net.device.DeviceEvent.Type.*;
+import static org.onlab.onos.net.NetTestTools.assertAnnotationsEquals;
import java.util.Arrays;
import java.util.HashMap;
@@ -38,7 +39,6 @@
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-import org.onlab.onos.net.Annotations;
import org.onlab.onos.net.DefaultAnnotations;
import org.onlab.onos.net.Device;
import org.onlab.onos.net.DeviceId;
@@ -56,6 +56,7 @@
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
+
import org.onlab.packet.ChassisId;
/**
@@ -146,25 +147,6 @@
assertEquals(SN, device.serialNumber());
}
- // TODO slice this out somewhere
- /**
- * Verifies that Annotations created by merging {@code annotations} is
- * equal to actual Annotations.
- *
- * @param actual Annotations to check
- * @param annotations
- */
- public static void assertAnnotationsEquals(Annotations actual, SparseAnnotations... annotations) {
- DefaultAnnotations expected = DefaultAnnotations.builder().build();
- for (SparseAnnotations a : annotations) {
- expected = DefaultAnnotations.merge(expected, a);
- }
- assertEquals(expected.keys(), actual.keys());
- for (String key : expected.keys()) {
- assertEquals(expected.value(key), actual.value(key));
- }
- }
-
@Test
public final void testGetDeviceCount() {
assertEquals("initialy empty", 0, deviceStore.getDeviceCount());