From: Richard Millet Date: Sat, 2 May 2009 06:54:02 +0000 (+0000) Subject: CSPACE-84: Modified client test code to work with new source structure. X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=9b2047a18cffce35962b8d7e881f7bc7d5fcbf9f;p=tmp%2Fjakarta-migration.git 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 c2780a8a4..97aee047a 100644 --- 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 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 a24a19baa..9b41c3fe8 100644 --- 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"; private static final String HOST = "localhost"; private static final String PORT = "8080"; - private static final String URI = "/helloworld/cspace-nuxeo"; + private static final String URI = "/CollectionSpace/nuxeo-rest"; private static final String URL = SCHEME + "://" + HOST + ":" + PORT +