Fixing CollectionObject service tests.

diff --git a/sandbox/richard/HelloWorld/HelloWorldClient/src/test/java/org/collectionspace/hello/client/test/CollectionObjectServiceTest.java b/sandbox/richard/HelloWorld/HelloWorldClient/src/test/java/org/collectionspace/hello/client/test/CollectionObjectServiceTest.java
index db1674aaa7c705b40fd8b7aca05d1d39b138dbfb..aa76d13c3d3433717696f772367b4a907690b911 100644 (file)
--- a/sandbox/richard/HelloWorld/HelloWorldClient/src/test/java/org/collectionspace/hello/client/test/CollectionObjectServiceTest.java
+++ b/sandbox/richard/HelloWorld/HelloWorldClient/src/test/java/org/collectionspace/hello/client/test/CollectionObjectServiceTest.java
@@ -12,19 +12,18 @@ import org.testng.annotations.Test;
 
 import org.collectionspace.hello.CollectionObject;
 import org.collectionspace.hello.CollectionObjectList;
-import org.collectionspace.hello.PersonNuxeo;
 import org.collectionspace.hello.client.CollectionObjectClient;
 
 /**
- * A PersonNuxeoServiceTest.
+ * A CollectionObjectNuxeoServiceTest.
  * 
  * @version $Revision:$
  */
 public class CollectionObjectServiceTest {
 
     private CollectionObjectClient collectionObjectClient = CollectionObjectClient.getInstance();
-    private String updateId = "";
-    private String deleteId = "";
+    private String updateId = null;
+    private String deleteId = null;
 
     @Test
     public void createCollectionObject() {
@@ -35,23 +34,26 @@ public class CollectionObjectServiceTest {
         Assert.assertEquals(res.getStatus(), Response.Status.CREATED.getStatusCode());
         
         //store updateId locally for "update" test
-        updateId = extractId(res);        
+        if (updateId == null)
+               updateId = extractId(res);
+        else
+               deleteId = extractId(res);
     }
 
     @Test(dependsOnMethods = {"createCollectionObject"})
-    public void updatePerson() {
+    public void updateCollectionObject() {
        ClientResponse<CollectionObject> res = collectionObjectClient.getCollectionObject(updateId);
         CollectionObject collectionObject = res.getEntity();
         verbose("got collectionobject to update: " + updateId,
                        collectionObject, CollectionObject.class);
         
-        collectionObject.setCsid("updated-" + updateId);
+        //collectionObject.setCsid("updated-" + updateId);
         collectionObject.setIdentifier("updated-" + collectionObject.getIdentifier());
         collectionObject.setDescription("updated-" + collectionObject.getDescription());
         
         res = collectionObjectClient.updateCollectionObject(updateId, collectionObject);
         CollectionObject updatedCollectionObject = res.getEntity();
-        Assert.assertEquals(updatedCollectionObject.getDescription(), "updated-" + collectionObject.getDescription());
+        Assert.assertEquals(updatedCollectionObject.getDescription(), collectionObject.getDescription());
 
         verbose("updated collectionObject", updatedCollectionObject, CollectionObject.class);
         
@@ -114,7 +116,7 @@ public class CollectionObjectServiceTest {
     }
 
     private void verbose(String msg) {
-        System.out.println("PersonServiceTest : " + msg);
+        System.out.println("CollectionObjectServiceTest : " + msg);
     }
 
     private void verbose(String msg, Object o, Class clazz) {