Skip to content

Commit

Permalink
Fixed existing wf tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mederly
mederly committed Nov 25, 2016
1 parent bbdc5ba commit 405e62b
Show file tree
Hide file tree
Showing 5 changed files with 100 additions and 181 deletions.
165 changes: 43 additions & 122 deletions ...pl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestAssignmentApproval.java
View file
Expand Up @@ -87,16 +87,16 @@ public void test020DeleteRole1Assignment() throws Exception {
OperationResult result = task.getResult();

LensContext<UserType> context = createUserAccountContext();
fillContextWithUser(context, USER_JACK_OID, result);
fillContextWithUser(context, userJackOid, result);
addFocusDeltaToContext(context,
(ObjectDelta<UserType>) DeltaBuilder.deltaFor(UserType.class, prismContext)
.item(UserType.F_ASSIGNMENT).delete(createAssignmentTo(getRoleOid(1), ObjectTypes.ROLE, prismContext))
.asObjectDelta(USER_JACK_OID));
.asObjectDelta(userJackOid));
clockwork.run(context, task, result);

assertEquals("Wrong context state", ModelState.FINAL, context.getState());
TestUtil.assertSuccess(result);
assertNotAssignedRole(getUser(USER_JACK_OID), getRoleOid(1), task, result);
assertNotAssignedRole(getUser(userJackOid), getRoleOid(1), task, result);
}

