From: Aron Roberts Date: Wed, 9 Dec 2009 05:33:28 +0000 (+0000) Subject: CSPACE-489: Clean up extra entity objects created during tests for several entity... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=0ddb6a5c07da66628272481805aac54d19a6cedc;p=tmp%2Fjakarta-migration.git CSPACE-489: Clean up extra entity objects created during tests for several entity services: collectionobject, acquisition, intake, relation. --- diff --git a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java index c3a8f80c7..9f7f012e3 100644 --- a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java +++ b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java @@ -22,6 +22,7 @@ */ package org.collectionspace.services.client.test; +import java.util.ArrayList; import java.util.List; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; @@ -36,6 +37,7 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartInput; import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput; import org.jboss.resteasy.plugins.providers.multipart.OutputPart; import org.testng.Assert; +import org.testng.annotations.AfterClass; import org.testng.annotations.Test; import org.slf4j.Logger; @@ -56,6 +58,7 @@ public class AcquisitionServiceTest extends AbstractServiceTest { // Instance variables specific to this test. private AcquisitionClient client = new AcquisitionClient(); private String knownResourceId = null; + private List additionalResourceIds = new ArrayList(); // --------------------------------------------------------------- // CRUD tests : CREATE tests @@ -91,11 +94,17 @@ public class AcquisitionServiceTest extends AbstractServiceTest { invalidStatusCodeMessage(REQUEST_TYPE, statusCode)); Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE); - // Store the ID returned from this create operation for - // additional tests below. - knownResourceId = extractId(res); - if(logger.isDebugEnabled()){ - logger.debug("create: knownResourceId=" + knownResourceId); + // Store the ID returned from the first resource created + // for additional tests below. + if (knownResourceId == null){ + knownResourceId = extractId(res); + if (logger.isDebugEnabled()) { + logger.debug(testName + ": knownResourceId=" + knownResourceId); + } + // Store the IDs from any additional resources created by tests, + // so they can be deleted after all tests have been run. + } else { + additionalResourceIds.add(extractId(res)); } } @@ -560,6 +569,24 @@ public class AcquisitionServiceTest extends AbstractServiceTest { } + // --------------------------------------------------------------- + // Cleanup of resources created during testing + // --------------------------------------------------------------- + + /** + * Deletes any additional resources created by tests, + * after all tests have been run. + */ + @AfterClass + public void cleanUp() { + if (logger.isDebugEnabled()) { + logger.debug("Cleaning up temporary resources created for testing ..."); + } + for (String resourceId : additionalResourceIds) { + ClientResponse res = client.delete(resourceId); + } + } + // --------------------------------------------------------------- // Utility methods used by tests above // --------------------------------------------------------------- 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 d1d3df06c..2bb1a1c21 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 @@ -22,6 +22,7 @@ */ package org.collectionspace.services.client.test; +import java.util.ArrayList; import java.util.List; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; @@ -37,6 +38,7 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartInput; import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput; import org.jboss.resteasy.plugins.providers.multipart.OutputPart; import org.testng.Assert; +import org.testng.annotations.AfterClass; import org.testng.annotations.Test; import org.slf4j.Logger; @@ -56,6 +58,7 @@ public class CollectionObjectServiceTest extends AbstractServiceTest { // Instance variables specific to this test. private CollectionObjectClient client = new CollectionObjectClient(); private String knownResourceId = null; + private List additionalResourceIds = new ArrayList(); /* * This method is called only by the parent class, AbstractServiceTest @@ -98,11 +101,17 @@ public class CollectionObjectServiceTest extends AbstractServiceTest { invalidStatusCodeMessage(REQUEST_TYPE, statusCode)); Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE); - // Store the ID returned from this create operation + // Store the ID returned from the first resource created // for additional tests below. - knownResourceId = extractId(res); - if (logger.isDebugEnabled()) { - logger.debug(testName + ": knownResourceId=" + knownResourceId); + if (knownResourceId == null){ + knownResourceId = extractId(res); + if (logger.isDebugEnabled()) { + logger.debug(testName + ": knownResourceId=" + knownResourceId); + } + // Store the IDs from any additional resources created by tests, + // so they can be deleted after all tests have been run. + } else { + additionalResourceIds.add(extractId(res)); } } @@ -593,6 +602,24 @@ public class CollectionObjectServiceTest extends AbstractServiceTest { } + // --------------------------------------------------------------- + // Cleanup of resources created during testing + // --------------------------------------------------------------- + + /** + * Deletes any additional resources created by tests, + * after all tests have been run. + */ + @AfterClass + public void cleanUp() { + if (logger.isDebugEnabled()) { + logger.debug("Cleaning up temporary resources created for testing ..."); + } + for (String resourceId : additionalResourceIds) { + ClientResponse res = client.delete(resourceId); + } + } + // --------------------------------------------------------------- // Utility methods used by tests above // --------------------------------------------------------------- diff --git a/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeServiceTest.java b/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeServiceTest.java index f064f95dc..0a8b3990a 100644 --- a/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeServiceTest.java +++ b/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeServiceTest.java @@ -22,6 +22,7 @@ */ package org.collectionspace.services.client.test; +import java.util.ArrayList; import java.util.List; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; @@ -36,6 +37,7 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartInput; import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput; import org.jboss.resteasy.plugins.providers.multipart.OutputPart; import org.testng.Assert; +import org.testng.annotations.AfterClass; import org.testng.annotations.Test; import org.slf4j.Logger; @@ -57,6 +59,7 @@ public class IntakeServiceTest extends AbstractServiceTest { private IntakeClient client = new IntakeClient(); final String SERVICE_PATH_COMPONENT = "intakes"; private String knownResourceId = null; + private List additionalResourceIds = new ArrayList(); // --------------------------------------------------------------- // CRUD tests : CREATE tests @@ -92,11 +95,17 @@ public class IntakeServiceTest extends AbstractServiceTest { invalidStatusCodeMessage(REQUEST_TYPE, statusCode)); Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE); - // Store the ID returned from this create operation + // Store the ID returned from the first resource created // for additional tests below. - knownResourceId = extractId(res); - if(logger.isDebugEnabled()){ - logger.debug(testName + ": knownResourceId=" + knownResourceId); + if (knownResourceId == null){ + knownResourceId = extractId(res); + if (logger.isDebugEnabled()) { + logger.debug(testName + ": knownResourceId=" + knownResourceId); + } + // Store the IDs from any additional resources created by tests, + // so they can be deleted after all tests have been run. + } else { + additionalResourceIds.add(extractId(res)); } } @@ -566,6 +575,24 @@ public class IntakeServiceTest extends AbstractServiceTest { } + // --------------------------------------------------------------- + // Cleanup of resources created during testing + // --------------------------------------------------------------- + + /** + * Deletes any additional resources created by tests, + * after all tests have been run. + */ + @AfterClass + public void cleanUp() { + if (logger.isDebugEnabled()) { + logger.debug("Cleaning up temporary resources created for testing ..."); + } + for (String resourceId : additionalResourceIds) { + ClientResponse res = client.delete(resourceId); + } + } + // --------------------------------------------------------------- // Utility methods used by tests above // --------------------------------------------------------------- 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 2e6a60295..80941fe46 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 @@ -22,6 +22,7 @@ */ package org.collectionspace.services.client.test; +import java.util.ArrayList; import java.util.List; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; @@ -37,6 +38,7 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartInput; import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput; import org.jboss.resteasy.plugins.providers.multipart.OutputPart; import org.testng.Assert; +import org.testng.annotations.AfterClass; import org.testng.annotations.Test; import org.slf4j.Logger; @@ -57,6 +59,7 @@ public class RelationServiceTest extends AbstractServiceTest { private RelationClient client = new RelationClient(); final String SERVICE_PATH_COMPONENT = "relations"; private String knownResourceId = null; + private List additionalResourceIds = new ArrayList(); // --------------------------------------------------------------- // CRUD tests : CREATE tests @@ -89,11 +92,17 @@ public class RelationServiceTest extends AbstractServiceTest { invalidStatusCodeMessage(REQUEST_TYPE, statusCode)); Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE); - // Store the ID returned from this create operation for - // additional tests below. - knownResourceId = extractId(res); - if(logger.isDebugEnabled()){ - logger.debug("create: knownResourceId=" + knownResourceId); + // Store the ID returned from the first resource created + // for additional tests below. + if (knownResourceId == null){ + knownResourceId = extractId(res); + if (logger.isDebugEnabled()) { + logger.debug(testName + ": knownResourceId=" + knownResourceId); + } + // Store the IDs from any additional resources created by tests, + // so they can be deleted after all tests have been run. + } else { + additionalResourceIds.add(extractId(res)); } } @@ -574,6 +583,24 @@ public class RelationServiceTest extends AbstractServiceTest { } + // --------------------------------------------------------------- + // Cleanup of resources created during testing + // --------------------------------------------------------------- + + /** + * Deletes any additional resources created by tests, + * after all tests have been run. + */ + @AfterClass + public void cleanUp() { + if (logger.isDebugEnabled()) { + logger.debug("Cleaning up temporary resources created for testing ..."); + } + for (String resourceId : additionalResourceIds) { + ClientResponse res = client.delete(resourceId); + } + } + // --------------------------------------------------------------- // Utility methods used by tests above // ---------------------------------------------------------------