CSPACE-84: Modified client test code to work with new source structure.

diff --git a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java
index c2780a8a406f08b4aa214bde267adb37048ca223..97aee047ac9d475ad2d3e85514dd783549c2e9dc 100644 (file)
--- a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java
+++ b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java
@@ -34,10 +34,12 @@ public class CollectionObjectServiceTest {
         Assert.assertEquals(res.getStatus(), Response.Status.CREATED.getStatusCode());
         
         //store updateId locally for "update" test
-        if (updateId == null)
+        if (updateId == null) {
                updateId = extractId(res);
-        else
+        } else {
                deleteId = extractId(res);
+               System.out.println("Set deleteId: " + deleteId);
+        }
     }
 
     @Test(dependsOnMethods = {"createCollectionObject"})
@@ -83,8 +85,9 @@ public class CollectionObjectServiceTest {
         }
     }
 
-    @Test(dependsOnMethods = {"updateCollectionObject"})
+    @Test(dependsOnMethods = {"createCollection"})
     public void deleteCollectionObject() {
+       System.out.println("Calling deleteCollectionObject:" + deleteId);
         ClientResponse<Response> res = collectionObjectClient.deleteCollectionObject(deleteId);
         verbose("deleteCollectionObject: csid=" + deleteId);
         verbose("deleteCollectionObject: status = " + res.getStatus());

diff --git a/services/common/src/main/java/org/collectionspace/services/client/CollectionSpaceClient.java b/services/common/src/main/java/org/collectionspace/services/client/CollectionSpaceClient.java
index a24a19baa4da767f3f808c4e9dd59d196595a5f9..9b41c3fe82cc1e0799c6745984aa13565f78768a 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/client/CollectionSpaceClient.java
+++ b/services/common/src/main/java/org/collectionspace/services/client/CollectionSpaceClient.java
@@ -12,7 +12,7 @@ public abstract class CollectionSpaceClient {
        private static final String SCHEME = "http";\r
        private static final String HOST = "localhost";\r
        private static final String PORT = "8080";\r
-       private static final String URI = "/helloworld/cspace-nuxeo";\r
+       private static final String URI = "/CollectionSpace/nuxeo-rest";\r
        private static final String URL = SCHEME + "://" +\r
                HOST + ":" +\r
                PORT +\r