Skip to content

Commit

Permalink
Certification module is at least compilable now.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mederly
mederly committed Apr 1, 2017
1 parent 931d592 commit 974c724
Show file tree
Hide file tree
Showing 9 changed files with 172 additions and 150 deletions.
45 changes: 27 additions & 18 deletions infra/schema/src/main/java/com/evolveum/midpoint/schema/util/CertCampaignTypeUtil.java
View file
Expand Up @@ -16,9 +16,7 @@

package com.evolveum.midpoint.schema.util;

import com.evolveum.midpoint.prism.PrismConstants;
import com.evolveum.midpoint.prism.PrismContext;
import com.evolveum.midpoint.prism.PrismReferenceValue;
import com.evolveum.midpoint.prism.*;
import com.evolveum.midpoint.prism.path.ItemPath;
import com.evolveum.midpoint.prism.query.ObjectQuery;
import com.evolveum.midpoint.prism.query.builder.QueryBuilder;
Expand All @@ -29,10 +27,8 @@
import org.apache.commons.lang.StringUtils;

import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

import static com.evolveum.midpoint.prism.PrismConstants.T_PARENT;
import static com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationResponseType.ACCEPT;
Expand Down Expand Up @@ -85,13 +81,12 @@ public static AccessCertificationCaseType findCase(AccessCertificationCampaignTy
return null;
}

