commit c2a542bcab4512812a2ef18b07a08c93ac0ebec0
author Jian Li <pyguni@gmail.com> Tue May 10 11:48:19 2016 -0700
committer Jian Li <pyguni@gmail.com> Tue May 10 22:24:39 2016 +0000
tree 5e97323d8dbef836ac79f48c3f0f54532caf454e
parent 419c8bd1b0eb1aca803065e18614a722aa6bb6be

Explicitly return NO CONTENT type response for http DELETE request

Change-Id: I920084b92197bb1687e7d978ad350b2e1290ecbc

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

diff --git a/web/api/src/test/java/org/onosproject/rest/resources/RegionsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/RegionsResourceTest.java
index 155cbd9..574f7e0 100644
--- a/web/api/src/test/java/org/onosproject/rest/resources/RegionsResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/RegionsResourceTest.java
@@ -21,6 +21,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
+import org.glassfish.jersey.client.ClientProperties;
 import org.hamcrest.Description;
 import org.hamcrest.TypeSafeMatcher;
 import org.junit.Before;
@@ -383,7 +384,7 @@
         WebTarget wt = target();
         Response response = wt.path("regions/" + region1.id().toString())
                 .request().delete();
-        assertThat(response.getStatus(), is(HttpURLConnection.HTTP_OK));
+        assertThat(response.getStatus(), is(HttpURLConnection.HTTP_NO_CONTENT));
 
         verify(mockRegionAdminService);
     }
@@ -452,16 +453,16 @@
         replay(mockRegionAdminService);
 
 
-        WebTarget wt = target();
+        WebTarget wt = target()
+                .property(ClientProperties.SUPPRESS_HTTP_COMPLIANCE_VALIDATION, true);
         InputStream jsonStream = RegionsResourceTest.class
                 .getResourceAsStream("region-deviceIds.json");
 
         // FIXME: need to consider whether to use jsonStream for entry deletion
         Response response = wt.path("regions/" +
                 region1.id().toString() + "/devices")
-                .request(MediaType.APPLICATION_JSON_TYPE)
-                .delete();
-        // assertThat(response.getStatus(), is(HttpURLConnection.HTTP_OK));
-        // verify(mockRegionAdminService);
+                .request().method("DELETE", Entity.json(jsonStream));
+        assertThat(response.getStatus(), is(HttpURLConnection.HTTP_NO_CONTENT));
+        verify(mockRegionAdminService);
     }
 }