From e860fa7f6c4351d642817657c24f7728a9f3d30d Mon Sep 17 00:00:00 2001 From: Richard Millet Date: Sat, 8 Aug 2009 07:30:45 +0000 Subject: [PATCH] CSPACE-332: Changed test to look for http status code 200-ok after delete. Majority of this task is now finished. Need to qualify with more testing now. --- .../services/jaxrs/CollectionSpaceJaxRsApplication.java | 6 ++++-- .../services/client/test/RelationServiceTest.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) 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 350f06d7e..413442a02 100644 --- 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 d6b3494b2..5b05a24b0 100644 --- 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"}) -- 2.47.3