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 78b9635480420011c4f8e04c28d8de9c02c4e9c3..2b6f2370b97180ff9d9ee21e39a991b03ed0491f 100644 (file)
--- 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 9fac408be3f95e77c4e04f8fdb742d7e6a37acf1..cf60e22bfa9159e09facd6cbff8c1101bc5e0492 100644 (file)
--- 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 eefebb8aa7d8d11ddfcbefcb17a3ec609d502dd7..b8c06b852e73a18ef2f93fb67b883237fddcddc8 100644 (file)
--- 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) {