CSPACE-332: Changed test to look for http status code 200-ok after delete. Majority...

diff --git a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
index 350f06d7e1d501bec2809d093f552964e1390ce0..413442a02e1377e017b5d6dc1e5792343bb84616 100644 (file)
--- a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
+++ b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
@@ -3,7 +3,8 @@ package org.collectionspace.services.jaxrs;
 import org.collectionspace.services.collectionobject.CollectionObjectResource;
 import org.collectionspace.services.id.IDResource;
 import org.collectionspace.services.intake.IntakeResource;
-import org.collectionspace.services.relation.RelationResource;
+//import org.collectionspace.services.relation.RelationResource;
+import org.collectionspace.services.relation.NewRelationResource;
 
 import javax.ws.rs.core.Application;
 import java.util.HashSet;
@@ -19,7 +20,8 @@ public class CollectionSpaceJaxRsApplication extends Application {
         singletons.add(new CollectionObjectResource());
         singletons.add(new IDResource());
         singletons.add(new IntakeResource());
-        singletons.add(new RelationResource());
+//        singletons.add(new RelationResource());
+        singletons.add(new NewRelationResource());        
 //        singletons.add(new DomainIdentifierResource());
 //        singletons.add(new PingResource());
     }

diff --git a/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java b/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java
index d6b3494b287f3054b28583ee1d2f28e46113d0f4..5b05a24b0f96058512295f1a7ae7e0564e687877 100644 (file)
--- a/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java
+++ b/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java
@@ -120,7 +120,7 @@ public class RelationServiceTest {
         
         verbose("deleteRelation: csid=" + relationID);
         verbose("deleteRelation: status = " + res.getStatus());
-        Assert.assertEquals(res.getStatus(), Response.Status.NO_CONTENT.getStatusCode());
+        Assert.assertEquals(res.getStatus(), Response.Status.OK.getStatusCode());
     }
     
     @Test(dependsOnMethods = {"createRelation"})