diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractDirectManualResourceTest.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractDirectManualResourceTest.java index f381bcdffc4..de7092e860d 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractDirectManualResourceTest.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractDirectManualResourceTest.java @@ -31,8 +31,6 @@ import com.evolveum.midpoint.task.api.Task; import com.evolveum.midpoint.test.asserter.ShadowAsserter; import com.evolveum.midpoint.test.asserter.UserAsserter; -import com.evolveum.midpoint.util.logging.Trace; -import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationStatusType; import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationType; import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultStatusType; @@ -100,12 +98,8 @@ public abstract class AbstractDirectManualResourceTest extends AbstractManualRes protected static final File ROLE_TWO_SEMI_MANUAL_DISABLE_SLOW_PROPOSED_FILE = new File(TEST_DIR, "role-two-semi-manual-disable-slow-proposed.xml"); protected static final String ROLE_TWO_SEMI_MANUAL_DISABLE_SLOW_PROPOSED_OID = "5ecd6fa6-a200-11e7-b0cb-af5e1792d327"; - private static final Trace LOGGER = TraceManager.getTrace(AbstractDirectManualResourceTest.class); - private XMLGregorianCalendar roleTwoValidFromTimestamp; - protected String accountBarbossaOid; - @Override public void initSystem(Task initTask, OperationResult initResult) throws Exception { super.initSystem(initTask, initResult); @@ -1448,12 +1442,10 @@ protected void assertDeprovisionedTimedOutUser(UserAsserter userAsserter, */ @Test public void test349CleanUp() throws Exception { - final String TEST_NAME = "test349CleanUp"; - - cleanupUser(TEST_NAME, userWillOid, USER_WILL_NAME, accountWillOid); + cleanupUser(userWillOid, USER_WILL_NAME, accountWillOid); } - protected void cleanupUser(final String TEST_NAME, String userOid, String username, String accountOid) throws Exception { + protected void cleanupUser(String userOid, String username, String accountOid) throws Exception { // nothing to do here } @@ -1816,11 +1808,10 @@ public void test518RecomputeWillAfter180min() throws Exception { */ @Test public void test519CleanUp() throws Exception { - final String TEST_NAME = "test519CleanUp"; Task task = getTestTask(); OperationResult result = task.getResult(); - cleanupUser(TEST_NAME, userWillOid, USER_WILL_NAME, accountWillOid); + cleanupUser(userWillOid, USER_WILL_NAME, accountWillOid); // Make sure that all pending operations are expired clockForward("PT1H"); @@ -2102,11 +2093,10 @@ protected void assertTest528Deltas(PrismObject shadowRepo, Operation */ @Test public void test529CleanUp() throws Exception { - final String TEST_NAME = "test529CleanUp"; Task task = getTestTask(); OperationResult result = task.getResult(); - cleanupUser(TEST_NAME, userWillOid, USER_WILL_NAME, accountWillOid); + cleanupUser(userWillOid, USER_WILL_NAME, accountWillOid); // Make sure that all pending operations are expired clockForward("PT3H"); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractGroupingManualResourceTest.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractGroupingManualResourceTest.java index 476c278df47..7705244dbb7 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractGroupingManualResourceTest.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractGroupingManualResourceTest.java @@ -941,7 +941,7 @@ public void test330UpdateBackingStoreAndRecomputeWill() throws Exception { public void test349CleanUp() throws Exception { final String TEST_NAME = "test349CleanUp"; - cleanupUser(TEST_NAME, userWillOid, USER_WILL_NAME, accountWillOid); + cleanupUser(userWillOid, USER_WILL_NAME, accountWillOid); } // TODO: test400: create -> modify -> propagation diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java index 6e6d0062b94..d28acdaf035 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java @@ -2320,7 +2320,7 @@ private void assertManual(AbstractWriteCapabilityType cap) { assertEquals("Manual flag not set in capability "+cap, Boolean.TRUE, cap.isManual()); } - protected void cleanupUser(final String TEST_NAME, String userOid, String username, String accountOid) throws Exception { + protected void cleanupUser(String userOid, String username, String accountOid) throws Exception { // nothing to do here } diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManual.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManual.java index eb098f3af39..4b644fa1207 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManual.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManual.java @@ -318,7 +318,7 @@ public void test717RecomputeJackAfter130min() throws Exception { public void test719CleanUp() throws Exception { final String TEST_NAME = "test719CleanUp"; - cleanupUser(TEST_NAME, USER_JACK_OID, USER_JACK_USERNAME, accountJackOid); + cleanupUser(USER_JACK_OID, USER_JACK_USERNAME, accountJackOid); } @Override diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisable.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisable.java index 9f7de901187..f3f9117599b 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisable.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisable.java @@ -24,8 +24,6 @@ import com.evolveum.midpoint.test.asserter.ShadowAsserter; import com.evolveum.midpoint.test.asserter.UserAsserter; import com.evolveum.midpoint.util.exception.ObjectNotFoundException; -import com.evolveum.midpoint.util.logging.Trace; -import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationStatusType; import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultStatusType; import com.evolveum.midpoint.xml.ns._public.common.common_3.PendingOperationExecutionStatusType; @@ -43,8 +41,6 @@ @Listeners({ com.evolveum.midpoint.tools.testng.AlphabeticalMethodInterceptor.class }) public class TestSemiManualDisable extends TestSemiManual { - private static final Trace LOGGER = TraceManager.getTrace(TestSemiManualDisable.class); - @Override public void initSystem(Task initTask, OperationResult initResult) throws Exception { super.initSystem(initTask, initResult); @@ -150,9 +146,8 @@ protected void assertWillUnassignPendingOperationCompleted(ShadowAsserter } @Override - protected void cleanupUser(final String TEST_NAME, String userOid, String username, String accountOid) throws Exception { - - Task task = getTestTask(); + protected void cleanupUser(String userOid, String username, String accountOid) throws Exception { + Task task = createTask("cleanupUser"); OperationResult result = task.getResult(); backingStore.deleteAccount(username); @@ -175,7 +170,6 @@ protected void cleanupUser(final String TEST_NAME, String userOid, String userna @Test @Override public void test416PhoenixAccountUnassignCloseCase() throws Exception { - final String TEST_NAME = "test416PhoenixAccountUnassignCloseCase"; // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -183,22 +177,22 @@ public void test416PhoenixAccountUnassignCloseCase() throws Exception { closeCase(phoenixLastCaseOid); // WHEN - when(TEST_NAME); + when(); reconcileUser(USER_PHOENIX_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); // Make sure the operation will be picked up by propagation task clockForward("PT3M"); // WHEN - when(TEST_NAME); + when(); runPropagation(); // THEN - then(TEST_NAME); + then(); PrismObject userAfter = getUser(USER_PHOENIX_OID); display("User after", userAfter); @@ -220,28 +214,27 @@ public void test416PhoenixAccountUnassignCloseCase() throws Exception { @Test @Override public void test418AssignPhoenixAccountAgain() throws Exception { - final String TEST_NAME = "test418AssignPhoenixAccountAgain"; // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); // WHEN - when(TEST_NAME); + when(); assignAccountToUser(USER_PHOENIX_OID, getResourceOid(), null, task, result); // THEN - then(TEST_NAME); + then(); phoenixLastCaseOid = assertInProgress(result); // Make sure the operation will be picked up by propagation task clockForward("PT3M"); // WHEN - when(TEST_NAME); + when(); runPropagation(); // THEN - then(TEST_NAME); + then(); PrismObject userAfter = getUser(USER_PHOENIX_OID); display("User after", userAfter); @@ -296,9 +289,6 @@ protected void assertTest526Deltas(PrismObject shadowRepo, Operation protected void assertTest528Deltas(PrismObject shadowRepo, OperationResult result) { assertPendingOperationDeltas(shadowRepo, 3); - ObjectDeltaType deltaModify = null; - ObjectDeltaType deltaAdd = null; - ObjectDeltaType deltaDelete = null; for (PendingOperationType pendingOperation: shadowRepo.asObjectable().getPendingOperation()) { assertEquals("Wrong status in pending delta", OperationResultStatusType.SUCCESS, pendingOperation.getResultStatus()); } diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/multi/TestMultiResource.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/multi/TestMultiResource.java index 103ab7f653d..8811e89d649 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/multi/TestMultiResource.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/multi/TestMultiResource.java @@ -24,7 +24,6 @@ import com.evolveum.icf.dummy.resource.ConflictException; import com.evolveum.icf.dummy.resource.SchemaViolationException; import com.evolveum.midpoint.model.api.ModelExecuteOptions; -import com.evolveum.midpoint.model.intest.password.AbstractPasswordTest; import com.evolveum.midpoint.prism.util.PrismAsserts; import com.evolveum.midpoint.prism.util.PrismTestUtil; import com.evolveum.midpoint.schema.ObjectDeltaOperation; @@ -176,41 +175,36 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti @Test public void test110JackAssignRoleDummiesFull() throws Exception { - final String TEST_NAME = "test110JackAssignRoleDummiesFull"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.FULL); - jackAssignRoleDummies(TEST_NAME); + jackAssignRoleDummies(); } @Test public void test113JackRenameFull() throws Exception { - final String TEST_NAME = "test113JackRenameFull"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.FULL); - jackRename(TEST_NAME); + jackRename(); } @Test public void test114JackUnAssignRoleDummiesFull() throws Exception { - final String TEST_NAME = "test114JackUnAssignRoleDummiesFull"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.FULL); - jackUnAssignRoleDummies(TEST_NAME); + jackUnAssignRoleDummies(); } // TODO: lavender resource with failure @Test public void test115JackAssignRoleDummiesFullErrorIvory() throws Exception { - final String TEST_NAME = "test115JackAssignRoleDummiesFullErrorIvory"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.FULL); getDummyResource().setAddBreakMode(BreakMode.NETWORK); - jackAssignRoleDummiesError(TEST_NAME, ROLE_DUMMIES_IVORY_OID, RESOURCE_DUMMY_IVORY_NAME, true); + jackAssignRoleDummiesError(ROLE_DUMMIES_IVORY_OID, RESOURCE_DUMMY_IVORY_NAME, true); } @Test public void test116JackUnAssignRoleDummiesFullErrorIvory() throws Exception { - final String TEST_NAME = "test116JackUnAssignRoleDummiesFullErrorIvory"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.FULL); getDummyResource().setAddBreakMode(BreakMode.NETWORK); - jackUnassignRoleDummiesError(TEST_NAME, ROLE_DUMMIES_IVORY_OID, RESOURCE_DUMMY_IVORY_OID); + jackUnassignRoleDummiesError(ROLE_DUMMIES_IVORY_OID, RESOURCE_DUMMY_IVORY_OID); } /** @@ -220,24 +214,20 @@ public void test116JackUnAssignRoleDummiesFullErrorIvory() throws Exception { */ @Test public void test117JackAssignRoleDummiesFullErrorBeige() throws Exception { - final String TEST_NAME = "test117JackAssignRoleDummiesFullErrorBeige"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.FULL); getDummyResource().setAddBreakMode(BreakMode.NETWORK); - jackAssignRoleDummiesError(TEST_NAME, ROLE_DUMMIES_BEIGE_OID, RESOURCE_DUMMY_BEIGE_NAME, false); + jackAssignRoleDummiesError(ROLE_DUMMIES_BEIGE_OID, RESOURCE_DUMMY_BEIGE_NAME, false); } @Test public void test118JackUnAssignRoleDummiesFullErrorBeige() throws Exception { - final String TEST_NAME = "test118JackUnAssignRoleDummiesFullErrorBeige"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.FULL); getDummyResource().setAddBreakMode(BreakMode.NETWORK); - jackUnassignRoleDummiesError(TEST_NAME, ROLE_DUMMIES_BEIGE_OID, null); + jackUnassignRoleDummiesError(ROLE_DUMMIES_BEIGE_OID, null); } @Test public void test120JackAssignRoleDummiesRelative() throws Exception { - final String TEST_NAME = "test120JackAssignRoleDummiesRelative"; - getDummyResource().resetBreakMode(); // Clean up user Task task = getTestTask(); @@ -245,7 +235,7 @@ public void test120JackAssignRoleDummiesRelative() throws Exception { modifyUserReplace(USER_JACK_OID, UserType.F_ORGANIZATIONAL_UNIT, task, result); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); - jackAssignRoleDummies(TEST_NAME); + jackAssignRoleDummies(); } /** @@ -254,7 +244,6 @@ public void test120JackAssignRoleDummiesRelative() throws Exception { */ @Test public void test121JackTryDeleteAccount() throws Exception { - final String TEST_NAME = "test121JackTryDeleteAccount"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); getDummyResource().resetBreakMode(); @@ -281,16 +270,14 @@ public void test121JackTryDeleteAccount() throws Exception { @Test public void test123JackRenameRelative() throws Exception { - final String TEST_NAME = "test123JackRenameRelative"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); - jackRename(TEST_NAME); + jackRename(); } @Test public void test129JackUnAssignRoleDummiesRelative() throws Exception { - final String TEST_NAME = "test129JackUnAssignRoleDummiesRelative"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); - jackUnAssignRoleDummies(TEST_NAME); + jackUnAssignRoleDummies(); } /** @@ -298,8 +285,6 @@ public void test129JackUnAssignRoleDummiesRelative() throws Exception { */ @Test public void test200JackAssignDummyIvory() throws Exception { - final String TEST_NAME = "test200JackAssignDummyIvory"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -332,8 +317,6 @@ public void test200JackAssignDummyIvory() throws Exception { */ @Test public void test209JackUnAssignDummyIvory() throws Exception { - final String TEST_NAME = "test209JackUnAssignDummyIvory"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -364,8 +347,6 @@ public void test209JackUnAssignDummyIvory() throws Exception { */ @Test public void test210JackAssignDummyBeige() throws Exception { - final String TEST_NAME = "test210JackAssignDummyBeige"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -375,11 +356,11 @@ public void test210JackAssignDummyBeige() throws Exception { modifyUserReplace(USER_JACK_OID, UserType.F_ORGANIZATIONAL_UNIT, task, result); // WHEN - when(TEST_NAME); + when(); assignAccountToUser(USER_JACK_OID, RESOURCE_DUMMY_BEIGE_OID, null, task, result); // THEN - then(TEST_NAME); + then(); result.computeStatus(); TestUtil.assertSuccess(result); @@ -401,8 +382,6 @@ public void test210JackAssignDummyBeige() throws Exception { */ @Test public void test219JackUnAssignDummyBeige() throws Exception { - final String TEST_NAME = "test219JackUnAssignDummyBeige"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -412,11 +391,11 @@ public void test219JackUnAssignDummyBeige() throws Exception { modifyUserReplace(USER_JACK_OID, UserType.F_ORGANIZATIONAL_UNIT, task, result); // WHEN - when(TEST_NAME); + when(); unassignAccountFromUser(USER_JACK_OID, RESOURCE_DUMMY_BEIGE_OID, null, task, result); // THEN - then(TEST_NAME); + then(); result.computeStatus(); TestUtil.assertSuccess(result); @@ -435,8 +414,6 @@ public void test219JackUnAssignDummyBeige() throws Exception { */ @Test public void test220JackAssignDummyBeigeAndDefault() throws Exception { - final String TEST_NAME = "test220JackAssignDummyBeigeAndDefault"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -449,11 +426,11 @@ public void test220JackAssignDummyBeigeAndDefault() throws Exception { userDelta.addModification(createAssignmentModification(RESOURCE_DUMMY_OID, ShadowKindType.ACCOUNT, null, true)); // WHEN - when(TEST_NAME); + when(); executeChanges(userDelta, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userJack = getUser(USER_JACK_OID); @@ -473,18 +450,16 @@ public void test220JackAssignDummyBeigeAndDefault() throws Exception { */ @Test public void test221JackRecompute() throws Exception { - final String TEST_NAME = "test221JackRecompute"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); // WHEN - when(TEST_NAME); + when(); recomputeUser(USER_JACK_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userJack = getUser(USER_JACK_OID); @@ -506,8 +481,6 @@ public void test221JackRecompute() throws Exception { */ @Test public void test223JackKillDefaultDummyAccounAndRecompute() throws Exception { - final String TEST_NAME = "test223JackKillDefaultDummyAccounAndRecompute"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -516,11 +489,11 @@ public void test223JackKillDefaultDummyAccounAndRecompute() throws Exception { display("dummy resource before", getDummyResource()); // WHEN - when(TEST_NAME); + when(); recomputeUser(USER_JACK_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertUserAfter(USER_JACK_OID) @@ -544,8 +517,6 @@ public void test223JackKillDefaultDummyAccounAndRecompute() throws Exception { */ @Test public void test224JackKillBeigeAccounAndRecompute() throws Exception { - final String TEST_NAME = "test224JackKillBeigeAccounAndRecompute"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -554,11 +525,11 @@ public void test224JackKillBeigeAccounAndRecompute() throws Exception { display("beige dummy resource before", getDummyResource(RESOURCE_DUMMY_BEIGE_NAME)); // WHEN - when(TEST_NAME); + when(); recomputeUser(USER_JACK_OID, ModelExecuteOptions.createReconcile(), task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertUserAfter(USER_JACK_OID) @@ -602,8 +573,6 @@ public void test224JackKillBeigeAccounAndRecompute() throws Exception { @Test public void test225ForceDeleteDeadShadow() throws Exception { - final String TEST_NAME = "test225ForceDeleteDeadShadow"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -618,11 +587,11 @@ public void test225ForceDeleteDeadShadow() throws Exception { .getOid(); // WHEN - when(TEST_NAME); + when(); forceDeleteObject(ShadowType.class, deadBeigeShadowOid, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertNoShadow(deadBeigeShadowOid); @@ -656,8 +625,6 @@ public void test225ForceDeleteDeadShadow() throws Exception { */ @Test public void test226JackKillBothAccountsAndRecompute() throws Exception { - final String TEST_NAME = "test226JackKillBothAccountsAndRecompute"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -673,11 +640,11 @@ public void test226JackKillBothAccountsAndRecompute() throws Exception { display("beige dummy resource before", getDummyResource(RESOURCE_DUMMY_BEIGE_NAME)); // WHEN - when(TEST_NAME); + when(); recomputeUser(USER_JACK_OID, ModelExecuteOptions.createReconcile(), task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertUserAfter(USER_JACK_OID) @@ -733,22 +700,20 @@ public void test226JackKillBothAccountsAndRecompute() throws Exception { */ @Test public void test227ModifyUserJackDefaultDummyBrokenSchemaViolation() throws Exception { - final String TEST_NAME = "test227ModifyUserJackDefaultDummyBrokenSchemaViolation"; - // GIVEN - Task task = taskManager.createTaskInstance(TestMultiResource.class.getName() + "." + TEST_NAME); + Task task = getTestTask(); OperationResult result = task.getResult(); dummyAuditService.clear(); getDummyResource().setModifyBreakMode(BreakMode.SCHEMA); // WHEN - when(TEST_NAME); + when(); modifyUserReplace(USER_JACK_OID, UserType.F_FULL_NAME, task, result, createPolyString("Cpt. Jack Sparrow")); // THEN - then(TEST_NAME); + then(); assertPartialError(result); assertUserAfter(USER_JACK_OID) @@ -800,21 +765,19 @@ public void test227ModifyUserJackDefaultDummyBrokenSchemaViolation() throws Exce */ @Test public void test228ModifyUserJackDefaultDummyNoError() throws Exception { - final String TEST_NAME = "test228ModifyUserJackDefaultDummyNoError"; - // GIVEN - Task task = taskManager.createTaskInstance(TestMultiResource.class.getName() + "." + TEST_NAME); + Task task = getTestTask(); OperationResult result = task.getResult(); dummyAuditService.clear(); getDummyResource().resetBreakMode(); // WHEN - when(TEST_NAME); + when(); modifyUserReplace(USER_JACK_OID, UserType.F_FULL_NAME, task, result, createPolyString(USER_JACK_FULL_NAME)); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertUserAfter(USER_JACK_OID) @@ -862,8 +825,6 @@ public void test228ModifyUserJackDefaultDummyNoError() throws Exception { */ @Test public void test229JackUnassignDummyBeigeAndDefault() throws Exception { - final String TEST_NAME = "test229JackUnassignDummyBeigeAndDefault"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -874,11 +835,11 @@ public void test229JackUnassignDummyBeigeAndDefault() throws Exception { userDelta.addModification(createAssignmentModification(RESOURCE_DUMMY_OID, ShadowKindType.ACCOUNT, null, false)); // WHEN - when(TEST_NAME); + when(); executeChanges(userDelta, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); String deadShadowOid = assertUserAfter(USER_JACK_OID) @@ -898,7 +859,7 @@ public void test229JackUnassignDummyBeigeAndDefault() throws Exception { assertNoDummyAccount(RESOURCE_DUMMY_BEIGE_NAME, ACCOUNT_JACK_DUMMY_USERNAME); // CLEANUP - make sure we have clean slate for next tests - displayCleanup(TEST_NAME); + displayCleanup(contextName()); forceDeleteShadow(deadShadowOid); assertNoShadow(deadShadowOid); @@ -912,8 +873,6 @@ public void test229JackUnassignDummyBeigeAndDefault() throws Exception { */ @Test public void test250JackAssignDummyLavender() throws Exception { - final String TEST_NAME = "test250JackAssignDummyLavender"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -948,18 +907,17 @@ public void test250JackAssignDummyLavender() throws Exception { * The "dummies" role assigns two dummy resources that are in a dependency. The value of DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_SHIP_NAME is propagated from one * resource through the user to the other resource. If dependency does not work then no value is propagated. */ - public void jackAssignRoleDummies(final String TEST_NAME) throws Exception { - - Task task = getTestTask(); + public void jackAssignRoleDummies() throws Exception { + Task task = createTask("jackAssignRoleDummies"); OperationResult result = task.getResult(); clearJackOrganizationalUnit(task, result); // WHEN - when(TEST_NAME); + when(); assignRole(USER_JACK_OID, ROLE_DUMMIES_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertUserAfter(USER_JACK_OID) @@ -1002,28 +960,28 @@ public void jackAssignRoleDummies(final String TEST_NAME) throws Exception { .assertAttribute(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_SHIP_NAME, "The crew of The Lost Souls"); } - public void jackRename(final String TEST_NAME) throws Exception { + public void jackRename() throws Exception { Task task = getTestTask(); OperationResult result = task.getResult(); - jackRename(TEST_NAME, "jackie", "Jackie Sparrow", task, result); - jackRename(TEST_NAME, USER_JACK_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, task, result); + jackRename("jackie", "Jackie Sparrow", task, result); + jackRename(USER_JACK_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, task, result); } - public void jackRename(final String TEST_NAME, String toName, String toFullName, Task task, OperationResult result) throws Exception { - + public void jackRename(String toName, String toFullName, Task task, OperationResult result) + throws Exception { ObjectDelta objectDelta = createModifyUserReplaceDelta(USER_JACK_OID, UserType.F_NAME, PrismTestUtil.createPolyString(toName)); objectDelta.addModificationReplaceProperty(UserType.F_FULL_NAME, PrismTestUtil.createPolyString(toFullName)); Collection> deltas = MiscSchemaUtil.createCollection(objectDelta); // WHEN - when(TEST_NAME); + when(); modelService.executeChanges(deltas, null, task, result); // THEN - then(TEST_NAME); + then(); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1059,21 +1017,20 @@ public void jackRename(final String TEST_NAME, String toName, String toFullName, assertDummyAccountAttribute(RESOURCE_DUMMY_BEIGE_NAME, toName, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_SHIP_NAME, "The crew of The Lost Souls"); } - public void jackUnAssignRoleDummies(final String TEST_NAME) throws Exception { - + public void jackUnAssignRoleDummies() throws Exception { Task task = getTestTask(); OperationResult result = task.getResult(); List linkOidsBefore = assertUserBefore(USER_JACK_OID) - .links() + .links() .getOids(); // WHEN - when(TEST_NAME); + when(); unassignRole(USER_JACK_OID, ROLE_DUMMIES_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertUserAfter(USER_JACK_OID) @@ -1096,23 +1053,23 @@ public void jackUnAssignRoleDummies(final String TEST_NAME) throws Exception { * The "dummies" role assigns two dummy resources that are in a dependency. The value of DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_SHIP_NAME is propagated from one * resource through the user to the other resource. If dependency does not work then no value is propagated. */ - public void jackAssignRoleDummiesError(final String TEST_NAME, String roleOid, String dummyResourceName, - boolean expectAccount) throws Exception { + public void jackAssignRoleDummiesError( + String roleOid, String dummyResourceName, boolean expectAccount) throws Exception { Task task = getTestTask(); OperationResult result = task.getResult(); clearJackOrganizationalUnit(task, result); assertUserBefore(USER_JACK_OID) - .assertAssignments(0) - .assertLinks(0); + .assertAssignments(0) + .assertLinks(0); // WHEN - when(TEST_NAME); + when(); assignRole(USER_JACK_OID, roleOid, task, result); // THEN - then(TEST_NAME); + then(); result.computeStatus(); display(result); TestUtil.assertResultStatus(result, OperationResultStatus.IN_PROGRESS); @@ -1140,16 +1097,17 @@ private void clearJackOrganizationalUnit(Task task, OperationResult result) thro modifyUserReplace(USER_JACK_OID, UserType.F_ORGANIZATIONAL_UNIT, task, result); } - public void jackUnassignRoleDummiesError(final String TEST_NAME, String roleOid, String otherResourceOid) throws Exception { + public void jackUnassignRoleDummiesError( + String roleOid, String otherResourceOid) throws Exception { Task task = getTestTask(); OperationResult result = task.getResult(); UserAsserter userBeforeAsserter = assertUserBefore(USER_JACK_OID); String dummyShadowOid = userBeforeAsserter - .links() + .links() .by() - .resourceOid(RESOURCE_DUMMY_OID) + .resourceOid(RESOURCE_DUMMY_OID) .find() .resolveTarget() .assertConception() @@ -1166,11 +1124,11 @@ public void jackUnassignRoleDummiesError(final String TEST_NAME, String roleOid, } // WHEN - when(TEST_NAME); + when(); unassignRole(USER_JACK_OID, roleOid, task, result); // THEN - then(TEST_NAME); + then(); result.computeStatus(); display(result); // there is a failure while reading dummy account - it was not created @@ -1215,7 +1173,6 @@ public void jackUnassignRoleDummiesError(final String TEST_NAME, String roleOid, @Test public void test300AddAndAssignRelative() throws Exception { - final String TEST_NAME = "test300AddAndAssignRelative"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); Task task = getTestTask(); @@ -1243,11 +1200,11 @@ public void test300AddAndAssignRelative() throws Exception { assertDefaultDummyAccount(ACCOUNT_JACK_DUMMY_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, true); // WHEN - when(TEST_NAME); + when(); assignAccountToUser(USER_JACK_OID, RESOURCE_DUMMY_BLUE_OID, null, task, result); // THEN - then(TEST_NAME); + then(); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1274,18 +1231,17 @@ public void test300AddAndAssignRelative() throws Exception { @Test public void test310AddedAccountAndUnassignRelative() throws Exception { - final String TEST_NAME = "test310AddedAccountAndUnassignRelative"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); Task task = getTestTask(); OperationResult result = task.getResult(); // WHEN - when(TEST_NAME); + when(); unassignAccountFromUser(USER_JACK_OID, RESOURCE_DUMMY_BLUE_OID, null, task, result); // THEN - then(TEST_NAME); + then(); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1314,18 +1270,17 @@ public void test310AddedAccountAndUnassignRelative() throws Exception { */ @Test public void test319UnassignDummyRelative() throws Exception { - final String TEST_NAME = "test319UnassignDummyRelative"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); Task task = getTestTask(); OperationResult result = task.getResult(); // WHEN - when(TEST_NAME); + when(); unassignAccountFromUser(USER_JACK_OID, RESOURCE_DUMMY_OID, null, task, result); // THEN - then(TEST_NAME); + then(); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1349,7 +1304,6 @@ public void test319UnassignDummyRelative() throws Exception { */ @Test public void test350AddAccountLavender() throws Exception { - final String TEST_NAME = "test350AddAccountLavender"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); Task task = getTestTask(); @@ -1359,7 +1313,7 @@ public void test350AddAccountLavender() throws Exception { // WHEN try { - when(TEST_NAME); + when(); executeChanges(userDelta, null, task, result); AssertJUnit.fail("Unexpected success"); @@ -1369,7 +1323,7 @@ public void test350AddAccountLavender() throws Exception { } // THEN - then(TEST_NAME); + then(); result.computeStatus(); TestUtil.assertFailure(result); @@ -1379,7 +1333,6 @@ public void test350AddAccountLavender() throws Exception { @Test public void test352AddAccountIvory() throws Exception { - final String TEST_NAME = "test352AddAccountIvory"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); Task task = getTestTask(); @@ -1388,11 +1341,11 @@ public void test352AddAccountIvory() throws Exception { ObjectDelta userDelta = createModifyUserAddDummyAccount(USER_JACK_OID, RESOURCE_DUMMY_IVORY_NAME); // WHEN - when(TEST_NAME); + when(); executeChanges(userDelta, null, task, result); // THEN - then(TEST_NAME); + then(); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1402,7 +1355,6 @@ public void test352AddAccountIvory() throws Exception { @Test public void test354AddAccountBeige() throws Exception { - final String TEST_NAME = "test354AddAccountBeige"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); Task task = getTestTask(); @@ -1411,11 +1363,11 @@ public void test354AddAccountBeige() throws Exception { ObjectDelta userDelta = createModifyUserAddDummyAccount(USER_JACK_OID, RESOURCE_DUMMY_BEIGE_NAME); // WHEN - when(TEST_NAME); + when(); executeChanges(userDelta, null, task, result); // THEN - then(TEST_NAME); + then(); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1425,7 +1377,6 @@ public void test354AddAccountBeige() throws Exception { @Test public void test360AddAccountDummy() throws Exception { - final String TEST_NAME = "test360AddAccountDummy"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); Task task = getTestTask(); @@ -1434,11 +1385,11 @@ public void test360AddAccountDummy() throws Exception { ObjectDelta userDelta = createModifyUserAddAccount(USER_JACK_OID, getDummyResourceObject()); // WHEN - when(TEST_NAME); + when(); executeChanges(userDelta, null, task, result); // THEN - then(TEST_NAME); + then(); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1451,7 +1402,6 @@ public void test360AddAccountDummy() throws Exception { */ @Test public void test362AddAccountLavender() throws Exception { - final String TEST_NAME = "test362AddAccountLavender"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); Task task = getTestTask(); @@ -1460,11 +1410,11 @@ public void test362AddAccountLavender() throws Exception { ObjectDelta userDelta = createModifyUserAddDummyAccount(USER_JACK_OID, RESOURCE_DUMMY_LAVENDER_NAME); // WHEN - when(TEST_NAME); + when(); executeChanges(userDelta, null, task, result); // THEN - then(TEST_NAME); + then(); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1477,7 +1427,6 @@ public void test362AddAccountLavender() throws Exception { */ @Test public void test370DeleteAccountDummy() throws Exception { - final String TEST_NAME = "test370DeleteAccountDummy"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); Task task = getTestTask(); @@ -1487,7 +1436,7 @@ public void test370DeleteAccountDummy() throws Exception { // WHEN try { - when(TEST_NAME); + when(); executeChanges(userDelta, null, task, result); AssertJUnit.fail("Unexpected success"); @@ -1497,7 +1446,7 @@ public void test370DeleteAccountDummy() throws Exception { } // THEN - then(TEST_NAME); + then(); result.computeStatus(); TestUtil.assertFailure(result); @@ -1513,7 +1462,6 @@ public void test370DeleteAccountDummy() throws Exception { */ @Test public void test372UnlinkAccountDummy() throws Exception { - final String TEST_NAME = "test372UnlinkAccountDummy"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); Task task = getTestTask(); @@ -1523,7 +1471,7 @@ public void test372UnlinkAccountDummy() throws Exception { // WHEN try { - when(TEST_NAME); + when(); executeChanges(userDelta, null, task, result); AssertJUnit.fail("Unexpected success"); @@ -1533,7 +1481,7 @@ public void test372UnlinkAccountDummy() throws Exception { } // THEN - then(TEST_NAME); + then(); assertFailure(result); PrismObject user = getUser(USER_JACK_OID); @@ -1545,7 +1493,6 @@ public void test372UnlinkAccountDummy() throws Exception { @Test public void test374DeleteAccountLavender() throws Exception { - final String TEST_NAME = "test374DeleteAccountLavender"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); Task task = getTestTask(); @@ -1553,11 +1500,11 @@ public void test374DeleteAccountLavender() throws Exception { ObjectDelta userDelta = createModifyUserDeleteDummyAccount(USER_JACK_OID, RESOURCE_DUMMY_LAVENDER_NAME); - when(TEST_NAME); + when(); executeChanges(userDelta, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject user = getUser(USER_JACK_OID); @@ -1573,7 +1520,6 @@ public void test374DeleteAccountLavender() throws Exception { */ @Test public void test376DeleteAccountDummy() throws Exception { - final String TEST_NAME = "test376DeleteAccountDummy"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); Task task = getTestTask(); @@ -1581,11 +1527,11 @@ public void test376DeleteAccountDummy() throws Exception { ObjectDelta userDelta = createModifyUserDeleteAccount(USER_JACK_OID, getDummyResourceObject()); - when(TEST_NAME); + when(); executeChanges(userDelta, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertNoDummyAccount(RESOURCE_DUMMY_LAVENDER_NAME, ACCOUNT_JACK_DUMMY_USERNAME); @@ -1598,7 +1544,6 @@ public void test376DeleteAccountDummy() throws Exception { */ @Test public void test378DeleteAccountBeige() throws Exception { - final String TEST_NAME = "test378DeleteAccountBeige"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); Task task = getTestTask(); @@ -1606,11 +1551,11 @@ public void test378DeleteAccountBeige() throws Exception { ObjectDelta userDelta = createModifyUserDeleteDummyAccount(USER_JACK_OID, RESOURCE_DUMMY_BEIGE_NAME); - when(TEST_NAME); + when(); executeChanges(userDelta, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertNoDummyAccount(RESOURCE_DUMMY_LAVENDER_NAME, ACCOUNT_JACK_DUMMY_USERNAME); @@ -1624,7 +1569,6 @@ public void test378DeleteAccountBeige() throws Exception { */ @Test public void test379DeleteAccountIvory() throws Exception { - final String TEST_NAME = "test379DeleteAccountIvory"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); Task task = getTestTask(); @@ -1632,11 +1576,11 @@ public void test379DeleteAccountIvory() throws Exception { ObjectDelta userDelta = createModifyUserDeleteDummyAccount(USER_JACK_OID, RESOURCE_DUMMY_IVORY_NAME); - when(TEST_NAME); + when(); executeChanges(userDelta, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertNoDummyAccount(RESOURCE_DUMMY_LAVENDER_NAME, ACCOUNT_JACK_DUMMY_USERNAME); @@ -1651,7 +1595,6 @@ public void test379DeleteAccountIvory() throws Exception { */ @Test public void test380AddAccountPeru() throws Exception { - final String TEST_NAME = "test380AddAccountPeru"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); getDummyResource().resetBreakMode(); @@ -1664,11 +1607,11 @@ public void test380AddAccountPeru() throws Exception { ObjectDelta userDelta = createModifyUserAddDummyAccount(USER_JACK_OID, RESOURCE_DUMMY_PERU_NAME); // WHEN - when(TEST_NAME); + when(); executeChanges(userDelta, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertDummyAccount(RESOURCE_DUMMY_PERU_NAME, ACCOUNT_JACK_DUMMY_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, true); @@ -1677,7 +1620,6 @@ public void test380AddAccountPeru() throws Exception { @Test public void test382AddAccountYellow() throws Exception { - final String TEST_NAME = "test382AddAccountYellow"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); Task task = getTestTask(); @@ -1686,11 +1628,11 @@ public void test382AddAccountYellow() throws Exception { ObjectDelta userDelta = createModifyUserAddDummyAccount(USER_JACK_OID, RESOURCE_DUMMY_YELLOW_NAME); // WHEN - when(TEST_NAME); + when(); executeChanges(userDelta, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userJack = getUser(USER_JACK_OID); @@ -1712,10 +1654,8 @@ public void test382AddAccountYellow() throws Exception { */ @Test public void test385ModifyUserJackPasswordA() throws Exception { - final String TEST_NAME = "test385ModifyUserJackPasswordA"; - // GIVEN - Task task = taskManager.createTaskInstance(AbstractPasswordTest.class.getName() + "." + TEST_NAME); + Task task = getTestTask(); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -1744,7 +1684,6 @@ public void test385ModifyUserJackPasswordA() throws Exception { @Test public void test389DeleteAccountPeru() throws Exception { - final String TEST_NAME = "test389DeleteAccountPeru"; assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); Task task = getTestTask(); @@ -1752,11 +1691,11 @@ public void test389DeleteAccountPeru() throws Exception { ObjectDelta userDelta = createModifyUserDeleteDummyAccount(USER_JACK_OID, RESOURCE_DUMMY_PERU_NAME); - when(TEST_NAME); + when(); executeChanges(userDelta, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertNoDummyAccount(RESOURCE_DUMMY_PERU_NAME, ACCOUNT_JACK_DUMMY_USERNAME); @@ -1770,8 +1709,6 @@ public void test389DeleteAccountPeru() throws Exception { @Test public void test400DavidAndGoliathAssignRole() throws Exception { - final String TEST_NAME = "test400DavidAndGoliathAssignRole"; - // GIVEN assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); @@ -1785,11 +1722,11 @@ public void test400DavidAndGoliathAssignRole() throws Exception { dummyAuditService.clear(); // WHEN - when(TEST_NAME); + when(); assignRole(userBefore.getOid(), ROLE_FIGHT_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertDavidGoliath(userBefore.getOid(), "stone", USER_WORLD_NAME, true, true, true); @@ -1855,8 +1792,6 @@ private void assertDavidGoliath(String userOid, String ou, String name, boolean @Test public void test401DavidAndGoliathModifyOu() throws Exception { - final String TEST_NAME = "test401DavidAndGoliathModifyOu"; - // GIVEN assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); @@ -1867,11 +1802,11 @@ public void test401DavidAndGoliathModifyOu() throws Exception { dummyAuditService.clear(); // WHEN - when(TEST_NAME); + when(); modifyUserReplace(userBefore.getOid(), UserType.F_ORGANIZATIONAL_UNIT, task, result, PrismTestUtil.createPolyString("rock")); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertDavidGoliath(userBefore.getOid(), "rock", USER_WORLD_NAME, true, true, true); @@ -1901,8 +1836,6 @@ public void test401DavidAndGoliathModifyOu() throws Exception { @Test public void test403DavidAndGoliathDisableUser() throws Exception { - final String TEST_NAME = "test403DavidAndGoliathDisableUser"; - // GIVEN assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); @@ -1914,11 +1847,11 @@ public void test403DavidAndGoliathDisableUser() throws Exception { dummyAuditService.clear(); // WHEN - when(TEST_NAME); + when(); modifyUserReplace(userBefore.getOid(), ACTIVATION_ADMINISTRATIVE_STATUS_PATH, task, result, ActivationStatusType.DISABLED); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertDavidGoliath(userBefore.getOid(), "rock", USER_WORLD_NAME, false, false, false); @@ -1939,8 +1872,6 @@ public void test403DavidAndGoliathDisableUser() throws Exception { @Test public void test404DavidAndGoliathEnableUser() throws Exception { - final String TEST_NAME = "test404DavidAndGoliathEnableUser"; - // GIVEN assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); @@ -1951,11 +1882,11 @@ public void test404DavidAndGoliathEnableUser() throws Exception { dummyAuditService.clear(); // WHEN - when(TEST_NAME); + when(); modifyUserReplace(userBefore.getOid(), ACTIVATION_ADMINISTRATIVE_STATUS_PATH, task, result, ActivationStatusType.ENABLED); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertDavidGoliath(userBefore.getOid(), "rock", USER_WORLD_NAME, true, true, true); @@ -1976,8 +1907,6 @@ public void test404DavidAndGoliathEnableUser() throws Exception { @Test public void test405DavidAndGoliathDisableAccountDavid() throws Exception { - final String TEST_NAME = "test405DavidAndGoliathDisableAccountDavid"; - // GIVEN assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); @@ -1990,11 +1919,11 @@ public void test405DavidAndGoliathDisableAccountDavid() throws Exception { dummyAuditService.clear(); // WHEN - when(TEST_NAME); + when(); modifyAccountShadowReplace(accountDavidOid, ACTIVATION_ADMINISTRATIVE_STATUS_PATH, task, result, ActivationStatusType.DISABLED); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertDavidGoliath(userBefore.getOid(), "rock", USER_WORLD_NAME, true, false, true); @@ -2015,8 +1944,6 @@ public void test405DavidAndGoliathDisableAccountDavid() throws Exception { */ @Test public void test406DavidAndGoliathRecompute() throws Exception { - final String TEST_NAME = "test406DavidAndGoliathRecompute"; - // GIVEN assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); @@ -2028,11 +1955,11 @@ public void test406DavidAndGoliathRecompute() throws Exception { dummyAuditService.clear(); // WHEN - when(TEST_NAME); + when(); recomputeUser(userBefore.getOid(), task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertDavidGoliath(userBefore.getOid(), "rock", USER_WORLD_NAME, true, false, true); @@ -2044,8 +1971,6 @@ public void test406DavidAndGoliathRecompute() throws Exception { @Test public void test408DavidAndGoliathEnableAccountDavid() throws Exception { - final String TEST_NAME = "test408DavidAndGoliathEnableAccountDavid"; - // GIVEN assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); @@ -2058,11 +1983,11 @@ public void test408DavidAndGoliathEnableAccountDavid() throws Exception { dummyAuditService.clear(); // WHEN - when(TEST_NAME); + when(); modifyAccountShadowReplace(accountDavidOid, ACTIVATION_ADMINISTRATIVE_STATUS_PATH, task, result, ActivationStatusType.ENABLED); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertDavidGoliath(userBefore.getOid(), "rock", USER_WORLD_NAME, true, true, true); @@ -2080,8 +2005,6 @@ public void test408DavidAndGoliathEnableAccountDavid() throws Exception { @Test public void test410DavidAndGoliathRename() throws Exception { - final String TEST_NAME = "test410DavidAndGoliathRename"; - // GIVEN assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); @@ -2092,11 +2015,11 @@ public void test410DavidAndGoliathRename() throws Exception { dummyAuditService.clear(); // WHEN - when(TEST_NAME); + when(); modifyUserReplace(userBefore.getOid(), UserType.F_NAME, task, result, PrismTestUtil.createPolyString(USER_FIELD_NAME)); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertDavidGoliath(userBefore.getOid(), "rock", USER_FIELD_NAME, true, true, true); @@ -2126,8 +2049,6 @@ public void test410DavidAndGoliathRename() throws Exception { @Test public void test419DavidAndGoliathUnassignRole() throws Exception { - final String TEST_NAME = "test419DavidAndGoliathUnassignRole"; - // GIVEN assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); @@ -2138,11 +2059,11 @@ public void test419DavidAndGoliathUnassignRole() throws Exception { dummyAuditService.clear(); // WHEN - when(TEST_NAME); + when(); unassignRole(userBefore.getOid(), ROLE_FIGHT_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result, 2); assertUserAfter(userBefore.getOid()) @@ -2169,8 +2090,6 @@ public void test419DavidAndGoliathUnassignRole() throws Exception { @Test public void test420DavidAndGoliathAssignRoleGoliathDown() throws Exception { - final String TEST_NAME = "test420DavidAndGoliathAssignRoleGoliathDown"; - // GIVEN assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); @@ -2196,11 +2115,11 @@ public void test420DavidAndGoliathAssignRoleGoliathDown() throws Exception { dummyAuditService.clear(); // WHEN - when(TEST_NAME); + when(); assignRole(userBefore.getOid(), ROLE_FIGHT_OID, task, result); // THEN - then(TEST_NAME); + then(); result.computeStatus(); // explicitly recompute status here. It was computed before. // Inner errors are expected - but those should be pending on retry assertInProgress(result); @@ -2247,8 +2166,6 @@ public void test420DavidAndGoliathAssignRoleGoliathDown() throws Exception { */ @Test public void test421DavidAndGoliathAssignRoleGoliathUpRecompute() throws Exception { - final String TEST_NAME = "test421DavidAndGoliathAssignRoleGoliathUpRecompute"; - // GIVEN assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); getDummyResource(RESOURCE_DUMMY_GOLIATH_NAME).resetBreakMode(); @@ -2263,7 +2180,7 @@ public void test421DavidAndGoliathAssignRoleGoliathUpRecompute() throws Exceptio recomputeUser(userBefore.getOid(), task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertUserAfter(userBefore.getOid()) @@ -2301,8 +2218,6 @@ public void test421DavidAndGoliathAssignRoleGoliathUpRecompute() throws Exceptio */ @Test public void test422DavidAndGoliathAssignRoleGoliathUpRecompute() throws Exception { - final String TEST_NAME = "test422DavidAndGoliathAssignRoleGoliathUpRecompute"; - // GIVEN assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); getDummyResource(RESOURCE_DUMMY_GOLIATH_NAME).resetBreakMode(); @@ -2319,7 +2234,7 @@ public void test422DavidAndGoliathAssignRoleGoliathUpRecompute() throws Exceptio recomputeUser(userBefore.getOid(), task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertUserAfter(userBefore.getOid()) @@ -2354,8 +2269,6 @@ public void test422DavidAndGoliathAssignRoleGoliathUpRecompute() throws Exceptio */ @Test public void test423DavidAndGoliathAssignRoleGoliathUpReconcile() throws Exception { - final String TEST_NAME = "test423DavidAndGoliathAssignRoleGoliathUpReconcile"; - // GIVEN assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); getDummyResource(RESOURCE_DUMMY_GOLIATH_NAME).resetBreakMode(); @@ -2370,7 +2283,7 @@ public void test423DavidAndGoliathAssignRoleGoliathUpReconcile() throws Exceptio reconcileUser(userBefore.getOid(), task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertDavidGoliath(userBefore.getOid(), "rock", USER_FIELD_NAME, true, true, true); @@ -2383,8 +2296,6 @@ public void test423DavidAndGoliathAssignRoleGoliathUpReconcile() throws Exceptio @Test public void test428DavidAndGoliathUnassignRole() throws Exception { - final String TEST_NAME = "test428DavidAndGoliathUnassignRole"; - // GIVEN assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); getDummyResource(RESOURCE_DUMMY_GOLIATH_NAME).resetBreakMode(); @@ -2396,11 +2307,11 @@ public void test428DavidAndGoliathUnassignRole() throws Exception { PrismObject userBefore = findUserByUsername(USER_FIELD_NAME); // WHEN - when(TEST_NAME); + when(); unassignRole(userBefore.getOid(), ROLE_FIGHT_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); deadShadowOid = assertUserAfter(userBefore.getOid()) @@ -2434,8 +2345,6 @@ public void test428DavidAndGoliathUnassignRole() throws Exception { */ @Test public void test429ExpireDeadShadow() throws Exception { - final String TEST_NAME = "test429ExpireDeadShadow"; - // GIVEN assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); getDummyResource(RESOURCE_DUMMY_DAVID_NAME).resetBreakMode(); @@ -2450,11 +2359,11 @@ public void test429ExpireDeadShadow() throws Exception { OperationResult result = task.getResult(); // WHEN - when(TEST_NAME); + when(); reconcileUser(userBefore.getOid(), task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); assertUserAfter(userBefore.getOid()) @@ -2470,8 +2379,6 @@ public void test429ExpireDeadShadow() throws Exception { @Test public void test430DavidAndGoliathAssignRoleDavidDown() throws Exception { - final String TEST_NAME = "test430DavidAndGoliathAssignRoleDavidDown"; - // GIVEN assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); @@ -2495,11 +2402,11 @@ public void test430DavidAndGoliathAssignRoleDavidDown() throws Exception { dummyAuditService.clear(); // WHEN - when(TEST_NAME); + when(); assignRole(userBefore.getOid(), ROLE_FIGHT_OID, task, result); // THEN - then(TEST_NAME); + then(); // assertInProgress(result); assertUserAfter(userBefore.getOid()) @@ -2527,15 +2434,11 @@ public void test430DavidAndGoliathAssignRoleDavidDown() throws Exception { dummyAuditService.assertHasDelta(0,ChangeType.ADD, ShadowType.class); dummyAuditService.assertExecutionDeltas(1,1); dummyAuditService.assertHasDelta(1,ChangeType.MODIFY, UserType.class); -// dummyAuditService.assertExecutionDeltas(2,1); -// dummyAuditService.asserHasDelta(2,ChangeType.MODIFY, UserType.class); } @Test public void test440DavidAndGoliathAssignRoleAndCreateUserInOneStep() throws Exception { - final String TEST_NAME = "test440DavidAndGoliathAssignRoleAndCreateUserInOneStep"; - getDummyResource(RESOURCE_DUMMY_GOLIATH_NAME).resetBreakMode(); getDummyResource(RESOURCE_DUMMY_DAVID_NAME).resetBreakMode(); Task task = getTestTask(); @@ -2546,16 +2449,16 @@ public void test440DavidAndGoliathAssignRoleAndCreateUserInOneStep() throws Exce AssertJUnit.assertNotNull("User must not be null.", userWorld); - ObjectDelta delta = prismContext.deltaFactory().object().createDeleteDelta(UserType.class, userWorld.getOid() - ); + ObjectDelta delta = prismContext.deltaFactory().object() + .createDeleteDelta(UserType.class, userWorld.getOid()); Collection> deltas = new ArrayList<>(); deltas.add(delta); modelService.executeChanges(deltas, null, task, result); OperationResult deleteResult = new OperationResult("Check if user was deleted properly."); try { - repositoryService.getObject(UserType.class, userWorld.getOid(), null, deleteResult); - } catch (ObjectNotFoundException ex){ + repositoryService.getObject(UserType.class, userWorld.getOid(), null, deleteResult); + } catch (ObjectNotFoundException ex) { //this is OK, we deleted user before } @@ -2573,53 +2476,23 @@ public void test440DavidAndGoliathAssignRoleAndCreateUserInOneStep() throws Exce targetRef.getValue().setTargetType(RoleType.COMPLEX_TYPE); userBefore.findOrCreateContainer(UserType.F_ASSIGNMENT).add((PrismContainerValue) cval); - - -// userBefore.asObjectable().getAssignmentNew().add(cval.asContainerable()); - // this should add user and at the sate time assign the role fight..-> // the result of the operation have to be the same as in test 400 addObject(userBefore); dummyAuditService.clear(); - // WHEN - when(TEST_NAME); -// assignRole(userBefore.getOid(), ROLE_FIGHT_OID, task, result); - - // THEN - then(TEST_NAME); + expect(); assertSuccess(result); assertDavidGoliath(userBefore.getOid(), "stone", USER_WORLD_NAME, true, true, true); // Check audit display("Audit", dummyAuditService); -// dummyAuditService.assertRecords(4); -// dummyAuditService.assertSimpleRecordSanity(); -// dummyAuditService.assertAnyRequestDeltas(); -// dummyAuditService.assertExecutionDeltas(0,3); -// dummyAuditService.asserHasDelta(0,ChangeType.MODIFY, UserType.class); -// dummyAuditService.asserHasDelta(0,ChangeType.ADD, ShadowType.class); -// dummyAuditService.assertExecutionDeltas(1,3); -// dummyAuditService.asserHasDelta(1,ChangeType.MODIFY, UserType.class); -// dummyAuditService.asserHasDelta(1,ChangeType.ADD, ShadowType.class); -// dummyAuditService.assertExecutionDeltas(2,2); -// dummyAuditService.asserHasDelta(2,ChangeType.MODIFY, UserType.class); -// dummyAuditService.asserHasDelta(2,ChangeType.MODIFY, ShadowType.class); -// dummyAuditService.assertExecutionSuccess(); -// -// // Have a closer look at the last shadow modify delta. Make sure there are no phantom changes. -// ObjectDeltaOperation executionDeltaOp = dummyAuditService.getExecutionDelta(2, ChangeType.MODIFY, ShadowType.class); -// ObjectDelta executionDelta = executionDeltaOp.getObjectDelta(); -// display("Last execution delta", executionDelta); -// PrismAsserts.assertModifications("Phantom changes in last delta:", executionDelta, 2); } @Test public void test500PrepareJack() throws Exception { - final String TEST_NAME = "test500PrepareJack"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -2634,11 +2507,11 @@ public void test500PrepareJack() throws Exception { assertLinks(userBefore, 1); // WHEN - when(TEST_NAME); + when(); deleteUserAccount(USER_JACK_OID, RESOURCE_DUMMY_YELLOW_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -2653,8 +2526,6 @@ public void test500PrepareJack() throws Exception { @Test public void test501JackAssignDummyDarkYellow() throws Exception { - final String TEST_NAME = "test501JackAssignDummyDarkYellow"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -2666,11 +2537,11 @@ public void test501JackAssignDummyDarkYellow() throws Exception { assertLinks(userBefore, 0); // WHEN - when(TEST_NAME); + when(); assignAccountToUser(USER_JACK_OID, RESOURCE_DUMMY_DARK_YELLOW_OID, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -2683,8 +2554,6 @@ public void test501JackAssignDummyDarkYellow() throws Exception { @Test public void test502JackAssignDummyDarkPeru() throws Exception { - final String TEST_NAME = "test502JackAssignDummyDarkPeru"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -2693,11 +2562,11 @@ public void test502JackAssignDummyDarkPeru() throws Exception { display("User before", userBefore); // WHEN - when(TEST_NAME); + when(); assignAccountToUser(USER_JACK_OID, RESOURCE_DUMMY_DARK_PERU_OID, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -2714,8 +2583,6 @@ public void test502JackAssignDummyDarkPeru() throws Exception { */ @Test public void test504JackUnassignDummyDarkPeru() throws Exception { - final String TEST_NAME = "test504JackUnassignDummyDarkPeru"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -2724,11 +2591,11 @@ public void test504JackUnassignDummyDarkPeru() throws Exception { display("User before", userBefore); // WHEN - when(TEST_NAME); + when(); unassignAccountFromUser(USER_JACK_OID, RESOURCE_DUMMY_DARK_PERU_OID, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -2742,8 +2609,6 @@ public void test504JackUnassignDummyDarkPeru() throws Exception { @Test public void test507JackUnassignDummyDarkYellow() throws Exception { - final String TEST_NAME = "test507JackUnassignDummyDarkYellow"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -2752,11 +2617,11 @@ public void test507JackUnassignDummyDarkYellow() throws Exception { display("User before", userBefore); // WHEN - when(TEST_NAME); + when(); unassignAccountFromUser(USER_JACK_OID, RESOURCE_DUMMY_DARK_YELLOW_OID, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -2770,8 +2635,6 @@ public void test507JackUnassignDummyDarkYellow() throws Exception { @Test public void test508JackDeleteDummyDarkYellowAccount() throws Exception { - final String TEST_NAME = "test508JackDeleteDummyDarkYellowAccount"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -2780,11 +2643,11 @@ public void test508JackDeleteDummyDarkYellowAccount() throws Exception { display("User before", userBefore); // WHEN - when(TEST_NAME); + when(); deleteUserAccount(USER_JACK_OID, RESOURCE_DUMMY_DARK_YELLOW_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -2798,8 +2661,6 @@ public void test508JackDeleteDummyDarkYellowAccount() throws Exception { @Test public void test509JackDeleteDummyDarkPeruAccount() throws Exception { - final String TEST_NAME = "test509JackDeleteDummyDarkPeruAccount"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -2808,11 +2669,11 @@ public void test509JackDeleteDummyDarkPeruAccount() throws Exception { display("User before", userBefore); // WHEN - when(TEST_NAME); + when(); deleteUserAccount(USER_JACK_OID, RESOURCE_DUMMY_DARK_PERU_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -2826,8 +2687,6 @@ public void test509JackDeleteDummyDarkPeruAccount() throws Exception { @Test public void test510JackAssignRoleDarkYellowPeru() throws Exception { - final String TEST_NAME = "test510JackAssignRoleDarkYellowPeru"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -2841,11 +2700,11 @@ public void test510JackAssignRoleDarkYellowPeru() throws Exception { assertAssignments(userBefore, 0); // WHEN - when(TEST_NAME); + when(); assignRole(USER_JACK_OID, ROLE_DARK_YELLOW_PERU_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -2862,8 +2721,6 @@ public void test510JackAssignRoleDarkYellowPeru() throws Exception { */ @Test public void test519JackUnassignDarkRoleYellowPeru() throws Exception { - final String TEST_NAME = "test519JackUnassignDarkRoleYellowPeru"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -2872,11 +2729,11 @@ public void test519JackUnassignDarkRoleYellowPeru() throws Exception { display("User before", userBefore); // WHEN - when(TEST_NAME); + when(); unassignRole(USER_JACK_OID, ROLE_DARK_YELLOW_PERU_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -2890,8 +2747,6 @@ public void test519JackUnassignDarkRoleYellowPeru() throws Exception { @Test public void test520JackAssignRoleDarkYellowPeru() throws Exception { - final String TEST_NAME = "test520JackAssignRoleDarkYellowPeru"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -2905,11 +2760,11 @@ public void test520JackAssignRoleDarkYellowPeru() throws Exception { assertAssignments(userBefore, 0); // WHEN - when(TEST_NAME); + when(); assignRole(USER_JACK_OID, ROLE_DARK_YELLOW_PERU_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -2926,8 +2781,6 @@ public void test520JackAssignRoleDarkYellowPeru() throws Exception { */ @Test public void test529JackUnassignRoleDarkYellowPeru() throws Exception { - final String TEST_NAME = "test529JackUnassignRoleDarkYellowPeru"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -2937,11 +2790,11 @@ public void test529JackUnassignRoleDarkYellowPeru() throws Exception { AssignmentType currentAssignment = findAssignmentByTargetRequired(userBefore, ROLE_DARK_YELLOW_PERU_OID); // WHEN - when(TEST_NAME); + when(); unassign(UserType.class, USER_JACK_OID, currentAssignment.getId(), task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -2952,5 +2805,4 @@ public void test529JackUnassignRoleDarkYellowPeru() throws Exception { assertDummyAccount(RESOURCE_DUMMY_DARK_YELLOW_NAME, ACCOUNT_JACK_DUMMY_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, false); assertDummyAccount(RESOURCE_DUMMY_DARK_PERU_NAME, ACCOUNT_JACK_DUMMY_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, false); } - } diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java index cc860a3a5b1..f6084f01349 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java @@ -11,17 +11,8 @@ import java.io.File; import java.util.Collection; import java.util.List; - import javax.xml.datatype.XMLGregorianCalendar; -import com.evolveum.midpoint.prism.path.ItemPath; -import com.evolveum.midpoint.test.DummyResourceContoller; -import com.evolveum.midpoint.test.IntegrationTestTools; -import com.evolveum.midpoint.test.util.MidPointTestConstants; -import com.evolveum.midpoint.util.exception.*; -import com.evolveum.midpoint.xml.ns._public.common.common_3.*; -import com.evolveum.prism.xml.ns._public.types_3.ProtectedStringType; - import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ContextConfiguration; @@ -35,6 +26,7 @@ import com.evolveum.midpoint.prism.PrismObject; import com.evolveum.midpoint.prism.PrismReferenceValue; import com.evolveum.midpoint.prism.delta.ObjectDelta; +import com.evolveum.midpoint.prism.path.ItemPath; import com.evolveum.midpoint.prism.util.PrismAsserts; import com.evolveum.midpoint.prism.util.PrismTestUtil; import com.evolveum.midpoint.prism.xml.XmlTypeConverter; @@ -46,13 +38,18 @@ import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.schema.util.MiscSchemaUtil; import com.evolveum.midpoint.task.api.Task; +import com.evolveum.midpoint.test.DummyResourceContoller; +import com.evolveum.midpoint.test.IntegrationTestTools; +import com.evolveum.midpoint.test.util.MidPointTestConstants; import com.evolveum.midpoint.test.util.TestUtil; +import com.evolveum.midpoint.util.exception.*; +import com.evolveum.midpoint.xml.ns._public.common.common_3.*; +import com.evolveum.prism.xml.ns._public.types_3.ProtectedStringType; /** * @author semancik - * */ -@ContextConfiguration(locations = {"classpath:ctx-model-intest-test-main.xml"}) +@ContextConfiguration(locations = { "classpath:ctx-model-intest-test-main.xml" }) @DirtiesContext(classMode = ClassMode.AFTER_CLASS) public abstract class AbstractPasswordTest extends AbstractInitializedModelIntegrationTest { @@ -161,12 +158,11 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti @Test public void test000Sanity() throws Exception { - final String TEST_NAME = "test000Sanity"; - AccountActivationNotifierType accountActivationNotifier = null; - SystemConfigurationType systemConfig = getObject(SystemConfigurationType.class, SystemObjectsType.SYSTEM_CONFIGURATION.value()).asObjectable(); + SystemConfigurationType systemConfig = getObject(SystemConfigurationType.class, + SystemObjectsType.SYSTEM_CONFIGURATION.value()).asObjectable(); IntegrationTestTools.displayXml("system config", systemConfig.asPrismObject()); - for (EventHandlerType handler: systemConfig.getNotificationConfiguration().getHandler()) { + for (EventHandlerType handler : systemConfig.getNotificationConfiguration().getHandler()) { display("Handler: ", handler); List accountActivationNotifiers = handler.getAccountActivationNotifier(); if (!accountActivationNotifiers.isEmpty()) { @@ -180,8 +176,6 @@ public void test000Sanity() throws Exception { @Test public void test010AddPasswordPolicy() throws Exception { - final String TEST_NAME = "test010AddPasswordPolicy"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -202,8 +196,6 @@ public void test010AddPasswordPolicy() throws Exception { @Test public void test012AddSecurityPolicy() throws Exception { - final String TEST_NAME = "test012AddSecurityPolicy"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -224,15 +216,10 @@ public void test012AddSecurityPolicy() throws Exception { @Test public void test050CheckJackPassword() throws Exception { - final String TEST_NAME = "test050CheckJackPassword"; - // GIVEN, WHEN // this happens during test initialization when user-jack.xml is added // THEN - Task task = getTestTask(); - OperationResult result = task.getResult(); - PrismObject userJack = getUser(USER_JACK_OID); display("User after change execution", userJack); assertUserJack(userJack, "Jack Sparrow"); @@ -241,11 +228,8 @@ public void test050CheckJackPassword() throws Exception { assertUserPassword(userJack, USER_JACK_PASSWORD, CredentialsStorageTypeType.ENCRYPTION); } - @Test public void test051ModifyUserJackPassword() throws Exception { - final String TEST_NAME = "test051ModifyUserJackPassword"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -254,11 +238,11 @@ public void test051ModifyUserJackPassword() throws Exception { XMLGregorianCalendar startCal = clock.currentTimeXMLGregorianCalendar(); // WHEN - when(TEST_NAME); + when(); modifyUserChangePassword(USER_JACK_OID, USER_PASSWORD_1_CLEAR, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); XMLGregorianCalendar endCal = clock.currentTimeXMLGregorianCalendar(); @@ -277,8 +261,6 @@ public void test051ModifyUserJackPassword() throws Exception { @Test public void test060CheckJackPasswordModelInteraction() throws Exception { - final String TEST_NAME = "test060CheckJackPasswordModelInteraction"; - if (getPasswordStorageType() == CredentialsStorageTypeType.NONE) { // Nothing to check in this case return; @@ -311,8 +293,6 @@ public void test060CheckJackPasswordModelInteraction() throws Exception { @Test public void test070AddUserHerman() throws Exception { - final String TEST_NAME = "test070AddUserHerman"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -321,11 +301,11 @@ public void test070AddUserHerman() throws Exception { XMLGregorianCalendar startCal = clock.currentTimeXMLGregorianCalendar(); // WHEN - when(TEST_NAME); + when(); addObject(USER_HERMAN_FILE, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); XMLGregorianCalendar endCal = clock.currentTimeXMLGregorianCalendar(); @@ -345,8 +325,6 @@ public void test070AddUserHerman() throws Exception { @Test public void test100JackAssignAccountDummy() throws Exception { - final String TEST_NAME = "test100JackAssignAccountDummy"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -355,11 +333,11 @@ public void test100JackAssignAccountDummy() throws Exception { XMLGregorianCalendar startCal = clock.currentTimeXMLGregorianCalendar(); // WHEN - when(TEST_NAME); + when(); assignAccountToUser(USER_JACK_OID, RESOURCE_DUMMY_OID, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); XMLGregorianCalendar endCal = clock.currentTimeXMLGregorianCalendar(); @@ -398,8 +376,6 @@ public void test100JackAssignAccountDummy() throws Exception { */ @Test public void test110ModifyUserJackPassword() throws Exception { - final String TEST_NAME = "test110ModifyUserJackPassword"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -447,8 +423,6 @@ public void test110ModifyUserJackPassword() throws Exception { */ @Test public void test111ModifyAccountJackPassword() throws Exception { - final String TEST_NAME = "test111ModifyAccountJackPassword"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -482,8 +456,6 @@ public void test111ModifyAccountJackPassword() throws Exception { */ @Test public void test112ModifyJackPasswordUserAndAccount() throws Exception { - final String TEST_NAME = "test112ModifyJackPasswordUserAndAccount"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -526,14 +498,11 @@ public void test112ModifyJackPasswordUserAndAccount() throws Exception { assertSingleUserPasswordNotification(USER_JACK_USERNAME, USER_PASSWORD_4_CLEAR); } - /** * Add red and ugly dummy resource to the mix. This would be fun. */ @Test public void test120JackAssignAccountDummyRedAndUgly() throws Exception { - final String TEST_NAME = "test120JackAssignAccountDummyRedAndUgly"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -562,17 +531,17 @@ public void test120JackAssignAccountDummyRedAndUgly() throws Exception { // User and default dummy account should have unchanged passwords assertUserPassword(userJack, USER_PASSWORD_4_CLEAR); - assertDummyPassword(USER_JACK_USERNAME, USER_PASSWORD_5_CLEAR); + assertDummyPassword(USER_JACK_USERNAME, USER_PASSWORD_5_CLEAR); - assertPasswordMetadata(userJack, false, lastPasswordChangeStart, lastPasswordChangeEnd); + assertPasswordMetadata(userJack, false, lastPasswordChangeStart, lastPasswordChangeEnd); - if (isPasswordEncryption()) { - assertAccountPasswordNotifications(2); - assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_JACK_USERNAME, USER_PASSWORD_4_CLEAR); - assertHasAccountPasswordNotification(RESOURCE_DUMMY_UGLY_NAME, USER_JACK_USERNAME, USER_JACK_EMPLOYEE_NUMBER); - } else { - assertSingleAccountPasswordNotification(RESOURCE_DUMMY_UGLY_NAME, USER_JACK_USERNAME, USER_JACK_EMPLOYEE_NUMBER); - } + if (isPasswordEncryption()) { + assertAccountPasswordNotifications(2); + assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_JACK_USERNAME, USER_PASSWORD_4_CLEAR); + assertHasAccountPasswordNotification(RESOURCE_DUMMY_UGLY_NAME, USER_JACK_USERNAME, USER_JACK_EMPLOYEE_NUMBER); + } else { + assertSingleAccountPasswordNotification(RESOURCE_DUMMY_UGLY_NAME, USER_JACK_USERNAME, USER_JACK_EMPLOYEE_NUMBER); + } assertNoUserPasswordNotifications(); } @@ -582,8 +551,6 @@ public void test120JackAssignAccountDummyRedAndUgly() throws Exception { */ @Test public void test121ModifyJackPasswordUserAndAccountRed() throws Exception { - final String TEST_NAME = "test121ModifyJackPasswordUserAndAccountRed"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -632,7 +599,7 @@ public void test121ModifyJackPasswordUserAndAccountRed() throws Exception { displayAccountPasswordNotifications(); assertAccountPasswordNotifications(2); assertHasAccountPasswordNotification(null, USER_JACK_USERNAME, USER_PASSWORD_1_CLEAR); - assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_JACK_USERNAME, USER_PASSWORD_1_CLEAR); + assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_JACK_USERNAME, USER_PASSWORD_1_CLEAR); assertSingleUserPasswordNotification(USER_JACK_USERNAME, USER_PASSWORD_1_CLEAR); } @@ -641,7 +608,6 @@ public void test121ModifyJackPasswordUserAndAccountRed() throws Exception { */ @Test public void test122ModifyAccountUglyJackPasswordBad() throws Exception { - final String TEST_NAME = "test122ModifyAccountUglyJackPasswordBad"; prepareTest(); // GIVEN @@ -650,11 +616,11 @@ public void test122ModifyAccountUglyJackPasswordBad() throws Exception { OperationResult result = task.getResult(); // WHEN - when(TEST_NAME); + when(); modifyAccountChangePassword(accountJackUglyOid, "#badPassword!", task, result); // THEN - then(TEST_NAME); + then(); assertPartialError(result); assertDummyPassword(RESOURCE_DUMMY_UGLY_NAME, ACCOUNT_JACK_DUMMY_USERNAME, USER_JACK_EMPLOYEE_NUMBER); @@ -663,7 +629,6 @@ public void test122ModifyAccountUglyJackPasswordBad() throws Exception { assertNoUserPasswordNotifications(); } - /** * Jack employee number is mapped to ugly resource password. * Change employee number to something that does NOT comply with ugly resource password policy. @@ -671,15 +636,13 @@ public void test122ModifyAccountUglyJackPasswordBad() throws Exception { */ @Test public void test125ModifyJackEmployeeNumberBad() throws Exception { - final String TEST_NAME = "test125ModifyJackEmployeeNumberBad"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); modifyUserReplace(USER_JACK_OID, UserType.F_EMPLOYEE_NUMBER, task, result, USER_JACK_EMPLOYEE_NUMBER_NEW_BAD); @@ -710,8 +673,6 @@ public void test125ModifyJackEmployeeNumberBad() throws Exception { */ @Test public void test128ModifyJackEmployeeNumberGood() throws Exception { - final String TEST_NAME = "test128ModifyJackEmployeeNumberGood"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -747,8 +708,6 @@ public void test128ModifyJackEmployeeNumberGood() throws Exception { */ @Test public void test130JackAssignAccountDummyBlack() throws Exception { - final String TEST_NAME = "test130JackAssignAccountDummyBlack"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -773,7 +732,7 @@ public void test130JackAssignAccountDummyBlack() throws Exception { assertUserPassword(userJack, USER_PASSWORD_1_CLEAR); assertDummyAccount(RESOURCE_DUMMY_RED_NAME, ACCOUNT_JACK_DUMMY_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, true); assertDummyPassword(RESOURCE_DUMMY_RED_NAME, ACCOUNT_JACK_DUMMY_USERNAME, USER_PASSWORD_1_CLEAR); - assertDummyPassword(ACCOUNT_JACK_DUMMY_USERNAME, USER_PASSWORD_1_CLEAR); + assertDummyPassword(ACCOUNT_JACK_DUMMY_USERNAME, USER_PASSWORD_1_CLEAR); assertDummyPassword(RESOURCE_DUMMY_UGLY_NAME, ACCOUNT_JACK_DUMMY_USERNAME, USER_JACK_EMPLOYEE_NUMBER_NEW_GOOD); assertPasswordMetadata(userJack, false, lastPasswordChangeStart, lastPasswordChangeEnd); @@ -789,8 +748,6 @@ public void test130JackAssignAccountDummyBlack() throws Exception { */ @Test public void test132ModifyAccountBlackJackPasswordBad() throws Exception { - final String TEST_NAME = "test132ModifyAccountBlackJackPasswordBad"; - // GIVEN AbstractPasswordTest.class.getName(); Task task = getTestTask(); @@ -798,11 +755,11 @@ public void test132ModifyAccountBlackJackPasswordBad() throws Exception { prepareTest(); // WHEN - when(TEST_NAME); + when(); modifyAccountChangePassword(accountJackBlackOid, USER_PASSWORD_A_CLEAR, task, result); // THEN - then(TEST_NAME); + then(); assertPartialError(result); assertDummyPasswordConditional(RESOURCE_DUMMY_BLACK_NAME, ACCOUNT_JACK_DUMMY_USERNAME, USER_PASSWORD_1_CLEAR); @@ -813,8 +770,6 @@ public void test132ModifyAccountBlackJackPasswordBad() throws Exception { @Test public void test139JackUnassignAccountDummyBlack() throws Exception { - final String TEST_NAME = "test139JackUnassignAccountDummyBlack"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -838,7 +793,7 @@ public void test139JackUnassignAccountDummyBlack() throws Exception { assertUserPassword(userJack, USER_PASSWORD_1_CLEAR); assertDummyAccount(RESOURCE_DUMMY_RED_NAME, ACCOUNT_JACK_DUMMY_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, true); assertDummyPassword(RESOURCE_DUMMY_RED_NAME, ACCOUNT_JACK_DUMMY_USERNAME, USER_PASSWORD_1_CLEAR); - assertDummyPassword(ACCOUNT_JACK_DUMMY_USERNAME, USER_PASSWORD_1_CLEAR); + assertDummyPassword(ACCOUNT_JACK_DUMMY_USERNAME, USER_PASSWORD_1_CLEAR); assertDummyPassword(RESOURCE_DUMMY_UGLY_NAME, ACCOUNT_JACK_DUMMY_USERNAME, USER_JACK_EMPLOYEE_NUMBER_NEW_GOOD); assertPasswordMetadata(userJack, false, lastPasswordChangeStart, lastPasswordChangeEnd); @@ -855,19 +810,17 @@ public void test139JackUnassignAccountDummyBlack() throws Exception { */ @Test public void test140JackAssignAccountDummyYellow() throws Exception { - final String TEST_NAME = "test140JackAssignAccountDummyYellow"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); assignAccountToUser(USER_JACK_OID, RESOURCE_DUMMY_YELLOW_OID, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userJack = getUser(USER_JACK_OID); @@ -884,7 +837,7 @@ public void test140JackAssignAccountDummyYellow() throws Exception { assertUserPassword(userJack, USER_PASSWORD_1_CLEAR); assertDummyAccount(RESOURCE_DUMMY_RED_NAME, ACCOUNT_JACK_DUMMY_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, true); assertDummyPassword(RESOURCE_DUMMY_RED_NAME, ACCOUNT_JACK_DUMMY_USERNAME, USER_PASSWORD_1_CLEAR); - assertDummyPassword(ACCOUNT_JACK_DUMMY_USERNAME, USER_PASSWORD_1_CLEAR); + assertDummyPassword(ACCOUNT_JACK_DUMMY_USERNAME, USER_PASSWORD_1_CLEAR); assertDummyPassword(RESOURCE_DUMMY_UGLY_NAME, ACCOUNT_JACK_DUMMY_USERNAME, USER_JACK_EMPLOYEE_NUMBER_NEW_GOOD); assertPasswordMetadata(userJack, false, lastPasswordChangeStart, lastPasswordChangeEnd); @@ -902,8 +855,6 @@ public void test140JackAssignAccountDummyYellow() throws Exception { */ @Test public void test142ModifyUserJackPasswordAA() throws Exception { - final String TEST_NAME = "test142ModifyUserJackPasswordAA"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -912,11 +863,11 @@ public void test142ModifyUserJackPasswordAA() throws Exception { lastPasswordChangeStart = clock.currentTimeXMLGregorianCalendar(); // WHEN - when(TEST_NAME); + when(); modifyUserChangePassword(USER_JACK_OID, USER_PASSWORD_AA_CLEAR, task, result); // THEN - then(TEST_NAME); + then(); assertPartialError(result); lastPasswordChangeEnd = clock.currentTimeXMLGregorianCalendar(); @@ -935,7 +886,7 @@ public void test142ModifyUserJackPasswordAA() throws Exception { // User and default dummy account should have unchanged passwords assertUserPassword(userJack, USER_PASSWORD_AA_CLEAR); - assertDummyPassword(ACCOUNT_JACK_DUMMY_USERNAME, USER_PASSWORD_AA_CLEAR); + assertDummyPassword(ACCOUNT_JACK_DUMMY_USERNAME, USER_PASSWORD_AA_CLEAR); // this one is not changed assertDummyPassword(RESOURCE_DUMMY_UGLY_NAME, ACCOUNT_JACK_DUMMY_USERNAME, USER_JACK_EMPLOYEE_NUMBER_NEW_GOOD); @@ -946,7 +897,7 @@ public void test142ModifyUserJackPasswordAA() throws Exception { displayUserPasswordNotifications(); assertAccountPasswordNotifications(2); assertHasAccountPasswordNotification(null, USER_JACK_USERNAME, USER_PASSWORD_AA_CLEAR); - assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_JACK_USERNAME, USER_PASSWORD_AA_CLEAR); + assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_JACK_USERNAME, USER_PASSWORD_AA_CLEAR); assertSingleUserPasswordNotification(USER_JACK_USERNAME, USER_PASSWORD_AA_CLEAR); } @@ -957,19 +908,17 @@ public void test142ModifyUserJackPasswordAA() throws Exception { */ @Test public void test150AssignMonkeyDummyAccount() throws Exception { - final String TEST_NAME = "test150AssignMonkeyDummyAccount"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); assignAccountToUser(USER_THREE_HEADED_MONKEY_OID, RESOURCE_DUMMY_OID, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -980,7 +929,6 @@ public void test150AssignMonkeyDummyAccount() throws Exception { assertDummyAccount(null, USER_THREE_HEADED_MONKEY_NAME, USER_THREE_HEADED_MONKEY_FULL_NAME, true); } - /** * Three headed monkey has no credentials. No password, nothing. * Just three heads. @@ -988,8 +936,6 @@ public void test150AssignMonkeyDummyAccount() throws Exception { */ @Test public void test152ModifyUserMonkeyPassword() throws Exception { - final String TEST_NAME = "test152ModifyUserMonkeyPassword"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -998,11 +944,11 @@ public void test152ModifyUserMonkeyPassword() throws Exception { lastPasswordChangeStart = clock.currentTimeXMLGregorianCalendar(); // WHEN - when(TEST_NAME); + when(); modifyUserChangePassword(USER_THREE_HEADED_MONKEY_OID, USER_PASSWORD_1_CLEAR, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); lastPasswordChangeEnd = clock.currentTimeXMLGregorianCalendar(); @@ -1019,19 +965,17 @@ public void test152ModifyUserMonkeyPassword() throws Exception { */ @Test public void test154ModifyUserMonkeyPasswordA() throws Exception { - final String TEST_NAME = "test154ModifyUserMonkeyPasswordA"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); modifyUserChangePassword(USER_THREE_HEADED_MONKEY_OID, USER_PASSWORD_A_CLEAR, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -1042,22 +986,20 @@ public void test154ModifyUserMonkeyPasswordA() throws Exception { @Test public void test200ApplyPasswordPolicyHistoryLength() throws Exception { - final String TEST_NAME = "test200ApplyPasswordPolicyHistoryLength"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); applyPasswordPolicy(PASSWORD_POLICY_GLOBAL_OID, getSecurityPolicyOid(), task, result); modifyObjectReplaceProperty(SecurityPolicyType.class, getSecurityPolicyOid(), ItemPath.create(SecurityPolicyType.F_CREDENTIALS, CredentialsPolicyType.F_PASSWORD, PasswordCredentialsPolicyType.F_HISTORY_LENGTH), task, result, 3); // THEN - then(TEST_NAME); + then(); assertSuccess(result); } @@ -1069,8 +1011,6 @@ public void test200ApplyPasswordPolicyHistoryLength() throws Exception { */ @Test public void test204UnassignAccountRed() throws Exception { - final String TEST_NAME = "test204UnassignAccountRed"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -1086,11 +1026,11 @@ public void test204UnassignAccountRed() throws Exception { .createDeleteDelta(ShadowType.class, accountJackRedOid); // WHEN - when(TEST_NAME); + when(); modelService.executeChanges(MiscSchemaUtil.createCollection(userDelta, shadowDelta), null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -1106,7 +1046,7 @@ public void test204UnassignAccountRed() throws Exception { // User and default dummy account should have unchanged passwords assertUserPassword(userAfter, USER_PASSWORD_AA_CLEAR); - assertDummyPassword(ACCOUNT_JACK_DUMMY_USERNAME, USER_PASSWORD_AA_CLEAR); + assertDummyPassword(ACCOUNT_JACK_DUMMY_USERNAME, USER_PASSWORD_AA_CLEAR); // this one is not changed assertDummyPassword(RESOURCE_DUMMY_UGLY_NAME, ACCOUNT_JACK_DUMMY_USERNAME, USER_JACK_EMPLOYEE_NUMBER_NEW_GOOD); @@ -1124,8 +1064,6 @@ public void test204UnassignAccountRed() throws Exception { */ @Test public void test206ReconcileUserJack() throws Exception { - final String TEST_NAME = "test206ReconcileUserJack"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -1152,7 +1090,7 @@ public void test206ReconcileUserJack() throws Exception { // User and default dummy account should have unchanged passwords assertUserPassword(userAfter, USER_PASSWORD_AA_CLEAR); - assertDummyPassword(ACCOUNT_JACK_DUMMY_USERNAME, USER_PASSWORD_AA_CLEAR); + assertDummyPassword(ACCOUNT_JACK_DUMMY_USERNAME, USER_PASSWORD_AA_CLEAR); // this one is not changed assertDummyPassword(RESOURCE_DUMMY_UGLY_NAME, ACCOUNT_JACK_DUMMY_USERNAME, USER_JACK_EMPLOYEE_NUMBER_NEW_GOOD); @@ -1168,7 +1106,7 @@ public void test206ReconcileUserJack() throws Exception { */ @Test public void test210ModifyUserJackPasswordGood() throws Exception { - doTestModifyUserJackPasswordSuccessWithHistory("test210ModifyUserJackPasswordGood", + doTestModifyUserJackPasswordSuccessWithHistory( USER_PASSWORD_VALID_1, USER_PASSWORD_AA_CLEAR); } @@ -1178,8 +1116,6 @@ public void test210ModifyUserJackPasswordGood() throws Exception { */ @Test public void test212ReconcileUserJack() throws Exception { - final String TEST_NAME = "test212ReconcileUserJack"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -1201,8 +1137,6 @@ public void test212ReconcileUserJack() throws Exception { */ @Test public void test214RecomputeUserJack() throws Exception { - final String TEST_NAME = "test214RecomputeUserJack"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -1223,7 +1157,7 @@ public void test214RecomputeUserJack() throws Exception { */ @Test public void test220ModifyUserJackPasswordBadA() throws Exception { - doTestModifyUserJackPasswordFailureWithHistory("test220ModifyUserJackPasswordBadA", + doTestModifyUserJackPasswordFailureWithHistory( USER_PASSWORD_1_CLEAR, USER_PASSWORD_VALID_1, USER_PASSWORD_AA_CLEAR); } @@ -1234,8 +1168,6 @@ public void test220ModifyUserJackPasswordBadA() throws Exception { */ @Test public void test222ModifyUserJackPasswordBadContainer() throws Exception { - final String TEST_NAME = "test222ModifyUserJackPasswordBadContainer"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -1248,7 +1180,7 @@ public void test222ModifyUserJackPasswordBadContainer() throws Exception { ObjectDelta objectDelta = prismContext.deltaFactory().object() .createModificationReplaceContainer(UserType.class, USER_JACK_OID, - ItemPath.create(UserType.F_CREDENTIALS, CredentialsType.F_PASSWORD), + ItemPath.create(UserType.F_CREDENTIALS, CredentialsType.F_PASSWORD), passwordType); Collection> deltas = MiscSchemaUtil.createCollection(objectDelta); @@ -1276,7 +1208,7 @@ public void test222ModifyUserJackPasswordBadContainer() throws Exception { */ @Test public void test224ModifyUserJackPasswordBadJack() throws Exception { - doTestModifyUserJackPasswordFailureWithHistory("test224ModifyUserJackPasswordBadJack", + doTestModifyUserJackPasswordFailureWithHistory( USER_PASSWORD_JACK_CLEAR, USER_PASSWORD_VALID_1, USER_PASSWORD_AA_CLEAR); } @@ -1286,7 +1218,7 @@ public void test224ModifyUserJackPasswordBadJack() throws Exception { */ @Test public void test226ModifyUserJackPasswordBadSparrow() throws Exception { - doTestModifyUserJackPasswordFailureWithHistory("test226ModifyUserJackPasswordBadSparrow", + doTestModifyUserJackPasswordFailureWithHistory( USER_PASSWORD_SPARROW_CLEAR, USER_PASSWORD_VALID_1, USER_PASSWORD_AA_CLEAR); } @@ -1296,7 +1228,7 @@ public void test226ModifyUserJackPasswordBadSparrow() throws Exception { */ @Test public void test230ModifyUserJackPasswordGoodAgain() throws Exception { - doTestModifyUserJackPasswordSuccessWithHistory("test230ModifyUserJackPasswordGoodAgain", + doTestModifyUserJackPasswordSuccessWithHistory( USER_PASSWORD_VALID_2, USER_PASSWORD_AA_CLEAR, USER_PASSWORD_VALID_1); } @@ -1305,7 +1237,7 @@ public void test230ModifyUserJackPasswordGoodAgain() throws Exception { */ @Test public void test235ModifyUserJackPasswordGoodSameAsCurrent() throws Exception { - doTestModifyUserJackPasswordFailureWithHistory("test235ModifyUserJackPasswordGoodSameAsCurrent", + doTestModifyUserJackPasswordFailureWithHistory( USER_PASSWORD_VALID_2, USER_PASSWORD_VALID_2, USER_PASSWORD_AA_CLEAR, USER_PASSWORD_VALID_1); } @@ -1314,7 +1246,7 @@ public void test235ModifyUserJackPasswordGoodSameAsCurrent() throws Exception { */ @Test public void test236ModifyUserJackPasswordGoodInHistory() throws Exception { - doTestModifyUserJackPasswordFailureWithHistory("test236ModifyUserJackPasswordGoodInHistory", + doTestModifyUserJackPasswordFailureWithHistory( USER_PASSWORD_VALID_1, USER_PASSWORD_VALID_2, USER_PASSWORD_AA_CLEAR, USER_PASSWORD_VALID_1); } @@ -1323,7 +1255,7 @@ public void test236ModifyUserJackPasswordGoodInHistory() throws Exception { */ @Test public void test237ModifyUserJackPasswordBadInHistory() throws Exception { - doTestModifyUserJackPasswordFailureWithHistory("test237ModifyUserJackPasswordBadInHistory", + doTestModifyUserJackPasswordFailureWithHistory( USER_PASSWORD_AA_CLEAR, USER_PASSWORD_VALID_2, USER_PASSWORD_AA_CLEAR, USER_PASSWORD_VALID_1); } @@ -1334,7 +1266,7 @@ public void test237ModifyUserJackPasswordBadInHistory() throws Exception { */ @Test public void test240ModifyUserJackPasswordGoodAgainOverHistory() throws Exception { - doTestModifyUserJackPasswordSuccessWithHistory("test240ModifyUserJackPasswordGoodAgainOverHistory", + doTestModifyUserJackPasswordSuccessWithHistory( USER_PASSWORD_VALID_3, USER_PASSWORD_VALID_1, USER_PASSWORD_VALID_2); } @@ -1345,7 +1277,7 @@ public void test240ModifyUserJackPasswordGoodAgainOverHistory() throws Exception */ @Test public void test241ModifyUserJackPasswordGoodAgainOverHistoryAgain() throws Exception { - doTestModifyUserJackPasswordSuccessWithHistory("test241ModifyUserJackPasswordGoodAgainOverHistoryAgain", + doTestModifyUserJackPasswordSuccessWithHistory( USER_PASSWORD_VALID_4, USER_PASSWORD_VALID_2, USER_PASSWORD_VALID_3); } @@ -1355,12 +1287,13 @@ public void test241ModifyUserJackPasswordGoodAgainOverHistoryAgain() throws Exce */ @Test public void test248ModifyUserJackPasswordGoodReuse() throws Exception { - doTestModifyUserJackPasswordSuccessWithHistory("test248ModifyUserJackPasswordGoodReuse", + doTestModifyUserJackPasswordSuccessWithHistory( USER_PASSWORD_VALID_1, USER_PASSWORD_VALID_3, USER_PASSWORD_VALID_4); } - private void doTestModifyUserJackPasswordSuccessWithHistory(final String TEST_NAME, - String newPassword, String... expectedPasswordHistory) throws Exception { + private void doTestModifyUserJackPasswordSuccessWithHistory( + String newPassword, String... expectedPasswordHistory) + throws Exception { // GIVEN Task task = getTestTask(); @@ -1382,12 +1315,13 @@ private void doTestModifyUserJackPasswordSuccessWithHistory(final String TEST_NA displayAccountPasswordNotifications(); assertAccountPasswordNotifications(2); assertHasAccountPasswordNotification(null, USER_JACK_USERNAME, newPassword); - assertHasAccountPasswordNotification(RESOURCE_DUMMY_YELLOW_NAME, USER_JACK_USERNAME, newPassword); + assertHasAccountPasswordNotification(RESOURCE_DUMMY_YELLOW_NAME, USER_JACK_USERNAME, newPassword); assertSingleUserPasswordNotification(USER_JACK_USERNAME, newPassword); } - private void doTestModifyUserJackPasswordFailureWithHistory(final String TEST_NAME, - String newPassword, String oldPassword, String... expectedPasswordHistory) throws Exception { + private void doTestModifyUserJackPasswordFailureWithHistory( + String newPassword, String oldPassword, String... expectedPasswordHistory) + throws Exception { // GIVEN Task task = getTestTask(); @@ -1442,8 +1376,6 @@ private void assertJackPasswordsWithHistory(String expectedCurrentPassword, Stri */ @Test public void test300TwoParentOrgRefs() throws Exception { - final String TEST_NAME = "test300TwoParentOrgRefs"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -1504,8 +1436,6 @@ public void test300TwoParentOrgRefs() throws Exception { */ @Test public void test310PreparePasswordStrengthTests() throws Exception { - final String TEST_NAME = "test310PreparePasswordStrengthTests"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -1516,12 +1446,12 @@ public void test310PreparePasswordStrengthTests() throws Exception { unassignOrg(USER_JACK_OID, ORG_GOVERNOR_OFFICE_OID, SchemaConstants.ORG_MANAGER, task, result); // WHEN - when(TEST_NAME); + when(); assignAccountToUser(USER_JACK_OID, RESOURCE_DUMMY_RED_OID, null, task, result); assignAccountToUser(USER_JACK_OID, RESOURCE_DUMMY_BLUE_OID, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -1547,8 +1477,8 @@ public void test310PreparePasswordStrengthTests() throws Exception { if (isPasswordEncryption()) { assertAccountPasswordNotifications(2); - assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_JACK_USERNAME, USER_PASSWORD_VALID_1); - assertHasAccountPasswordNotification(RESOURCE_DUMMY_BLUE_NAME, USER_JACK_USERNAME, USER_PASSWORD_VALID_1); + assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_JACK_USERNAME, USER_PASSWORD_VALID_1); + assertHasAccountPasswordNotification(RESOURCE_DUMMY_BLUE_NAME, USER_JACK_USERNAME, USER_PASSWORD_VALID_1); } else { assertNoAccountPasswordNotifications(); @@ -1558,19 +1488,17 @@ public void test310PreparePasswordStrengthTests() throws Exception { @Test public void test312ChangeUserPassword() throws Exception { - final String TEST_NAME = "test312ChangeUserPassword"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); modifyUserChangePassword(USER_JACK_OID, USER_PASSWORD_VALID_2, task, result); // THEN - then(TEST_NAME); + then(); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1599,13 +1527,13 @@ public void test312ChangeUserPassword() throws Exception { if (isPasswordEncryption()) { assertAccountPasswordNotifications(2); assertHasAccountPasswordNotification(null, USER_JACK_USERNAME, USER_PASSWORD_VALID_2); - assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_JACK_USERNAME, USER_PASSWORD_VALID_2); - // not BLUE, it already has a password + assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_JACK_USERNAME, USER_PASSWORD_VALID_2); + // not BLUE, it already has a password } else { assertAccountPasswordNotifications(3); assertHasAccountPasswordNotification(null, USER_JACK_USERNAME, USER_PASSWORD_VALID_2); - assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_JACK_USERNAME, USER_PASSWORD_VALID_2); - assertHasAccountPasswordNotification(RESOURCE_DUMMY_BLUE_NAME, USER_JACK_USERNAME, USER_PASSWORD_VALID_2); + assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_JACK_USERNAME, USER_PASSWORD_VALID_2); + assertHasAccountPasswordNotification(RESOURCE_DUMMY_BLUE_NAME, USER_JACK_USERNAME, USER_PASSWORD_VALID_2); } assertSingleUserPasswordNotification(USER_JACK_USERNAME, USER_PASSWORD_VALID_2); } @@ -1619,8 +1547,6 @@ public void test312ChangeUserPassword() throws Exception { */ @Test public void test314RemovePasswordFail() throws Exception { - final String TEST_NAME = "test314RemovePasswordFail"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -1630,7 +1556,7 @@ public void test314RemovePasswordFail() throws Exception { try { // WHEN+THEN - when(TEST_NAME); + when(); try { modifyUserReplace(USER_JACK_OID, PASSWORD_VALUE_PATH, task, result /*, no value */); fail("unexpected success"); @@ -1646,7 +1572,7 @@ public void test314RemovePasswordFail() throws Exception { private void setPasswordMinOccurs(Integer value, Task task, OperationResult result) throws CommonException { ObjectDelta delta = prismContext.deltaFor(SecurityPolicyType.class) .item(SecurityPolicyType.F_CREDENTIALS, CredentialsPolicyType.F_PASSWORD, PasswordCredentialsPolicyType.F_MIN_OCCURS) - .replace(value) + .replace(value) .asObjectDeltaCast(getSecurityPolicyOid()); executeChanges(delta, null, task, result); } @@ -1656,19 +1582,17 @@ private void setPasswordMinOccurs(Integer value, Task task, OperationResult resu */ @Test public void test315RemovePassword() throws Exception { - final String TEST_NAME = "test315RemovePassword"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); modifyUserReplace(USER_JACK_OID, PASSWORD_VALUE_PATH, task, result /*, no value */); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -1703,19 +1627,17 @@ public void test315RemovePassword() throws Exception { */ @Test public void test316UserRecompute() throws Exception { - final String TEST_NAME = "test316UserRecompute"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); recomputeUser(USER_JACK_OID, task, result); // THEN - then(TEST_NAME); + then(); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1753,39 +1675,37 @@ public void test316UserRecompute() throws Exception { */ @Test public void test318ChangeUserPassword() throws Exception { - final String TEST_NAME = "test318ChangeUserPassword"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); modifyUserChangePassword(USER_JACK_OID, USER_PASSWORD_VALID_3, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = assertUserAfter(USER_JACK_OID) - .assertPassword(USER_PASSWORD_VALID_3, getPasswordStorageType()) - .assertLinks(4) - .getObject(); + .assertPassword(USER_PASSWORD_VALID_3, getPasswordStorageType()) + .assertLinks(4) + .getObject(); // default password mapping is normal assertDummyAccountByUsername(null, ACCOUNT_JACK_DUMMY_USERNAME) - .assertPassword(USER_PASSWORD_VALID_3) - // Admin password reset, no runAs - .assertLastModifier(null); + .assertPassword(USER_PASSWORD_VALID_3) + // Admin password reset, no runAs + .assertLastModifier(null); // RED password mapping is strong assertDummyAccountByUsername(RESOURCE_DUMMY_RED_NAME, ACCOUNT_JACK_DUMMY_USERNAME) - .assertFullName(USER_JACK_FULL_NAME) - .assertEnabled() - .assertPassword(USER_PASSWORD_VALID_3) - // and RED resource has no runAs capability - .assertLastModifier(null); + .assertFullName(USER_JACK_FULL_NAME) + .assertEnabled() + .assertPassword(USER_PASSWORD_VALID_3) + // and RED resource has no runAs capability + .assertLastModifier(null); // password mapping is weak assertDummyAccount(RESOURCE_DUMMY_BLUE_NAME, ACCOUNT_JACK_DUMMY_USERNAME, USER_JACK_FULL_NAME, true); @@ -1797,26 +1717,24 @@ public void test318ChangeUserPassword() throws Exception { displayAccountPasswordNotifications(); assertAccountPasswordNotifications(2); assertHasAccountPasswordNotification(null, USER_JACK_USERNAME, USER_PASSWORD_VALID_3); - assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_JACK_USERNAME, USER_PASSWORD_VALID_3); - // not BLUE, it already has a password + assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_JACK_USERNAME, USER_PASSWORD_VALID_3); + // not BLUE, it already has a password assertSingleUserPasswordNotification(USER_JACK_USERNAME, USER_PASSWORD_VALID_3); } @Test public void test320ChangeEmployeeNumber() throws Exception { - final String TEST_NAME = "test320ChangeEmployeeNumber"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); modifyUserReplace(USER_JACK_OID, UserType.F_EMPLOYEE_NUMBER, task, result, "emp0000"); // THEN - then(TEST_NAME); + then(); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1837,19 +1755,17 @@ public void test320ChangeEmployeeNumber() throws Exception { @Test public void test330RemoveEmployeeNumber() throws Exception { - final String TEST_NAME = "test330RemoveEmployeeNumber"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); modifyUserReplace(USER_JACK_OID, UserType.F_EMPLOYEE_NUMBER, task, result); // THEN - then(TEST_NAME); + then(); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1875,8 +1791,6 @@ public void test330RemoveEmployeeNumber() throws Exception { */ @Test public void test340ModifyUserMonkeyPasswordAA() throws Exception { - final String TEST_NAME = "test340ModifyUserMonkeyPasswordAA"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -1884,7 +1798,7 @@ public void test340ModifyUserMonkeyPasswordAA() throws Exception { try { // WHEN - when(TEST_NAME); + when(); modifyUserChangePassword(USER_THREE_HEADED_MONKEY_OID, USER_PASSWORD_AA_CLEAR, task, result); @@ -1895,7 +1809,7 @@ public void test340ModifyUserMonkeyPasswordAA() throws Exception { } // THEN - then(TEST_NAME); + then(); assertFailure(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -1911,19 +1825,17 @@ public void test340ModifyUserMonkeyPasswordAA() throws Exception { */ @Test public void test341RecomputeMonkey() throws Exception { - final String TEST_NAME = "test341RecomputeMonkey"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); recomputeUser(USER_THREE_HEADED_MONKEY_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -1939,19 +1851,17 @@ public void test341RecomputeMonkey() throws Exception { */ @Test public void test342ReconcileMonkey() throws Exception { - final String TEST_NAME = "test342ReconcileMonkey"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); reconcileUser(USER_THREE_HEADED_MONKEY_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -1967,8 +1877,6 @@ public void test342ReconcileMonkey() throws Exception { */ @Test public void test343ModifyUserMonkeyDescription() throws Exception { - final String TEST_NAME = "test343ModifyUserMonkeyDescription"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -1980,11 +1888,11 @@ public void test343ModifyUserMonkeyDescription() throws Exception { assertDummyAccount(null, USER_THREE_HEADED_MONKEY_NAME); // WHEN - when(TEST_NAME); + when(); modifyUserReplace(USER_THREE_HEADED_MONKEY_OID, UserType.F_DESCRIPTION, task, result, "Look behind you! A three-headed MONKEY!"); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -2003,20 +1911,18 @@ public void test343ModifyUserMonkeyDescription() throws Exception { */ @Test public void test344ModifyUserMonkeyLocality() throws Exception { - final String TEST_NAME = "test343ModifyUserMonkeyDescription"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); modifyUserReplace(USER_THREE_HEADED_MONKEY_OID, UserType.F_LOCALITY, task, result, createPolyString("Monkey Island")); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -2037,20 +1943,18 @@ public void test344ModifyUserMonkeyLocality() throws Exception { */ @Test public void test345AssignMonkeyAccountBlue() throws Exception { - final String TEST_NAME = "test345AssignMonkeyAccountBlue"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); assignAccountToUser(USER_THREE_HEADED_MONKEY_OID, RESOURCE_DUMMY_BLUE_OID, null, task, result); // THEN - then(TEST_NAME); + then(); assertPartialError(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -2067,20 +1971,18 @@ public void test345AssignMonkeyAccountBlue() throws Exception { */ @Test public void test346UnassignMonkeyAccountBlue() throws Exception { - final String TEST_NAME = "test346UnassignMonkeyAccountBlue"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); unassignAccountFromUser(USER_THREE_HEADED_MONKEY_OID, RESOURCE_DUMMY_BLUE_OID, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -2100,20 +2002,18 @@ public void test346UnassignMonkeyAccountBlue() throws Exception { */ @Test public void test347AssignMonkeyAccountYellow() throws Exception { - final String TEST_NAME = "test347AssignMonkeyAccountYellow"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); assignAccountToUser(USER_THREE_HEADED_MONKEY_OID, RESOURCE_DUMMY_YELLOW_OID, null, task, result); // THEN - then(TEST_NAME); + then(); assertPartialError(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -2128,20 +2028,18 @@ public void test347AssignMonkeyAccountYellow() throws Exception { @Test public void test348UnassignMonkeyAccountYellow() throws Exception { - final String TEST_NAME = "test348UnassignMonkeyAccountYellow"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); unassignAccountFromUser(USER_THREE_HEADED_MONKEY_OID, RESOURCE_DUMMY_YELLOW_OID, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -2162,19 +2060,17 @@ public void test348UnassignMonkeyAccountYellow() throws Exception { */ @Test public void test349AssignMonkeyPirate() throws Exception { - final String TEST_NAME = "test349AssignMonkeyPirate"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); assignRole(USER_THREE_HEADED_MONKEY_OID, ROLE_PIRATE_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -2197,19 +2093,17 @@ public void test349AssignMonkeyPirate() throws Exception { */ @Test public void test350DisableMonkey() throws Exception { - final String TEST_NAME = "test350DisableMonkey"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); modifyUserReplace(USER_THREE_HEADED_MONKEY_OID, ACTIVATION_ADMINISTRATIVE_STATUS_PATH, task, result, ActivationStatusType.DISABLED); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -2232,19 +2126,17 @@ public void test350DisableMonkey() throws Exception { */ @Test public void test351EnableMonkey() throws Exception { - final String TEST_NAME = "test351EnableMonkey"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); modifyUserReplace(USER_THREE_HEADED_MONKEY_OID, ACTIVATION_ADMINISTRATIVE_STATUS_PATH, task, result, ActivationStatusType.ENABLED); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -2267,19 +2159,17 @@ public void test351EnableMonkey() throws Exception { */ @Test public void test352UnassignMonkeyPirate() throws Exception { - final String TEST_NAME = "test352UnassignMonkeyPirate"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); unassignRole(USER_THREE_HEADED_MONKEY_OID, ROLE_PIRATE_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -2301,19 +2191,17 @@ public void test352UnassignMonkeyPirate() throws Exception { */ @Test public void test354ModifyUserMonkeyPasswordValid1() throws Exception { - final String TEST_NAME = "test354ModifyUserMonkeyPasswordValid1"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); modifyUserChangePassword(USER_THREE_HEADED_MONKEY_OID, USER_PASSWORD_VALID_1, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -2329,19 +2217,17 @@ public void test354ModifyUserMonkeyPasswordValid1() throws Exception { */ @Test public void test355ModifyUserMonkeyDescriptionAgain() throws Exception { - final String TEST_NAME = "test355ModifyUserMonkeyDescriptionAgain"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); modifyUserReplace(USER_THREE_HEADED_MONKEY_OID, UserType.F_DESCRIPTION, task, result, "Look behind you! A three-headed MONKEY!"); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -2356,8 +2242,6 @@ public void test355ModifyUserMonkeyDescriptionAgain() throws Exception { */ @Test public void test400AddUserRappWithAssignment() throws Exception { - final String TEST_NAME = "test400AddUserRappWithAssignment"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -2366,18 +2250,18 @@ public void test400AddUserRappWithAssignment() throws Exception { AssignmentType assignmentType = createConstructionAssignment(RESOURCE_DUMMY_OID, null, null); UserType userBeforeType = userBefore.asObjectable(); userBeforeType - .fullName(createPolyStringType(USER_RAPP_FULLNAME)) - .emailAddress(USER_RAPP_EMAIL); // Make sure Rapp has e-mail address otherwise the notifications will not be sent to transport + .fullName(createPolyStringType(USER_RAPP_FULLNAME)) + .emailAddress(USER_RAPP_EMAIL); // Make sure Rapp has e-mail address otherwise the notifications will not be sent to transport userBeforeType.getAssignment().add(assignmentType); setPassword(userBefore, USER_PASSWORD_VALID_1); display("User before", userBefore); // WHEN - when(TEST_NAME); + when(); addObject(userBefore, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_RAPP_OID); @@ -2406,19 +2290,17 @@ public void test400AddUserRappWithAssignment() throws Exception { */ @Test public void test401UserRappRecompute() throws Exception { - final String TEST_NAME = "test401UserRappRecompute"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); recomputeUser(USER_RAPP_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_RAPP_OID); @@ -2447,8 +2329,6 @@ public void test401UserRappRecompute() throws Exception { */ @Test public void test402AssignRappDummyRed() throws Exception { - final String TEST_NAME = "test402AssignRappDummyRed"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -2458,11 +2338,11 @@ public void test402AssignRappDummyRed() throws Exception { display("User before", userBefore); // WHEN - when(TEST_NAME); + when(); assignAccountToUser(USER_RAPP_OID, RESOURCE_DUMMY_RED_OID, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_RAPP_OID); @@ -2511,8 +2391,6 @@ public void test402AssignRappDummyRed() throws Exception { */ @Test public void test403UserRappRecompute() throws Exception { - final String TEST_NAME = "test403UserRappRecompute"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -2522,11 +2400,11 @@ public void test403UserRappRecompute() throws Exception { display("User before", userBefore); // WHEN - when(TEST_NAME); + when(); recomputeUser(USER_RAPP_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_RAPP_OID); @@ -2573,8 +2451,6 @@ public void test403UserRappRecompute() throws Exception { */ @Test public void test404InitializeRappDummyRed() throws Exception { - final String TEST_NAME = "test404InitializeRappDummyRed"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -2587,11 +2463,11 @@ public void test404InitializeRappDummyRed() throws Exception { ObjectDelta shadowDelta = createAccountInitializationDelta(accountRedOid, USER_PASSWORD_VALID_1); // WHEN - when(TEST_NAME); + when(); executeChanges(shadowDelta, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_RAPP_OID); @@ -2638,8 +2514,6 @@ public void test404InitializeRappDummyRed() throws Exception { */ @Test public void test405UserRappRecompute() throws Exception { - final String TEST_NAME = "test405UserRappRecompute"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -2649,11 +2523,11 @@ public void test405UserRappRecompute() throws Exception { display("User before", userBefore); // WHEN - when(TEST_NAME); + when(); recomputeUser(USER_RAPP_OID, task, result); // THEN - then(TEST_NAME); + then(); result.computeStatus(); TestUtil.assertSuccess(result); @@ -2701,8 +2575,6 @@ public void test405UserRappRecompute() throws Exception { */ @Test public void test410AssignRappDummyLifecycle() throws Exception { - final String TEST_NAME = "test410AssignRappDummyLifecycle"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -2712,11 +2584,11 @@ public void test410AssignRappDummyLifecycle() throws Exception { display("User before", userBefore); // WHEN - when(TEST_NAME); + when(); assignAccountToUser(USER_RAPP_OID, RESOURCE_DUMMY_LIFECYCLE_OID, null, task, result); // THEN - then(TEST_NAME); + then(); result.computeStatus(); TestUtil.assertSuccess(result); @@ -2735,7 +2607,6 @@ public void test410AssignRappDummyLifecycle() throws Exception { assertShadowLifecycle(accountShadowLifecycle, false); // assertShadowLifecycle(accountShadowLifecycle, SchemaConstants.LIFECYCLE_ACTIVE); - assertDummyAccount(RESOURCE_DUMMY_RED_NAME, USER_RAPP_USERNAME, USER_RAPP_FULLNAME, true); assertDummyPassword(RESOURCE_DUMMY_RED_NAME, USER_RAPP_USERNAME, USER_PASSWORD_VALID_1); assertUserPassword(userAfter, USER_PASSWORD_VALID_1); @@ -2748,8 +2619,6 @@ public void test410AssignRappDummyLifecycle() throws Exception { @Test public void test412InitializeRappDummyLifecycle() throws Exception { - final String TEST_NAME = "test412InitializeRappDummyLifecycle"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -2767,11 +2636,11 @@ public void test412InitializeRappDummyLifecycle() throws Exception { shadowDelta.addModificationReplaceProperty(ObjectType.F_LIFECYCLE_STATE, SchemaConstants.LIFECYCLE_ACTIVE); // WHEN - when(TEST_NAME); + when(); executeChanges(shadowDelta, null, task, result); // THEN - then(TEST_NAME); + then(); result.computeStatus(); TestUtil.assertSuccess(result); @@ -2825,8 +2694,6 @@ public void test412InitializeRappDummyLifecycle() throws Exception { @Test public void test414UserRappRecompute() throws Exception { - final String TEST_NAME = "test414UserRappRecompute"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -2836,11 +2703,11 @@ public void test414UserRappRecompute() throws Exception { display("User before", userBefore); // WHEN - when(TEST_NAME); + when(); recomputeUser(USER_RAPP_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_RAPP_OID); @@ -2895,8 +2762,6 @@ public void test414UserRappRecompute() throws Exception { @Test public void test416UserRappSubtypeWreck() throws Exception { - final String TEST_NAME = "test416UserRappSubtypeWreck"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -2906,11 +2771,11 @@ public void test416UserRappSubtypeWreck() throws Exception { display("User before", userBefore); // WHEN - when(TEST_NAME); + when(); modifyUserReplace(USER_RAPP_OID, UserType.F_SUBTYPE, task, result, "WRECK"); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_RAPP_OID); @@ -2971,8 +2836,6 @@ public void test416UserRappSubtypeWreck() throws Exception { */ @Test public void test420AddUserDrakeWithAssignment() throws Exception { - final String TEST_NAME = "test420AddUserDrakeWithAssignment"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -2984,16 +2847,16 @@ public void test420AddUserDrakeWithAssignment() throws Exception { display("User before", userBefore); // WHEN - when(TEST_NAME); + when(); addObject(userBefore, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); String accountOid = assertUserAfter(USER_DRAKE_OID) .singleLink() - .getOid(); + .getOid(); assertRepoShadow(accountOid) // Lifecycle state is always proposed, even for encrypted passwords. @@ -3012,8 +2875,6 @@ public void test420AddUserDrakeWithAssignment() throws Exception { */ @Test public void test500JackAssignResourceSouvenir() throws Exception { - final String TEST_NAME = "test500JackAssignResourceSouvenir"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -3035,11 +2896,11 @@ public void test500JackAssignResourceSouvenir() throws Exception { assertUserPassword(userBefore, USER_PASSWORD_VALID_3); // WHEN - when(TEST_NAME); + when(); assignAccountToUser(USER_JACK_OID, RESOURCE_DUMMY_SOUVENIR_OID, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -3074,8 +2935,6 @@ public void test500JackAssignResourceSouvenir() throws Exception { */ @Test public void test502JackInitializeAccountSouvenir() throws Exception { - final String TEST_NAME = "test502JackInitializeAccountSouvenir"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -3084,11 +2943,11 @@ public void test502JackInitializeAccountSouvenir() throws Exception { ObjectDelta shadowDelta = createAccountInitializationDelta(accountJackSouvenirOid, PASSWORD_ALLIGATOR); // WHEN - when(TEST_NAME); + when(); executeChanges(shadowDelta, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -3119,8 +2978,6 @@ public void test502JackInitializeAccountSouvenir() throws Exception { */ @Test public void test510JackAssignResourceMaverick() throws Exception { - final String TEST_NAME = "test510JackAssignResourceMaverick"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -3134,11 +2991,11 @@ public void test510JackAssignResourceMaverick() throws Exception { assertUserPassword(userBefore, USER_PASSWORD_VALID_3); // WHEN - when(TEST_NAME); + when(); assignAccountToUser(USER_JACK_OID, RESOURCE_DUMMY_MAVERICK_OID, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -3164,8 +3021,6 @@ public void test510JackAssignResourceMaverick() throws Exception { */ @Test public void test512JackInitializeAccountMaverickAlligator() throws Exception { - final String TEST_NAME = "test512JackInitializeAccountMaverick"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -3174,11 +3029,11 @@ public void test512JackInitializeAccountMaverickAlligator() throws Exception { ObjectDelta shadowDelta = createAccountInitializationDelta(accountJackMaverickOid, PASSWORD_ALLIGATOR); // WHEN - when(TEST_NAME); + when(); executeChanges(shadowDelta, null, task, result); // THEN - then(TEST_NAME); + then(); assertPartialError(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -3200,8 +3055,6 @@ public void test512JackInitializeAccountMaverickAlligator() throws Exception { */ @Test public void test514JackInitializeAccountMaverickCrododile() throws Exception { - final String TEST_NAME = "test514JackInitializeAccountMaverickCrododile"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -3210,11 +3063,11 @@ public void test514JackInitializeAccountMaverickCrododile() throws Exception { ObjectDelta shadowDelta = createAccountInitializationDelta(accountJackMaverickOid, PASSWORD_CROCODILE); // WHEN - when(TEST_NAME); + when(); executeChanges(shadowDelta, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -3240,19 +3093,17 @@ public void test514JackInitializeAccountMaverickCrododile() throws Exception { */ @Test public void test516JackChangePasswordResourceMaverickAlligator() throws Exception { - final String TEST_NAME = "test516JackChangePasswordResourceMaverickAlligator"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); modifyAccountChangePassword(accountJackMaverickOid, PASSWORD_ALLIGATOR, task, result); // THEN - then(TEST_NAME); + then(); assertPartialError(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -3270,19 +3121,17 @@ public void test516JackChangePasswordResourceMaverickAlligator() throws Exceptio */ @Test public void test518JackChangePasswordResourceMaverickGiantLizard() throws Exception { - final String TEST_NAME = "test518JackChangePasswordResourceMaverickGiantLizard"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); modifyAccountChangePassword(accountJackMaverickOid, PASSWORD_GIANT_LIZARD, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -3299,8 +3148,6 @@ public void test518JackChangePasswordResourceMaverickGiantLizard() throws Except */ @Test public void test530JackUnassignResourceSouvenir() throws Exception { - final String TEST_NAME = "test530JackUnassignResourceSouvenir"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -3313,11 +3160,11 @@ public void test530JackUnassignResourceSouvenir() throws Exception { assertLinks(userBefore, 6); // WHEN - when(TEST_NAME); + when(); unassignAccountFromUser(USER_JACK_OID, RESOURCE_DUMMY_SOUVENIR_OID, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -3336,8 +3183,6 @@ public void test530JackUnassignResourceSouvenir() throws Exception { */ @Test public void test532JackChangePasswordResourceBlueAlligator() throws Exception { - final String TEST_NAME = "test532JackChangePasswordResourceBlueAlligator"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -3350,11 +3195,11 @@ public void test532JackChangePasswordResourceBlueAlligator() throws Exception { accountJackBlueOid = assertAccount(userBefore, RESOURCE_DUMMY_BLUE_OID); // WHEN - when(TEST_NAME); + when(); modifyAccountChangePassword(accountJackBlueOid, PASSWORD_ALLIGATOR, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -3375,19 +3220,17 @@ public void test532JackChangePasswordResourceBlueAlligator() throws Exception { */ @Test public void test535ModifyUserJackPasswordAlligator() throws Exception { - final String TEST_NAME = "test535ModifyUserJackPasswordAlligator"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); modifyUserChangePassword(USER_JACK_OID, PASSWORD_ALLIGATOR, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -3405,8 +3248,6 @@ public void test535ModifyUserJackPasswordAlligator() throws Exception { */ @Test public void test539JackUnassignResourceMaverick() throws Exception { - final String TEST_NAME = "test539JackUnassignResourceMaverick"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -3419,11 +3260,11 @@ public void test539JackUnassignResourceMaverick() throws Exception { assertLinks(userBefore, 5); // WHEN - when(TEST_NAME); + when(); unassignAccountFromUser(USER_JACK_OID, RESOURCE_DUMMY_MAVERICK_OID, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -3440,7 +3281,7 @@ public void test539JackUnassignResourceMaverick() throws Exception { */ @Test public void test550JackManyPasswordChangesClear() throws Exception { - testJackManyPasswordChanges("test550JackManyPasswordChangesClear", "TesT550x", null); + testJackManyPasswordChanges("TesT550x", null); } /** @@ -3448,13 +3289,13 @@ public void test550JackManyPasswordChangesClear() throws Exception { */ @Test public void test552JackManyPasswordChangesEncrypted() throws Exception { - testJackManyPasswordChanges("test552JackManyPasswordChangesEncrypted", "TesT552x", CredentialsStorageTypeType.ENCRYPTION); + testJackManyPasswordChanges("TesT552x", CredentialsStorageTypeType.ENCRYPTION); } /** * MID-4507 */ - public void testJackManyPasswordChanges(final String TEST_NAME, String passwordPrefix, CredentialsStorageTypeType storageType) throws Exception { + public void testJackManyPasswordChanges(String passwordPrefix, CredentialsStorageTypeType storageType) throws Exception { // GIVEN prepareTest(); @@ -3466,13 +3307,14 @@ public void testJackManyPasswordChanges(final String TEST_NAME, String passwordP assertLinks(userBefore, 4); for (int i = 1; i < 10; i++) { - testJackManyPasswordChangesAttempt(TEST_NAME, passwordPrefix, storageType, i); + testJackManyPasswordChangesAttempt(passwordPrefix, storageType, i); } - } - private void testJackManyPasswordChangesAttempt(String TEST_NAME, String passwordPrefix, CredentialsStorageTypeType storageType, int i) throws Exception { - Task task = getTestTask(); + private void testJackManyPasswordChangesAttempt( + String passwordPrefix, CredentialsStorageTypeType storageType, int i) + throws Exception { + Task task = createTask("testJackManyPasswordChangesAttempt-" + i); OperationResult result = task.getResult(); String newPassword = passwordPrefix + i; @@ -3483,11 +3325,11 @@ private void testJackManyPasswordChangesAttempt(String TEST_NAME, String passwor } // WHEN - when(TEST_NAME + "-" + i); - modifyUserReplace(USER_JACK_OID, PASSWORD_VALUE_PATH, task, result, userPasswordPs); + when("iteration-" + i); + modifyUserReplace(USER_JACK_OID, PASSWORD_VALUE_PATH, task, result, userPasswordPs); // THEN - then(TEST_NAME + "-" + i); + then("iteration-" + i); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -3502,15 +3344,13 @@ private void testJackManyPasswordChangesAttempt(String TEST_NAME, String passwor /** * Jack changing his own password. He does it as an admin * and there is no old password specified. RunAs should NOT be used. - * + *

* This also sets predictable password for next test. - * + *

* MID-4661 */ @Test public void test560ChangeJackPasswordSuperuser() throws Exception { - final String TEST_NAME = "test560ChangeJackPasswordSuperuser"; - // GIVEN prepareTest(); @@ -3518,24 +3358,24 @@ public void test560ChangeJackPasswordSuperuser() throws Exception { // preconditions assertUserBefore(USER_JACK_OID) - .displayWithProjections() - .assertLinks(4); + .displayWithProjections() + .assertLinks(4); assertDummyAccountByUsername(null, ACCOUNT_JACK_DUMMY_USERNAME) - .assertLastModifier(null); + .assertLastModifier(null); login(USER_JACK_USERNAME); - Task task = createTask(TEST_NAME, getSecurityContextPrincipal()); + Task task = createTask(getSecurityContextPrincipal()); task.setChannel(SchemaConstants.CHANNEL_GUI_USER_URI); OperationResult result = task.getResult(); // WHEN - when(TEST_NAME); + when(); modifyUserChangePassword(USER_JACK_OID, USER_PASSWORD_VALID_4, task, result); // THEN - then(TEST_NAME); + then(); login(USER_ADMINISTRATOR_USERNAME); assertSuccess(result); @@ -3546,16 +3386,16 @@ public void test560ChangeJackPasswordSuperuser() throws Exception { // default password mapping is normal assertDummyAccountByUsername(null, ACCOUNT_JACK_DUMMY_USERNAME) - .assertPassword(USER_PASSWORD_VALID_4) - .assertLastModifier(null); + .assertPassword(USER_PASSWORD_VALID_4) + .assertLastModifier(null); // RED password mapping is strong assertDummyAccountByUsername(RESOURCE_DUMMY_RED_NAME, ACCOUNT_JACK_DUMMY_USERNAME) - .assertFullName(USER_JACK_FULL_NAME) - .assertEnabled() - .assertPassword(USER_PASSWORD_VALID_4) - // and RED resource has no runAs capability - .assertLastModifier(null); + .assertFullName(USER_JACK_FULL_NAME) + .assertEnabled() + .assertPassword(USER_PASSWORD_VALID_4) + // and RED resource has no runAs capability + .assertLastModifier(null); // BLUE password mapping is weak, we do not really care about password change here // we do not really care about ugly resource either @@ -3563,36 +3403,34 @@ public void test560ChangeJackPasswordSuperuser() throws Exception { displayAccountPasswordNotifications(); assertAccountPasswordNotifications(2); assertHasAccountPasswordNotification(null, USER_JACK_USERNAME, USER_PASSWORD_VALID_4); - assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_JACK_USERNAME, USER_PASSWORD_VALID_4); - // not BLUE, it already has a password + assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_JACK_USERNAME, USER_PASSWORD_VALID_4); + // not BLUE, it already has a password assertSingleUserPasswordNotification(USER_JACK_USERNAME, USER_PASSWORD_VALID_4); } /** * Self-service password change. User's own identity should be used * to change password on resource that have runAs capability. - * + *

* MID-4661 */ @Test public void test562ChangeJackPasswordSelfService() throws Exception { - final String TEST_NAME = "test562ChangeJackPasswordSelfService"; - // GIVEN prepareTest(); // preconditions assertUserBefore(USER_JACK_OID) - .displayWithProjections() - .assertLinks(4); + .displayWithProjections() + .assertLinks(4); assertDummyAccountByUsername(null, ACCOUNT_JACK_DUMMY_USERNAME) - .assertPassword(USER_PASSWORD_VALID_4) - .assertLastModifier(null); + .assertPassword(USER_PASSWORD_VALID_4) + .assertLastModifier(null); login(USER_JACK_USERNAME); - Task task = createTask(TEST_NAME, getSecurityContextPrincipal()); + Task task = createTask(getSecurityContextPrincipal()); task.setChannel(SchemaConstants.CHANNEL_GUI_SELF_SERVICE_URI); OperationResult result = task.getResult(); @@ -3600,11 +3438,11 @@ public void test562ChangeJackPasswordSelfService() throws Exception { USER_PASSWORD_VALID_4, USER_PASSWORD_VALID_5); // WHEN - when(TEST_NAME); + when(); executeChanges(objectDelta, null, task, result); // THEN - then(TEST_NAME); + then(); login(USER_ADMINISTRATOR_USERNAME); assertSuccess(result); @@ -3615,16 +3453,16 @@ public void test562ChangeJackPasswordSelfService() throws Exception { // default password mapping is normal assertDummyAccountByUsername(null, ACCOUNT_JACK_DUMMY_USERNAME) - .assertPassword(USER_PASSWORD_VALID_5) - .assertLastModifier(ACCOUNT_JACK_DUMMY_USERNAME); + .assertPassword(USER_PASSWORD_VALID_5) + .assertLastModifier(ACCOUNT_JACK_DUMMY_USERNAME); // RED password mapping is strong assertDummyAccountByUsername(RESOURCE_DUMMY_RED_NAME, ACCOUNT_JACK_DUMMY_USERNAME) - .assertFullName(USER_JACK_FULL_NAME) - .assertEnabled() - .assertPassword(USER_PASSWORD_VALID_5) - // and RED resource has no runAs capability - .assertLastModifier(null); + .assertFullName(USER_JACK_FULL_NAME) + .assertEnabled() + .assertPassword(USER_PASSWORD_VALID_5) + // and RED resource has no runAs capability + .assertLastModifier(null); // BLUE password mapping is weak, we do not really care about password change here // we do not really care about ugly resource either @@ -3632,8 +3470,8 @@ public void test562ChangeJackPasswordSelfService() throws Exception { displayAccountPasswordNotifications(); assertAccountPasswordNotifications(2); assertHasAccountPasswordNotification(null, USER_JACK_USERNAME, USER_PASSWORD_VALID_5); - assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_JACK_USERNAME, USER_PASSWORD_VALID_5); - // not BLUE, it already has a password + assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_JACK_USERNAME, USER_PASSWORD_VALID_5); + // not BLUE, it already has a password assertSingleUserPasswordNotification(USER_JACK_USERNAME, USER_PASSWORD_VALID_5); } @@ -3642,29 +3480,26 @@ public void test562ChangeJackPasswordSelfService() throws Exception { * Old password is (strangely) specified. * But as this is not user changing its own password then RunAs * should NOT be used. - * + *

* MID-4661 */ @Test public void test564ChangeJackPasswordAdmin() throws Exception { - final String TEST_NAME = "test564ChangeJackPasswordAdmin"; - // GIVEN - prepareTest(); // preconditions assertUserBefore(USER_JACK_OID) - .displayWithProjections() - .assertLinks(4); + .displayWithProjections() + .assertLinks(4); assertDummyAccountByUsername(null, ACCOUNT_JACK_DUMMY_USERNAME) - .assertPassword(USER_PASSWORD_VALID_5) - .assertLastModifier(ACCOUNT_JACK_DUMMY_USERNAME); + .assertPassword(USER_PASSWORD_VALID_5) + .assertLastModifier(ACCOUNT_JACK_DUMMY_USERNAME); login(USER_ADMINISTRATOR_USERNAME); - Task task = createTask(TEST_NAME, getSecurityContextPrincipal()); + Task task = createTask(getSecurityContextPrincipal()); task.setChannel(SchemaConstants.CHANNEL_GUI_USER_URI); OperationResult result = task.getResult(); @@ -3672,11 +3507,11 @@ public void test564ChangeJackPasswordAdmin() throws Exception { USER_PASSWORD_VALID_5, USER_PASSWORD_VALID_6); // WHEN - when(TEST_NAME); + when(); executeChanges(objectDelta, null, task, result); // THEN - then(TEST_NAME); + then(); login(USER_ADMINISTRATOR_USERNAME); assertSuccess(result); @@ -3687,16 +3522,16 @@ public void test564ChangeJackPasswordAdmin() throws Exception { // default password mapping is normal assertDummyAccountByUsername(null, ACCOUNT_JACK_DUMMY_USERNAME) - .assertPassword(USER_PASSWORD_VALID_6) - .assertLastModifier(null); + .assertPassword(USER_PASSWORD_VALID_6) + .assertLastModifier(null); // RED password mapping is strong assertDummyAccountByUsername(RESOURCE_DUMMY_RED_NAME, ACCOUNT_JACK_DUMMY_USERNAME) - .assertFullName(USER_JACK_FULL_NAME) - .assertEnabled() - .assertPassword(USER_PASSWORD_VALID_6) - // and RED resource has no runAs capability - .assertLastModifier(null); + .assertFullName(USER_JACK_FULL_NAME) + .assertEnabled() + .assertPassword(USER_PASSWORD_VALID_6) + // and RED resource has no runAs capability + .assertLastModifier(null); // BLUE password mapping is weak, we do not really care about password change here // we do not really care about ugly resource either @@ -3704,13 +3539,11 @@ public void test564ChangeJackPasswordAdmin() throws Exception { displayAccountPasswordNotifications(); assertAccountPasswordNotifications(2); assertHasAccountPasswordNotification(null, USER_JACK_USERNAME, USER_PASSWORD_VALID_6); - assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_JACK_USERNAME, USER_PASSWORD_VALID_6); - // not BLUE, it already has a password + assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_JACK_USERNAME, USER_PASSWORD_VALID_6); + // not BLUE, it already has a password assertSingleUserPasswordNotification(USER_JACK_USERNAME, USER_PASSWORD_VALID_6); } - - protected ObjectDelta createAccountInitializationDelta(String accountOid, String newAccountPassword) { ObjectDelta shadowDelta = prismContext.deltaFactory().object() .createEmptyModifyDelta(ShadowType.class, accountOid); @@ -3771,7 +3604,7 @@ protected void assertShadowLifecycle(PrismObject shadow, String expe if (expectedLifecycle == null) { String actualLifecycle = shadow.asObjectable().getLifecycleState(); if (actualLifecycle != null && !SchemaConstants.LIFECYCLE_ACTIVE.equals(actualLifecycle)) { - fail("Expected default lifecycle for "+shadow+", but was "+actualLifecycle); + fail("Expected default lifecycle for " + shadow + ", but was " + actualLifecycle); } } else { PrismAsserts.assertPropertyValue(shadow, ObjectType.F_LIFECYCLE_STATE, expectedLifecycle); @@ -3793,8 +3626,6 @@ private void assertShadowPasswordMetadata(PrismObject shadow, */ @Test public void test900ModifyUserElainePassword() throws Exception { - final String TEST_NAME = "test900ModifyUserElainePassword"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -3822,14 +3653,12 @@ public void test900ModifyUserElainePassword() throws Exception { displayAccountPasswordNotifications(); assertAccountPasswordNotifications(3); assertHasAccountPasswordNotification(null, USER_ELAINE_USERNAME, USER_PASSWORD_VALID_1); - assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_ELAINE_USERNAME, USER_PASSWORD_VALID_1); - assertHasAccountPasswordNotification(RESOURCE_DUMMY_BLUE_NAME, USER_ELAINE_USERNAME, USER_PASSWORD_VALID_1); + assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_ELAINE_USERNAME, USER_PASSWORD_VALID_1); + assertHasAccountPasswordNotification(RESOURCE_DUMMY_BLUE_NAME, USER_ELAINE_USERNAME, USER_PASSWORD_VALID_1); } @Test public void test902SetPasswordMinAge() throws Exception { - final String TEST_NAME = "test900SetPasswordMinAge"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -3859,8 +3688,6 @@ public void test902SetPasswordMinAge() throws Exception { */ @Test public void test904ModifyUserElainePasswordAgain() throws Exception { - final String TEST_NAME = "test904ModifyUserElainePasswordAgain"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -3892,8 +3719,6 @@ public void test904ModifyUserElainePasswordAgain() throws Exception { @Test public void test906ModifyUserElainePasswordLater() throws Exception { - final String TEST_NAME = "test906ModifyUserElainePasswordLater"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -3919,8 +3744,8 @@ public void test906ModifyUserElainePasswordLater() throws Exception { displayAccountPasswordNotifications(); assertAccountPasswordNotifications(2); assertHasAccountPasswordNotification(null, USER_ELAINE_USERNAME, USER_PASSWORD_VALID_3); - assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_ELAINE_USERNAME, USER_PASSWORD_VALID_3); - // BLUE resource already has a password + assertHasAccountPasswordNotification(RESOURCE_DUMMY_RED_NAME, USER_ELAINE_USERNAME, USER_PASSWORD_VALID_3); + // BLUE resource already has a password assertSingleUserPasswordNotification(USER_ELAINE_USERNAME, USER_PASSWORD_VALID_3); } @@ -3930,8 +3755,6 @@ public void test906ModifyUserElainePasswordLater() throws Exception { */ @Test public void test910AddUserWithNoPasswordFail() throws Exception { - final String TEST_NAME = "test910AddUserWithNoPasswordFail"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -3941,7 +3764,7 @@ public void test910AddUserWithNoPasswordFail() throws Exception { try { // WHEN+THEN - when(TEST_NAME); + when(); try { UserType user = new UserType(prismContext).name("passwordless"); addObject(user.asPrismObject(), task, result); @@ -3956,12 +3779,10 @@ public void test910AddUserWithNoPasswordFail() throws Exception { } /** - * MID-4593 + * MID-4593 */ @Test public void test920AddCredentials() throws Exception { - final String TEST_NAME = "test920AddCredentials"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -3980,7 +3801,7 @@ public void test920AddCredentials() throws Exception { value.setClearValue(PASSWORD_HELLO_WORLD); CredentialsType credentials = new CredentialsType(prismContext) .beginPassword() - .value(value) + .value(value) .end(); ObjectDelta objectDelta = prismContext.deltaFor(UserType.class) .item(UserType.F_CREDENTIALS).add(credentials) @@ -3996,12 +3817,10 @@ public void test920AddCredentials() throws Exception { } /** - * MID-4593 + * MID-4593 */ @Test public void test922ReplaceCredentials() throws Exception { - final String TEST_NAME = "test922ReplaceCredentials"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -4020,7 +3839,7 @@ public void test922ReplaceCredentials() throws Exception { value.setClearValue(PASSWORD_HELLO_WORLD); CredentialsType credentials = new CredentialsType(prismContext) .beginPassword() - .value(value) + .value(value) .end(); ObjectDelta objectDelta = prismContext.deltaFor(UserType.class) .item(UserType.F_CREDENTIALS).replace(credentials) @@ -4036,12 +3855,10 @@ public void test922ReplaceCredentials() throws Exception { } /** - * MID-4593 + * MID-4593 */ @Test public void test924AddPassword() throws Exception { - final String TEST_NAME = "test924AddPassword"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -4073,12 +3890,10 @@ public void test924AddPassword() throws Exception { } /** - * MID-4593 + * MID-4593 */ @Test public void test926ReplacePassword() throws Exception { - final String TEST_NAME = "test926ReplacePassword"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -4110,12 +3925,10 @@ public void test926ReplacePassword() throws Exception { } /** - * MID-4593 + * MID-4593 */ @Test public void test928AddPasswordValue() throws Exception { - final String TEST_NAME = "test928AddPasswordValue"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -4146,12 +3959,10 @@ public void test928AddPasswordValue() throws Exception { } /** - * MID-4593 + * MID-4593 */ @Test public void test929ReplacePasswordValue() throws Exception { - final String TEST_NAME = "test929ReplacePasswordValue"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -4189,15 +4000,13 @@ public void test929ReplacePasswordValue() throws Exception { */ @Test public void test950RemoveGlobalPasswordPolicy() throws Exception { - final String TEST_NAME = "test950RemoveGlobalPasswordPolicy"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); applyPasswordPolicy(null, getSecurityPolicyOid(), task, result); modifyObjectReplaceProperty(SecurityPolicyType.class, getSecurityPolicyOid(), ItemPath.create(SecurityPolicyType.F_CREDENTIALS, CredentialsPolicyType.F_PASSWORD, PasswordCredentialsPolicyType.F_HISTORY_LENGTH), @@ -4210,7 +4019,7 @@ public void test950RemoveGlobalPasswordPolicy() throws Exception { task, result /* no value */); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject securityPolicyAfter = getObject(SecurityPolicyType.class, getSecurityPolicyOid()); @@ -4227,8 +4036,6 @@ public void test950RemoveGlobalPasswordPolicy() throws Exception { */ @Test public void test952SetupOrgPolicy() throws Exception { - final String TEST_NAME = "test952SetupOrgPolicy"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -4236,11 +4043,11 @@ public void test952SetupOrgPolicy() throws Exception { PrismObject securityPolicy = prismContext.createObject(SecurityPolicyType.class); securityPolicy.asObjectable() - .name("Ministry security policy") - .beginCredentials() + .name("Ministry security policy") + .beginCredentials() .beginPassword() - .valuePolicyRef(PASSWORD_POLICY_GLOBAL_OID, ValuePolicyType.COMPLEX_TYPE) - .historyLength(ORG_MINISTRY_OF_OFFENSE_PASSWORD_HISTORY_LENGTH); + .valuePolicyRef(PASSWORD_POLICY_GLOBAL_OID, ValuePolicyType.COMPLEX_TYPE) + .historyLength(ORG_MINISTRY_OF_OFFENSE_PASSWORD_HISTORY_LENGTH); ministrySecurityPolicyOid = addObject(securityPolicy, task, result); PrismReferenceValue securityPolicyRef = itemFactory().createReferenceValue(); @@ -4249,11 +4056,11 @@ public void test952SetupOrgPolicy() throws Exception { OrgType.F_SECURITY_POLICY_REF, task, result, securityPolicyRef); // WHEN - when(TEST_NAME); + when(); assignOrg(USER_THREE_HEADED_MONKEY_OID, ORG_MINISTRY_OF_OFFENSE_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject ministryPolicyAfter = getObject(OrgType.class, ORG_MINISTRY_OF_OFFENSE_OID); @@ -4275,8 +4082,6 @@ public void test952SetupOrgPolicy() throws Exception { */ @Test public void test954ModifyUserMonkeyPasswordAA() throws Exception { - final String TEST_NAME = "test954ModifyUserMonkeyPasswordAA"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); @@ -4284,7 +4089,7 @@ public void test954ModifyUserMonkeyPasswordAA() throws Exception { try { // WHEN - when(TEST_NAME); + when(); modifyUserChangePassword(USER_THREE_HEADED_MONKEY_OID, USER_PASSWORD_AA_CLEAR, task, result); @@ -4295,7 +4100,7 @@ public void test954ModifyUserMonkeyPasswordAA() throws Exception { } // THEN - then(TEST_NAME); + then(); assertFailure(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -4310,20 +4115,18 @@ public void test954ModifyUserMonkeyPasswordAA() throws Exception { */ @Test public void test956ModifyUserJackPasswordAA() throws Exception { - final String TEST_NAME = "test956ModifyUserJackPasswordAA"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); modifyUserChangePassword(USER_JACK_OID, USER_PASSWORD_AA_CLEAR, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_JACK_OID); @@ -4339,19 +4142,17 @@ public void test956ModifyUserJackPasswordAA() throws Exception { */ @Test public void test961RecomputeMonkey() throws Exception { - final String TEST_NAME = "test961RecomputeMonkey"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); recomputeUser(USER_THREE_HEADED_MONKEY_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -4367,19 +4168,17 @@ public void test961RecomputeMonkey() throws Exception { */ @Test public void test962ReconcileMonkey() throws Exception { - final String TEST_NAME = "test962ReconcileMonkey"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); reconcileUser(USER_THREE_HEADED_MONKEY_OID, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -4395,20 +4194,18 @@ public void test962ReconcileMonkey() throws Exception { */ @Test public void test964ModifyUserMonkeyLocality() throws Exception { - final String TEST_NAME = "test964ModifyUserMonkeyLocality"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); modifyUserReplace(USER_THREE_HEADED_MONKEY_OID, UserType.F_LOCALITY, task, result, createPolyString("Scabb Island")); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -4429,20 +4226,18 @@ public void test964ModifyUserMonkeyLocality() throws Exception { */ @Test public void test965AssignMonkeyAccountBlue() throws Exception { - final String TEST_NAME = "test965AssignMonkeyAccountBlue"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); assignAccountToUser(USER_THREE_HEADED_MONKEY_OID, RESOURCE_DUMMY_BLUE_OID, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -4463,20 +4258,18 @@ public void test965AssignMonkeyAccountBlue() throws Exception { */ @Test public void test966AssignMonkeyAccountYellow() throws Exception { - final String TEST_NAME = "test966AssignMonkeyAccountYellow"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); assignAccountToUser(USER_THREE_HEADED_MONKEY_OID, RESOURCE_DUMMY_YELLOW_OID, null, task, result); // THEN - then(TEST_NAME); + then(); assertPartialError(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -4496,31 +4289,29 @@ public void test966AssignMonkeyAccountYellow() throws Exception { */ @Test public void test970ReapplyGlobalPasswordPolicy() throws Exception { - final String TEST_NAME = "test970ReapplyGlobalPasswordPolicy"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // preconditions - assertUserBefore(USER_JACK_OID) - .displayWithProjections() - .assertLinks(4); + assertUserBefore(USER_JACK_OID) + .displayWithProjections() + .assertLinks(4); - // Make sure that no global password policy is applied by setting some insane passwords + // Make sure that no global password policy is applied by setting some insane passwords modifyUserChangePassword(USER_JACK_OID, USER_PASSWORD_LLL_CLEAR); modifyUserChangePassword(USER_JACK_OID, USER_PASSWORD_A_CLEAR); // WHEN - when(TEST_NAME); + when(); applyPasswordPolicy(PASSWORD_POLICY_GLOBAL_OID, getSecurityPolicyOid(), task, result); modifyObjectReplaceProperty(SecurityPolicyType.class, getSecurityPolicyOid(), ItemPath.create(SecurityPolicyType.F_CREDENTIALS, CredentialsPolicyType.F_PASSWORD, PasswordCredentialsPolicyType.F_HISTORY_LENGTH), task, result, GLOBAL_POLICY_NEW_PASSWORD_HISTORY_LENGTH); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject securityPolicyAfter = getObject(SecurityPolicyType.class, getSecurityPolicyOid()); @@ -4539,15 +4330,13 @@ public void test970ReapplyGlobalPasswordPolicy() throws Exception { */ @Test public void test972ChangePasswordJack() throws Exception { - final String TEST_NAME = "test970ReapplyGlobalPasswordPolicy"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); modifyUserChangePassword(USER_JACK_OID, USER_PASSWORD_VALID_1); modifyUserChangePassword(USER_JACK_OID, USER_PASSWORD_VALID_2); @@ -4568,7 +4357,7 @@ public void test972ChangePasswordJack() throws Exception { modifyUserChangePassword(USER_JACK_OID, USER_PASSWORD_VALID_1); // THEN - then(TEST_NAME); + then(); assertSuccess(result); } @@ -4581,15 +4370,13 @@ public void test972ChangePasswordJack() throws Exception { */ @Test public void test974ChangePasswordJack() throws Exception { - final String TEST_NAME = "test970ReapplyGlobalPasswordPolicy"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); modifyUserChangePassword(USER_THREE_HEADED_MONKEY_OID, USER_PASSWORD_VALID_1); modifyUserChangePassword(USER_THREE_HEADED_MONKEY_OID, USER_PASSWORD_VALID_2); @@ -4610,18 +4397,16 @@ public void test974ChangePasswordJack() throws Exception { modifyUserChangePassword(USER_THREE_HEADED_MONKEY_OID, USER_PASSWORD_VALID_2); // THEN - then(TEST_NAME); + then(); assertSuccess(result); - } - private void modifyUserChangePasswordPolicyViolation(String userOid, String newPassword) throws CommonException { - Task task = getTestTask(); + Task task = createTask("modifyUserChangePasswordPolicyViolation"); OperationResult result = task.getResult(); try { modifyUserChangePassword(userOid, newPassword, task, result); - fail("Change of password '"+newPassword+"' succeeded for user "+userOid+", expected failure"); + fail("Change of password '" + newPassword + "' succeeded for user " + userOid + ", expected failure"); } catch (PolicyViolationException e) { assertFailure(result); } @@ -4639,7 +4424,7 @@ protected PrismObject getBlueShadow(PrismObject userAfter) Collection> options = getOperationOptionsBuilder() .item(SchemaConstants.PATH_PASSWORD_VALUE).retrieve() .build(); - PrismObject shadow = modelService.getObject(ShadowType.class, accountBlueOid, options , task, result); + PrismObject shadow = modelService.getObject(ShadowType.class, accountBlueOid, options, task, result); result.computeStatus(); TestUtil.assertSuccess("getObject(Account) result not success", result); display("Blue shadow", shadow); @@ -4655,15 +4440,15 @@ protected void assertCachedResourcePassword(PrismObject shadow, Stri if (expectedPassword == null && credentials == null) { return; } - assertNotNull("Missing credentendials in repo shadow "+shadow, credentials); + assertNotNull("Missing credentendials in repo shadow " + shadow, credentials); PasswordType passwordType = credentials.getPassword(); if (expectedPassword == null && passwordType == null) { return; } - assertNotNull("Missing password credential in repo shadow "+shadow, passwordType); + assertNotNull("Missing password credential in repo shadow " + shadow, passwordType); ProtectedStringType protectedStringType = passwordType.getValue(); - assertNotNull("No password value in repo shadow "+shadow, protectedStringType); - assertProtectedString("Wrong password value in repo shadow "+shadow, expectedPassword, protectedStringType, CredentialsStorageTypeType.HASHING); + assertNotNull("No password value in repo shadow " + shadow, protectedStringType); + assertProtectedString("Wrong password value in repo shadow " + shadow, expectedPassword, protectedStringType, CredentialsStorageTypeType.HASHING); } private void assertPasswordCreateMetadata(PrismObject user) { diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefault.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefault.java index 30355144993..bfaf30dd3c7 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefault.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefault.java @@ -52,10 +52,8 @@ protected void assertShadowLifecycle(PrismObject shadow, boolean foc */ @Test public void test202ReconcileUserJack() throws Exception { - final String TEST_NAME = "test202ReconcileUserJack"; - // GIVEN - Task task = taskManager.createTaskInstance(AbstractPasswordTest.class.getName() + "." + TEST_NAME); + Task task = getTestTask(); OperationResult result = task.getResult(); PrismObject userBefore = getUser(USER_JACK_OID); @@ -63,11 +61,11 @@ public void test202ReconcileUserJack() throws Exception { assertLinks(userBefore, 4); // WHEN - when(TEST_NAME); + when(); reconcileUser(USER_JACK_OID, task, result); // THEN - then(TEST_NAME); + then(); assertPartialError(result); PrismObject userAfter = getUser(USER_JACK_OID); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.java index 686e6527cfb..568bc8c4301 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.java @@ -65,10 +65,8 @@ protected void assertShadowLifecycle(PrismObject shadow, boolean foc */ @Test public void test202ReconcileUserJack() throws Exception { - final String TEST_NAME = "test202ReconcileUserJack"; - // GIVEN - Task task = taskManager.createTaskInstance(AbstractPasswordTest.class.getName() + "." + TEST_NAME); + Task task = getTestTask(); OperationResult result = task.getResult(); PrismObject userBefore = getUser(USER_JACK_OID); @@ -124,7 +122,6 @@ protected void assert31xBluePasswordAfterPasswordChange(PrismObject us protected void assertAccountActivationNotification(String dummyResourceName, String username) { checkDummyTransportMessages(NOTIFIER_ACCOUNT_ACTIVATION_NAME, 1); String body = getDummyTransportMessageBody(NOTIFIER_ACCOUNT_ACTIVATION_NAME, 0); - //String expectedPrefix = getExpectedAccountPasswordNotificationBodyPrefix(dummyResourceName, username); if (!body.contains("activat")) { fail("Activation not mentioned in "+dummyResourceName+" dummy account activation notification message : "+body); } @@ -143,20 +140,18 @@ protected void assertAccountActivationNotification(String dummyResourceName, Str @Test @Override public void test345AssignMonkeyAccountBlue() throws Exception { - final String TEST_NAME = "test345AssignMonkeyAccountBlue"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); assignAccountToUser(USER_THREE_HEADED_MONKEY_OID, RESOURCE_DUMMY_BLUE_OID, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -168,7 +163,7 @@ public void test345AssignMonkeyAccountBlue() throws Exception { assertDummyAccount(RESOURCE_DUMMY_BLUE_NAME, USER_THREE_HEADED_MONKEY_NAME); // CLEANUP - displayCleanup(TEST_NAME); + displayCleanup(contextName()); unassignAccountFromUser(USER_THREE_HEADED_MONKEY_OID, RESOURCE_DUMMY_BLUE_OID, null, task, result); @@ -191,20 +186,18 @@ public void test345AssignMonkeyAccountBlue() throws Exception { @Test @Override public void test347AssignMonkeyAccountYellow() throws Exception { - final String TEST_NAME = "test347AssignMonkeyYellow"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); assignAccountToUser(USER_THREE_HEADED_MONKEY_OID, RESOURCE_DUMMY_YELLOW_OID, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID); @@ -217,7 +210,7 @@ public void test347AssignMonkeyAccountYellow() throws Exception { assertNoDummyAccount(RESOURCE_DUMMY_BLUE_NAME, USER_THREE_HEADED_MONKEY_NAME); // CLEANUP - displayCleanup(TEST_NAME); + displayCleanup(contextName()); unassignAccountFromUser(USER_THREE_HEADED_MONKEY_OID, RESOURCE_DUMMY_YELLOW_OID, null, task, result); @@ -241,20 +234,18 @@ public void test347AssignMonkeyAccountYellow() throws Exception { @Test @Override public void test966AssignMonkeyAccountYellow() throws Exception { - final String TEST_NAME = "test966AssignMonkeyAccountYellow"; - // GIVEN Task task = getTestTask(); OperationResult result = task.getResult(); prepareTest(); // WHEN - when(TEST_NAME); + when(); assignAccountToUser(USER_THREE_HEADED_MONKEY_OID, RESOURCE_DUMMY_YELLOW_OID, null, task, result); // THEN - then(TEST_NAME); + then(); assertSuccess(result); PrismObject userAfter = getUser(USER_THREE_HEADED_MONKEY_OID);