CSPACE-1208,CSPACE-1209: Client tests of services once again fully clean up temporary...

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 e6c1d507b5d039b398db75dcb0eacc4b90965885..6a6b87860553d8935826382d77ca669e15ebdbfc 100644 (file)
--- 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<Response> 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 97028e7b08425ec3c3394c81d0f2b94fdeef4430..5e4d0c695f3379815921a9a8f8ed6aa55d0485c1 100644 (file)
--- 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 69c62876005b3444bc63b9324b0f15e0869504cd..49e0592b0a3d43d77d7998e581f2e24c8e3d90b6 100644 (file)
--- 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<Response> res = acquisitionClient.delete(resourceId);
+           // Note: Any non-success responses are ignored and not reported.
+           ClientResponse<Response> 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<Response> res = personAuthClient.deleteItem(personAuthCSID, resourceId);
         }
+        // Note: Any non-success response is ignored and not reported.
         ClientResponse<Response> 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 2d98c9c656e3b9c7818fd9f150d80c8ffe73e258..6f817176b040fdc7e8ba9119dc057c355fe6d799 100644 (file)
--- 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 931ad51e6d8eacef546df01778cd079d2b0175bf..3fae6b3cd0bca2e46b79853c3df2d6f45fd632a7 100644 (file)
--- 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<Response> 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 b3c55a16765daba361cc0f87d4109142f36b3a26..a8d4a224a1cf8f8efe4f519cb4cae0b6d3d9385e 100644 (file)
--- 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<Response> 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 97d9f8be19172754916e3d992c7bcd9edaec4e1e..2cdcb5fea50f79662886afee547c02cdd0580da7 100644 (file)
--- 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<Response> 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 479484d7b1e54f0dabfced542b81117621dd6450..67ff9059a2000ba7ac6ed25993cdd1ea4063ae9a 100644 (file)
--- 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<Response> 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<Response> res = personAuthClient.deleteItem(personAuthCSID, resourceId);
         }
         ClientResponse<Response> 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 a8427608c7231c2de9bdf8ab77ee5f50b37a6a51..2d91d022706a5abf61ac755bb0175dd874e1e0e6 100644 (file)
--- 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 575a9e758b4eeba9e8c41a6eaa5558a134b44b79..2b150912189314d127b4c04edc49573faa48c404 100644 (file)
--- 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 2eebbc8d5c04bd79a816bb55233acc890613465b..82812a2be988c21bb5f4d3998d41da7ffeade52e 100644 (file)
--- 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 c46cd9cbb9a6ae9c6c4bd53af6f58f0a62ea79d1..7c1c1ca637b42a7551634c402266246150e4d526 100644 (file)
--- 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 2666d6781c191dbf7c220ab4d31001f504cf24cc..1d06f354da24f98db894355ecf60379c332e00cc 100644 (file)
--- 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<Response> 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 c5d1c82e96e6a600e8269a05eaae7ff99f4ee664..807629ca76145b78fa68d24a7ae75f6930347afa 100644 (file)
--- 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<Response> 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 d9e4f78d04e51cecaf4d1c2d7b673a5ddbe35620..f89481c57e6b3521596b4b7bb9419775f6356b28 100644 (file)
--- 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<Response> 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 fbfc7f6bd030e34275f8307ea6b6617253fc45c8..228a7fc5eaaf5a4c0621dc225dfe8cd182a20245 100644 (file)
--- 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 81872dd76674717dc4aced509b78a76388d750d4..59aaa854bbcf8ff0adf41528cad18b127bff6974 100644 (file)
--- 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 b9db66bfd1534c79e6e61d82f065448c03eaf6ff..90358fcd0d25a9c56c26e519608b1105134612ef 100644 (file)
--- 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 d99c453e0b9022ce8ab745869f9474c23cb5d7d9..551a2ff00ac494be4f30f17b21309111d5197431 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
@@ -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 0e8d60e3614a9814430ceba245bb07fe53370fbc..82cec283ab74b4e34d0bf593ca9671977aa76e07 100644 (file)
--- 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 ...");
         }