From: Aron Roberts Date: Mon, 26 Apr 2010 18:56:16 +0000 (+0000) Subject: CSPACE-1208,CSPACE-1209: Client tests of services once again fully clean up temporary... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=77d44df8612f618f2e255d51c24d4beaa4340990;p=tmp%2Fjakarta-migration.git CSPACE-1208,CSPACE-1209: Client tests of services once again fully clean up temporary records created during testing. Following Patrick's lead in PersonAuthRefDocsTest, all cleanUp() methods in client tests now recognize a 'noTestCleanup' system property, which will disable clean up of temporary records for that test run (e.g. 'mvn test -DnoTestCleanup=true -DforkMode=never'). --- diff --git a/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountRoleServiceTest.java b/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountRoleServiceTest.java index e6c1d507b..6a6b87860 100644 --- a/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountRoleServiceTest.java +++ b/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountRoleServiceTest.java @@ -381,13 +381,19 @@ public class AccountRoleServiceTest extends AbstractServiceTestImpl { @AfterClass(alwaysRun = true) public void cleanUp() { setupDelete("delete"); + String noTest = System.getProperty("noTestCleanup"); + if(Boolean.TRUE.toString().equalsIgnoreCase(noTest)) { + if (logger.isDebugEnabled()) { + logger.debug("Skipping Cleanup phase ..."); + } + return; + } if (logger.isDebugEnabled()) { - logger.debug("clenaup: Cleaning up temporary resources created for testing ..."); + logger.debug("Cleaning up temporary resources created for testing ..."); } AccountRoleClient client = new AccountRoleClient(); for (String resourceId : allResourceIdsCreated) { - // Note: Any non-success responses are ignored and not reported. ClientResponse res = client.delete(resourceId, "123"); int statusCode = res.getStatus(); if (logger.isDebugEnabled()) { diff --git a/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountServiceTest.java b/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountServiceTest.java index 97028e7b0..5e4d0c695 100644 --- a/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountServiceTest.java +++ b/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountServiceTest.java @@ -972,6 +972,13 @@ public class AccountServiceTest extends AbstractServiceTestImpl { @AfterClass(alwaysRun = true) public void cleanUp() { setupDelete("delete"); + String noTest = System.getProperty("noTestCleanup"); + if(Boolean.TRUE.toString().equalsIgnoreCase(noTest)) { + if (logger.isDebugEnabled()) { + logger.debug("Skipping Cleanup phase ..."); + } + return; + } if (logger.isDebugEnabled()) { logger.debug("Cleaning up temporary resources created for testing ..."); } diff --git a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java index 69c628760..49e0592b0 100644 --- a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java +++ b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java @@ -253,24 +253,30 @@ public class AcquisitionAuthRefsTest extends BaseServiceTest { * at any point during testing, even if some of those resources * may be expected to be deleted by certain tests. */ - // @AfterClass(alwaysRun=true) + @AfterClass(alwaysRun=true) public void cleanUp() { - + String noTest = System.getProperty("noTestCleanup"); + if(Boolean.TRUE.toString().equalsIgnoreCase(noTest)) { + if (logger.isDebugEnabled()) { + logger.debug("Skipping Cleanup phase ..."); + } + return; + } if (logger.isDebugEnabled()) { logger.debug("Cleaning up temporary resources created for testing ..."); } - AcquisitionClient acquisitionClient = new AcquisitionClient(); - // Note: Any non-success responses are ignored and not reported. for (String resourceId : acquisitionIdsCreated) { - ClientResponse res = acquisitionClient.delete(resourceId); + // Note: Any non-success responses are ignored and not reported. + ClientResponse res = acquisitionClient.delete(resourceId); } - PersonAuthorityClient personAuthClient = new PersonAuthorityClient(); // Delete persons before PersonAuth for (String resourceId : personIdsCreated) { + // Note: Any non-success responses are ignored and not reported. ClientResponse res = personAuthClient.deleteItem(personAuthCSID, resourceId); } + // Note: Any non-success response is ignored and not reported. ClientResponse res = personAuthClient.delete(personAuthCSID); } 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 2d98c9c65..6f817176b 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 @@ -596,8 +596,15 @@ public class AcquisitionServiceTest extends AbstractServiceTestImpl { * at any point during testing, even if some of those resources * may be expected to be deleted by certain tests. */ - // @AfterClass(alwaysRun=true) + @AfterClass(alwaysRun=true) public void cleanUp() { + String noTest = System.getProperty("noTestCleanup"); + if(Boolean.TRUE.toString().equalsIgnoreCase(noTest)) { + if (logger.isDebugEnabled()) { + logger.debug("Skipping Cleanup phase ..."); + } + return; + } if (logger.isDebugEnabled()) { logger.debug("Cleaning up temporary resources created for testing ..."); } diff --git a/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/PermissionRoleServiceTest.java b/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/PermissionRoleServiceTest.java index 931ad51e6..3fae6b3cd 100644 --- a/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/PermissionRoleServiceTest.java +++ b/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/PermissionRoleServiceTest.java @@ -379,17 +379,23 @@ public class PermissionRoleServiceTest extends AbstractServiceTestImpl { @AfterClass(alwaysRun = true) public void cleanUp() { setupDelete("delete"); + String noTest = System.getProperty("noTestCleanup"); + if(Boolean.TRUE.toString().equalsIgnoreCase(noTest)) { + if (logger.isDebugEnabled()) { + logger.debug("Skipping Cleanup phase ..."); + } + return; + } if (logger.isDebugEnabled()) { - logger.debug("clenaup: Cleaning up temporary resources created for testing ..."); + logger.debug("Cleaning up temporary resources created for testing ..."); } PermissionRoleClient client = new PermissionRoleClient(); for (String resourceId : allResourceIdsCreated) { - // Note: Any non-success responses are ignored and not reported. ClientResponse res = client.delete(resourceId, "123"); int statusCode = res.getStatus(); if (logger.isDebugEnabled()) { - logger.debug("clenaup: delete relationships for permission id=" + logger.debug("cleanup: delete relationships for permission id=" + resourceId + " status=" + statusCode); } Assert.assertTrue(REQUEST_TYPE.isValidStatusCode(statusCode), diff --git a/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/PermissionServiceTest.java b/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/PermissionServiceTest.java index b3c55a167..a8d4a224a 100644 --- a/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/PermissionServiceTest.java +++ b/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/PermissionServiceTest.java @@ -555,12 +555,18 @@ public class PermissionServiceTest extends AbstractServiceTestImpl { @AfterClass(alwaysRun = true) public void cleanUp() { setupDelete("delete"); + String noTest = System.getProperty("noTestCleanup"); + if(Boolean.TRUE.toString().equalsIgnoreCase(noTest)) { + if (logger.isDebugEnabled()) { + logger.debug("Skipping Cleanup phase ..."); + } + return; + } if (logger.isDebugEnabled()) { logger.debug("Cleaning up temporary resources created for testing ..."); } PermissionClient client = new PermissionClient(); for (String resourceId : allResourceIdsCreated) { - // Note: Any non-success responses are ignored and not reported. ClientResponse res = client.delete(resourceId); int statusCode = res.getStatus(); Assert.assertTrue(REQUEST_TYPE.isValidStatusCode(statusCode), diff --git a/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/RoleServiceTest.java b/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/RoleServiceTest.java index 97d9f8be1..2cdcb5fea 100644 --- a/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/RoleServiceTest.java +++ b/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/RoleServiceTest.java @@ -538,12 +538,18 @@ public class RoleServiceTest extends AbstractServiceTestImpl { @AfterClass(alwaysRun = true) public void cleanUp() { setupDelete("delete"); + String noTest = System.getProperty("noTestCleanup"); + if(Boolean.TRUE.toString().equalsIgnoreCase(noTest)) { + if (logger.isDebugEnabled()) { + logger.debug("Skipping Cleanup phase ..."); + } + return; + } if (logger.isDebugEnabled()) { logger.debug("Cleaning up temporary resources created for testing ..."); } RoleClient client = new RoleClient(); for (String resourceId : allResourceIdsCreated) { - // Note: Any non-success responses are ignored and not reported. ClientResponse res = client.delete(resourceId); int statusCode = res.getStatus(); Assert.assertTrue(REQUEST_TYPE.isValidStatusCode(statusCode), diff --git a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java index 479484d7b..67ff9059a 100644 --- a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java +++ b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java @@ -256,19 +256,28 @@ public class CollectionObjectAuthRefsTest extends BaseServiceTest { * at any point during testing, even if some of those resources * may be expected to be deleted by certain tests. */ - // @AfterClass(alwaysRun=true) + @AfterClass(alwaysRun=true) public void cleanUp() { + String noTest = System.getProperty("noTestCleanup"); + if(Boolean.TRUE.toString().equalsIgnoreCase(noTest)) { + if (logger.isDebugEnabled()) { + logger.debug("Skipping Cleanup phase ..."); + } + return; + } if (logger.isDebugEnabled()) { logger.debug("Cleaning up temporary resources created for testing ..."); } CollectionObjectClient collectionObjectClient = new CollectionObjectClient(); - // Note: Any non-success responses are ignored and not reported. for (String resourceId : collectionObjectIdsCreated) { + // Note: Any non-success responses are ignored and not reported. ClientResponse res = collectionObjectClient.delete(resourceId); } + // Note: Any non-success response is ignored and not reported. PersonAuthorityClient personAuthClient = new PersonAuthorityClient(); // Delete persons before PersonAuth for (String resourceId : personIdsCreated) { + // Note: Any non-success responses are ignored and not reported. ClientResponse res = personAuthClient.deleteItem(personAuthCSID, resourceId); } ClientResponse res = personAuthClient.delete(personAuthCSID); 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 a8427608c..2d91d0227 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 @@ -861,6 +861,13 @@ public class CollectionObjectServiceTest extends AbstractServiceTestImpl { */ @AfterClass(alwaysRun = true) public void cleanUp() { + String noTest = System.getProperty("noTestCleanup"); + if(Boolean.TRUE.toString().equalsIgnoreCase(noTest)) { + if (logger.isDebugEnabled()) { + logger.debug("Skipping Cleanup phase ..."); + } + return; + } if (logger.isDebugEnabled()) { logger.debug("Cleaning up temporary resources created for testing ..."); } diff --git a/services/dimension/client/src/test/java/org/collectionspace/services/client/test/DimensionServiceTest.java b/services/dimension/client/src/test/java/org/collectionspace/services/client/test/DimensionServiceTest.java index 575a9e758..2b1509121 100644 --- a/services/dimension/client/src/test/java/org/collectionspace/services/client/test/DimensionServiceTest.java +++ b/services/dimension/client/src/test/java/org/collectionspace/services/client/test/DimensionServiceTest.java @@ -593,6 +593,13 @@ public class DimensionServiceTest extends AbstractServiceTestImpl { */ @AfterClass(alwaysRun=true) public void cleanUp() { + String noTest = System.getProperty("noTestCleanup"); + if(Boolean.TRUE.toString().equalsIgnoreCase(noTest)) { + if (logger.isDebugEnabled()) { + logger.debug("Skipping Cleanup phase ..."); + } + return; + } if (logger.isDebugEnabled()) { logger.debug("Cleaning up temporary resources created for testing ..."); } diff --git a/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java b/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java index 2eebbc8d5..82812a2be 100644 --- a/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java +++ b/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java @@ -272,6 +272,13 @@ public class IntakeAuthRefsTest extends BaseServiceTest { */ @AfterClass(alwaysRun=true) public void cleanUp() { + String noTest = System.getProperty("noTestCleanup"); + if(Boolean.TRUE.toString().equalsIgnoreCase(noTest)) { + if (logger.isDebugEnabled()) { + logger.debug("Skipping Cleanup phase ..."); + } + return; + } if (logger.isDebugEnabled()) { logger.debug("Cleaning up temporary resources created for testing ..."); } 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 c46cd9cbb..7c1c1ca63 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 @@ -594,6 +594,13 @@ public class IntakeServiceTest extends AbstractServiceTestImpl { */ @AfterClass(alwaysRun=true) public void cleanUp() { + String noTest = System.getProperty("noTestCleanup"); + if(Boolean.TRUE.toString().equalsIgnoreCase(noTest)) { + if (logger.isDebugEnabled()) { + logger.debug("Skipping Cleanup phase ..."); + } + return; + } if (logger.isDebugEnabled()) { logger.debug("Cleaning up temporary resources created for testing ..."); } diff --git a/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java b/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java index 2666d6781..1d06f354d 100644 --- a/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java +++ b/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java @@ -258,18 +258,18 @@ public class PersonAuthRefDocsTest extends BaseServiceTest { */ @AfterClass(alwaysRun=true) public void cleanUp() { - String noTest = System.getProperty("noTestCleanup"); - if("true".equalsIgnoreCase(noTest)) { + String noTest = System.getProperty("noTestCleanup"); + if(Boolean.TRUE.toString().equalsIgnoreCase(noTest)) { if (logger.isDebugEnabled()) { - logger.debug("Skipping Cleanup phase"); + logger.debug("Skipping Cleanup phase ..."); } return; } - IntakeClient intakeClient = new IntakeClient(); - PersonAuthorityClient personAuthClient = new PersonAuthorityClient(); if (logger.isDebugEnabled()) { logger.debug("Cleaning up temporary resources created for testing ..."); } + IntakeClient intakeClient = new IntakeClient(); + PersonAuthorityClient personAuthClient = new PersonAuthorityClient(); // Note: Any non-success responses are ignored and not reported. for (String resourceId : intakeIdsCreated) { ClientResponse res = intakeClient.delete(resourceId); diff --git a/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java b/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java index c5d1c82e9..807629ca7 100644 --- a/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java +++ b/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java @@ -273,22 +273,30 @@ public class LoaninAuthRefsTest extends BaseServiceTest { */ @AfterClass(alwaysRun=true) public void cleanUp() { + String noTest = System.getProperty("noTestCleanup"); + if(Boolean.TRUE.toString().equalsIgnoreCase(noTest)) { + if (logger.isDebugEnabled()) { + logger.debug("Skipping Cleanup phase ..."); + } + return; + } if (logger.isDebugEnabled()) { logger.debug("Cleaning up temporary resources created for testing ..."); } - // Note: Any non-success responses are ignored and not reported. - PersonAuthorityClient personAuthClient = new PersonAuthorityClient(); // Delete Person resource(s) (before PersonAuthority resources). ClientResponse res; for (String resourceId : personIdsCreated) { + // Note: Any non-success responses are ignored and not reported. res = personAuthClient.deleteItem(personAuthCSID, resourceId); } // Delete PersonAuthority resource(s). + // Note: Any non-success response is ignored and not reported. res = personAuthClient.delete(personAuthCSID); // Delete Loans In resource(s). LoaninClient loaninClient = new LoaninClient(); for (String resourceId : loaninIdsCreated) { + // Note: Any non-success responses are ignored and not reported. res = loaninClient.delete(resourceId); } } diff --git a/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutAuthRefsTest.java b/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutAuthRefsTest.java index d9e4f78d0..f89481c57 100644 --- a/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutAuthRefsTest.java +++ b/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutAuthRefsTest.java @@ -269,22 +269,30 @@ public class LoanoutAuthRefsTest extends BaseServiceTest { */ @AfterClass(alwaysRun=true) public void cleanUp() { + String noTest = System.getProperty("noTestCleanup"); + if(Boolean.TRUE.toString().equalsIgnoreCase(noTest)) { + if (logger.isDebugEnabled()) { + logger.debug("Skipping Cleanup phase ..."); + } + return; + } if (logger.isDebugEnabled()) { logger.debug("Cleaning up temporary resources created for testing ..."); } - // Note: Any non-success responses are ignored and not reported. - PersonAuthorityClient personAuthClient = new PersonAuthorityClient(); // Delete Person resource(s) (before PersonAuthority resources). ClientResponse res; for (String resourceId : personIdsCreated) { + // Note: Any non-success responses are ignored and not reported. res = personAuthClient.deleteItem(personAuthCSID, resourceId); } // Delete PersonAuthority resource(s). + // Note: Any non-success response is ignored and not reported. res = personAuthClient.delete(personAuthCSID); // Delete Loans In resource(s). LoanoutClient loanoutClient = new LoanoutClient(); for (String resourceId : loanoutIdsCreated) { + // Note: Any non-success responses are ignored and not reported. res = loanoutClient.delete(resourceId); } } diff --git a/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutServiceTest.java b/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutServiceTest.java index fbfc7f6bd..228a7fc5e 100644 --- a/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutServiceTest.java +++ b/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutServiceTest.java @@ -593,6 +593,13 @@ public class LoanoutServiceTest extends AbstractServiceTestImpl { */ @AfterClass(alwaysRun=true) public void cleanUp() { + String noTest = System.getProperty("noTestCleanup"); + if(Boolean.TRUE.toString().equalsIgnoreCase(noTest)) { + if (logger.isDebugEnabled()) { + logger.debug("Skipping Cleanup phase ..."); + } + return; + } if (logger.isDebugEnabled()) { logger.debug("Cleaning up temporary resources created for testing ..."); } diff --git a/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java b/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java index 81872dd76..59aaa854b 100644 --- a/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java +++ b/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java @@ -1537,6 +1537,13 @@ public class OrgAuthorityServiceTest extends AbstractServiceTestImpl { @AfterClass(alwaysRun=true) public void cleanUp() { + String noTest = System.getProperty("noTestCleanup"); + if(Boolean.TRUE.toString().equalsIgnoreCase(noTest)) { + if (logger.isDebugEnabled()) { + logger.debug("Skipping Cleanup phase ..."); + } + return; + } if (logger.isDebugEnabled()) { logger.debug("Cleaning up temporary resources created for testing ..."); } diff --git a/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthorityServiceTest.java b/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthorityServiceTest.java index b9db66bfd..90358fcd0 100644 --- a/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthorityServiceTest.java +++ b/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthorityServiceTest.java @@ -1566,6 +1566,13 @@ public class PersonAuthorityServiceTest extends AbstractServiceTestImpl { @AfterClass(alwaysRun=true) public void cleanUp() { + String noTest = System.getProperty("noTestCleanup"); + if(Boolean.TRUE.toString().equalsIgnoreCase(noTest)) { + if (logger.isDebugEnabled()) { + logger.debug("Skipping Cleanup phase ..."); + } + return; + } if (logger.isDebugEnabled()) { logger.debug("Cleaning up temporary resources created for testing ..."); } 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 d99c453e0..551a2ff00 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 @@ -604,6 +604,13 @@ public class RelationServiceTest extends AbstractServiceTestImpl { */ @AfterClass(alwaysRun=true) public void cleanUp() { + String noTest = System.getProperty("noTestCleanup"); + if(Boolean.TRUE.toString().equalsIgnoreCase(noTest)) { + if (logger.isDebugEnabled()) { + logger.debug("Skipping Cleanup phase ..."); + } + return; + } if (logger.isDebugEnabled()) { logger.debug("Cleaning up temporary resources created for testing ..."); } diff --git a/services/vocabulary/client/src/test/java/org/collectionspace/services/client/test/VocabularyServiceTest.java b/services/vocabulary/client/src/test/java/org/collectionspace/services/client/test/VocabularyServiceTest.java index 0e8d60e36..82cec283a 100644 --- a/services/vocabulary/client/src/test/java/org/collectionspace/services/client/test/VocabularyServiceTest.java +++ b/services/vocabulary/client/src/test/java/org/collectionspace/services/client/test/VocabularyServiceTest.java @@ -1016,7 +1016,13 @@ public class VocabularyServiceTest extends AbstractServiceTestImpl { */ @AfterClass(alwaysRun=true) public void cleanUp() { - + String noTest = System.getProperty("noTestCleanup"); + if(Boolean.TRUE.toString().equalsIgnoreCase(noTest)) { + if (logger.isDebugEnabled()) { + logger.debug("Skipping Cleanup phase ..."); + } + return; + } if (logger.isDebugEnabled()) { logger.debug("Cleaning up temporary resources created for testing ..."); }