Skip to content

Commit

Permalink
Reviewed BasicCertificationTest + a couple of fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mederly
mederly committed Feb 6, 2016
1 parent f113aa9 commit 06e4320
Show file tree
Hide file tree
Showing 6 changed files with 119 additions and 97 deletions.
9 changes: 9 additions & 0 deletions infra/schema/src/main/java/com/evolveum/midpoint/schema/util/CertCampaignTypeUtil.java
View file
Expand Up @@ -264,4 +264,13 @@ public static ObjectQuery createCasesForCampaignQuery(String campaignOid, PrismC
.ownerId(campaignOid)
.build();
}

public static AccessCertificationCaseStageOutcomeType getStageOutcome(AccessCertificationCaseType aCase, int stageNumber) {
for (AccessCertificationCaseStageOutcomeType outcome : aCase.getCompletedStageOutcome()) {
if (outcome.getStageNumber() == stageNumber) {
return outcome;
}
}
throw new IllegalStateException("No outcome registered for stage " + stageNumber + " in case " + aCase);
}
}
9 changes: 8 additions & 1 deletion .../main/java/com/evolveum/midpoint/certification/impl/AccCertResponseComputationHelper.java
View file
Expand Up @@ -206,15 +206,22 @@ private ResponsesSummary summarize(List<AccessCertificationResponseType> respons
return summary;
}

public AccessCertificationResponseType computeOverallOutcome(AccessCertificationCaseType aCase, AccessCertificationCampaignType campaign) {
return computeOverallOutcome(aCase, campaign, null);
}

