Changeset 1894

Timestamp:

04/20/12 07:51:13 (12 years ago)

Author:

twagoo

Message:

Fixed manipulate comment methods (for deleting without http DELETE) in rest service. Added tests for all manipulate methods.

Location:

ComponentRegistry/trunk/ComponentRegistry/src

Files:

• main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java (modified) (2 diffs)
• test/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestServiceTest.java (modified) (5 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java

@@ -312 +312 @@
     @POST
     @Path("/profiles/{profileId}/comments/{commentId}")
-    public Response manipulateCommentFromProfile(@PathParam("profileId") String profileId, @PathParam("profileId") String commentId, @FormParam("method") String method,
+    public Response manipulateCommentFromProfile(@PathParam("profileId") String profileId, @PathParam("commentId") String commentId, @FormParam("method") String method,
             @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
         if ("delete".equalsIgnoreCase(method)) {
@@ -323 +323 @@
     @POST
     @Path("/components/{componentId}/comments/{commentId}")
-    public Response manipulateCommentFromComponent(@PathParam("componentId") String componentId, @PathParam("profileId") String commentId, @FormParam("method") String method,
+    public Response manipulateCommentFromComponent(@PathParam("componentId") String componentId, @PathParam("commentId") String commentId, @FormParam("method") String method,
             @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
         if ("delete".equalsIgnoreCase(method)) {

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestServiceTest.java

@@ -14 +14 @@
 import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.representation.Form;
 import com.sun.jersey.multipart.FormDataMultiPart;
 import java.io.ByteArrayInputStream;
@@ -225 +226 @@
 
     @Test
+    public void testManipulateCommentFromComponent() throws Exception {
+        fillUp();
+        List<Comment> comments = getResource().path("/registry/components/clarin.eu:cr1:component1/comments").get(COMMENT_LIST_GENERICTYPE);
+        assertEquals(2, comments.size());
+        Comment aComment = getResource().path("/registry/components/clarin.eu:cr1:component1/comments/2").get(Comment.class);
+        assertNotNull(aComment);
+
+        Form manipulateForm = new Form();
+        manipulateForm.add("method", "delete");
+
+        // Try to delete from other component
+        ClientResponse response = getAuthenticatedResource("/registry/components/clarin.eu:cr1:component1/comments/2").post(ClientResponse.class, manipulateForm);
+        assertEquals(200, response.getStatus());
+
+        comments = getResource().path("/registry/components/clarin.eu:cr1:component1/comments/").get(COMMENT_LIST_GENERICTYPE);
+        assertEquals(1, comments.size());
+    }
+
+    @Test
     public void testDeleteCommentFromProfile() throws Exception {
         fillUp();
@@ -247 +267 @@
         comments = getResource().path("/registry/profiles/clarin.eu:cr1:profile1/comments").get(COMMENT_LIST_GENERICTYPE);
         assertEquals(0, comments.size());
+    }
+
+    @Test
+    public void testManipulateCommentFromProfile() throws Exception {
+        fillUp();
+        List<Comment> comments = getResource().path("/registry/profiles/clarin.eu:cr1:profile1/comments").get(COMMENT_LIST_GENERICTYPE);
+        assertEquals(2, comments.size());
+        Comment aComment = getResource().path("/registry/profiles/clarin.eu:cr1:profile1/comments/0").get(Comment.class);
+        assertNotNull(aComment);
+
+        Form manipulateForm = new Form();
+        manipulateForm.add("method", "delete");
+        // Delete from correct profile
+        ClientResponse response = getAuthenticatedResource("/registry/profiles/clarin.eu:cr1:profile1/comments/0").post(ClientResponse.class, manipulateForm);
+        assertEquals(200, response.getStatus());
+
+        comments = getResource().path("/registry/profiles/clarin.eu:cr1:profile1/comments/").get(COMMENT_LIST_GENERICTYPE);
+        assertEquals(1, comments.size());
     }
 
@@ -329 +367 @@
 
     @Test
+    public void testManipulateRegisteredComponent() throws Exception {
+        fillUp();
+        List<ComponentDescription> components = getResource().path("/registry/components").get(COMPONENT_LIST_GENERICTYPE);
+        assertEquals(2, components.size());
+        CMDComponentSpec profile = getResource().path("/registry/components/clarin.eu:cr1:component1").get(CMDComponentSpec.class);
+        assertNotNull(profile);
+
+        Form manipulateForm = new Form();
+        manipulateForm.add("method", "delete");
+
+        ClientResponse response = getAuthenticatedResource("/registry/components/clarin.eu:cr1:component1").post(ClientResponse.class, manipulateForm);
+        assertEquals(200, response.getStatus());
+
+        components = getResource().path("/registry/components").get(COMPONENT_LIST_GENERICTYPE);
+        assertEquals(1, components.size());
+
+        response = getAuthenticatedResource("/registry/components/clarin.eu:cr1:component2").post(ClientResponse.class, manipulateForm);
+        assertEquals(200, response.getStatus());
+    }
+
+    @Test
     public void testGetRegisteredProfile() throws Exception {
         fillUp();
@@ -417 +476 @@
 
         response = getAuthenticatedResource("/registry/profiles/clarin.eu:cr1:profile1").delete(ClientResponse.class);
+        assertEquals(200, response.getStatus());
+    }
+
+    @Test
+    public void testManipulateRegisteredProfile() throws Exception {
+        fillUp();
+        List<ProfileDescription> profiles = getResource().path("/registry/profiles").get(PROFILE_LIST_GENERICTYPE);
+        assertEquals(2, profiles.size());
+        CMDComponentSpec profile = getResource().path("/registry/profiles/clarin.eu:cr1:profile1").get(CMDComponentSpec.class);
+        assertNotNull(profile);
+
+        Form manipulateForm = new Form();
+        manipulateForm.add("method", "delete");
+
+        ClientResponse response = getAuthenticatedResource("/registry/profiles/clarin.eu:cr1:profile1").post(ClientResponse.class, manipulateForm);
+        assertEquals(200, response.getStatus());
+
+        profiles = getResource().path("/registry/profiles").get(PROFILE_LIST_GENERICTYPE);
+        assertEquals(1, profiles.size());
+
+        response = getAuthenticatedResource("/registry/profiles/clarin.eu:cr1:profile2").post(ClientResponse.class, manipulateForm);
         assertEquals(200, response.getStatus());
     }