diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java index 686941aa62a..455e676a2b9 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java @@ -436,8 +436,10 @@ public String debugDump(int indent) { sb.append("\n"); DebugUtil.debugDumpWithLabel(sb, "forceRecon", forceRecon, indent + 1); } - if (!constructionTriple.isEmpty()) { - sb.append("\n"); + sb.append("\n"); + if (constructionTriple.isEmpty()) { + DebugUtil.debugDumpWithLabel(sb, "Constructions", "(empty)", indent+1); + } else { DebugUtil.debugDumpWithLabel(sb, "Constructions", constructionTriple, indent+1); } if (!personaConstructionTriple.isEmpty()) { diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java index e8abff73aed..a23780ec059 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java @@ -118,6 +118,9 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti initDummyResourcePirate(RESOURCE_DUMMY_LEMON_NAME, RESOURCE_DUMMY_LEMON_FILE, RESOURCE_DUMMY_LEMON_OID, initTask, initResult); + // Elaine is in inconsistent state. Account attributes do not match the mappings. + // We do not want that here, as it would add noise to preview operations. + reconcileUser(USER_ELAINE_OID, initTask, initResult); } @Test @@ -195,10 +198,10 @@ public void check(ModelContext modelContext) { private void modifyUserAddAccountImplicit(String bundleName, ObjectSource> accountSource, ObjectChecker> checker) throws Exception { final String TEST_NAME = bundleName + "Implicit"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject account = accountSource.get(); @@ -216,10 +219,10 @@ private void modifyUserAddAccountImplicit(String bundleName, ObjectSource> accountSource, ObjectChecker> checker) throws Exception { final String TEST_NAME = bundleName + "Explicit"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject account = accountSource.get(); @@ -234,10 +237,10 @@ private void modifyUserAddAccountExplicit(String bundleName, ObjectSource> accountSource, ObjectChecker> checker) throws Exception { final String TEST_NAME = bundleName + "ImplicitExplicitSame"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject account = accountSource.get(); @@ -256,10 +259,10 @@ private void modifyUserAddAccountImplicitExplicitSame(String bundleName, private void modifyUserAddAccountImplicitExplicitSameReverse(String bundleName, ObjectSource> accountSource, ObjectChecker> checker) throws Exception { final String TEST_NAME = bundleName + "ImplicitExplicitSameReverse"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject account = accountSource.get(); @@ -278,10 +281,10 @@ private void modifyUserAddAccountImplicitExplicitSameReverse(String bundleName, private void modifyUserAddAccountImplicitExplicitEqual(String bundleName, ObjectSource> accountSource, ObjectChecker> checker) throws Exception { final String TEST_NAME = bundleName + "ImplicitExplicitEqual"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject account = accountSource.get(); @@ -300,10 +303,10 @@ private void modifyUserAddAccountImplicitExplicitEqual(String bundleName, private void modifyUserAddAccountImplicitExplicitEqualReverse(String bundleName, ObjectSource> accountSource, ObjectChecker> checker) throws Exception { final String TEST_NAME = bundleName + "ImplicitExplicitEqualReverse"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject account = accountSource.get(); @@ -322,10 +325,10 @@ private void modifyUserAddAccountImplicitExplicitEqualReverse(String bundleName, private void modifyUserAddAccountImplicitExplicitNotEqual(String bundleName, ObjectSource> accountSource, ObjectChecker> checker) throws Exception { final String TEST_NAME = bundleName + "ImplicitExplicitNotEqual"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject account = accountSource.get(); @@ -346,10 +349,10 @@ private void modifyUserAddAccountImplicitExplicitNotEqual(String bundleName, private void modifyUserAddAccountImplicitExplicitNotEqualReverse(String bundleName, ObjectSource> accountSource, ObjectChecker> checker) throws Exception { final String TEST_NAME = bundleName + "ImplicitExplicitNotEqualReverse"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject account = accountSource.get(); @@ -447,10 +450,10 @@ private void assertAddAccount(ModelContext modelContext, boolean expec @Test public void test130GetAdminGuiConfig() throws Exception { final String TEST_NAME = "test130GetAdminGuiConfig"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN @@ -472,10 +475,10 @@ public void test130GetAdminGuiConfig() throws Exception { @Test public void test150GetGuybrushRefinedObjectClassDef() throws Exception { final String TEST_NAME = "test150GetGuybrushRefinedObjectClassDef"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject shadow = getShadowModel(ACCOUNT_SHADOW_GUYBRUSH_OID); @@ -498,10 +501,10 @@ public void test150GetGuybrushRefinedObjectClassDef() throws Exception { @Test public void test200ModifyUserGuybrushDeleteAccount() throws Exception { final String TEST_NAME = "test200ModifyUserGuybrushDeleteAccount"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -516,11 +519,11 @@ public void test200ModifyUserGuybrushDeleteAccount() throws Exception { display("Input deltas: ", deltas); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); ModelContext modelContext = modelInteractionService.previewChanges(deltas, new ModelExecuteOptions(), task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); display("Preview context", modelContext); assertNotNull("Null model context", modelContext); @@ -547,10 +550,10 @@ public void test200ModifyUserGuybrushDeleteAccount() throws Exception { @Test public void test210GuybrushAddAccount() throws Exception { final String TEST_NAME = "test210GuybrushAddAccount"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -560,11 +563,11 @@ public void test210GuybrushAddAccount() throws Exception { display("Input deltas: ", deltas); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); ModelContext modelContext = modelInteractionService.previewChanges(deltas, new ModelExecuteOptions(), task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); display("Preview context", modelContext); assertNotNull("Null model context", modelContext); @@ -598,10 +601,10 @@ public void test210GuybrushAddAccount() throws Exception { @Test public void test212ModifyUserAddAccountRef() throws Exception { final String TEST_NAME = "test212ModifyUserAddAccountRef"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -613,11 +616,11 @@ public void test212ModifyUserAddAccountRef() throws Exception { display("Input deltas: ", userDelta); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); ModelContext modelContext = modelInteractionService.previewChanges(deltas, new ModelExecuteOptions(), task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); display("Preview context", modelContext); assertNotNull("Null model context", modelContext); @@ -655,10 +658,10 @@ public void test212ModifyUserAddAccountRef() throws Exception { @Test public void test220PreviewJackAssignRolePirate() throws Exception { final String TEST_NAME = "test220PreviewJackAssignRolePirate"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); @@ -666,12 +669,12 @@ public void test220PreviewJackAssignRolePirate() throws Exception { ROLE_PIRATE_OID, RoleType.COMPLEX_TYPE, null, null, null, true); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); ModelContext modelContext = modelInteractionService.previewChanges(MiscSchemaUtil.createCollection(delta), null, task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); display("Preview context", modelContext); assertNotNull("Null model context", modelContext); @@ -752,10 +755,10 @@ public void test220PreviewJackAssignRolePirate() throws Exception { @Test public void test230GuybrushAssignAccountDummy() throws Exception { final String TEST_NAME = "test230GuybrushAssignAccountDummy"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); @@ -765,13 +768,13 @@ public void test230GuybrushAssignAccountDummy() throws Exception { ModelExecuteOptions options = ModelExecuteOptions.createReconcile(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modifyUserReplace(USER_GUYBRUSH_OID, new ItemPath(UserType.F_EXTENSION, PIRACY_WEAPON), task, result, "tongue"); assignAccount(USER_GUYBRUSH_OID, RESOURCE_DUMMY_OID, null, task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -786,10 +789,10 @@ public void test230GuybrushAssignAccountDummy() throws Exception { @Test public void test232PreviewGuybrushAddRolePirate() throws Exception { final String TEST_NAME = "test232PreviewGuybrushAddRolePirate"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); @@ -797,12 +800,12 @@ public void test232PreviewGuybrushAddRolePirate() throws Exception { ROLE_PIRATE_OID, RoleType.COMPLEX_TYPE, null, null, null, true); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); ModelContext modelContext = modelInteractionService.previewChanges(MiscSchemaUtil.createCollection(delta), null, task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); display("Preview context", modelContext); assertNotNull("Null model context", modelContext); @@ -854,10 +857,10 @@ public void test232PreviewGuybrushAddRolePirate() throws Exception { @Test public void test234PreviewGuybrushAddRolePirateRecon() throws Exception { final String TEST_NAME = "test234PreviewGuybrushAddRolePirateRecon"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); @@ -867,12 +870,12 @@ public void test234PreviewGuybrushAddRolePirateRecon() throws Exception { ModelExecuteOptions options = ModelExecuteOptions.createReconcile(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); ModelContext modelContext = modelInteractionService.previewChanges(MiscSchemaUtil.createCollection(delta), options, task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); display("Preview context", modelContext); assertNotNull("Null model context", modelContext); @@ -924,10 +927,10 @@ public void test234PreviewGuybrushAddRolePirateRecon() throws Exception { @Test public void test236PreviewGuybrushAddRoleSailor() throws Exception { final String TEST_NAME = "test236PreviewGuybrushAddRoleSailor"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); @@ -935,12 +938,12 @@ public void test236PreviewGuybrushAddRoleSailor() throws Exception { ROLE_SAILOR_OID, RoleType.COMPLEX_TYPE, null, null, null, true); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); ModelContext modelContext = modelInteractionService.previewChanges(MiscSchemaUtil.createCollection(delta), null, task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); display("Preview context", modelContext); assertNotNull("Null model context", modelContext); @@ -975,19 +978,19 @@ public void test236PreviewGuybrushAddRoleSailor() throws Exception { @Test public void test239GuybrushUnAssignAccountDummy() throws Exception { final String TEST_NAME = "test239GuybrushUnAssignAccountDummy"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); unassignAccount(USER_GUYBRUSH_OID, RESOURCE_DUMMY_OID, null, task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1001,19 +1004,19 @@ public void test239GuybrushUnAssignAccountDummy() throws Exception { @Test public void test240GuybrushAssignAccountDummyRelative() throws Exception { final String TEST_NAME = "test240GuybrushAssignAccountDummyRelative"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); assignAccount(USER_GUYBRUSH_OID, RESOURCE_DUMMY_RELATIVE_OID, null, task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1030,10 +1033,10 @@ public void test240GuybrushAssignAccountDummyRelative() throws Exception { @Test public void test242PreviewGuybrushAddRolePirateRelative() throws Exception { final String TEST_NAME = "test242PreviewGuybrushAddRolePirateRelative"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); @@ -1041,12 +1044,12 @@ public void test242PreviewGuybrushAddRolePirateRelative() throws Exception { ROLE_PIRATE_RELATIVE_OID, RoleType.COMPLEX_TYPE, null, null, null, true); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); ModelContext modelContext = modelInteractionService.previewChanges(MiscSchemaUtil.createCollection(delta), null, task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); display("Preview context", modelContext); assertNotNull("Null model context", modelContext); @@ -1098,10 +1101,10 @@ public void test242PreviewGuybrushAddRolePirateRelative() throws Exception { @Test public void test244PreviewGuybrushAddRolePirateRelativeRecon() throws Exception { final String TEST_NAME = "test244PreviewGuybrushAddRolePirateRelativeRecon"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); @@ -1109,12 +1112,12 @@ public void test244PreviewGuybrushAddRolePirateRelativeRecon() throws Exception ROLE_PIRATE_RELATIVE_OID, RoleType.COMPLEX_TYPE, null, null, null, true); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); ModelContext modelContext = modelInteractionService.previewChanges(MiscSchemaUtil.createCollection(delta), ModelExecuteOptions.createReconcile(), task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); display("Preview context", modelContext); assertNotNull("Null model context", modelContext); @@ -1163,19 +1166,19 @@ public void test244PreviewGuybrushAddRolePirateRelativeRecon() throws Exception @Test public void test249GuybrushUnAssignAccountDummyRelative() throws Exception { final String TEST_NAME = "test249GuybrushUnAssignAccountDummyRelative"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); unassignAccount(USER_GUYBRUSH_OID, RESOURCE_DUMMY_RELATIVE_OID, null, task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1217,10 +1220,10 @@ private void assertAccountItemModify(ObjectDelta accountDelta, @Test public void test300ModifyElaineAccountDummyReplace() throws Exception { final String TEST_NAME = "test300ModifyElaineAccountDummyReplace"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -1264,11 +1267,7 @@ ACCOUNT_SHADOW_ELAINE_DUMMY_OID, getDummyResourceObject(), DummyResourceContolle "Elaine Threepwood"); ObjectDelta accountSecondaryDelta = accContext.getSecondaryDelta(); - assertEquals("Unexpected size of account secondary delta: "+accountSecondaryDelta, 2, accountSecondaryDelta.getModifications().size()); - PrismAsserts.assertPropertyAdd(accountSecondaryDelta, - dummyResourceCtl.getAttributePath(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_DRINK_NAME), "rum"); - PrismAsserts.assertPropertyAdd(accountSecondaryDelta, - dummyResourceCtl.getAttributePath(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_QUOTE_NAME), "Arr!"); + assertNull("Unexpected account secondary delta: "+accountSecondaryDelta, accountSecondaryDelta); } /** @@ -1277,10 +1276,10 @@ ACCOUNT_SHADOW_ELAINE_DUMMY_OID, getDummyResourceObject(), DummyResourceContolle @Test public void test301ModifyElaineAccountDummyDeleteAdd() throws Exception { final String TEST_NAME = "test301ModifyElaineAccountDummyDeleteAdd"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -1327,11 +1326,7 @@ public void test301ModifyElaineAccountDummyDeleteAdd() throws Exception { getDummyResourceController().getAttributePath(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_FULLNAME_NAME), "Elaine Marley"); ObjectDelta accountSecondaryDelta = accContext.getSecondaryDelta(); - assertEquals("Unexpected size of account secondary delta: "+accountSecondaryDelta, 2, accountSecondaryDelta.getModifications().size()); - PrismAsserts.assertPropertyAdd(accountSecondaryDelta, - dummyResourceCtl.getAttributePath(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_DRINK_NAME), "rum"); - PrismAsserts.assertPropertyAdd(accountSecondaryDelta, - dummyResourceCtl.getAttributePath(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_QUOTE_NAME), "Arr!"); + assertNull("Unexpected account secondary delta: "+accountSecondaryDelta, accountSecondaryDelta); } /** @@ -1342,10 +1337,10 @@ public void test301ModifyElaineAccountDummyDeleteAdd() throws Exception { @Test public void test400ModifyElaineAccountDummyRedReplace() throws Exception { final String TEST_NAME = "test400ModifyElaineAccountDummyRedReplace"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -1378,10 +1373,10 @@ ACCOUNT_SHADOW_ELAINE_DUMMY_RED_OID, getDummyResourceObject(RESOURCE_DUMMY_RED_N @Test public void test401ModifyElaineAccountDummyRedDeleteAdd() throws Exception { final String TEST_NAME = "test401ModifyElaineAccountDummyRedDeleteAdd"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -1416,10 +1411,10 @@ public void test401ModifyElaineAccountDummyRedDeleteAdd() throws Exception { @Test public void test500ModifyElaineAccountDummyBlueReplace() throws Exception { final String TEST_NAME = "test500ModifyElaineAccountDummyBlueReplace"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -1472,10 +1467,10 @@ public void test500ModifyElaineAccountDummyBlueReplace() throws Exception { @Test public void test501ModifyElaineAccountDummyBlueDeleteAdd() throws Exception { final String TEST_NAME = "test501ModifyElaineAccountDummyBlueDeleteAdd"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -1526,14 +1521,7 @@ public void test501ModifyElaineAccountDummyBlueDeleteAdd() throws Exception { "Elaine Marley"); ObjectDelta accountSecondaryDelta = accContext.getSecondaryDelta(); - assertNotNull("Missing account secondary delta", accountSecondaryDelta); - // these are originally empty attributes with weak mappings - assertEquals("Wrong items in account secondary delta", new HashSet<>( - Arrays.asList( - dummyResourceCtlBlue.getAttributePath(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_DRINK_NAME), - dummyResourceCtlBlue.getAttributePath(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_GOSSIP_NAME), - dummyResourceCtlBlue.getAttributePath(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_QUOTE_NAME))), - new HashSet<>(accountSecondaryDelta.getModifiedItems())); + assertNull("Unexpected account secondary delta: "+accountSecondaryDelta, accountSecondaryDelta); } @@ -1543,10 +1531,10 @@ public void test501ModifyElaineAccountDummyBlueDeleteAdd() throws Exception { @Test public void test600ModifyElaineUserDummyReplace() throws Exception { final String TEST_NAME = "test600ModifyElaineUserDummyReplace"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -1556,11 +1544,11 @@ public void test600ModifyElaineUserDummyReplace() throws Exception { display("Input deltas: ", deltas); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); ModelContext modelContext = modelInteractionService.previewChanges(deltas, new ModelExecuteOptions(), task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); display("Preview context", modelContext); assertNotNull("Null model context", modelContext); @@ -1593,14 +1581,10 @@ public void test600ModifyElaineUserDummyReplace() throws Exception { ObjectDelta accountSecondaryDelta = accContext.getSecondaryDelta(); assertNotNull("No account secondary delta (default)", accountSecondaryDelta); - PrismAsserts.assertModifications(accountSecondaryDelta, 3); + PrismAsserts.assertModifications(accountSecondaryDelta, 1); PrismAsserts.assertPropertyReplace(accountSecondaryDelta, getDummyResourceController().getAttributePath(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_FULLNAME_NAME), "Elaine Threepwood"); - PrismAsserts.assertPropertyAdd(accountSecondaryDelta, - getDummyResourceController().getAttributePath(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_DRINK_NAME), "rum"); - PrismAsserts.assertPropertyAdd(accountSecondaryDelta, - getDummyResourceController().getAttributePath(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_QUOTE_NAME), "Arr!"); // RED dummy resource: strong mappings accContext = modelContext.findProjectionContext( @@ -1613,13 +1597,10 @@ public void test600ModifyElaineUserDummyReplace() throws Exception { accountSecondaryDelta = accContext.getSecondaryDelta(); assertNotNull("No account secondary delta (red)", accountSecondaryDelta); - PrismAsserts.assertModifications(accountSecondaryDelta, 2); + PrismAsserts.assertModifications(accountSecondaryDelta, 1); PrismAsserts.assertPropertyReplace(accountSecondaryDelta, getAttributePath(getDummyResourceObject(RESOURCE_DUMMY_RED_NAME), DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_FULLNAME_NAME), "Elaine Threepwood"); - PrismAsserts.assertPropertyAdd(accountSecondaryDelta, - getAttributePath(getDummyResourceObject(RESOURCE_DUMMY_RED_NAME), DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_QUOTE_NAME), - "null -- red resource"); // BLUE dummy resource: weak mappings accContext = modelContext.findProjectionContext( @@ -1631,11 +1612,10 @@ public void test600ModifyElaineUserDummyReplace() throws Exception { assertNull("Unexpected account primary delta (blue)", accountPrimaryDelta); accountSecondaryDelta = accContext.getSecondaryDelta(); - PrismAsserts.assertModifications(accountSecondaryDelta, 3); - PrismAsserts.assertPropertyAdd(accountSecondaryDelta, - getAttributePath(resourceDummyBlue, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_GOSSIP_NAME), - "SystemConfiguration"); - + PrismAsserts.assertModifications(accountSecondaryDelta, 1); + PrismAsserts.assertPropertyDelete(accountSecondaryDelta, + getAttributePath(resourceDummyBlue, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_QUOTE_NAME), + "null -- Elaine Marley"); } /** @@ -1644,10 +1624,10 @@ public void test600ModifyElaineUserDummyReplace() throws Exception { @Test public void test610ModifyElaineUserAccountDummyReplace() throws Exception { final String TEST_NAME = "test610ModifyElaineUserAccountDummyReplace"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -1668,11 +1648,11 @@ ACCOUNT_SHADOW_ELAINE_DUMMY_OID, getDummyResourceObject(), display("Input deltas: ", deltas); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); ModelContext modelContext = modelInteractionService.previewChanges(deltas, new ModelExecuteOptions(), task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); display("Preview context", modelContext); assertNotNull("Null model context", modelContext); @@ -1708,11 +1688,7 @@ ACCOUNT_SHADOW_ELAINE_DUMMY_OID, getDummyResourceObject(), "Elaine LeChuck"); ObjectDelta accountSecondaryDelta = accContext.getSecondaryDelta(); - assertEquals("Unexpected size of account secondary delta (default): "+accountSecondaryDelta, 2, accountSecondaryDelta.getModifications().size()); - PrismAsserts.assertPropertyAdd(accountSecondaryDelta, - dummyResourceCtl.getAttributePath(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_DRINK_NAME), "rum"); - PrismAsserts.assertPropertyAdd(accountSecondaryDelta, - dummyResourceCtl.getAttributePath(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_QUOTE_NAME), "Arr!"); + assertNull("Unexpected account secondary delta: "+accountSecondaryDelta, accountSecondaryDelta); // RED dummy resource: strong mappings accContext = modelContext.findProjectionContext( @@ -1724,13 +1700,10 @@ ACCOUNT_SHADOW_ELAINE_DUMMY_OID, getDummyResourceObject(), assertNull("Unexpected account primary delta (red)", accountPrimaryDelta); accountSecondaryDelta = accContext.getSecondaryDelta(); assertNotNull("No account secondary delta (red)", accountSecondaryDelta); - PrismAsserts.assertModifications(accountSecondaryDelta, 2); + PrismAsserts.assertModifications(accountSecondaryDelta, 1); PrismAsserts.assertPropertyReplace(accountSecondaryDelta, getAttributePath(getDummyResourceObject(RESOURCE_DUMMY_RED_NAME), DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_FULLNAME_NAME), "Elaine Threepwood"); - PrismAsserts.assertPropertyAdd(accountSecondaryDelta, - getAttributePath(getDummyResourceObject(RESOURCE_DUMMY_RED_NAME), DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_QUOTE_NAME), - "null -- red resource"); // BLUE dummy resource: weak mappings accContext = modelContext.findProjectionContext( @@ -1746,17 +1719,19 @@ ACCOUNT_SHADOW_ELAINE_DUMMY_OID, getDummyResourceObject(), "Elaine LeChuck"); accountSecondaryDelta = accContext.getSecondaryDelta(); - PrismAsserts.assertModifications("account secondary delta (blue)", accountSecondaryDelta, 3); - + PrismAsserts.assertModifications("account secondary delta (blue)", accountSecondaryDelta, 1); + PrismAsserts.assertPropertyDelete(accountSecondaryDelta, + getAttributePath(resourceDummyBlue, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_QUOTE_NAME), + "null -- Elaine Marley"); } @Test public void test620AddUserCapsize() throws Exception { final String TEST_NAME = "test620AddUserCapsize"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -1835,18 +1810,17 @@ public void test620AddUserCapsize() throws Exception { PrismAsserts.assertModifications(accountSecondaryDelta, 10); PrismAsserts.assertNoItemDelta(accountSecondaryDelta, getAttributePath(resourceDummyBlue, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_FULLNAME_NAME)); - assertPasswordDelta(accountSecondaryDelta); - + assertPasswordDelta(accountSecondaryDelta); } // testing multiple resources with dependencies (dummy -> dummy lemon) @Test public void test630AddUserRogers() throws Exception { final String TEST_NAME = "test630AddUserRogers"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -1939,10 +1913,10 @@ public void test630AddUserRogers() throws Exception { @Test public void test700DisableElaineAccountTwoResources() throws Exception { final String TEST_NAME = "test700DisableElaineAccountTwoResources"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestPreviewChanges.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -1985,18 +1959,13 @@ public void test700DisableElaineAccountTwoResources() throws Exception { PrismAsserts.assertPropertyReplace(accountPrimaryDelta, ACTIVATION_ADMINISTRATIVE_STATUS_PATH, ActivationStatusType.DISABLED); ObjectDelta accountSecondaryDelta = accContextDefault.getSecondaryDelta(); - PrismAsserts.assertModifications(accountSecondaryDelta, 4); + PrismAsserts.assertModifications(accountSecondaryDelta, 2); assertNotNull("No disableTimestamp delta in account secodary delta (default)", accountSecondaryDelta.findPropertyDelta( new ItemPath(ShadowType.F_ACTIVATION, ActivationType.F_DISABLE_TIMESTAMP))); PrismAsserts.assertPropertyReplace(accountSecondaryDelta, SchemaConstants.PATH_ACTIVATION_DISABLE_REASON, SchemaConstants.MODEL_DISABLE_REASON_EXPLICIT); - PrismAsserts.assertPropertyAdd(accountSecondaryDelta, - getAttributePath(getDummyResourceObject(), DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_DRINK_NAME), - "rum"); - PrismAsserts.assertPropertyAdd(accountSecondaryDelta, - getAttributePath(getDummyResourceObject(), DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_QUOTE_NAME), - "Arr!"); + // the other modification is disable timestamp ModelProjectionContext accContextBlue = modelContext.findProjectionContext( new ResourceShadowDiscriminator(RESOURCE_DUMMY_BLUE_OID, ShadowKindType.ACCOUNT, null)); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java index b91049c0eb6..6e27a38441f 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java @@ -132,13 +132,13 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti @Test public void test000Sanity() throws Exception { final String TEST_NAME = "test000Sanity"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); PrismObject systemConfiguration = modelService.getObject(SystemConfigurationType.class, SystemObjectsType.SYSTEM_CONFIGURATION.value(), null, task, result); @@ -172,10 +172,10 @@ private void assertObjectTemplate(List defaultObj @Test public void test100ModifyUserGivenName() throws Exception { final String TEST_NAME = "test100ModifyUserGivenName"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); Collection> deltas = new ArrayList>(); @@ -220,10 +220,10 @@ public void test100ModifyUserGivenName() throws Exception { @Test public void test101ModifyUserEmployeeTypePirate() throws Exception { final String TEST_NAME = "test101ModifyUserEmployeeTypePirate"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); Collection> deltas = new ArrayList>(); @@ -234,11 +234,11 @@ public void test101ModifyUserEmployeeTypePirate() throws Exception { deltas.add(userDelta); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modelService.executeChanges(deltas, null, task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -274,10 +274,10 @@ public void test101ModifyUserEmployeeTypePirate() throws Exception { @Test public void test102ModifyUserEmployeeTypeBuccaneer() throws Exception { final String TEST_NAME = "test102ModifyUserEmployeeTypeBuccaneer"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); Collection> deltas = new ArrayList>(); @@ -313,10 +313,10 @@ public void test102ModifyUserEmployeeTypeBuccaneer() throws Exception { @Test public void test103ModifyUserEmployeeTypeBartender() throws Exception { final String TEST_NAME = "test103ModifyUserEmployeeTypeBartender"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); Collection> deltas = new ArrayList>(); @@ -356,10 +356,10 @@ public void test103ModifyUserEmployeeTypeBartender() throws Exception { @Test public void test104ModifyUserCostCenter() throws Exception { final String TEST_NAME = "test104ModifyUserCostCenter"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); Collection> deltas = new ArrayList>(); @@ -395,10 +395,10 @@ public void test104ModifyUserCostCenter() throws Exception { @Test public void test105ModifyUserTelephoneNumber() throws Exception { final String TEST_NAME = "test105ModifyUserTelephoneNumber"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); Collection> deltas = new ArrayList>(); @@ -436,10 +436,10 @@ public void test105ModifyUserTelephoneNumber() throws Exception { @Test public void test106ModifyUserRemoveTelephoneNumber() throws Exception { final String TEST_NAME = "test106ModifyUserRemoveTelephoneNumber"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); Collection> deltas = new ArrayList>(); @@ -477,10 +477,10 @@ public void test106ModifyUserRemoveTelephoneNumber() throws Exception { @Test public void test107ModifyUserSetTelephoneNumber() throws Exception { final String TEST_NAME = "test107ModifyUserSetTelephoneNumber"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN @@ -517,10 +517,10 @@ public void test107ModifyUserSetTelephoneNumber() throws Exception { @Test public void test120ReconcileUser() throws Exception { final String TEST_NAME = "test121ModifyUserReplaceLocality"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN @@ -560,10 +560,10 @@ public void test120ReconcileUser() throws Exception { @Test public void test121ModifyUserReplaceLocality() throws Exception { final String TEST_NAME = "test121ModifyUserReplaceLocality"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN @@ -599,10 +599,10 @@ public void test121ModifyUserReplaceLocality() throws Exception { @Test public void test140AssignDummy() throws Exception { final String TEST_NAME = "test140AssignDummy"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN @@ -634,10 +634,10 @@ public void test140AssignDummy() throws Exception { @Test public void test149UnAssignDummy() throws Exception { final String TEST_NAME = "test149UnAssignDummy"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN @@ -668,10 +668,10 @@ public void test149UnAssignDummy() throws Exception { @Test public void test150ModifyJackOrganizationalUnitRum() throws Exception { final String TEST_NAME = "test150ModifyJackOrganizationalUnitRum"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN @@ -704,10 +704,10 @@ public void test150ModifyJackOrganizationalUnitRum() throws Exception { @Test public void test151ModifyJackOrganizationalUnitOffense() throws Exception { final String TEST_NAME = "test151ModifyJackOrganizationalUnitOffense"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN @@ -740,10 +740,10 @@ public void test151ModifyJackOrganizationalUnitOffense() throws Exception { @Test public void test152ModifyJackOrganizationalUnitAddRum() throws Exception { final String TEST_NAME = "test152ModifyJackOrganizationalUnitAddRum"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN @@ -778,10 +778,10 @@ public void test152ModifyJackOrganizationalUnitAddRum() throws Exception { @Test public void test153ModifyJackOrganizationalUnitDeleteOffense() throws Exception { final String TEST_NAME = "test153ModifyJackOrganizationalUnitDeleteOffense"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN @@ -817,10 +817,10 @@ public void test153ModifyJackOrganizationalUnitDeleteOffense() throws Exception @Test public void test155ModifyJackOrganizationalUnitFD001() throws Exception { final String TEST_NAME = "test155ModifyJackOrganizationalUnitFD001"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN @@ -859,10 +859,10 @@ public void test155ModifyJackOrganizationalUnitFD001() throws Exception { @Test public void test156ReconcileJack() throws Exception { final String TEST_NAME = "test156ReconcileJack"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN @@ -900,10 +900,10 @@ public void test156ReconcileJack() throws Exception { @Test public void test157ModifyJackOrganizationalUnitFD0023() throws Exception { final String TEST_NAME = "test157ModifyJackOrganizationalUnitFD0023"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN @@ -943,10 +943,10 @@ public void test157ModifyJackOrganizationalUnitFD0023() throws Exception { @Test public void test159ModifyJackDeleteOrganizationalUnitFD002() throws Exception { final String TEST_NAME = "test159ModifyJackDeleteOrganizationalUnitFD002"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN @@ -1003,11 +1003,9 @@ public void test160ModifyUserGivenNameAgain() throws Exception { modelService.executeChanges(deltas, null, task, result); // THEN + assertSuccess(result); + PrismObject userJack = modelService.getObject(UserType.class, USER_JACK_OID, null, task, result); - - result.computeStatus(); - TestUtil.assertSuccess(result); - PrismAsserts.assertPropertyValue(userJack.findContainer(UserType.F_EXTENSION), PIRACY_BAD_LUCK, 123L); display("Audit", dummyAuditService); @@ -1030,10 +1028,10 @@ public void test160ModifyUserGivenNameAgain() throws Exception { @Test public void test162ModifyUserGivenNameAgainPhantomChange() throws Exception { final String TEST_NAME = "test162ModifyUserGivenNameAgainPhantomChange"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = modelService.getObject(UserType.class, USER_JACK_OID, null, task, result); @@ -1047,13 +1045,12 @@ public void test162ModifyUserGivenNameAgainPhantomChange() throws Exception { deltas.add(userDelta); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modelService.executeChanges(deltas, null, task, result); // THEN - TestUtil.displayThen(TEST_NAME); - result.computeStatus(); - TestUtil.assertSuccess(result); + displayThen(TEST_NAME); + assertSuccess(result); PrismObject userJack = modelService.getObject(UserType.class, USER_JACK_OID, null, task, result); display("User after", userJack); @@ -1064,21 +1061,22 @@ public void test162ModifyUserGivenNameAgainPhantomChange() throws Exception { dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); - dummyAuditService.assertExecutionDeltas(1); + dummyAuditService.assertExecutionDeltas(2); dummyAuditService.assertHasDelta(ChangeType.MODIFY, UserType.class); + dummyAuditService.assertHasDelta(ChangeType.MODIFY, ShadowType.class); dummyAuditService.assertTarget(USER_JACK_OID); dummyAuditService.assertExecutionSuccess(); - ObjectDeltaOperation objectDeltaOperation = dummyAuditService.getExecutionDelta(0); - assertEquals("unexpected number of modifications in audited delta", 2, objectDeltaOperation.getObjectDelta().getModifications().size()); // givenName + modifyTimestamp + ObjectDeltaOperation objectDeltaOperation = dummyAuditService.getExecutionDelta(0, ChangeType.MODIFY, UserType.class); + assertEquals("unexpected number of modifications in audited delta", 4, objectDeltaOperation.getObjectDelta().getModifications().size()); // givenName + modifyTimestamp, modifyChannel, modifierRef } @Test public void test165ModifyUserGivenNameAgainAgain() throws Exception { final String TEST_NAME = "test165ModifyUserGivenNameAgainAgain"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = modelService.getObject(UserType.class, USER_JACK_OID, null, task, result); @@ -1125,10 +1123,10 @@ private void assertOnDemandOrgAssigned(String orgName, PrismObject use @Test public void test170ModifyUserGuybrushEmployeeTypeThief() throws Exception { final String TEST_NAME = "test170ModifyUserGuybrushEmployeeTypeThief"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = getUser(USER_GUYBRUSH_OID); @@ -1136,13 +1134,12 @@ public void test170ModifyUserGuybrushEmployeeTypeThief() throws Exception { assertAssignedNoRole(userBefore); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modifyUserReplace(USER_GUYBRUSH_OID, UserType.F_EMPLOYEE_TYPE, task, result, "THIEF"); // THEN - TestUtil.displayThen(TEST_NAME); - result.computeStatus(); - TestUtil.assertSuccess(result); + displayThen(TEST_NAME); + assertSuccess(result); PrismObject userAfter = modelService.getObject(UserType.class, USER_GUYBRUSH_OID, null, task, result); display("User after", userAfter); @@ -1157,10 +1154,10 @@ public void test170ModifyUserGuybrushEmployeeTypeThief() throws Exception { @Test public void test172ModifyUserGuybrushHonorificPrefix() throws Exception { final String TEST_NAME = "test172ModifyUserGuybrushHonorificPrefix"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = getUser(USER_GUYBRUSH_OID); @@ -1168,14 +1165,13 @@ public void test172ModifyUserGuybrushHonorificPrefix() throws Exception { assertAssignedNoRole(userBefore); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modifyUserReplace(USER_GUYBRUSH_OID, UserType.F_HONORIFIC_PREFIX, task, result, PrismTestUtil.createPolyString("Thf.")); // THEN - TestUtil.displayThen(TEST_NAME); - result.computeStatus(); - TestUtil.assertSuccess(result); + displayThen(TEST_NAME); + assertSuccess(result); PrismObject userAfter = modelService.getObject(UserType.class, USER_GUYBRUSH_OID, null, task, result); display("User after", userAfter); @@ -1190,10 +1186,10 @@ public void test172ModifyUserGuybrushHonorificPrefix() throws Exception { @Test public void test174ModifyUserGuybrushHonorificPrefixNone() throws Exception { final String TEST_NAME = "test174ModifyUserGuybrushHonorificPrefixNone"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = getUser(USER_GUYBRUSH_OID); @@ -1201,13 +1197,12 @@ public void test174ModifyUserGuybrushHonorificPrefixNone() throws Exception { assertAssignedRole(userBefore, ROLE_THIEF_OID); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modifyUserReplace(USER_GUYBRUSH_OID, UserType.F_HONORIFIC_PREFIX, task, result); // THEN - TestUtil.displayThen(TEST_NAME); - result.computeStatus(); - TestUtil.assertSuccess(result); + displayThen(TEST_NAME); + assertSuccess(result); PrismObject userAfter = modelService.getObject(UserType.class, USER_GUYBRUSH_OID, null, task, result); display("User after", userAfter); @@ -1221,10 +1216,10 @@ public void test174ModifyUserGuybrushHonorificPrefixNone() throws Exception { @Test public void test180ModifyUserGuybrushEmployeeTypeMarooned() throws Exception { final String TEST_NAME = "test180ModifyUserGuybrushEmployeeTypeMarooned"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = getUser(USER_GUYBRUSH_OID); @@ -1232,13 +1227,12 @@ public void test180ModifyUserGuybrushEmployeeTypeMarooned() throws Exception { assertAssignedNoRole(userBefore); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modifyUserReplace(USER_GUYBRUSH_OID, UserType.F_EMPLOYEE_TYPE, task, result, EMPLOYEE_TYPE_MAROONED); // THEN - TestUtil.displayThen(TEST_NAME); - result.computeStatus(); - TestUtil.assertSuccess(result); + displayThen(TEST_NAME); + assertSuccess(result); PrismObject userAfter = modelService.getObject(UserType.class, USER_GUYBRUSH_OID, null, task, result); display("User after", userAfter); @@ -1251,10 +1245,10 @@ public void test180ModifyUserGuybrushEmployeeTypeMarooned() throws Exception { @Test public void test189ModifyUserGuybrushEmployeeTypeNone() throws Exception { final String TEST_NAME = "test189ModifyUserGuybrushEmployeeTypeNone"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = getUser(USER_GUYBRUSH_OID); @@ -1262,13 +1256,12 @@ public void test189ModifyUserGuybrushEmployeeTypeNone() throws Exception { assertAssignedNoRole(userBefore); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modifyUserReplace(USER_GUYBRUSH_OID, UserType.F_EMPLOYEE_TYPE, task, result); // THEN - TestUtil.displayThen(TEST_NAME); - result.computeStatus(); - TestUtil.assertSuccess(result); + displayThen(TEST_NAME); + assertSuccess(result); PrismObject userAfter = modelService.getObject(UserType.class, USER_GUYBRUSH_OID, null, task, result); display("User after", userAfter); @@ -1285,10 +1278,10 @@ public void test189ModifyUserGuybrushEmployeeTypeNone() throws Exception { @Test public void test190ModifyUserGuybrushOrganizationWhateveric() throws Exception { final String TEST_NAME = "test190ModifyUserGuybrushOrganizationWhateveric"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = getUser(USER_GUYBRUSH_OID); @@ -1297,13 +1290,12 @@ public void test190ModifyUserGuybrushOrganizationWhateveric() throws Exception { assertAssignments(userBefore, 1); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modifyUserReplace(USER_GUYBRUSH_OID, UserType.F_ORGANIZATION, task, result, createPolyString("Whateveric")); // THEN - TestUtil.displayThen(TEST_NAME); - result.computeStatus(); - TestUtil.assertSuccess(result); + displayThen(TEST_NAME); + assertSuccess(result); PrismObject userAfter = modelService.getObject(UserType.class, USER_GUYBRUSH_OID, null, task, result); display("User after", userAfter); @@ -1320,10 +1312,10 @@ public void test190ModifyUserGuybrushOrganizationWhateveric() throws Exception { @Test public void test191ModifyUserGuybrushOrganizationAutomatic() throws Exception { final String TEST_NAME = "test191ModifyUserGuybrushOrganizationAutomatic"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = getUser(USER_GUYBRUSH_OID); @@ -1331,11 +1323,11 @@ public void test191ModifyUserGuybrushOrganizationAutomatic() throws Exception { assertAssignedNoRole(userBefore); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modifyUserAdd(USER_GUYBRUSH_OID, UserType.F_ORGANIZATION, task, result, createPolyString("AUTO-matic")); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1358,10 +1350,10 @@ public void test191ModifyUserGuybrushOrganizationAutomatic() throws Exception { @Test public void test192ModifyUserGuybrushOrganizationAddMixed() throws Exception { final String TEST_NAME = "test192ModifyUserGuybrushOrganizationAddMixed"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = getUser(USER_GUYBRUSH_OID); @@ -1369,7 +1361,7 @@ public void test192ModifyUserGuybrushOrganizationAddMixed() throws Exception { assertAssignments(userBefore, 2); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modifyUserAdd(USER_GUYBRUSH_OID, UserType.F_ORGANIZATION, task, result, createPolyString("DEMO-cratic"), createPolyString("AUTO-cratic"), @@ -1378,7 +1370,7 @@ public void test192ModifyUserGuybrushOrganizationAddMixed() throws Exception { ); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1409,10 +1401,10 @@ public void test192ModifyUserGuybrushOrganizationAddMixed() throws Exception { @Test public void test193ModifyUserGuybrushOrganizationAddOutOfDomain() throws Exception { final String TEST_NAME = "test193ModifyUserGuybrushOrganizationAddOutOfDomain"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = getUser(USER_GUYBRUSH_OID); @@ -1420,14 +1412,14 @@ public void test193ModifyUserGuybrushOrganizationAddOutOfDomain() throws Excepti assertAssignments(userBefore, 4); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modifyUserAdd(USER_GUYBRUSH_OID, UserType.F_ORGANIZATION, task, result, createPolyString("meritocratic"), createPolyString("piratocratic") ); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1460,10 +1452,10 @@ public void test193ModifyUserGuybrushOrganizationAddOutOfDomain() throws Excepti @Test public void test194ModifyUserGuybrushOrganizationDeleteMixed() throws Exception { final String TEST_NAME = "test194ModifyUserGuybrushOrganizationDeleteMixed"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = getUser(USER_GUYBRUSH_OID); @@ -1471,7 +1463,7 @@ public void test194ModifyUserGuybrushOrganizationDeleteMixed() throws Exception assertAssignments(userBefore, 4); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modifyUserDelete(USER_GUYBRUSH_OID, UserType.F_ORGANIZATION, task, result, createPolyString("AUTO-matic"), createPolyString("plutocratic"), @@ -1480,7 +1472,7 @@ public void test194ModifyUserGuybrushOrganizationDeleteMixed() throws Exception ); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1507,10 +1499,10 @@ public void test194ModifyUserGuybrushOrganizationDeleteMixed() throws Exception @Test public void test195ModifyUserGuybrushOrganizationDeleteOutOfDomain() throws Exception { final String TEST_NAME = "test195ModifyUserGuybrushOrganizationDeleteOutOfDomain"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = getUser(USER_GUYBRUSH_OID); @@ -1518,14 +1510,14 @@ public void test195ModifyUserGuybrushOrganizationDeleteOutOfDomain() throws Exce assertAssignments(userBefore, 2); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modifyUserDelete(USER_GUYBRUSH_OID, UserType.F_ORGANIZATION, task, result, createPolyString("piratocratic"), createPolyString("DEMO-cratic") ); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1551,10 +1543,10 @@ public void test195ModifyUserGuybrushOrganizationDeleteOutOfDomain() throws Exce @Test public void test196GuybrushAssignCaptain() throws Exception { final String TEST_NAME = "test196GuybrushAssignCaptain"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = getUser(USER_GUYBRUSH_OID); @@ -1562,11 +1554,11 @@ public void test196GuybrushAssignCaptain() throws Exception { assertAssignments(userBefore, 2); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); assignRole(USER_GUYBRUSH_OID, ROLE_CAPTAIN_OID, task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1593,18 +1585,18 @@ public void test196GuybrushAssignCaptain() throws Exception { @Test public void test197ModifyGuybrushEmployeeTypePirate() throws Exception { final String TEST_NAME = "test197ModifyGuybrushEmployeeTypePirate"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modifyUserReplace(USER_GUYBRUSH_OID, UserType.F_EMPLOYEE_TYPE, task, result, "PIRATE"); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1632,10 +1624,10 @@ public void test197ModifyGuybrushEmployeeTypePirate() throws Exception { @Test public void test198AModifyUserGuybrushOrganizationAddInDomain() throws Exception { final String TEST_NAME = "test198AModifyUserGuybrushOrganizationAddInDomain"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = getUser(USER_GUYBRUSH_OID); @@ -1643,14 +1635,14 @@ public void test198AModifyUserGuybrushOrganizationAddInDomain() throws Exception assertAssignments(userBefore, 4); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modifyUserAdd(USER_GUYBRUSH_OID, UserType.F_ORGANIZATION, task, result, createPolyString("AUTO-graphic"), createPolyString("AUTO-matic") ); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1682,10 +1674,10 @@ public void test198AModifyUserGuybrushOrganizationAddInDomain() throws Exception @Test public void test198BModifyUserGuybrushOrganizationDeleteMixed() throws Exception { final String TEST_NAME = "test198BModifyUserGuybrushOrganizationDeleteMixed"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = getUser(USER_GUYBRUSH_OID); @@ -1693,14 +1685,14 @@ public void test198BModifyUserGuybrushOrganizationDeleteMixed() throws Exception assertAssignments(userBefore, 6); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modifyUserDelete(USER_GUYBRUSH_OID, UserType.F_ORGANIZATION, task, result, createPolyString("AUTO-cratic"), createPolyString("Whateveric") ); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1728,10 +1720,10 @@ public void test198BModifyUserGuybrushOrganizationDeleteMixed() throws Exception @Test public void test199AGuyBrushModifyEmployeeTypeWannabe() throws Exception { final String TEST_NAME = "test199AGuyBrushModifyEmployeeTypeWannabe"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = getUser(USER_GUYBRUSH_OID); @@ -1739,11 +1731,11 @@ public void test199AGuyBrushModifyEmployeeTypeWannabe() throws Exception { assertAssignments(userBefore, 5); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modifyUserReplace(USER_GUYBRUSH_OID, UserType.F_EMPLOYEE_TYPE, task, result, "wannabe"); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1770,10 +1762,10 @@ public void test199AGuyBrushModifyEmployeeTypeWannabe() throws Exception { @Test public void test199BGuyBrushUnassignCaptain() throws Exception { final String TEST_NAME = "test199BGuyBrushUnassignCaptain"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = getUser(USER_GUYBRUSH_OID); @@ -1781,11 +1773,11 @@ public void test199BGuyBrushUnassignCaptain() throws Exception { assertAssignments(userBefore, 4); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); unassignRole(USER_GUYBRUSH_OID, ROLE_CAPTAIN_OID, task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1811,21 +1803,21 @@ public void test199BGuyBrushUnassignCaptain() throws Exception { @Test public void test199CModifyUserGuybrushOrganizationCleanup() throws Exception { final String TEST_NAME = "test199CModifyUserGuybrushOrganizationCleanup"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = getUser(USER_GUYBRUSH_OID); display("User before", userBefore); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modifyUserReplace(USER_GUYBRUSH_OID, UserType.F_ORGANIZATION, task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1842,10 +1834,10 @@ public void test199CModifyUserGuybrushOrganizationCleanup() throws Exception { @Test public void test200AddUserRapp() throws Exception { final String TEST_NAME = "test200AddUserRapp"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject user = PrismTestUtil.parseObject(USER_RAPP_FILE); @@ -1966,10 +1958,10 @@ public void test202AddUserMonkey() throws Exception { @Test public void test204AddUserHerman() throws Exception { final String TEST_NAME = "test204AddUserHerman"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject user = PrismTestUtil.parseObject(USER_HERMAN_FILE); @@ -2002,10 +1994,10 @@ public void test204AddUserHerman() throws Exception { @Test public void test220AssignRoleSailorToUserRapp() throws Exception { final String TEST_NAME = "test220AssignRoleSailorToUserRapp"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN @@ -2037,10 +2029,10 @@ public void test220AssignRoleSailorToUserRapp() throws Exception { @Test public void test229UnassignRoleSailorFromUserRapp() throws Exception { final String TEST_NAME = "test220AssignRoleSailorToUserRapp"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN @@ -2074,10 +2066,10 @@ public void test229UnassignRoleSailorFromUserRapp() throws Exception { @Test public void test230AssignRoleCaptainToUserRapp() throws Exception { final String TEST_NAME = "test230AssignRoleCaptainToUserRapp"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN @@ -2109,10 +2101,10 @@ public void test230AssignRoleCaptainToUserRapp() throws Exception { @Test public void test232ModifyUserRappCostCenter() throws Exception { final String TEST_NAME = "test232ModifyUserRappCostCenter"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN @@ -2145,10 +2137,10 @@ public void test232ModifyUserRappCostCenter() throws Exception { @Test public void test239UnassignRoleCaptainFromUserRapp() throws Exception { final String TEST_NAME = "test239UnassignRoleCaptainFromUserRapp"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN @@ -2177,10 +2169,10 @@ public void test239UnassignRoleCaptainFromUserRapp() throws Exception { @Test public void test240ModifyUserRappLocalityScabb() throws Exception { final String TEST_NAME = "test240ModifyUserRappLocalityScabb"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = modelService.getObject(UserType.class, USER_RAPP_OID, null, task, result); @@ -2225,10 +2217,10 @@ public void test240ModifyUserRappLocalityScabb() throws Exception { @Test public void test242AssignRoleRastamanToUserRapp() throws Exception { final String TEST_NAME = "test242AssignRoleRastamanToUserRapp"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN @@ -2266,10 +2258,10 @@ public void test242AssignRoleRastamanToUserRapp() throws Exception { @Test public void test244ModifyUserRappLocalityCoffin() throws Exception { final String TEST_NAME = "test244ModifyUserRappLocalityCoffin"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = modelService.getObject(UserType.class, USER_RAPP_OID, null, task, result); @@ -2307,10 +2299,10 @@ public void test244ModifyUserRappLocalityCoffin() throws Exception { @Test public void test245ModifyUserRappLocalityUnderReconcile() throws Exception { final String TEST_NAME = "test245ModifyUserRappLocalityUnderReconcile"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = modelService.getObject(UserType.class, USER_RAPP_OID, null, task, result); @@ -2355,10 +2347,10 @@ public void test245ModifyUserRappLocalityUnderReconcile() throws Exception { @Test public void test246ModifyUserRappTimezoneMonkey() throws Exception { final String TEST_NAME = "test246ModifyUserRappTimezoneMonkey"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = modelService.getObject(UserType.class, USER_RAPP_OID, null, task, result); @@ -2398,10 +2390,10 @@ public void test246ModifyUserRappTimezoneMonkey() throws Exception { @Test public void test247ModifyUserRappLocaleMI() throws Exception { final String TEST_NAME = "test247ModifyUserRappLocaleMI"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject userBefore = modelService.getObject(UserType.class, USER_RAPP_OID, null, task, result); @@ -2438,10 +2430,10 @@ public void test247ModifyUserRappLocaleMI() throws Exception { @Test public void test249UnassignRoleRastamanFromUserRapp() throws Exception { final String TEST_NAME = "test249UnassignRoleRastamanFromUserRapp"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN @@ -2478,10 +2470,10 @@ public void test249UnassignRoleRastamanFromUserRapp() throws Exception { @Test public void test300ImportStanFromEmeraldResource() throws Exception { final String TEST_NAME = "test300ImportStanFromEmeraldResource"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -2496,11 +2488,11 @@ public void test300ImportStanFromEmeraldResource() throws Exception { display("Shadow before", shadowBefore); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modelService.importFromResource(shadowBefore.getOid(), task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); display(result); TestUtil.assertSuccess(result); @@ -2523,10 +2515,10 @@ public void test300ImportStanFromEmeraldResource() throws Exception { @Test public void test302ModifyStanAccountAndReimport() throws Exception { final String TEST_NAME = "test302ModifyStanAccountAndReimport"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -2538,11 +2530,11 @@ public void test302ModifyStanAccountAndReimport() throws Exception { display("Shadow before", shadowBefore); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modelService.importFromResource(shadowBefore.getOid(), task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); display(result); TestUtil.assertSuccess(result); @@ -2562,10 +2554,10 @@ public void test302ModifyStanAccountAndReimport() throws Exception { @Test public void test800Kaboom() throws Exception { final String TEST_NAME = "test800Kaboom"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); @@ -2588,10 +2580,10 @@ public void test800Kaboom() throws Exception { @Test public void test900DeleteUser() throws Exception { final String TEST_NAME = "test900DeleteUser"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); @@ -2621,12 +2613,12 @@ public void test900DeleteUser() throws Exception { @Test public void test950CreateUserJackWithoutTemplate() throws Exception { final String TEST_NAME = "test950CreateUserJackWithoutTemplate"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN setDefaultUserTemplate(null); - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); @@ -2656,10 +2648,10 @@ public void test950CreateUserJackWithoutTemplate() throws Exception { @Test public void test952ModifyJackOrganizationalUnitFD004() throws Exception { final String TEST_NAME = "test952ModifyJackOrganizationalUnitFD004"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // WHEN @@ -2688,12 +2680,12 @@ public void test952ModifyJackOrganizationalUnitFD004() throws Exception { @Test public void test960ReconcileUserJackWithTemplate() throws Exception { final String TEST_NAME = "test960ModifyUserJackWithTemplate"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN setDefaultUserTemplate(USER_TEMPLATE_COMPLEX_OID); - Task task = taskManager.createTaskInstance(TestUserTemplate.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java index 44784ba01b4..74bf7c578c5 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java @@ -47,7 +47,6 @@ import com.evolveum.midpoint.common.refinery.RefinedResourceSchema; import com.evolveum.midpoint.model.api.ModelService; import com.evolveum.midpoint.model.common.stringpolicy.ValuePolicyProcessor; -import com.evolveum.midpoint.model.impl.lens.projector.credentials.CredentialPolicyEvaluator; import com.evolveum.midpoint.model.impl.sync.ReconciliationTaskHandler; import com.evolveum.midpoint.model.impl.util.DebugReconciliationTaskResultListener; import com.evolveum.midpoint.model.intest.AbstractInitializedModelIntegrationTest; @@ -309,7 +308,7 @@ protected File getDummyResourceAzureFile() { @Test public void test001SanityAzure() throws Exception { final String TEST_NAME = "test001SanityAzure"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); display("Dummy resource azure", dummyResourceAzure); @@ -328,7 +327,7 @@ public void test001SanityAzure() throws Exception { @Test public void test002SanityAzureRefined() throws Exception { final String TEST_NAME = "test002SanityAzureRefined"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // WHEN RefinedResourceSchema refinedSchemaAzure = RefinedResourceSchemaImpl.getRefinedSchema(resourceDummyAzureType, prismContext); @@ -345,10 +344,10 @@ public void test002SanityAzureRefined() throws Exception { @Test public void test100ImportStanFromResourceDummy() throws Exception { final String TEST_NAME = "test100ImportStanFromResourceDummy"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -358,11 +357,11 @@ public void test100ImportStanFromResourceDummy() throws Exception { rememberShadowFetchOperationCount(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modelService.importFromResource(ACCOUNT_STAN_OID, task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); display(result); TestUtil.assertSuccess(result); @@ -394,10 +393,10 @@ public void test100ImportStanFromResourceDummy() throws Exception { @Test public void test150ImportFromResourceDummy() throws Exception { final String TEST_NAME = "test150ImportFromResourceDummy"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -415,18 +414,18 @@ public void test150ImportFromResourceDummy() throws Exception { rememberShadowFetchOperationCount(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modelService.importFromResource(RESOURCE_DUMMY_OID, new QName(RESOURCE_DUMMY_NAMESPACE, "AccountObjectClass"), task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); OperationResult subresult = result.getLastSubresult(); TestUtil.assertInProgress("importAccountsFromResource result", subresult); waitForTaskFinish(task, true, 40000); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); TestUtil.assertSuccess(task.getResult()); assertShadowFetchOperationCountIncrement(3); @@ -460,35 +459,31 @@ public void test150ImportFromResourceDummy() throws Exception { @Test public void test155ImportFromResourceDummyAgain() throws Exception { final String TEST_NAME = "test155ImportFromResourceDummyAgain"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); dummyAuditService.clear(); rememberShadowFetchOperationCount(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modelService.importFromResource(RESOURCE_DUMMY_OID, new QName(RESOURCE_DUMMY_NAMESPACE, "AccountObjectClass"), task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); OperationResult subresult = result.getLastSubresult(); TestUtil.assertInProgress("importAccountsFromResource result", subresult); waitForTaskFinish(task, true, 40000); // THEN - TestUtil.displayThen(TEST_NAME); - TestUtil.assertSuccess(task.getResult()); + displayThen(TEST_NAME); + assertSuccess(task.getResult()); - // The fetch: search in import handler - // Even though there are outbound mappings these were already processes - // by previous import run. There are no account modifications this time. - // Therefore there should be no "fetchbacks". - assertShadowFetchOperationCountIncrement(2); + assertShadowFetchOperationCountIncrement(3); List> users = modelService.searchObjects(UserType.class, null, null, task, result); display("Users after import", users); @@ -519,10 +514,10 @@ public void test155ImportFromResourceDummyAgain() throws Exception { @Test public void test160ImportFromResourceDummyLime() throws Exception { final String TEST_NAME = "test160ImportFromResourceDummyLime"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -539,18 +534,18 @@ public void test160ImportFromResourceDummyLime() throws Exception { PrismTestUtil.createPolyString("The crew of The Elaine")); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modelService.importFromResource(RESOURCE_DUMMY_LIME_OID, new QName(RESOURCE_DUMMY_LIME_NAMESPACE, "AccountObjectClass"), task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); OperationResult subresult = result.getLastSubresult(); TestUtil.assertInProgress("importAccountsFromResource result", subresult); waitForTaskFinish(task, true, 40000); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); TestUtil.assertSuccess(task.getResult()); assertShadowFetchOperationCountIncrement(2); @@ -588,10 +583,10 @@ public void test160ImportFromResourceDummyLime() throws Exception { @Test public void test162ImportFromResourceDummyLimeRappOrganizationScummBar() throws Exception { final String TEST_NAME = "test162ImportFromResourceDummyLimeRappOrganizationScummBar"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -613,18 +608,18 @@ public void test162ImportFromResourceDummyLimeRappOrganizationScummBar() throws rememberShadowFetchOperationCount(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modelService.importFromResource(RESOURCE_DUMMY_LIME_OID, new QName(RESOURCE_DUMMY_LIME_NAMESPACE, "AccountObjectClass"), task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); OperationResult subresult = result.getLastSubresult(); TestUtil.assertInProgress("importAccountsFromResource result", subresult); waitForTaskFinish(task, true, 40000); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); TestUtil.assertSuccess(task.getResult()); assertShadowFetchOperationCountIncrement(2); @@ -667,10 +662,10 @@ public void test162ImportFromResourceDummyLimeRappOrganizationScummBar() throws @Test public void test164ImportFromResourceDummyLimeRappOrganizationNull() throws Exception { final String TEST_NAME = "test164ImportFromResourceDummyLimeRappOrganizationNull"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -694,19 +689,19 @@ public void test164ImportFromResourceDummyLimeRappOrganizationNull() throws Exce rememberShadowFetchOperationCount(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modelService.importFromResource(RESOURCE_DUMMY_LIME_OID, new QName(RESOURCE_DUMMY_LIME_NAMESPACE, "AccountObjectClass"), task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); OperationResult subresult = result.getLastSubresult(); TestUtil.assertInProgress("importAccountsFromResource result", subresult); waitForTaskFinish(task, true, 40000); // THEN - TestUtil.displayThen(TEST_NAME); - TestUtil.assertSuccess(task.getResult()); + displayThen(TEST_NAME); + assertSuccess(task.getResult()); assertShadowFetchOperationCountIncrement(2); @@ -743,10 +738,10 @@ public void test164ImportFromResourceDummyLimeRappOrganizationNull() throws Exce @Test public void test200ReconcileDummy() throws Exception { final String TEST_NAME = "test200ReconcileDummy"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -784,17 +779,17 @@ public void test200ReconcileDummy() throws Exception { reconciliationTaskResultListener.clear(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); importObjectFromFile(TASK_RECONCILE_DUMMY_SINGLE_FILE); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); waitForTaskFinish(TASK_RECONCILE_DUMMY_OID, false); // THEN - TestUtil.displayThen(TEST_NAME); - assertShadowFetchOperationCountIncrement(3); + displayThen(TEST_NAME); + assertShadowFetchOperationCountIncrement(4); reconciliationTaskResultListener.assertResult(RESOURCE_DUMMY_OID, 0, 7, 0, 0); @@ -863,10 +858,10 @@ public void test200ReconcileDummy() throws Exception { @Test public void test210ReconcileDummyBroken() throws Exception { final String TEST_NAME = "test210ReconcileDummyBroken"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -884,12 +879,12 @@ public void test210ReconcileDummyBroken() throws Exception { reconciliationTaskResultListener.clear(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); restartTask(TASK_RECONCILE_DUMMY_OID); waitForTaskFinish(TASK_RECONCILE_DUMMY_OID, false, DEFAULT_TASK_WAIT_TIMEOUT, true); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); List> users = modelService.searchObjects(UserType.class, null, null, task, result); display("Users after reconciliation (broken resource)", users); @@ -935,10 +930,10 @@ public void test210ReconcileDummyBroken() throws Exception { @Test public void test219ReconcileDummyFixed() throws Exception { final String TEST_NAME = "test219ReconcileDummyFixed"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -951,13 +946,13 @@ public void test219ReconcileDummyFixed() throws Exception { rememberShadowFetchOperationCount(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); restartTask(TASK_RECONCILE_DUMMY_OID); waitForTaskFinish(TASK_RECONCILE_DUMMY_OID, false, DEFAULT_TASK_WAIT_TIMEOUT, true); // THEN - TestUtil.displayThen(TEST_NAME); - assertShadowFetchOperationCountIncrement(3); + displayThen(TEST_NAME); + assertShadowFetchOperationCountIncrement(4); reconciliationTaskResultListener.assertResult(RESOURCE_DUMMY_OID, 0, 7, 0, 0); @@ -1015,10 +1010,10 @@ public void test219ReconcileDummyFixed() throws Exception { @Test public void test220ReconcileDummyBrokenGuybrush() throws Exception { final String TEST_NAME = "test220ReconcileDummyBrokenGuybrush"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -1037,12 +1032,12 @@ public void test220ReconcileDummyBrokenGuybrush() throws Exception { reconciliationTaskResultListener.clear(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); restartTask(TASK_RECONCILE_DUMMY_OID); waitForTaskFinish(TASK_RECONCILE_DUMMY_OID, false, DEFAULT_TASK_WAIT_TIMEOUT, true); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); List> users = modelService.searchObjects(UserType.class, null, null, task, result); display("Users after reconciliation (broken resource)", users); @@ -1090,10 +1085,10 @@ public void test220ReconcileDummyBrokenGuybrush() throws Exception { @Test public void test229ReconcileDummyFixed() throws Exception { final String TEST_NAME = "test229ReconcileDummyFixed"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -1107,13 +1102,13 @@ public void test229ReconcileDummyFixed() throws Exception { reconciliationTaskResultListener.clear(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); restartTask(TASK_RECONCILE_DUMMY_OID); waitForTaskFinish(TASK_RECONCILE_DUMMY_OID, false, DEFAULT_TASK_WAIT_TIMEOUT, true); // THEN - TestUtil.displayThen(TEST_NAME); - assertShadowFetchOperationCountIncrement(3); + displayThen(TEST_NAME); + assertShadowFetchOperationCountIncrement(4); reconciliationTaskResultListener.assertResult(RESOURCE_DUMMY_OID, 0, 7, 0, 0); @@ -1173,10 +1168,10 @@ public void test229ReconcileDummyFixed() throws Exception { @Test public void test230ReconcileDummyRename() throws Exception { final String TEST_NAME = "test230ReconcileDummyRename"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -1198,13 +1193,13 @@ public void test230ReconcileDummyRename() throws Exception { reconciliationTaskResultListener.clear(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); restartTask(TASK_RECONCILE_DUMMY_OID); waitForTaskFinish(TASK_RECONCILE_DUMMY_OID, false, DEFAULT_TASK_WAIT_TIMEOUT, true); // THEN - TestUtil.displayThen(TEST_NAME); - assertShadowFetchOperationCountIncrement(3); + displayThen(TEST_NAME); + assertShadowFetchOperationCountIncrement(4); reconciliationTaskResultListener.assertResult(RESOURCE_DUMMY_OID, 0, 7, 0, 1); @@ -1296,10 +1291,10 @@ private void addReconScripts(Collection scripts, String @Test public void test300ReconcileDummyAzureAddAccountOtis() throws Exception { final String TEST_NAME = "test300ReconcileDummyAzureAddAccountOtis"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); getDummyResource().setBreakMode(BreakMode.NONE); @@ -1314,15 +1309,15 @@ public void test300ReconcileDummyAzureAddAccountOtis() throws Exception { reconciliationTaskResultListener.clear(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); importObjectFromFile(TASK_RECONCILE_DUMMY_AZURE_FILE); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); waitForTaskFinish(TASK_RECONCILE_DUMMY_AZURE_OID, false); - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); List> users = modelService.searchObjects(UserType.class, null, null, task, result); display("Users after reconcile", users); @@ -1361,10 +1356,10 @@ public void test300ReconcileDummyAzureAddAccountOtis() throws Exception { @Test public void test310ReconcileDummyAzureAgain() throws Exception { final String TEST_NAME = "test310ReconcileDummyAzureAgain"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); getDummyResource().setBreakMode(BreakMode.NONE); @@ -1378,15 +1373,15 @@ public void test310ReconcileDummyAzureAgain() throws Exception { reconciliationTaskResultListener.clear(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); restartTask(TASK_RECONCILE_DUMMY_AZURE_OID); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); waitForTaskFinish(TASK_RECONCILE_DUMMY_AZURE_OID, false); - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); reconciliationTaskResultListener.assertResult(RESOURCE_DUMMY_AZURE_OID, 0, 1, 0, 0); List> users = modelService.searchObjects(UserType.class, null, null, task, result); @@ -1428,10 +1423,10 @@ public void test310ReconcileDummyAzureAgain() throws Exception { @Test public void test320ReconcileDummyAzureDeleteOtis() throws Exception { final String TEST_NAME = "test320ReconcileDummyAzureDeleteOtis"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); getDummyResource().setBreakMode(BreakMode.NONE); @@ -1448,15 +1443,15 @@ public void test320ReconcileDummyAzureDeleteOtis() throws Exception { reconciliationTaskResultListener.clear(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); restartTask(TASK_RECONCILE_DUMMY_AZURE_OID); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); waitForTaskFinish(TASK_RECONCILE_DUMMY_AZURE_OID, false); - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); List> users = modelService.searchObjects(UserType.class, null, null, task, result); display("Users after reconcile", users); @@ -1498,10 +1493,10 @@ public void test320ReconcileDummyAzureDeleteOtis() throws Exception { @Test public void test330ReconcileDummyAzureAddAccountRapp() throws Exception { final String TEST_NAME = "test330ReconcileDummyAzureAddAccountRapp"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); getDummyResource().setBreakMode(BreakMode.NONE); @@ -1520,15 +1515,15 @@ public void test330ReconcileDummyAzureAddAccountRapp() throws Exception { reconciliationTaskResultListener.clear(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); restartTask(TASK_RECONCILE_DUMMY_AZURE_OID); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); waitForTaskFinish(TASK_RECONCILE_DUMMY_AZURE_OID, false); - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); List> users = modelService.searchObjects(UserType.class, null, null, task, result); display("Users after reconcile", users); @@ -1593,10 +1588,10 @@ public void test330ReconcileDummyAzureAddAccountRapp() throws Exception { @Test public void test332ModifyUserRappAndReconcileDummyAzure() throws Exception { final String TEST_NAME = "test332ModifyUserRappAndReconcileDummyAzure"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); getDummyResource().setBreakMode(BreakMode.NONE); @@ -1625,15 +1620,15 @@ public void test332ModifyUserRappAndReconcileDummyAzure() throws Exception { reconciliationTaskResultListener.clear(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); restartTask(TASK_RECONCILE_DUMMY_AZURE_OID); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); waitForTaskFinish(TASK_RECONCILE_DUMMY_AZURE_OID, false); - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); List> users = modelService.searchObjects(UserType.class, null, null, task, result); display("Users after reconcile", users); @@ -1676,10 +1671,10 @@ public void test332ModifyUserRappAndReconcileDummyAzure() throws Exception { @Test public void test334AssignRoleCorpseToRappAndReconcileDummyAzure() throws Exception { final String TEST_NAME = "test334AssignRoleCorpseToRappAndReconcileDummyAzure"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.POSITIVE); getDummyResource().setBreakMode(BreakMode.NONE); @@ -1700,15 +1695,15 @@ public void test334AssignRoleCorpseToRappAndReconcileDummyAzure() throws Excepti reconciliationTaskResultListener.clear(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); restartTask(TASK_RECONCILE_DUMMY_AZURE_OID); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); waitForTaskFinish(TASK_RECONCILE_DUMMY_AZURE_OID, false); - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); List> users = modelService.searchObjects(UserType.class, null, null, task, result); display("Users after reconcile", users); @@ -1745,10 +1740,10 @@ public void test334AssignRoleCorpseToRappAndReconcileDummyAzure() throws Excepti @Test public void test339ReconcileDummyAzureDeleteRapp() throws Exception { final String TEST_NAME = "test339ReconcileDummyAzureDeleteRapp"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); getDummyResource().setBreakMode(BreakMode.NONE); @@ -1771,15 +1766,15 @@ public void test339ReconcileDummyAzureDeleteRapp() throws Exception { reconciliationTaskResultListener.clear(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); restartTask(TASK_RECONCILE_DUMMY_AZURE_OID); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); waitForTaskFinish(TASK_RECONCILE_DUMMY_AZURE_OID, false); - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); List> users = modelService.searchObjects(UserType.class, null, null, task, result); display("Users after reconcile", users); @@ -1820,10 +1815,10 @@ public void test339ReconcileDummyAzureDeleteRapp() throws Exception { @Test public void test400ReconcileDummyLimeAddAccount() throws Exception { final String TEST_NAME = "test400ReconcileDummyLimeAddAccount"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -1836,15 +1831,15 @@ public void test400ReconcileDummyLimeAddAccount() throws Exception { reconciliationTaskResultListener.clear(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); importObjectFromFile(TASK_RECONCILE_DUMMY_LIME_FILE); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); waitForTaskFinish(TASK_RECONCILE_DUMMY_LIME_OID, false); - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); List> users = modelService.searchObjects(UserType.class, null, null, task, result); display("Users after reconcile", users); @@ -1874,10 +1869,10 @@ public void test400ReconcileDummyLimeAddAccount() throws Exception { @Test public void test401ReconcileDummyLimeKateOnlyEmpty() throws Exception { final String TEST_NAME = "test401ReconcileDummyLimeKateOnlyEmpty"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -1892,11 +1887,11 @@ public void test401ReconcileDummyLimeKateOnlyEmpty() throws Exception { reconciliationTaskResultListener.clear(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); reconcileUser(userBefore.getOid(), task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1924,10 +1919,10 @@ public void test401ReconcileDummyLimeKateOnlyEmpty() throws Exception { @Test public void test402ReconcileDummyLimeKateOnlyGrog() throws Exception { final String TEST_NAME = "test402ReconcileDummyLimeKateOnlyGrog"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -1941,11 +1936,11 @@ public void test402ReconcileDummyLimeKateOnlyGrog() throws Exception { reconciliationTaskResultListener.clear(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); reconcileUser(userBefore.getOid(), task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1972,10 +1967,10 @@ public void test402ReconcileDummyLimeKateOnlyGrog() throws Exception { @Test public void test403ReconcileDummyLimeKateOnlyNoValue() throws Exception { final String TEST_NAME = "test403ReconcileDummyLimeKateOnlyNoValue"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -1990,11 +1985,11 @@ public void test403ReconcileDummyLimeKateOnlyNoValue() throws Exception { reconciliationTaskResultListener.clear(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); reconcileUser(userBefore.getOid(), task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -2019,10 +2014,10 @@ public void test403ReconcileDummyLimeKateOnlyNoValue() throws Exception { @Test public void test404ReconcileDummyLimeKateOnlyRum() throws Exception { final String TEST_NAME = "test404ReconcileDummyLimeKateOnlyRum"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -2036,11 +2031,11 @@ public void test404ReconcileDummyLimeKateOnlyRum() throws Exception { reconciliationTaskResultListener.clear(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); reconcileUser(userBefore.getOid(), task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -2067,10 +2062,10 @@ public void test404ReconcileDummyLimeKateOnlyRum() throws Exception { @Test public void test405ReconcileDummyLimeKateOnlyEmpty() throws Exception { final String TEST_NAME = "test405ReconcileDummyLimeKateOnlyEmpty"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -2084,11 +2079,11 @@ public void test405ReconcileDummyLimeKateOnlyEmpty() throws Exception { reconciliationTaskResultListener.clear(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); reconcileUser(userBefore.getOid(), task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -2115,10 +2110,10 @@ public void test405ReconcileDummyLimeKateOnlyEmpty() throws Exception { @Test public void test406ReconcileDummyLimeKateOnlyEmptyAgain() throws Exception { final String TEST_NAME = "test406ReconcileDummyLimeKateOnlyEmptyAgain"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -2129,11 +2124,11 @@ public void test406ReconcileDummyLimeKateOnlyEmptyAgain() throws Exception { reconciliationTaskResultListener.clear(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); reconcileUser(userBefore.getOid(), task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -2158,10 +2153,10 @@ public void test406ReconcileDummyLimeKateOnlyEmptyAgain() throws Exception { @Test public void test410ReconcileDummyLimeKatePassword() throws Exception { final String TEST_NAME = "test410ReconcileDummyLimeKatePassword"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -2175,11 +2170,11 @@ public void test410ReconcileDummyLimeKatePassword() throws Exception { reconciliationTaskResultListener.clear(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); reconcileUser(userBefore.getOid(), task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -2206,10 +2201,10 @@ public void test410ReconcileDummyLimeKatePassword() throws Exception { @Test public void test420ReconcileDummyLimeDeleteLinkedAccount() throws Exception { final String TEST_NAME = "test420ReconcileDummyLimeDeleteLinkedAccount"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -2221,15 +2216,15 @@ public void test420ReconcileDummyLimeDeleteLinkedAccount() throws Exception { reconciliationTaskResultListener.clear(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); restartTask(TASK_RECONCILE_DUMMY_LIME_OID); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); waitForTaskFinish(TASK_RECONCILE_DUMMY_LIME_OID, false); - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); List> users = modelService.searchObjects(UserType.class, null, null, task, result); display("Users after reconcile", users); @@ -2260,10 +2255,10 @@ public void test420ReconcileDummyLimeDeleteLinkedAccount() throws Exception { @Test public void test500ImportTAugustusFromResourceDummy() throws Exception { final String TEST_NAME = "test500ImportTAugustusFromResourceDummy"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -2276,11 +2271,11 @@ public void test500ImportTAugustusFromResourceDummy() throws Exception { rememberShadowFetchOperationCount(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modelService.importFromResource(ACCOUNT_TAUGUSTUS_OID, task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); display(result); TestUtil.assertSuccess(result); @@ -2323,10 +2318,10 @@ public void test500ImportTAugustusFromResourceDummy() throws Exception { @Test public void test502ImportAugustusFromResourceDummy() throws Exception { final String TEST_NAME = "test502ImportAugustusFromResourceDummy"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -2343,11 +2338,11 @@ public void test502ImportAugustusFromResourceDummy() throws Exception { rememberShadowFetchOperationCount(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modelService.importFromResource(ACCOUNT_AUGUSTUS_OID, task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); display(result); TestUtil.assertSuccess(result); @@ -2390,10 +2385,10 @@ public void test502ImportAugustusFromResourceDummy() throws Exception { @Test public void test510ImportFromResourceDummy() throws Exception { final String TEST_NAME = "test510ImportFromResourceDummy"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); @@ -2427,18 +2422,18 @@ public void test510ImportFromResourceDummy() throws Exception { rememberShadowFetchOperationCount(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); modelService.importFromResource(RESOURCE_DUMMY_OID, new QName(RESOURCE_DUMMY_NAMESPACE, "AccountObjectClass"), task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); OperationResult subresult = result.getLastSubresult(); TestUtil.assertInProgress("importAccountsFromResource result", subresult); waitForTaskFinish(task, true, 40000); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); TestUtil.assertSuccess(task.getResult()); // First fetch: search in import handler @@ -2480,21 +2475,21 @@ public void test510ImportFromResourceDummy() throws Exception { @Test public void test600SearchAllDummyAccounts() throws Exception { final String TEST_NAME = "test600SearchAllDummyAccounts"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); ObjectQuery query = ObjectQueryUtil.createResourceAndObjectClassQuery(RESOURCE_DUMMY_OID, new QName(RESOURCE_DUMMY_NAMESPACE, "AccountObjectClass"), prismContext); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); SearchResultList> objects = modelService.searchObjects(ShadowType.class, query, null, task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -2506,10 +2501,10 @@ public void test600SearchAllDummyAccounts() throws Exception { @Test public void test610SearchDummyAccountsNameSubstring() throws Exception { final String TEST_NAME = "test610SearchDummyAccountsNameSubstring"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); ObjectQuery query = @@ -2520,11 +2515,11 @@ public void test610SearchDummyAccountsNameSubstring() throws Exception { .build(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); SearchResultList> objects = modelService.searchObjects(ShadowType.class, query, null, task, result); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); result.computeStatus(); TestUtil.assertSuccess(result); @@ -2536,10 +2531,10 @@ public void test610SearchDummyAccountsNameSubstring() throws Exception { @Test public void test900DeleteDummyShadows() throws Exception { final String TEST_NAME = "test900DeleteDummyShadows"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // Preconditions @@ -2548,16 +2543,16 @@ public void test900DeleteDummyShadows() throws Exception { rememberShadowFetchOperationCount(); // WHEN - TestUtil.displayWhen(TEST_NAME); + displayWhen(TEST_NAME); importObjectFromFile(TASK_DELETE_DUMMY_SHADOWS_FILE); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); waitForTaskFinish(TASK_DELETE_DUMMY_SHADOWS_OID, true, 20000); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); assertShadowFetchOperationCountIncrement(0); PrismObject deleteTask = getTask(TASK_DELETE_DUMMY_SHADOWS_OID); @@ -2582,10 +2577,10 @@ public void test900DeleteDummyShadows() throws Exception { @Test public void test910DeleteDummyAccounts() throws Exception { final String TEST_NAME = "test910DeleteDummyAccounts"; - TestUtil.displayTestTile(this, TEST_NAME); + displayTestTile(TEST_NAME); // GIVEN - Task task = createTask(TestImportRecon.class.getName() + "." + TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); // Preconditions @@ -2593,17 +2588,17 @@ public void test910DeleteDummyAccounts() throws Exception { dummyAuditService.clear(); rememberShadowFetchOperationCount(); - // WHEN - TestUtil.displayWhen(TEST_NAME); + // WHEN + displayWhen(TEST_NAME); importObjectFromFile(TASK_DELETE_DUMMY_ACCOUNTS_FILE); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); waitForTaskFinish(TASK_DELETE_DUMMY_ACCOUNTS_OID, true, 20000); // THEN - TestUtil.displayThen(TEST_NAME); + displayThen(TEST_NAME); assertShadowFetchOperationCountIncrement(2); PrismObject deleteTask = getTask(TASK_DELETE_DUMMY_ACCOUNTS_OID); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportReconDeprecated.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportReconDeprecated.java index 3974b617705..d1a0590b949 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportReconDeprecated.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportReconDeprecated.java @@ -79,7 +79,4 @@ public void test910DeleteDummyAccounts() throws Exception { // Not relevant for deprecated syntax } - - - } diff --git a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java index 0e2c475d899..a1c107eed06 100644 --- a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java +++ b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java @@ -137,6 +137,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.stream.Collectors; @@ -2063,7 +2064,7 @@ protected void assertNoRoleMembershipRef(PrismObject fo assertNull("No roleMembershipRef expected in "+focus+", but found: "+memRef, memRef); } - protected void generateRoles(int numberOfRoles, String nameFormat, String oidFormat, Consumer mutator, OperationResult result) throws Exception { + protected void generateRoles(int numberOfRoles, String nameFormat, String oidFormat, BiConsumer mutator, OperationResult result) throws Exception { long startMillis = System.currentTimeMillis(); PrismObjectDefinition roleDefinition = getRoleDefinition(); @@ -2075,7 +2076,7 @@ protected void generateRoles(int numberOfRoles, String nameFormat, String oidFor roleType.setName(createPolyStringType(name)); roleType.setOid(oid); if (mutator != null) { - mutator.accept(roleType); + mutator.accept(roleType, i); } LOGGER.info("Adding {}:\n{}", role, role.debugDump(1)); repositoryService.addObject(role, null, result); @@ -2103,12 +2104,16 @@ protected String assignmentSummary(PrismObject user) { private void relationToMap(Map map, ObjectReferenceType ref) { if (ref != null) { - Integer i = map.get(ref.getRelation().getLocalPart()); + String relation = null; + if (ref.getRelation() != null) { + relation = ref.getRelation().getLocalPart(); + } + Integer i = map.get(relation); if (i == null) { i = 0; } i++; - map.put(ref.getRelation().getLocalPart(), i); + map.put(relation, i); } } diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestNotoriousRole.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestNotoriousRole.java index f5f3d23fbba..06872e13b06 100644 --- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestNotoriousRole.java +++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestNotoriousRole.java @@ -114,7 +114,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti super.initSystem(initTask, initResult); generateRoles(NUMBER_OF_LEVEL_A_ROLES, ROLE_LEVEL_A_NAME_FORMAT, ROLE_LEVEL_A_OID_FORMAT, - role -> { + (role,i) -> { role.beginInducement().targetRef(ROLE_NOTORIOUS_OID, RoleType.COMPLEX_TYPE).end(); }, initResult); diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestPlentyOfAssignments.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestPlentyOfAssignments.java index 1414ceabcc8..4f671adf6c3 100644 --- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestPlentyOfAssignments.java +++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestPlentyOfAssignments.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Map; +import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; import org.springframework.test.annotation.DirtiesContext; @@ -27,28 +28,40 @@ import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.Test; +import com.evolveum.icf.dummy.resource.DummyAccount; import com.evolveum.midpoint.model.api.context.ModelContext; import com.evolveum.midpoint.prism.PrismObject; import com.evolveum.midpoint.prism.delta.ObjectDelta; +import com.evolveum.midpoint.prism.path.ItemPath; import com.evolveum.midpoint.prism.util.PrismTestUtil; +import com.evolveum.midpoint.schema.constants.MidPointConstants; import com.evolveum.midpoint.schema.constants.SchemaConstants; import com.evolveum.midpoint.schema.internals.InternalMonitor; import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.schema.util.MiscSchemaUtil; import com.evolveum.midpoint.schema.util.ObjectTypeUtil; 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.util.exception.SchemaException; +import com.evolveum.midpoint.util.exception.SystemException; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectFactory; import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType; import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType; import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowKindType; import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType; +import com.evolveum.prism.xml.ns._public.types_3.ItemPathType; /** + * MID-3938 + * * @author Radovan Semancik - * */ @ContextConfiguration(locations = {"classpath:ctx-story-test-main.xml"}) @DirtiesContext(classMode = ClassMode.AFTER_CLASS) @@ -56,21 +69,36 @@ public class TestPlentyOfAssignments extends AbstractStoryTest { public static final File TEST_DIR = new File(MidPointTestConstants.TEST_RESOURCES_DIR, "plenty-of-assignments"); + protected static final File RESOURCE_DUMMY_FILE = new File(TEST_DIR, "resource-dummy.xml"); + protected static final String RESOURCE_DUMMY_OID = "10000000-0000-0000-0000-000000000004"; + private static final String RESOURCE_DUMMY_NS = MidPointConstants.NS_RI; + public static final File USER_CHEESE_FILE = new File(TEST_DIR, "user-cheese.xml"); public static final String USER_CHEESE_OID = "9e796c76-45e0-11e7-9dfd-1792e56081d0"; + protected static final File USER_BOB_FILE = new File(TEST_DIR, "user-bob.xml"); + protected static final String USER_BOB_OID = "f5ffef5e-4b96-11e7-8e4c-1b0bc353a751"; + protected static final String USER_BOB_USERNAME = "bob"; + protected static final String USER_BOB_FULLNAME = "Bob"; + public static final File ROLE_BASIC_FILE = new File(TEST_DIR, "role-basic.xml"); public static final String ROLE_BASIC_OID = "6909ff20-45e4-11e7-b0a3-0fe76ff4380e"; private static final int NUMBER_OF_ORDINARY_ROLES = 2; // including superuser role - private static final int NUMBER_OF_GENERATED_ROLES = 1000; - private static final String GENERATED_ROLE_OID_FORMAT = "00000000-0000-ffff-2000-00000000%04d"; + private static final int NUMBER_OF_GENERATED_EMPTY_ROLES = 1000; + private static final String GENERATED_EMPTY_ROLE_OID_FORMAT = "00000000-0000-ffff-2000-e0000000%04d"; + private static final int NUMBER_OF_GENERATED_DUMMY_ROLES = 10; + private static final String GENERATED_DUMMY_ROLE_OID_FORMAT = "00000000-0000-ffff-2000-d0000000%04d"; + private static final int NUMBER_OF_CHEESE_ASSIGNMENTS_APPROVER = 600; private static final int NUMBER_OF_CHEESE_ASSIGNMENTS_OWNER = 400; private static final int NUMBER_OF_CHEESE_ASSIGNMENTS_ORDINARY = 1; private static final int NUMBER_OF_CHEESE_ASSIGNMENTS = NUMBER_OF_CHEESE_ASSIGNMENTS_APPROVER + NUMBER_OF_CHEESE_ASSIGNMENTS_OWNER + NUMBER_OF_CHEESE_ASSIGNMENTS_ORDINARY; + + private static final int NUMBER_OF_BOB_DUMMY_ROLE_ASSIGNMENTS = NUMBER_OF_GENERATED_DUMMY_ROLES; private static final Trace LOGGER = TraceManager.getTrace(TestPlentyOfAssignments.class); + private RepoReadInspector inspector; @@ -78,16 +106,40 @@ public class TestPlentyOfAssignments extends AbstractStoryTest { public void initSystem(Task initTask, OperationResult initResult) throws Exception { super.initSystem(initTask, initResult); + initDummyResourcePirate(null, RESOURCE_DUMMY_FILE, RESOURCE_DUMMY_OID, initTask, initResult); + importObjectFromFile(ROLE_BASIC_FILE, initResult); - generateRoles(NUMBER_OF_GENERATED_ROLES, "role%04d", GENERATED_ROLE_OID_FORMAT, null, initResult); + ObjectFactory objectFactory = new ObjectFactory(); + generateRoles(NUMBER_OF_GENERATED_EMPTY_ROLES, "Empty Role %04d", GENERATED_EMPTY_ROLE_OID_FORMAT, null, initResult); + generateRoles(NUMBER_OF_GENERATED_DUMMY_ROLES, "Dummy Role %04d", GENERATED_DUMMY_ROLE_OID_FORMAT, + (role,i) -> { + ItemPathType attrPath = new ItemPathType( + new ItemPath(new QName(RESOURCE_DUMMY_NS, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_DRINK_NAME))); + JAXBElement evaluator = objectFactory.createValue(String.format("bottle of rum #%04d", i)); + role + .beginInducement() + .beginConstruction() + .resourceRef(RESOURCE_DUMMY_OID, ResourceType.COMPLEX_TYPE) + .kind(ShadowKindType.ACCOUNT) + .beginAttribute() + .ref(attrPath) + .beginOutbound() + .beginExpression() + .expressionEvaluator(evaluator); + try { + IntegrationTestTools.displayXml("RRRRRRRRR", role.asPrismObject()); + } catch (SchemaException e) { + throw new SystemException(e); + } + }, initResult); inspector = new RepoReadInspector(); InternalMonitor.setInspector(inspector); } - private String generateRoleOid(int num) { - return String.format(GENERATED_ROLE_OID_FORMAT, num); + private String generateRoleOid(String format, int num) { + return String.format(format, num); } @Test @@ -95,7 +147,7 @@ public void test000Sanity() throws Exception { final String TEST_NAME = "test000Sanity"; displayTestTile(TEST_NAME); - assertObjects(RoleType.class, NUMBER_OF_GENERATED_ROLES + NUMBER_OF_ORDINARY_ROLES); + assertObjects(RoleType.class, NUMBER_OF_GENERATED_EMPTY_ROLES + NUMBER_OF_GENERATED_DUMMY_ROLES + NUMBER_OF_ORDINARY_ROLES); display("Repo reads", InternalMonitor.getRepositoryReadCount()); display("Object compares", InternalMonitor.getPrismObjectCompareCount()); @@ -234,39 +286,96 @@ public void test120CheesePreviewChanges() throws Exception { private PrismObject prepareCheese() throws Exception { PrismObject cheese = PrismTestUtil.parseObject(USER_CHEESE_FILE); - addAssignments(cheese, SchemaConstants.ORG_APPROVER, 0, NUMBER_OF_CHEESE_ASSIGNMENTS_APPROVER); - addAssignments(cheese, SchemaConstants.ORG_OWNER, NUMBER_OF_CHEESE_ASSIGNMENTS_APPROVER, NUMBER_OF_CHEESE_ASSIGNMENTS_OWNER); + addAssignments(cheese, GENERATED_EMPTY_ROLE_OID_FORMAT, SchemaConstants.ORG_APPROVER, 0, NUMBER_OF_CHEESE_ASSIGNMENTS_APPROVER); + addAssignments(cheese, GENERATED_EMPTY_ROLE_OID_FORMAT, SchemaConstants.ORG_OWNER, NUMBER_OF_CHEESE_ASSIGNMENTS_APPROVER, NUMBER_OF_CHEESE_ASSIGNMENTS_OWNER); return cheese; } + + private void assertCheeseRoleMembershipRef(PrismObject cheese) { + + assertRoleMembershipRefs(cheese, GENERATED_EMPTY_ROLE_OID_FORMAT, SchemaConstants.ORG_APPROVER, 0, NUMBER_OF_CHEESE_ASSIGNMENTS_APPROVER); + assertRoleMembershipRefs(cheese, GENERATED_EMPTY_ROLE_OID_FORMAT, SchemaConstants.ORG_OWNER, NUMBER_OF_CHEESE_ASSIGNMENTS_APPROVER, NUMBER_OF_CHEESE_ASSIGNMENTS_OWNER); + + assertRoleMembershipRef(cheese, ROLE_BASIC_OID, SchemaConstants.ORG_DEFAULT); + + assertRoleMembershipRefs(cheese, NUMBER_OF_CHEESE_ASSIGNMENTS); + } + + /** + * MID-3938 #8 + */ + @Test + public void test200AddBob() throws Exception { + final String TEST_NAME = "test200AddBob"; + displayTestTile(TEST_NAME); + + Task task = createTask(TEST_NAME); + OperationResult result = task.getResult(); + + PrismObject userBefore = PrismTestUtil.parseObject(USER_BOB_FILE); + addAssignments(userBefore, GENERATED_DUMMY_ROLE_OID_FORMAT, null, 0, NUMBER_OF_BOB_DUMMY_ROLE_ASSIGNMENTS); + display("User before", assignmentSummary(userBefore)); + + inspector.reset(); + rememberPrismObjectCompareCount(); + rememberRepositoryReadCount(); + long startMillis = System.currentTimeMillis(); + + // WHEN + displayWhen(TEST_NAME); + + addObject(userBefore, task, result); + + // THEN + displayThen(TEST_NAME); + long endMillis = System.currentTimeMillis(); + assertSuccess(result); + + display("Added jack in "+(endMillis - startMillis)+"ms ("+((endMillis - startMillis)/NUMBER_OF_BOB_DUMMY_ROLE_ASSIGNMENTS)+"ms per assignment)"); + + PrismObject userAfter = getUser(USER_BOB_OID); + display("User after", assignmentSummary(userAfter)); + assertBobRoleMembershipRef(userAfter); + + display("Repo reads", InternalMonitor.getRepositoryReadCount()); + display("Object compares", InternalMonitor.getPrismObjectCompareCount()); + + display("Inspector", inspector); + +// inspector.assertRead(RoleType.class, NUMBER_OF_JACK_DUMMY_ROLE_ASSIGNMENTS); +// assertRepositoryReadCount(xxx); // may be influenced by tasks + + assertPrismObjectCompareCount(0); + + DummyAccount dummyAccount = assertDummyAccount(null, USER_BOB_USERNAME, USER_BOB_FULLNAME, true); + display("Dummy account", dummyAccount); + // TODO: assert drink: bottles of rum + } - private void addAssignments(PrismObject user, QName relation, int offset, int num) { + private void assertBobRoleMembershipRef(PrismObject user) { + + assertRoleMembershipRefs(user, GENERATED_DUMMY_ROLE_OID_FORMAT, null, 0, NUMBER_OF_BOB_DUMMY_ROLE_ASSIGNMENTS); + assertRoleMembershipRefs(user, NUMBER_OF_BOB_DUMMY_ROLE_ASSIGNMENTS); + } + + private void addAssignments(PrismObject user, String roleOidFormat, QName relation, int offset, int num) { UserType userType = user.asObjectable(); for (int i = 0; i < num; i++) { AssignmentType assignmentType = new AssignmentType(); - String oid = generateRoleOid(offset + i); + String oid = generateRoleOid(roleOidFormat, offset + i); assignmentType.targetRef(oid, RoleType.COMPLEX_TYPE, relation); userType.getAssignment().add(assignmentType); } } - private void assertCheeseRoleMembershipRef(PrismObject cheese) { - - assertRoleMembershipRefs(cheese, SchemaConstants.ORG_APPROVER, 0, NUMBER_OF_CHEESE_ASSIGNMENTS_APPROVER); - assertRoleMembershipRefs(cheese, SchemaConstants.ORG_OWNER, NUMBER_OF_CHEESE_ASSIGNMENTS_APPROVER, NUMBER_OF_CHEESE_ASSIGNMENTS_OWNER); - - assertRoleMembershipRef(cheese, ROLE_BASIC_OID, SchemaConstants.ORG_DEFAULT); - - assertRoleMembershipRefs(cheese, NUMBER_OF_CHEESE_ASSIGNMENTS); - } - - private void assertRoleMembershipRefs(PrismObject user, QName relation, int offset, int num) { + private void assertRoleMembershipRefs(PrismObject user, String roleOidFormat, QName relation, int offset, int num) { for (int i = 0; i < num; i++) { - assertRoleMembershipRef(user, relation, offset + i); + assertRoleMembershipRef(user, roleOidFormat, relation, offset + i); } } - private void assertRoleMembershipRef(PrismObject user, QName relation, int num) { - assertRoleMembershipRef(user, generateRoleOid(num), relation); + private void assertRoleMembershipRef(PrismObject user, String roleOidFormat, QName relation, int num) { + assertRoleMembershipRef(user, generateRoleOid(roleOidFormat, num), relation); } private void assertRoleMembershipRef(PrismObject user, String roleOid, QName relation) { diff --git a/testing/story/src/test/resources/plenty-of-assignments/resource-dummy.xml b/testing/story/src/test/resources/plenty-of-assignments/resource-dummy.xml new file mode 100644 index 00000000000..250621bae22 --- /dev/null +++ b/testing/story/src/test/resources/plenty-of-assignments/resource-dummy.xml @@ -0,0 +1,341 @@ + + + + + + Dummy Resource + + + + + connectorType + com.evolveum.icf.dummy.connector.DummyConnector + + + connectorVersion + 2.0 + + + + + + + + + + whatever + + USEless + true + + + + false + false + false + + + + + + + account + default + true + ri:AccountObjectClass + + icfs:name + Username + + strong + + $user/name + + + + + + + + icfs:uid + + + ri:fullname + + + $user/fullName + + + + + ri:title + true + + + ri:location + Location + + strong + + + $user/locality + + + + + + ri:ship + Ship + + + + + + organizationalUnit + + + + + + + + ri:loot + Loot + explicit + + http://pirates.net/avast + + + + + + + ri:weapon + Weapon + + weak + + + declare namespace piracy = "http://midpoint.evolveum.com/xml/ns/samples/piracy"; + $user/extension/piracy:weapon + + + + + + ri:drink + Drink + false + + strong + + barrel of rum + + + + + ri:quote + Quote + false + + strong + + Arr! + + + + + ri:gossip + Gossip + true + + + ri:water + + true + + + + + ri:group + false + entitlement + group + objectToSubject + ri:members + icfs:name + + + + ri:priv + entitlement + privilege + subjectToObject + ri:privileges + icfs:name + + + + 5 + + + + + + + + + + + + + + + + + + + + + + + + entitlement + group + true + ri:GroupObjectClass + + icfs:name + Groupname + mr:stringIgnoreCase + true + + + $focus/name + + + declare namespace t="http://prism.evolveum.com/xml/ns/public/types-3"; + t:norm + + + + + ri:description + + + $focus/description + + + + + ri:cc + + weak + + + declare namespace piracy = "http://midpoint.evolveum.com/xml/ns/samples/piracy"; + $focus/extension/piracy:costCenter + + + + + + ri:members + minimal + + + + + entitlement + privilege + false + ri:CustomprivilegeObjectClass + + + + + + true + true + + + + + ri:AccountObjectClass + account + default + true + + + name + + declare namespace icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"; + $account/attributes/icfs:name + + + + + linked + true + + + deleted + true + + http://midpoint.evolveum.com/xml/ns/public/model/action-3#unlink + + + + unlinked + true + + http://midpoint.evolveum.com/xml/ns/public/model/action-3#link + + + + unmatched + true + + http://midpoint.evolveum.com/xml/ns/public/model/action-3#addFocus + + + + + + + diff --git a/testing/story/src/test/resources/plenty-of-assignments/user-bob.xml b/testing/story/src/test/resources/plenty-of-assignments/user-bob.xml new file mode 100644 index 00000000000..eeeb16d5446 --- /dev/null +++ b/testing/story/src/test/resources/plenty-of-assignments/user-bob.xml @@ -0,0 +1,37 @@ + + + + bob + This user has many roles with construction for the same resource + Bob + + + + + + + bobAbobek + + + + +