From: Sanjay Dalal <sanjay.dalal@berkeley.edu>
Date: Thu, 12 Mar 2009 19:26:58 +0000 (+0000)
Subject: CSPACE-11:  added list and delete operations with tests. fixed test execution order.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=a12bae99bfa1470ec0ccfc95420221d35fa941b5;p=tmp%2Fjakarta-migration.git

CSPACE-11:  added list and delete operations with tests. fixed test execution order.
---

diff --git a/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/PersonProxy.java b/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/PersonProxy.java
index 78b963548..2b6f2370b 100644
--- a/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/PersonProxy.java
+++ b/HelloWorld/HelloWorldClient/src/main/java/org/collectionspace/hello/client/PersonProxy.java
@@ -37,5 +37,6 @@ public interface PersonProxy {
     ClientResponse<Person> updatePerson(@PathParam("id") Long id, Person so);
 
     @DELETE
-     ClientResponse<Response> deletePerson(@PathParam("id") Long id);
+    @Path("/{id}")
+    ClientResponse<Response> deletePerson(@PathParam("id") Long id);
 }
\ No newline at end of file
diff --git a/HelloWorld/HelloWorldClient/src/test/java/org/collectionspace/hello/client/test/PersonServiceTest.java b/HelloWorld/HelloWorldClient/src/test/java/org/collectionspace/hello/client/test/PersonServiceTest.java
index 9fac408be..cf60e22bf 100644
--- a/HelloWorld/HelloWorldClient/src/test/java/org/collectionspace/hello/client/test/PersonServiceTest.java
+++ b/HelloWorld/HelloWorldClient/src/test/java/org/collectionspace/hello/client/test/PersonServiceTest.java
@@ -62,13 +62,14 @@ public class PersonServiceTest {
         List<Persons.PersonListItem> list = persons.getPersonListItem();
         int i = 0;
         for (Persons.PersonListItem pli : list) {
-            verbose("list-item[" + i + "] firstName=" + pli.getFirstName());
-            verbose("list-item[" + i + "] lastName=" + pli.getLastName());
-            verbose("list-item[" + i + "] uri=" + pli.getUri());
+            verbose("getPersons: list-item[" + i + "] firstName=" + pli.getFirstName());
+            verbose("getPersons: list-item[" + i + "] lastName=" + pli.getLastName());
+            verbose("getPersons: list-item[" + i + "] uri=" + pli.getUri());
             i++;
         }
     }
 
+
     @Test
     public void getNonExistingPerson() {
         ClientResponse<Person> res = personClient.getPerson(999L);
@@ -87,7 +88,7 @@ public class PersonServiceTest {
         }
     }
 
-    @Test
+    @Test(dependsOnMethods = {"updatePerson"})
     public void updateWrongPerson() {
         Person touPerson = personClient.getPerson(updateId).getEntity();
         verbose("updateWrongPerson: got person to update", touPerson, Person.class);
@@ -102,6 +103,15 @@ public class PersonServiceTest {
         }
     }
 
+
+    @Test(dependsOnMethods = {"updateWrongPerson"})
+    public void deletePerson() {
+        ClientResponse<Response> res = personClient.deletePerson(updateId);
+        verbose("deletePerson: id=" + updateId);
+        verbose("deletePerson: status = " + res.getStatus());
+        Assert.assertEquals(res.getStatus(), Response.Status.NO_CONTENT.getStatusCode());
+    }
+    
     private Person createPerson(String firstName, String lastName) {
         Person person = new Person();
         person.setFirstName(firstName);
diff --git a/HelloWorld/HelloWorldService/src/main/java/org/collectionspace/hello/services/PersonResource.java b/HelloWorld/HelloWorldService/src/main/java/org/collectionspace/hello/services/PersonResource.java
index eefebb8aa..b8c06b852 100644
--- a/HelloWorld/HelloWorldService/src/main/java/org/collectionspace/hello/services/PersonResource.java
+++ b/HelloWorld/HelloWorldService/src/main/java/org/collectionspace/hello/services/PersonResource.java
@@ -105,7 +105,7 @@ public class PersonResource {
     }
 
     @DELETE
-    @Path("/{id}")
+    @Path("{id}")
     public void deletePerson(@PathParam("id") Long id) {
         Person removed = personDB.remove(id);
         if (removed == null) {