commit 1853b3f3598f7e3137dce58c1a2d6043b312822d
author Varun Sharma <varunsha@partner.ciena.com> Mon Jul 18 14:37:13 2016 +0530
committer Varun Sharma <varunsha@partner.ciena.com> Mon Jul 25 09:15:06 2016 +0000
tree d17cea0b9ab6216016506dd7dd28e09252447900
parent c553c954c89a9d91eecf679a5719105ddab025fc

Cherry pick ONOS-4835 fix

Change-Id: I82ecb542dad4430d55af0fc684f8d13d6e45b45e

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 11334d2..63a7daa 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
@@ -95,14 +95,14 @@
     final Device device2 = new DefaultDevice(null, deviceId2, Device.Type.OTHER,
             "", "", "", "", null);
 
-    final MockGroup group1 = new MockGroup(deviceId1, 1, "111", 1);
-    final MockGroup group2 = new MockGroup(deviceId1, 2, "222", 2);
+    final MockGroup group1 = new MockGroup(deviceId1, 1, "0x111", 1);
+    final MockGroup group2 = new MockGroup(deviceId1, 2, "0x222", 2);
 
-    final MockGroup group3 = new MockGroup(deviceId2, 3, "333", 3);
-    final MockGroup group4 = new MockGroup(deviceId2, 4, "444", 4);
+    final MockGroup group3 = new MockGroup(deviceId2, 3, "0x333", 3);
+    final MockGroup group4 = new MockGroup(deviceId2, 4, "0x444", 4);
 
-    final MockGroup group5 = new MockGroup(deviceId3, 5, "555", 5);
-    final MockGroup group6 = new MockGroup(deviceId3, 6, "666", 6);
+    final MockGroup group5 = new MockGroup(deviceId3, 5, "0x555", 5);
+    final MockGroup group6 = new MockGroup(deviceId3, 6, "0x666", 6);
 
     /**
      * Mock class for a group.
@@ -462,7 +462,7 @@
                 .andReturn(group5).anyTimes();
         replay(mockGroupService);
         final WebTarget wt = target();
-        final String response = wt.path("groups/" + deviceId3 + "/" + "111")
+        final String response = wt.path("groups/" + deviceId3 + "/" + "0x111")
                 .request().get(String.class);
         final JsonObject result = Json.parse(response).asObject();
         assertThat(result, notNullValue());
@@ -484,7 +484,7 @@
                 .andReturn(null).anyTimes();
         replay(mockGroupService);
         final WebTarget wt = target();
-        final Response response = wt.path("groups/" + deviceId3 + "/" + "222").request().get();
+        final Response response = wt.path("groups/" + deviceId3 + "/" + "0x222").request().get();
 
         assertEquals(404, response.getStatus());
     }
@@ -522,7 +522,7 @@
 
         WebTarget wt = target();
 
-        String location = "/groups/1/111";
+        String location = "/groups/1/0x111";
 
         Response deleteResponse = wt.path(location)
                 .request(MediaType.APPLICATION_JSON_TYPE)