Fixed wf tests.

Evolveum · Jun 23, 2017 · ef86c2d · ef86c2d
1 parent 594f3e0
commit ef86c2d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...del-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java b/...del-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
@@ -2426,7 +2426,7 @@ public boolean check() throws CommonException {
 				OperationResult result = task.getResult();
 				if (verbose) display("Check result", result);
 				assert !isError(result, checkSubresult) : "Error in "+task+": "+TestUtil.getErrorMessage(result);
-				assert !isUknown(result, checkSubresult) : "Unknown result in "+task+": "+TestUtil.getErrorMessage(result);
+				assert !isUnknown(result, checkSubresult) : "Unknown result in "+task+": "+TestUtil.getErrorMessage(result);
 				return !isInProgress(result, checkSubresult);
 			}
 			@Override
@@ -2507,10 +2507,10 @@ public boolean check() throws CommonException {
 						AssertJUnit.fail("Error in "+freshTask+": "+TestUtil.getErrorMessage(result));
 					}
 				}
-				if (isUknown(result, checkSubresult)) {
+				if (isUnknown(result, checkSubresult)) {
 					return false;
 				}
-//				assert !isUknown(result, checkSubresult) : "Unknown result in "+freshTask+": "+IntegrationTestTools.getErrorMessage(result);
+//				assert !isUnknown(result, checkSubresult) : "Unknown result in "+freshTask+": "+IntegrationTestTools.getErrorMessage(result);
 				return !isInProgress(result, checkSubresult);
 			}
 			@Override
@@ -2543,7 +2543,7 @@ public boolean check() throws CommonException {
 				OperationResult result = freshTask.getResult();
 				if (verbose) display("Check result", result);
 				assert !isError(result, checkSubresult) : "Error in "+freshTask+": "+TestUtil.getErrorMessage(result);
-				if (isUknown(result, checkSubresult)) {
+				if (isUnknown(result, checkSubresult)) {
 					return false;
 				}
 				return freshTask.getLastRunStartTimestamp() != null;
@@ -2627,7 +2627,7 @@ public boolean check() throws CommonException {
 				if (isError(taskResult, checkSubresult)) {
                     return true;
                 }
-				if (isUknown(taskResult, checkSubresult)) {
+				if (isUnknown(taskResult, checkSubresult)) {
 					return false;
 				}
 				if (freshTask.getLastRunFinishTimestamp() == null) {
@@ -2682,7 +2682,7 @@ private boolean isError(OperationResult result, boolean checkSubresult) {
 		return subresult != null ? subresult.isError() : false;
 	}
 
-	private boolean isUknown(OperationResult result, boolean checkSubresult) {
+	private boolean isUnknown(OperationResult result, boolean checkSubresult) {
 		OperationResult subresult = getSubresult(result, checkSubresult);
 		return subresult != null ? subresult.isUnknown() : false;			// TODO or return true?
 	}

diff --git a/...flow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestMiscellaneous.java b/...flow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestMiscellaneous.java
@@ -111,7 +111,7 @@ public void test100RequesterComment() throws Exception {
 		}
 
 		Task parent = taskManager.createTaskInstance(wfTask.asPrismObject(), result).getParentTask(result);
-		waitForTaskFinish(parent.getOid(), true);
+		waitForTaskFinish(parent.getOid(), false);
 
 		assertAssignedRole(userJackOid, roleRole2Oid, task, result);
 	}
@@ -151,7 +151,7 @@ public void test110RequestPrunedRole() throws Exception {
 		workflowManager.completeWorkItem(workItem.getExternalId(), true, null, null, null, result);
 		TaskType wfTask = getTask(WfContextUtil.getTask(workItem).getOid()).asObjectable();
 		Task parent = taskManager.createTaskInstance(wfTask.asPrismObject(), result).getParentTask(result);
-		waitForTaskFinish(parent.getOid(), true);
+		waitForTaskFinish(parent.getOid(), false);
 
 		assertNotAssignedRole(userJackOid, roleRole2Oid, task, result);			// should be pruned without approval
 	}