// aCase contains outcomes from stages 1..N-1. Outcome from stage N is in currentStageOutcome
// (alternatively: aCase has stages 1..N and currentStageOutcome is null)
public AccessCertificationResponseType computeOverallOutcome(AccessCertificationCaseType aCase, AccessCertificationCampaignType campaign,
AccessCertificationCaseStageOutcomeType currentStageOutcome) {
final OutcomeStrategy strategy = getOverallOutcomeStrategy(campaign);
final List<AccessCertificationResponseType> stageOutcomes = new ArrayList<>();
for (AccessCertificationCaseStageOutcomeType stageOutcome : aCase.getCompletedStageOutcome()) {
stageOutcomes.add(stageOutcome.getOutcome());
}
stageOutcomes.add(currentStageOutcome.getOutcome());
if (currentStageOutcome != null) {
stageOutcomes.add(currentStageOutcome.getOutcome());
}
return strategy.computeOutcome(summarize(stageOutcomes));
}
}
14 changes: 7 additions & 7 deletions ...tion-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertUpdateHelper.java
View file
Expand Up @@ -278,15 +278,15 @@ protected AccessCertificationStageType createStage(AccessCertificationCampaignTy
stage.setStart(XmlTypeConverter.createXMLGregorianCalendar(new Date()));

AccessCertificationStageDefinitionType stageDef = CertCampaignTypeUtil.findStageDefinition(campaign, stage.getNumber());
XMLGregorianCalendar end = (XMLGregorianCalendar) stage.getStart().clone();
XMLGregorianCalendar deadline = (XMLGregorianCalendar) stage.getStart().clone();
if (stageDef.getDuration() != null) {
end.add(stageDef.getDuration());
deadline.add(stageDef.getDuration());
}
end.setHour(23);
end.setMinute(59);
end.setSecond(59);
end.setMillisecond(999);
stage.setEnd(end);
deadline.setHour(23);
deadline.setMinute(59);
deadline.setSecond(59);
deadline.setMillisecond(999);
stage.setDeadline(deadline);

stage.setName(stageDef.getName());
stage.setDescription(stageDef.getDescription());
Expand Down
64 changes: 63 additions & 1 deletion ...mpl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
View file
Expand Up @@ -19,6 +19,7 @@
import com.evolveum.midpoint.certification.api.CertificationManager;
import com.evolveum.midpoint.certification.impl.AccCertGeneralHelper;
import com.evolveum.midpoint.certification.impl.AccCertQueryHelper;
import com.evolveum.midpoint.certification.impl.AccCertResponseComputationHelper;
import com.evolveum.midpoint.model.api.AccessCertificationService;
import com.evolveum.midpoint.model.test.AbstractModelIntegrationTest;
import com.evolveum.midpoint.prism.PrismObject;
Expand Down Expand Up @@ -50,6 +51,7 @@
import com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationDecisionType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationDefinitionType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationResponseType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationStageType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationStatusType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
Expand All @@ -74,6 +76,9 @@
import java.util.Set;

import static com.evolveum.midpoint.schema.RetrieveOption.INCLUDE;
import static com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationCampaignStateType.CREATED;
import static com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationCampaignStateType.IN_REVIEW_STAGE;
import static com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationCampaignStateType.REVIEW_STAGE_DONE;
import static com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationCampaignType.F_CASE;
import static com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationResponseType.NO_RESPONSE;
import static org.testng.AssertJUnit.assertEquals;
Expand All @@ -87,6 +92,9 @@
*
*/
public class AbstractCertificationTest extends AbstractModelIntegrationTest {

@Autowired
private AccCertResponseComputationHelper computationHelper;

public static final File SYSTEM_CONFIGURATION_FILE = new File(COMMON_DIR, "system-configuration.xml");
public static final String SYSTEM_CONFIGURATION_OID = SystemObjectsType.SYSTEM_CONFIGURATION.value();
Expand Down Expand Up @@ -297,6 +305,30 @@ protected void assertApproximateTime(String itemName, Date expected, XMLGregoria
Math.abs(actualAsDate.getTime() - expected.getTime()) < 600000); // 10 minutes
}

protected void assertAfterCampaignStart(AccessCertificationCampaignType campaign, AccessCertificationDefinitionType definition, int cases) {
assertStateAndStage(campaign, IN_REVIEW_STAGE, 1);
assertDefinitionAndOwner(campaign, definition);
assertApproximateTime("start time", new Date(), campaign.getStart());
assertNull("Unexpected end time", campaign.getEnd());
assertEquals("wrong # of defined stages", definition.getStageDefinition().size(), campaign.getStageDefinition().size());
assertEquals("wrong # of stages", 1, campaign.getStage().size());
AccessCertificationStageType stage = campaign.getStage().get(0);
assertEquals("wrong stage #", 1, stage.getNumber());
assertApproximateTime("stage 1 start", new Date(), stage.getStart());
assertNotNull("stage 1 deadline", stage.getDeadline()); // too lazy to compute exact datetime
assertNull("unexpected stage 1 end", stage.getEnd());
assertEquals("Wrong number of certification cases", cases, campaign.getCase().size());
}

protected void assertAfterCampaignCreate(AccessCertificationCampaignType campaign, AccessCertificationDefinitionType definition) {
assertEquals("Unexpected certification cases", 0, campaign.getCase().size());
assertStateAndStage(campaign, CREATED, 0);
assertEquals("Unexpected # of stages", definition.getStageDefinition().size(), campaign.getStageDefinition().size());
assertDefinitionAndOwner(campaign, definition);
assertNull("Unexpected start time", campaign.getStart());
assertNull("Unexpected end time", campaign.getEnd());
}

protected void assertStateAndStage(AccessCertificationCampaignType campaign, AccessCertificationCampaignStateType state, int stage) {
assertEquals("Unexpected campaign state", state, campaign.getState());
assertEquals("Unexpected stage number", stage, campaign.getStageNumber());
Expand Down Expand Up @@ -349,7 +381,7 @@ protected void recordDecision(String campaignOid, AccessCertificationCaseType _c

protected void assertSingleDecision(AccessCertificationCaseType _case, AccessCertificationResponseType response, String comment, int stageNumber, String reviewerOid, AccessCertificationResponseType aggregatedResponse, boolean checkHistory) {
List<AccessCertificationDecisionType> currentDecisions = getCurrentDecisions(_case, stageNumber, false);
assertEquals("wrong # of decisions", 1, currentDecisions.size());
assertEquals("wrong # of decisions for stage " + stageNumber, 1, currentDecisions.size());
AccessCertificationDecisionType storedDecision = currentDecisions.get(0);
assertEquals("wrong response", response, storedDecision.getResponse());
assertEquals("wrong comment", comment, storedDecision.getComment());
Expand Down Expand Up @@ -441,5 +473,35 @@ protected AccessCertificationCampaignType getCampaignWithCases(String campaignOi
}


protected void assertAfterStageClose(AccessCertificationCampaignType campaign, AccessCertificationDefinitionType definition, int stageNumber) {
assertStateAndStage(campaign, REVIEW_STAGE_DONE, stageNumber);
assertDefinitionAndOwner(campaign, definition);
assertNull("Unexpected end time", campaign.getEnd());
assertEquals("wrong # of stages", stageNumber, campaign.getStage().size());
AccessCertificationStageType stage = CertCampaignTypeUtil.getCurrentStage(campaign);
assertEquals("wrong stage #", 1, stage.getNumber());
assertApproximateTime("stage 1 start", new Date(), stage.getStart());
assertApproximateTime("stage 1 end", new Date(), stage.getStart());

for (AccessCertificationCaseType aCase : campaign.getCase()) {
if (aCase.getCurrentStageNumber() != stageNumber) {
continue;
}
checkCaseOutcomes(aCase, campaign, stageNumber);
}
}

private void checkCaseOutcomes(AccessCertificationCaseType aCase, AccessCertificationCampaignType campaign, int stageNumber) {
List<AccessCertificationResponseType> stageOutcomes = new ArrayList<>(stageNumber);
for (int i = 1; i <= stageNumber; i++) {
stageOutcomes.add(checkCaseStageOutcome(aCase, stageNumber));
}
assertEquals("Wrong # of completed stage outcomes", stageNumber, aCase.getCompletedStageOutcome().size());
AccessCertificationResponseType expectedOverall = computationHelper.computeOverallOutcome(aCase, campaign);
assertEquals("Inconsistent overall outcome", expectedOverall, aCase.getOverallOutcome());
}

private AccessCertificationResponseType checkCaseStageOutcome(AccessCertificationCaseType aCase, int stageNumber) {
return CertCampaignTypeUtil.getStageOutcome(aCase, stageNumber).getOutcome();
}
}

0 comments on commit 06e4320

Please sign in to comment.