/**
Expand Down Expand Up @@ -125,7 +125,7 @@ public void test040AddRole1AssignmentImmediate() throws Exception {
TestUtil.displayTestTile(this, TEST_NAME);
login(userAdministrator);

unassignAllRoles(USER_JACK_OID);
unassignAllRoles(userJackOid);
executeAssignRole1ToJack(TEST_NAME, true, false, null);
}

Expand All @@ -141,7 +141,7 @@ public void test050AddRoles123AssignmentNNN() throws Exception {
TestUtil.displayTestTile(this, TEST_NAME);
login(userAdministrator);

unassignAllRoles(USER_JACK_OID);
unassignAllRoles(userJackOid);
executeAssignRoles123ToJack(TEST_NAME, false, false, false, false);
}

Expand All @@ -154,7 +154,7 @@ public void test052AddRoles123AssignmentNNNImmediate() throws Exception {
TestUtil.displayTestTile(this, TEST_NAME);
login(userAdministrator);

unassignAllRoles(USER_JACK_OID);
unassignAllRoles(userJackOid);
executeAssignRoles123ToJack(TEST_NAME, true, false, false, false);
}

Expand All @@ -170,7 +170,7 @@ public void test060AddRoles123AssignmentYNN() throws Exception {
TestUtil.displayTestTile(this, TEST_NAME);
login(userAdministrator);

unassignAllRoles(USER_JACK_OID);
unassignAllRoles(userJackOid);
executeAssignRoles123ToJack(TEST_NAME, false, true, false, false);
}

Expand All @@ -180,7 +180,7 @@ public void test062AddRoles123AssignmentYNNImmediate() throws Exception {
TestUtil.displayTestTile(this, TEST_NAME);
login(userAdministrator);

unassignAllRoles(USER_JACK_OID);
unassignAllRoles(userJackOid);
executeAssignRoles123ToJack(TEST_NAME, true, true, false, false);
}

Expand All @@ -196,7 +196,7 @@ public void test070AddRoles123AssignmentYYY() throws Exception {
TestUtil.displayTestTile(this, TEST_NAME);
login(userAdministrator);

unassignAllRoles(USER_JACK_OID);
unassignAllRoles(userJackOid);
executeAssignRoles123ToJack(TEST_NAME, false, true, true, true);
}

Expand All @@ -206,7 +206,7 @@ public void test072AddRoles123AssignmentYYYImmediate() throws Exception {
TestUtil.displayTestTile(this, TEST_NAME);
login(userAdministrator);

unassignAllRoles(USER_JACK_OID);
unassignAllRoles(userJackOid);
executeAssignRoles123ToJack(TEST_NAME, true, true, true, true);
}

Expand All @@ -222,7 +222,7 @@ public void test130AddRole1aAssignmentWithDeputy() throws Exception {
Task task = createTask(TEST_NAME);
importLead1Deputies(task, task.getResult());

unassignAllRoles(USER_JACK_OID);
unassignAllRoles(userJackOid);
executeAssignRole1ToJack(TEST_NAME, false, true, null);
}

Expand All @@ -235,18 +235,18 @@ public void test132AddRole1aAssignmentWithDeputyApprovedByDeputy1() throws Excep
TestUtil.displayTestTile(this, TEST_NAME);
login(userAdministrator);

unassignAllRoles(USER_JACK_OID);
executeAssignRole1ToJack(TEST_NAME, false, true, USER_LEAD1_DEPUTY_1_OID);
unassignAllRoles(userJackOid);
executeAssignRole1ToJack(TEST_NAME, false, true, userLead1Deputy1Oid);
}


private void executeAssignRole1ToJack(String TEST_NAME, boolean immediate, boolean deputy, String approverOid) throws Exception {
PrismObject<UserType> jack = getUser(USER_JACK_OID);
PrismObject<UserType> jack = getUser(userJackOid);
ObjectDelta<UserType> addRole1Delta = (ObjectDelta<UserType>) DeltaBuilder
.deltaFor(UserType.class, prismContext)
.item(UserType.F_ASSIGNMENT).add(createAssignmentTo(getRoleOid(1), ObjectTypes.ROLE, prismContext))
.asObjectDelta(USER_JACK_OID);
String realApproverOid = approverOid != null ? approverOid : USER_LEAD1_OID;
.asObjectDelta(userJackOid);
String realApproverOid = approverOid != null ? approverOid : userLead1Oid;
executeTest2(TEST_NAME, new TestDetails2<UserType>() {
@Override
protected PrismObject<UserType> getFocus(OperationResult result) throws Exception {
Expand Down Expand Up @@ -291,27 +291,27 @@ protected List<ExpectedTask> getExpectedTasks() {
@Override
protected List<ExpectedWorkItem> getExpectedWorkItems() {
ExpectedTask etask = getExpectedTasks().get(0);
return Collections.singletonList(new ExpectedWorkItem(USER_LEAD1_OID, getRoleOid(1), etask));
return Collections.singletonList(new ExpectedWorkItem(userLead1Oid, getRoleOid(1), etask));
}

@Override
protected void assertDeltaExecuted(int number, boolean yes, Task rootTask, OperationResult result) throws Exception {
if (number == 1) {
if (yes) {
assertAssignedRole(USER_JACK_OID, getRoleOid(1), rootTask, result);
assertAssignedRole(userJackOid, getRoleOid(1), rootTask, result);
checkWorkItemAuditRecords(createResultMap(getRoleOid(1), WorkflowResult.APPROVED));
checkUserApprovers(USER_JACK_OID, Collections.singletonList(realApproverOid), result);
checkUserApprovers(userJackOid, Collections.singletonList(realApproverOid), result);
} else {
assertNotAssignedRole(USER_JACK_OID, getRoleOid(1), rootTask, result);
assertNotAssignedRole(userJackOid, getRoleOid(1), rootTask, result);
}
}
}

@Override
protected Boolean decideOnApproval(String executionId) throws Exception {
assertActiveWorkItems(USER_LEAD1_OID, 1);
assertActiveWorkItems(USER_LEAD1_DEPUTY_1_OID, deputy ? 1 : 0);
assertActiveWorkItems(USER_LEAD1_DEPUTY_2_OID, deputy ? 1 : 0);
assertActiveWorkItems(userLead1Oid, 1);
assertActiveWorkItems(userLead1Deputy1Oid, deputy ? 1 : 0);
assertActiveWorkItems(userLead1Deputy2Oid, deputy ? 1 : 0);
checkTargetOid(executionId, getRoleOid(1));
login(getUser(realApproverOid));
return true;
Expand All @@ -338,115 +338,36 @@ protected void assertActiveWorkItems(String approverOid, int expectedCount) thro
assertEquals("Wrong active work items for " + approverOid, expectedCount, items.size());
}

// private void executeAssignRole1aToJack(String TEST_NAME, boolean immediate, boolean deputy, String approverOid) throws Exception {
// PrismObject<UserType> jack = getUser(USER_JACK_OID);
// ObjectDelta<UserType> addRole1aDelta = (ObjectDelta<UserType>) DeltaBuilder
// .deltaFor(UserType.class, prismContext)
// .item(UserType.F_ASSIGNMENT).add(createAssignmentTo(ROLE_ROLE1A_OID, ObjectTypes.ROLE, prismContext))
// .asObjectDelta(USER_JACK_OID);
// String realApproverOid = approverOid != null ? approverOid : USER_LEAD1_OID;
// executeTest2(TEST_NAME, new TestDetails2<UserType>() {
// @Override
// protected PrismObject<UserType> getFocus(OperationResult result) throws Exception {
// return jack.clone();
// }
//
// @Override
// protected ObjectDelta<UserType> getFocusDelta() throws SchemaException {
// return addRole1aDelta.clone();
// }
//
// @Override
// protected int getNumberOfDeltasToApprove() {
// return 1;
// }
//
// @Override
// protected List<Boolean> getApprovals() {
// return Collections.singletonList(true);
// }
//
// @Override
// protected List<ObjectDelta<UserType>> getExpectedDeltasToApprove() {
// return Collections.singletonList(addRole1aDelta.clone());
// }
//
// @Override
// protected ObjectDelta<UserType> getExpectedDelta0() {
// return ObjectDelta.createModifyDelta(jack.getOid(), Collections.emptyList(), UserType.class, prismContext);
// }
//
// @Override
// protected String getObjectOid() {
// return jack.getOid();
// }
//
// @Override
// protected List<ExpectedTask> getExpectedTasks() {
// return Collections.singletonList(new ExpectedTask(ROLE_ROLE1A_OID, "Assigning Role1a to jack"));
// }
//
// @Override
// protected List<ExpectedWorkItem> getExpectedWorkItems() {
// ExpectedTask etask = getExpectedTasks().get(0);
// return Collections.singletonList(new ExpectedWorkItem(USER_LEAD1_OID, ROLE_ROLE1A_OID, etask));
// }
//
// @Override
// protected void assertDeltaExecuted(int number, boolean yes, Task rootTask, OperationResult result) throws Exception {
// if (number == 1) {
// if (yes) {
// assertAssignedRole(USER_JACK_OID, ROLE_ROLE1A_OID, rootTask, result);
// checkWorkItemAuditRecords(createResultMap(ROLE_ROLE1A_OID, WorkflowResult.APPROVED));
// checkUserApprovers(USER_JACK_OID, Collections.singletonList(realApproverOid), result);
// } else {
// assertNotAssignedRole(USER_JACK_OID, ROLE_ROLE1A_OID, rootTask, result);
// }
// }
// }
//
// @Override
// protected Boolean decideOnApproval(String executionId) throws Exception {
// assertActiveWorkItems(USER_LEAD1_OID, 1);
// assertActiveWorkItems(USER_LEAD1_DEPUTY_1_OID, deputy ? 1 : 0);
// assertActiveWorkItems(USER_LEAD1_DEPUTY_2_OID, deputy ? 1 : 0);
// checkTargetOid(executionId, ROLE_ROLE1A_OID);
// login(getUser(realApproverOid));
// return true;
// }
// }, 1, immediate);
// }

private void executeAssignRoles123ToJack(String TEST_NAME, boolean immediate, boolean approve1, boolean approve2, boolean approve3) throws Exception {
PrismObject<UserType> jack = getUser(USER_JACK_OID);
PrismObject<UserType> jack = getUser(userJackOid);
@SuppressWarnings("unchecked")
ObjectDelta<UserType> addRole1Delta = (ObjectDelta<UserType>) DeltaBuilder
.deltaFor(UserType.class, prismContext)
.item(UserType.F_ASSIGNMENT).add(createAssignmentTo(getRoleOid(1), ObjectTypes.ROLE, prismContext))
.asObjectDelta(USER_JACK_OID);
.asObjectDelta(userJackOid);
@SuppressWarnings("unchecked")
ObjectDelta<UserType> addRole2Delta = (ObjectDelta<UserType>) DeltaBuilder
.deltaFor(UserType.class, prismContext)
.item(UserType.F_ASSIGNMENT).add(createAssignmentTo(getRoleOid(2), ObjectTypes.ROLE, prismContext))
.asObjectDelta(USER_JACK_OID);
.asObjectDelta(userJackOid);
@SuppressWarnings("unchecked")
ObjectDelta<UserType> addRole3Delta = (ObjectDelta<UserType>) DeltaBuilder
.deltaFor(UserType.class, prismContext)
.item(UserType.F_ASSIGNMENT).add(createAssignmentTo(getRoleOid(3), ObjectTypes.ROLE, prismContext))
.asObjectDelta(USER_JACK_OID);
.asObjectDelta(userJackOid);
@SuppressWarnings("unchecked")
ObjectDelta<UserType> addRole4Delta = (ObjectDelta<UserType>) DeltaBuilder
.deltaFor(UserType.class, prismContext)
.item(UserType.F_ASSIGNMENT).add(createAssignmentTo(getRoleOid(4), ObjectTypes.ROLE, prismContext))
.asObjectDelta(USER_JACK_OID);
.asObjectDelta(userJackOid);
@SuppressWarnings("unchecked")
ObjectDelta<UserType> changeDescriptionDelta = (ObjectDelta<UserType>) DeltaBuilder
.deltaFor(UserType.class, prismContext)
.item(UserType.F_DESCRIPTION).replace(TEST_NAME)
.asObjectDelta(USER_JACK_OID);
.asObjectDelta(userJackOid);
ObjectDelta<UserType> primaryDelta = ObjectDelta.summarize(addRole1Delta, addRole2Delta, addRole3Delta, addRole4Delta, changeDescriptionDelta);
ObjectDelta<UserType> delta0 = ObjectDelta.summarize(addRole4Delta, changeDescriptionDelta);
String originalDescription = getUser(USER_JACK_OID).asObjectable().getDescription();
String originalDescription = getUser(userJackOid).asObjectable().getDescription();
executeTest2(TEST_NAME, new TestDetails2<UserType>() {
@Override
protected PrismObject<UserType> getFocus(OperationResult result) throws Exception {
Expand Down Expand Up @@ -495,9 +416,9 @@ protected List<ExpectedTask> getExpectedTasks() {
protected List<ExpectedWorkItem> getExpectedWorkItems() {
List<ExpectedTask> etasks = getExpectedTasks();
return Arrays.asList(
new ExpectedWorkItem(USER_LEAD1_OID, getRoleOid(1), etasks.get(0)),
new ExpectedWorkItem(USER_LEAD2_OID, getRoleOid(2), etasks.get(1)),
new ExpectedWorkItem(USER_LEAD3_OID, getRoleOid(3), etasks.get(2))
new ExpectedWorkItem(userLead1Oid, getRoleOid(1), etasks.get(0)),
new ExpectedWorkItem(userLead2Oid, getRoleOid(2), etasks.get(1)),
new ExpectedWorkItem(userLead3Oid, getRoleOid(3), etasks.get(2))
);
}

Expand All @@ -506,24 +427,24 @@ protected void assertDeltaExecuted(int number, boolean yes, Task rootTask, Opera
switch (number) {
case 0:
if (yes) {
assertUserProperty(USER_JACK_OID, UserType.F_DESCRIPTION, TEST_NAME);
assertAssignedRole(USER_JACK_OID, getRoleOid(4), rootTask, result);
assertUserProperty(userJackOid, UserType.F_DESCRIPTION, TEST_NAME);
assertAssignedRole(userJackOid, getRoleOid(4), rootTask, result);
} else {
if (originalDescription != null) {
assertUserProperty(USER_JACK_OID, UserType.F_DESCRIPTION, originalDescription);
assertUserProperty(userJackOid, UserType.F_DESCRIPTION, originalDescription);
} else {
assertUserNoProperty(USER_JACK_OID, UserType.F_DESCRIPTION);
assertUserNoProperty(userJackOid, UserType.F_DESCRIPTION);
}
assertNotAssignedRole(USER_JACK_OID, getRoleOid(4), rootTask, result);
assertNotAssignedRole(userJackOid, getRoleOid(4), rootTask, result);
}
break;
case 1:
case 2:
case 3:
if (yes) {
assertAssignedRole(USER_JACK_OID, getRoleOid(number), rootTask, result);
assertAssignedRole(userJackOid, getRoleOid(number), rootTask, result);
} else {
assertNotAssignedRole(USER_JACK_OID, getRoleOid(number), rootTask, result);
assertNotAssignedRole(userJackOid, getRoleOid(number), rootTask, result);
}
break;

Expand All @@ -534,13 +455,13 @@ protected void assertDeltaExecuted(int number, boolean yes, Task rootTask, Opera
protected Boolean decideOnApproval(String executionId) throws Exception {
String targetOid = getTargetOid(executionId);
if (getRoleOid(1).equals(targetOid)) {
login(getUser(USER_LEAD1_OID));
login(getUser(userLead1Oid));
return approve1;
} else if (getRoleOid(2).equals(targetOid)) {
login(getUser(USER_LEAD2_OID));
login(getUser(userLead2Oid));
return approve2;
} else if (getRoleOid(3).equals(targetOid)) {
login(getUser(USER_LEAD3_OID));
login(getUser(userLead3Oid));
return approve3;
} else {
throw new IllegalStateException("Unexpected approval request for " + targetOid);
Expand Down
12 changes: 6 additions & 6 deletions ...rkflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractTestLifecycle.java
View file
Expand Up @@ -62,10 +62,10 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti

executeChanges((ObjectDelta<UserType>) DeltaBuilder.deltaFor(UserType.class, prismContext)
.item(UserType.F_ASSIGNMENT).add(ObjectTypeUtil.createAssignmentTo(pirateOwner, prismContext))
.asObjectDelta(USER_PIRATE_OWNER_OID),
.asObjectDelta(userPirateOwnerOid),
null, initTask, initResult);
display("Pirate role", getRole(PIRATE_OID));
display("Pirate owner", getUser(USER_PIRATE_OWNER_OID));
display("Pirate owner", getUser(userPirateOwnerOid));
}

@Test
Expand All @@ -81,8 +81,8 @@ public void test100ModifyRolePirateDescription() throws Exception {
//noinspection UnnecessaryLocalVariable
ObjectDelta<RoleType> delta1 = descriptionDelta;
ExpectedTask expectedTask = new ExpectedTask(null, "Modification of pirate");
ExpectedWorkItem expectedWorkItem = new ExpectedWorkItem(USER_PIRATE_OWNER_OID, null, expectedTask);
modifyObject(TEST_NAME, descriptionDelta, delta0, delta1, false, true, USER_PIRATE_OWNER_OID,
ExpectedWorkItem expectedWorkItem = new ExpectedWorkItem(userPirateOwnerOid, null, expectedTask);
modifyObject(TEST_NAME, descriptionDelta, delta0, delta1, false, true, userPirateOwnerOid,
Collections.singletonList(expectedTask), Collections.singletonList(expectedWorkItem),
() -> {},
() -> assertNull("Description is modified", getRoleSimple(PIRATE_OID).getDescription()),
Expand All @@ -96,8 +96,8 @@ public void test200DeleteRolePirate() throws Exception {
login(userAdministrator);

ExpectedTask expectedTask = new ExpectedTask(null, "Deletion of pirate");
ExpectedWorkItem expectedWorkItem = new ExpectedWorkItem(USER_PIRATE_OWNER_OID, null, expectedTask);
deleteObject(TEST_NAME, RoleType.class, PIRATE_OID, false, true, USER_PIRATE_OWNER_OID,
ExpectedWorkItem expectedWorkItem = new ExpectedWorkItem(userPirateOwnerOid, null, expectedTask);
deleteObject(TEST_NAME, RoleType.class, PIRATE_OID, false, true, userPirateOwnerOid,
Collections.singletonList(expectedTask), Collections.singletonList(expectedWorkItem));
}

Expand Down

0 comments on commit 405e62b

Please sign in to comment.