From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 13 Feb 2014 05:08:01 +0000 (-0800)
Subject: CSPACE-6301: Added 'undelete' tests in a base test class.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=abced9ce000b48bd14f92bcf5f5ee34e6679c706;p=tmp%2Fjakarta-migration.git

CSPACE-6301: Added 'undelete' tests in a base test class.
---

diff --git a/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java b/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java
index d7c7b723d..9a1abdaaf 100644
--- a/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java
+++ b/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java
@@ -563,6 +563,47 @@ public abstract class AbstractServiceTestImpl<CLT, CPT, REQUEST_TYPE, RESPONSE_T
             }
             Assert.assertEquals(result, STATUS_NOT_FOUND);
 
+            //
+            // Undelete the soft-deleted record
+            //
+            this.setupUpdate();
+            this.updateLifeCycleState(testName, csid, WorkflowClient.WORKFLOWTRANSITION_UNDELETE, WorkflowClient.WORKFLOWSTATE_PROJECT);
+
+            //
+            // Read the list of existing non-deleted records, to verify that
+            // the undeleted record is once again returned in that list.
+            //
+            updatedTotal = readIncludeDeleted(testName, Boolean.FALSE);
+            Assert.assertEquals(updatedTotal, existingRecords + OBJECTS_TO_CREATE, "Expected item is missing from list results.");
+
+            //
+            // Next, test that a GET with WorkflowClient.WORKFLOWSTATE_DELETED query param set to 'false' returns a 200;
+            // that the formerly 'Not Found' record is once again being found.
+            //
+            trials = 0;
+            result = 0;
+            while (trials < 30) {
+	            CollectionSpacePoxClient client = this.assertPoxClient();
+	            ClientResponse<String> res = client.readIncludeDeleted(csid, Boolean.FALSE);
+	            result = res.getStatus();
+	            if (result == STATUS_OK) {
+	            	logger.info("Workflow transition to 'project' is complete");
+	            	break;
+	            } else {
+	            	/*
+	            	 * This should never happen, but if it does we need a full stack trace to help track it down.
+	            	 */
+	            	try {
+		            	throw new RuntimeException(ERROR_WORKFLOW_TRANSITION);
+	            	} catch (RuntimeException e) {
+		            	logger.info(ERROR_WORKFLOW_TRANSITION, e);
+	            	}
+	            }
+	            trials++;
+            }
+            Assert.assertEquals(result, STATUS_OK);
+
+
         } catch (UnsupportedOperationException e) {
             logger.warn(this.getClass().getName() + " did not implement createWorkflowTarget() method.  No workflow tests performed.");
             return;
diff --git a/services/client/src/main/java/org/collectionspace/services/client/workflow/WorkflowClient.java b/services/client/src/main/java/org/collectionspace/services/client/workflow/WorkflowClient.java
index 1d72d0fb5..60e0d4435 100644
--- a/services/client/src/main/java/org/collectionspace/services/client/workflow/WorkflowClient.java
+++ b/services/client/src/main/java/org/collectionspace/services/client/workflow/WorkflowClient.java
@@ -44,6 +44,7 @@ public class WorkflowClient extends AbstractCommonListPoxServiceClientImpl<Workf
 	public static final String WORKFLOWSTATE_DELETED = "deleted";
 	
 	public static final String WORKFLOWSTATE_ACTIVE = "active";
+	public static final String WORKFLOWSTATE_PROJECT = "project";
 	
 	public static final String WORKFLOWTRANSITION_LOCK = "lock";
 	public static final String WORKFLOWSTATE_LOCKED = "locked";