public static void findDecision(AccessCertificationCaseType _case, int stageNumber, String reviewerOid) {
// for (AccessCertificationDecisionType d : _case.getDecision()) {
// if (d.getStageNumber() == stageNumber && d.getReviewerRef().getOid().equals(reviewerOid)) {
// return d;
// }
// }
// return null;
// to be used in tests (beware: there could be more work items)
// TODO move to a test class
public static AccessCertificationWorkItemType findWorkItem(AccessCertificationCaseType _case, int stageNumber, String reviewerOid) {
return _case.getWorkItem().stream()
.filter(wi -> wi.getStageNumber() == stageNumber && ObjectTypeUtil.containsOid(wi.getReviewerRef(), reviewerOid))
.findFirst().orElse(null);
}

public static AccessCertificationWorkItemType findWorkItem(AccessCertificationCaseType _case, long workItemId) {
Expand Down Expand Up @@ -335,8 +330,22 @@ public static List<AccessCertificationResponseType> getOutcomesToStopOn(List<Acc
return rv;
}

// TODO temporary implementation: replace by work items based approach where possible
// public static List<ObjectReferenceType> getReviewers(AccessCertificationCaseType _case) {
// throw new UnsupportedOperationException("TODO");
// }
// useful e.g. for tests
public static Set<ObjectReferenceType> getReviewers(AccessCertificationCaseType aCase) {
return aCase.getWorkItem().stream()
.flatMap(wi -> wi.getReviewerRef().stream())
.collect(Collectors.toSet());
}

public static AccessCertificationCaseType getCase(AccessCertificationWorkItemType workItem) {
PrismContainerable<AccessCertificationWorkItemType> parent = workItem.asPrismContainerValue().getParent();
if (!(parent instanceof PrismContainer)) {
return null;
}
PrismValue parentParent = ((PrismContainer<AccessCertificationWorkItemType>) parent).getParent();
if (!(parentParent instanceof PrismContainerValue)) {
return null;
}
return ((PrismContainerValue<AccessCertificationCaseType>) parentParent).asContainerable();
}
}
116 changes: 71 additions & 45 deletions ...mpl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
View file
Expand Up @@ -56,6 +56,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;

import static com.evolveum.midpoint.schema.RetrieveOption.INCLUDE;
import static com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationCampaignStateType.CREATED;
Expand Down Expand Up @@ -259,6 +260,20 @@ protected AccessCertificationCaseType checkCase(Collection<AccessCertificationCa
return checkSpecificCase(ccase, focus);
}

protected AccessCertificationCaseType checkWorkItem(Collection<AccessCertificationWorkItemType> workItems, String subjectOid, String targetOid, FocusType focus, String campaignOid) {
AccessCertificationWorkItemType workItem = findWorkItem(workItems, subjectOid, targetOid);
assertNotNull("Certification work item for " + subjectOid + ":" + targetOid + " was not found", workItem);
AccessCertificationCaseType ccase = CertCampaignTypeUtil.getCase(workItem);
assertNotNull("No case for " + workItem, ccase);
assertNotNull("reviewRequestedTimestamp", ccase.getCurrentReviewRequestedTimestamp());
assertNotNull("deadline", ccase.getCurrentReviewDeadline());
assertNull("remediedTimestamp", ccase.getRemediedTimestamp());
if (campaignOid != null) {
assertEquals("incorrect campaign OID in case", campaignOid, ccase.getCampaignRef().getOid());
}
return checkSpecificCase(ccase, focus);
}

protected AccessCertificationCaseType checkCase(Collection<AccessCertificationCaseType> caseList, String objectOid,
String targetOid, FocusType focus, String campaignOid,
String tenantOid, String orgOid, ActivationStatusType administrativeStatus) {
Expand Down Expand Up @@ -302,6 +317,17 @@ protected AccessCertificationCaseType findCase(Collection<AccessCertificationCas
return null;
}

protected AccessCertificationWorkItemType findWorkItem(Collection<AccessCertificationWorkItemType> workItems, String subjectOid, String targetOid) {
for (AccessCertificationWorkItemType workItem : workItems) {
AccessCertificationCaseType aCase = CertCampaignTypeUtil.getCase(workItem);
if (aCase != null && aCase.getTargetRef() != null && aCase.getTargetRef().getOid().equals(targetOid) &&
aCase.getObjectRef() != null && aCase.getObjectRef().getOid().equals(subjectOid)) {
return workItem;
}
}
return null;
}

protected void assertApproximateTime(String itemName, Date expected, XMLGregorianCalendar actual) {
assertNotNull("missing " + itemName, actual);
Date actualAsDate = XmlTypeConverter.toDate(actual);
Expand Down Expand Up @@ -361,58 +387,58 @@ protected void assertDefinitionAndOwner(AccessCertificationCampaignType campaign
}

protected void assertDefinitionAndOwner(AccessCertificationCampaignType campaign,
AccessCertificationDefinitionType certificationDefinition,
String expectedOwnerOid) {
AccessCertificationDefinitionType certificationDefinition, String expectedOwnerOid) {
assertRefEquals("Unexpected ownerRef", ObjectTypeUtil.createObjectRef(expectedOwnerOid, ObjectTypes.USER), campaign.getOwnerRef());
assertRefEquals("Unexpected definitionRef",
ObjectTypeUtil.createObjectRef(certificationDefinition),
campaign.getDefinitionRef());
}

protected void assertCaseReviewers(AccessCertificationCaseType _case, AccessCertificationResponseType currentStageOutcome,
int currentStage, List<String> reviewerOidList) {
int currentStage, List<String> reviewerOidList) {
assertEquals("wrong current stage outcome for "+_case, currentStageOutcome, _case.getCurrentStageOutcome());
assertEquals("wrong current stage number for "+_case, currentStage, _case.getCurrentStageNumber());
Set<String> realReviewerOids = new HashSet<>();
for (ObjectReferenceType ref : _case.getCurrentReviewerRef()) {
realReviewerOids.add(ref.getOid());
}
Set<String> realReviewerOids = CertCampaignTypeUtil.getReviewers(_case).stream().map(ref -> ref.getOid()).collect(Collectors.toSet());
assertEquals("wrong reviewer oids for "+_case, new HashSet<>(reviewerOidList), realReviewerOids);
}

protected void recordDecision(String campaignOid, AccessCertificationCaseType _case, AccessCertificationResponseType response, String comment,
int stageNumber, String reviewerOid, Task task, OperationResult result)
int stageNumber, String reviewerOid, Task task, OperationResult result)
throws CommunicationException, ObjectNotFoundException, ObjectAlreadyExistsException, SchemaException, SecurityViolationException, ConfigurationException {
assertEquals("Wrong stage number", stageNumber, _case.getCurrentStageNumber()); // TODO consider removing stageNumber parameter

Authentication originalAuthentication = null;
AccessCertificationDecisionType decision = new AccessCertificationDecisionType(prismContext);
decision.setResponse(response);
decision.setComment(comment);
decision.setStageNumber(stageNumber);
String realReviewerOid;
if (reviewerOid != null) {
originalAuthentication = SecurityContextHolder.getContext().getAuthentication();
login(getUser(reviewerOid));
// ObjectReferenceType reviewerRef = ObjectTypeUtil.createObjectRef(reviewerOid, ObjectTypes.USER);
// decision.setReviewerRef(reviewerRef);
realReviewerOid = reviewerOid;
} else {
realReviewerOid = securityEnforcer.getPrincipal().getOid();
}
List<AccessCertificationWorkItemType> workItems = _case.getWorkItem().stream()
.filter(wi -> ObjectTypeUtil.containsOid(wi.getReviewerRef(), realReviewerOid)).collect(Collectors.toList());
assertEquals("Wrong # of work items for " + realReviewerOid + " in " + _case, 1, workItems.size());
long id = _case.asPrismContainerValue().getId();
certificationManager.recordDecision(campaignOid, id, decision, task, result);
certificationManager.recordDecision(campaignOid, id, workItems.get(0).getId(), response, comment, task, result);
if (reviewerOid != null) {
SecurityContextHolder.getContext().setAuthentication(originalAuthentication);
}
}

// TODO remove redundant check on outcomes (see assertCaseOutcome)
protected void assertSingleDecision(AccessCertificationCaseType _case, AccessCertificationResponseType response, String comment,
int stageNumber, String reviewerOid, AccessCertificationResponseType currentStageOutcome, boolean checkHistory) {
List<AccessCertificationDecisionType> currentDecisions = getCurrentDecisions(_case, stageNumber, false);
assertEquals("wrong # of decisions for stage " + stageNumber + " for case #" + _case.getId(), 1, currentDecisions.size());
AccessCertificationDecisionType storedDecision = currentDecisions.get(0);
assertEquals("wrong response", response, storedDecision.getResponse());
assertEquals("wrong comment", comment, storedDecision.getComment());
assertRefEquals("wrong reviewerRef", ObjectTypeUtil.createObjectRef(reviewerOid, ObjectTypes.USER), storedDecision.getReviewerRef());
assertEquals("wrong stage number", stageNumber, storedDecision.getStageNumber());
int stageNumber, String reviewerOid, AccessCertificationResponseType currentStageOutcome, boolean checkHistory) {
List<AccessCertificationWorkItemType> currentWorkItems = getCurrentWorkItems(_case, stageNumber, false);
assertEquals("wrong # of decisions for stage " + stageNumber + " for case #" + _case.getId(), 1, currentWorkItems.size());
AccessCertificationWorkItemType workItem = currentWorkItems.get(0);
assertEquals("wrong response", response, workItem.getResponse());
assertEquals("wrong comment", comment, workItem.getComment());
assertEquals("Wrong # of reviewers", 1, workItem.getReviewerRef().size());
assertRefEquals("wrong reviewerRef", ObjectTypeUtil.createObjectRef(reviewerOid, ObjectTypes.USER), workItem.getReviewerRef().get(0));
assertEquals("wrong stage number", (Integer) stageNumber, workItem.getStageNumber());
if (response != null) {
assertApproximateTime("timestamp", new Date(), storedDecision.getTimestamp());
assertApproximateTime("timestamp", new Date(), workItem.getTimestamp());
}
assertEquals("wrong current stage outcome", currentStageOutcome, _case.getCurrentStageOutcome());
if (checkHistory) {
Expand All @@ -422,12 +448,12 @@ protected void assertSingleDecision(AccessCertificationCaseType _case, AccessCer

protected void assertReviewerDecision(AccessCertificationCaseType _case, AccessCertificationResponseType response, String comment,
int stageNumber, String reviewerOid, AccessCertificationResponseType currentStageOutcome, boolean checkHistory) {
AccessCertificationDecisionType storedDecision = getDecisionForReviewer(_case, stageNumber, reviewerOid);
assertNotNull("No decision for reviewer " + reviewerOid + " in stage " + stageNumber, storedDecision);
assertEquals("wrong response", response, storedDecision.getResponse());
assertEquals("wrong comment", comment, storedDecision.getComment());
AccessCertificationWorkItemType workItem = getWorkItemsForReviewer(_case, stageNumber, reviewerOid);
assertNotNull("No work item for reviewer " + reviewerOid + " in stage " + stageNumber, workItem);
assertEquals("wrong response", response, workItem.getResponse());
assertEquals("wrong comment", comment, workItem.getComment());
if (response != null) {
assertApproximateTime("timestamp", new Date(), storedDecision.getTimestamp());
assertApproximateTime("timestamp", new Date(), workItem.getTimestamp());
}
assertEquals("wrong current stage outcome", currentStageOutcome, _case.getCurrentStageOutcome());
if (checkHistory) {
Expand Down Expand Up @@ -457,31 +483,31 @@ protected void assertCaseHistoricOutcomes(AccessCertificationCaseType aCase, Acc
}


public List<AccessCertificationDecisionType> getCurrentDecisions(AccessCertificationCaseType _case, int stageNumber, boolean decidedOnly) {
List<AccessCertificationDecisionType> currentDecisions = new ArrayList<>();
for (AccessCertificationDecisionType decision : _case.getDecision()) {
if (decidedOnly && (decision.getResponse() == null || decision.getResponse() == NO_RESPONSE)) {
public List<AccessCertificationWorkItemType> getCurrentWorkItems(AccessCertificationCaseType _case, int stageNumber, boolean decidedOnly) {
List<AccessCertificationWorkItemType> rv = new ArrayList<>();
for (AccessCertificationWorkItemType workItem : _case.getWorkItem()) {
if (decidedOnly && (workItem.getResponse() == null || workItem.getResponse() == NO_RESPONSE)) {
continue;
}
if (decision.getStageNumber() == stageNumber) {
currentDecisions.add(decision.clone());
if (workItem.getStageNumber() == stageNumber && workItem.getClosedTimestamp() == null) {
rv.add(workItem.clone());
}
}
return currentDecisions;
return rv;
}

public AccessCertificationDecisionType getDecisionForReviewer(AccessCertificationCaseType _case, int stageNumber, String reviewerOid) {
for (AccessCertificationDecisionType decision : _case.getDecision()) {
if (decision.getStageNumber() == stageNumber && decision.getReviewerRef().getOid().equals(reviewerOid)) {
return decision;
public AccessCertificationWorkItemType getWorkItemsForReviewer(AccessCertificationCaseType _case, int stageNumber, String reviewerOid) {
for (AccessCertificationWorkItemType workItem : _case.getWorkItem()) {
if (workItem.getStageNumber() == stageNumber && ObjectTypeUtil.containsOid(workItem.getReviewerRef(), reviewerOid)) {
return workItem;
}
}
return null;
}

protected void assertNoDecision(AccessCertificationCaseType _case, int stage, AccessCertificationResponseType aggregatedResponse, boolean checkHistory) {
List<AccessCertificationDecisionType> currentDecisions = getCurrentDecisions(_case, stage, true);
assertEquals("wrong # of decisions", 0, currentDecisions.size());
List<AccessCertificationWorkItemType> currentWorkItems = getCurrentWorkItems(_case, stage, true);
assertEquals("wrong # of decisions", 0, currentWorkItems.size());
assertEquals("wrong current response", aggregatedResponse, _case.getCurrentStageOutcome());
if (checkHistory) {
assertHistoricOutcome(_case, stage, aggregatedResponse);
Expand All @@ -493,13 +519,13 @@ protected void assertCurrentState(AccessCertificationCaseType _case, AccessCerti
assertEquals("wrong current response stage number", currentResponseStage, _case.getCurrentStageNumber());
}

protected void assertDecisions(AccessCertificationCaseType _case, int count) {
assertEquals("Wrong # of decisions", count, _case.getDecision().size());
protected void assertWorkItems(AccessCertificationCaseType _case, int count) {
assertEquals("Wrong # of work items", count, _case.getWorkItem().size());
}

protected void assertDecision2(AccessCertificationCaseType _case, AccessCertificationResponseType response, String comment,
int stageNumber, String reviewerOid, AccessCertificationResponseType aggregatedResponse) {
AccessCertificationDecisionType decision = CertCampaignTypeUtil.findDecision(_case, stageNumber, reviewerOid);
AccessCertificationWorkItemType decision = CertCampaignTypeUtil.findWorkItem(_case, stageNumber, reviewerOid);
assertNotNull("decision does not exist", decision);
assertEquals("wrong response", response, decision.getResponse());
assertEquals("wrong comment", comment, decision.getComment());
Expand Down
21 changes: 6 additions & 15 deletions ...n-impl/src/test/java/com/evolveum/midpoint/certification/test/BasicCertificationTest.java
View file
Expand Up @@ -489,12 +489,9 @@ public void test100RecordDecision() throws Exception {

// WHEN
TestUtil.displayWhen(TEST_NAME);
AccessCertificationDecisionType decision = new AccessCertificationDecisionType(prismContext);
decision.setResponse(ACCEPT);
decision.setComment("no comment");
decision.setStageNumber(0); // will be replaced by current stage number
AccessCertificationWorkItemType workItem = CertCampaignTypeUtil.findWorkItem(superuserCase, 1, USER_ADMINISTRATOR_OID);
long id = superuserCase.asPrismContainerValue().getId();
certificationService.recordDecision(campaignOid, id, decision, task, result);
certificationService.recordDecision(campaignOid, id, workItem.getId(), ACCEPT, "no comment", task, result);

// THEN
TestUtil.displayThen(TEST_NAME);
Expand Down Expand Up @@ -528,13 +525,10 @@ public void test105RecordAcceptJackCeo() throws Exception {

// WHEN
TestUtil.displayWhen(TEST_NAME);
AccessCertificationDecisionType decision = new AccessCertificationDecisionType(prismContext);
decision.setResponse(ACCEPT);
decision.setComment("ok");
decision.setStageNumber(1);
AccessCertificationWorkItemType workItem = CertCampaignTypeUtil.findWorkItem(ceoCase, 1, USER_ADMINISTRATOR_OID);
// reviewerRef will be taken from the current user
long id = ceoCase.asPrismContainerValue().getId();
certificationService.recordDecision(campaignOid, id, decision, task, result);
certificationService.recordDecision(campaignOid, id, workItem.getId(), ACCEPT, "ok", task, result);

// THEN
TestUtil.displayThen(TEST_NAME);
Expand Down Expand Up @@ -568,13 +562,10 @@ public void test110RecordRevokeJackCeo() throws Exception {

// WHEN
TestUtil.displayWhen(TEST_NAME);
AccessCertificationDecisionType decision = new AccessCertificationDecisionType(prismContext);
decision.setResponse(REVOKE);
decision.setComment("no way");
decision.setStageNumber(1);
// reviewerRef will be taken from the current user
long id = ceoCase.asPrismContainerValue().getId();
certificationService.recordDecision(campaignOid, id, decision, task, result);
AccessCertificationWorkItemType workItem = CertCampaignTypeUtil.findWorkItem(ceoCase, 1, USER_ADMINISTRATOR_OID);
certificationService.recordDecision(campaignOid, id, workItem.getId(), REVOKE, "no way", task, result);

// THEN
TestUtil.displayThen(TEST_NAME);
Expand Down

0 comments on commit 974c724

Please sign in to comment.