commit 3ff504c8e8ceae4ae52828e23d3542847e4d668c
author Prince Pereira <prpereir@partner.ciena.com> Tue Aug 30 14:23:43 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Thu Sep 29 16:22:13 2016 +0000
tree 5cc8f1991e9100c256bc8b712089f968f775c21a
parent 46c82d4d794c3b66c1b0e27db19b5da10284d36f

Fix for ONOS-5175. GroupId refactoring.

Change-Id: I951392bdc69fe1ef694d321164b0b49032617d6b

web/api/src/test/java/org/onosproject/rest/resources/GroupsResourceTest.java

diff --git a/web/api/src/test/java/org/onosproject/rest/resources/GroupsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/GroupsResourceTest.java
index 67cf11b..0e494ef 100644
--- a/web/api/src/test/java/org/onosproject/rest/resources/GroupsResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/GroupsResourceTest.java
@@ -272,9 +272,9 @@
         public boolean matchesSafely(JsonObject jsonGroup) {
             // check id
             final String jsonId = jsonGroup.get("id").asString();
-            final String groupId = group.id().toString();
+            final String groupId = group.id().id().toString();
             if (!jsonId.equals(groupId)) {
-                reason = "id " + group.id().toString();
+                reason = "id " + group.id().id().toString();
                 return false;
             }
 
@@ -356,7 +356,7 @@
 
                 final JsonObject jsonGroup = json.get(jsonGroupIndex).asObject();
 
-                final String groupId = group.id().toString();
+                final String groupId = group.id().id().toString();
                 final String jsonGroupId = jsonGroup.get("id").asString();
                 if (jsonGroupId.equals(groupId)) {
                     groupFound = true;
@@ -366,7 +366,7 @@
                 }
             }
             if (!groupFound) {
-                reason = "Group with id " + group.id().toString() + " not found";
+                reason = "Group with id " + group.id().id().toString() + " not found";
                 return false;
             } else {
                 return true;