commit 76b30f7881150b405bde0c3caafce605403ac0d3
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Mon Jan 11 14:08:35 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Mon Jan 11 22:38:16 2016 +0000
tree e67e6895a616ba0eddb6e97856aed0a432b4f6a8
parent 61ab5e0f6f394665ab4ed7c8003de1ee3ebb6b3f

Rename ResourcePath.Key to ResourceId for naming consistency

Change-Id: Idb34624f897b0fd5745f26758a007c171f4cd774

core/api/src/test/java/org/onosproject/net/newresource/ResourcePathTest.java

diff --git a/core/api/src/test/java/org/onosproject/net/newresource/ResourcePathTest.java b/core/api/src/test/java/org/onosproject/net/newresource/ResourcePathTest.java
index 23bbb27..83d9b44 100644
--- a/core/api/src/test/java/org/onosproject/net/newresource/ResourcePathTest.java
+++ b/core/api/src/test/java/org/onosproject/net/newresource/ResourcePathTest.java
@@ -60,18 +60,18 @@
     }
 
     @Test
-    public void testKeyEquality() {
-        ResourcePath.Key key1 = ResourcePath.discrete(D1, P1, VLAN1).key();
-        ResourcePath.Key sameAsKey1 = ResourcePath.discrete(D1, P1, VLAN1).key();
-        ResourcePath.Key key2 = ResourcePath.discrete(D2, P1, VLAN1).key();
-        ResourcePath.Key key3 = ResourcePath.continuous(BW1.bps(), D1, P1, BW1).key();
+    public void testIdEquality() {
+        ResourceId id1 = ResourcePath.discrete(D1, P1, VLAN1).id();
+        ResourceId sameAsId1 = ResourcePath.discrete(D1, P1, VLAN1).id();
+        ResourceId id2 = ResourcePath.discrete(D2, P1, VLAN1).id();
+        ResourceId id3 = ResourcePath.continuous(BW1.bps(), D1, P1, BW1).id();
         // intentionally set a different value
-        ResourcePath.Key sameAsKey3 = ResourcePath.continuous(BW2.bps(), D1, P1, BW1).key();
+        ResourceId sameAsId3 = ResourcePath.continuous(BW2.bps(), D1, P1, BW1).id();
 
         new EqualsTester()
-                .addEqualityGroup(key1, sameAsKey1)
-                .addEqualityGroup(key2)
-                .addEqualityGroup(key3, sameAsKey3);
+                .addEqualityGroup(id1, sameAsId1)
+                .addEqualityGroup(id2)
+                .addEqualityGroup(id3, sameAsId3);
     }
 
     @Test