commit 9d61649f0f5b318cbbf650d90b4fd681770e429f
author Jian Li <pyguni@gmail.com> Wed Mar 09 10:52:49 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Mar 24 18:54:28 2016 +0000
tree acf79d758aa01fefdc896933e50da9d0f6e891cd
parent b1681bda109d5d53a0447be3696c5ef9a1a6a672

[ONOS-4042] Bump up Jersey from 1.19 to 2.22.2

- Fix unit test errors of web/api
- Fix default page redirection problem
- Fix compilation errors of web/gui
- Fix configuration of aaa, acl, cordfabric, cord-gui, dhcp, mfwd,
  olt, openstack, segmentrouting, vtn, virtualbng, xos-integration
- Fix unit test errors of cpman, vtn, acl, faultmanagement
- Fix compilation errors of openstack, virtualbng, xos-integration,
  REST SB controller
- Rearrange features.xml to resolve bundle dependencies
- Remove all of stale Jersey 1.x libraries
- Rearrange web.xml to point new Jersey 2.x servlet

Change-Id: Ic17f461ede0aa36fa8d470546d8069152dc1d134

web/api/src/test/java/org/onosproject/rest/DevicesResourceTest.java

diff --git a/web/api/src/test/java/org/onosproject/rest/DevicesResourceTest.java b/web/api/src/test/java/org/onosproject/rest/DevicesResourceTest.java
index 1804fe12..16e6cc0 100644
--- a/web/api/src/test/java/org/onosproject/rest/DevicesResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/DevicesResourceTest.java
@@ -15,9 +15,10 @@
  */
 package org.onosproject.rest;
 
-import java.util.List;
-
 import com.eclipsesource.json.Json;
+import com.eclipsesource.json.JsonArray;
+import com.eclipsesource.json.JsonObject;
+import com.google.common.collect.ImmutableList;
 import org.hamcrest.Description;
 import org.hamcrest.TypeSafeMatcher;
 import org.junit.After;
@@ -35,11 +36,9 @@
 import org.onosproject.net.Port;
 import org.onosproject.net.device.DeviceService;
 
-import com.eclipsesource.json.JsonArray;
-import com.eclipsesource.json.JsonObject;
-import com.google.common.collect.ImmutableList;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.client.WebResource;
+import javax.ws.rs.NotFoundException;
+import javax.ws.rs.client.WebTarget;
+import java.util.List;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -248,8 +247,8 @@
         expect(mockDeviceService.getDevices()).andReturn(ImmutableList.of());
         replay(mockDeviceService);
 
-        WebResource rs = resource();
-        String response = rs.path("devices").get(String.class);
+        WebTarget wt = target();
+        String response = wt.path("devices").request().get(String.class);
         assertThat(response, is("{\"devices\":[]}"));
     }
 
@@ -268,8 +267,8 @@
 
         replay(mockDeviceService);
 
-        WebResource rs = resource();
-        String response = rs.path("devices").get(String.class);
+        WebTarget wt = target();
+        String response = wt.path("devices").request().get(String.class);
         assertThat(response, containsString("{\"devices\":["));
 
         JsonObject result = Json.parse(response).asObject();
@@ -302,8 +301,8 @@
                 .once();
         replay(mockDeviceService);
 
-        WebResource rs = resource();
-        String response = rs.path("devices/" + deviceId).get(String.class);
+        WebTarget wt = target();
+        String response = wt.path("devices/" + deviceId).request().get(String.class);
         JsonObject result = Json.parse(response).asObject();
         assertThat(result, matchesDevice(device));
     }
@@ -332,9 +331,9 @@
                 .once();
         replay(mockDeviceService);
 
-        WebResource rs = resource();
+        WebTarget wt = target();
         String response =
-                rs.path("devices/" + deviceId + "/ports")
+                wt.path("devices/" + deviceId + "/ports").request()
                     .get(String.class);
         JsonObject result = Json.parse(response).asObject();
         assertThat(result, matchesDevice(device));
@@ -366,13 +365,13 @@
                 .anyTimes();
         replay(mockDeviceService);
 
-        WebResource rs = resource();
+        WebTarget wt = target();
         try {
-            rs.path("devices/0").get(String.class);
+            wt.path("devices/0").request().get(String.class);
             fail("Fetch of non-existent device did not throw an exception");
-        } catch (UniformInterfaceException ex) {
+        } catch (NotFoundException ex) {
             assertThat(ex.getMessage(),
-                    containsString("returned a response status of"));
+                    containsString("HTTP 404 Not Found"));
         }
     }
 }