Skip to content

Commit

Permalink
Consistency update: fixing TestSemiManualDisable
Browse files Browse the repository at this point in the history
  • Loading branch information
@semancik
semancik committed Aug 15, 2018
1 parent 90d1a9b commit 71bbfd0
Show file tree
Hide file tree
Showing 7 changed files with 86 additions and 110 deletions.
2 changes: 1 addition & 1 deletion ...model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
View file
Expand Up @@ -1257,7 +1257,7 @@ public String debugDump(int indent, boolean showTriples) {
sb.append(", NOT FRESH");
}
if (resourceShadowDiscriminator != null && resourceShadowDiscriminator.isTombstone()) {
sb.append(", THOMBSTONE");
sb.append(", TOMBSTONE");
}
if (syncAbsoluteTrigger) {
sb.append(", SYNC TRIGGER");
Expand Down
115 changes: 60 additions & 55 deletions ...test/java/com/evolveum/midpoint/model/intest/manual/AbstractDirectManualResourceTest.java
View file
Expand Up @@ -1084,12 +1084,7 @@ public void test300UnassignAccountWill() throws Exception {
pendingOperation = findPendingOperation(shadowModel, OperationResultStatusType.IN_PROGRESS);
assertPendingOperation(shadowModel, pendingOperation, accountWillReqestTimestampStart, accountWillReqestTimestampEnd);

PrismObject<ShadowType> shadowModelFuture = modelService.getObject(ShadowType.class,
accountWillOid,
SelectorOptions.createCollection(GetOperationOptions.createPointInTimeType(PointInTimeType.FUTURE)),
task, result);
display("Model shadow (future)", shadowModelFuture);
assertWillUnassignedFuture(shadowModelFuture, true);
assertWillUnassignedFuture(assertModelShadowFuture(accountWillOid), true);

assertSteadyResources();

Expand Down Expand Up @@ -1158,12 +1153,7 @@ public void test302RecomputeWill() throws Exception {
pendingOperation = findPendingOperation(shadowModel, OperationResultStatusType.IN_PROGRESS);
assertPendingOperation(shadowModel, pendingOperation, accountWillReqestTimestampStart, accountWillReqestTimestampEnd);

PrismObject<ShadowType> shadowModelFuture = modelService.getObject(ShadowType.class,
accountWillOid,
SelectorOptions.createCollection(GetOperationOptions.createPointInTimeType(PointInTimeType.FUTURE)),
task, result);
display("Model shadow (future)", shadowModelFuture);
assertWillUnassignedFuture(shadowModelFuture, true);
assertWillUnassignedFuture(assertModelShadowFuture(accountWillOid), true);

// Make sure that the account is still linked
PrismObject<UserType> userAfter = getUser(userWillOid);
Expand Down Expand Up @@ -1238,9 +1228,7 @@ public void test310CloseCaseAndReconcileWill() throws Exception {
assertUnassignedShadow(shadowModelAsserter, false, ActivationStatusType.ENABLED); // backing store not yet updated
assertShadowPassword(shadowModelAsserter);

PrismObject<ShadowType> shadowModelFuture = assertModelShadowFuture(accountWillOid)
.getObject();
assertWillUnassignedFuture(shadowModelFuture, true);
assertWillUnassignedFuture(assertModelShadowFuture(accountWillOid), true);

assertCase(willLastCaseOid, SchemaConstants.CASE_STATE_CLOSED);

Expand Down Expand Up @@ -1297,12 +1285,7 @@ public void test320RecomputeWillAfter5min() throws Exception {
assertUnassignedShadow(shadowModelAsserter, false, ActivationStatusType.ENABLED); // backing store not yet updated
assertShadowPassword(shadowModelAsserter);

PrismObject<ShadowType> shadowModelFuture = modelService.getObject(ShadowType.class,
accountWillOid,
SelectorOptions.createCollection(GetOperationOptions.createPointInTimeType(PointInTimeType.FUTURE)),
task, result);
display("Model shadow (future)", shadowModelFuture);
assertWillUnassignedFuture(shadowModelFuture, true);
assertWillUnassignedFuture(assertModelShadowFuture(accountWillOid), true);

assertCase(willLastCaseOid, SchemaConstants.CASE_STATE_CLOSED);

Expand Down Expand Up @@ -1346,7 +1329,7 @@ public void test330UpdateBackingStoreAndRecomputeWill() throws Exception {
.end();
assertUnassignedShadow(shadowRepoAsserter, true, null);

ShadowAsserter<Void> shadowModelAsserter = assertModelShadowNoFetch(accountWillOid)
ShadowAsserter<Void> shadowModelAsserterNoFetch = assertModelShadowNoFetch(accountWillOid)
.assertName(USER_WILL_NAME)
.assertKind(ShadowKindType.ACCOUNT)
.pendingOperations()
Expand All @@ -1357,17 +1340,12 @@ public void test330UpdateBackingStoreAndRecomputeWill() throws Exception {
.assertCompletionTimestamp(accountWillCompletionTimestampStart, accountWillCompletionTimestampEnd)
.end()
.end();
assertUnassignedShadow(shadowModelAsserter, true, ActivationStatusType.DISABLED);
assertUnassignedShadow(shadowModelAsserterNoFetch, true, null);
// Do NOT assert password here. There is no password even for semi-manual case as the shadow is dead and account gone.

assertModelShadow(accountWillOid)
.assertTombstone();

assertModelShadowFuture(accountWillOid)
.assertTombstone();

assertModelShadowFutureNoFetch(accountWillOid)
.assertTombstone();
assertUnassignedShadow(assertModelShadow(accountWillOid), true, ActivationStatusType.DISABLED);
assertUnassignedShadow(assertModelShadowFuture(accountWillOid), true, ActivationStatusType.DISABLED);
assertUnassignedShadow(assertModelShadowFutureNoFetch(accountWillOid), true, ActivationStatusType.DISABLED);

assertCase(willLastCaseOid, SchemaConstants.CASE_STATE_CLOSED);

Expand Down Expand Up @@ -1402,11 +1380,18 @@ public void test340RecomputeWillAfter25min() throws Exception {

assertUserAfter(userWillOid)
.singleLink()
.resolveTarget()
.assertOid(accountWillOid)
.assertDead()
.pendingOperations()
.singleOperation();
.assertOid(accountWillOid);

ShadowAsserter<Void> shadowRepoAsserter = assertRepoShadow(accountWillOid)
.pendingOperations()
.singleOperation()
.assertRequestTimestamp(accountWillReqestTimestampStart, accountWillReqestTimestampEnd)
.assertExecutionStatus(PendingOperationExecutionStatusType.COMPLETED)
.assertResultStatus(OperationResultStatusType.SUCCESS)
.assertCompletionTimestamp(accountWillCompletionTimestampStart, accountWillCompletionTimestampEnd)
.end()
.end();
assertUnassignedShadow(shadowRepoAsserter, true, null);

assertCase(willLastCaseOid, SchemaConstants.CASE_STATE_CLOSED);

Expand Down Expand Up @@ -1439,12 +1424,14 @@ public void test342RecomputeWillAfter35min() throws Exception {

assertUserAfter(userWillOid)
.singleLink()
.resolveTarget()
.assertOid(accountWillOid)
.assertDead()
.pendingOperations()
.assertNone();
.assertOid(accountWillOid);

ShadowAsserter<Void> shadowRepoAsserter = assertRepoShadow(accountWillOid)
.pendingOperations()
.assertNone()
.end();
assertUnassignedShadow(shadowRepoAsserter, true, null);

assertCase(willLastCaseOid, SchemaConstants.CASE_STATE_CLOSED);

assertSteadyResources();
Expand Down Expand Up @@ -1515,9 +1502,10 @@ public void test500AssignWillRoleOne() throws Exception {

/**
* Unassign account before anybody had the time to do anything about it.
* Snapshot (backing store) is never updated.
* Create ticket is not closed, the account is not yet created and we
* want to delete it.
* The shadow should exist, all the operations are should be cancelled.
* The shadow should exist, all the operations should be cancelled.
* MID-4037
*/
@Test
Expand Down Expand Up @@ -1569,9 +1557,9 @@ public void test510UnassignWillRoleOne() throws Exception {
.pendingOperations()
.assertOperations(2);

assertModelShadowFuture(accountWillOid)
.assertName(USER_WILL_NAME)
.assertTombstone();
ShadowAsserter<Void> shadowFutureAsserter = assertModelShadowFuture(accountWillOid)
.assertName(USER_WILL_NAME);
assertUnassignedShadow(shadowFutureAsserter, true, ActivationStatusType.DISABLED);

// Make sure that the account is still linked
assertUserAfter(userWillOid)
Expand Down Expand Up @@ -1635,9 +1623,9 @@ public void test512ReconcileWill() throws Exception {
.pendingOperations()
.assertOperations(2);

assertModelShadowFuture(accountWillOid)
.assertName(USER_WILL_NAME)
.assertTombstone();
ShadowAsserter<Void> shadowFutureAsserter = assertModelShadowFuture(accountWillOid)
.assertName(USER_WILL_NAME);
assertUnassignedShadow(shadowFutureAsserter, true, ActivationStatusType.DISABLED);

// Make sure that the account is still linked
assertUserAfter(userWillOid)
Expand All @@ -1652,7 +1640,14 @@ public void test512ReconcileWill() throws Exception {
}

/**
* Close both cases at the same time.
* Close both cases (assign and unassign) at the same time.
*
* This is an interesting case for SemiManualDisable. In that case
* we would expect that the account was created and that it was disabled.
* But snapshot (backing store) is never updated as the account was not
* created at all. But as long as the pending operations are in
* grace period we have to pretend that the account was created.
*
* MID-4037
*/
@Test
Expand Down Expand Up @@ -1680,6 +1675,8 @@ public void test515CloseCasesAndReconcileWill() throws Exception {

accountWillCompletionTimestampEnd = clock.currentTimeXMLGregorianCalendar();

// For SemiManualDisable case the shadow is not dead yet. We do not know whether
// the account was created or not. We have to assume that it was created.
ShadowAsserter<Void> shadowRepoAsserter = assertRepoShadow(accountWillOid)
.pendingOperations()
.assertOperations(2)
Expand All @@ -1701,12 +1698,12 @@ public void test515CloseCasesAndReconcileWill() throws Exception {
.assertKind(ShadowKindType.ACCOUNT);
assertUnassignedShadow(shadowModelAsserter, true, null); // Shadow in not in the backing store

PrismObject<ShadowType> shadowModelFuture = modelService.getObject(ShadowType.class,
accountWillOid,
SelectorOptions.createCollection(GetOperationOptions.createPointInTimeType(PointInTimeType.FUTURE)),
task, result);
display("Model shadow (future)", shadowModelFuture);
assertWillUnassignedFuture(shadowModelFuture, false);
// For SemiManualDisable case we still pretend that the shadow will exist
assertWillUnassignedFuture(assertModelShadowFuture(accountWillOid), false);

assertUserAfter(userWillOid)
.singleLink()
.assertOid(accountWillOid);

assertCase(willLastCaseOid, SchemaConstants.CASE_STATE_CLOSED);
assertCase(willSecondLastCaseOid, SchemaConstants.CASE_STATE_CLOSED);
Expand Down Expand Up @@ -1744,6 +1741,14 @@ protected void assertWillUnassignPendingOperationCompleted(ShadowAsserter<Void>
/**
* ff 20min, grace period expired, But we keep pending operation and shadow
* because they are not expired yet.
*
* SemiManualDisable case gets even more interesting here.
* Snapshot (backing store) was never updated as the account was in fact not
* created at all. As pending operations are over grace period now, we stop
* pretending that the account was created. And the reality shows that the
* account was in fact not created at all. This is the point where we should
* end up with a dead shadow.
*
* MID-4037
*/
@Test
Expand Down
28 changes: 4 additions & 24 deletions ...st/java/com/evolveum/midpoint/model/intest/manual/AbstractGroupingManualResourceTest.java
View file
Expand Up @@ -695,12 +695,7 @@ public void test300UnassignAccountWill() throws Exception {
PendingOperationExecutionStatusType.EXECUTION_PENDING, null,
null, null);

PrismObject<ShadowType> shadowModelFuture = modelService.getObject(ShadowType.class,
accountWillOid,
SelectorOptions.createCollection(GetOperationOptions.createPointInTimeType(PointInTimeType.FUTURE)),
task, result);
display("Model shadow (future)", shadowModelFuture);
assertWillUnassignedFuture(shadowModelFuture, true);
assertWillUnassignedFuture(assertModelShadowFuture(accountWillOid), true);

// Make sure that the account is still linked
PrismObject<UserType> userAfter = getUser(userWillOid);
Expand Down Expand Up @@ -779,12 +774,7 @@ public void test302RunPropagationAfterInterval() throws Exception {
null, null);
assertEquals("Case ID mismatch", willLastCaseOid, pendingOperation.getAsynchronousOperationReference());

PrismObject<ShadowType> shadowModelFuture = modelService.getObject(ShadowType.class,
accountWillOid,
SelectorOptions.createCollection(GetOperationOptions.createPointInTimeType(PointInTimeType.FUTURE)),
task, result);
display("Model shadow (future)", shadowModelFuture);
assertWillUnassignedFuture(shadowModelFuture, true);
assertWillUnassignedFuture(assertModelShadowFuture(accountWillOid), true);

// Make sure that the account is still linked
PrismObject<UserType> userAfter = getUser(userWillOid);
Expand Down Expand Up @@ -846,12 +836,7 @@ public void test310CloseCaseAndRecomputeWill() throws Exception {
OperationResultStatusType.SUCCESS,
accountWillCompletionTimestampStart, accountWillCompletionTimestampEnd);

PrismObject<ShadowType> shadowModelFuture = modelService.getObject(ShadowType.class,
accountWillOid,
SelectorOptions.createCollection(GetOperationOptions.createPointInTimeType(PointInTimeType.FUTURE)),
task, result);
display("Model shadow (future)", shadowModelFuture);
assertWillUnassignedFuture(shadowModelFuture, true);
assertWillUnassignedFuture(assertModelShadowFuture(accountWillOid), true);

assertCase(willLastCaseOid, SchemaConstants.CASE_STATE_CLOSED);
}
Expand Down Expand Up @@ -897,12 +882,7 @@ public void test330UpdateBackingStoreAndRecomputeWill() throws Exception {
OperationResultStatusType.SUCCESS,
accountWillCompletionTimestampStart, accountWillCompletionTimestampEnd);

PrismObject<ShadowType> shadowModelFuture = modelService.getObject(ShadowType.class,
accountWillOid,
SelectorOptions.createCollection(GetOperationOptions.createPointInTimeType(PointInTimeType.FUTURE)),
task, result);
display("Model shadow (future)", shadowModelFuture);
assertWillUnassignedFuture(shadowModelFuture, false);
assertWillUnassignedFuture(assertModelShadowFuture(accountWillOid), false);

assertCase(willLastCaseOid, SchemaConstants.CASE_STATE_CLOSED);
}
Expand Down
22 changes: 12 additions & 10 deletions ...t/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
View file
Expand Up @@ -1090,12 +1090,12 @@ public void test132RecomputeWillAfter32min() throws Exception {
assertSuccess(result);

assertRepoShadow(accountWillOid)
.pendingOperations()
.assertNone();
.pendingOperations()
.assertNone();

assertModelShadow(accountWillOid)
.pendingOperations()
.assertNone();
.pendingOperations()
.assertNone();

assertCase(willLastCaseOid, SchemaConstants.CASE_STATE_CLOSED);

Expand Down Expand Up @@ -2302,15 +2302,17 @@ protected void assertWillAfterCreateCaseClosed(final String TEST_NAME, boolean b
assertCase(willLastCaseOid, SchemaConstants.CASE_STATE_CLOSED);
}

protected void assertWillUnassignedFuture(PrismObject<ShadowType> shadowModelFuture, boolean assertPassword) {
assertShadowName(shadowModelFuture, USER_WILL_NAME);
assertUnassignedFuture(shadowModelFuture, assertPassword);
protected void assertWillUnassignedFuture(ShadowAsserter<?> shadowModelAsserterFuture, boolean assertPassword) {
shadowModelAsserterFuture
.assertName(USER_WILL_NAME);
assertUnassignedFuture(shadowModelAsserterFuture, assertPassword);
}

protected void assertUnassignedFuture(PrismObject<ShadowType> shadowModelFuture, boolean assertPassword) {
assertShadowDead(shadowModelFuture);
protected void assertUnassignedFuture(ShadowAsserter<?> shadowModelAsserterFuture, boolean assertPassword) {
shadowModelAsserterFuture
.assertDead();
if (assertPassword) {
assertShadowPassword(shadowModelFuture);
assertShadowPassword(shadowModelAsserterFuture);
}
}

Expand Down
16 changes: 2 additions & 14 deletions .../model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManual.java
View file
Expand Up @@ -238,13 +238,7 @@ public void test710UnassignAccountJack() throws Exception {
pendingOperation = findPendingOperation(shadowModel, OperationResultStatusType.IN_PROGRESS);
assertPendingOperation(shadowModel, pendingOperation, accountJackReqestTimestampStart, accountJackReqestTimestampEnd);

PrismObject<ShadowType> shadowModelFuture = modelService.getObject(ShadowType.class,
accountJackOid,
SelectorOptions.createCollection(GetOperationOptions.createPointInTimeType(PointInTimeType.FUTURE)),
task, result);
display("Model shadow (future)", shadowModelFuture);
assertShadowName(shadowModelFuture, USER_JACK_USERNAME);
assertUnassignedFuture(shadowModelFuture, true);
assertUnassignedFuture(assertModelShadowFuture(accountJackOid), true);

assertCase(jackLastCaseOid, SchemaConstants.CASE_STATE_OPEN);
}
Expand Down Expand Up @@ -302,13 +296,7 @@ public void test712CloseCaseAndRecomputeJack() throws Exception {
.end();
assertUnassignedShadow(shadowModelAsserter, true, ActivationStatusType.DISABLED);

PrismObject<ShadowType> shadowModelFuture = modelService.getObject(ShadowType.class,
accountJackOid,
SelectorOptions.createCollection(GetOperationOptions.createPointInTimeType(PointInTimeType.FUTURE)),
task, result);
display("Model shadow (future)", shadowModelFuture);
assertShadowName(shadowModelFuture, USER_JACK_USERNAME);
assertUnassignedFuture(shadowModelFuture, false);
assertUnassignedFuture(assertModelShadowFuture(accountJackOid), false);

assertCase(jackLastCaseOid, SchemaConstants.CASE_STATE_CLOSED);
}
Expand Down
8 changes: 5 additions & 3 deletions ...intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisable.java
View file
Expand Up @@ -116,10 +116,12 @@ protected void assertUnassignedShadow(ShadowAsserter<?> shadowModelAsserter, boo
}

@Override
protected void assertUnassignedFuture(PrismObject<ShadowType> shadowModelFuture, boolean assertPassword) {
assertShadowActivationAdministrativeStatus(shadowModelFuture, ActivationStatusType.DISABLED);
protected void assertUnassignedFuture(ShadowAsserter<?> shadowModelAsserterFuture, boolean assertPassword) {
shadowModelAsserterFuture
.assertLife()
.assertAdministrativeStatus(ActivationStatusType.DISABLED);
if (assertPassword) {
assertShadowPassword(shadowModelFuture);
assertShadowPassword(shadowModelAsserterFuture);
}
}

Expand Down
5 changes: 2 additions & 3 deletions model/model-intest/src/test/resources/manual/resource-semi-manual-disable.xml
View file
Expand Up @@ -200,6 +200,8 @@
<avoidDuplicateValues>true</avoidDuplicateValues>
<shadowConstraintsCheck>light</shadowConstraintsCheck>
<pendingOperationGracePeriod>PT15M</pendingOperationGracePeriod>
<pendingOperationRetentionPeriod>PT30M</pendingOperationRetentionPeriod>
<deadShadowRetentionPeriod>PT2H</deadShadowRetentionPeriod>
<reshreshOnRead>true</reshreshOnRead>
</consistency>

Expand All @@ -224,9 +226,6 @@
<reaction>
<situation>deleted</situation>
<synchronize>true</synchronize>
<action>
<handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-3#unlink</handlerUri>
</action>
</reaction>
<reaction>
<situation>unlinked</situation>
Expand Down

0 comments on commit 71bbfd0

Please sign in to comment.