From b17ea5035384bc69cdd55b1abe25440a2198b289 Mon Sep 17 00:00:00 2001 From: Richard Richter Date: Fri, 27 Mar 2020 15:38:24 +0100 Subject: [PATCH 1/4] InfratestMixin (before OperationResultTestMixin) has more competencies - offers displayDumpable(String title, DebugDumpable dumpable) This is still not used from various static and other contexts where the code is not on the test class itself (various Asserters). It should happen too, but it's too much work for a single commit. - tests use this new display(title, dumpable) - and various cleanup - and Mutinier(Franch?)->Mutineer typo fix - each display is prefixed with time+thread name on stdout (This, again, does not cover those display implemented elsewhere.) --- .../TestIntegrationObjectWrapperFactory.java | 257 +++++----- .../midpoint/web/TestDescriptorLoader.java | 23 +- .../midpoint/web/TestInitialObjects.java | 2 +- .../validator/test/BasicValidatorTest.java | 23 +- .../test/UnknownNodeValidationTest.java | 14 +- .../midpoint/prism/util/PrismTestUtil.java | 1 - ...sultTestMixin.java => InfraTestMixin.java} | 16 +- .../test/TestCertificationBasic.java | 2 +- .../test/TestCriticalRolesCertification.java | 30 +- .../certification/test/TestEscalation.java | 10 +- .../test/TestRoleInducementCertification.java | 16 +- .../test/TestSoDCertification.java | 2 +- .../model/common/AbstractModelCommonTest.java | 6 +- .../expression/script/AbstractScriptTest.java | 9 +- .../expression/script/TestScriptCaching.java | 11 +- .../common/mapping/TestMappingDomain.java | 15 +- .../model/common/mapping/TestMappingTime.java | 7 +- .../model/impl/lens/Construction.java | 81 ++- ...actModelImplementationIntegrationTest.java | 2 +- .../model/impl/TestRefinedSchema.java | 16 +- .../impl/expr/ExpressionHandlerImplTest.java | 4 +- .../model/impl/expr/TestFilterExpression.java | 36 +- .../model/impl/lens/AbstractLensTest.java | 29 +- .../lens/TestAbstractAssignmentEvaluator.java | 12 +- .../impl/lens/TestAssignmentProcessor.java | 79 ++- .../impl/lens/TestAssignmentProcessor2.java | 78 +-- .../model/impl/lens/TestClockwork.java | 16 +- .../model/impl/lens/TestDependencies.java | 38 +- .../model/impl/lens/TestPolicyRules.java | 52 +- .../model/impl/lens/TestPolicyRules2.java | 59 +-- .../impl/lens/TestPolicyStateRecording.java | 26 +- .../model/impl/lens/TestProjector.java | 148 +++--- .../model/impl/lens/TestProjectorPersona.java | 10 +- .../lens/TestProjectorRoleEntitlement.java | 10 +- .../TestAbstractAuthenticationEvaluator.java | 2 +- .../impl/sync/TestSynchronizationService.java | 44 +- .../model/impl/visualizer/TestVisualizer.java | 22 +- .../{role-mutinier.xml => role-mutineer.xml} | 8 +- .../midpoint/model/intest/TestActivation.java | 26 +- .../model/intest/TestConnectorDummyFake.java | 6 +- .../model/intest/TestEntitlements.java | 122 ++--- .../midpoint/model/intest/TestInbounds.java | 42 +- .../midpoint/model/intest/TestIntent.java | 10 +- .../midpoint/model/intest/TestIteration.java | 36 +- .../midpoint/model/intest/TestMerge.java | 8 +- .../intest/TestModelServiceContract.java | 110 ++-- .../model/intest/TestNotifications.java | 22 +- .../model/intest/TestPreviewChanges.java | 64 +-- .../midpoint/model/intest/TestResources.java | 12 +- .../model/intest/TestScriptHooks.java | 2 +- .../model/intest/TestStrangeCases.java | 10 +- .../model/intest/TestUserTemplate.java | 4 +- .../midpoint/model/intest/TestVolatility.java | 4 +- .../intest/archetypes/TestCollections.java | 2 +- .../model/intest/gensync/TestEditSchema.java | 263 +++++----- .../intest/gensync/TestRoleEntitlement.java | 50 +- .../intest/importer/AbstractImportTest.java | 26 +- .../AbstractDirectManualResourceTest.java | 2 +- .../AbstractGroupingManualResourceTest.java | 2 +- .../manual/AbstractManualResourceTest.java | 4 +- .../manual/TestDummyItsmIntegration.java | 2 +- .../TestSemiManualGroupingProposed.java | 4 +- .../model/intest/mapping/TestMapping.java | 150 +++--- .../intest/mapping/TestMappingInbound.java | 20 +- .../midpoint/model/intest/misc/TestMisc.java | 2 +- .../model/intest/multi/TestMultiResource.java | 64 +-- .../intest/negative/TestAssignmentErrors.java | 10 +- .../intest/negative/TestBrokenResources.java | 2 +- .../model/intest/orgstruct/TestOrgStruct.java | 2 +- .../intest/password/AbstractPasswordTest.java | 5 +- .../model/intest/rbac/TestMetaMeta.java | 12 +- .../midpoint/model/intest/rbac/TestRbac.java | 12 +- .../intest/rbac/TestSegregationOfDuties.java | 6 +- .../intest/scripting/TestScriptingBasic.java | 22 +- .../intest/security/AbstractSecurityTest.java | 6 +- .../intest/security/TestSecurityAdvanced.java | 38 +- .../intest/security/TestSecurityBasic.java | 426 ++++++++-------- .../security/TestSecurityPrincipal.java | 20 +- .../AbstractSynchronizationStoryTest.java | 4 +- .../model/intest/sync/TestImportRecon.java | 56 +- .../intest/sync/TestInboundReconTask.java | 2 +- .../intest/sync/TestParallelDiscovery.java | 10 +- .../sync/TestParallelSynchronization.java | 6 +- .../intest/sync/TestProgressReporting.java | 8 +- .../model/intest/sync/TestRecomputeTask.java | 4 +- .../midpoint/model/intest/sync/TestUuid.java | 6 +- .../sync/TestValidityRecomputeTask.java | 4 +- .../test/AbstractModelIntegrationTest.java | 34 +- .../wf/impl/AbstractWfTestPolicy.java | 14 +- .../impl/association/TestAddAssociation.java | 21 +- .../wf/impl/other/ManualResourceTest.java | 8 +- .../wf/impl/other/TestEscalation.java | 53 +- .../wf/impl/other/TestMiscellaneous.java | 33 +- .../AbstractProvisioningIntegrationTest.java | 2 +- .../impl/async/TestAsyncUpdate.java | 18 +- .../impl/csv/AbstractCsvTest.java | 6 +- .../impl/dummy/AbstractBasicDummyTest.java | 10 +- .../provisioning/impl/dummy/TestDummy.java | 90 ++-- .../impl/dummy/TestDummyCaching.java | 2 +- .../impl/dummy/TestDummyCaseIgnore.java | 8 +- .../impl/dummy/TestDummyConsistency.java | 8 +- .../impl/dummy/TestDummyExtra.java | 8 +- .../impl/dummy/TestDummyLegacy.java | 4 +- .../impl/dummy/TestDummyLimited.java | 58 +-- .../impl/dummy/TestDummyParallelism.java | 6 +- .../TestDummyPrioritiesAndReadReplace.java | 4 +- .../TestDummyResourceAndSchemaCaching.java | 26 +- .../impl/dummy/TestDummySchemaless.java | 8 +- .../impl/dummy/TestDummySecurity.java | 8 +- .../manual/AbstractManualResourceTest.java | 8 +- .../provisioning/impl/opendj/TestOpenDj.java | 34 +- .../impl/opendj/TestOpenDjNegative.java | 4 +- .../ucf/impl/connid/AbstractUcfDummyTest.java | 9 +- .../ucf/impl/connid/TestUcfDummy.java | 20 +- .../ucf/impl/connid/TestUcfDummyMulti.java | 20 +- .../ucf/impl/connid/TestUcfOpenDj.java | 6 +- .../repo/cache/TestRepositoryCache.java | 11 +- .../midpoint/repo/sql/BaseSQLRepoTest.java | 6 +- .../midpoint/test/AbstractHigherUnitTest.java | 7 +- .../test/AbstractIntegrationTest.java | 42 +- .../test/asserter/ShadowAsserter.java | 65 +-- .../midpoint/security/impl/TestEmpty.java | 2 +- .../quartzimpl/AbstractTaskManagerTest.java | 7 +- .../testing/conntest/Abstract389DsDnTest.java | 2 +- .../testing/conntest/AbstractLdapTest.java | 10 +- .../testing/conntest/ad/AdTestMixin.java | 477 ++++++++---------- .../midpoint/testing/longtest/TestRunAs.java | 2 +- .../testing/rest/TestAbstractRestService.java | 108 ++-- .../TestRestServiceProxyAuthentication.java | 11 +- .../midpoint/testing/sanity/TestSanity.java | 2 +- .../testing/story/AbstractStoryTest.java | 2 +- .../TestConfiguredCapabilitiesActivation.java | 8 +- .../story/TestConsistencyMechanism.java | 2 +- .../story/TestInboundOutboundAssociation.java | 26 +- .../testing/story/TestLiveSyncMadness.java | 6 +- .../testing/story/TestNullAttribute.java | 4 +- .../testing/story/TestOperationPerf.java | 4 +- .../story/TestPlentyOfAssignments.java | 22 +- .../testing/story/TestReconNullValue.java | 4 +- .../midpoint/testing/story/TestStrings.java | 32 +- .../midpoint/testing/story/TestUnix.java | 24 +- .../testing/story/TestUnixTolerantAux.java | 4 +- .../ldap/TestLdapAssociationPerformance.java | 2 +- .../testing/story/ldap/TestLdapComplex.java | 2 +- .../testing/story/ldap/TestLdapMutilated.java | 2 +- .../hierarchy/AbstractLdapHierarchyTest.java | 2 +- .../notorious/AbstractNotoriousTest.java | 2 +- .../story/security/TestRoleMembers.java | 2 +- .../tools/testng/MidpointTestMixin.java | 50 +- 149 files changed, 2125 insertions(+), 2303 deletions(-) rename infra/test-util/src/main/java/com/evolveum/midpoint/test/util/{OperationResultTestMixin.java => InfraTestMixin.java} (51%) rename model/model-impl/src/test/resources/lens/{role-mutinier.xml => role-mutineer.xml} (86%) diff --git a/gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/TestIntegrationObjectWrapperFactory.java b/gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/TestIntegrationObjectWrapperFactory.java index 7cf9595729c..6d9922c615a 100644 --- a/gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/TestIntegrationObjectWrapperFactory.java +++ b/gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/TestIntegrationObjectWrapperFactory.java @@ -11,7 +11,6 @@ import static com.evolveum.midpoint.web.AdminGuiTestConstants.*; import java.io.File; -import java.io.IOException; import java.util.*; import java.util.stream.Collectors; @@ -113,7 +112,6 @@ public class TestIntegrationObjectWrapperFactory extends AbstractInitializedGuiI private String userWallyOid; private String accountWallyOid; - @Override public void initSystem(Task initTask, OperationResult initResult) throws Exception { super.initSystem(initTask, initResult); @@ -146,12 +144,12 @@ public void test100CreateWrapperUserJack() throws Exception { // THEN then(); - PrismTestUtil.display("Wrapper after", objectWrapper); + displayDumpable("Wrapper after", objectWrapper); WrapperTestUtil.assertWrapper(objectWrapper, getString("prismContainer.mainPanelDisplayName"), "user description", user, userOld, ItemStatus.NOT_CHANGED); assertContainersPaths(objectWrapper, BASIC_USER_CONTAINERS_PATHS); - assertEquals("wrong number of containers in "+objectWrapper, 1, objectWrapper.getValues().size()); + assertEquals("wrong number of containers in " + objectWrapper, 1, objectWrapper.getValues().size()); PrismObjectValueWrapper mainContainerValueWrapper = objectWrapper.getValue(); WrapperTestUtil.assertPropertyWrapperByName(mainContainerValueWrapper, UserType.F_NAME, PrismTestUtil.createPolyString(USER_JACK_USERNAME)); WrapperTestUtil.assertPropertyWrapperByName(mainContainerValueWrapper, UserType.F_TIMEZONE, null); @@ -161,12 +159,12 @@ public void test100CreateWrapperUserJack() throws Exception { PrismContainerWrapper activationContainerWrapper = objectWrapper.findContainer(UserType.F_ACTIVATION); WrapperTestUtil.assertWrapper(activationContainerWrapper, getString("ActivationType.activation"), UserType.F_ACTIVATION, user, ItemStatus.NOT_CHANGED); - assertEquals("wrong number of containers in "+activationContainerWrapper, 1, activationContainerWrapper.getValues().size()); + assertEquals("wrong number of containers in " + activationContainerWrapper, 1, activationContainerWrapper.getValues().size()); PrismContainerValueWrapper activationContainerValueWrapper = activationContainerWrapper.getValues().iterator().next(); WrapperTestUtil.assertPropertyWrapperByName(activationContainerValueWrapper, ActivationType.F_ADMINISTRATIVE_STATUS, ActivationStatusType.ENABLED); WrapperTestUtil.assertPropertyWrapperByName(activationContainerValueWrapper, ActivationType.F_LOCKOUT_STATUS, null); - assertEquals("Wrong main container wrapper readOnly", Boolean.FALSE, (Boolean)objectWrapper.isReadOnly()); + assertEquals("Wrong main container wrapper readOnly", Boolean.FALSE, (Boolean) objectWrapper.isReadOnly()); assertItemWrapperFullConrol(mainContainerValueWrapper, UserType.F_NAME, true); assertItemWrapperFullConrol(mainContainerValueWrapper, UserType.F_GIVEN_NAME, true); @@ -190,8 +188,8 @@ public void test100CreateWrapperUserJack() throws Exception { assertItemWrapperFullConrol(mainContainerValueWrapper, UserType.F_LOCALITY, true); // empty ObjectDelta objectDelta = objectWrapper.getObjectDelta(); - display("Delta", objectDelta); - assertTrue("non-empty delta produced from wrapper: "+objectDelta, objectDelta.isEmpty()); + displayDumpable("Delta", objectDelta); + assertTrue("non-empty delta produced from wrapper: " + objectDelta, objectDelta.isEmpty()); } private void assertContainersPaths(PrismObjectWrapper objectWrapper, Collection expectedPaths) { @@ -205,7 +203,7 @@ private void assertContainersPaths(PrismObjectWrapper objectWrapper, Collecti Set realUniformPaths = containerWrappers.stream() .map(c -> prismContext.toUniformPath(c.getPath())) .collect(Collectors.toSet()); - assertEquals("wrong container paths in "+objectWrapper, expectedUniformPaths, realUniformPaths); + assertEquals("wrong container paths in " + objectWrapper, expectedUniformPaths, realUniformPaths); } @Test @@ -228,13 +226,13 @@ public void test102CreateWrapperUserEmpty() throws Exception { // THEN then(); - PrismTestUtil.display("Wrapper after", objectWrapper); + displayDumpable("Wrapper after", objectWrapper); WrapperTestUtil.assertWrapper(objectWrapper, getString("prismContainer.mainPanelDisplayName"), "user description", user, userOld, ItemStatus.NOT_CHANGED); assertContainersPaths(objectWrapper, BASIC_USER_CONTAINERS_PATHS); WrapperTestUtil.assertWrapper(objectWrapper, getString("prismContainer.mainPanelDisplayName"), null, user, ItemStatus.NOT_CHANGED); - assertEquals("wrong number of containers in "+objectWrapper, 1, objectWrapper.getValues().size()); + assertEquals("wrong number of containers in " + objectWrapper, 1, objectWrapper.getValues().size()); PrismContainerValueWrapper mainContainerValueWrapper = objectWrapper.getValue(); WrapperTestUtil.assertPropertyWrapperByName(mainContainerValueWrapper, UserType.F_NAME, PrismTestUtil.createPolyString(USER_EMPTY_USERNAME)); WrapperTestUtil.assertPropertyWrapperByName(mainContainerValueWrapper, UserType.F_TIMEZONE, null); @@ -243,7 +241,7 @@ public void test102CreateWrapperUserEmpty() throws Exception { // ContainerWrapper activationContainerWrapper = objectWrapper.findContainer(ItemPath.create(UserType.F_ACTIVATION)); // assertNull("Unexpected activation "+activationContainerWrapper, activationContainerWrapper); - assertEquals("Wrong main container wrapper readOnly", Boolean.FALSE, (Boolean)objectWrapper.isReadOnly()); + assertEquals("Wrong main container wrapper readOnly", Boolean.FALSE, (Boolean) objectWrapper.isReadOnly()); assertItemWrapperFullConrol(mainContainerValueWrapper, UserType.F_NAME, true); assertItemWrapperFullConrol(mainContainerValueWrapper, UserType.F_GIVEN_NAME, true); // emphasized @@ -262,8 +260,8 @@ public void test102CreateWrapperUserEmpty() throws Exception { assertItemWrapperFullConrol(mainContainerValueWrapper, UserType.F_LOCALITY, true); // empty ObjectDelta objectDelta = objectWrapper.getObjectDelta(); - display("Delta", objectDelta); - assertTrue("non-empty delta produced from wrapper: "+objectDelta, objectDelta.isEmpty()); + displayDumpable("Delta", objectDelta); + assertTrue("non-empty delta produced from wrapper: " + objectDelta, objectDelta.isEmpty()); } /** @@ -285,24 +283,24 @@ public void test110CreateWrapperUserNewEmpty() throws Exception { PrismObjectWrapper objectWrapper = factory.createObjectWrapper(user, ItemStatus.ADDED, context); then(); - PrismTestUtil.display("Wrapper after", objectWrapper); + displayDumpable("Wrapper after", objectWrapper); WrapperTestUtil.assertWrapper(objectWrapper, getString("prismContainer.mainPanelDisplayName"), "user description", user, getUserDefinition().instantiate(), ItemStatus.ADDED); assertContainersPaths(objectWrapper, BASIC_USER_CONTAINERS_PATHS); - assertEquals("wrong number of containers in "+objectWrapper, 1, objectWrapper.getValues().size()); + assertEquals("wrong number of containers in " + objectWrapper, 1, objectWrapper.getValues().size()); PrismContainerValueWrapper mainContainerValueWrapper = objectWrapper.getValue(); WrapperTestUtil.assertPropertyWrapperByName(mainContainerValueWrapper, UserType.F_NAME, null); WrapperTestUtil.assertPropertyWrapperByName(mainContainerValueWrapper, UserType.F_TIMEZONE, null); PrismContainerWrapper activationContainerWrapper = objectWrapper.findContainer(UserType.F_ACTIVATION); WrapperTestUtil.assertWrapper(activationContainerWrapper, getString("ActivationType.activation"), UserType.F_ACTIVATION, user, ItemStatus.ADDED); - assertEquals("wrong number of containers in "+activationContainerWrapper, 1, activationContainerWrapper.getValues().size()); + assertEquals("wrong number of containers in " + activationContainerWrapper, 1, activationContainerWrapper.getValues().size()); PrismContainerValueWrapper activationContainerValueWrapper = activationContainerWrapper.getValues().iterator().next(); WrapperTestUtil.assertPropertyWrapperByName(activationContainerValueWrapper, ActivationType.F_ADMINISTRATIVE_STATUS, null); WrapperTestUtil.assertPropertyWrapperByName(activationContainerValueWrapper, ActivationType.F_LOCKOUT_STATUS, null); - assertEquals("Wrong main container wrapper readOnly", Boolean.FALSE, (Boolean)objectWrapper.isReadOnly()); + assertEquals("Wrong main container wrapper readOnly", Boolean.FALSE, (Boolean) objectWrapper.isReadOnly()); assertItemWrapperFullConrol(mainContainerValueWrapper, UserType.F_NAME, true); assertItemWrapperFullConrol(mainContainerValueWrapper, UserType.F_GIVEN_NAME, true); @@ -325,10 +323,10 @@ public void test110CreateWrapperUserNewEmpty() throws Exception { assertItemWrapperFullConrol(mainContainerValueWrapper, UserType.F_LOCALITY, false); // empty ObjectDelta objectDelta = objectWrapper.getObjectDelta(); - display("Delta", objectDelta); - assertTrue("non-add delta produced from wrapper: "+objectDelta, objectDelta.isAdd()); + displayDumpable("Delta", objectDelta); + assertTrue("non-add delta produced from wrapper: " + objectDelta, objectDelta.isAdd()); PrismObject objectToAdd = objectDelta.getObjectToAdd(); - assertTrue("non-empty object in add delta produced from wrapper: "+objectDelta, objectToAdd.isEmpty()); + assertTrue("non-empty object in add delta produced from wrapper: " + objectDelta, objectToAdd.isEmpty()); } /** @@ -359,22 +357,22 @@ public void test112CreateWrapperUserNewman() throws Exception { // THEN then(); - PrismTestUtil.display("Wrapper after", objectWrapper); + displayDumpable("Wrapper after", objectWrapper); WrapperTestUtil.assertWrapper(objectWrapper, getString("prismContainer.mainPanelDisplayName"), "user description", user, getUserDefinition().instantiate(), ItemStatus.ADDED); assertContainersPaths(objectWrapper, BASIC_USER_CONTAINERS_PATHS); WrapperTestUtil.assertWrapper(objectWrapper, getString("prismContainer.mainPanelDisplayName"), null, user, ItemStatus.ADDED); - assertEquals("wrong number of containers in "+objectWrapper, 1, objectWrapper.getValues().size()); + assertEquals("wrong number of containers in " + objectWrapper, 1, objectWrapper.getValues().size()); WrapperTestUtil.assertPropertyWrapperByName(mainContainerValueWrapper, UserType.F_NAME, PrismTestUtil.createPolyString(USER_NEWMAN_USERNAME)); WrapperTestUtil.assertPropertyWrapperByName(mainContainerValueWrapper, UserType.F_TIMEZONE, null); WrapperTestUtil.assertPropertyWrapper(mainContainerValueWrapper, extensionPath(PIRACY_SHIP), USER_NEWMAN_SHIP); PrismContainerWrapper activationContainerWrapper = objectWrapper.findContainer(UserType.F_ACTIVATION); WrapperTestUtil.assertWrapper(activationContainerWrapper, getString("ActivationType.activation"), UserType.F_ACTIVATION, user, ItemStatus.ADDED); - assertEquals("wrong number of containers in "+activationContainerWrapper, 1, activationContainerWrapper.getValues().size()); + assertEquals("wrong number of containers in " + activationContainerWrapper, 1, activationContainerWrapper.getValues().size()); - assertEquals("Wrong main container wrapper readOnly", Boolean.FALSE, (Boolean)objectWrapper.isReadOnly()); + assertEquals("Wrong main container wrapper readOnly", Boolean.FALSE, (Boolean) objectWrapper.isReadOnly()); assertItemWrapperProcessing(mainContainerValueWrapper, extensionPath(PIRACY_WEAPON), null); assertItemWrapperProcessing(mainContainerValueWrapper, extensionPath(PIRACY_COLORS), ItemProcessing.AUTO); @@ -397,8 +395,8 @@ public void test112CreateWrapperUserNewman() throws Exception { assertItemWrapperFullConrol(mainContainerValueWrapper, UserType.F_ADDITIONAL_NAME, false); // not visible, because it is empty ObjectDelta objectDelta = objectWrapper.getObjectDelta(); - display("Delta", objectDelta); - assertTrue("non-add delta produced from wrapper: "+objectDelta, objectDelta.isAdd()); + displayDumpable("Delta", objectDelta); + assertTrue("non-add delta produced from wrapper: " + objectDelta, objectDelta.isAdd()); PrismObject objectToAdd = objectDelta.getObjectToAdd(); PrismAsserts.assertPropertyValue(objectToAdd, UserType.F_NAME, PrismTestUtil.createPolyString(USER_NEWMAN_USERNAME)); PrismAsserts.assertPropertyValue(objectToAdd, UserType.F_GIVEN_NAME, PrismTestUtil.createPolyString(USER_NEWMAN_GIVEN_NAME)); @@ -408,7 +406,6 @@ public void test112CreateWrapperUserNewman() throws Exception { PrismAsserts.assertItems(objectToAdd, 5); } - @Test public void test150CreateWrapperShadow() throws Exception { PrismObject shadow = getShadowModel(accountJackOid); @@ -427,40 +424,40 @@ public void test150CreateWrapperShadow() throws Exception { WrapperContext context = new WrapperContext(task, result); PrismObjectWrapper objectWrapper = factory.createObjectWrapper(shadow, ItemStatus.NOT_CHANGED, context); - assertTrue("Wrong wrapper created. Expected ShadowWrapper but got " + objectWrapper.getClass().getSimpleName(), objectWrapper instanceof ShadowWrapper); + assertTrue("Wrong wrapper created. Expected ShadowWrapper but got " + objectWrapper.getClass().getSimpleName(), objectWrapper instanceof ShadowWrapper); then(); - display("Wrapper after", objectWrapper); + displayDumpable("Wrapper after", objectWrapper); WrapperTestUtil.assertWrapper(objectWrapper, getString("prismContainer.mainPanelDisplayName"), "shadow description", shadow, shadowOld, ItemStatus.NOT_CHANGED); assertContainersPaths(objectWrapper, BASIC_SHADOW_CONTAINERS_PATHS); PrismContainerWrapper attributesContainerWrapper = objectWrapper.findContainer(ShadowType.F_ATTRIBUTES); - assertEquals("wrong number of values in "+attributesContainerWrapper, 1, attributesContainerWrapper.getValues().size()); + assertEquals("wrong number of values in " + attributesContainerWrapper, 1, attributesContainerWrapper.getValues().size()); PrismContainer attributesContainer = shadow.findContainer(ShadowType.F_ATTRIBUTES); WrapperTestUtil.assertWrapper(attributesContainerWrapper, "Attributes", ShadowType.F_ATTRIBUTES, attributesContainer, false, ItemStatus.NOT_CHANGED); PrismContainerValueWrapper attributesContainerValueWrapper = attributesContainerWrapper.getValue(); WrapperTestUtil.assertPropertyWrapperByName(attributesContainerValueWrapper, dummyResourceCtl.getAttributeFullnameQName(), USER_JACK_FULL_NAME); WrapperTestUtil.assertPropertyWrapperByName(attributesContainerValueWrapper, SchemaConstants.ICFS_NAME, USER_JACK_USERNAME); - assertEquals("wrong number of items in "+attributesContainerWrapper, 18, attributesContainerValueWrapper.getItems().size()); + assertEquals("wrong number of items in " + attributesContainerWrapper, 18, attributesContainerValueWrapper.getItems().size()); PrismContainerWrapper activationContainerWrapper = objectWrapper.findContainer(ShadowType.F_ACTIVATION); - assertEquals("wrong number of values in "+activationContainerWrapper, 1, activationContainerWrapper.getValues().size()); + assertEquals("wrong number of values in " + activationContainerWrapper, 1, activationContainerWrapper.getValues().size()); PrismContainerValueWrapper activationContainerValueWrapper = activationContainerWrapper.getValues().iterator().next(); WrapperTestUtil.assertWrapper(activationContainerWrapper, getString("ShadowType.activation"), UserType.F_ACTIVATION, shadow, ItemStatus.NOT_CHANGED); WrapperTestUtil.assertPropertyWrapperByName(activationContainerValueWrapper, ActivationType.F_ADMINISTRATIVE_STATUS, ActivationStatusType.ENABLED); WrapperTestUtil.assertPropertyWrapperByName(activationContainerValueWrapper, ActivationType.F_LOCKOUT_STATUS, null); - assertEquals("Wrong attributes container wrapper readOnly", Boolean.FALSE, (Boolean)attributesContainerValueWrapper.isReadOnly()); + assertEquals("Wrong attributes container wrapper readOnly", Boolean.FALSE, (Boolean) attributesContainerValueWrapper.isReadOnly()); PrismPropertyWrapper fullnameWrapper = attributesContainerValueWrapper.findProperty(ItemPath.create(dummyResourceCtl.getAttributeFullnameQName())); - assertEquals("Wrong attribute fullname readOnly", Boolean.FALSE, (Boolean)fullnameWrapper.isReadOnly()); // Is this OK? - assertEquals("Wrong attribute fullname visible", Boolean.TRUE, (Boolean)fullnameWrapper.isVisible(attributesContainerValueWrapper, null)); - display("fullname attribute definition", fullnameWrapper); - assertEquals("Wrong attribute fullname definition.canRead", Boolean.TRUE, (Boolean)fullnameWrapper.canRead()); - assertEquals("Wrong attribute fullname definition.canAdd", Boolean.TRUE, (Boolean)fullnameWrapper.canAdd()); - assertEquals("Wrong attribute fullname definition.canModify", Boolean.TRUE, (Boolean)fullnameWrapper.canModify()); + assertEquals("Wrong attribute fullname readOnly", Boolean.FALSE, (Boolean) fullnameWrapper.isReadOnly()); // Is this OK? + assertEquals("Wrong attribute fullname visible", Boolean.TRUE, (Boolean) fullnameWrapper.isVisible(attributesContainerValueWrapper, null)); + displayDumpable("fullname attribute definition", fullnameWrapper); + assertEquals("Wrong attribute fullname definition.canRead", Boolean.TRUE, (Boolean) fullnameWrapper.canRead()); + assertEquals("Wrong attribute fullname definition.canAdd", Boolean.TRUE, (Boolean) fullnameWrapper.canAdd()); + assertEquals("Wrong attribute fullname definition.canModify", Boolean.TRUE, (Boolean) fullnameWrapper.canModify()); // MID-3144 if (fullnameWrapper.getDisplayOrder() == null || fullnameWrapper.getDisplayOrder() < 100 || fullnameWrapper.getDisplayOrder() > 400) { AssertJUnit.fail("Wrong fullname definition.displayOrder: " + fullnameWrapper.getDisplayOrder()); @@ -468,8 +465,8 @@ public void test150CreateWrapperShadow() throws Exception { assertEquals("Wrong attribute fullname definition.displayName", "Full Name", fullnameWrapper.getDisplayName()); ObjectDelta objectDelta = objectWrapper.getObjectDelta(); - display("Delta", objectDelta); - assertTrue("non-empty delta produced from wrapper: "+objectDelta, objectDelta.isEmpty()); + displayDumpable("Delta", objectDelta); + assertTrue("non-empty delta produced from wrapper: " + objectDelta, objectDelta.isEmpty()); } @@ -501,25 +498,25 @@ public void test160CreateWrapperOrgScummBar() throws Exception { // THEN then(); - PrismTestUtil.display("Wrapper after", objectWrapper); + displayDumpable("Wrapper after", objectWrapper); WrapperTestUtil.assertWrapper(objectWrapper, getString("prismContainer.mainPanelDisplayName"), "org description", org, orgOld, ItemStatus.NOT_CHANGED); assertContainersPaths(objectWrapper, BASIC_ORG_CONTAINERS_PATHS); - WrapperTestUtil.assertWrapper(objectWrapper, getString("prismContainer.mainPanelDisplayName"), (ItemPath)null, org, ItemStatus.NOT_CHANGED); - assertEquals("wrong number of containers in "+objectWrapper, 1, objectWrapper.getValues().size()); + WrapperTestUtil.assertWrapper(objectWrapper, getString("prismContainer.mainPanelDisplayName"), (ItemPath) null, org, ItemStatus.NOT_CHANGED); + assertEquals("wrong number of containers in " + objectWrapper, 1, objectWrapper.getValues().size()); PrismContainerValueWrapper mainContainerValueWrapper = objectWrapper.getValue(); WrapperTestUtil.assertPropertyWrapperByName(mainContainerValueWrapper, OrgType.F_NAME, PrismTestUtil.createPolyString(ORG_SCUMM_BAR_NAME)); WrapperTestUtil.assertPropertyWrapperByName(mainContainerValueWrapper, OrgType.F_TIMEZONE, null); PrismContainerWrapper activationContainerWrapper = mainContainerValueWrapper.findContainer(OrgType.F_ACTIVATION); WrapperTestUtil.assertWrapper(activationContainerWrapper, getString("ActivationType.activation"), OrgType.F_ACTIVATION, org, ItemStatus.NOT_CHANGED); - assertEquals("wrong number of containers in "+activationContainerWrapper, 1, activationContainerWrapper.getValues().size()); + assertEquals("wrong number of containers in " + activationContainerWrapper, 1, activationContainerWrapper.getValues().size()); PrismContainerValueWrapper activationContainerValueWrapper = activationContainerWrapper.getValues().iterator().next(); WrapperTestUtil.assertPropertyWrapperByName(activationContainerValueWrapper, ActivationType.F_ADMINISTRATIVE_STATUS, ActivationStatusType.ENABLED); WrapperTestUtil.assertPropertyWrapperByName(activationContainerValueWrapper, ActivationType.F_LOCKOUT_STATUS, null); - assertEquals("Wrong main container wrapper readOnly", Boolean.FALSE, (Boolean)mainContainerValueWrapper.isReadOnly()); + assertEquals("Wrong main container wrapper readOnly", Boolean.FALSE, (Boolean) mainContainerValueWrapper.isReadOnly()); assertItemWrapperFullConrol(mainContainerValueWrapper, OrgType.F_NAME, true); assertItemWrapperFullConrol(mainContainerValueWrapper, OrgType.F_IDENTIFIER, true); @@ -528,7 +525,7 @@ public void test160CreateWrapperOrgScummBar() throws Exception { assertItemWrapperProcessing(mainContainerValueWrapper, extensionPath(PIRACY_TRANSFORM_DESCRIPTION), null); PrismContainerWrapper transformContainerWrapper = mainContainerValueWrapper.findContainer(extensionPath(PIRACY_TRANSFORM)); - assertEquals("Wrong processing in item wrapper for "+PIRACY_TRANSFORM, ItemProcessing.MINIMAL, transformContainerWrapper.getProcessing()); + assertEquals("Wrong processing in item wrapper for " + PIRACY_TRANSFORM, ItemProcessing.MINIMAL, transformContainerWrapper.getProcessing()); // ContainerWrapper transformContainerWrapper = objectWrapper.findContainer(ItemPath.create(PIRACY_TRANSFORM)); // assertEquals("Wrong processing in item wrapper for "+PIRACY_TRANSFORM, ItemProcessing.MINIMAL, transformContainerWrapper.getProcessing()); @@ -543,8 +540,8 @@ public void test160CreateWrapperOrgScummBar() throws Exception { assertItemWrapperFullConrol(mainContainerValueWrapper, OrgType.F_LOCALITY, true); ObjectDelta objectDelta = objectWrapper.getObjectDelta(); - display("Delta", objectDelta); - assertTrue("non-empty delta produced from wrapper: "+objectDelta, objectDelta.isEmpty()); + displayDumpable("Delta", objectDelta); + assertTrue("non-empty delta produced from wrapper: " + objectDelta, objectDelta.isEmpty()); } @Test @@ -574,7 +571,7 @@ public void test220AssignRoleLandluberToWally() throws Exception { DummyGroup dummyGroup = dummyResource.getGroupByName(GROUP_DUMMY_MAPMAKERS_NAME); assertNotNull("No group on dummy resource", dummyGroup); - display("Group", dummyGroup); + displayDumpable("Group", dummyGroup); assertGroupMember(dummyGroup, USER_WALLY_NAME); // WHEN @@ -587,7 +584,7 @@ public void test220AssignRoleLandluberToWally() throws Exception { // THEN then(); - display("Wrapper after", shadowWrapper); + displayDumpable("Wrapper after", shadowWrapper); WrapperTestUtil.assertWrapper(shadowWrapper, getString("prismContainer.mainPanelDisplayName"), "shadow description", shadow, shadowOld, ItemStatus.NOT_CHANGED); assertContainersPaths(objectWrapper, BASIC_SHADOW_CONTAINERS_PATHS); @@ -595,15 +592,15 @@ public void test220AssignRoleLandluberToWally() throws Exception { PrismContainerWrapper attributesContainerWrapper = objectWrapper.findContainer(ShadowType.F_ATTRIBUTES); WrapperTestUtil.assertWrapper(attributesContainerWrapper, "Attributes", ShadowType.F_ATTRIBUTES, shadow.findContainer(ShadowType.F_ATTRIBUTES), false, ItemStatus.NOT_CHANGED); - assertEquals("wrong number of containers in "+attributesContainerWrapper, 1, attributesContainerWrapper.getValues().size()); + assertEquals("wrong number of containers in " + attributesContainerWrapper, 1, attributesContainerWrapper.getValues().size()); PrismContainerValueWrapper attributesContainerValueWrapper = attributesContainerWrapper.getValues().iterator().next(); WrapperTestUtil.assertPropertyWrapperByName(attributesContainerValueWrapper, dummyResourceCtl.getAttributeFullnameQName(), USER_WALLY_FULLNAME); WrapperTestUtil.assertPropertyWrapperByName(attributesContainerValueWrapper, SchemaConstants.ICFS_NAME, USER_WALLY_NAME); - assertEquals("wrong number of items in "+attributesContainerWrapper, 18, attributesContainerValueWrapper.getItems().size()); + assertEquals("wrong number of items in " + attributesContainerWrapper, 18, attributesContainerValueWrapper.getItems().size()); PrismContainerWrapper activationContainerWrapper = objectWrapper.findContainer(ShadowType.F_ACTIVATION); WrapperTestUtil.assertWrapper(activationContainerWrapper, getString("ShadowType.activation"), UserType.F_ACTIVATION, shadow, ItemStatus.NOT_CHANGED); - assertEquals("wrong number of containers in "+activationContainerWrapper, 1, activationContainerWrapper.getValues().size()); + assertEquals("wrong number of containers in " + activationContainerWrapper, 1, activationContainerWrapper.getValues().size()); PrismContainerValueWrapper activationContainerValueWrapper = activationContainerWrapper.getValues().iterator().next(); WrapperTestUtil.assertPropertyWrapperByName(activationContainerValueWrapper, ActivationType.F_ADMINISTRATIVE_STATUS, ActivationStatusType.ENABLED); WrapperTestUtil.assertPropertyWrapperByName(activationContainerValueWrapper, ActivationType.F_LOCKOUT_STATUS, null); @@ -611,16 +608,16 @@ public void test220AssignRoleLandluberToWally() throws Exception { //TODO: fix PrismContainerWrapper associationContainerWrapper = objectWrapper.findContainer(ShadowType.F_ASSOCIATION); assertNotNull("No association container wrapper", associationContainerWrapper); - assertTrue("Wrong type of group association property wrapper: "+associationContainerWrapper.getClass(), associationContainerWrapper instanceof ShadowAssociationWrapperImpl); - assertEquals("wrong number of items in "+associationContainerWrapper, 1, associationContainerWrapper.getValues().size()); - PrismReferenceWrapper groupAssociationWrapper = (PrismReferenceWrapper) associationContainerWrapper.findReference(RESOURCE_DUMMY_ASSOCIATION_GROUP_QNAME); + assertTrue("Wrong type of group association property wrapper: " + associationContainerWrapper.getClass(), associationContainerWrapper instanceof ShadowAssociationWrapperImpl); + assertEquals("wrong number of items in " + associationContainerWrapper, 1, associationContainerWrapper.getValues().size()); + PrismReferenceWrapper groupAssociationWrapper = associationContainerWrapper.findReference(RESOURCE_DUMMY_ASSOCIATION_GROUP_QNAME); assertNotNull("No group association property wrapper", groupAssociationWrapper); List groupAssociationValues = groupAssociationWrapper.getValues(); - assertEquals("wrong number of values in "+groupAssociationWrapper, 1, groupAssociationValues.size()); + assertEquals("wrong number of values in " + groupAssociationWrapper, 1, groupAssociationValues.size()); PrismValueWrapper groupAssociationValue = groupAssociationValues.get(0); PrismReferenceValue groupAssociationValuePVal = (PrismReferenceValue) groupAssociationValue.getNewValue(); - display("groupAssociationValuePVal", groupAssociationValuePVal); - assertEquals("wrong number of values in "+groupAssociationValue, ValueStatus.NOT_CHANGED, groupAssociationValue.getStatus()); + displayDumpable("groupAssociationValuePVal", groupAssociationValuePVal); + assertEquals("wrong number of values in " + groupAssociationValue, ValueStatus.NOT_CHANGED, groupAssociationValue.getStatus()); assertEquals("Wrong group association name", RESOURCE_DUMMY_ASSOCIATION_GROUP_QNAME, groupAssociationWrapper.getItemName()); assertEquals("Wrong group association value", GROUP_DUMMY_MAPMAKERS_NAME, groupAssociationValuePVal.asReferencable().getTargetName().getOrig()); // PrismContainer groupAssociationValueIdentifiers = groupAssociationValuePVal.findContainer(ShadowAssociationType.F_IDENTIFIERS); @@ -635,13 +632,13 @@ public void test240OrgScummBarModifyTransformDescription() throws Exception { Task task = getTestTask(); PrismObjectWrapper objectWrapper = createObjectWrapper(task, org, ItemStatus.NOT_CHANGED); - PrismTestUtil.display("Wrapper before", objectWrapper); + displayDumpable("Wrapper before", objectWrapper); PrismObjectValueWrapper mainContainerValueWrapper = objectWrapper.getValue(); modifyPropertyWrapper(getServiceLocator(task), mainContainerValueWrapper, extensionPath(PIRACY_TRANSFORM_DESCRIPTION), "Whatever"); - PrismTestUtil.display("Wrapper after", objectWrapper); + displayDumpable("Wrapper after", objectWrapper); // WHEN when(); @@ -649,7 +646,7 @@ public void test240OrgScummBarModifyTransformDescription() throws Exception { // THEN then(); - display("Delta", objectDelta); + displayDumpable("Delta", objectDelta); ItemPath ahoyPath = ItemPath.create(ObjectType.F_EXTENSION, PIRACY_TRANSFORM_DESCRIPTION); PrismAsserts.assertPropertyReplace(objectDelta, ahoyPath, "Whatever"); PrismAsserts.assertModifications(objectDelta, 1); @@ -671,7 +668,7 @@ public void test241OrgScummBarModifyTransformProperties() throws Exception { Task task = getTestTask(); PrismObjectWrapper objectWrapper = createObjectWrapper(task, org, ItemStatus.NOT_CHANGED); - PrismTestUtil.display("Wrapper before", objectWrapper); + displayDumpable("Wrapper before", objectWrapper); PrismContainerValueWrapper mainContainerValueWrapper = objectWrapper.getValue(); PrismContainerWrapper transformContainerWrapper = mainContainerValueWrapper.findContainer(extensionPath(PIRACY_TRANSFORM)); @@ -680,10 +677,10 @@ public void test241OrgScummBarModifyTransformProperties() throws Exception { PrismContainerValueWrapper valueWrapperA = findTransformValueWrapper(transformValueWrappers, "A"); assertNotNull("No A value wrapper", valueWrapperA); - display("A value wrapper", valueWrapperA); + displayDumpable("A value wrapper", valueWrapperA); modifyTransformProp(valueWrapperA, PIRACY_REPLACEMENT, "Ahoy"); - PrismTestUtil.display("Wrapper after", objectWrapper); + displayDumpable("Wrapper after", objectWrapper); // WHEN when(); @@ -691,7 +688,7 @@ public void test241OrgScummBarModifyTransformProperties() throws Exception { // THEN then(); - display("Delta", objectDelta); + displayDumpable("Delta", objectDelta); ItemPath ahoyPath = ItemPath.create(ObjectType.F_EXTENSION, PIRACY_TRANSFORM, valueWrapperA.getNewValue().getId(), PIRACY_REPLACEMENT); PrismAsserts.assertPropertyReplace(objectDelta, ahoyPath, "Ahoy"); PrismAsserts.assertModifications(objectDelta, 1); @@ -712,7 +709,7 @@ public void test242OrgScummBarAddTransform() throws Exception { Task task = getTestTask(); PrismObjectWrapper objectWrapper = createObjectWrapper(task, org, ItemStatus.NOT_CHANGED); - PrismTestUtil.display("Wrapper before", objectWrapper); + displayDumpable("Wrapper before", objectWrapper); PrismContainerValueWrapper mainContainerValueWrapper = objectWrapper.getValue(); PrismContainerWrapper transformContainerWrapper = mainContainerValueWrapper.findContainer(extensionPath(PIRACY_TRANSFORM)); @@ -724,12 +721,12 @@ public void test242OrgScummBarAddTransform() throws Exception { context.setShowEmpty(true); context.setCreateIfEmpty(true); - PrismContainerValueWrapper newContainerValueWrapper = modelServiceLocator.createValueWrapper(transformContainerWrapper, transformContainerWrapper.getItem().createNewValue(), ValueStatus.ADDED, context); + PrismContainerValueWrapper newContainerValueWrapper = modelServiceLocator.createValueWrapper(transformContainerWrapper, transformContainerWrapper.getItem().createNewValue(), ValueStatus.ADDED, context); transformContainerWrapper.getValues().add(newContainerValueWrapper); modifyTransformProp(newContainerValueWrapper, PIRACY_PATTERN, "D"); modifyTransformProp(newContainerValueWrapper, PIRACY_REPLACEMENT, "Doubloon"); - PrismTestUtil.display("Wrapper after", objectWrapper); + displayDumpable("Wrapper after", objectWrapper); // WHEN when(); @@ -737,11 +734,11 @@ public void test242OrgScummBarAddTransform() throws Exception { // THEN then(); - display("Delta", objectDelta); + displayDumpable("Delta", objectDelta); ItemPath transformPath = ItemPath.create(ObjectType.F_EXTENSION, PIRACY_TRANSFORM); PrismAsserts.assertModifications(objectDelta, 1); ContainerDelta transfromDelta = (ContainerDelta) objectDelta.getModifications().iterator().next(); - assertTrue("Wrong container delta path. Expected "+transformPath+" but was "+transfromDelta.getPath(), transfromDelta.getPath().equivalent(transformPath)); + assertTrue("Wrong container delta path. Expected " + transformPath + " but was " + transfromDelta.getPath(), transfromDelta.getPath().equivalent(transformPath)); PrismAsserts.assertNoDelete(transfromDelta); PrismAsserts.assertNoReplace(transfromDelta); Collection> valuesToAdd = transfromDelta.getValuesToAdd(); @@ -761,7 +758,6 @@ public void test242OrgScummBarAddTransform() throws Exception { PrismObject orgAfter = getObject(OrgType.class, ORG_MINISTRY_OF_RUM_OID); display("Org after", orgAfter); - } /** @@ -774,13 +770,13 @@ public void test250OrgMinistryOrRumModifyTransformDescription() throws Exception Task task = getTestTask(); PrismObjectWrapper objectWrapper = createObjectWrapper(task, org, ItemStatus.NOT_CHANGED); - PrismTestUtil.display("Wrapper before", objectWrapper); + displayDumpable("Wrapper before", objectWrapper); PrismContainerValueWrapper mainContainerValueWrapper = objectWrapper.getValue(); modifyPropertyWrapper(getServiceLocator(task), mainContainerValueWrapper, extensionPath(PIRACY_TRANSFORM_DESCRIPTION), "Whatever"); - PrismTestUtil.display("Wrapper after", objectWrapper); + displayDumpable("Wrapper after", objectWrapper); // WHEN when(); @@ -788,7 +784,7 @@ public void test250OrgMinistryOrRumModifyTransformDescription() throws Exception // THEN then(); - display("Delta", objectDelta); + displayDumpable("Delta", objectDelta); PrismAsserts.assertModifications(objectDelta, 1); ContainerDelta containerDelta = (ContainerDelta) objectDelta.getModifications().iterator().next(); @@ -829,7 +825,7 @@ private void modifyPropertyWrapper(ModelServiceLocator modelServiceLocator, Pris private PrismContainerValueWrapper findTransformValueWrapper( List> transformValueWrappers, String pattern) throws SchemaException { - for (PrismContainerValueWrapper transformValueWrapper: transformValueWrappers) { + for (PrismContainerValueWrapper transformValueWrapper : transformValueWrappers) { PrismPropertyWrapper patternPropWrapper = transformValueWrapper.findProperty(PIRACY_PATTERN); PrismProperty patternProperty = patternPropWrapper.getItem(); if (pattern.equals(patternProperty.getRealValue())) { @@ -867,52 +863,52 @@ public void test800EditSchemaJackPropReadAllModifySomeUser() throws Exception { // THEN then(); - PrismTestUtil.display("Wrapper after", objectWrapper); - assertEquals("Wrong object wrapper readOnly", Boolean.FALSE, (Boolean)objectWrapper.isReadOnly()); + displayDumpable("Wrapper after", objectWrapper); + assertEquals("Wrong object wrapper readOnly", Boolean.FALSE, (Boolean) objectWrapper.isReadOnly()); PrismContainerValueWrapper mainContainerValueWrapper = objectWrapper.getValue(); PrismPropertyWrapper nameWrapper = mainContainerValueWrapper.findProperty(UserType.F_NAME); - assertEquals("Wrong name readOnly", Boolean.TRUE, (Boolean)nameWrapper.isReadOnly()); // Is this OK? - assertEquals("Wrong name visible", Boolean.TRUE, (Boolean)nameWrapper.isVisible(mainContainerValueWrapper, null)); - assertEquals("Wrong name definition.canRead", Boolean.TRUE, (Boolean)nameWrapper.canRead()); - assertEquals("Wrong name definition.canAdd", Boolean.FALSE, (Boolean)nameWrapper.canAdd()); - assertEquals("Wrong name definition.canModify", Boolean.FALSE, (Boolean)nameWrapper.canModify()); + assertEquals("Wrong name readOnly", Boolean.TRUE, (Boolean) nameWrapper.isReadOnly()); // Is this OK? + assertEquals("Wrong name visible", Boolean.TRUE, (Boolean) nameWrapper.isVisible(mainContainerValueWrapper, null)); + assertEquals("Wrong name definition.canRead", Boolean.TRUE, (Boolean) nameWrapper.canRead()); + assertEquals("Wrong name definition.canAdd", Boolean.FALSE, (Boolean) nameWrapper.canAdd()); + assertEquals("Wrong name definition.canModify", Boolean.FALSE, (Boolean) nameWrapper.canModify()); PrismPropertyWrapper givenNameWrapper = mainContainerValueWrapper.findProperty(UserType.F_GIVEN_NAME); - assertEquals("Wrong givenName readOnly", Boolean.TRUE, (Boolean)givenNameWrapper.isReadOnly()); // Is this OK? - assertEquals("Wrong givenName visible", Boolean.TRUE, (Boolean)givenNameWrapper.isVisible(mainContainerValueWrapper, null)); - assertEquals("Wrong givenName definition.canRead", Boolean.TRUE, (Boolean)givenNameWrapper.canRead()); - assertEquals("Wrong givenName definition.canAdd", Boolean.FALSE, (Boolean)givenNameWrapper.canAdd()); - assertEquals("Wrong givenName definition.canModify", Boolean.FALSE, (Boolean)givenNameWrapper.canModify()); + assertEquals("Wrong givenName readOnly", Boolean.TRUE, (Boolean) givenNameWrapper.isReadOnly()); // Is this OK? + assertEquals("Wrong givenName visible", Boolean.TRUE, (Boolean) givenNameWrapper.isVisible(mainContainerValueWrapper, null)); + assertEquals("Wrong givenName definition.canRead", Boolean.TRUE, (Boolean) givenNameWrapper.canRead()); + assertEquals("Wrong givenName definition.canAdd", Boolean.FALSE, (Boolean) givenNameWrapper.canAdd()); + assertEquals("Wrong givenName definition.canModify", Boolean.FALSE, (Boolean) givenNameWrapper.canModify()); PrismPropertyWrapper fullNameWrapper = mainContainerValueWrapper.findProperty(UserType.F_FULL_NAME); - assertEquals("Wrong fullName readOnly", Boolean.FALSE, (Boolean)fullNameWrapper.isReadOnly()); - assertEquals("Wrong fullName visible", Boolean.TRUE, (Boolean)fullNameWrapper.isVisible(mainContainerValueWrapper, null)); - assertEquals("Wrong fullName definition.canRead", Boolean.TRUE, (Boolean)fullNameWrapper.canRead()); - assertEquals("Wrong fullName definition.canAdd", Boolean.FALSE, (Boolean)fullNameWrapper.canAdd()); - assertEquals("Wrong fullName definition.canModify", Boolean.TRUE, (Boolean)fullNameWrapper.canModify()); + assertEquals("Wrong fullName readOnly", Boolean.FALSE, (Boolean) fullNameWrapper.isReadOnly()); + assertEquals("Wrong fullName visible", Boolean.TRUE, (Boolean) fullNameWrapper.isVisible(mainContainerValueWrapper, null)); + assertEquals("Wrong fullName definition.canRead", Boolean.TRUE, (Boolean) fullNameWrapper.canRead()); + assertEquals("Wrong fullName definition.canAdd", Boolean.FALSE, (Boolean) fullNameWrapper.canAdd()); + assertEquals("Wrong fullName definition.canModify", Boolean.TRUE, (Boolean) fullNameWrapper.canModify()); PrismPropertyWrapper additionalNameWrapper = mainContainerValueWrapper.findProperty(UserType.F_ADDITIONAL_NAME); - assertEquals("Wrong additionalName readOnly", Boolean.TRUE, (Boolean)additionalNameWrapper.isReadOnly()); // Is this OK? - assertEquals("Wrong additionalName visible", Boolean.FALSE, (Boolean)additionalNameWrapper.isVisible(mainContainerValueWrapper, null)); // not visible, because it is empty - assertEquals("Wrong additionalName definition.canRead", Boolean.TRUE, (Boolean)additionalNameWrapper.canRead()); - assertEquals("Wrong additionalName definition.canAdd", Boolean.FALSE, (Boolean)additionalNameWrapper.canAdd()); - assertEquals("Wrong additionalName definition.canModify", Boolean.FALSE, (Boolean)additionalNameWrapper.canModify()); + assertEquals("Wrong additionalName readOnly", Boolean.TRUE, (Boolean) additionalNameWrapper.isReadOnly()); // Is this OK? + assertEquals("Wrong additionalName visible", Boolean.FALSE, (Boolean) additionalNameWrapper.isVisible(mainContainerValueWrapper, null)); // not visible, because it is empty + assertEquals("Wrong additionalName definition.canRead", Boolean.TRUE, (Boolean) additionalNameWrapper.canRead()); + assertEquals("Wrong additionalName definition.canAdd", Boolean.FALSE, (Boolean) additionalNameWrapper.canAdd()); + assertEquals("Wrong additionalName definition.canModify", Boolean.FALSE, (Boolean) additionalNameWrapper.canModify()); PrismPropertyWrapper localityNameWrapper = mainContainerValueWrapper.findProperty(UserType.F_LOCALITY); - assertEquals("Wrong locality readOnly", Boolean.TRUE, (Boolean)localityNameWrapper.isReadOnly()); - assertEquals("Wrong locality visible", Boolean.TRUE, (Boolean)localityNameWrapper.isVisible(mainContainerValueWrapper, null)); - assertEquals("Wrong locality definition.canRead", Boolean.TRUE, (Boolean)localityNameWrapper.canRead()); - assertEquals("Wrong locality definition.canAdd", Boolean.FALSE, (Boolean)localityNameWrapper.canAdd()); - assertEquals("Wrong locality definition.canModify", Boolean.FALSE, (Boolean)localityNameWrapper.canModify()); + assertEquals("Wrong locality readOnly", Boolean.TRUE, (Boolean) localityNameWrapper.isReadOnly()); + assertEquals("Wrong locality visible", Boolean.TRUE, (Boolean) localityNameWrapper.isVisible(mainContainerValueWrapper, null)); + assertEquals("Wrong locality definition.canRead", Boolean.TRUE, (Boolean) localityNameWrapper.canRead()); + assertEquals("Wrong locality definition.canAdd", Boolean.FALSE, (Boolean) localityNameWrapper.canAdd()); + assertEquals("Wrong locality definition.canModify", Boolean.FALSE, (Boolean) localityNameWrapper.canModify()); // WHEN mainContainerValueWrapper.setShowEmpty(true); // THEN additionalNameWrapper = mainContainerValueWrapper.findProperty(UserType.F_ADDITIONAL_NAME); - assertEquals("Wrong additionalName visible", Boolean.TRUE, (Boolean)additionalNameWrapper.isVisible(mainContainerValueWrapper, null)); // visible, because show empty + assertEquals("Wrong additionalName visible", Boolean.TRUE, (Boolean) additionalNameWrapper.isVisible(mainContainerValueWrapper, null)); // visible, because show empty } @@ -938,16 +934,16 @@ public void test802EditSchemaJackPropReadSomeModifySomeUser() throws Exception { // THEN then(); - PrismTestUtil.display("Wrapper after", objectWrapper); - assertEquals("Wrong object wrapper readOnly", Boolean.FALSE, (Boolean)objectWrapper.isReadOnly()); + displayDumpable("Wrapper after", objectWrapper); + assertEquals("Wrong object wrapper readOnly", Boolean.FALSE, (Boolean) objectWrapper.isReadOnly()); PrismContainerValueWrapper mainContainerValueWrapper = objectWrapper.getValue(); PrismPropertyWrapper nameWrapper = mainContainerValueWrapper.findProperty(UserType.F_NAME); - assertEquals("Wrong name readOnly", Boolean.TRUE, (Boolean)nameWrapper.isReadOnly()); - assertEquals("Wrong name visible", Boolean.TRUE, (Boolean)nameWrapper.isVisible(mainContainerValueWrapper, null)); - assertEquals("Wrong name definition.canRead", Boolean.TRUE, (Boolean)nameWrapper.canRead()); - assertEquals("Wrong name definition.canAdd", Boolean.FALSE, (Boolean)nameWrapper.canAdd()); - assertEquals("Wrong name definition.canModify", Boolean.FALSE, (Boolean)nameWrapper.canModify()); + assertEquals("Wrong name readOnly", Boolean.TRUE, (Boolean) nameWrapper.isReadOnly()); + assertEquals("Wrong name visible", Boolean.TRUE, (Boolean) nameWrapper.isVisible(mainContainerValueWrapper, null)); + assertEquals("Wrong name definition.canRead", Boolean.TRUE, (Boolean) nameWrapper.canRead()); + assertEquals("Wrong name definition.canAdd", Boolean.FALSE, (Boolean) nameWrapper.canAdd()); + assertEquals("Wrong name definition.canModify", Boolean.FALSE, (Boolean) nameWrapper.canModify()); //no access to given name, wrapper should not be even generated PrismPropertyWrapper givenNameWrapper = mainContainerValueWrapper.findProperty(UserType.F_GIVEN_NAME); @@ -961,11 +957,11 @@ public void test802EditSchemaJackPropReadSomeModifySomeUser() throws Exception { // assertEquals("Wrong givenName definition.canModify", Boolean.FALSE, (Boolean)givenNameWrapper.canModify()); PrismPropertyWrapper fullNameWrapper = mainContainerValueWrapper.findProperty(UserType.F_FULL_NAME); - assertEquals("Wrong fullName readOnly", Boolean.FALSE, (Boolean)fullNameWrapper.isReadOnly()); - assertEquals("Wrong fullName visible", Boolean.TRUE, (Boolean)fullNameWrapper.isVisible(mainContainerValueWrapper, null)); - assertEquals("Wrong fullName definition.canRead", Boolean.TRUE, (Boolean)fullNameWrapper.canRead()); - assertEquals("Wrong fullName definition.canAdd", Boolean.FALSE, (Boolean)fullNameWrapper.canAdd()); - assertEquals("Wrong fullName definition.canModify", Boolean.TRUE, (Boolean)fullNameWrapper.canModify()); + assertEquals("Wrong fullName readOnly", Boolean.FALSE, (Boolean) fullNameWrapper.isReadOnly()); + assertEquals("Wrong fullName visible", Boolean.TRUE, (Boolean) fullNameWrapper.isVisible(mainContainerValueWrapper, null)); + assertEquals("Wrong fullName definition.canRead", Boolean.TRUE, (Boolean) fullNameWrapper.canRead()); + assertEquals("Wrong fullName definition.canAdd", Boolean.FALSE, (Boolean) fullNameWrapper.canAdd()); + assertEquals("Wrong fullName definition.canModify", Boolean.TRUE, (Boolean) fullNameWrapper.canModify()); // not created because of unsufficient authZ PrismPropertyWrapper additionalNameWrapper = mainContainerValueWrapper.findProperty(UserType.F_ADDITIONAL_NAME); @@ -988,28 +984,29 @@ public void test802EditSchemaJackPropReadSomeModifySomeUser() throws Exception { } private void assertItemWrapperFullConrol(PrismContainerValueWrapper containerWrapper, ItemName propName, - boolean visible) throws SchemaException { + boolean visible) throws SchemaException { ItemWrapper itemWrapper = containerWrapper.findItem(propName, ItemWrapper.class); - assertEquals("Wrong "+propName+" readOnly", Boolean.FALSE, (Boolean)itemWrapper.isReadOnly()); - assertEquals("Wrong "+propName+" visible", visible, itemWrapper.isVisible(containerWrapper, w -> ItemVisibility.AUTO)); - assertEquals("Wrong "+propName+" definition.canRead", Boolean.TRUE, (Boolean)itemWrapper.canRead()); - assertEquals("Wrong "+propName+" definition.canAdd", Boolean.TRUE, (Boolean)itemWrapper.canAdd()); - assertEquals("Wrong "+propName+" definition.canModify", Boolean.TRUE, (Boolean)itemWrapper.canModify()); + assertEquals("Wrong " + propName + " readOnly", Boolean.FALSE, (Boolean) itemWrapper.isReadOnly()); + assertEquals("Wrong " + propName + " visible", visible, itemWrapper.isVisible(containerWrapper, w -> ItemVisibility.AUTO)); + assertEquals("Wrong " + propName + " definition.canRead", Boolean.TRUE, (Boolean) itemWrapper.canRead()); + assertEquals("Wrong " + propName + " definition.canAdd", Boolean.TRUE, (Boolean) itemWrapper.canAdd()); + assertEquals("Wrong " + propName + " definition.canModify", Boolean.TRUE, (Boolean) itemWrapper.canModify()); } private void assertItemWrapperProcessing(PrismContainerValueWrapper containerWrapper, - ItemPath propName, ItemProcessing expectedProcessing) throws SchemaException { + ItemPath propName, ItemProcessing expectedProcessing) throws SchemaException { ItemWrapper itemWrapper = containerWrapper.findItem(propName, ItemWrapper.class); if (expectedProcessing == ItemProcessing.IGNORE) { - assertNull("Unexpected ignored item wrapper for "+propName, itemWrapper); + assertNull("Unexpected ignored item wrapper for " + propName, itemWrapper); } else { - assertEquals("Wrong processing in item wrapper for "+propName, expectedProcessing, itemWrapper.getProcessing()); + assertEquals("Wrong processing in item wrapper for " + propName, expectedProcessing, itemWrapper.getProcessing()); } } - - private void cleanupAutzTest(String userOid) throws ObjectNotFoundException, SchemaException, ExpressionEvaluationException, CommunicationException, ConfigurationException, - ObjectAlreadyExistsException, PolicyViolationException, SecurityViolationException, IOException { + private void cleanupAutzTest(String userOid) + throws ObjectNotFoundException, SchemaException, ExpressionEvaluationException, + CommunicationException, ConfigurationException, ObjectAlreadyExistsException, + PolicyViolationException, SecurityViolationException { login(userAdministrator); unassignAllRoles(userOid); } diff --git a/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestDescriptorLoader.java b/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestDescriptorLoader.java index 279c90f81ae..71636ff2118 100644 --- a/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestDescriptorLoader.java +++ b/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestDescriptorLoader.java @@ -8,7 +8,6 @@ package com.evolveum.midpoint.web; import java.io.InputStream; -import java.net.MalformedURLException; import java.net.URL; import java.util.Enumeration; import java.util.EventListener; @@ -83,7 +82,7 @@ public ServletRegistration.Dynamic addJspFile(String s, String s1) { } @Override - public T createServlet(Class c) throws ServletException { + public T createServlet(Class c) { return null; } @@ -113,7 +112,7 @@ public FilterRegistration.Dynamic addFilter(String filterName, Class T createFilter(Class c) throws ServletException { + public T createFilter(Class c) { return null; } @@ -163,7 +162,7 @@ public void addListener(Class listenerClass) { } @Override - public T createListener(Class c) throws ServletException { + public T createListener(Class c) { return null; } @@ -241,12 +240,12 @@ public void log(String msg) { } @Override - public Enumeration getServlets() { + public Enumeration getServlets() { return null; } @Override - public Enumeration getServletNames() { + public Enumeration getServletNames() { return null; } @@ -256,7 +255,7 @@ public String getServletContextName() { } @Override - public Servlet getServlet(String arg0) throws ServletException { + public Servlet getServlet(String arg0) { return null; } @@ -266,7 +265,7 @@ public String getServerInfo() { } @Override - public Set getResourcePaths(String arg0) { + public Set getResourcePaths(String arg0) { return null; } @@ -276,7 +275,7 @@ public InputStream getResourceAsStream(String name) { } @Override - public URL getResource(String name) throws MalformedURLException { + public URL getResource(String name) { return this.getClass().getClassLoader().getResource(name); } @@ -311,7 +310,7 @@ public int getMajorVersion() { } @Override - public Enumeration getInitParameterNames() { + public Enumeration getInitParameterNames() { return null; } @@ -331,7 +330,7 @@ public ServletContext getContext(String arg0) { } @Override - public Enumeration getAttributeNames() { + public Enumeration getAttributeNames() { return null; } @@ -351,6 +350,6 @@ public Object getAttribute(String arg0) { descriptorLoader.loadData(midPointApplication); // THEN - display("initialized loader", descriptorLoader); + displayDumpable("initialized loader", descriptorLoader); } } diff --git a/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestInitialObjects.java b/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestInitialObjects.java index d0b51a3992a..51ddacb1114 100644 --- a/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestInitialObjects.java +++ b/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestInitialObjects.java @@ -60,7 +60,7 @@ private void testInitialObject(ObjectValidator validator, display("Checked "+object+": no warnings"); return; } - display("Validation warnings for "+object, validationResult); + displayDumpable("Validation warnings for "+object, validationResult); for (ValidationItem valItem : validationResult.getItems()) { errorsSb.append(file.getName()); errorsSb.append(" "); diff --git a/infra/common/src/test/java/com/evolveum/midpoint/validator/test/BasicValidatorTest.java b/infra/common/src/test/java/com/evolveum/midpoint/validator/test/BasicValidatorTest.java index 11babb0927b..da313645e83 100644 --- a/infra/common/src/test/java/com/evolveum/midpoint/validator/test/BasicValidatorTest.java +++ b/infra/common/src/test/java/com/evolveum/midpoint/validator/test/BasicValidatorTest.java @@ -32,7 +32,7 @@ import com.evolveum.midpoint.schema.MidPointPrismContextFactory; import com.evolveum.midpoint.schema.constants.MidPointConstants; import com.evolveum.midpoint.schema.result.OperationResult; -import com.evolveum.midpoint.test.util.OperationResultTestMixin; +import com.evolveum.midpoint.test.util.InfraTestMixin; import com.evolveum.midpoint.tools.testng.AbstractUnitTest; import com.evolveum.midpoint.util.DOMUtil; import com.evolveum.midpoint.util.PrettyPrinter; @@ -44,7 +44,7 @@ * @author Radovan Semancik */ public class BasicValidatorTest extends AbstractUnitTest - implements OperationResultTestMixin { + implements InfraTestMixin { public static final String BASE_PATH = "src/test/resources/validator/"; private static final String OBJECT_RESULT_OPERATION_NAME = BasicValidatorTest.class.getName() + ".validateObject"; @@ -72,8 +72,7 @@ public EventResult preMarshall(Element objectElement, Node postValidationTree, @Override public EventResult postMarshall(PrismObject object, Element objectElement, OperationResult objectResult) { - System.out.println("Validating resorce:"); - System.out.println(object.debugDump()); + displayDumpable("Validating resource:", object); object.checkConsistence(); PrismContainer extensionContainer = object.getExtension(); @@ -114,23 +113,21 @@ public EventResult preMarshall(Element objectElement, Node postValidationTree, O @Override public EventResult postMarshall(PrismObject object, Element objectElement, OperationResult objectResult) { - System.out.println("Handler processing " + object + ", result:"); - System.out.println(objectResult.debugDump()); + displayDumpable("Handler processing " + object + ", result:", objectResult); postMarshallHandledOids.add(object.getOid()); return EventResult.cont(); } @Override public void handleGlobalError(OperationResult currentResult) { - System.out.println("Handler got global error:"); - System.out.println(currentResult.debugDump()); + displayDumpable("Handler got global error:", currentResult); } }; validateFile("three-objects.xml", handler, result); - System.out.println(result.debugDump()); + displayDumpable("Result:", result); AssertJUnit.assertTrue("Result is not success", result.isSuccess()); AssertJUnit.assertTrue(postMarshallHandledOids.contains("c0c010c0-d34d-b33f-f00d-111111111111")); AssertJUnit.assertTrue(preMarshallHandledOids.contains("c0c010c0-d34d-b33f-f00d-111111111111")); @@ -233,7 +230,7 @@ private void validateFile(String filename, EventHandler handler, OperationResult private void validateFile(String filename, LegacyValidator validator, OperationResult result) throws FileNotFoundException { String filepath = BASE_PATH + filename; - System.out.println("Validating " + filename); + display("Validating " + filename); File file = new File(filepath); FileInputStream fis = new FileInputStream(file); @@ -241,11 +238,9 @@ private void validateFile(String filename, LegacyValidator validator, OperationR validator.validate(fis, result, OBJECT_RESULT_OPERATION_NAME); if (!result.isSuccess()) { - System.out.println("Errors:"); - System.out.println(result.debugDump()); + displayDumpable("Errors:", result); } else { - System.out.println("No errors"); - System.out.println(result.debugDump()); + displayDumpable("No errors:", result); } } } diff --git a/infra/common/src/test/java/com/evolveum/midpoint/validator/test/UnknownNodeValidationTest.java b/infra/common/src/test/java/com/evolveum/midpoint/validator/test/UnknownNodeValidationTest.java index 6ea4d74cde5..2defe45445c 100644 --- a/infra/common/src/test/java/com/evolveum/midpoint/validator/test/UnknownNodeValidationTest.java +++ b/infra/common/src/test/java/com/evolveum/midpoint/validator/test/UnknownNodeValidationTest.java @@ -16,14 +16,14 @@ import com.evolveum.midpoint.schema.MidPointPrismContextFactory; import com.evolveum.midpoint.schema.constants.MidPointConstants; import com.evolveum.midpoint.schema.result.OperationResult; -import com.evolveum.midpoint.test.util.OperationResultTestMixin; +import com.evolveum.midpoint.test.util.InfraTestMixin; import com.evolveum.midpoint.tools.testng.AbstractUnitTest; import com.evolveum.midpoint.util.PrettyPrinter; import com.evolveum.midpoint.util.exception.SchemaException; // TODO testing: missing from suite, all passing public class UnknownNodeValidationTest extends AbstractUnitTest - implements OperationResultTestMixin { + implements InfraTestMixin { public static final String BASE_PATH = "src/test/resources/validator/unknown/"; private static final String OBJECT_RESULT_OPERATION_NAME = BasicValidatorTest.class.getName() + ".validateObject"; @@ -92,7 +92,7 @@ public void elementInConnector() throws Exception { protected void validateNodeFailure(String name, String file, String expected) throws Exception { OperationResult result = createOperationResult(); validateFile(file, result); - System.out.println(result.debugDump()); + displayDumpable("result", result); AssertJUnit.assertFalse("Result should not be successful", result.isSuccess()); String message = result.getMessage(); AssertJUnit.assertTrue(message.contains("undeclared")); @@ -114,7 +114,6 @@ protected void validateFile(String filename, EventHandler handler, OperationResu } protected void customizeValidator(LegacyValidator validator) { - } private void validateFile(String filename, LegacyValidator validator, OperationResult result) throws FileNotFoundException { @@ -126,12 +125,9 @@ private void validateFile(String filename, LegacyValidator validator, OperationR fis = new FileInputStream(file); validator.validate(fis, result, OBJECT_RESULT_OPERATION_NAME); if (!result.isSuccess()) { - System.out.println("Errors:"); - System.out.println(result.debugDump()); + displayDumpable("Errors:", result); } else { - System.out.println("No errors"); - System.out.println(result.debugDump()); + displayDumpable("No errors", result); } - } } diff --git a/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java b/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java index 7eb26eed7d3..032bf40f3d5 100644 --- a/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java +++ b/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java @@ -213,7 +213,6 @@ public static ObjectFilter getFilterCondition(ObjectFilter filter, int index) { return ((LogicalFilter) filter).getConditions().get(index); } - // TODO versions with external logger? public static void display(String title, DebugDumpable dumpable) { System.out.println(OBJECT_TITLE_OUT_PREFIX + title); System.out.println(dumpable == null ? "null" : dumpable.debugDump(1)); diff --git a/infra/test-util/src/main/java/com/evolveum/midpoint/test/util/OperationResultTestMixin.java b/infra/test-util/src/main/java/com/evolveum/midpoint/test/util/InfraTestMixin.java similarity index 51% rename from infra/test-util/src/main/java/com/evolveum/midpoint/test/util/OperationResultTestMixin.java rename to infra/test-util/src/main/java/com/evolveum/midpoint/test/util/InfraTestMixin.java index 1039d9374bb..9b30a7ccedc 100644 --- a/infra/test-util/src/main/java/com/evolveum/midpoint/test/util/OperationResultTestMixin.java +++ b/infra/test-util/src/main/java/com/evolveum/midpoint/test/util/InfraTestMixin.java @@ -2,12 +2,14 @@ import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.tools.testng.MidpointTestMixin; +import com.evolveum.midpoint.util.DebugDumpable; /** - * Mixin interface adding methods for {@link OperationResult} creation with context in its name. + * Mixin interface adding capabilities from infra test-utils like {@link OperationResult} creation + * (with context in its name), display method for dumpable, etc. * It is based on {@link MidpointTestMixin} and provides all its operations too. */ -public interface OperationResultTestMixin extends MidpointTestMixin { +public interface InfraTestMixin extends MidpointTestMixin { /** * Creates new {@link OperationResult} with name equal to {@link #contextName()}. @@ -22,4 +24,14 @@ default OperationResult createOperationResult() { default OperationResult createOperationResult(String nameSuffix) { return new OperationResult(contextName() + "." + nameSuffix); } + + /** + * Displays {@link DebugDumpable} value prefixed with provided title. + */ + // TODO: after cleanup rename to displayValue or displayDumpable + default void displayDumpable(String title, DebugDumpable dumpable) { + displayValue(title, dumpable == null ? "null" : dumpable.debugDump(1)); + } + + // TODO add displayValue(title, Object) based on PrettyPrinter, finish PrettyPrinter ideas } diff --git a/model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestCertificationBasic.java b/model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestCertificationBasic.java index a3c2fd7bba4..a505da9f019 100644 --- a/model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestCertificationBasic.java +++ b/model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestCertificationBasic.java @@ -666,7 +666,7 @@ public void test110RecordRevokeJackCeo() throws Exception { checkAllCasesSanity(caseList); ceoCase = findCase(caseList, USER_JACK_OID, ROLE_CEO_OID); - display("CEO case", ceoCase.asPrismContainerValue()); + displayDumpable("CEO case", ceoCase.asPrismContainerValue()); assertEquals("changed case ID", Long.valueOf(id), ceoCase.asPrismContainerValue().getId()); assertSingleDecision(ceoCase, REVOKE, "no way", 1, 1, USER_ADMINISTRATOR_OID, REVOKE, false); diff --git a/model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestCriticalRolesCertification.java b/model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestCriticalRolesCertification.java index c847c47e963..6d04bb5e8bd 100644 --- a/model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestCriticalRolesCertification.java +++ b/model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestCriticalRolesCertification.java @@ -87,7 +87,7 @@ public void test010CreateCampaign() throws Exception { display("campaign", campaign); assertSanityAfterCampaignCreate(campaign, certificationDefinition); - display("dummy transport", dummyTransport); + displayDumpable("dummy transport", dummyTransport); } /* @@ -166,7 +166,7 @@ public void test020OpenFirstStage() throws Exception { assertPercentCompleteCurrentIteration(campaign, 83, 83, 0); assertPercentCompleteAll(campaign, 83, 83, 0); - display("dummy transport", dummyTransport); + displayDumpable("dummy transport", dummyTransport); } @Test @@ -245,7 +245,7 @@ public void test150CloseFirstStage() throws Exception { assertPercentCompleteCurrentIteration(campaignOid, 100, 100, 100); assertPercentCompleteAll(campaignOid, 100, 100, 100); assertCasesCount(campaignOid, 6); - display("dummy transport", dummyTransport); + displayDumpable("dummy transport", dummyTransport); } @Test @@ -316,7 +316,7 @@ public void test200OpenSecondStage() throws Exception { assertPercentCompleteAll(campaign, 17, 17, 17); assertCasesCount(campaignOid, 6); - display("dummy transport", dummyTransport); + displayDumpable("dummy transport", dummyTransport); } @Test @@ -335,7 +335,7 @@ public void test220StatisticsAllStages() throws Exception { result.computeStatus(); TestUtil.assertSuccess(result); - display("statistics", stat.asPrismContainerValue()); + displayDumpable("statistics", stat.asPrismContainerValue()); assertEquals(1, stat.getMarkedAsAccept()); assertEquals(0, stat.getMarkedAsRevoke()); assertEquals(0, stat.getMarkedAsRevokeAndRemedied()); @@ -445,7 +445,7 @@ public void test260Statistics() throws Exception { result.computeStatus(); TestUtil.assertSuccess(result); - display("statistics", stat.asPrismContainerValue()); + displayDumpable("statistics", stat.asPrismContainerValue()); assertEquals(4, stat.getMarkedAsAccept()); assertEquals(1, stat.getMarkedAsRevoke()); assertEquals(0, stat.getMarkedAsRevokeAndRemedied()); @@ -495,7 +495,7 @@ public void test290CloseSecondStage() throws Exception { // - work items: 1/1 + 4/5 = 5/6 = 83% assertPercentCompleteCurrentIteration(campaign, 83, 83, 83); assertPercentCompleteAll(campaign, 83, 83, 83); - display("dummy transport", dummyTransport); + displayDumpable("dummy transport", dummyTransport); } @Test @@ -569,7 +569,7 @@ public void test300OpenThirdStage() throws Exception { assertPercentCompleteCurrentIteration(campaign, 17, 17, 36); assertPercentCompleteAll(campaign, 17, 17, 36); - display("dummy transport", dummyTransport); + displayDumpable("dummy transport", dummyTransport); } @Test @@ -673,7 +673,7 @@ public void test330RecordDecisionsThirdStage() throws Exception { assertPercentCompleteCurrentIteration(campaign, 17, 33, 50); assertPercentCompleteAll(campaign, 17, 33, 50); - display("dummy transport", dummyTransport); + displayDumpable("dummy transport", dummyTransport); } @Test @@ -736,7 +736,7 @@ public void test390CloseThirdStage() throws Exception { assertPercentCompleteCurrentIteration(campaign, 17, 33, 50); assertPercentCompleteAll(campaign, 17, 33, 50); - display("dummy transport", dummyTransport); + displayDumpable("dummy transport", dummyTransport); } @Test @@ -809,7 +809,7 @@ public void test400OpenFourthStage() throws Exception { // - work items: 1/1 + 4/5 + 2/8 + 0/3 = 7/17 = 41% assertPercentCompleteCurrentIteration(campaign, 17, 17, 41); assertPercentCompleteAll(campaign, 17, 17, 41); - display("dummy transport", dummyTransport); + displayDumpable("dummy transport", dummyTransport); } @Test @@ -976,7 +976,7 @@ public void test490CloseFourthStage() throws Exception { // - work items: 1/1 + 4/5 + 2/8 + 2/3 = 9/17 = 53% assertPercentCompleteCurrentIteration(campaign, 17, 33, 53); assertPercentCompleteAll(campaign, 17, 33, 53); - display("dummy transport", dummyTransport); + displayDumpable("dummy transport", dummyTransport); } @Test @@ -1048,7 +1048,7 @@ public void test497Statistics() throws Exception { // AccessCertificationCampaignType campaignWithCases = getCampaignWithCases(campaignOid); // display("campaignWithCases", campaignWithCases); - display("statistics", stat.asPrismContainerValue()); + displayDumpable("statistics", stat.asPrismContainerValue()); assertEquals(1, stat.getMarkedAsAccept()); assertEquals(1, stat.getMarkedAsRevoke()); assertEquals(1, stat.getMarkedAsRevokeAndRemedied()); @@ -1132,7 +1132,7 @@ public void test500Reiterate() throws Exception { // - 2 cases are decided (33%) // - work items are all from iteration 1: 1/1 + 4/5 + 2/8 + 2/3 = 9/17 = 53% assertPercentCompleteAll(campaign, 17, 33, 53); - display("dummy transport", dummyTransport); + displayDumpable("dummy transport", dummyTransport); } /* @@ -1251,6 +1251,6 @@ Out of them, completed (for stage 2) are: elaine->CEO, guybrush->COO, administra assertPercentCompleteAll(campaign, 17, 33, 53); assertCasesCount(campaignOid, 6); - display("dummy transport", dummyTransport); + displayDumpable("dummy transport", dummyTransport); } } diff --git a/model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestEscalation.java b/model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestEscalation.java index d4d68489ca6..02d43296a72 100644 --- a/model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestEscalation.java +++ b/model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestEscalation.java @@ -143,7 +143,7 @@ public void test021OpenFirstStage() throws Exception { assertPercentCompleteAll(campaign, 0, 0, 0); assertEquals("Wrong # of triggers", 2, campaign.getTrigger().size()); // completion + timed-action - display("dummy transport", dummyTransport); + displayDumpable("dummy transport", dummyTransport); } @Test @@ -282,7 +282,7 @@ public void test110Escalate() throws Exception { display("campaign after escalation", campaign); assertEquals("Wrong # of triggers", 2, campaign.getTrigger().size()); // completion + timed-action (P3D) - display("dummy transport", dummyTransport); + displayDumpable("dummy transport", dummyTransport); List messages = dummyTransport.getMessages("dummy:simpleReviewerNotifier"); assertEquals("Wrong # of dummy notifications", 3, messages.size()); // original + new approver + deputy of administrator } @@ -349,7 +349,7 @@ public void test120EscalateAgain() throws Exception { display("campaign after escalation", campaign); assertEquals("Wrong # of triggers", 1, campaign.getTrigger().size()); // completion - display("dummy transport", dummyTransport); + displayDumpable("dummy transport", dummyTransport); List messages = dummyTransport.getMessages("dummy:simpleReviewerNotifier"); assertEquals("Wrong # of dummy notifications", 1, messages.size()); // new approver } @@ -463,7 +463,7 @@ public void test200AutomaticReiteration() throws Exception { assertPercentCompleteAll(campaign, 14, 14, 14); assertEquals("Wrong # of triggers", 2, campaign.getTrigger().size()); // completion + timed-action - display("dummy transport", dummyTransport); + displayDumpable("dummy transport", dummyTransport); } @Test @@ -587,7 +587,7 @@ public void test320OpenFirstStage() throws Exception { assertPercentCompleteAll(campaign, 14, 14, 14); assertEquals("Wrong # of triggers", 2, campaign.getTrigger().size()); // completion + timed-action - display("dummy transport", dummyTransport); + displayDumpable("dummy transport", dummyTransport); } @Test diff --git a/model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestRoleInducementCertification.java b/model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestRoleInducementCertification.java index 68960a14648..341b614ef18 100644 --- a/model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestRoleInducementCertification.java +++ b/model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestRoleInducementCertification.java @@ -107,7 +107,7 @@ public void test014Statistics() throws Exception { result.computeStatus(); TestUtil.assertSuccess(result); - display("statistics", stat.asPrismContainerValue()); + displayDumpable("statistics", stat.asPrismContainerValue()); assertEquals(0, stat.getMarkedAsAccept()); assertEquals(0, stat.getMarkedAsRevoke()); assertEquals(0, stat.getMarkedAsRevokeAndRemedied()); @@ -179,7 +179,7 @@ public void test024Statistics() throws Exception { TestUtil.assertSuccess(result); // all cases are marked as ACCEPT, because the outcome strategy is acceptedIfNotDenied, with a default of Accept - display("statistics", stat.asPrismContainerValue()); + displayDumpable("statistics", stat.asPrismContainerValue()); assertEquals(5, stat.getMarkedAsAccept()); assertEquals(0, stat.getMarkedAsRevoke()); assertEquals(0, stat.getMarkedAsRevokeAndRemedied()); @@ -374,7 +374,7 @@ public void test110Statistics() throws Exception { result.computeStatus(); TestUtil.assertSuccess(result); - display("statistics", stat.asPrismContainerValue()); + displayDumpable("statistics", stat.asPrismContainerValue()); assertEquals(3, stat.getMarkedAsAccept()); assertEquals(2, stat.getMarkedAsRevoke()); assertEquals(0, stat.getMarkedAsRevokeAndRemedied()); @@ -446,7 +446,7 @@ public void test160Statistics() throws Exception { result.computeStatus(); TestUtil.assertSuccess(result); - display("statistics", stat.asPrismContainerValue()); + displayDumpable("statistics", stat.asPrismContainerValue()); assertEquals(3, stat.getMarkedAsAccept()); assertEquals(2, stat.getMarkedAsRevoke()); assertEquals(0, stat.getMarkedAsRevokeAndRemedied()); @@ -529,7 +529,7 @@ public void test210Statistics() throws Exception { result.computeStatus(); TestUtil.assertSuccess(result); - display("statistics", stat.asPrismContainerValue()); + displayDumpable("statistics", stat.asPrismContainerValue()); assertEquals(0, stat.getMarkedAsAccept()); assertEquals(0, stat.getMarkedAsRevoke()); assertEquals(0, stat.getMarkedAsRevokeAndRemedied()); @@ -555,7 +555,7 @@ public void test220StatisticsAllStages() throws Exception { result.computeStatus(); TestUtil.assertSuccess(result); - display("statistics", stat.asPrismContainerValue()); + displayDumpable("statistics", stat.asPrismContainerValue()); assertEquals(0, stat.getMarkedAsAccept()); assertEquals(2, stat.getMarkedAsRevoke()); assertEquals(0, stat.getMarkedAsRevokeAndRemedied()); @@ -665,7 +665,7 @@ public void test260Statistics() throws Exception { result.computeStatus(); TestUtil.assertSuccess(result); - display("statistics", stat.asPrismContainerValue()); + displayDumpable("statistics", stat.asPrismContainerValue()); assertEquals(1, stat.getMarkedAsAccept()); assertEquals(1, stat.getMarkedAsRevoke()); assertEquals(0, stat.getMarkedAsRevokeAndRemedied()); @@ -820,7 +820,7 @@ public void test310Statistics() throws Exception { result.computeStatus(); TestUtil.assertSuccess(result); - display("statistics", stat.asPrismContainerValue()); + displayDumpable("statistics", stat.asPrismContainerValue()); assertEquals(1, stat.getMarkedAsAccept()); assertEquals(3, stat.getMarkedAsRevoke()); assertEquals(3, stat.getMarkedAsRevokeAndRemedied()); diff --git a/model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestSoDCertification.java b/model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestSoDCertification.java index 0f5c0f26fdf..5eed54de1bd 100644 --- a/model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestSoDCertification.java +++ b/model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestSoDCertification.java @@ -212,7 +212,7 @@ public void test014Statistics() throws Exception { result.computeStatus(); TestUtil.assertSuccess(result); - display("statistics", stat.asPrismContainerValue()); + displayDumpable("statistics", stat.asPrismContainerValue()); assertEquals(0, stat.getMarkedAsAccept()); assertEquals(0, stat.getMarkedAsRevoke()); assertEquals(0, stat.getMarkedAsRevokeAndRemedied()); diff --git a/model/model-common/src/test/java/com/evolveum/midpoint/model/common/AbstractModelCommonTest.java b/model/model-common/src/test/java/com/evolveum/midpoint/model/common/AbstractModelCommonTest.java index d2e454cedb6..4035097a92d 100644 --- a/model/model-common/src/test/java/com/evolveum/midpoint/model/common/AbstractModelCommonTest.java +++ b/model/model-common/src/test/java/com/evolveum/midpoint/model/common/AbstractModelCommonTest.java @@ -11,7 +11,7 @@ import com.evolveum.midpoint.prism.util.PrismTestUtil; import com.evolveum.midpoint.task.api.Task; import com.evolveum.midpoint.task.api.test.NullTaskImpl; -import com.evolveum.midpoint.test.util.OperationResultTestMixin; +import com.evolveum.midpoint.test.util.InfraTestMixin; import com.evolveum.midpoint.tools.testng.AbstractUnitTest; import com.evolveum.midpoint.util.DebugDumpable; @@ -19,7 +19,7 @@ * @author semancik */ public class AbstractModelCommonTest extends AbstractUnitTest - implements OperationResultTestMixin { + implements InfraTestMixin { protected static final File COMMON_DIR = new File("src/test/resources/common"); @@ -31,7 +31,7 @@ protected Task createTask() { } public void displayValue(String title, DebugDumpable value) { - PrismTestUtil.display(title, value); + displayDumpable(title, value); } public void displayValue(String title, Object value) { diff --git a/model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/AbstractScriptTest.java b/model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/AbstractScriptTest.java index 86890526077..cf5fb5b7c9a 100644 --- a/model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/AbstractScriptTest.java +++ b/model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/AbstractScriptTest.java @@ -43,7 +43,7 @@ import com.evolveum.midpoint.schema.expression.ScriptExpressionProfile; import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.schema.util.MiscSchemaUtil; -import com.evolveum.midpoint.test.util.OperationResultTestMixin; +import com.evolveum.midpoint.test.util.InfraTestMixin; import com.evolveum.midpoint.test.util.ParallelTestThread; import com.evolveum.midpoint.test.util.TestUtil; import com.evolveum.midpoint.tools.testng.AbstractUnitTest; @@ -53,11 +53,8 @@ import com.evolveum.midpoint.xml.ns._public.common.common_3.ScriptExpressionEvaluatorType; import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType; -/** - * @author Radovan Semancik - */ public abstract class AbstractScriptTest extends AbstractUnitTest - implements OperationResultTestMixin { + implements InfraTestMixin { protected static final QName PROPERTY_NAME = new QName(MidPointConstants.NS_MIDPOINT_TEST_PREFIX, "whatever"); protected static final File BASE_TEST_DIR = new File("src/test/resources/expression"); @@ -94,7 +91,7 @@ public void setupFactory() { localizationService = LocalizationTestUtil.getLocalizationService(); evaluator = createEvaluator(prismContext, protector); String languageUrl = evaluator.getLanguageUrl(); - System.out.println("Expression test for " + evaluator.getLanguageName() + ": registering " + evaluator + " with URL " + languageUrl); + display("Expression test for " + evaluator.getLanguageName() + ": registering " + evaluator + " with URL " + languageUrl); scriptExpressionfactory.registerEvaluator(languageUrl, evaluator); } diff --git a/model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestScriptCaching.java b/model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestScriptCaching.java index e33d244f03c..a2f88e27581 100644 --- a/model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestScriptCaching.java +++ b/model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestScriptCaching.java @@ -44,7 +44,7 @@ import com.evolveum.midpoint.schema.internals.InternalCounters; import com.evolveum.midpoint.schema.internals.InternalMonitor; import com.evolveum.midpoint.schema.result.OperationResult; -import com.evolveum.midpoint.test.util.OperationResultTestMixin; +import com.evolveum.midpoint.test.util.InfraTestMixin; import com.evolveum.midpoint.tools.testng.AbstractUnitTest; import com.evolveum.midpoint.util.DOMUtil; import com.evolveum.midpoint.util.PrettyPrinter; @@ -55,7 +55,7 @@ * @author semancik */ public class TestScriptCaching extends AbstractUnitTest - implements OperationResultTestMixin { + implements InfraTestMixin { private static final File TEST_DIR = new File("src/test/resources/expression/groovy"); protected static final File OBJECTS_DIR = new File("src/test/resources/objects"); @@ -73,7 +73,7 @@ public void setup() throws SchemaException, SAXException, IOException { @BeforeClass public void setupFactory() { - System.out.println("Setting up expression factory and evaluator"); + display("Setting up expression factory and evaluator"); PrismContext prismContext = getPrismContext(); ObjectResolver resolver = new DirectoryFileObjectResolver(OBJECTS_DIR); Protector protector = KeyStoreBasedProtectorBuilder.create(prismContext).buildOnly(); @@ -149,8 +149,9 @@ private long executeScript(String filname, String expectedResult, String desc) long endTime = System.currentTimeMillis(); // THEN - System.out.println("Script results " + desc + ", etime: " + (endTime - startTime) + " ms"); - System.out.println(scripResults); + displayValue( + "Script results " + desc + ", etime: " + (endTime - startTime) + " ms", + scripResults); String scriptResult = asScalarString(scripResults); assertEquals("Wrong script " + desc + " result", expectedResult, scriptResult); diff --git a/model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDomain.java b/model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDomain.java index 65b99731a0d..9627f9250b1 100644 --- a/model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDomain.java +++ b/model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDomain.java @@ -24,9 +24,8 @@ import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.task.api.Task; import com.evolveum.midpoint.task.api.test.NullTaskImpl; -import com.evolveum.midpoint.test.util.OperationResultTestMixin; +import com.evolveum.midpoint.test.util.InfraTestMixin; import com.evolveum.midpoint.tools.testng.AbstractUnitTest; -import com.evolveum.midpoint.util.DebugDumpable; import com.evolveum.midpoint.util.exception.SchemaException; import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType; @@ -38,7 +37,7 @@ * @author Radovan Semancik */ public class TestMappingDomain extends AbstractUnitTest - implements OperationResultTestMixin { + implements InfraTestMixin { private static final String MAPPING_DOMAIN_FILENAME = "mapping-domain.xml"; @@ -155,7 +154,7 @@ public void testReplaceMixedMultiValue() throws Exception { // THEN then(); PrismValueDeltaSetTriple> outputTriple = mapping.getOutputTriple(); - display("Output triple", outputTriple); + displayDumpable("Output triple", outputTriple); outputTriple.checkConsistence(); PrismAsserts.assertTripleNoZero(outputTriple); PrismAsserts.assertTriplePlus(outputTriple, @@ -197,7 +196,7 @@ public void testAddMixedMultiValue() throws Exception { // THEN then(); PrismValueDeltaSetTriple> outputTriple = mapping.getOutputTriple(); - display("Output triple", outputTriple); + displayDumpable("Output triple", outputTriple); outputTriple.checkConsistence(); PrismAsserts.assertTripleZero(outputTriple, PrismTestUtil.createPolyString("Pirate Jackie (001)"), @@ -241,7 +240,7 @@ public void testDeleteMixedMultiValue() throws Exception { // THEN then(); PrismValueDeltaSetTriple> outputTriple = mapping.getOutputTriple(); - display("Output triple", outputTriple); + displayDumpable("Output triple", outputTriple); outputTriple.checkConsistence(); PrismAsserts.assertTripleZero(outputTriple, PrismTestUtil.createPolyString("Pirate Jackie (001)"), @@ -252,10 +251,6 @@ public void testDeleteMixedMultiValue() throws Exception { PrismTestUtil.createPolyString("Pirate Jackie (007)")); } - protected void display(String title, DebugDumpable value) { - PrismTestUtil.display(title, value); - } - public void displayValue(String title, Object value) { PrismTestUtil.display(title, value); } diff --git a/model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingTime.java b/model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingTime.java index c3ba0fda321..56099c19671 100644 --- a/model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingTime.java +++ b/model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingTime.java @@ -30,18 +30,15 @@ import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.task.api.Task; import com.evolveum.midpoint.task.api.test.NullTaskImpl; -import com.evolveum.midpoint.test.util.OperationResultTestMixin; +import com.evolveum.midpoint.test.util.InfraTestMixin; import com.evolveum.midpoint.tools.testng.AbstractUnitTest; import com.evolveum.midpoint.util.DOMUtil; import com.evolveum.midpoint.util.exception.SchemaException; import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationType; import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType; -/** - * @author Radovan Semancik - */ public class TestMappingTime extends AbstractUnitTest - implements OperationResultTestMixin { + implements InfraTestMixin { private static final String MAPPING_TIME_FROM_TO_FILENAME = "mapping-time-from-to.xml"; private static final String MAPPING_TIME_ACTIVATION = "mapping-time-deferred-delete.xml"; diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java index 227f0a4c65e..91995017d48 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java @@ -10,33 +10,23 @@ import java.util.Collection; import java.util.List; import java.util.Objects; - import javax.xml.namespace.QName; -import com.evolveum.midpoint.prism.path.ItemPath; -import com.evolveum.midpoint.repo.common.expression.ExpressionUtil; -import com.evolveum.midpoint.repo.common.expression.ExpressionVariables; -import com.evolveum.midpoint.common.refinery.RefinedAssociationDefinition; -import com.evolveum.midpoint.common.refinery.RefinedAttributeDefinition; -import com.evolveum.midpoint.common.refinery.RefinedObjectClassDefinition; -import com.evolveum.midpoint.common.refinery.RefinedResourceSchema; -import com.evolveum.midpoint.common.refinery.RefinedResourceSchemaImpl; -import com.evolveum.midpoint.model.common.mapping.MappingImpl; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import com.evolveum.midpoint.common.refinery.*; import com.evolveum.midpoint.model.common.mapping.MappingFactory; +import com.evolveum.midpoint.model.common.mapping.MappingImpl; import com.evolveum.midpoint.model.impl.lens.projector.mappings.MappingEvaluator; import com.evolveum.midpoint.model.impl.util.ModelImplUtils; -import com.evolveum.midpoint.prism.ItemDefinition; -import com.evolveum.midpoint.prism.OriginType; -import com.evolveum.midpoint.prism.PrismContainerDefinition; -import com.evolveum.midpoint.prism.PrismContainerValue; -import com.evolveum.midpoint.prism.PrismObject; -import com.evolveum.midpoint.prism.PrismObjectDefinition; -import com.evolveum.midpoint.prism.PrismPropertyDefinition; -import com.evolveum.midpoint.prism.PrismPropertyValue; -import com.evolveum.midpoint.prism.PrismValue; +import com.evolveum.midpoint.prism.*; import com.evolveum.midpoint.prism.delta.PrismValueDeltaSetTriple; +import com.evolveum.midpoint.prism.path.ItemPath; import com.evolveum.midpoint.prism.query.ObjectFilter; import com.evolveum.midpoint.prism.util.ItemPathTypeUtil; +import com.evolveum.midpoint.repo.common.expression.ExpressionUtil; +import com.evolveum.midpoint.repo.common.expression.ExpressionVariables; import com.evolveum.midpoint.schema.ResourceShadowDiscriminator; import com.evolveum.midpoint.schema.ResultHandler; import com.evolveum.midpoint.schema.constants.ExpressionConstants; @@ -49,21 +39,12 @@ import com.evolveum.midpoint.task.api.Task; import com.evolveum.midpoint.util.DebugUtil; import com.evolveum.midpoint.util.PrettyPrinter; -import com.evolveum.midpoint.util.exception.CommunicationException; -import com.evolveum.midpoint.util.exception.ConfigurationException; -import com.evolveum.midpoint.util.exception.ExpressionEvaluationException; -import com.evolveum.midpoint.util.exception.ObjectNotFoundException; -import com.evolveum.midpoint.util.exception.SchemaException; -import com.evolveum.midpoint.util.exception.SecurityViolationException; -import com.evolveum.midpoint.util.exception.SystemException; +import com.evolveum.midpoint.util.exception.*; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.xml.ns._public.common.common_3.*; import com.evolveum.prism.xml.ns._public.types_3.ReferentialIntegrityType; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - /** * Live class that contains "construction" - a definition how to construct a * resource object. It in fact reflects the definition of ConstructionType but @@ -71,12 +52,12 @@ * contains intermediary and side results of the evaluation. * * @author Radovan Semancik - * - * This class is Serializable but it is not in fact serializable. It - * implements Serializable interface only to be storable in the - * PrismPropertyValue. + *

+ * This class is Serializable but it is not in fact serializable. It + * implements Serializable interface only to be storable in the + * PrismPropertyValue. */ -public class Construction extends AbstractConstruction { +public class Construction extends AbstractConstruction { private static final Trace LOGGER = TraceManager.getTrace(Construction.class); @@ -438,7 +419,7 @@ private void evaluateAttributes(Task task, OperationResult result) private MappingImpl, ResourceAttributeDefinition> evaluateAttribute( ResourceAttributeDefinitionType attributeDefinition, Task task, OperationResult result) - throws ExpressionEvaluationException, ObjectNotFoundException, SchemaException, SecurityViolationException, ConfigurationException, CommunicationException { + throws ExpressionEvaluationException, ObjectNotFoundException, SchemaException, SecurityViolationException, ConfigurationException, CommunicationException { QName attrName = ItemPathTypeUtil.asSingleNameOrFailNullSafe(attributeDefinition.getRef()); if (attrName == null) { throw new SchemaException("Missing 'ref' in attribute construction in account construction in " @@ -492,12 +473,12 @@ private MappingImpl, ResourceAttributeDefinition> e } private String getAttributeEvaluationErrorMessage(QName attrName, Exception e) { - return "Error evaluating mapping for attribute "+PrettyPrinter.prettyPrint(attrName)+" in "+getHumanReadableConstructionDescription()+": "+e.getMessage(); + return "Error evaluating mapping for attribute " + PrettyPrinter.prettyPrint(attrName) + " in " + getHumanReadableConstructionDescription() + ": " + e.getMessage(); } private String getHumanReadableConstructionDescription() { - return "construction for ("+ (resolvedResource!=null?resolvedResource.resource:null) - +"/"+getKind()+"/"+getIntent()+") in "+getSource(); + return "construction for (" + (resolvedResource != null ? resolvedResource.resource : null) + + "/" + getKind() + "/" + getIntent() + ") in " + getSource(); } public RefinedAttributeDefinition findAttributeDefinition(QName attributeName) { @@ -556,7 +537,7 @@ private void evaluateAssociations(Task task, OperationResult result) private MappingImpl, PrismContainerDefinition> evaluateAssociation( ResourceObjectAssociationType associationDefinitionType, Task task, OperationResult result) - throws ExpressionEvaluationException, ObjectNotFoundException, SchemaException, SecurityViolationException, ConfigurationException, CommunicationException { + throws ExpressionEvaluationException, ObjectNotFoundException, SchemaException, SecurityViolationException, ConfigurationException, CommunicationException { QName assocName = ItemPathTypeUtil.asSingleNameOrFailNullSafe(associationDefinitionType.getRef()); if (assocName == null) { throw new SchemaException("Missing 'ref' in association in construction in " + getSource()); @@ -596,7 +577,7 @@ private MappingImpl, PrismContainerDe private > MappingImpl evaluateMapping( MappingImpl.Builder builder, ItemPath implicitTargetPath, QName mappingQName, D outputDefinition, RefinedObjectClassDefinition assocTargetObjectClassDefinition, Task task, OperationResult result) - throws ExpressionEvaluationException, ObjectNotFoundException, SchemaException, SecurityViolationException, ConfigurationException, CommunicationException { + throws ExpressionEvaluationException, ObjectNotFoundException, SchemaException, SecurityViolationException, ConfigurationException, CommunicationException { if (!builder.isApplicableToChannel(getChannel())) { return null; @@ -755,10 +736,10 @@ public String debugDump(int indent) { if (refinedObjectClassDefinition == null) { sb.append(" (no object class definition)"); if (getConstructionType() != null && getConstructionType().getResourceRef() != null) { // should - // be - // always - // the - // case + // be + // always + // the + // case sb.append("\n"); DebugUtil.debugDumpLabel(sb, "resourceRef / kind / intent", indent + 1); sb.append(" "); @@ -798,7 +779,7 @@ public String debugDump(int indent) { if (attributeMappings != null && !attributeMappings.isEmpty()) { sb.append("\n"); DebugUtil.debugDumpLabel(sb, "attribute mappings", indent + 1); - for (MappingImpl mapping : attributeMappings) { + for (MappingImpl mapping : attributeMappings) { sb.append("\n"); sb.append(mapping.debugDump(indent + 2)); } @@ -806,7 +787,7 @@ public String debugDump(int indent) { if (associationMappings != null && !associationMappings.isEmpty()) { sb.append("\n"); DebugUtil.debugDumpLabel(sb, "association mappings", indent + 1); - for (MappingImpl mapping : associationMappings) { + for (MappingImpl mapping : associationMappings) { sb.append("\n"); sb.append(mapping.debugDump(indent + 2)); } @@ -844,7 +825,7 @@ public String toString() { /** * Should this construction be ignored e.g. because the resource couldn't be resolved? - * @pre The construction was already evaluated. + * The construction was already evaluated. */ public boolean isIgnored() { return getResource() == null; @@ -866,10 +847,8 @@ private ResolvedResource(boolean warning) { @Override public boolean equals(Object o) { - if (this == o) - return true; - if (!(o instanceof ResolvedResource)) - return false; + if (this == o) { return true; } + if (!(o instanceof ResolvedResource)) { return false; } ResolvedResource that = (ResolvedResource) o; return warning == that.warning && Objects.equals(resource, that.resource); diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractModelImplementationIntegrationTest.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractModelImplementationIntegrationTest.java index 0a9d902a905..8b1a8f26c4f 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractModelImplementationIntegrationTest.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractModelImplementationIntegrationTest.java @@ -317,7 +317,7 @@ protected LensContext createContextForAssignment(Class< addFocusDeltaToContext(context, createAssignmentFocusDelta(focusClass, focusOid, targetOid, targetType, relation, modificationBlock, true)); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); return context; } diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/TestRefinedSchema.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/TestRefinedSchema.java index 9e63f5c0f45..85f4948c9f1 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/TestRefinedSchema.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/TestRefinedSchema.java @@ -63,7 +63,7 @@ public void test000Sanity() throws Exception { // WHEN refinedSchema = RefinedResourceSchemaImpl.getRefinedSchema(getDummyResourceType(), prismContext); - display("Dummy refined schema", refinedSchema); + displayDumpable("Dummy refined schema", refinedSchema); // THEN getDummyResourceController().assertRefinedSchemaSanity(refinedSchema); @@ -74,7 +74,7 @@ public void test010SanityModel() throws Exception { // WHEN refinedSchemaModel = RefinedResourceSchemaImpl.getRefinedSchema(getDummyResourceType(), LayerType.MODEL, prismContext); - display("Dummy refined schema (MODEL)", refinedSchemaModel); + displayDumpable("Dummy refined schema (MODEL)", refinedSchemaModel); // THEN getDummyResourceController().assertRefinedSchemaSanity(refinedSchemaModel); @@ -126,7 +126,7 @@ public void test110DetermineObjectClassObjectClass() throws Exception { ObjectClassComplexTypeDefinition objectClass = ModelImplUtils.determineObjectClass(refinedSchema, task); // THEN - display("Object class", objectClass); + displayDumpable("Object class", objectClass); deleteObject(TaskType.class, TASK_RECONCILE_DUMMY_OBJECTCLASS_OID); @@ -146,7 +146,7 @@ public void test112DetermineObjectClassKindIntent() throws Exception { ObjectClassComplexTypeDefinition objectClass = ModelImplUtils.determineObjectClass(refinedSchema, task); // THEN - display("Object class", objectClass); + displayDumpable("Object class", objectClass); deleteObject(TaskType.class, TASK_RECONCILE_DUMMY_KIND_INTENT_OID); @@ -166,7 +166,7 @@ public void test114DetermineObjectClassKindIntentObjectClass() throws Exception ObjectClassComplexTypeDefinition objectClass = ModelImplUtils.determineObjectClass(refinedSchema, task); // THEN - display("Object class", objectClass); + displayDumpable("Object class", objectClass); deleteObject(TaskType.class, TASK_RECONCILE_DUMMY_KIND_INTENT_OBJECTCLASS_OID); @@ -186,7 +186,7 @@ public void test120DetermineObjectClassObjectClassModel() throws Exception { ObjectClassComplexTypeDefinition objectClass = ModelImplUtils.determineObjectClass(refinedSchemaModel, task); // THEN - display("Object class", objectClass); + displayDumpable("Object class", objectClass); displayValue("Object class (toString)", objectClass.toString()); deleteObject(TaskType.class, TASK_RECONCILE_DUMMY_OBJECTCLASS_OID); @@ -207,7 +207,7 @@ public void test122DetermineObjectClassKindIntentModel() throws Exception { ObjectClassComplexTypeDefinition objectClass = ModelImplUtils.determineObjectClass(refinedSchemaModel, task); // THEN - display("Object class", objectClass); + displayDumpable("Object class", objectClass); displayValue("Object class (toString)", objectClass.toString()); deleteObject(TaskType.class, TASK_RECONCILE_DUMMY_KIND_INTENT_OID); @@ -229,7 +229,7 @@ public void test124DetermineObjectClassKindIntentObjectClassModel() throws Excep ObjectClassComplexTypeDefinition objectClass = ModelImplUtils.determineObjectClass(refinedSchemaModel, task); // THEN - display("Object class", objectClass); + displayDumpable("Object class", objectClass); displayValue("Object class (toString)", objectClass.toString()); deleteObject(TaskType.class, TASK_RECONCILE_DUMMY_KIND_INTENT_OBJECTCLASS_OID); diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/ExpressionHandlerImplTest.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/ExpressionHandlerImplTest.java index 6a51f3a0732..55e289ad917 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/ExpressionHandlerImplTest.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/ExpressionHandlerImplTest.java @@ -34,7 +34,7 @@ import com.evolveum.midpoint.schema.util.SchemaDebugUtil; import com.evolveum.midpoint.security.api.MidPointPrincipal; import com.evolveum.midpoint.test.util.AbstractSpringTest; -import com.evolveum.midpoint.test.util.OperationResultTestMixin; +import com.evolveum.midpoint.test.util.InfraTestMixin; import com.evolveum.midpoint.util.PrettyPrinter; import com.evolveum.midpoint.util.exception.SchemaException; import com.evolveum.midpoint.xml.ns._public.common.common_3.*; @@ -44,7 +44,7 @@ */ @ContextConfiguration(locations = { "classpath:ctx-model-test-no-repo.xml" }) public class ExpressionHandlerImplTest extends AbstractSpringTest - implements OperationResultTestMixin { + implements InfraTestMixin { private static final File TEST_FOLDER = new File("./src/test/resources/expr"); private static final File TEST_FOLDER_COMMON = new File("./src/test/resources/common"); diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/TestFilterExpression.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/TestFilterExpression.java index ca2822ae06c..4fc24d0d298 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/TestFilterExpression.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/TestFilterExpression.java @@ -21,23 +21,17 @@ import org.testng.annotations.Test; import org.xml.sax.SAXException; -import com.evolveum.midpoint.repo.common.expression.ExpressionFactory; -import com.evolveum.midpoint.repo.common.expression.ExpressionUtil; -import com.evolveum.midpoint.repo.common.expression.ExpressionVariables; import com.evolveum.midpoint.model.impl.AbstractInternalModelIntegrationTest; import com.evolveum.midpoint.prism.PrimitiveType; import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.prism.PrismObject; import com.evolveum.midpoint.prism.PrismPropertyValue; -import com.evolveum.midpoint.prism.query.AllFilter; -import com.evolveum.midpoint.prism.query.EqualFilter; -import com.evolveum.midpoint.prism.query.NoneFilter; -import com.evolveum.midpoint.prism.query.ObjectFilter; -import com.evolveum.midpoint.prism.query.ObjectQuery; -import com.evolveum.midpoint.prism.query.RefFilter; -import com.evolveum.midpoint.prism.query.UndefinedFilter; +import com.evolveum.midpoint.prism.query.*; import com.evolveum.midpoint.prism.util.PrismAsserts; import com.evolveum.midpoint.prism.util.PrismTestUtil; +import com.evolveum.midpoint.repo.common.expression.ExpressionFactory; +import com.evolveum.midpoint.repo.common.expression.ExpressionUtil; +import com.evolveum.midpoint.repo.common.expression.ExpressionVariables; import com.evolveum.midpoint.schema.MidPointPrismContextFactory; import com.evolveum.midpoint.schema.SearchResultList; import com.evolveum.midpoint.schema.constants.ExpressionConstants; @@ -45,14 +39,8 @@ import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.schema.util.MiscSchemaUtil; import com.evolveum.midpoint.task.api.Task; -import com.evolveum.midpoint.task.api.TaskManager; import com.evolveum.midpoint.util.PrettyPrinter; -import com.evolveum.midpoint.util.exception.CommunicationException; -import com.evolveum.midpoint.util.exception.ConfigurationException; -import com.evolveum.midpoint.util.exception.ExpressionEvaluationException; -import com.evolveum.midpoint.util.exception.ObjectNotFoundException; -import com.evolveum.midpoint.util.exception.SchemaException; -import com.evolveum.midpoint.util.exception.SecurityViolationException; +import com.evolveum.midpoint.util.exception.*; import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType; import com.evolveum.prism.xml.ns._public.query_3.SearchFilterType; @@ -65,9 +53,6 @@ public class TestFilterExpression extends AbstractInternalModelIntegrationTest { @Autowired private ExpressionFactory expressionFactory; - @Autowired - private TaskManager taskManager; - @BeforeSuite public void setup() throws SchemaException, SAXException, IOException { PrettyPrinter.setDefaultNamespacePrefix(MidPointConstants.NS_MIDPOINT_PUBLIC_PREFIX); @@ -120,11 +105,10 @@ public void test130EvaluateExpressionEmployeeTypeError() throws Exception { AssertJUnit.fail("Unexpected success"); } catch (ExpressionEvaluationException e) { // this is expected - assertTrue("Unexpected exception message: "+e.getMessage(), e.getMessage().contains("evaluated to no value")); + assertTrue("Unexpected exception message: " + e.getMessage(), e.getMessage().contains("evaluated to no value")); } } - @Test public void test140EvaluateExpressionEmployeeTypeEmptyFilter() throws Exception { // GIVEN @@ -170,7 +154,6 @@ public void test152EvaluateExpressionEmployeeTypeDefaultsCaptain() throws Except executeFilter(filter, 1, task, result); } - @Test public void test200EvaluateExpressionLinkRefDefaultsNull() throws Exception { // GIVEN @@ -231,7 +214,6 @@ public void test212EvaluateExpressionLinkRefObjectReferenceTypeDefaultsVal() thr executeFilter(filter, 1, task, result); } - private ObjectFilter evaluateExpressionAssertFilter(String filename, String input, Class expectedType, Task task, OperationResult result) throws SchemaException, IOException, ObjectNotFoundException, ExpressionEvaluationException, CommunicationException, ConfigurationException, SecurityViolationException { @@ -255,8 +237,8 @@ private ObjectFilter evaluateExpressionAssertFilter(String filename, "evaluating filter with null value not allowed", task, result); // THEN - display("Evaluated filter", evaluatedFilter); - AssertJUnit.assertTrue("Expression should be evaluated to "+expectedType+", but was "+evaluatedFilter, expectedType.isAssignableFrom(evaluatedFilter.getClass())); + displayDumpable("Evaluated filter", evaluatedFilter); + AssertJUnit.assertTrue("Expression should be evaluated to " + expectedType + ", but was " + evaluatedFilter, expectedType.isAssignableFrom(evaluatedFilter.getClass())); return evaluatedFilter; } @@ -265,7 +247,7 @@ private void executeFilter(ObjectFilter filter, int expectedNumberOfResults, Tas ObjectQuery query = prismContext.queryFactory().createQuery(filter); SearchResultList> objects = modelService.searchObjects(UserType.class, query, null, task, result); display("Found objects", objects); - assertEquals("Wrong number of results (found: "+objects+")", expectedNumberOfResults, objects.size()); + assertEquals("Wrong number of results (found: " + objects + ")", expectedNumberOfResults, objects.size()); } } diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java index 364cd0ae1e4..a732a323f30 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java @@ -25,7 +25,6 @@ import com.evolveum.midpoint.prism.PrismContainer; import com.evolveum.midpoint.prism.PrismContainerDefinition; import com.evolveum.midpoint.prism.delta.DeltaSetTriple; -import com.evolveum.midpoint.prism.util.PrismAsserts; import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.task.api.Task; import com.evolveum.midpoint.task.api.TaskManager; @@ -80,8 +79,8 @@ public abstract class AbstractLensTest extends AbstractInternalModelIntegrationT protected static final File ROLE_PIRATE_RECORD_ONLY_FILE = new File(TEST_DIR, "role-pirate-record-only.xml"); protected static final String ROLE_PIRATE_OID = "12345678-d34d-b33f-f00d-555555556666"; - protected static final File ROLE_MUTINIER_FILE = new File(TEST_DIR, "role-mutinier.xml"); - protected static final String ROLE_MUTINIER_OID = "12345678-d34d-b33f-f00d-555555556668"; + protected static final File ROLE_MUTINEER_FILE = new File(TEST_DIR, "role-mutineer.xml"); + protected static final String ROLE_MUTINEER_OID = "12345678-d34d-b33f-f00d-555555556668"; protected static final File ROLE_JUDGE_FILE = new File(TEST_DIR, "role-judge.xml"); protected static final File ROLE_JUDGE_RECORD_ONLY_FILE = new File(TEST_DIR, "role-judge-record-only.xml"); @@ -197,7 +196,7 @@ void assertTargetTriggers(LensContext context, PolicyConstr if (selectedConstraintKind != null && trigger.getConstraintKind() != selectedConstraintKind) { return; } - display("Selected trigger", trigger); + displayDumpable("Selected trigger", trigger); triggers.add(trigger); }); assertEquals("Unexpected number of triggers (" + selectedConstraintKind + ") in the context", expectedCount, triggers.size()); @@ -212,7 +211,7 @@ void assertTargetTriggers(LensContext context, PolicyConstr if (selectedConstraintKind != null && trigger.getConstraintKind() != selectedConstraintKind) { return; } - display("Selected trigger", trigger); + displayDumpable("Selected trigger", trigger); triggersFound.add(trigger); namesFound.add(trigger.getConstraint().getName()); }); @@ -227,7 +226,7 @@ void assertFocusTriggers(LensContext context, PolicyConstra if (selectedConstraintKind != null && trigger.getConstraintKind() != selectedConstraintKind) { return; } - display("Selected trigger", trigger); + displayDumpable("Selected trigger", trigger); triggers.add(trigger); }); assertEquals("Unexpected number of focus triggers (" + selectedConstraintKind + ") in the context", expectedCount, triggers.size()); @@ -242,7 +241,7 @@ void assertFocusTriggers(LensContext context, PolicyConstra if (selectedConstraintKind != null && trigger.getConstraintKind() != selectedConstraintKind) { return; } - display("Selected trigger", trigger); + displayDumpable("Selected trigger", trigger); triggersFound.add(trigger); namesFound.add(trigger.getConstraint().getName()); }); @@ -257,7 +256,7 @@ protected EvaluatedPolicyRuleTrigger assertTriggeredTargetPolicyRule(LensContext if (!exclusive && trigger.getConstraintKind() != expectedConstraintKind) { return; } - display("Triggered rule", trigger); + displayDumpable("Triggered rule", trigger); triggers.add(trigger); if (expectedConstraintKind != null) { assertEquals("Wrong trigger constraint type in " + trigger, expectedConstraintKind, trigger.getConstraintKind()); @@ -359,18 +358,4 @@ protected void assertAssignmentPath(AssignmentPath path, String... targetOids) { } } } - - protected void assertAssignmentPolicySituation( - LensContext context, String roleOid, String... uris) { - AssignmentType assignment = findAssignmentByTargetRequired( - context.getFocusContext().getObjectNew(), roleOid); - PrismAsserts.assertEqualsCollectionUnordered( - "Wrong assignment policy situation", assignment.getPolicySituation(), uris); - } - - protected void assertFocusPolicySituation( - LensContext context, String... uris) { - PrismAsserts.assertEqualsCollectionUnordered("Wrong focus policy situation", - context.getFocusContext().getObjectNew().asObjectable().getPolicySituation(), uris); - } } diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java index e73ee4949f1..56f57b374d5 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java @@ -129,7 +129,7 @@ public void test100Direct() throws Exception { PrismAsserts.assertParentConsistency(userTypeJack.asPrismObject()); Construction construction = evaluatedAssignment.getConstructionTriple().getZeroSet().iterator().next(); - display("Evaluated construction", construction); + displayDumpable("Evaluated construction", construction); assertNotNull("No object class definition in construction", construction.getRefinedObjectClassDefinition()); assertEquals("Wrong number of admin GUI configs", 0, evaluatedAssignment.getAdminGuiConfigurations().size()); @@ -162,7 +162,7 @@ public void test110DirectExpression() throws Exception { TestUtil.assertSuccess(result); assertNotNull(evaluatedAssignment); - display("Evaluated assignment", evaluatedAssignment); + displayDumpable("Evaluated assignment", evaluatedAssignment); assertEquals(1, evaluatedAssignment.getConstructionTriple().size()); PrismAsserts.assertParentConsistency(userTypeJack.asPrismObject()); @@ -194,7 +194,7 @@ public void test120DirectExpressionReplaceDescription() throws Exception { assignmentIdi.setResolvePath(UserType.F_ASSIGNMENT); assignmentIdi.setSubItemDeltas(userDelta.getModifications()); assignmentIdi.recompute(); - display("Assignment IDI", assignmentIdi); + displayDumpable("Assignment IDI", assignmentIdi); // WHEN when(); @@ -207,7 +207,7 @@ public void test120DirectExpressionReplaceDescription() throws Exception { assertSuccess(result); assertNotNull(evaluatedAssignment); - display("Evaluated assignment", evaluatedAssignment); + displayDumpable("Evaluated assignment", evaluatedAssignment); assertEquals(1, evaluatedAssignment.getConstructionTriple().size()); PrismAsserts.assertParentConsistency(user); @@ -217,7 +217,7 @@ public void test120DirectExpressionReplaceDescription() throws Exception { MappingImpl, PrismPropertyDefinition> attributeMapping = (MappingImpl, PrismPropertyDefinition>) construction.getAttributeMappings().iterator().next(); PrismValueDeltaSetTriple> outputTriple = attributeMapping.getOutputTriple(); - display("output triple", outputTriple); + displayDumpable("output triple", outputTriple); PrismAsserts.assertTripleNoZero(outputTriple); PrismAsserts.assertTriplePlus(outputTriple, "The best captain the world has ever seen"); PrismAsserts.assertTripleMinus(outputTriple, "The best pirate the world has ever seen"); @@ -268,7 +268,7 @@ public void test130DirectExpressionReplaceDescriptionFromNull() throws Exception assertSuccess(result); assertNotNull(evaluatedAssignment); - display("Evaluated assignment", evaluatedAssignment); + displayDumpable("Evaluated assignment", evaluatedAssignment); assertEquals(1, evaluatedAssignment.getConstructionTriple().size()); PrismAsserts.assertParentConsistency(user); diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java index c45623cf1c3..10c24aa8fba 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java @@ -92,7 +92,7 @@ public void test002ModifyUser() throws Exception { addModificationToContextReplaceUserProperty(context, UserType.F_LOCALITY, new PolyString("Tortuga")); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -100,11 +100,11 @@ public void test002ModifyUser() throws Exception { assignmentProcessor.processAssignments(context, getNow(), task, result); // THEN - display("Output context", context); + displayDumpable("Output context", context); display("outbound processor result", result); // assertSuccess("Outbound processor failed (result)", result); - assertTrue(context.getFocusContext().getPrimaryDelta().getChangeType() == ChangeType.MODIFY); + assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.MODIFY); assertNull("Unexpected user changes", context.getFocusContext().getSecondaryDelta()); assertFalse("No account changes", context.getProjectionContexts().isEmpty()); @@ -123,7 +123,7 @@ public void test002ModifyUser() throws Exception { PrismValueDeltaSetTriple> accountConstructionDeltaSetTriple = accContext.getConstructionDeltaSetTriple(); - display("accountConstructionDeltaSetTriple", accountConstructionDeltaSetTriple); + displayDumpable("accountConstructionDeltaSetTriple", accountConstructionDeltaSetTriple); PrismAsserts.assertTripleNoMinus(accountConstructionDeltaSetTriple); PrismAsserts.assertTripleNoPlus(accountConstructionDeltaSetTriple); @@ -151,7 +151,7 @@ public void test011AddAssignmentAddAccountDirect() throws Exception { addFocusModificationToContext(context, REQ_USER_JACK_MODIFY_ADD_ASSIGNMENT_ACCOUNT_DUMMY); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -159,11 +159,11 @@ public void test011AddAssignmentAddAccountDirect() throws Exception { assignmentProcessor.processAssignments(context, getNow(), task, result); // THEN - display("Output context", context); + displayDumpable("Output context", context); display("outbound processor result", result); // assertSuccess("Outbound processor failed (result)", result); - assertTrue(context.getFocusContext().getPrimaryDelta().getChangeType() == ChangeType.MODIFY); + assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.MODIFY); assertNull("Unexpected user changes", context.getFocusContext().getSecondaryDelta()); assertFalse("No account changes", context.getProjectionContexts().isEmpty()); @@ -190,7 +190,7 @@ public void test012AddAssignmentAddAccountDirectAssignmentWithAttrs() throws Exc addFocusModificationToContext(context, REQ_USER_JACK_MODIFY_ADD_ASSIGNMENT_ACCOUNT_DUMMY_ATTR); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -200,11 +200,11 @@ public void test012AddAssignmentAddAccountDirectAssignmentWithAttrs() throws Exc // THEN then(); - display("Output context", context); + displayDumpable("Output context", context); display("outbound processor result", result); // assertSuccess("Outbound processor failed (result)", result); - assertTrue(context.getFocusContext().getPrimaryDelta().getChangeType() == ChangeType.MODIFY); + assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.MODIFY); assertNull("Unexpected user changes", context.getFocusContext().getSecondaryDelta()); assertFalse("No account changes", context.getProjectionContexts().isEmpty()); @@ -259,7 +259,7 @@ public void test021AddAssignmentModifyAccountAssignment() throws Exception { addFocusModificationToContext(context, REQ_USER_BARBOSSA_MODIFY_ADD_ASSIGNMENT_ACCOUNT_DUMMY_ATTR); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -267,11 +267,11 @@ public void test021AddAssignmentModifyAccountAssignment() throws Exception { assignmentProcessor.processAssignments(context, getNow(), task, result); // THEN - display("Output context", context); + displayDumpable("Output context", context); display("outbound processor result", result); // assertSuccess("Outbound processor failed (result)", result); - assertTrue(context.getFocusContext().getPrimaryDelta().getChangeType() == ChangeType.MODIFY); + assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.MODIFY); assertNull("Unexpected user changes", context.getFocusContext().getSecondaryDelta()); assertFalse("No account changes", context.getProjectionContexts().isEmpty()); @@ -355,7 +355,7 @@ public void test031DeleteAssignmentModifyAccount() throws Exception { addFocusModificationToContext(context, REQ_USER_BARBOSSA_MODIFY_DELETE_ASSIGNMENT_ACCOUNT_DUMMY_ATTR); context.recomputeFocus(); - display("Input context", context); + displayDumpable("Input context", context); PrismObject userNew = context.getFocusContext().getObjectNew(); assertEquals("Unexpected number of assignments in userNew after recompute", 1, userNew.asObjectable().getAssignment().size()); @@ -372,7 +372,7 @@ public void test031DeleteAssignmentModifyAccount() throws Exception { display("result", result); assertSuccess(result); - assertTrue(context.getFocusContext().getPrimaryDelta().getChangeType() == ChangeType.MODIFY); + assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.MODIFY); assertNull("Unexpected user changes", context.getFocusContext().getSecondaryDelta()); assertFalse("No account changes", context.getProjectionContexts().isEmpty()); @@ -445,7 +445,7 @@ public void test032ModifyUserLegalizeAccount() throws Exception { assumeResourceAssigmentPolicy(RESOURCE_DUMMY_OID, AssignmentPolicyEnforcementType.POSITIVE, true); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -454,7 +454,7 @@ public void test032ModifyUserLegalizeAccount() throws Exception { context.recompute(); // THEN - display("Output context", context); + displayDumpable("Output context", context); display("outbound processor result", result); assertNotNull("Expected assigment change in secondary user changes, but it does not exist.", context.getFocusContext().getSecondaryDelta()); @@ -482,7 +482,7 @@ public void test100AddAssignmentWithConditionalMetarole() throws Exception { addFocusModificationToContext(context, REQ_USER_JACK_MODIFY_ADD_ASSIGNMENT_ROLE_ENGINEER); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -490,11 +490,11 @@ public void test100AddAssignmentWithConditionalMetarole() throws Exception { assignmentProcessor.processAssignments(context, getNow(), task, result); // THEN - display("Output context", context); + displayDumpable("Output context", context); display("outbound processor result", result); // assertSuccess("Outbound processor failed (result)", result); - assertTrue(context.getFocusContext().getPrimaryDelta().getChangeType() == ChangeType.MODIFY); + assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.MODIFY); assertNull("Unexpected user changes", context.getFocusContext().getSecondaryDelta()); assertFalse("No account changes", context.getProjectionContexts().isEmpty()); @@ -550,7 +550,7 @@ public void test102EnableConditionalMetarole() throws Exception { addFocusModificationToContext(context, REQ_USER_JACK_MODIFY_SET_COST_CENTER); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -558,11 +558,11 @@ public void test102EnableConditionalMetarole() throws Exception { assignmentProcessor.processAssignments(context, getNow(), task, result); // THEN - display("Output context", context); + displayDumpable("Output context", context); display("outbound processor result", result); // assertSuccess("Outbound processor failed (result)", result); - assertTrue(context.getFocusContext().getPrimaryDelta().getChangeType() == ChangeType.MODIFY); + assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.MODIFY); assertNull("Unexpected user changes", context.getFocusContext().getSecondaryDelta()); assertFalse("No account changes", context.getProjectionContexts().isEmpty()); @@ -633,7 +633,7 @@ public void test200AssignVisitor() throws Exception { .asObjectDelta(USER_JACK_OID)); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -642,11 +642,11 @@ public void test200AssignVisitor() throws Exception { // THEN //DebugUtil.setDetailedDebugDump(true); - display("Output context", context); + displayDumpable("Output context", context); display("outbound processor result", result); //assertSuccess("Outbound processor failed (result)", result); - assertTrue(context.getFocusContext().getPrimaryDelta().getChangeType() == ChangeType.MODIFY); + assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.MODIFY); assertNull("Unexpected user changes", context.getFocusContext().getSecondaryDelta()); assertFalse("No account changes", context.getProjectionContexts().isEmpty()); @@ -686,7 +686,7 @@ public void test210AssignEngineer() throws Exception { .asObjectDelta(USER_JACK_OID)); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -695,11 +695,11 @@ public void test210AssignEngineer() throws Exception { // THEN //DebugUtil.setDetailedDebugDump(true); - display("Output context", context); + displayDumpable("Output context", context); display("outbound processor result", result); //assertSuccess("Outbound processor failed (result)", result); - assertTrue(context.getFocusContext().getPrimaryDelta().getChangeType() == ChangeType.MODIFY); + assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.MODIFY); assertNull("Unexpected user changes", context.getFocusContext().getSecondaryDelta()); assertFalse("No account changes", context.getProjectionContexts().isEmpty()); @@ -717,7 +717,7 @@ public void test210AssignEngineer() throws Exception { private void assertAttributeValues(Collection> accountConstructions, QName attrName, PlusMinusZero attrSet, T... expectedValue) { Set realValues = getAttributeValues(accountConstructions, attrName, attrSet); - assertEquals("Unexpected attributes", new HashSet(Arrays.asList(expectedValue)), realValues); + assertEquals("Unexpected attributes", new HashSet<>(Arrays.asList(expectedValue)), realValues); } private Set getAttributeValues(Collection> accountConstructions, QName attrName, PlusMinusZero attributeSet) { @@ -778,12 +778,6 @@ private void assertNoMinusAttributeValues(Construction accountConstruction, QNam PrismAsserts.assertTripleNoMinus(triple); } - private Object getSingleValueFromDeltaSetTriple(Collection> set) { - Collection values = getMultiValueFromDeltaSetTriple(set); - assertEquals(1, values.size()); - return values.iterator().next(); - } - private Collection getMultiValueFromDeltaSetTriple( Collection> set) { Collection vals = new ArrayList<>(set.size()); @@ -807,7 +801,7 @@ private Construction getZeroAccountConstruction( PrismValueDeltaSetTriple> accountConstructionDeltaSetTriple, String description) { Collection> set = accountConstructionDeltaSetTriple.getZeroSet(); - return getAccountConstruction(accountConstructionDeltaSetTriple, description, set, "zero"); + return getAccountConstruction(description, set, "zero"); } private Construction getPlusAccountConstruction( @@ -819,7 +813,7 @@ private Construction getPlusAccountConstruction( PrismValueDeltaSetTriple> accountConstructionDeltaSetTriple, String description) { Collection> set = accountConstructionDeltaSetTriple.getPlusSet(); - return getAccountConstruction(accountConstructionDeltaSetTriple, description, set, "plus"); + return getAccountConstruction(description, set, "plus"); } private Construction getMinusAccountConstruction( @@ -831,10 +825,10 @@ private Construction getMinusAccountConstruction( PrismValueDeltaSetTriple> accountConstructionDeltaSetTriple, String description) { Collection> set = accountConstructionDeltaSetTriple.getMinusSet(); - return getAccountConstruction(accountConstructionDeltaSetTriple, description, set, "minus"); + return getAccountConstruction(description, set, "minus"); } - private Construction getAccountConstruction(PrismValueDeltaSetTriple> accountConstructionDeltaSetTriple, + private Construction getAccountConstruction( String description, Collection> set, String setName) { for (PrismPropertyValue constructionPVal : set) { Construction accountConstruction = constructionPVal.getValue(); @@ -850,10 +844,6 @@ private void assertLegal(LensProjectionContext accContext) { assertEquals("Expected projection " + accContext + " not legal", Boolean.TRUE, accContext.isLegal()); } - private void assertIllegal(LensProjectionContext accContext) { - assertEquals("Expected projection " + accContext + " not illegal", Boolean.FALSE, accContext.isLegal()); - } - private void assertNoDecision(LensProjectionContext accContext) { assertNull( "Projection " + accContext + " has decision " @@ -864,5 +854,4 @@ private void assertNoDecision(LensProjectionContext accContext) { private XMLGregorianCalendar getNow() { return clock.currentTimeXMLGregorianCalendar(); } - } diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.java index 754fcdf405d..4382e128bc5 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.java @@ -177,8 +177,8 @@ public void test010AssignR1ToJack() throws Exception { processAssignments(context, result, task); // THEN - display("Output context", context); - display("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); + displayDumpable("Output context", context); + displayDumpable("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); result.computeStatus(); assertSuccess("Assignment processor failed (result)", result); @@ -237,8 +237,8 @@ public void test020AssignMR1ToR1() throws Exception { // THEN then(); - display("Output context", context); - display("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); + displayDumpable("Output context", context); + displayDumpable("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); assertSuccess(result); // assignment of construction R1-0 @@ -282,7 +282,7 @@ public void test030AssignR1ToJackProjectorDisabled() throws Exception { projector.project(context, "", task, result); // THEN - display("Output context", context); + displayDumpable("Output context", context); result.computeStatus(); assertSuccess("Projector failed (result)", result); @@ -310,8 +310,8 @@ public void test040AssignR1ToJackAsApprover() throws Exception { processAssignments(context, result, task); // THEN - display("Output context", context); - display("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); + displayDumpable("Output context", context); + displayDumpable("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); result.computeStatus(); assertSuccess("Assignment processor failed (result)", result); @@ -379,8 +379,8 @@ public void test050JackDeputyOfBarbossa() throws Exception { processAssignments(context, result, task); // THEN - display("Output context", context); - display("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); + displayDumpable("Output context", context); + displayDumpable("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); result.computeStatus(); assertSuccess("Assignment processor failed (result)", result); @@ -458,8 +458,8 @@ public void test060JackDeputyOfGuybrushDeputyOfBarbossa() throws Exception { processAssignments(context, result, task); // THEN - display("Output context", context); - display("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); + displayDumpable("Output context", context); + displayDumpable("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); result.computeStatus(); assertSuccess("Assignment processor failed (result)", result); @@ -537,8 +537,8 @@ public void test062JackDeputyOfGuybrushDeputyOfBarbossaInLoginMode() throws Exce // THEN then(); - display("Output context", context); - display("Evaluated assignment", evaluatedAssignment); + displayDumpable("Output context", context); + displayDumpable("Evaluated assignment", evaluatedAssignment); assertSuccess("Assignment evaluator failed (result)", result); @@ -604,8 +604,8 @@ public void test070JackDeputyOfBarbossaApproverOfR1() throws Exception { processAssignments(context, result, task); // THEN - display("Output context", context); - display("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); + displayDumpable("Output context", context); + displayDumpable("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); result.computeStatus(); assertSuccess("Assignment processor failed (result)", result); @@ -685,8 +685,8 @@ public void test110AssignR1ToJack() throws Exception { processAssignments(context, result, task); // THEN - display("Output context", context); - display("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); + displayDumpable("Output context", context); + displayDumpable("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); result.computeStatus(); assertSuccess("Assignment processor failed (result)", result); @@ -755,8 +755,8 @@ public void test160AssignR1ToJack() throws Exception { processAssignments(context, result, task); // THEN - display("Output context", context); - display("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); + displayDumpable("Output context", context); + displayDumpable("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); result.computeStatus(); assertSuccess("Assignment processor failed (result)", result); @@ -835,8 +835,8 @@ public void test210AssignR1ToJack() throws Exception { processAssignments(context, result, task); // THEN - display("Output context", context); - display("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); + displayDumpable("Output context", context); + displayDumpable("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); result.computeStatus(); assertSuccess("Assignment processor failed (result)", result); @@ -896,8 +896,8 @@ public void test300AssignR7ToJack() throws Exception { processAssignments(context, result, task); // THEN - display("Output context", context); - display("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); + displayDumpable("Output context", context); + displayDumpable("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); result.computeStatus(); assertSuccess("Assignment processor failed (result)", result); @@ -1048,8 +1048,8 @@ public void test400AssignJackPirate() throws Exception { recording = false; // THEN - display("Output context", context); - display("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); + displayDumpable("Output context", context); + displayDumpable("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); result.computeStatus(); assertSuccess("Assignment processor failed (result)", result); @@ -1499,8 +1499,8 @@ public void test500AssignJackOrg11() throws Exception { processAssignments(context, result, task); // THEN - display("Output context", context); - display("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); + displayDumpable("Output context", context); + displayDumpable("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); result.computeStatus(); assertSuccess("Assignment processor failed (result)", result); @@ -1555,8 +1555,8 @@ public void test505AssignJackOrg11AsManager() throws Exception { processAssignments(context, result, task); // THEN - display("Output context", context); - display("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); + displayDumpable("Output context", context); + displayDumpable("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); result.computeStatus(); assertSuccess("Assignment processor failed (result)", result); @@ -1610,8 +1610,8 @@ public void test507AssignJackOrg11AsApprover() throws Exception { processAssignments(context, result, task); // THEN - display("Output context", context); - display("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); + displayDumpable("Output context", context); + displayDumpable("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); result.computeStatus(); assertSuccess("Assignment processor failed (result)", result); @@ -1665,8 +1665,8 @@ public void test510AssignJackOrg21() throws Exception { processAssignments(context, result, task); // THEN - display("Output context", context); - display("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); + displayDumpable("Output context", context); + displayDumpable("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); result.computeStatus(); assertSuccess("Assignment processor failed (result)", result); @@ -1718,8 +1718,8 @@ public void test515AssignJackOrg21AsManager() throws Exception { processAssignments(context, result, task); // THEN - display("Output context", context); - display("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); + displayDumpable("Output context", context); + displayDumpable("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); result.computeStatus(); assertSuccess("Assignment processor failed (result)", result); @@ -1785,8 +1785,8 @@ public void test520AssignJackOrg41AsApprover() throws Exception { processAssignments(context, result, task); // THEN - display("Output context", context); - display("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); + displayDumpable("Output context", context); + displayDumpable("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); result.computeStatus(); assertSuccess("Assignment processor failed (result)", result); @@ -1851,8 +1851,8 @@ public void test600AssignA1ToJack() throws Exception { processAssignments(context, result, task); // THEN - display("Output context", context); - display("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); + displayDumpable("Output context", context); + displayDumpable("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); assertSuccess("Assignment processor failed (result)", result); diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestClockwork.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestClockwork.java index 914b83c2bd9..1105ee59717 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestClockwork.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestClockwork.java @@ -82,7 +82,7 @@ public void test010SerializeAddUserBarbossa() throws Exception { when(); clockwork.click(context, task, result); // one round - compute projections - display("Context before serialization", context); + displayDumpable("Context before serialization", context); LensContextType lensContextType = context.toLensContextType(); String xml = prismContext.xmlSerializer().serializeRealValue(lensContextType, SchemaConstants.C_MODEL_CONTEXT); @@ -93,7 +93,7 @@ public void test010SerializeAddUserBarbossa() throws Exception { LensContext context2 = LensContext.fromLensContextType( unmarshalledContainer, context.getPrismContext(), provisioningService, task, result); - display("Context after deserialization", context); + displayDumpable("Context after deserialization", context); // THEN then(); @@ -117,7 +117,7 @@ public void test020AssignAccountToJackSync() throws Exception { LensContext context = createJackAssignAccountContext(result); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); mockClockworkHook.reset(); @@ -131,8 +131,8 @@ public void test020AssignAccountToJackSync() throws Exception { // THEN then(); mockClockworkHook.setRecord(false); - display("Output context", context); - display("Hook contexts", mockClockworkHook); + displayDumpable("Output context", context); + displayDumpable("Hook contexts", mockClockworkHook); assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 0); assertJackAssignAccountContext(context); @@ -191,7 +191,7 @@ public void test053ModifyUserBarbossaDisable() throws Exception { context, PATH_ACTIVATION_ADMINISTRATIVE_STATUS, ActivationStatusType.DISABLED); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -201,7 +201,7 @@ public void test053ModifyUserBarbossaDisable() throws Exception { // THEN then(); - display("Output context", context); + displayDumpable("Output context", context); assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.MODIFY); assertSideEffectiveDeltasOnly(context.getFocusContext().getSecondaryDelta(), "user secondary delta", @@ -264,7 +264,7 @@ private void assignAccountToJackAsync(boolean serialize) throws Exception { assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 0); if (serialize) { - display("Context before serialization", context); + displayDumpable("Context before serialization", context); LensContextType lensContextType = context.toLensContextType(); String xml = prismContext.xmlSerializer().serializeRealValue( diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestDependencies.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestDependencies.java index 6c16a321a21..37efb3219e6 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestDependencies.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestDependencies.java @@ -96,14 +96,14 @@ public void test100SortToWavesIdependent() throws Exception { fillContextWithDummyElaineAccount(context, "a", task, result); context.recompute(); - display("Context before", context); + displayDumpable("Context before", context); context.checkConsistence(); // WHEN dependencyProcessor.sortProjectionsToWaves(context); // THEN - display("Context after", context); + displayDumpable("Context after", context); assertWave(context, RESOURCE_DUMMY_OID, 0, 0); assertWave(context, getDummyOid("a"), 0, 0); @@ -123,14 +123,14 @@ public void test101SortToWavesAB() throws Exception { fillContextWithDummyElaineAccount(context, "b", task, result); context.recompute(); - display("Context before", context); + displayDumpable("Context before", context); context.checkConsistence(); // WHEN dependencyProcessor.sortProjectionsToWaves(context); // THEN - display("Context after", context); + displayDumpable("Context after", context); assertWave(context, RESOURCE_DUMMY_OID, 0, 0); assertWave(context, getDummyOid("a"), 0, 0); @@ -153,14 +153,14 @@ public void test102SortToWavesABCD() throws Exception { fillContextWithDummyElaineAccount(context, "d", task, result); context.recompute(); - display("Context before", context); + displayDumpable("Context before", context); context.checkConsistence(); // WHEN dependencyProcessor.sortProjectionsToWaves(context); // THEN - display("Context after", context); + displayDumpable("Context after", context); assertWave(context, RESOURCE_DUMMY_OID, 0, 0); assertWave(context, getDummyOid("a"), 0, 0); @@ -182,14 +182,14 @@ public void test120SortToWavesBCUnsatisfied() throws Exception { fillContextWithDummyElaineAccount(context, "c", task, result); context.recompute(); - display("Context before", context); + displayDumpable("Context before", context); context.checkConsistence(); try { // WHEN dependencyProcessor.sortProjectionsToWaves(context); - display("Context after", context); + displayDumpable("Context after", context); AssertJUnit.fail("Unexpected success"); } catch (PolicyViolationException e) { // this is expected @@ -209,14 +209,14 @@ public void test151SortToWavesPR() throws Exception { fillContextWithDummyElaineAccount(context, "r", task, result); context.recompute(); - display("Context before", context); + displayDumpable("Context before", context); context.checkConsistence(); // WHEN dependencyProcessor.sortProjectionsToWaves(context); // THEN - display("Context after", context); + displayDumpable("Context after", context); assertWave(context, getDummyOid("p"), 0, 0); assertWave(context, getDummyOid("r"), 0, 1); @@ -240,14 +240,14 @@ public void test152SortToWavesRP() throws Exception { fillContextWithDummyElaineAccount(context, "p", task, result); context.recompute(); - display("Context before", context); + displayDumpable("Context before", context); context.checkConsistence(); // WHEN dependencyProcessor.sortProjectionsToWaves(context); // THEN - display("Context after", context); + displayDumpable("Context after", context); assertWave(context, getDummyOid("p"), 0, 0); assertWave(context, getDummyOid("r"), 0, 1); @@ -268,14 +268,14 @@ public void test200SortToWavesIdependentDeprovision() throws Exception { setDelete(fillContextWithDummyElaineAccount(context, "a", task, result)); context.recompute(); - display("Context before", context); + displayDumpable("Context before", context); context.checkConsistence(); // WHEN dependencyProcessor.sortProjectionsToWaves(context); // THEN - display("Context after", context); + displayDumpable("Context after", context); assertWave(context, RESOURCE_DUMMY_OID, 0, 0); assertWave(context, getDummyOid("a"), 0, 0); @@ -296,14 +296,14 @@ public void test201SortToWavesABDeprovision() throws Exception { setDelete(fillContextWithDummyElaineAccount(context, "b", task, result)); context.recompute(); - display("Context before", context); + displayDumpable("Context before", context); context.checkConsistence(); // WHEN dependencyProcessor.sortProjectionsToWaves(context); // THEN - display("Context after", context); + displayDumpable("Context after", context); assertWave(context, RESOURCE_DUMMY_OID, 0, 0); assertWave(context, getDummyOid("a"), 0, 1); @@ -327,14 +327,14 @@ public void test202SortToWavesABCDDeprovision() throws Exception { setDelete(fillContextWithDummyElaineAccount(context, "d", task, result)); context.recompute(); - display("Context before", context); + displayDumpable("Context before", context); context.checkConsistence(); // WHEN dependencyProcessor.sortProjectionsToWaves(context); // THEN - display("Context after", context); + displayDumpable("Context after", context); assertWave(context, RESOURCE_DUMMY_OID, 0, 0); assertWave(context, getDummyOid("a"), 0, 2); @@ -363,7 +363,7 @@ public void test300SortToWavesXYZCircular() throws Exception { fillContextWithDummyElaineAccount(context, "z", task, result); context.recompute(); - display("Context before", context); + displayDumpable("Context before", context); context.checkConsistence(); try { diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java index 5127eb3df3d..510e1218222 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java @@ -59,7 +59,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti repoAddObjectFromFile(USER_DRAKE_FILE, initResult); addObject(ROLE_PIRATE_FILE); - addObject(ROLE_MUTINIER_FILE); + addObject(ROLE_MUTINEER_FILE); addObject(ROLE_JUDGE_FILE); addObject(ROLE_CONSTABLE_FILE); addObject(ROLE_THIEF_FILE); @@ -85,7 +85,7 @@ public void test005JackAttemptAssignRoleJudge() throws Exception { fillContextWithUser(context, USER_JACK_OID, result); addModificationToContextAssignRole(context, USER_JACK_OID, ROLE_JUDGE_OID); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); rememberCounter(InternalCounters.SHADOW_FETCH_OPERATION_COUNT); @@ -120,7 +120,7 @@ public void test007JackAttemptAssignRoleJudgeAsOwner() throws Exception { assignment -> assignment.getTargetRef().setRelation(SchemaConstants.ORG_OWNER) ); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); rememberCounter(InternalCounters.SHADOW_FETCH_OPERATION_COUNT); @@ -179,7 +179,7 @@ public void test020JackUnassignRoleJudge() throws Exception { fillContextWithUser(context, USER_JACK_OID, result); addModificationToContextUnassignRole(context, USER_JACK_OID, ROLE_JUDGE_OID); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); rememberCounter(InternalCounters.SHADOW_FETCH_OPERATION_COUNT); @@ -206,7 +206,7 @@ public void test020JackUnassignRoleJudge() throws Exception { * No exclusion here. The assignment should go smoothly. */ @Test - public void test100AssignRoleMutinierToJack() throws Exception { + public void test100AssignRoleMutineerToJack() throws Exception { Task task = getTestTask(); OperationResult result = getTestOperationResult(); @@ -214,9 +214,9 @@ public void test100AssignRoleMutinierToJack() throws Exception { LensContext context = createUserLensContext(); fillContextWithUser(context, USER_JACK_OID, result); - addModificationToContextAssignRole(context, USER_JACK_OID, ROLE_MUTINIER_OID); + addModificationToContextAssignRole(context, USER_JACK_OID, ROLE_MUTINEER_OID); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); rememberCounter(InternalCounters.SHADOW_FETCH_OPERATION_COUNT); @@ -249,7 +249,7 @@ public void test110AssignRolePirateToJack() throws Exception { fillContextWithUser(context, USER_JACK_OID, result); addModificationToContextAssignRole(context, USER_JACK_OID, ROLE_PIRATE_OID); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); rememberCounter(InternalCounters.SHADOW_FETCH_OPERATION_COUNT); @@ -292,7 +292,7 @@ public void test112AssignRolePirateWithExceptionToJack() throws Exception { assignment.getPolicyException().add(policyException); }); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); rememberCounter(InternalCounters.SHADOW_FETCH_OPERATION_COUNT); @@ -331,7 +331,7 @@ public void test120AssignRoleConstableToJack() throws Exception { fillContextWithUser(context, USER_JACK_OID, result); addModificationToContextAssignRole(context, USER_JACK_OID, ROLE_CONSTABLE_OID); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); rememberCounter(InternalCounters.SHADOW_FETCH_OPERATION_COUNT); @@ -345,7 +345,7 @@ public void test120AssignRoleConstableToJack() throws Exception { result.computeStatus(); TestUtil.assertSuccess(result); - display("Output context", context); + displayDumpable("Output context", context); dumpPolicyRules(context); dumpPolicySituations(context); @@ -382,7 +382,7 @@ public void test150AssignRoleThiefToJack() throws Exception { fillContextWithUser(context, USER_JACK_OID, result); addModificationToContextAssignRole(context, USER_JACK_OID, ROLE_THIEF_OID); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); rememberCounter(InternalCounters.SHADOW_FETCH_OPERATION_COUNT); @@ -397,7 +397,7 @@ public void test150AssignRoleThiefToJack() throws Exception { TestUtil.assertSuccess(result); DeltaSetTriple> evaluatedAssignmentTriple = context.getEvaluatedAssignmentTriple(); - display("Output evaluatedAssignmentTriple", evaluatedAssignmentTriple); + displayDumpable("Output evaluatedAssignmentTriple", evaluatedAssignmentTriple); dumpPolicyRules(context); dumpPolicySituations(context); @@ -456,7 +456,7 @@ public void test210AssignRoleEmployeeToJack() throws Exception { fillContextWithUser(context, USER_JACK_OID, result); addModificationToContextAssignRole(context, USER_JACK_OID, ROLE_CORP_EMPLOYEE_OID); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); rememberCounter(InternalCounters.SHADOW_FETCH_OPERATION_COUNT); @@ -497,7 +497,7 @@ public void test220AssignRoleEngineerToJack() throws Exception { fillContextWithUser(context, USER_JACK_OID, result); addModificationToContextAssignRole(context, USER_JACK_OID, ROLE_CORP_ENGINEER_OID); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); rememberCounter(InternalCounters.SHADOW_FETCH_OPERATION_COUNT); @@ -525,19 +525,19 @@ public void test220AssignRoleEngineerToJack() throws Exception { assertTriggeredTargetPolicyRule(context, ROLE_CORP_ENGINEER_OID, PolicyConstraintKindType.SITUATION, 1, false); EvaluatedPolicyRule engineerRule = getTriggeredTargetPolicyRule(context, ROLE_CORP_ENGINEER_OID, PolicyConstraintKindType.EXCLUSION); - display("exclusion rule for Engineer", engineerRule); - display("exclusion trigger for Engineer", engineerTrigger); - display("Engineer: assignmentPath", engineerRule.getAssignmentPath()); - display("Engineer: conflictingPath", engineerTrigger.getConflictingPath()); + displayDumpable("exclusion rule for Engineer", engineerRule); + displayDumpable("exclusion trigger for Engineer", engineerTrigger); + displayDumpable("Engineer: assignmentPath", engineerRule.getAssignmentPath()); + displayDumpable("Engineer: conflictingPath", engineerTrigger.getConflictingPath()); assertAssignmentPath(engineerRule.getAssignmentPath(), ROLE_CORP_ENGINEER_OID, ROLE_CORP_EMPLOYEE_OID, null); assertAssignmentPath(engineerTrigger.getConflictingPath(), ROLE_CORP_CONTRACTOR_OID); EvaluatedPolicyRule contractorRule = getTriggeredTargetPolicyRule(context, ROLE_CORP_CONTRACTOR_OID, PolicyConstraintKindType.EXCLUSION); EvaluatedExclusionTrigger contractorTrigger = (EvaluatedExclusionTrigger) assertTriggeredTargetPolicyRule(context, ROLE_CORP_CONTRACTOR_OID, PolicyConstraintKindType.EXCLUSION, 1, false); - display("exclusion rule for Contractor", contractorRule); - display("exclusion trigger for Contractor", contractorTrigger); - display("Contractor: assignmentPath", contractorRule.getAssignmentPath()); - display("Contractor: conflictingPath", contractorTrigger.getConflictingPath()); + displayDumpable("exclusion rule for Contractor", contractorRule); + displayDumpable("exclusion trigger for Contractor", contractorTrigger); + displayDumpable("Contractor: assignmentPath", contractorRule.getAssignmentPath()); + displayDumpable("Contractor: conflictingPath", contractorTrigger.getConflictingPath()); assertAssignmentPath(contractorRule.getAssignmentPath(), ROLE_CORP_CONTRACTOR_OID, null); assertAssignmentPath(contractorTrigger.getConflictingPath(), ROLE_CORP_ENGINEER_OID, ROLE_CORP_EMPLOYEE_OID); } @@ -580,7 +580,7 @@ public void test300DrakeChangeEmployeeType() throws Exception { assertAssignedRole(userAfter, ROLE_JUDGE_OID); LensFocusContext focusContext = ((LensContext) recordingListener.getModelContext()).getFocusContext(); - display("focusContext", focusContext); + displayDumpable("focusContext", focusContext); assertEquals("Wrong # of focus policy rules", 0, focusContext.getPolicyRules().size()); } @@ -599,7 +599,7 @@ public void test400AssignRoleLocalized() throws Exception { fillContextWithUser(context, USER_LOCALIZED.oid, result); addModificationToContextAssignRole(context, USER_LOCALIZED.oid, ROLE_LOCALIZED.oid); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -643,7 +643,7 @@ public void test400AssignRoleLocalized() throws Exception { } private ObjectDelta assertAssignAccountToJack(LensContext context) { - display("Output context", context); + displayDumpable("Output context", context); assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.MODIFY); assertFalse("No account changes", context.getProjectionContexts().isEmpty()); diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules2.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules2.java index 0fa915f0450..45d8c782a02 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules2.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules2.java @@ -136,7 +136,7 @@ public void test100JackAttemptAssignRoleStudent() throws Exception { fillContextWithUser(context, USER_JACK_OID, result); addModificationToContextAssignRole(context, USER_JACK_OID, roleStudentOid); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -176,7 +176,7 @@ public void test110JoeAttemptAssignRoleStudent() throws Exception { fillContextWithUser(context, userJoeOid, result); addModificationToContextAssignRole(context, userJoeOid, roleStudentOid); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -223,7 +223,7 @@ public void test120JackAttemptToMoveTo1900AndAssignRoleStudent() throws Exceptio .item(UserType.F_ASSIGNMENT).add(assignment) .item(UserType.F_COST_CENTER).replace("1900") .asObjectDelta(USER_JACK_OID)); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -272,7 +272,7 @@ public void test130JackMoveTo1900AndAssignRoleStudent() throws Exception { .item(UserType.F_ASSIGNMENT).add(assignment) .item(UserType.F_COST_CENTER).replace("1900") .asObjectDelta(USER_JACK_OID)); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -300,14 +300,6 @@ public void test130JackMoveTo1900AndAssignRoleStudent() throws Exception { assertFocusTriggers(context, PolicyConstraintKindType.HAS_ASSIGNMENT, 4); assertFocusTriggers(context, PolicyConstraintKindType.HAS_NO_ASSIGNMENT, 1); assertFocusTriggers(context, PolicyConstraintKindType.TRANSITION, 3); - -// assertAssignmentPolicySituation(context, roleStudentOid, -// SchemaConstants.MODEL_POLICY_SITUATION_ASSIGNMENT_MODIFIED, -// SchemaConstants.MODEL_POLICY_SITUATION_OBJECT_STATE); -// assertFocusPolicySituation(context, -// SchemaConstants.MODEL_POLICY_SITUATION_OBJECT_STATE, -// SchemaConstants.MODEL_POLICY_SITUATION_HAS_ASSIGNMENT, -// SchemaConstants.MODEL_POLICY_SITUATION_HAS_NO_ASSIGNMENT); } @Test @@ -323,7 +315,7 @@ public void test135JackChangeValidTo() throws Exception { context.getFocusContext().addPrimaryDelta(prismContext.deltaFor(UserType.class) .item(UserType.F_ASSIGNMENT, assignmentId, AssignmentType.F_ACTIVATION, ActivationType.F_VALID_TO).replace() .asObjectDelta(USER_JACK_OID)); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -362,7 +354,7 @@ public void test140JackNoChange() throws Exception { LensContext context = createUserLensContext(); fillContextWithUser(context, USER_JACK_OID, result); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -418,7 +410,7 @@ public void test142JackNoChangeButTaskExists() throws Exception { LensContext context = createUserLensContext(); fillContextWithUser(context, USER_JACK_OID, result); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -463,7 +455,7 @@ public void test150FrankAttemptToAssignRoleStudentButDisabled() throws Exception .administrativeStatus(ActivationStatusType.DISABLED) .end()) .asObjectDelta(userFrankOid)); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -501,7 +493,7 @@ public void test160AttemptToAddPeter() throws Exception { LensContext context = createUserLensContext(); fillContextWithAddUserDelta(context, prismContext.parseObject(USER_PETER_FILE)); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -538,7 +530,7 @@ public void test170AddPeter() throws Exception { LensContext context = createUserLensContext(); fillContextWithAddUserDelta(context, prismContext.parseObject(USER_PETER_FILE)); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -569,13 +561,6 @@ public void test170AddPeter() throws Exception { assertFocusTriggers(context, PolicyConstraintKindType.TRANSITION, "cc-from-1900-false-true", "has-student-assignment-false-true", "has-student-assignment-false-any"); - -// assertAssignmentPolicySituation(context, roleStudentOid, -// SchemaConstants.MODEL_POLICY_SITUATION_OBJECT_STATE); -// assertFocusPolicySituation(context, -// SchemaConstants.MODEL_POLICY_SITUATION_OBJECT_STATE, -// SchemaConstants.MODEL_POLICY_SITUATION_HAS_ASSIGNMENT, -// SchemaConstants.MODEL_POLICY_SITUATION_HAS_NO_ASSIGNMENT); } /** @@ -589,7 +574,7 @@ public void test180StudentRecompute() throws Exception { LensContext context = createLensContext(RoleType.class); fillContextWithFocus(context, RoleType.class, roleStudentOid, result); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -622,7 +607,7 @@ public void test200AddUnresolvable() throws Exception { LensContext context = createLensContext(RoleType.class); fillContextWithAddDelta(context, prismContext.parseObject(ROLE_UNRESOLVABLE_REFERENCES_FILE)); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -648,7 +633,7 @@ public void test210AddCyclic() throws Exception { LensContext context = createLensContext(RoleType.class); fillContextWithAddDelta(context, prismContext.parseObject(ROLE_CYCLIC_REFERENCES_FILE)); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -675,7 +660,7 @@ public void test220AddChained() throws Exception { LensContext context = createLensContext(RoleType.class); fillContextWithAddDelta(context, prismContext.parseObject(ROLE_CHAINED_REFERENCES_FILE)); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -684,11 +669,11 @@ public void test220AddChained() throws Exception { clockwork.run(context, task, result); then(); - display("Output context", context); + displayDumpable("Output context", context); Map rules = new HashMap<>(); forEvaluatedFocusPolicyRule(context, (r) -> { - display("rule", r); + displayDumpable("rule", r); rules.put(r.getName(), r); }); @@ -732,7 +717,7 @@ public void test230AddAmbiguous() throws Exception { LensContext context = createLensContext(RoleType.class); fillContextWithAddDelta(context, prismContext.parseObject(ROLE_AMBIGUOUS_REFERENCE_FILE)); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -763,7 +748,7 @@ public void test300ModifyInducement() throws Exception { .asObjectDeltaCast(roleImmutableInducementsOid); LensContext context = createLensContext(RoleType.class); context.createFocusContext().setPrimaryDelta(delta); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -794,7 +779,7 @@ public void test310ModifyInducementPass() throws Exception { .asObjectDeltaCast(roleNoInducementsAddDeleteOid); LensContext context = createLensContext(RoleType.class); context.createFocusContext().setPrimaryDelta(delta); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -818,7 +803,7 @@ public void test320ModifyInducementPass2() throws Exception { .asObjectDeltaCast(roleNoInducementsAddDeleteViaExpressionOid); LensContext context = createLensContext(RoleType.class); context.createFocusContext().setPrimaryDelta(delta); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -842,7 +827,7 @@ public void test330AddInducement() throws Exception { .asObjectDeltaCast(roleNoInducementsAddDeleteOid); LensContext context = createLensContext(RoleType.class); context.createFocusContext().setPrimaryDelta(delta); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -873,7 +858,7 @@ public void test340AddInducementViaExpression() throws Exception { .asObjectDeltaCast(roleNoInducementsAddDeleteViaExpressionOid); LensContext context = createLensContext(RoleType.class); context.createFocusContext().setPrimaryDelta(delta); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyStateRecording.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyStateRecording.java index 6bcab29513a..c44bc287f50 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyStateRecording.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyStateRecording.java @@ -113,7 +113,7 @@ public void test100JackAssignRoleJudge() throws Exception { Collections.emptyList(), jack.getAssignment().get(0).getPolicySituation()); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertExecutionRecords(1); } @@ -135,7 +135,7 @@ public void test110JackAssignRolePirate() throws Exception { assertExclusionViolationState(assignment); } - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertExecutionRecords(2); // rules without IDs, with IDs } @@ -163,7 +163,7 @@ public void test120RecomputeJack() throws Exception { assignment.getPolicySituation()); } - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertExecutionRecords(1); dummyAuditService.assertExecutionDeltas(0); } @@ -194,7 +194,7 @@ public void test130JackUnassignRolePirate() throws Exception { Collections.emptyList(), jack.getAssignment().get(0).getPolicySituation()); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertExecutionRecords(1); // executed in one shot } @@ -227,7 +227,7 @@ public void test200BobAssign2a3a() throws Exception { Collections.emptyList(), bob.getAssignment().get(1).getPolicySituation()); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertExecutionRecords(1); // no policy state update } @@ -256,7 +256,7 @@ public void test210BobAssign2b3b() throws Exception { assertAssignedRole(bob.asPrismObject(), roleATest3bOid); assertEquals("Wrong # of assignments", 4, bob.getAssignment().size()); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertExecutionRecords(2); // rules without IDs, with IDs for (AssignmentType assignment : bob.getAssignment()) { @@ -297,7 +297,7 @@ public void test220AliceAssign2a2b() throws Exception { assertAssignedRole(alice.asPrismObject(), roleATest2bOid); assertEquals("Wrong # of assignments", 2, alice.getAssignment().size()); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertExecutionRecords(2); // rules without IDs, with IDs ? for (AssignmentType assignment : alice.getAssignment()) { @@ -332,7 +332,7 @@ public void test230ChuckAssign2a2b() throws Exception { assertAssignedRole(chuck.asPrismObject(), roleATest2bOid); assertEquals("Wrong # of assignments", 2, chuck.getAssignment().size()); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertExecutionRecords(2); // sourceRef.oid is null on the first iteration (object OID is unknown before actual creation in repo) for (AssignmentType assignment : chuck.getAssignment()) { @@ -368,7 +368,7 @@ public void test240DanAssign2a2b() throws Exception { assertAssignedRole(dan.asPrismObject(), roleATest2bOid); assertEquals("Wrong # of assignments", 2, dan.getAssignment().size()); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertExecutionRecords(1); for (AssignmentType assignment : dan.getAssignment()) { @@ -399,7 +399,7 @@ public void test250EveAssign2b() throws Exception { assertAssignedRole(eve.asPrismObject(), roleATest2bOid); assertEquals("Wrong # of assignments", 2, eve.getAssignment().size()); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertExecutionRecords(1); for (AssignmentType assignment : eve.getAssignment()) { @@ -426,7 +426,7 @@ public void test300MakeRoleWrong() throws Exception { assertEquals("Wrong policy situations for role", Collections.singletonList(WRONG_URI), wrong.getPolicySituation()); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertExecutionRecords(1); // no extra policy state update } @@ -450,7 +450,7 @@ public void test310CreateWrongRole() throws Exception { assertEquals("Wrong policy situations for role", Collections.singletonList(WRONG_URI), wrong2.getPolicySituation()); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertExecutionRecords(2); // extra policy state update because of OID } @@ -477,7 +477,7 @@ public void test320CreateWrongRoleKnownOid() throws Exception { assertEquals("Wrong policy situations for role", Collections.singletonList(WRONG_URI), wrong3.getPolicySituation()); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertExecutionRecords(1); // no extra policy state update } diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java index daa86fe6402..ead0ed6af15 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java @@ -61,7 +61,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti super.initSystem(initTask, initResult); setDefaultUserTemplate(USER_TEMPLATE_OID); addObject(ORG_BRETHREN_FILE); - addObject(ROLE_MUTINIER_FILE); + addObject(ROLE_MUTINEER_FILE); // repoAddObjectFromFile(SECURITY_POLICY_FILE, initResult); @@ -106,20 +106,20 @@ public void test010BasicContextOperations() throws Exception { accountContext.setPrimaryDelta(accountDeltaPrimary); accountContext.setSecondaryDelta(accountDeltaSecondary); - display("Context before", context); + displayDumpable("Context before", context); // WHEN: checkConsistence context.checkConsistence(); - display("Context after checkConsistence", context); + displayDumpable("Context after checkConsistence", context); assert focusContext == context.getFocusContext() : "focus context delta replaced"; assert focusContext.getPrimaryDelta() == userDeltaPrimary : "focus primary delta replaced"; assert userDeltaPrimaryClone.equals(userDeltaPrimary) : "focus primary delta changed"; ObjectDelta focusSecondaryDelta = focusContext.getSecondaryDelta(); - display("Focus secondary delta", focusSecondaryDelta); - display("Orig user secondary delta", userDeltaSecondaryClone); + displayDumpable("Focus secondary delta", focusSecondaryDelta); + displayDumpable("Orig user secondary delta", userDeltaSecondaryClone); assert focusSecondaryDelta.equals(userDeltaSecondaryClone) : "focus secondary delta not equal"; assert accountContext == context.findProjectionContext( @@ -133,22 +133,22 @@ public void test010BasicContextOperations() throws Exception { // WHEN: recompute context.recompute(); - display("Context after recompute", context); + displayDumpable("Context after recompute", context); assert focusContext == context.getFocusContext() : "focus context delta replaced"; assert focusContext.getPrimaryDelta() == userDeltaPrimary : "focus primary delta replaced"; focusSecondaryDelta = focusContext.getSecondaryDelta(); - display("Focus secondary delta", focusSecondaryDelta); - display("Orig user secondary delta", userDeltaSecondaryClone); + displayDumpable("Focus secondary delta", focusSecondaryDelta); + displayDumpable("Orig user secondary delta", userDeltaSecondaryClone); assert focusSecondaryDelta.equals(userDeltaSecondaryClone) : "focus secondary delta not equal"; assert accountContext == context.findProjectionContext( new ResourceShadowDiscriminator(RESOURCE_DUMMY_OID, ShadowKindType.ACCOUNT, null, null, false)) : "wrong account context"; assert accountContext.getPrimaryDelta() == accountDeltaPrimary : "account primary delta replaced"; - display("Orig account primary delta", accountDeltaPrimaryClone); - display("Account primary delta after recompute", accountDeltaPrimary); + displayDumpable("Orig account primary delta", accountDeltaPrimaryClone); + displayDumpable("Account primary delta after recompute", accountDeltaPrimary); assert accountDeltaPrimaryClone.equals(accountDeltaPrimary) : "account primary delta changed"; assert accountContext.getSecondaryDelta() == accountDeltaSecondary : "account secondary delta replaced"; assert accountDeltaSecondaryClone.equals(accountDeltaSecondary) : "account secondary delta changed"; @@ -167,7 +167,7 @@ public void test100AddAccountToJackDirect() throws Exception { // We want "shadow" so the fullname will be computed by outbound expression addModificationToContextAddAccountFromFile(context, ACCOUNT_SHADOW_JACK_DUMMY_FILE); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -179,7 +179,7 @@ public void test100AddAccountToJackDirect() throws Exception { // THEN then(); - display("Output context", context); + displayDumpable("Output context", context); // Not loading anything. The account is already loaded in the context assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 0); @@ -231,7 +231,7 @@ public void test110AssignAccountToJack() throws Exception { fillContextWithUser(context, USER_JACK_OID, result); addFocusModificationToContext(context, REQ_USER_JACK_MODIFY_ADD_ASSIGNMENT_ACCOUNT_DUMMY); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); rememberCounter(InternalCounters.SHADOW_FETCH_OPERATION_COUNT); @@ -257,7 +257,7 @@ public void test111AssignAccountToJackBroken() throws Exception { fillContextWithUser(context, USER_JACK_OID, result); addFocusModificationToContext(context, REQ_USER_JACK_MODIFY_ADD_ASSIGNMENT_ACCOUNT_DUMMY); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -273,11 +273,11 @@ public void test111AssignAccountToJackBroken() throws Exception { } private void assertAssignAccountToJack(LensContext context) { - display("Output context", context); + displayDumpable("Output context", context); // Not loading anything. The account is already loaded in the context assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 0); - assertTrue(context.getFocusContext().getPrimaryDelta().getChangeType() == ChangeType.MODIFY); + assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.MODIFY); assertSideEffectiveDeltasOnly(context.getFocusContext().getSecondaryDelta(), "user secondary delta", ActivationStatusType.ENABLED); assertFalse("No account changes", context.getProjectionContexts().isEmpty()); @@ -319,7 +319,7 @@ public void test250ModifyUserBarbossaLocality() throws Exception { addModificationToContextReplaceUserProperty(context, UserType.F_LOCALITY, PrismTestUtil.createPolyString("Tortuga")); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -327,9 +327,9 @@ public void test250ModifyUserBarbossaLocality() throws Exception { projector.project(context, "test", task, result); // THEN - display("Output context", context); + displayDumpable("Output context", context); - assertTrue(context.getFocusContext().getPrimaryDelta().getChangeType() == ChangeType.MODIFY); + assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.MODIFY); assertSideEffectiveDeltasOnly("user secondary delta", context.getFocusContext().getSecondaryDelta()); assertFalse("No account changes", context.getProjectionContexts().isEmpty()); @@ -368,7 +368,7 @@ public void test251ModifyUserBarbossaFullname() throws Exception { addModificationToContextReplaceUserProperty(context, UserType.F_FULL_NAME, PrismTestUtil.createPolyString("Captain Hector Barbossa")); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -376,9 +376,9 @@ public void test251ModifyUserBarbossaFullname() throws Exception { projector.project(context, "test", task, result); // THEN - display("Output context", context); + displayDumpable("Output context", context); - assertTrue(context.getFocusContext().getPrimaryDelta().getChangeType() == ChangeType.MODIFY); + assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.MODIFY); assertSideEffectiveDeltasOnly("user secondary delta", context.getFocusContext().getSecondaryDelta()); assertFalse("No account changes", context.getProjectionContexts().isEmpty()); @@ -417,7 +417,7 @@ public void test254ModifyUserBarbossaDisable() throws Exception { addModificationToContextReplaceUserProperty(context, PATH_ACTIVATION_ADMINISTRATIVE_STATUS, ActivationStatusType.DISABLED); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -425,9 +425,9 @@ public void test254ModifyUserBarbossaDisable() throws Exception { projector.project(context, "test", task, result); // THEN - display("Output context", context); + displayDumpable("Output context", context); - assertTrue(context.getFocusContext().getPrimaryDelta().getChangeType() == ChangeType.MODIFY); + assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.MODIFY); assertSideEffectiveDeltasOnly(context.getFocusContext().getSecondaryDelta(), "user secondary delta", ActivationStatusType.DISABLED); assertFalse("No account changes", context.getProjectionContexts().isEmpty()); @@ -477,7 +477,7 @@ public void test255ModifyUserBarbossaAssignment() throws Exception { addFocusModificationToContext(context, USER_BARBOSSA_MODIFY_ASSIGNMENT_REPLACE_AC_FILE); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -485,11 +485,11 @@ public void test255ModifyUserBarbossaAssignment() throws Exception { projector.project(context, "test", task, result); // THEN - display("Output context", context); + displayDumpable("Output context", context); - assertTrue(context.getFocusContext().getPrimaryDelta().getChangeType() == ChangeType.MODIFY); + assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.MODIFY); ObjectDelta userSecondaryDelta = context.getFocusContext().getSecondaryDelta(); - display("User Secondary Delta", userSecondaryDelta); + displayDumpable("User Secondary Delta", userSecondaryDelta); assertSideEffectiveDeltasOnly("user secondary delta", userSecondaryDelta); Collection accountContexts = context.getProjectionContexts(); @@ -529,7 +529,7 @@ public void test260ModifyAccountBarbossaDrinkReplace() throws Exception { DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_DRINK_NAME, "Water"); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -563,7 +563,7 @@ public void test261ModifyAccountBarbossaQuoteReplace() throws Exception { DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_QUOTE_NAME, "I'm disinclined to acquiesce to your request."); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -571,7 +571,7 @@ public void test261ModifyAccountBarbossaQuoteReplace() throws Exception { projector.project(context, "test", task, result); // THEN - display("Output context", context); + displayDumpable("Output context", context); assertNull("Unexpected user primary changes", context.getFocusContext().getPrimaryDelta()); assertSideEffectiveDeltasOnly("user secondary delta", context.getFocusContext().getSecondaryDelta()); @@ -620,7 +620,7 @@ public void test269DeleteBarbossaDummyAccount() throws Exception { addModificationToContextDeleteAccount(context, ACCOUNT_HBARBOSSA_DUMMY_OID); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); try { @@ -628,7 +628,7 @@ public void test269DeleteBarbossaDummyAccount() throws Exception { projector.project(context, "test", task, result); // THEN: fail - display("Output context", context); + displayDumpable("Output context", context); assert context.getFocusContext() != null : "The operation was successful but it should throw expcetion AND " + "there is no focus context"; assert false : "The operation was successful but it should throw expcetion"; @@ -653,7 +653,7 @@ public void test270AddUserBarbossaAssignmentBrethren() throws Exception { OrgType.COMPLEX_TYPE, null, null, true)); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -661,11 +661,11 @@ public void test270AddUserBarbossaAssignmentBrethren() throws Exception { projector.project(context, "test", task, result); // THEN - display("Output context", context); + displayDumpable("Output context", context); - assertTrue(context.getFocusContext().getPrimaryDelta().getChangeType() == ChangeType.MODIFY); + assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.MODIFY); ObjectDelta userSecondaryDelta = context.getFocusContext().getSecondaryDelta(); - display("User Secondary Delta", userSecondaryDelta); + displayDumpable("User Secondary Delta", userSecondaryDelta); PrismAsserts.assertPropertyAdd(userSecondaryDelta, UserType.F_ORGANIZATION, PrismTestUtil.createPolyString(ORG_BRETHREN_INDUCED_ORGANIZATION)); Collection accountContexts = context.getProjectionContexts(); @@ -705,7 +705,7 @@ public void test275DeleteUserBarbossaAssignmentBrethren() throws Exception { context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -713,11 +713,11 @@ public void test275DeleteUserBarbossaAssignmentBrethren() throws Exception { projector.project(context, "test", task, result); // THEN - display("Output context", context); + displayDumpable("Output context", context); - assertTrue(context.getFocusContext().getPrimaryDelta().getChangeType() == ChangeType.MODIFY); + assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.MODIFY); ObjectDelta userSecondaryDelta = context.getFocusContext().getSecondaryDelta(); - display("User Secondary Delta", userSecondaryDelta); + displayDumpable("User Secondary Delta", userSecondaryDelta); PrismAsserts.assertPropertyDelete(userSecondaryDelta, UserType.F_ORGANIZATION, PrismTestUtil.createPolyString(ORG_BRETHREN_INDUCED_ORGANIZATION)); Collection accountContexts = context.getProjectionContexts(); @@ -728,7 +728,7 @@ public void test275DeleteUserBarbossaAssignmentBrethren() throws Exception { } @Test - public void test280AddUserBarbossaAssignmentMutinier() throws Exception { + public void test280AddUserBarbossaAssignmentMutineer() throws Exception { // GIVEN Task task = getTestTask(); @@ -738,11 +738,11 @@ public void test280AddUserBarbossaAssignmentMutinier() throws Exception { LensContext context = createUserLensContext(); fillContextWithUser(context, USER_BARBOSSA_OID, result); fillContextWithAccount(context, ACCOUNT_HBARBOSSA_DUMMY_OID, task, result); - addFocusDeltaToContext(context, createAssignmentUserDelta(USER_BARBOSSA_OID, ROLE_MUTINIER_OID, + addFocusDeltaToContext(context, createAssignmentUserDelta(USER_BARBOSSA_OID, ROLE_MUTINEER_OID, RoleType.COMPLEX_TYPE, null, null, true)); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -750,9 +750,9 @@ public void test280AddUserBarbossaAssignmentMutinier() throws Exception { projector.project(context, "test", task, result); // THEN - display("Output context", context); + displayDumpable("Output context", context); - assertTrue(context.getFocusContext().getPrimaryDelta().getChangeType() == ChangeType.MODIFY); + assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.MODIFY); ObjectDelta userSecondaryDelta = context.getFocusContext().getSecondaryDelta(); assertSideEffectiveDeltasOnly("user secondary delta", userSecondaryDelta); @@ -768,7 +768,7 @@ public void test280AddUserBarbossaAssignmentMutinier() throws Exception { assertEquals("Unexpected number of account secondary changes", 1, accountSecondaryDelta.getModifications().size()); PrismAsserts.assertPropertyAdd(accountSecondaryDelta, getDummyResourceController().getAttributePath(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_TITLE_NAME), - "Damned mutinier"); + "Damned mutineer"); PrismAsserts.assertOrigin(accountSecondaryDelta, OriginType.ASSIGNMENTS); } @@ -787,7 +787,7 @@ public void test301AssignConflictingAccountToJack() throws Exception { fillContextWithUser(context, USER_JACK_OID, result); addFocusModificationToContext(context, REQ_USER_JACK_MODIFY_ADD_ASSIGNMENT_ACCOUNT_DUMMY); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -797,9 +797,9 @@ public void test301AssignConflictingAccountToJack() throws Exception { // THEN then(); - display("Output context", context); + displayDumpable("Output context", context); - assertTrue(context.getFocusContext().getPrimaryDelta().getChangeType() == ChangeType.MODIFY); + assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.MODIFY); assertSideEffectiveDeltasOnly(context.getFocusContext().getSecondaryDelta(), "user secondary delta", ActivationStatusType.ENABLED); assertFalse("No account changes", context.getProjectionContexts().isEmpty()); @@ -833,7 +833,7 @@ public void test400ImportHermanDummy() throws Exception { makeImportSyncDelta(context.getProjectionContexts().iterator().next()); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -841,11 +841,11 @@ public void test400ImportHermanDummy() throws Exception { projector.project(context, "test", task, result); // THEN - display("Output context", context); + displayDumpable("Output context", context); // TODO - assertTrue(context.getFocusContext().getPrimaryDelta().getChangeType() == ChangeType.ADD); + assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.ADD); ObjectDelta userSecondaryDelta = context.getFocusContext().getSecondaryDelta(); assertNotNull("No user secondary delta", userSecondaryDelta); PrismAsserts.assertPropertyAdd(userSecondaryDelta, UserType.F_DESCRIPTION, "Came from Monkey Island"); @@ -862,9 +862,9 @@ public void test400ImportHermanDummy() throws Exception { // Activation is created in user policy. Therefore assert the origin of that as special case // and remove it from the delta so the next assert passes - Iterator iterator = userSecondaryDelta.getModifications().iterator(); + Iterator> iterator = userSecondaryDelta.getModifications().iterator(); while (iterator.hasNext()) { - ItemDelta modification = iterator.next(); + ItemDelta modification = iterator.next(); if (modification.getPath().startsWithName(UserType.F_ACTIVATION)) { PrismAsserts.assertOrigin(modification, OriginType.USER_POLICY); iterator.remove(); @@ -888,7 +888,7 @@ public void test401ImportHermanDummy() throws Exception { makeImportSyncDelta(context.getProjectionContexts().iterator().next()); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -896,11 +896,11 @@ public void test401ImportHermanDummy() throws Exception { projector.project(context, "test", task, result); // THEN - display("Output context", context); + displayDumpable("Output context", context); // TODO - assertTrue(context.getFocusContext().getPrimaryDelta().getChangeType() == ChangeType.ADD); + assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.ADD); ObjectDelta userSecondaryDelta = context.getFocusContext().getSecondaryDelta(); assertNotNull("No user secondary delta", userSecondaryDelta); @@ -930,7 +930,7 @@ public void test450GuybrushInboundFromDelta() throws Exception { addSyncModificationToContextReplaceAccountAttribute(context, ACCOUNT_SHADOW_GUYBRUSH_OID, "ship", "Black Pearl"); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -938,12 +938,12 @@ public void test450GuybrushInboundFromDelta() throws Exception { projector.project(context, "test", task, result); // THEN - display("Output context", context); + displayDumpable("Output context", context); assertNoUserPrimaryDelta(context); assertUserSecondaryDelta(context); ObjectDelta userSecondaryDelta = context.getFocusContext().getSecondaryDelta(); - assertTrue(userSecondaryDelta.getChangeType() == ChangeType.MODIFY); + assertSame(userSecondaryDelta.getChangeType(), ChangeType.MODIFY); PrismAsserts.assertPropertyAdd(userSecondaryDelta, UserType.F_ORGANIZATIONAL_UNIT, PrismTestUtil.createPolyString("The crew of Black Pearl")); assertOriginWithSideEffectChanges(userSecondaryDelta, OriginType.INBOUND); @@ -968,7 +968,7 @@ public void test451GuybrushInboundFromAbsolute() throws Exception { guybrushAccountContext.setDoReconciliation(true); context.recompute(); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -976,12 +976,12 @@ public void test451GuybrushInboundFromAbsolute() throws Exception { projector.project(context, "test", task, result); // THEN - display("Output context", context); + displayDumpable("Output context", context); assertNoUserPrimaryDelta(context); assertUserSecondaryDelta(context); ObjectDelta userSecondaryDelta = context.getFocusContext().getSecondaryDelta(); - assertTrue(userSecondaryDelta.getChangeType() == ChangeType.MODIFY); + assertSame(userSecondaryDelta.getChangeType(), ChangeType.MODIFY); PrismAsserts.assertPropertyAdd(userSecondaryDelta, UserType.F_ORGANIZATIONAL_UNIT, PrismTestUtil.createPolyString("The crew of The Sea Monkey")); assertOriginWithSideEffectChanges(userSecondaryDelta, OriginType.INBOUND); @@ -1005,9 +1005,9 @@ public void test500ReconcileGuybrushDummy() throws Exception { fillContextWithUser(context, USER_GUYBRUSH_OID, result); context.setDoReconciliationForAllProjections(true); - display("Guybrush account before: ", dummyAccount); + displayDumpable("Guybrush account before: ", dummyAccount); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -1015,15 +1015,15 @@ public void test500ReconcileGuybrushDummy() throws Exception { projector.project(context, "test", task, result); // THEN - display("Output context", context); + displayDumpable("Output context", context); assertNull("User primary delta sneaked in", context.getFocusContext().getPrimaryDelta()); // There is an inbound mapping for password that generates it if not present. it is triggered in this case. ObjectDelta userSecondaryDelta = context.getFocusContext().getSecondaryDelta(); - assertTrue(userSecondaryDelta.getChangeType() == ChangeType.MODIFY); + assertSame(userSecondaryDelta.getChangeType(), ChangeType.MODIFY); assertEquals("Unexpected number of modifications in user secondary delta", 9, userSecondaryDelta.getModifications().size()); - ItemDelta modification = userSecondaryDelta.getModifications().iterator().next(); + ItemDelta modification = userSecondaryDelta.getModifications().iterator().next(); assertEquals("Unexpected modification", PasswordType.F_VALUE, modification.getElementName()); assertOriginWithSideEffectChanges(userSecondaryDelta, OriginType.INBOUND); @@ -1062,7 +1062,7 @@ public void test600AddLargo() throws Exception { PrismObject user = PrismTestUtil.parseObject(USER_LARGO_FILE); fillContextWithAddUserDelta(context, user); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -1070,7 +1070,7 @@ public void test600AddLargo() throws Exception { projector.project(context, "test", task, result); // THEN - display("Output context", context); + displayDumpable("Output context", context); // TODO @@ -1094,9 +1094,9 @@ private void assertNoJackShadow() throws SchemaException, ObjectNotFoundExceptio private void assertOriginWithSideEffectChanges(ObjectDelta delta, OriginType expectedOrigi) { // Activation is created in user policy. Therefore assert the origin of that as special case // and remove it from the delta so the next assert passes - Iterator iterator = delta.getModifications().iterator(); + Iterator> iterator = delta.getModifications().iterator(); while (iterator.hasNext()) { - ItemDelta modification = iterator.next(); + ItemDelta modification = iterator.next(); QName firstName = modification.getPath().firstToName(); if (firstName.equals(UserType.F_ACTIVATION) || firstName.equals(FocusType.F_ITERATION) || firstName.equals(FocusType.F_ITERATION_TOKEN)) { diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjectorPersona.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjectorPersona.java index 90b617ffb99..0952889a9ae 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjectorPersona.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjectorPersona.java @@ -49,7 +49,7 @@ public void test100AssignRolePersonaAdminToJack() throws Exception { ROLE_PERSONA_ADMIN_OID, RoleType.COMPLEX_TYPE, null, null, null, true); addFocusDeltaToContext(context, focusDelta); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); rememberCounter(InternalCounters.SHADOW_FETCH_OPERATION_COUNT); @@ -58,10 +58,10 @@ public void test100AssignRolePersonaAdminToJack() throws Exception { projector.project(context, "test", task, result); // THEN - display("Output context", context); + displayDumpable("Output context", context); assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 0); - assertTrue(context.getFocusContext().getPrimaryDelta().getChangeType() == ChangeType.MODIFY); + assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.MODIFY); assertSideEffectiveDeltasOnly(context.getFocusContext().getSecondaryDelta(), "user secondary delta", ActivationStatusType.ENABLED); assertTrue("Unexpected projection changes", context.getProjectionContexts().isEmpty()); @@ -73,10 +73,10 @@ public void test100AssignRolePersonaAdminToJack() throws Exception { assertNotNull("No evaluatedAssignmentTriple plus set", evaluatedAssignmentTriple.getPlusSet()); assertEquals("Wrong size of evaluatedAssignmentTriple plus set", 1, evaluatedAssignmentTriple.getPlusSet().size()); EvaluatedAssignmentImpl evaluatedAssignment = (EvaluatedAssignmentImpl) evaluatedAssignmentTriple.getPlusSet().iterator().next(); - display("evaluatedAssignment", evaluatedAssignment); + displayDumpable("evaluatedAssignment", evaluatedAssignment); assertNotNull("No evaluatedAssignment", evaluatedAssignment); DeltaSetTriple> personaConstructionTriple = evaluatedAssignment.getPersonaConstructionTriple(); - display("personaConstructionTriple", personaConstructionTriple); + displayDumpable("personaConstructionTriple", personaConstructionTriple); assertNotNull("No personaConstructionTriple", personaConstructionTriple); assertFalse("Empty personaConstructionTriple", personaConstructionTriple.isEmpty()); assertTrue("Unexpected personaConstructionTriple plus set", personaConstructionTriple.getPlusSet().isEmpty()); diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjectorRoleEntitlement.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjectorRoleEntitlement.java index 48775302987..b6883f3c8d7 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjectorRoleEntitlement.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjectorRoleEntitlement.java @@ -71,7 +71,7 @@ public void test100AddEntitlementToPirateDirect() throws Exception { // We want "shadow" so the fullname will be computed by outbound expression addModificationToContextAddProjection(context, RoleType.class, ENTITLEMENT_SHADOW_PIRATE_DUMMY_FILE); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -79,7 +79,7 @@ public void test100AddEntitlementToPirateDirect() throws Exception { projector.project(context, "test", task, result); // THEN - display("Output context", context); + displayDumpable("Output context", context); assertNull("Unexpected focus primary changes " + context.getFocusContext().getPrimaryDelta(), context.getFocusContext().getPrimaryDelta()); assertSideEffectiveDeltasOnly(context.getFocusContext().getSecondaryDelta(), "focus secondary delta", ActivationStatusType.ENABLED); @@ -132,7 +132,7 @@ public void test110AssignEntitlementToPirate() throws Exception { ROLE_PIRATE_OID, RESOURCE_DUMMY_OID, ShadowKindType.ENTITLEMENT, "group", true); addFocusDeltaToContext(context, roleAssignmentDelta); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -159,7 +159,7 @@ public void test111AssignEntitlementToPirateBroken() throws Exception { ROLE_PIRATE_OID, RESOURCE_DUMMY_OID, ShadowKindType.ENTITLEMENT, "group", true); addFocusDeltaToContext(context, roleAssignmentDelta); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); @@ -174,7 +174,7 @@ public void test111AssignEntitlementToPirateBroken() throws Exception { } private void assertAssignEntitlementToPirate(LensContext context) { - display("Output context", context); + displayDumpable("Output context", context); assertSame(context.getFocusContext().getPrimaryDelta().getChangeType(), ChangeType.MODIFY); assertSideEffectiveDeltasOnly(context.getFocusContext().getSecondaryDelta(), diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAbstractAuthenticationEvaluator.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAbstractAuthenticationEvaluator.java index 97a57603dce..845862d5348 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAbstractAuthenticationEvaluator.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAbstractAuthenticationEvaluator.java @@ -971,7 +971,7 @@ private void addFakeAuthorization(MidPointPrincipal principal) { } private void assertPrincipalJack(MidPointPrincipal principal) { - display("principal", principal); + displayDumpable("principal", principal); assertEquals("Bad principal name", USER_JACK_USERNAME, principal.getName().getOrig()); assertEquals("Bad principal name", USER_JACK_USERNAME, principal.getUsername()); FocusType user = principal.getFocus(); diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java index 117cfbc3db9..9543b8b8f58 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java @@ -111,7 +111,7 @@ public void test010AddedAccountJack() throws Exception { // THEN LensContext context = cleanDebugListener(); - display("Resulting context (as seen by debug listener)", context); + displayDumpable("Resulting context (as seen by debug listener)", context); assertNotNull("No resulting context (as seen by debug listener)", context); assertNull("Unexpected user primary delta", context.getFocusContext().getPrimaryDelta()); @@ -162,7 +162,7 @@ public void test020ModifyLootAbsolute() throws Exception { then(); LensContext context = cleanDebugListener(); - display("Resulting context (as seen by debug listener)", context); + displayDumpable("Resulting context (as seen by debug listener)", context); assertNotNull("No resulting context (as seen by debug listener)", context); assertNull("Unexpected user primary delta", context.getFocusContext().getPrimaryDelta()); @@ -209,7 +209,7 @@ public void test021ModifyLootAbsoluteEmpty() throws Exception { change.setResource(getDummyResourceObject()); change.setSourceChannel(SchemaConstants.CHANGE_CHANNEL_LIVE_SYNC_URI); - display("SENDING CHANGE NOTIFICATION", change); + displayDumpable("SENDING CHANGE NOTIFICATION", change); // WHEN synchronizationService.notifyChange(change, task, result); @@ -217,7 +217,7 @@ public void test021ModifyLootAbsoluteEmpty() throws Exception { // THEN LensContext context = cleanDebugListener(); - display("Resulting context (as seen by debug listener)", context); + displayDumpable("Resulting context (as seen by debug listener)", context); assertNotNull("No resulting context (as seen by debug listener)", context); assertNull("Unexpected user primary delta", context.getFocusContext().getPrimaryDelta()); @@ -271,7 +271,7 @@ public void test030Reconcile() throws Exception { // THEN LensContext context = cleanDebugListener(); - display("Resulting context (as seen by debug listener)", context); + displayDumpable("Resulting context (as seen by debug listener)", context); assertNotNull("No resulting context (as seen by debug listener)", context); assertNull("Unexpected user primary delta", context.getFocusContext().getPrimaryDelta()); @@ -358,7 +358,7 @@ public void test039DeletedAccountJack() throws Exception { assertSuccess(result); LensContext context = cleanDebugListener(); - display("Resulting context (as seen by debug listener)", context); + displayDumpable("Resulting context (as seen by debug listener)", context); assertNotNull("No resulting context (as seen by debug listener)", context); assertNull("Unexpected user primary delta", context.getFocusContext().getPrimaryDelta()); @@ -428,7 +428,7 @@ public void test050AddedAccountCalypso() throws Exception { then(); LensContext context = cleanDebugListener(); - display("Resulting context (as seen by debug listener)", context); + displayDumpable("Resulting context (as seen by debug listener)", context); assertNull("Unexpected lens context", context); PrismObject userCalypso = findUserByUsername(ACCOUNT_CALYPSO_DUMMY_USERNAME); @@ -463,7 +463,7 @@ public void test051CalypsoRecon() throws Exception { change.setCurrentShadow(accountShadowCalypso); change.setResource(getDummyResourceObject()); - display("Change notification", change); + displayDumpable("Change notification", change); // WHEN when(); @@ -473,7 +473,7 @@ public void test051CalypsoRecon() throws Exception { then(); LensContext context = cleanDebugListener(); - display("Resulting context (as seen by debug listener)", context); + displayDumpable("Resulting context (as seen by debug listener)", context); assertNull("Unexpected lens context", context); PrismObject userCalypso = findUserByUsername(ACCOUNT_CALYPSO_DUMMY_USERNAME); @@ -507,7 +507,7 @@ public void test100AddedAccountJack() throws Exception { dummyAccount.addAttributeValues(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_FULLNAME_NAME, "Jack Sparrow"); getDummyResource().addAccount(dummyAccount); - display("Dummy resource before", getDummyResource()); + displayDumpable("Dummy resource before", getDummyResource()); ResourceObjectShadowChangeDescription change = new ResourceObjectShadowChangeDescription(); change.setCurrentShadow(accountShadowJack); @@ -522,7 +522,7 @@ public void test100AddedAccountJack() throws Exception { assertSuccess(result); LensContext context = cleanDebugListener(); - display("Resulting context (as seen by debug listener)", context); + displayDumpable("Resulting context (as seen by debug listener)", context); assertNotNull("No resulting context (as seen by debug listener)", context); assertNull("Unexpected user primary delta", context.getFocusContext().getPrimaryDelta()); @@ -583,7 +583,7 @@ public void test199DeletedAccountJackTotal() throws Exception { assertSuccess(result, 1); LensContext context = cleanDebugListener(); - display("Resulting context (as seen by debug listener)", context); + displayDumpable("Resulting context (as seen by debug listener)", context); assertNotNull("No resulting context (as seen by debug listener)", context); assertNotNull("No focus context", context.getFocusContext()); @@ -631,7 +631,7 @@ public void test200AddedAccountJackSchemaViolation() throws Exception { dummyAccount.addAttributeValues(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_FULLNAME_NAME, "Jack Sparrow"); getDummyResource().addAccount(dummyAccount); - display("Dummy resource before", getDummyResource()); + displayDumpable("Dummy resource before", getDummyResource()); getDummyResource().setModifyBreakMode(BreakMode.SCHEMA); @@ -649,7 +649,7 @@ public void test200AddedAccountJackSchemaViolation() throws Exception { assertPartialError(result); LensContext context = cleanDebugListener(); - display("Resulting context (as seen by debug listener)", context); + displayDumpable("Resulting context (as seen by debug listener)", context); assertNotNull("No resulting context (as seen by debug listener)", context); assertNull("Unexpected user primary delta", context.getFocusContext().getPrimaryDelta()); @@ -691,7 +691,7 @@ public void test202UpdatedAccountJackSchemaViolation() throws Exception { assertLinks(userBefore, 1); setDebugListener(); - display("Dummy resource before", getDummyResource()); + displayDumpable("Dummy resource before", getDummyResource()); getDummyResource().setModifyBreakMode(BreakMode.SCHEMA); @@ -710,7 +710,7 @@ public void test202UpdatedAccountJackSchemaViolation() throws Exception { assertPartialError(result); LensContext context = cleanDebugListener(); - display("Resulting context (as seen by debug listener)", context); + displayDumpable("Resulting context (as seen by debug listener)", context); assertNotNull("No resulting context (as seen by debug listener)", context); assertNull("Unexpected user primary delta", context.getFocusContext().getPrimaryDelta()); @@ -759,7 +759,7 @@ public void test210AssignJackDummy() throws Exception { assertSuccess(result); LensContext context = cleanDebugListener(); - display("Resulting context (as seen by debug listener)", context); + displayDumpable("Resulting context (as seen by debug listener)", context); assertNotNull("No resulting context (as seen by debug listener)", context); assertNotNull("Missing user primary delta", context.getFocusContext().getPrimaryDelta()); @@ -805,7 +805,7 @@ public void test212AssignJackDummyLimited() throws Exception { assertSuccess(result); LensContext context = cleanDebugListener(); - display("Resulting context (as seen by debug listener)", context); + displayDumpable("Resulting context (as seen by debug listener)", context); assertNotNull("No resulting context (as seen by debug listener)", context); assertNotNull("Missing user primary delta", context.getFocusContext().getPrimaryDelta()); @@ -859,7 +859,7 @@ public void test214UpdatedAccountJackLimited() throws Exception { getDummyResource(RESOURCE_DUMMY_LIMITED_NAME).getAccountByUsername(USER_JACK_USERNAME) .replaceAttributeValue(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, "Limitistan"); - display("Dummy resource before", getDummyResource()); + displayDumpable("Dummy resource before", getDummyResource()); ResourceObjectShadowChangeDescription change = new ResourceObjectShadowChangeDescription(); PrismObject accountShadowLimitedJackBefore = getShadowModelNoFetch(accountShadowJackDummyLimitedOid); @@ -882,7 +882,7 @@ public void test214UpdatedAccountJackLimited() throws Exception { getDummyResource().resetBreakMode(); LensContext context = cleanDebugListener(); - display("Resulting context (as seen by debug listener)", context); + displayDumpable("Resulting context (as seen by debug listener)", context); assertNotNull("No resulting context (as seen by debug listener)", context); assertNull("Unexpected user primary delta", context.getFocusContext().getPrimaryDelta()); @@ -910,7 +910,7 @@ public void test214UpdatedAccountJackLimited() throws Exception { PrismObject userAfter = getUser(USER_JACK_OID); assertLinks(userAfter, 2); - display("Dummy resource after", getDummyResource()); + displayDumpable("Dummy resource after", getDummyResource()); PrismObject shadowDummyAfter = getShadowModelNoFetch(accountShadowJackDummyOid); assertSituation(shadowDummyAfter, SynchronizationSituationType.LINKED); @@ -957,7 +957,7 @@ public void test300AddedGroupPirates() throws Exception { TestUtil.assertSuccess(result); LensContext context = cleanDebugListener(); - display("Resulting context (as seen by debug listener)", context); + displayDumpable("Resulting context (as seen by debug listener)", context); assertNotNull("No resulting context (as seen by debug listener)", context); assertNotNull("No focus primary delta", context.getFocusContext().getPrimaryDelta()); diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/visualizer/TestVisualizer.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/visualizer/TestVisualizer.java index c6039f2927b..ffa9de4194a 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/visualizer/TestVisualizer.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/visualizer/TestVisualizer.java @@ -73,7 +73,7 @@ public void test100UserBasic() throws Exception { // THEN then(); - display("scene", scene); + displayDumpable("scene", scene); // TODO some asserts } @@ -110,7 +110,7 @@ public void test110UserWithContainers() throws Exception { // THEN then(); - display("scene", scene); + displayDumpable("scene", scene); // TODO some asserts } @@ -129,7 +129,7 @@ public void test200UserDeltaBasic() throws Exception { // THEN then(); - display("scene", scene); + displayDumpable("scene", scene); // TODO some asserts } @@ -158,7 +158,7 @@ public void test210UserDeltaContainers() throws Exception { // THEN then(); - display("scene", scene); + displayDumpable("scene", scene); // TODO some asserts } @@ -208,7 +208,7 @@ public void test220UserContainerReplace() throws Exception { // THEN then(); - display("scene", scene); + displayDumpable("scene", scene); // TODO some asserts } @@ -234,7 +234,7 @@ public void test230UserContainerDelete() throws Exception { // THEN then(); - display("scene", scene); + displayDumpable("scene", scene); // TODO some asserts } @@ -296,7 +296,7 @@ public void test305UserAssignmentAdd() throws Exception { // THEN then(); - display("scene", scene); + displayDumpable("scene", scene); display("jack with assignment", getUser(USER_JACK_OID)); // TODO some asserts @@ -364,7 +364,7 @@ public void test310UserLinkRefDelete() throws Exception { // THEN then(); - display("scene", scene); + displayDumpable("scene", scene); // TODO some asserts } @@ -383,7 +383,7 @@ public void test320UserLinkRefAdd() throws Exception { // THEN then(); - display("scene", scene); + displayDumpable("scene", scene); // TODO some asserts } @@ -402,7 +402,7 @@ public void test330UserLinkRefReplaceNoOp() throws Exception { // THEN then(); - display("scene", scene); + displayDumpable("scene", scene); // TODO some asserts } @@ -421,7 +421,7 @@ public void test340UserLinkRefReplaceOp() throws Exception { // THEN then(); - display("scene", scene); + displayDumpable("scene", scene); // TODO some asserts } diff --git a/model/model-impl/src/test/resources/lens/role-mutinier.xml b/model/model-impl/src/test/resources/lens/role-mutineer.xml similarity index 86% rename from model/model-impl/src/test/resources/lens/role-mutinier.xml rename to model/model-impl/src/test/resources/lens/role-mutineer.xml index 4958ff5885b..4fdaef60e30 100644 --- a/model/model-impl/src/test/resources/lens/role-mutinier.xml +++ b/model/model-impl/src/test/resources/lens/role-mutineer.xml @@ -7,10 +7,8 @@ - Mutinier + xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"> + Mutineer @@ -24,7 +22,7 @@ diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java index af295bc8d47..9b75b547014 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java @@ -467,7 +467,7 @@ public void test100ModifyUserJackAssignAccount() throws Exception { TestUtil.assertModifyTimestamp(userJack, start, end); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -482,7 +482,7 @@ public void test100ModifyUserJackAssignAccount() throws Exception { ObjectDelta objectDelta = executionDelta.getObjectDelta(); if (objectDelta.getObjectTypeClass() == ShadowType.class) { PropertyDelta enableTimestampDelta = objectDelta.findPropertyDelta(PATH_ACTIVATION_ENABLE_TIMESTAMP); - display("Audit enableTimestamp delta", enableTimestampDelta); + displayDumpable("Audit enableTimestamp delta", enableTimestampDelta); assertNotNull("EnableTimestamp delta vanished from audit record", enableTimestampDelta); found = true; } @@ -612,7 +612,7 @@ public void test112UserJackRecompute() throws Exception { assertDummyDisabled("jack"); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertNoRecord(); } @@ -671,7 +671,7 @@ public void test115ModifyUserJackAdministrativeStatusNull() throws Exception { PrismObject userJack = getUser(USER_JACK_OID); display("User after change execution", userJack); DummyAccount account = getDummyAccount(null, ACCOUNT_JACK_DUMMY_USERNAME); - display("Account after change", account); + displayDumpable("Account after change", account); assertUserJack(userJack, USER_JACK_FULL_NAME); @@ -1307,7 +1307,7 @@ public void test160ModifyUserJackAssignAccountKhaki() throws Exception { checkAdminStatusFor15x(userAfter, true, true, true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1326,7 +1326,7 @@ public void test160ModifyUserJackAssignAccountKhaki() throws Exception { // continue; // } PropertyDelta enableTimestampDelta = objectDelta.findPropertyDelta(PATH_ACTIVATION_ENABLE_TIMESTAMP); - display("Audit enableTimestamp delta", enableTimestampDelta); + displayDumpable("Audit enableTimestamp delta", enableTimestampDelta); assertNotNull("EnableTimestamp delta vanished from audit record, delta: " + objectDelta, enableTimestampDelta); found = true; } @@ -1841,7 +1841,7 @@ public void test240AddUserRappDraft() throws Exception { PrismObject userAfter = getUser(USER_RAPP_OID); display("user after", userAfter); - display("Dummy", getDummyResource()); + displayDumpable("Dummy", getDummyResource()); assertEffectiveActivation(userAfter, ActivationStatusType.DISABLED); @@ -1880,7 +1880,7 @@ public void test241RecomputeRappDraft() throws Exception { PrismObject userAfter = getUser(USER_RAPP_OID); display("user after", userAfter); - display("Dummy", getDummyResource()); + displayDumpable("Dummy", getDummyResource()); assertEffectiveActivation(userAfter, ActivationStatusType.DISABLED); @@ -1964,7 +1964,7 @@ public void test245ActivateRapp() throws Exception { assertRoleMembershipRef(userAfter, ROLE_CARIBBEAN_PIRATE_OID, ROLE_PIRATE_OID, ROLE_CAPTAIN_OID); DummyAccount dummyAccount = assertDummyAccount(null, USER_RAPP_USERNAME); - display("dummy account", dummyAccount); + displayDumpable("dummy account", dummyAccount); assertDummyAccountAttribute(null, USER_RAPP_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_WEAPON_NAME, ROLE_PIRATE_WEAPON); assertDummyAccountAttribute(null, USER_RAPP_USERNAME, @@ -2055,7 +2055,7 @@ public void test300AddDummyGreenAccountMancomb() throws Exception { display("Account shadow after", accountMancomb); DummyAccount dummyAccountAfter = getDummyResource(RESOURCE_DUMMY_GREEN_NAME).getAccountByUsername(ACCOUNT_MANCOMB_DUMMY_USERNAME); - display("Account after", dummyAccountAfter); + displayDumpable("Account after", dummyAccountAfter); assertNotNull("No mancomb account shadow", accountMancomb); assertEquals("Wrong resourceRef in mancomb account", RESOURCE_DUMMY_GREEN_OID, @@ -2427,7 +2427,7 @@ private void test5X5Recompute(Class type, String oid) t assertEffectiveStatus(objectAfter, ActivationStatusType.ENABLED); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertNoRecord(); } @@ -2458,7 +2458,7 @@ public void test600AddUser1() throws Exception { display("User after change execution", user1); DummyAccount dummyAccount = dummyResourceCoral.getAccountByUsername("user1"); - display("Dummy account", dummyAccount); + displayDumpable("Dummy account", dummyAccount); checkSuspendedAttribute(dummyAccount, Boolean.TRUE); String accountOid = getSingleLinkOid(user1); @@ -2496,7 +2496,7 @@ public void test610EnableUser1() throws Exception { display("User after change execution", user1); DummyAccount dummyAccount = dummyResourceCoral.getAccountByUsername("user1"); - display("Dummy account", dummyAccount); + displayDumpable("Dummy account", dummyAccount); checkSuspendedAttribute(dummyAccount, Boolean.FALSE); String accountOid = getSingleLinkOid(user1); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorDummyFake.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorDummyFake.java index 06955cb4d01..5b344903601 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorDummyFake.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorDummyFake.java @@ -236,7 +236,7 @@ public void test100UpgradeModelAddDelete() throws Exception { resourceDelta.addModification(connectorRefDeltaAdd); // Purge the schema. New connector schema is not compatible. resourceDelta.addModificationReplaceContainer(ResourceType.F_SCHEMA); - display("Delta", resourceDelta); + displayDumpable("Delta", resourceDelta); // WHEN executeChanges(resourceDelta, null, task, result); @@ -466,7 +466,7 @@ private void assertUpgrade(PrismObject dummyResourceModelBefore) t dummyResourceModelBefore.asObjectable().setFetchResult(null); dummyResourceModelAfter.asObjectable().setFetchResult(null); ObjectDelta dummyResourceDiff = DiffUtil.diff(dummyResourceModelBefore, dummyResourceModelAfter); - display("Dummy resource diff", dummyResourceDiff); + displayDumpable("Dummy resource diff", dummyResourceDiff); assertTrue("Ha! Someone touched the other resource! Off with his head! diff:" + dummyResourceDiff, dummyResourceDiff.isEmpty()); testResources(3, 3); @@ -496,7 +496,7 @@ private void assertDowngrade(PrismObject dummyResourceModelBefore) dummyResourceModelBefore.asObjectable().setFetchResult(null); dummyResourceModelAfter.asObjectable().setFetchResult(null); ObjectDelta dummyResourceDiff = DiffUtil.diff(dummyResourceModelBefore, dummyResourceModelAfter); - display("Dummy resource diff", dummyResourceDiff); + displayDumpable("Dummy resource diff", dummyResourceDiff); assertTrue("Ha! Someone touched the other resource! Off with his head! diff:" + dummyResourceDiff, dummyResourceDiff.isEmpty()); testResources(3, 1); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java index 45a25716e07..016f2f48db9 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java @@ -159,7 +159,7 @@ public void test100AddGroupShadowSwashbucklers() throws Exception { DummyGroup dummyGroup = getDummyResource().getGroupByName(GROUP_DUMMY_SWASHBUCKLERS_NAME); assertNotNull("No group created on dummy resource", dummyGroup); - display("Group", dummyGroup); + displayDumpable("Group", dummyGroup); assertEquals("Wrong group description", GROUP_DUMMY_SWASHBUCKLERS_DESCRIPTION, dummyGroup.getAttributeValue(DummyResourceContoller.DUMMY_GROUP_ATTRIBUTE_DESCRIPTION)); @@ -231,7 +231,7 @@ public void test200AssignRoleSwashbucklerToJack() throws Exception { assertDefaultDummyAccount(ACCOUNT_JACK_DUMMY_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, true); DummyGroup dummyGroup = getDummyResource().getGroupByName(GROUP_DUMMY_SWASHBUCKLERS_NAME); assertNotNull("No group on dummy resource", dummyGroup); - display("Group", dummyGroup); + displayDumpable("Group", dummyGroup); assertEquals("Wrong group description", GROUP_DUMMY_SWASHBUCKLERS_DESCRIPTION, dummyGroup.getAttributeValue(DummyResourceContoller.DUMMY_GROUP_ATTRIBUTE_DESCRIPTION)); assertGroupMember(dummyGroup, ACCOUNT_GUYBRUSH_DUMMY_USERNAME); @@ -257,7 +257,7 @@ public void test209UnAssignRoleSwashbucklerFromJack() throws Exception { DummyGroup dummyGroup = getDummyResource().getGroupByName(GROUP_DUMMY_SWASHBUCKLERS_NAME); assertNotNull("No group on dummy resource", dummyGroup); - display("Group", dummyGroup); + displayDumpable("Group", dummyGroup); assertEquals("Wrong group description", GROUP_DUMMY_SWASHBUCKLERS_DESCRIPTION, dummyGroup.getAttributeValue(DummyResourceContoller.DUMMY_GROUP_ATTRIBUTE_DESCRIPTION)); assertGroupMember(dummyGroup, ACCOUNT_GUYBRUSH_DUMMY_USERNAME); @@ -287,7 +287,7 @@ public void test220AssignRoleLandluberToWally() throws Exception { DummyGroup dummyGroup = getDummyResource().getGroupByName(GROUP_DUMMY_LANDLUBERS_NAME); assertNotNull("No group on dummy resource", dummyGroup); - display("Group", dummyGroup); + displayDumpable("Group", dummyGroup); assertEquals("Wrong group description", GROUP_DUMMY_LANDLUBERS_DESCRIPTION, dummyGroup.getAttributeValue(DummyResourceContoller.DUMMY_GROUP_ATTRIBUTE_DESCRIPTION)); assertGroupMember(dummyGroup, USER_WALLY_NAME); @@ -353,7 +353,7 @@ public void test224UnassignRoleMapmakerFromWally() throws Exception { DummyGroup dummyGroup = getDummyResource().getGroupByName(GROUP_DUMMY_MAPMAKERS_NAME); assertNotNull("No group on dummy resource", dummyGroup); - display("Group", dummyGroup); + displayDumpable("Group", dummyGroup); assertNoGroupMember(dummyGroup, USER_WALLY_NAME); } @@ -372,14 +372,14 @@ public void test300AddRoleWimp() throws Exception { DummyGroup dummyGroup = getDummyResource().getGroupByName(GROUP_DUMMY_WIMPS_NAME); assertNotNull("No group on dummy resource", dummyGroup); - display("Group", dummyGroup); + displayDumpable("Group", dummyGroup); // assertEquals("Wrong group description", GROUP_DUMMY_LANDLUBERS_DESCRIPTION, // dummyGroup.getAttributeValue(DummyResourceContoller.DUMMY_GROUP_ATTRIBUTE_DESCRIPTION)); assertNoGroupMembers(dummyGroup); DummyGroup dummyGroupAtOrange = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_DUMMY_WIMPS_NAME); assertNotNull("No group on orange dummy resource", dummyGroupAtOrange); - display("Group @orange", dummyGroupAtOrange); + displayDumpable("Group @orange", dummyGroupAtOrange); assertNoGroupMembers(dummyGroupAtOrange); assertCounterIncrement(InternalCounters.CONNECTOR_INSTANCE_INITIALIZATION_COUNT, 0); // MID-4779 @@ -403,12 +403,12 @@ public void test302AddRoleBrute() throws Exception { DummyGroup dummyGroupBrute = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_BRUTE_NAME); assertNotNull("No group on orange dummy resource", dummyGroupBrute); - display("Group", dummyGroupBrute); + displayDumpable("Group", dummyGroupBrute); assertNoGroupMembers(dummyGroupBrute); DummyGroup dummyGroupBruteWannabe = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_BRUTE_NAME + "-wannabe"); assertNotNull("No wannabe group on orange dummy resource", dummyGroupBruteWannabe); - display("Wannabe Group", dummyGroupBruteWannabe); + displayDumpable("Wannabe Group", dummyGroupBruteWannabe); assertNoGroupMembers(dummyGroupBruteWannabe); } @@ -428,12 +428,12 @@ public void test304AddRoleThug() throws Exception { DummyGroup dummyGroupThug = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_THUG_NAME); assertNotNull("No group on orange dummy resource", dummyGroupThug); - display("Group", dummyGroupThug); + displayDumpable("Group", dummyGroupThug); assertNoGroupMembers(dummyGroupThug); DummyGroup dummyGroupThugWannabe = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_THUG_NAME + "-wannabe"); assertNotNull("No wannabe group on orange dummy resource", dummyGroupThugWannabe); - display("Wannabe Group", dummyGroupThugWannabe); + displayDumpable("Wannabe Group", dummyGroupThugWannabe); assertNoGroupMembers(dummyGroupThugWannabe); } @@ -457,7 +457,7 @@ public void test310AssignRoleWimpToLargo() throws Exception { DummyGroup dummyGroupWimpAtOrange = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_DUMMY_WIMPS_NAME); assertNotNull("No group on orange dummy resource", dummyGroupWimpAtOrange); - display("Group @orange", dummyGroupWimpAtOrange); + displayDumpable("Group @orange", dummyGroupWimpAtOrange); assertGroupMember(dummyGroupWimpAtOrange, USER_LARGO_USERNAME); } @@ -479,7 +479,7 @@ public void test312AssignRoleBruteToLargo() throws Exception { DummyGroup dummyGroupBruteWannabe = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_BRUTE_NAME + "-wannabe"); assertNotNull("No wannabe group on orange dummy resource", dummyGroupBruteWannabe); - display("Wannabe Group", dummyGroupBruteWannabe); + displayDumpable("Wannabe Group", dummyGroupBruteWannabe); assertGroupMember(dummyGroupBruteWannabe, USER_LARGO_USERNAME); } @@ -499,19 +499,19 @@ public void test313UnAssignRoleBruteFromLargo() throws Exception { DummyGroup dummyGroupBrute = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_BRUTE_NAME); assertNotNull("No group on orange dummy resource", dummyGroupBrute); - display("Group", dummyGroupBrute); + displayDumpable("Group", dummyGroupBrute); assertNoGroupMembers(dummyGroupBrute); DummyGroup dummyGroupBruteWannabe = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_BRUTE_NAME + "-wannabe"); assertNotNull("No wannabe group on orange dummy resource", dummyGroupBruteWannabe); - display("Wannabe Group", dummyGroupBruteWannabe); + displayDumpable("Wannabe Group", dummyGroupBruteWannabe); assertNoGroupMembers(dummyGroupBruteWannabe); assertGroupMember(GROUP_DUMMY_WIMPS_NAME, USER_LARGO_USERNAME, getDummyResource()); DummyGroup dummyGroupAtOrange = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_DUMMY_WIMPS_NAME); assertNotNull("No group on orange dummy resource", dummyGroupAtOrange); - display("Group @orange", dummyGroupAtOrange); + displayDumpable("Group @orange", dummyGroupAtOrange); assertGroupMember(dummyGroupAtOrange, USER_LARGO_USERNAME); } @@ -533,7 +533,7 @@ public void test314AssignRoleThugToLargo() throws Exception { DummyGroup dummyGroupThugWannabe = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_THUG_NAME + "-wannabe"); assertNotNull("No wannabe group on orange dummy resource", dummyGroupThugWannabe); - display("Wannabe Group", dummyGroupThugWannabe); + displayDumpable("Wannabe Group", dummyGroupThugWannabe); assertGroupMember(dummyGroupThugWannabe, USER_LARGO_USERNAME); } @@ -553,19 +553,19 @@ public void test315UnAssignRoleThugFromLargo() throws Exception { DummyGroup dummyGroupThug = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_THUG_NAME); assertNotNull("No group on orange dummy resource", dummyGroupThug); - display("Group", dummyGroupThug); + displayDumpable("Group", dummyGroupThug); assertNoGroupMembers(dummyGroupThug); DummyGroup dummyGroupThugWannabe = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_THUG_NAME + "-wannabe"); assertNotNull("No wannabe group on orange dummy resource", dummyGroupThugWannabe); - display("Wannabe Group", dummyGroupThugWannabe); + displayDumpable("Wannabe Group", dummyGroupThugWannabe); assertNoGroupMembers(dummyGroupThugWannabe); assertGroupMember(GROUP_DUMMY_WIMPS_NAME, USER_LARGO_USERNAME, getDummyResource()); DummyGroup dummyGroupAtOrange = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_DUMMY_WIMPS_NAME); assertNotNull("No group on orange dummy resource", dummyGroupAtOrange); - display("Group @orange", dummyGroupAtOrange); + displayDumpable("Group @orange", dummyGroupAtOrange); assertGroupMember(dummyGroupAtOrange, USER_LARGO_USERNAME); } @@ -590,13 +590,13 @@ public void test317RenameLargo() throws Exception { DummyGroup dummyGroup = getDummyResource().getGroupByName(GROUP_DUMMY_WIMPS_NAME); assertNotNull("No group on dummy resource", dummyGroup); - display("Group", dummyGroup); + displayDumpable("Group", dummyGroup); assertNoGroupMember(dummyGroup, USER_LARGO_USERNAME); assertGroupMember(dummyGroup, "newLargo"); DummyGroup dummyGroupAtOrange = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_DUMMY_WIMPS_NAME); assertNotNull("No group on orange dummy resource", dummyGroupAtOrange); - display("Group", dummyGroupAtOrange); + displayDumpable("Group", dummyGroupAtOrange); assertNoGroupMember(dummyGroupAtOrange, USER_LARGO_USERNAME); assertGroupMember(dummyGroupAtOrange, "newLargo"); } @@ -620,13 +620,13 @@ public void test319UnassignRoleWimpFromLargo() throws Exception { DummyGroup dummyGroup = getDummyResource().getGroupByName(GROUP_DUMMY_WIMPS_NAME); assertNotNull("No group on dummy resource", dummyGroup); - display("Group", dummyGroup); + displayDumpable("Group", dummyGroup); assertNoGroupMember(dummyGroup, USER_LARGO_USERNAME); assertNoGroupMember(dummyGroup, "newLargo"); DummyGroup dummyGroupAtOrange = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_DUMMY_WIMPS_NAME); assertNotNull("No group on orange dummy resource", dummyGroupAtOrange); - display("Group @orange", dummyGroupAtOrange); + displayDumpable("Group @orange", dummyGroupAtOrange); assertNoGroupMember(dummyGroupAtOrange, USER_LARGO_USERNAME); // Orange resource has explicit referential integrity switched off assertGroupMember(dummyGroupAtOrange, "newLargo"); @@ -655,7 +655,7 @@ public void test320AssignRoleBruteToRapp() throws Exception { DummyGroup dummyGroupBruteWannabe = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_BRUTE_NAME + "-wannabe"); assertNotNull("No wannabe group on orange dummy resource", dummyGroupBruteWannabe); - display("Wannabe Group", dummyGroupBruteWannabe); + displayDumpable("Wannabe Group", dummyGroupBruteWannabe); assertGroupMember(dummyGroupBruteWannabe, USER_RAPP_USERNAME); } @@ -677,14 +677,14 @@ public void test322AssignRoleWimpToRapp() throws Exception { DummyGroup dummyGroupWimpAtOrange = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_DUMMY_WIMPS_NAME); assertNotNull("No group on orange dummy resource", dummyGroupWimpAtOrange); - display("Group @orange", dummyGroupWimpAtOrange); + displayDumpable("Group @orange", dummyGroupWimpAtOrange); assertGroupMember(dummyGroupWimpAtOrange, USER_RAPP_USERNAME); assertGroupMember(GROUP_BRUTE_NAME, USER_RAPP_USERNAME, getDummyResource(RESOURCE_DUMMY_ORANGE_NAME)); DummyGroup dummyGroupBruteWannabe = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_BRUTE_NAME + "-wannabe"); assertNotNull("No wannabe group on orange dummy resource", dummyGroupBruteWannabe); - display("Wannabe Group", dummyGroupBruteWannabe); + displayDumpable("Wannabe Group", dummyGroupBruteWannabe); assertGroupMember(dummyGroupBruteWannabe, USER_RAPP_USERNAME); } @@ -706,21 +706,21 @@ public void test324AssignRoleThugToRapp() throws Exception { DummyGroup dummyGroupThugWannabe = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_THUG_NAME + "-wannabe"); assertNotNull("No wannabe group on orange dummy resource", dummyGroupThugWannabe); - display("Wannabe Group", dummyGroupThugWannabe); + displayDumpable("Wannabe Group", dummyGroupThugWannabe); assertGroupMember(dummyGroupThugWannabe, USER_RAPP_USERNAME); assertGroupMember(GROUP_DUMMY_WIMPS_NAME, USER_RAPP_USERNAME, getDummyResource()); DummyGroup dummyGroupWimpAtOrange = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_DUMMY_WIMPS_NAME); assertNotNull("No group on orange dummy resource", dummyGroupWimpAtOrange); - display("Group @orange", dummyGroupWimpAtOrange); + displayDumpable("Group @orange", dummyGroupWimpAtOrange); assertGroupMember(dummyGroupWimpAtOrange, USER_RAPP_USERNAME); assertGroupMember(GROUP_BRUTE_NAME, USER_RAPP_USERNAME, getDummyResource(RESOURCE_DUMMY_ORANGE_NAME)); DummyGroup dummyGroupBruteWannabe = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_BRUTE_NAME + "-wannabe"); assertNotNull("No wannabe group on orange dummy resource", dummyGroupBruteWannabe); - display("Wannabe Group", dummyGroupBruteWannabe); + displayDumpable("Wannabe Group", dummyGroupBruteWannabe); assertGroupMember(dummyGroupBruteWannabe, USER_RAPP_USERNAME); } @@ -740,26 +740,26 @@ public void test327UnassignRoleWimpFromRapp() throws Exception { DummyGroup dummyGroupWimp = getDummyResource().getGroupByName(GROUP_DUMMY_WIMPS_NAME); assertNotNull("No group on dummy resource", dummyGroupWimp); - display("Group", dummyGroupWimp); + displayDumpable("Group", dummyGroupWimp); assertNoGroupMember(dummyGroupWimp, USER_RAPP_USERNAME); DummyGroup dummyGroupWimpAtOrange = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_DUMMY_WIMPS_NAME); assertNotNull("No group on orange dummy resource", dummyGroupWimpAtOrange); - display("Group @orange", dummyGroupWimpAtOrange); + displayDumpable("Group @orange", dummyGroupWimpAtOrange); assertNoGroupMember(dummyGroupWimpAtOrange, USER_RAPP_USERNAME); assertGroupMember(GROUP_THUG_NAME, USER_RAPP_USERNAME, getDummyResource(RESOURCE_DUMMY_ORANGE_NAME)); DummyGroup dummyGroupThugWannabe = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_THUG_NAME + "-wannabe"); assertNotNull("No wannabe group on orange dummy resource", dummyGroupThugWannabe); - display("Wannabe Group", dummyGroupThugWannabe); + displayDumpable("Wannabe Group", dummyGroupThugWannabe); assertGroupMember(dummyGroupThugWannabe, USER_RAPP_USERNAME); assertGroupMember(GROUP_BRUTE_NAME, USER_RAPP_USERNAME, getDummyResource(RESOURCE_DUMMY_ORANGE_NAME)); DummyGroup dummyGroupBruteWannabe = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_BRUTE_NAME + "-wannabe"); assertNotNull("No wannabe group on orange dummy resource", dummyGroupBruteWannabe); - display("Wannabe Group", dummyGroupBruteWannabe); + displayDumpable("Wannabe Group", dummyGroupBruteWannabe); assertGroupMember(dummyGroupBruteWannabe, USER_RAPP_USERNAME); } @@ -779,29 +779,29 @@ public void test328UnassignRoleThugFromRapp() throws Exception { DummyGroup dummyGroupThug = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_THUG_NAME); assertNotNull("No group on orange dummy resource", dummyGroupThug); - display("Group", dummyGroupThug); + displayDumpable("Group", dummyGroupThug); assertNoGroupMember(dummyGroupThug, USER_RAPP_USERNAME); DummyGroup dummyGroupThugWannabe = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_THUG_NAME + "-wannabe"); assertNotNull("No wannabe group on orange dummy resource", dummyGroupThugWannabe); - display("Wannabe Group", dummyGroupThugWannabe); + displayDumpable("Wannabe Group", dummyGroupThugWannabe); assertNoGroupMember(dummyGroupThugWannabe, USER_RAPP_USERNAME); DummyGroup dummyGroupWimp = getDummyResource().getGroupByName(GROUP_DUMMY_WIMPS_NAME); assertNotNull("No group on dummy resource", dummyGroupWimp); - display("Group", dummyGroupWimp); + displayDumpable("Group", dummyGroupWimp); assertNoGroupMember(dummyGroupWimp, USER_RAPP_USERNAME); DummyGroup dummyGroupWimpAtOrange = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_DUMMY_WIMPS_NAME); assertNotNull("No group on orange dummy resource", dummyGroupWimpAtOrange); - display("Group @orange", dummyGroupWimpAtOrange); + displayDumpable("Group @orange", dummyGroupWimpAtOrange); assertNoGroupMember(dummyGroupWimpAtOrange, USER_RAPP_USERNAME); assertGroupMember(GROUP_BRUTE_NAME, USER_RAPP_USERNAME, getDummyResource(RESOURCE_DUMMY_ORANGE_NAME)); DummyGroup dummyGroupBruteWannabe = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_BRUTE_NAME + "-wannabe"); assertNotNull("No wannabe group on orange dummy resource", dummyGroupBruteWannabe); - display("Wannabe Group", dummyGroupBruteWannabe); + displayDumpable("Wannabe Group", dummyGroupBruteWannabe); assertGroupMember(dummyGroupBruteWannabe, USER_RAPP_USERNAME); } @@ -825,18 +825,18 @@ public void test329UnAssignRoleBruteFromRapp() throws Exception { DummyGroup dummyGroupBruteWannabe = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_BRUTE_NAME + "-wannabe"); assertNotNull("No wannabe group on orange dummy resource", dummyGroupBruteWannabe); - display("Wannabe Group", dummyGroupBruteWannabe); + displayDumpable("Wannabe Group", dummyGroupBruteWannabe); // Orange resource has explicit referential integrity switched off assertGroupMember(dummyGroupBruteWannabe, USER_RAPP_USERNAME); DummyGroup dummyGroupWimps = getDummyResource().getGroupByName(GROUP_DUMMY_WIMPS_NAME); assertNotNull("No group on dummy resource", dummyGroupWimps); - display("Group", dummyGroupWimps); + displayDumpable("Group", dummyGroupWimps); assertNoGroupMembers(dummyGroupWimps); DummyGroup dummyGroupWimpsAtOrange = getDummyResource(RESOURCE_DUMMY_ORANGE_NAME).getGroupByName(GROUP_DUMMY_WIMPS_NAME); assertNotNull("No group on orange dummy resource", dummyGroupWimpsAtOrange); - display("Group @orange", dummyGroupWimpsAtOrange); + displayDumpable("Group @orange", dummyGroupWimpsAtOrange); // Orange resource has explicit referential integrity switched off assertNoGroupMember(dummyGroupWimpsAtOrange, USER_RAPP_USERNAME); } @@ -856,9 +856,9 @@ public void test350AssignOrangeAccountToGuybrushAndRapp() throws Exception { assertSuccess(result); DummyAccount accountGuybrush = assertDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME); - display("Account guybrush", accountGuybrush); + displayDumpable("Account guybrush", accountGuybrush); DummyAccount accountRapp = assertDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_RAPP_USERNAME); - display("Account rapp", accountRapp); + displayDumpable("Account rapp", accountRapp); } /** @@ -898,7 +898,7 @@ public void test351AssignRoleCrewOfGuybrushToRapp() throws Exception { assertAssociation(rappShadow, RESOURCE_DUMMY_ORANGE_ASSOCIATION_CREW_QNAME, guybrushShadowOid); DummyAccount dummyOrangeAccountRapp = getDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_RAPP_USERNAME); - display("Rapp account", dummyOrangeAccountRapp); + displayDumpable("Rapp account", dummyOrangeAccountRapp); assertDummyAccountAttribute(RESOURCE_DUMMY_ORANGE_NAME, USER_RAPP_USERNAME, DUMMY_ACCOUNT_ATTRIBUTE_MATE_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME); } @@ -938,7 +938,7 @@ public void test358UnassignRoleCrewOfGuybrushToRapp() throws Exception { assertNoAssociation(rappShadow, RESOURCE_DUMMY_ORANGE_ASSOCIATION_CREW_QNAME, guybrushShadowOid); DummyAccount dummyOrangeAccountRapp = getDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_RAPP_USERNAME); - display("Rapp account", dummyOrangeAccountRapp); + displayDumpable("Rapp account", dummyOrangeAccountRapp); assertNoDummyAccountAttribute(RESOURCE_DUMMY_ORANGE_NAME, USER_RAPP_USERNAME, DUMMY_ACCOUNT_ATTRIBUTE_MATE_NAME); } @@ -982,7 +982,7 @@ public void test600AssignRolePirateToJack() throws Exception { assertDefaultDummyAccount(ACCOUNT_JACK_DUMMY_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, true); DummyGroup dummyGroup = getDummyResource().getGroupByName(GROUP_DUMMY_SWASHBUCKLERS_NAME); assertNotNull("No group on dummy resource", dummyGroup); - display("Group", dummyGroup); + displayDumpable("Group", dummyGroup); assertEquals("Wrong group description", GROUP_DUMMY_SWASHBUCKLERS_DESCRIPTION, dummyGroup.getAttributeValue(DummyResourceContoller.DUMMY_GROUP_ATTRIBUTE_DESCRIPTION)); assertNoGroupMember(dummyGroup, ACCOUNT_JACK_DUMMY_USERNAME); @@ -1013,7 +1013,7 @@ public void test610AssignRoleSwashbucklerToJack() throws Exception { assertDefaultDummyAccount(ACCOUNT_JACK_DUMMY_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, true); DummyGroup dummyGroup = getDummyResource().getGroupByName(GROUP_DUMMY_SWASHBUCKLERS_NAME); assertNotNull("No group on dummy resource", dummyGroup); - display("Group", dummyGroup); + displayDumpable("Group", dummyGroup); assertEquals("Wrong group description", GROUP_DUMMY_SWASHBUCKLERS_DESCRIPTION, dummyGroup.getAttributeValue(DummyResourceContoller.DUMMY_GROUP_ATTRIBUTE_DESCRIPTION)); assertGroupMember(dummyGroup, ACCOUNT_JACK_DUMMY_USERNAME); @@ -1044,7 +1044,7 @@ public void test620UnAssignSwashbucklerFromJack() throws Exception { assertDefaultDummyAccount(ACCOUNT_JACK_DUMMY_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, true); DummyGroup dummyGroup = getDummyResource().getGroupByName(GROUP_DUMMY_SWASHBUCKLERS_NAME); assertNotNull("No group on dummy resource", dummyGroup); - display("Group", dummyGroup); + displayDumpable("Group", dummyGroup); assertEquals("Wrong group description", GROUP_DUMMY_SWASHBUCKLERS_DESCRIPTION, dummyGroup.getAttributeValue(DummyResourceContoller.DUMMY_GROUP_ATTRIBUTE_DESCRIPTION)); assertNoGroupMember(dummyGroup, ACCOUNT_JACK_DUMMY_USERNAME); @@ -1088,7 +1088,7 @@ public void test630AssignRoleSwashbucklerToJackValidity() throws Exception { assertDefaultDummyAccount(ACCOUNT_JACK_DUMMY_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, true); DummyGroup dummyGroup = getDummyResource().getGroupByName(GROUP_DUMMY_SWASHBUCKLERS_NAME); assertNotNull("No group on dummy resource", dummyGroup); - display("Group", dummyGroup); + displayDumpable("Group", dummyGroup); assertEquals("Wrong group description", GROUP_DUMMY_SWASHBUCKLERS_DESCRIPTION, dummyGroup.getAttributeValue(DummyResourceContoller.DUMMY_GROUP_ATTRIBUTE_DESCRIPTION)); assertNoGroupMember(dummyGroup, ACCOUNT_JACK_DUMMY_USERNAME); @@ -1120,7 +1120,7 @@ public void test640JackRoleSwashbucklerBecomesValid() throws Exception { assertDefaultDummyAccount(ACCOUNT_JACK_DUMMY_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, true); DummyGroup dummyGroup = getDummyResource().getGroupByName(GROUP_DUMMY_SWASHBUCKLERS_NAME); assertNotNull("No group on dummy resource", dummyGroup); - display("Group", dummyGroup); + displayDumpable("Group", dummyGroup); assertEquals("Wrong group description", GROUP_DUMMY_SWASHBUCKLERS_DESCRIPTION, dummyGroup.getAttributeValue(DummyResourceContoller.DUMMY_GROUP_ATTRIBUTE_DESCRIPTION)); assertGroupMember(dummyGroup, ACCOUNT_JACK_DUMMY_USERNAME); @@ -1149,7 +1149,7 @@ public void test645JackRoleSwashbucklerIsValid() throws Exception { assertDefaultDummyAccount(ACCOUNT_JACK_DUMMY_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, true); DummyGroup dummyGroup = getDummyResource().getGroupByName(GROUP_DUMMY_SWASHBUCKLERS_NAME); assertNotNull("No group on dummy resource", dummyGroup); - display("Group", dummyGroup); + displayDumpable("Group", dummyGroup); assertEquals("Wrong group description", GROUP_DUMMY_SWASHBUCKLERS_DESCRIPTION, dummyGroup.getAttributeValue(DummyResourceContoller.DUMMY_GROUP_ATTRIBUTE_DESCRIPTION)); assertGroupMember(dummyGroup, ACCOUNT_JACK_DUMMY_USERNAME); @@ -1180,7 +1180,7 @@ public void test650JackRoleSwashbucklerBecomesInvalid() throws Exception { assertDefaultDummyAccount(ACCOUNT_JACK_DUMMY_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, true); DummyGroup dummyGroup = getDummyResource().getGroupByName(GROUP_DUMMY_SWASHBUCKLERS_NAME); assertNotNull("No group on dummy resource", dummyGroup); - display("Group", dummyGroup); + displayDumpable("Group", dummyGroup); assertEquals("Wrong group description", GROUP_DUMMY_SWASHBUCKLERS_DESCRIPTION, dummyGroup.getAttributeValue(DummyResourceContoller.DUMMY_GROUP_ATTRIBUTE_DESCRIPTION)); assertNoGroupMember(dummyGroup, ACCOUNT_JACK_DUMMY_USERNAME); @@ -1215,7 +1215,7 @@ public void test659UnassignRoleSwashbucklerFromJack() throws Exception { assertDefaultDummyAccount(ACCOUNT_JACK_DUMMY_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, true); DummyGroup dummyGroup = getDummyResource().getGroupByName(GROUP_DUMMY_SWASHBUCKLERS_NAME); assertNotNull("No group on dummy resource", dummyGroup); - display("Group", dummyGroup); + displayDumpable("Group", dummyGroup); assertEquals("Wrong group description", GROUP_DUMMY_SWASHBUCKLERS_DESCRIPTION, dummyGroup.getAttributeValue(DummyResourceContoller.DUMMY_GROUP_ATTRIBUTE_DESCRIPTION)); assertNoGroupMember(dummyGroup, ACCOUNT_JACK_DUMMY_USERNAME); @@ -1533,7 +1533,7 @@ public void test765ReconcileGuybrush() throws Exception { assertGroupMember(orgGroupName(OU_CLUB_DIVERS), ACCOUNT_GUYBRUSH_DUMMY_USERNAME, getDummyResource()); assertGroupMember(orgGroupName(OU_CLUB_SCI_FI), ACCOUNT_GUYBRUSH_DUMMY_USERNAME, getDummyResource()); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2281,7 +2281,7 @@ private void assertJackAccountSwashbuckler() throws SchemaViolationException, Co assertDefaultDummyAccount(ACCOUNT_JACK_DUMMY_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, true); DummyGroup dummyGroup = getDummyResource().getGroupByName(GROUP_DUMMY_SWASHBUCKLERS_NAME); assertNotNull("No group on dummy resource", dummyGroup); - display("Group", dummyGroup); + displayDumpable("Group", dummyGroup); assertEquals("Wrong group description", GROUP_DUMMY_SWASHBUCKLERS_DESCRIPTION, dummyGroup.getAttributeValue(DummyResourceContoller.DUMMY_GROUP_ATTRIBUTE_DESCRIPTION)); assertGroupMember(dummyGroup, ACCOUNT_JACK_DUMMY_USERNAME); @@ -2294,7 +2294,7 @@ private void assertJackAccountNoSwashbuckler() throws SchemaViolationException, assertDefaultDummyAccount(ACCOUNT_JACK_DUMMY_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, true); DummyGroup dummyGroup = getDummyResource().getGroupByName(GROUP_DUMMY_SWASHBUCKLERS_NAME); assertNotNull("No group on dummy resource", dummyGroup); - display("Group", dummyGroup); + displayDumpable("Group", dummyGroup); assertEquals("Wrong group description", GROUP_DUMMY_SWASHBUCKLERS_DESCRIPTION, dummyGroup.getAttributeValue(DummyResourceContoller.DUMMY_GROUP_ATTRIBUTE_DESCRIPTION)); assertNoGroupMember(dummyGroup, ACCOUNT_JACK_DUMMY_USERNAME); @@ -2306,7 +2306,7 @@ private void assertJackAccountNoSwashbuckler() throws SchemaViolationException, private void assertJackNoAccountNoSwashbuckler() throws ConnectException, FileNotFoundException, SchemaViolationException, ConflictException, InterruptedException { DummyGroup dummyGroup = getDummyResource().getGroupByName(GROUP_DUMMY_SWASHBUCKLERS_NAME); assertNotNull("No group on dummy resource", dummyGroup); - display("Group", dummyGroup); + displayDumpable("Group", dummyGroup); assertEquals("Wrong group description", GROUP_DUMMY_SWASHBUCKLERS_DESCRIPTION, dummyGroup.getAttributeValue(DummyResourceContoller.DUMMY_GROUP_ATTRIBUTE_DESCRIPTION)); assertNoGroupMember(dummyGroup, ACCOUNT_JACK_DUMMY_USERNAME); @@ -2348,7 +2348,7 @@ private void dumpAccountAndGroups(PrismObject user, String dummyResour throws ConflictException, SchemaViolationException, FileNotFoundException, ConnectException, InterruptedException { String userName = user.getName().getOrig(); DummyAccount dummyAccount = getDummyAccount(dummyResourceName, userName); - display("dummy account: " + dummyResourceName, dummyAccount); + displayDumpable("dummy account: " + dummyResourceName, dummyAccount); List groups = getGroupsForUser(dummyResourceName, userName); display("dummy account groups: " + dummyResourceName, groups); } @@ -2392,7 +2392,7 @@ private void assertGroupMember(String groupName, String accountName, DummyResour throws ConnectException, FileNotFoundException, SchemaViolationException, ConflictException, InterruptedException { DummyGroup dummyGroup = dummyResource.getGroupByName(groupName); assertNotNull("No group " + dummyGroup + " on " + dummyResource, dummyGroup); - display("group", dummyGroup); + displayDumpable("group", dummyGroup); assertGroupMember(dummyGroup, accountName); } @@ -2400,7 +2400,7 @@ private void assertNoGroupMember(String groupName, String accountName, DummyReso throws ConnectException, FileNotFoundException, SchemaViolationException, ConflictException, InterruptedException { DummyGroup dummyGroup = dummyResource.getGroupByName(groupName); assertNotNull("No group " + dummyGroup + " on " + dummyResource, dummyGroup); - display("group", dummyGroup); + displayDumpable("group", dummyGroup); assertNoGroupMember(dummyGroup, accountName); } diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestInbounds.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestInbounds.java index e847e7da6a1..7f9c73236ca 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestInbounds.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestInbounds.java @@ -210,7 +210,7 @@ public void test200AssignAccountOrange() throws Exception { assertLinks(userAfter, 2); DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_GUYBRUSH_USERNAME, USER_GUYBRUSH_FULL_NAME, true); - display("Orange account", dummyAccount); + displayDumpable("Orange account", dummyAccount); guybrushShadowOrangeOid = getLinkRefOid(userAfter, RESOURCE_DUMMY_ORANGE_OID); PrismObject shadowOrange = getShadowModel(guybrushShadowOrangeOid); @@ -252,7 +252,7 @@ public void test202ModifyAccountOrangeGossip() throws Exception { assertLinks(userAfter, 2); DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_GUYBRUSH_USERNAME, USER_GUYBRUSH_FULL_NAME, true); - display("Orange account", dummyAccount); + displayDumpable("Orange account", dummyAccount); guybrushShadowOrangeOid = getLinkRefOid(userAfter, RESOURCE_DUMMY_ORANGE_OID); PrismObject shadowOrange = getShadowModel(guybrushShadowOrangeOid); @@ -291,7 +291,7 @@ public void test204AssignAccountOrangeAgain() throws Exception { assertLinks(userAfter, 2); DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_GUYBRUSH_USERNAME, USER_GUYBRUSH_FULL_NAME, true); - display("Orange account", dummyAccount); + displayDumpable("Orange account", dummyAccount); guybrushShadowOrangeOid = getLinkRefOid(userAfter, RESOURCE_DUMMY_ORANGE_OID); PrismObject shadowOrange = getShadowModel(guybrushShadowOrangeOid); @@ -334,7 +334,7 @@ public void test209ModifyAccountOrangeGossipRemove() throws Exception { assertLinks(userAfter, 2); DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_GUYBRUSH_USERNAME, USER_GUYBRUSH_FULL_NAME, true); - display("Orange account", dummyAccount); + displayDumpable("Orange account", dummyAccount); guybrushShadowOrangeOid = getLinkRefOid(userAfter, RESOURCE_DUMMY_ORANGE_OID); PrismObject shadowOrange = getShadowModel(guybrushShadowOrangeOid); @@ -382,7 +382,7 @@ public void test210ModifyAccountOrangeQuoteMonkey() throws Exception { PrismAsserts.assertPropertyValue(userAfter, getExtensionPath(PIRACY_TALES), "Look behind you, a Three-Headed Monkey!"); DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_GUYBRUSH_USERNAME, USER_GUYBRUSH_FULL_NAME, true); - display("Orange account", dummyAccount); + displayDumpable("Orange account", dummyAccount); guybrushShadowOrangeOid = getLinkRefOid(userAfter, RESOURCE_DUMMY_ORANGE_OID); PrismObject shadowOrange = getShadowModel(guybrushShadowOrangeOid); @@ -430,7 +430,7 @@ public void test211ModifyAccountOrangeQuotePirate() throws Exception { PrismAsserts.assertPropertyValue(userAfter, getExtensionPath(PIRACY_TALES), "I wanna be a pirrrrrrate!"); DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_GUYBRUSH_USERNAME, USER_GUYBRUSH_FULL_NAME, true); - display("Orange account", dummyAccount); + displayDumpable("Orange account", dummyAccount); guybrushShadowOrangeOid = getLinkRefOid(userAfter, RESOURCE_DUMMY_ORANGE_OID); PrismObject shadowOrange = getShadowModel(guybrushShadowOrangeOid); @@ -475,7 +475,7 @@ public void test214ModifyAccountOrangeQuoteWoodchuck() throws Exception { assertLinks(userAfter, 2); DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_GUYBRUSH_USERNAME, USER_GUYBRUSH_FULL_NAME, true); - display("Orange account", dummyAccount); + displayDumpable("Orange account", dummyAccount); guybrushShadowOrangeOid = getLinkRefOid(userAfter, RESOURCE_DUMMY_ORANGE_OID); PrismObject shadowOrange = getShadowModel(guybrushShadowOrangeOid); @@ -517,7 +517,7 @@ public void test250UnlinkAccountDefaultDummy() throws Exception { assertLinks(userAfter, 1); DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_GUYBRUSH_USERNAME, USER_GUYBRUSH_FULL_NAME, true); - display("Orange account", dummyAccount); + displayDumpable("Orange account", dummyAccount); guybrushShadowOrangeOid = getLinkRefOid(userAfter, RESOURCE_DUMMY_ORANGE_OID); PrismObject shadowOrange = getShadowModel(guybrushShadowOrangeOid); @@ -542,7 +542,7 @@ public void test252ModifyAccountOrangeGossipRecon() throws Exception { DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_GUYBRUSH_USERNAME); dummyAccountBefore.replaceAttributeValue(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_GOSSIP_NAME, ROLE_THIEF_OID); - display("Account orange before", dummyAccountBefore); + displayDumpable("Account orange before", dummyAccountBefore); // WHEN reconcileUser(USER_GUYBRUSH_OID, task, result); @@ -561,7 +561,7 @@ public void test252ModifyAccountOrangeGossipRecon() throws Exception { assertLinks(userAfter, 1); DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_GUYBRUSH_USERNAME, USER_GUYBRUSH_FULL_NAME, true); - display("Orange account", dummyAccount); + displayDumpable("Orange account", dummyAccount); guybrushShadowOrangeOid = getLinkRefOid(userAfter, RESOURCE_DUMMY_ORANGE_OID); PrismObject shadowOrange = getShadowModel(guybrushShadowOrangeOid); @@ -584,7 +584,7 @@ public void test259ModifyAccountOrangeGossipRemoveRecon() throws Exception { DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_GUYBRUSH_USERNAME); dummyAccountBefore.replaceAttributeValues(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_GOSSIP_NAME /* no value */); - display("Account orange before", dummyAccountBefore); + displayDumpable("Account orange before", dummyAccountBefore); // WHEN reconcileUser(USER_GUYBRUSH_OID, task, result); @@ -605,7 +605,7 @@ public void test259ModifyAccountOrangeGossipRemoveRecon() throws Exception { assertLinks(userAfter, 1); DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_GUYBRUSH_USERNAME, USER_GUYBRUSH_FULL_NAME, true); - display("Orange account", dummyAccount); + displayDumpable("Orange account", dummyAccount); guybrushShadowOrangeOid = getLinkRefOid(userAfter, RESOURCE_DUMMY_ORANGE_OID); PrismObject shadowOrange = getShadowModel(guybrushShadowOrangeOid); @@ -630,7 +630,7 @@ public void test260ModifyAccountOrangeQuoteMonkeyRecon() throws Exception { DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_GUYBRUSH_USERNAME); dummyAccountBefore.replaceAttributeValues(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_QUOTE_NAME, "Look behind you, a Three-Headed Monkey!"); - display("Account orange before", dummyAccountBefore); + displayDumpable("Account orange before", dummyAccountBefore); // WHEN reconcileUser(USER_GUYBRUSH_OID, task, result); @@ -657,7 +657,7 @@ public void test260ModifyAccountOrangeQuoteMonkeyRecon() throws Exception { assertLinks(userAfter, 1); DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_GUYBRUSH_USERNAME, USER_GUYBRUSH_FULL_NAME, true); - display("Orange account", dummyAccount); + displayDumpable("Orange account", dummyAccount); guybrushShadowOrangeOid = getLinkRefOid(userAfter, RESOURCE_DUMMY_ORANGE_OID); PrismObject shadowOrange = getShadowModel(guybrushShadowOrangeOid); @@ -681,7 +681,7 @@ public void test261ModifyAccountOrangeQuotePirateRecon() throws Exception { DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_GUYBRUSH_USERNAME); dummyAccountBefore.replaceAttributeValues(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_QUOTE_NAME, "I wanna be a pirrrrrrate!"); - display("Account orange before", dummyAccountBefore); + displayDumpable("Account orange before", dummyAccountBefore); // WHEN reconcileUser(USER_GUYBRUSH_OID, task, result); @@ -703,8 +703,8 @@ public void test261ModifyAccountOrangeQuotePirateRecon() throws Exception { assertLinks(userAfter, 1); DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_GUYBRUSH_USERNAME, USER_GUYBRUSH_FULL_NAME, true); - display("Account orange after", dummyAccount); - display("Orange account", dummyAccount); + displayDumpable("Account orange after", dummyAccount); + displayDumpable("Orange account", dummyAccount); guybrushShadowOrangeOid = getLinkRefOid(userAfter, RESOURCE_DUMMY_ORANGE_OID); PrismObject shadowOrange = getShadowModel(guybrushShadowOrangeOid); @@ -728,7 +728,7 @@ public void test264ModifyAccountOrangeQuoteWoodchuckRecon() throws Exception { DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_GUYBRUSH_USERNAME); dummyAccountBefore.replaceAttributeValues(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_QUOTE_NAME, "How much wood could a woodchuck chuck if a woodchuck could chuck wood?"); - display("Account orange before", dummyAccountBefore); + displayDumpable("Account orange before", dummyAccountBefore); // WHEN when(); @@ -751,7 +751,7 @@ public void test264ModifyAccountOrangeQuoteWoodchuckRecon() throws Exception { assertLinks(userAfter, 1); DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_GUYBRUSH_USERNAME, USER_GUYBRUSH_FULL_NAME, true); - display("Orange account", dummyAccount); + displayDumpable("Orange account", dummyAccount); guybrushShadowOrangeOid = getLinkRefOid(userAfter, RESOURCE_DUMMY_ORANGE_OID); PrismObject shadowOrange = getShadowModel(guybrushShadowOrangeOid); @@ -772,7 +772,7 @@ public void test297ModifyAccountOrangeGossipRecon() throws Exception { DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_GUYBRUSH_USERNAME); dummyAccountBefore.replaceAttributeValues(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_GOSSIP_NAME /* no value */); - display("Account orange before", dummyAccountBefore); + displayDumpable("Account orange before", dummyAccountBefore); // WHEN when(); @@ -793,7 +793,7 @@ public void test297ModifyAccountOrangeGossipRecon() throws Exception { assertLinks(userAfter, 1); DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_ORANGE_NAME, USER_GUYBRUSH_USERNAME, USER_GUYBRUSH_FULL_NAME, true); - display("Orange account", dummyAccount); + displayDumpable("Orange account", dummyAccount); guybrushShadowOrangeOid = getLinkRefOid(userAfter, RESOURCE_DUMMY_ORANGE_OID); PrismObject shadowOrange = getShadowModel(guybrushShadowOrangeOid); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIntent.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIntent.java index ac36a94e82d..0e00889ec23 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIntent.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIntent.java @@ -92,7 +92,7 @@ public void test131ModifyUserJackAssignAccountDefault() throws Exception { assertDefaultDummyAccount("jack", "Jack Sparrow", true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -162,7 +162,7 @@ public void test132ModifyUserJackAssignAccountTest() throws Exception { assertDefaultDummyGroupMember(GROUP_DUMMY_TESTERS_NAME, "T"+ACCOUNT_JACK_DUMMY_USERNAME); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -221,7 +221,7 @@ public void test135ModifyUserJackFullName() throws Exception { assertDefaultDummyAccount("T"+ACCOUNT_JACK_DUMMY_USERNAME, "cpt. Jack Sparrow (test)", true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -275,7 +275,7 @@ public void test147ModifyUserJackUnAssignAccountDefault() throws Exception { assertNoDummyAccount(ACCOUNT_JACK_DUMMY_USERNAME); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -319,7 +319,7 @@ public void test149ModifyUserJackUnassignAccountTest() throws Exception { assertNoDummyAccount("T"+ACCOUNT_JACK_DUMMY_USERNAME); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java index 381c6b3c799..e191a4fe2a0 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java @@ -231,7 +231,7 @@ public void test100JackAssignAccountDummyConflicting() throws Exception { assertDefaultDummyAccount(ACCOUNT_JACK_DUMMY_USERNAME, "Jack Sparrow", true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -309,7 +309,7 @@ public void test200JackAssignAccountDummyPinkConflicting() throws Exception { assertDummyAccount(RESOURCE_DUMMY_PINK_NAME, "jack1", "Jack Sparrow", true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -361,7 +361,7 @@ public void test210GuybrushAssignAccountDummyPink() throws Exception { assertDummyAccount(RESOURCE_DUMMY_PINK_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, "Guybrush Threepwood", true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -426,7 +426,7 @@ public void test220DeWattAssignAccountDummyPinkCaseIgnore() throws Exception { assertDummyAccount(RESOURCE_DUMMY_PINK_NAME, USER_DEWATT_NAME + "1", "Augustus DeWatt", true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -569,7 +569,7 @@ public void test240LargoAssignAccountDummyConflictingNoShadow() throws Exception // Check audit // USER Largo MODIFY(add-assignment): request + execution (focus(assignment) + account/failed) + execution (focus(linkRef) / account/OK) - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(3); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -634,7 +634,7 @@ public void test260JupiterConflictNoShadowSyncBack() throws Exception { assertDummyAccount(RESOURCE_DUMMY_FUCHSIA_NAME, ACCOUNT_JUPITER_DUMMY_FUCHSIA_USERNAME, null, true); // TODO Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); } // remove the assignment, shadow and account to prepare for following tests @@ -672,7 +672,7 @@ protected void cleanUpJupiter() assertNull("Unexpected account for jupiter", getDummyAccount(RESOURCE_DUMMY_FUCHSIA_NAME, ACCOUNT_JUPITER_DUMMY_FUCHSIA_USERNAME)); // TODO Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); } /** @@ -720,7 +720,7 @@ public void test264JupiterConflictNoShadowSyncBackSeparate() throws Exception { assertDummyAccount(RESOURCE_DUMMY_FUCHSIA_NAME, ACCOUNT_JUPITER_DUMMY_FUCHSIA_USERNAME, null, true); // TODO Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); } // remove the assignment, shadow and account to prepare for following tests @@ -795,7 +795,7 @@ public void test270JupiterConflictOtherNoShadowSyncBack() throws Exception { assertDummyAccountAttribute(RESOURCE_DUMMY_FUCHSIA_NAME, "Jupiter Jones", DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_AD_SAM_ACCOUNT_NAME_NAME, "jupiter0"); // TODO Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); } private void assertUserJupiter(PrismObject user) { @@ -1037,7 +1037,7 @@ public void test300JackAssignAccountDummyVioletConflicting() throws Exception { assertDummyAccount(RESOURCE_DUMMY_VIOLET_NAME, "jack.1", "Jack Sparrow", true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1091,7 +1091,7 @@ public void test350GuybrushAssignAccountDummyViolet() throws Exception { assertDummyAccount(RESOURCE_DUMMY_VIOLET_NAME, "guybrush.3", "Guybrush Threepwood", true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1148,7 +1148,7 @@ public void test360HermanAssignAccountDummyViolet() throws Exception { assertDummyAccount(RESOURCE_DUMMY_VIOLET_NAME, "herman.1", "Herman Toothrot", true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1242,7 +1242,7 @@ public void test500JackAssignAccountDummyMagenta() throws Exception { PrismTestUtil.createPolyString(DESCRIPTION_RUM)); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(3); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1319,7 +1319,7 @@ public void test510DrakeAssignAccountDummyMagenta() throws Exception { PrismTestUtil.createPolyString(DESCRIPTION_RUM + " -- Francis Drake")); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(3); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1380,7 +1380,7 @@ public void test520DrakeModifyLocality() throws Exception { PrismTestUtil.createPolyString(DESCRIPTION_RUM + " -- Francis Drake")); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1443,7 +1443,7 @@ public void test530GuybrushAssignAccountDummyMagenta() throws Exception { assertDummyAccount(RESOURCE_DUMMY_MAGENTA_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, "Guybrush Threepwood", true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1509,7 +1509,7 @@ public void test532GuybrushModifyDescription() throws Exception { PrismTestUtil.createPolyString(DESCRIPTION_RUM + " -- Guybrush Threepwood")); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(3); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1568,7 +1568,7 @@ public void test600JackRename() throws Exception { PrismTestUtil.createPolyString(DESCRIPTION_RUM)); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java index 5d17a039583..b6f42c28c4f 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java @@ -110,7 +110,7 @@ public void test100MergeJackGuybrushPreviewDelta() throws Exception { result.computeStatus(); TestUtil.assertSuccess(result); - display("Deltas", deltas); + displayDumpable("Deltas", deltas); ObjectDelta leftObjectdelta = deltas.getLeftObjectDelta(); PrismAsserts.assertIsModify(leftObjectdelta); @@ -218,7 +218,7 @@ public void test110MergeGuybrushJackPreviewDelta() throws Exception { result.computeStatus(); TestUtil.assertSuccess(result); - display("Deltas", deltas); + displayDumpable("Deltas", deltas); ObjectDelta delta = deltas.getLeftObjectDelta(); PrismAsserts.assertIsModify(delta); @@ -320,7 +320,7 @@ public void test200MergeJackGuybrushExpressionPreviewDelta() throws Exception { result.computeStatus(); TestUtil.assertSuccess(result); - display("Deltas", deltas); + displayDumpable("Deltas", deltas); ObjectDelta delta = deltas.getLeftObjectDelta(); PrismAsserts.assertIsModify(delta); @@ -418,7 +418,7 @@ public void test300MergeJackGuybrushPreviewDeltaDefaultSpecific() throws Excepti result.computeStatus(); TestUtil.assertSuccess(result); - display("Deltas", deltas); + displayDumpable("Deltas", deltas); ObjectDelta leftObjectdelta = deltas.getLeftObjectDelta(); PrismAsserts.assertIsModify(leftObjectdelta); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java index 947b02b96f5..69c5b06017b 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java @@ -237,12 +237,12 @@ public void test100ModifyUserAddAccount() throws Exception { // Check account in dummy resource DummyAccount dummyAccount = assertDefaultDummyAccount("jack", "Jack Sparrow", true); - display("dummyAccount after", dummyAccount); + displayDumpable("dummyAccount after", dummyAccount); assertDummyScriptsAdd(userAfter, accountModel, getDummyResourceType()); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -291,11 +291,11 @@ public void test101GetAccount() throws Exception { // THEN display("Account", account); - display("Account def", account.getDefinition()); + displayDumpable("Account def", account.getDefinition()); assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 1); PrismContainer accountContainer = account.findContainer(ShadowType.F_ATTRIBUTES); - display("Account attributes def", accountContainer.getDefinition()); - display("Account attributes def complex type def", accountContainer.getDefinition().getComplexTypeDefinition()); + displayDumpable("Account attributes def", accountContainer.getDefinition()); + displayDumpable("Account attributes def complex type def", accountContainer.getDefinition().getComplexTypeDefinition()); assertDummyAccountShadowModel(account, accountJackOid, "jack", "Jack Sparrow"); assertSuccess("getObject result", result); @@ -319,7 +319,7 @@ public void test101GetAccount() throws Exception { ResourceAttribute fullNameAttr = attributesContainer.findAttribute(dummyResourceCtl.getAttributeFullnameQName()); PrismAsserts.assertPropertyValue(fullNameAttr, ACCOUNT_JACK_DUMMY_FULLNAME); ResourceAttributeDefinition fullNameAttrDef = fullNameAttr.getDefinition(); - display("attribute fullname definition", fullNameAttrDef); + displayDumpable("attribute fullname definition", fullNameAttrDef); PrismAsserts.assertDefinition(fullNameAttrDef, dummyResourceCtl.getAttributeFullnameQName(), DOMUtil.XSD_STRING, 1, 1); // MID-3144 @@ -345,11 +345,11 @@ public void test102GetAccountNoFetch() throws Exception { PrismObject account = modelService.getObject(ShadowType.class, accountJackOid, options, task, result); display("Account", account); - display("Account def", account.getDefinition()); + displayDumpable("Account def", account.getDefinition()); assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 0); PrismContainer accountContainer = account.findContainer(ShadowType.F_ATTRIBUTES); - display("Account attributes def", accountContainer.getDefinition()); - display("Account attributes def complex type def", accountContainer.getDefinition().getComplexTypeDefinition()); + displayDumpable("Account attributes def", accountContainer.getDefinition()); + displayDumpable("Account attributes def complex type def", accountContainer.getDefinition().getComplexTypeDefinition()); assertDummyAccountShadowRepo(account, accountJackOid, "jack"); assertSuccess("getObject result", result); @@ -371,11 +371,11 @@ public void test103GetAccountRaw() throws Exception { PrismObject account = modelService.getObject(ShadowType.class, accountJackOid, options, task, result); display("Account", account); - display("Account def", account.getDefinition()); + displayDumpable("Account def", account.getDefinition()); assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 0); PrismContainer accountContainer = account.findContainer(ShadowType.F_ATTRIBUTES); - display("Account attributes def", accountContainer.getDefinition()); - display("Account attributes def complex type def", accountContainer.getDefinition().getComplexTypeDefinition()); + displayDumpable("Account attributes def", accountContainer.getDefinition()); + displayDumpable("Account attributes def complex type def", accountContainer.getDefinition().getComplexTypeDefinition()); assertDummyAccountShadowRepo(account, accountJackOid, "jack"); assertSuccess("getObject result", result); @@ -477,7 +477,7 @@ public void test108ModifyUserAddAccountAgain() throws Exception { assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 0); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -525,7 +525,7 @@ public void test109ModifyUserAddAccountAgain() throws Exception { assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 0); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -699,7 +699,7 @@ public void test119ModifyUserDeleteAccount() throws Exception { assertDummyScriptsDelete(); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -775,7 +775,7 @@ public void test120AddAccount() throws Exception { assertDummyScriptsAdd(null, accountModel, getDummyResourceType()); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -842,7 +842,7 @@ public void test121ModifyUserAddAccountRef() throws Exception { assertDefaultDummyAccount("jack", "Jack Sparrow", true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -908,7 +908,7 @@ public void test128ModifyUserDeleteAccountRef() throws Exception { assertDefaultDummyAccount("jack", "Jack Sparrow", true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -964,7 +964,7 @@ public void test129DeleteAccount() throws Exception { assertDummyScriptsDelete(); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1083,7 +1083,7 @@ public void test131ModifyUserJackAssignAccount() throws Exception { assertDummyScriptsAdd(userAfter, accountModel, getDummyResourceType()); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1165,7 +1165,7 @@ public void test132ModifyAccountJackDummy() throws Exception { assertDummyScriptsModify(userJack); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(3); dummyAuditService.assertAnyRequestDeltas(); @@ -1239,7 +1239,7 @@ public void test135ModifyUserJackAssignAccountAgain() throws Exception { "Queen Anne's Revenge"); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1303,7 +1303,7 @@ public void test136JackRecomputeNoChange() throws Exception { "Queen Anne's Revenge"); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(0); dummyAuditService.assertSimpleRecordSanity(); @@ -1354,7 +1354,7 @@ public void test139ModifyUserJackUnassignAccount() throws Exception { assertDummyScriptsDelete(); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -1432,7 +1432,7 @@ public void test141ModifyUserJackAssignAccountPositiveEnforcement() throws Excep assertDummyScriptsAdd(userJack, accountModel, getDummyResourceType()); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1517,7 +1517,7 @@ public void test148ModifyUserJackUnassignAccountPositiveEnforcement() throws Exc assertNoProvisioningScripts(); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1596,7 +1596,7 @@ public void test149ModifyUserJackDeleteAccount() throws Exception { assertDummyScriptsDelete(); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -1673,7 +1673,7 @@ public void test151ModifyUserJackAssignAccountRelativeEnforcement() throws Excep assertDummyScriptsAdd(userJack, accountModel, getDummyResourceType()); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1734,7 +1734,7 @@ public void test158ModifyUserJackUnassignAccountRelativeEnforcement() throws Exc assertDummyScriptsDelete(); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -1798,7 +1798,7 @@ public void test161ModifyUserJackAssignAccountNoneEnforcement() throws Exception assertDummyProvisioningScriptsNone(); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -1838,7 +1838,7 @@ public void test163ModifyUserJackAddAccountNoneEnforcement() throws Exception { ReferenceDelta accountDelta = prismContext.deltaFactory().reference() .createModificationAdd(UserType.F_LINK_REF, getUserDefinition(), accountRefVal); userDelta.addModification(accountDelta); - Collection> deltas = (Collection) MiscUtil.createCollection(userDelta); + Collection> deltas = MiscUtil.createCollection(userDelta); dummyAuditService.clear(); dummyTransport.clearMessages(); @@ -1876,7 +1876,7 @@ public void test163ModifyUserJackAddAccountNoneEnforcement() throws Exception { assertDummyScriptsAdd(userJack, accountModel, getDummyResourceType()); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1941,7 +1941,7 @@ public void test164ModifyUserJackUnassignAccountNoneEnforcement() throws Excepti assertDummyProvisioningScriptsNone(); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2005,7 +2005,7 @@ public void test169ModifyUserJackDeleteAccountNoneEnforcement() throws Exception assertDummyScriptsDelete(); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -2045,7 +2045,7 @@ public void test180ModifyUserAddAccountFullEnforcement() throws Exception { accountRefVal.setObject(account); ReferenceDelta accountDelta = prismContext.deltaFactory().reference().createModificationAdd(UserType.F_LINK_REF, getUserDefinition(), accountRefVal); userDelta.addModification(accountDelta); - Collection> deltas = (Collection) MiscUtil.createCollection(userDelta); + Collection> deltas = MiscUtil.createCollection(userDelta); try { @@ -2076,7 +2076,7 @@ public void test180ModifyUserAddAccountFullEnforcement() throws Exception { assertNoProvisioningScripts(); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2102,7 +2102,7 @@ public void test182ModifyUserAddAndAssignAccountPositiveEnforcement() throws Exc accountRefVal.setObject(account); ReferenceDelta accountDelta = prismContext.deltaFactory().reference().createModificationAdd(UserType.F_LINK_REF, getUserDefinition(), accountRefVal); userDelta.addModification(accountDelta); - Collection> deltas = (Collection) MiscUtil.createCollection(userDelta); + Collection> deltas = MiscUtil.createCollection(userDelta); XMLGregorianCalendar startTime = clock.currentTimeXMLGregorianCalendar(); @@ -2144,7 +2144,7 @@ public void test182ModifyUserAddAndAssignAccountPositiveEnforcement() throws Exc assertDummyScriptsAdd(userJack, accountModel, getDummyResourceType()); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2200,7 +2200,7 @@ public void test189ModifyUserJackUnassignAndDeleteAccount() throws Exception { assertDummyScriptsDelete(); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -2273,7 +2273,7 @@ public void test190ModifyUserJackAssignAccountAndModify() throws Exception { assertDummyScriptsAdd(userJack, accountModel, getDummyResourceType()); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2395,7 +2395,7 @@ public void test191ModifyUserJackModifyAssignment() throws Exception { assertDummyScriptsModify(userJack, true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2448,7 +2448,7 @@ public void test192ModifyUserJack() throws Exception { assertDummyScriptsModify(userAfter); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2516,7 +2516,7 @@ public void test193ModifyUserJackLocationEmpty() throws Exception { assertDummyScriptsModify(userAfter); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2567,7 +2567,7 @@ public void test194ModifyUserJackLocationNull() throws Exception { assertNoProvisioningScripts(); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); // This should fail even before the request record is created dummyAuditService.assertRecords(0); @@ -2612,7 +2612,7 @@ public void test195ModifyUserJackLocationSea() throws Exception { assertDummyScriptsModify(userAfter); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2650,7 +2650,7 @@ public void test198ModifyUserJackRaw() throws Exception { ObjectDelta objectDelta = createModifyUserReplaceDelta(USER_JACK_OID, UserType.F_FULL_NAME, PrismTestUtil.createPolyString("Marvelous Captain Jack Sparrow")); - Collection> deltas = (Collection) MiscUtil.createCollection(objectDelta); + Collection> deltas = MiscUtil.createCollection(objectDelta); // WHEN modelService.executeChanges(deltas, ModelExecuteOptions.createRaw(), task, result); @@ -2680,7 +2680,7 @@ public void test198ModifyUserJackRaw() throws Exception { assertNoProvisioningScripts(); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2729,7 +2729,7 @@ public void test199DeleteUserJack() throws Exception { assertDummyScriptsDelete(); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2808,7 +2808,7 @@ public void test200AddUserBlackbeardWithAccount() throws Exception { assertDummyScriptsAdd(userBlackbeard, accountModel, getDummyResourceType()); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -2891,7 +2891,7 @@ public void test210AddUserMorganWithAssignment() throws Exception { assertDummyScriptsAdd(userMorgan, accountModel, getDummyResourceType()); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2958,7 +2958,7 @@ public void test212RenameUserMorgan() throws Exception { assertDummyScriptsModify(userMorgan); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -3026,7 +3026,7 @@ public void test240AddUserCharlesRaw() throws Exception { assertNoProvisioningScripts(); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -3066,7 +3066,7 @@ public void test241DeleteUserCharlesRaw() throws Exception { assertNoProvisioningScripts(); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -3127,7 +3127,7 @@ public void test300AddUserJackWithAssignmentBlue() throws Exception { assertDummyAccount(RESOURCE_DUMMY_BLUE_NAME, USER_JACK_USERNAME, USER_JACK_FULL_NAME, true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -3192,7 +3192,7 @@ accountJackBlueOid, getDummyResourceController(RESOURCE_DUMMY_BLUE_NAME).getAttr assertDummyAccount(RESOURCE_DUMMY_BLUE_NAME, USER_JACK_USERNAME, "Cpt. Jack Sparrow", true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java index 907a9d7a0d8..1e292e506c0 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java @@ -177,7 +177,7 @@ public void test100ModifyUserAddAccount() throws Exception { notificationManager.setDisabled(true); // Check notifications - display("Dummy transport messages", dummyTransport); + displayDumpable("Dummy transport messages", dummyTransport); checkDummyTransportMessages("accountPasswordNotifier", 1); checkDummyTransportMessages("userPasswordNotifier", 0); @@ -263,7 +263,7 @@ public void test119ModifyUserDeleteAccount() throws Exception { assertNoDummyAccount("jack"); // Check notifications - display("Notifications", dummyTransport); + displayDumpable("Notifications", dummyTransport); notificationManager.setDisabled(true); checkDummyTransportMessages("accountPasswordNotifier", 0); @@ -331,7 +331,7 @@ public void test131ModifyUserJackAssignAccount() throws Exception { assertDefaultDummyAccount("jack", "Jack Sparrow", true); // Check notifications - display("Notifications", dummyTransport); + displayDumpable("Notifications", dummyTransport); notificationManager.setDisabled(true); checkDummyTransportMessages("accountPasswordNotifier", 1); @@ -383,7 +383,7 @@ public void test140ModifyUserJackAssignRole() throws Exception { assertAssignments(userJack, 2); // Check notifications - display("Notifications", dummyTransport); + displayDumpable("Notifications", dummyTransport); notificationManager.setDisabled(true); checkDummyTransportMessages("accountPasswordNotifier", 0); @@ -438,7 +438,7 @@ public void test150ModifyUserJackModifyAssignment() throws Exception { assertUserJack(jackAfter); // Check notifications - display("Notifications", dummyTransport); + displayDumpable("Notifications", dummyTransport); notificationManager.setDisabled(true); checkDummyTransportMessages("accountPasswordNotifier", 0); @@ -497,7 +497,7 @@ public void test160ModifyUserJackDeleteAssignment() throws Exception { assertUserJack(jackAfter); // Check notifications - display("Notifications", dummyTransport); + displayDumpable("Notifications", dummyTransport); notificationManager.setDisabled(true); checkDummyTransportMessages("accountPasswordNotifier", 0); @@ -673,7 +673,7 @@ public void test400StringAttachment() throws Exception { TestUtil.assertSuccess("addObject result", result); // Check notifications - display("Notifications", dummyTransport); + displayDumpable("Notifications", dummyTransport); notificationManager.setDisabled(true); checkDummyTransportMessages("string-attachment", 1); @@ -707,7 +707,7 @@ public void test410ByteAttachment() throws Exception { TestUtil.assertSuccess("addObject result", result); // Check notifications - display("Notifications", dummyTransport); + displayDumpable("Notifications", dummyTransport); notificationManager.setDisabled(true); checkDummyTransportMessages("byte-attachment", 1); @@ -755,7 +755,7 @@ public void test420AttachmentFromFile() throws Exception { TestUtil.assertSuccess("addObject result", result); // Check notifications - display("Notifications", dummyTransport); + displayDumpable("Notifications", dummyTransport); notificationManager.setDisabled(true); checkDummyTransportMessages("attachment-from-file", 1); @@ -788,7 +788,7 @@ public void test430ExpressionAttachment() throws Exception { TestUtil.assertSuccess("addObject result", result); // Check notifications - display("Notifications", dummyTransport); + displayDumpable("Notifications", dummyTransport); notificationManager.setDisabled(true); checkDummyTransportMessages("expression-attachment", 1); @@ -822,7 +822,7 @@ public void test500RecomputeRole() throws Exception { TestUtil.assertSuccess("executeChanges result", result); // Check notifications - display("Notifications", dummyTransport); + displayDumpable("Notifications", dummyTransport); notificationManager.setDisabled(true); checkDummyTransportMessages("simpleRoleNotifier", 0); // MID-5350 (other asserts are just for sure) 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 a04e4c86439..a20ea2738e0 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 @@ -311,7 +311,7 @@ private void doPreview(Collection> deltas, ModelContext modelContext = modelInteractionService.previewChanges(deltas, new ModelExecuteOptions(), task, result); // THEN - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); checker.check(modelContext); assertSuccess(result); @@ -418,7 +418,7 @@ public void test150GetGuybrushRefinedObjectClassDef() throws Exception { // THEN assertSuccess(result); - display("Refined object class", rOCDef); + displayDumpable("Refined object class", rOCDef); assertNotNull("Null config", rOCDef); display("Password credentials outbound", rOCDef.getPasswordOutbound()); @@ -449,7 +449,7 @@ public void test200ModifyUserGuybrushDeleteAccount() throws Exception { // THEN then(); - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertNotNull("Null model context", modelContext); result.computeStatus(); @@ -490,7 +490,7 @@ public void test210GuybrushAddAccount() throws Exception { // THEN then(); - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertNotNull("Null model context", modelContext); result.computeStatus(); @@ -533,7 +533,7 @@ public void test212ModifyUserAddAccountRef() throws Exception { ACCOUNT_SHADOW_GUYBRUSH_OID); userDelta.addModification(accountDelta); Collection> deltas = MiscSchemaUtil.createCollection(userDelta); - display("Input deltas: ", userDelta); + displayDumpable("Input deltas: ", userDelta); // WHEN when(); @@ -541,7 +541,7 @@ public void test212ModifyUserAddAccountRef() throws Exception { // THEN then(); - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertNotNull("Null model context", modelContext); result.computeStatus(); @@ -626,7 +626,7 @@ public void test221PreviewJackAssignRolePirateReconcile() throws Exception { } private void assertPreviewJackAssignRolePirate(ModelContext modelContext) { - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertNotNull("Null model context", modelContext); ModelElementContext focusContext = modelContext.getFocusContext(); @@ -726,7 +726,7 @@ public void test230GuybrushAssignAccountDummy() throws Exception { .getOid(); DummyAccount dummyAccount = assertDummyAccount(null, USER_GUYBRUSH_USERNAME, USER_GUYBRUSH_FULL_NAME, true); - display("Dummy account after", dummyAccount); + displayDumpable("Dummy account after", dummyAccount); dummyAccount.addAttributeValue(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_TITLE_NAME, "Great Pirate"); } @@ -750,7 +750,7 @@ public void test231PreviewGuybrushModifyAccountFullName() throws Exception { // THEN then(); - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertNotNull("Null model context", modelContext); assertSuccess(result); @@ -801,7 +801,7 @@ public void test232PreviewGuybrushModifyAccountShip() throws Exception { // THEN then(); - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertNotNull("Null model context", modelContext); assertSuccess(result); @@ -850,7 +850,7 @@ public void test233PreviewGuybrushAddRolePirate() throws Exception { // THEN then(); - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertNotNull("Null model context", modelContext); assertSuccess(result); @@ -916,7 +916,7 @@ public void test234PreviewGuybrushAddRolePirateRecon() throws Exception { // THEN then(); - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertNotNull("Null model context", modelContext); assertSuccess(result); @@ -980,7 +980,7 @@ public void test236PreviewGuybrushAddRoleSailor() throws Exception { // THEN then(); - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertNotNull("Null model context", modelContext); result.computeStatus(); @@ -1031,7 +1031,7 @@ public void test238PreviewGuybrushAddRoleSailorOwner() throws Exception { // THEN then(); - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertNotNull("Null model context", modelContext); result.computeStatus(); @@ -1041,7 +1041,7 @@ public void test238PreviewGuybrushAddRoleSailorOwner() throws Exception { assertNotNull("Model focus context missing", focusContext); DeltaSetTriple> evaluatedAssignmentTriple = modelContext.getEvaluatedAssignmentTriple(); - display("evaluatedAssignmentTriple", evaluatedAssignmentTriple); + displayDumpable("evaluatedAssignmentTriple", evaluatedAssignmentTriple); assertEquals("Wrong # of evaluated assignments in plus set", 1, evaluatedAssignmentTriple.getPlusSet().size()); EvaluatedAssignment evaluatedAssignment = evaluatedAssignmentTriple.getPlusSet().iterator().next(); @@ -1089,7 +1089,7 @@ public void test240GuybrushAssignAccountDummyRelative() throws Exception { TestUtil.assertSuccess(result); DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_RELATIVE_NAME, USER_GUYBRUSH_USERNAME, USER_GUYBRUSH_FULL_NAME, true); - display("Dummy account after", dummyAccount); + displayDumpable("Dummy account after", dummyAccount); dummyAccount.addAttributeValue(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_TITLE_NAME, "Great Pirate"); } @@ -1115,7 +1115,7 @@ public void test242PreviewGuybrushAddRolePirateRelative() throws Exception { // THEN then(); - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertNotNull("Null model context", modelContext); result.computeStatus(); @@ -1180,7 +1180,7 @@ public void test244PreviewGuybrushAddRolePirateRelativeRecon() throws Exception // THEN then(); - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertNotNull("Null model context", modelContext); result.computeStatus(); @@ -1291,7 +1291,7 @@ ACCOUNT_SHADOW_ELAINE_DUMMY_OID, getDummyResourceObject(), DummyResourceContolle ModelContext modelContext = modelInteractionService.previewChanges(deltas, new ModelExecuteOptions(), task, result); // THEN - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertNotNull("Null model context", modelContext); result.computeStatus(); @@ -1345,7 +1345,7 @@ public void test301ModifyElaineAccountDummyDeleteAdd() throws Exception { ModelContext modelContext = modelInteractionService.previewChanges(deltas, new ModelExecuteOptions(), task, result); // THEN - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertNotNull("Null model context", modelContext); result.computeStatus(); @@ -1402,7 +1402,7 @@ ACCOUNT_SHADOW_ELAINE_DUMMY_RED_OID, getDummyResourceObject(RESOURCE_DUMMY_RED_N // THEN then(); - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertPartialError(result); } @@ -1429,7 +1429,7 @@ public void test401ModifyElaineAccountDummyRedDeleteAdd() throws Exception { // WHEN when(); ModelContext modelContext = modelInteractionService.previewChanges(deltas, new ModelExecuteOptions(), task, result); - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); // THEN then(); @@ -1458,7 +1458,7 @@ ACCOUNT_SHADOW_ELAINE_DUMMY_BLUE_OID, getDummyResourceObject(RESOURCE_DUMMY_BLUE ModelContext modelContext = modelInteractionService.previewChanges(deltas, new ModelExecuteOptions(), task, result); // THEN - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertNotNull("Null model context", modelContext); result.computeStatus(); @@ -1501,7 +1501,7 @@ public void test501ModifyElaineAccountDummyBlueDeleteAdd() throws Exception { OperationResult result = task.getResult(); assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); - display("elaine blue account before", getDummyAccount(RESOURCE_DUMMY_BLUE_NAME, ACCOUNT_ELAINE_DUMMY_BLUE_USERNAME)); + displayDumpable("elaine blue account before", getDummyAccount(RESOURCE_DUMMY_BLUE_NAME, ACCOUNT_ELAINE_DUMMY_BLUE_USERNAME)); ObjectDelta accountDelta = createModifyAccountShadowEmptyDelta(ACCOUNT_SHADOW_ELAINE_DUMMY_BLUE_OID); PropertyDelta fullnameDelta = createAttributeAddDelta(getDummyResourceObject(RESOURCE_DUMMY_BLUE_NAME), @@ -1515,7 +1515,7 @@ public void test501ModifyElaineAccountDummyBlueDeleteAdd() throws Exception { ModelContext modelContext = modelInteractionService.previewChanges(deltas, new ModelExecuteOptions(), task, result); // THEN - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertNotNull("Null model context", modelContext); result.computeStatus(); @@ -1573,7 +1573,7 @@ public void test600ModifyElaineUserDummyReplace() throws Exception { // THEN then(); - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertNotNull("Null model context", modelContext); result.computeStatus(); @@ -1674,7 +1674,7 @@ ACCOUNT_SHADOW_ELAINE_DUMMY_BLUE_OID, getDummyResourceObject(RESOURCE_DUMMY_BLUE // THEN then(); - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertNotNull("Null model context", modelContext); result.computeStatus(); @@ -1763,7 +1763,7 @@ public void test620AddUserCapsize() throws Exception { ModelContext modelContext = modelInteractionService.previewChanges(deltas, new ModelExecuteOptions(), task, result); // THEN - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertNotNull("Null model context", modelContext); assertSuccess(result); @@ -1850,7 +1850,7 @@ public void test630AddUserRogers() throws Exception { ModelContext modelContext = modelInteractionService.previewChanges(deltas, new ModelExecuteOptions(), task, result); // THEN - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertNotNull("Null model context", modelContext); result.computeStatus(); @@ -1946,7 +1946,7 @@ public void test700DisableElaineAccountTwoResources() throws Exception { ModelContext modelContext = modelInteractionService.previewChanges(deltas, new ModelExecuteOptions(), task, result); // THEN - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertNotNull("Null model context", modelContext); result.computeStatus(); @@ -2020,7 +2020,7 @@ public void test710PreviewGuybrushHavingRoleSailorOwner() throws Exception { // THEN then(); - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); assertNotNull("Null model context", modelContext); result.computeStatus(); @@ -2030,7 +2030,7 @@ public void test710PreviewGuybrushHavingRoleSailorOwner() throws Exception { assertNotNull("Model focus context missing", focusContext); DeltaSetTriple> evaluatedAssignmentTriple = modelContext.getEvaluatedAssignmentTriple(); - display("evaluatedAssignmentTriple", evaluatedAssignmentTriple); + displayDumpable("evaluatedAssignmentTriple", evaluatedAssignmentTriple); assertEquals("Wrong # of evaluated assignments in zero set", 1, evaluatedAssignmentTriple.getZeroSet().size()); EvaluatedAssignment evaluatedAssignment = evaluatedAssignmentTriple.getZeroSet().iterator().next(); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java index 865ef461b36..95856738987 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java @@ -711,7 +711,7 @@ private void assertResourceDummy(PrismObject resource, boolean exp private void assertDummyConfigurationContainerDefinition( PrismContainerDefinition configurationContainerDefinition, String desc) { - display("Dummy configuration container definition "+desc, configurationContainerDefinition); + displayDumpable("Dummy configuration container definition "+desc, configurationContainerDefinition); PrismContainerDefinition configurationPropertiesContainerDefinition = configurationContainerDefinition.findContainerDefinition(SchemaConstants.CONNECTOR_SCHEMA_CONFIGURATION_PROPERTIES_ELEMENT_QNAME); assertNotNull("No container definition for "+SchemaConstants.CONNECTOR_SCHEMA_CONFIGURATION_PROPERTIES_ELEMENT_QNAME+" "+desc, configurationPropertiesContainerDefinition); @@ -746,12 +746,12 @@ private void assertConfigurationPropertyDefinition(PrismPropertyDefinition propD private void assertResource(PrismObject resource, boolean expectSchema) { display("Resource", resource); - display("Resource def", resource.getDefinition()); + displayDumpable("Resource def", resource.getDefinition()); PrismContainer configurationContainer = resource.findContainer(ResourceType.F_CONNECTOR_CONFIGURATION); assertNotNull("No Resource connector configuration def", configurationContainer); PrismContainerDefinition configurationContainerDefinition = configurationContainer.getDefinition(); - display("Resource connector configuration def", configurationContainerDefinition); - display("Resource connector configuration def complex type def", configurationContainerDefinition.getComplexTypeDefinition()); + displayDumpable("Resource connector configuration def", configurationContainerDefinition); + displayDumpable("Resource connector configuration def complex type def", configurationContainerDefinition.getComplexTypeDefinition()); assertNotNull("Empty Resource connector configuration def", configurationContainer.isEmpty()); assertEquals("Wrong compile-time class in Resource connector configuration in "+resource, ConnectorConfigurationType.class, configurationContainer.getCompileTimeClass()); @@ -1009,7 +1009,7 @@ private void modifyConfigurationDiffExpressionRaw( assertNotNull(serializedModifiedResource); ObjectDelta diffDelta = resourceBefore.diff(modifiedResource, EquivalenceStrategy.LITERAL_IGNORE_METADATA); - display("Diff delta", diffDelta); + displayDumpable("Diff delta", diffDelta); // WHEN when(); @@ -1049,7 +1049,7 @@ private ObjectDelta createConfigurationPropertyDelta(QName element PropertyDelta propDelta = prismContext.deltaFactory().property().createModificationReplaceProperty(propPath, propDef, newValue); ObjectDelta resourceDelta = prismContext.deltaFactory().object() .createModifyDelta(RESOURCE_DUMMY_OID, propDelta, ResourceType.class); - display("Resource delta", resourceDelta); + displayDumpable("Resource delta", resourceDelta); return resourceDelta; } diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestScriptHooks.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestScriptHooks.java index e9a7533214f..0734bdd916a 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestScriptHooks.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestScriptHooks.java @@ -120,7 +120,7 @@ public void test100JackAssignHookAccount() throws Exception { StaticHookRecorder.assertInvocationCount("bar-user", 1); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java index 59aee222e6b..408d130b895 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java @@ -323,7 +323,7 @@ public void test100ModifyUserGuybrushAddAccountDummyRedNoAttributesConflict() th TestUtil.assertFailure("executeChanges result", result); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -387,7 +387,7 @@ public void test180DeleteHalfAssignmentFromUser() throws Exception { assertNoDummyAccount("otis"); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -437,7 +437,7 @@ public void test190DeleteHalfAssignedUser() throws Exception { assertNoDummyAccount("navigator"); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -479,7 +479,7 @@ public void test200ModifyUserJackBrokenAccountRefAndPolyString() throws Exceptio assertAccounts(USER_JACK_OID, 0); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -766,7 +766,7 @@ public void test301AddUserDeGhoulash() throws Exception { assertAccounts(USER_DEGHOULASH_OID, 0); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); 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 d7b9e567d10..671873a68c8 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 @@ -936,7 +936,7 @@ public void test160ModifyUserGivenNameAgain() throws Exception { PrismObject userJack = modelService.getObject(UserType.class, USER_JACK_OID, null, task, result); PrismAsserts.assertPropertyValue(userJack.findContainer(UserType.F_EXTENSION), PIRACY_BAD_LUCK, 123L); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -990,7 +990,7 @@ public void test162ModifyUserGivenNameAgainPhantomChange() throws Exception { PrismAsserts.assertPropertyValue(userJack.findContainer(UserType.F_EXTENSION), PIRACY_BAD_LUCK, 123L); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestVolatility.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestVolatility.java index e4608402da1..bb49ea4d9dc 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestVolatility.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestVolatility.java @@ -340,7 +340,7 @@ public void test400AddHerman() throws Exception { assertLinks(userAfter, 1); DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_MONSTERIZED_NAME, USER_HERMAN_USERNAME); - display("Dummy account", dummyAccount); + displayDumpable("Dummy account", dummyAccount); assertDummyAccountAttribute(RESOURCE_DUMMY_MONSTERIZED_NAME, USER_HERMAN_USERNAME, DummyAccount.ATTR_INTERESTS_NAME, "foo", "bar", DummyResource.VALUE_COOKIE); } @@ -372,7 +372,7 @@ public void test402ModifyHermanMonster() throws Exception { assertLinks(userAfter, 1); DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_MONSTERIZED_NAME, USER_HERMAN_USERNAME); - display("Dummy account", dummyAccount); + displayDumpable("Dummy account", dummyAccount); assertDummyAccountAttribute(RESOURCE_DUMMY_MONSTERIZED_NAME, USER_HERMAN_USERNAME, DummyAccount.ATTR_INTERESTS_NAME, "foo", "bar", DummyResource.VALUE_COOKIE, DummyResource.VALUE_MONSTER); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/archetypes/TestCollections.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/archetypes/TestCollections.java index b9d9a824cd2..153d2a915e0 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/archetypes/TestCollections.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/archetypes/TestCollections.java @@ -83,7 +83,7 @@ public void test100CompileCollectionView() throws Exception { // THEN then(); - display("Active users collection view", collectionViewActiveUsers); + displayDumpable("Active users collection view", collectionViewActiveUsers); assertSuccess(result); assertNotNull("Null view", collectionActiveUsers); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java index 2dbec11b5ac..a98a1d0f544 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java @@ -6,24 +6,12 @@ */ package com.evolveum.midpoint.model.intest.gensync; -import static java.util.Collections.singleton; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertNotNull; -import static org.testng.AssertJUnit.assertNull; -import static org.testng.AssertJUnit.assertTrue; +import static org.testng.AssertJUnit.*; import java.io.File; import java.util.Collection; import java.util.List; -import com.evolveum.midpoint.init.ConfigurablePrismContextFactory; -import com.evolveum.midpoint.prism.delta.DeltaFactory; -import com.evolveum.midpoint.prism.path.ItemName; -import com.evolveum.midpoint.prism.path.ItemPath; -import com.evolveum.midpoint.prism.path.UniformItemPath; -import com.evolveum.midpoint.schema.*; -import com.evolveum.midpoint.xml.ns._public.common.common_3.*; - import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ContextConfiguration; @@ -31,19 +19,15 @@ import org.testng.annotations.Test; import com.evolveum.midpoint.model.api.ModelExecuteOptions; -import com.evolveum.midpoint.prism.Containerable; -import com.evolveum.midpoint.prism.PrismContainer; -import com.evolveum.midpoint.prism.PrismContainerDefinition; -import com.evolveum.midpoint.prism.PrismContainerValue; -import com.evolveum.midpoint.prism.PrismObject; -import com.evolveum.midpoint.prism.PrismObjectDefinition; -import com.evolveum.midpoint.prism.PrismProperty; -import com.evolveum.midpoint.prism.PrismPropertyDefinition; -import com.evolveum.midpoint.prism.PrismReferenceValue; +import com.evolveum.midpoint.prism.*; +import com.evolveum.midpoint.prism.delta.DeltaFactory; import com.evolveum.midpoint.prism.delta.ObjectDelta; +import com.evolveum.midpoint.prism.path.ItemName; +import com.evolveum.midpoint.prism.path.ItemPath; import com.evolveum.midpoint.prism.polystring.PolyString; import com.evolveum.midpoint.prism.util.PrismAsserts; import com.evolveum.midpoint.prism.util.PrismTestUtil; +import com.evolveum.midpoint.schema.*; import com.evolveum.midpoint.schema.constants.SchemaConstants; import com.evolveum.midpoint.schema.processor.ResourceAttributeContainerDefinition; import com.evolveum.midpoint.schema.result.OperationResult; @@ -52,22 +36,16 @@ import com.evolveum.midpoint.test.IntegrationTestTools; import com.evolveum.midpoint.test.util.TestUtil; import com.evolveum.midpoint.util.Validator; -import com.evolveum.midpoint.util.exception.CommunicationException; -import com.evolveum.midpoint.util.exception.ConfigurationException; -import com.evolveum.midpoint.util.exception.ExpressionEvaluationException; -import com.evolveum.midpoint.util.exception.ObjectAlreadyExistsException; -import com.evolveum.midpoint.util.exception.ObjectNotFoundException; -import com.evolveum.midpoint.util.exception.SchemaException; -import com.evolveum.midpoint.util.exception.SecurityViolationException; +import com.evolveum.midpoint.util.exception.*; import com.evolveum.midpoint.xml.ns._public.common.api_types_3.ImportOptionsType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.*; import com.evolveum.prism.xml.ns._public.types_3.ProtectedStringType; /** * @author semancik - * */ @SuppressWarnings({ "SimplifiedTestNGAssertion", "SameParameterValue" }) -@ContextConfiguration(locations = {"classpath:ctx-model-intest-test-main.xml"}) +@ContextConfiguration(locations = { "classpath:ctx-model-intest-test-main.xml" }) @DirtiesContext(classMode = ClassMode.AFTER_CLASS) public class TestEditSchema extends AbstractGenericSyncTest { @@ -153,10 +131,10 @@ public void test110LookupLanguagesGetAll() throws Exception { then(); result.computeStatus(); TestUtil.assertSuccess(result); - checkLookupResult(lookup, new String[]{"en_US", "en", "English (US)"}, - new String[]{"en_PR", "en", "English (pirate)"}, - new String[]{"sk_SK", "sk", "Slovak"}, - new String[]{"tr_TR", "tr", "Turkish"}); + checkLookupResult(lookup, new String[] { "en_US", "en", "English (US)" }, + new String[] { "en_PR", "en", "English (pirate)" }, + new String[] { "sk_SK", "sk", "Slovak" }, + new String[] { "tr_TR", "tr", "Turkish" }); } @Test @@ -172,8 +150,8 @@ public void test120LookupLanguagesGetByKeyExact() throws Exception { GetOperationOptionsBuilder optionsBuilder = schemaHelper.getOperationOptionsBuilder() .item(LookupTableType.F_ROW) .retrieveQuery() - .item(LookupTableRowType.F_KEY) - .eq("sk_SK") + .item(LookupTableRowType.F_KEY) + .eq("sk_SK") .end(); PrismObject lookup = modelService.getObject(LookupTableType.class, LOOKUP_LANGUAGES_OID, optionsBuilder.build(), task, result); @@ -197,8 +175,8 @@ public void test121LookupLanguagesGetByKeyStartingWith() throws Exception { GetOperationOptionsBuilder optionsBuilder = schemaHelper.getOperationOptionsBuilder() .item(LookupTableType.F_ROW) .retrieveQuery() - .item(LookupTableRowType.F_KEY) - .startsWith("e") + .item(LookupTableRowType.F_KEY) + .startsWith("e") .end(); PrismObject lookup = modelService.getObject(LookupTableType.class, LOOKUP_LANGUAGES_OID, optionsBuilder.build(), task, result); @@ -206,8 +184,8 @@ public void test121LookupLanguagesGetByKeyStartingWith() throws Exception { then(); result.computeStatus(); TestUtil.assertSuccess(result); - checkLookupResult(lookup, new String[]{"en_US", "en", "English (US)"}, - new String[]{"en_PR", "en", "English (pirate)"}); + checkLookupResult(lookup, new String[] { "en_US", "en", "English (US)" }, + new String[] { "en_PR", "en", "English (pirate)" }); } @Test @@ -223,8 +201,8 @@ public void test122LookupLanguagesGetByKeyContaining() throws Exception { GetOperationOptionsBuilder optionsBuilder = schemaHelper.getOperationOptionsBuilder() .item(LookupTableType.F_ROW) .retrieveQuery() - .item(LookupTableRowType.F_KEY) - .contains("r") + .item(LookupTableRowType.F_KEY) + .contains("r") .end(); PrismObject lookup = modelService.getObject(LookupTableType.class, LOOKUP_LANGUAGES_OID, optionsBuilder.build(), task, result); @@ -232,7 +210,7 @@ public void test122LookupLanguagesGetByKeyContaining() throws Exception { then(); result.computeStatus(); TestUtil.assertSuccess(result); - checkLookupResult(lookup, new String[]{"tr_TR", "tr", "Turkish"}); + checkLookupResult(lookup, new String[] { "tr_TR", "tr", "Turkish" }); } @Test @@ -248,11 +226,11 @@ public void test123LookupLanguagesGetByKeyContainingWithPaging() throws Exceptio GetOperationOptionsBuilder optionsBuilder = schemaHelper.getOperationOptionsBuilder() .item(LookupTableType.F_ROW) .retrieveQuery() - .item(LookupTableRowType.F_KEY) - .contains("_") - .offset(2) - .maxSize(1) - .asc(LookupTableRowType.F_KEY) + .item(LookupTableRowType.F_KEY) + .contains("_") + .offset(2) + .maxSize(1) + .asc(LookupTableRowType.F_KEY) .end(); PrismObject lookup = modelService.getObject(LookupTableType.class, LOOKUP_LANGUAGES_OID, optionsBuilder.build(), task, result); @@ -276,8 +254,8 @@ public void test124LookupLanguagesGetByKeyContainingReturningNothing() throws Ex GetOperationOptionsBuilder optionsBuilder = schemaHelper.getOperationOptionsBuilder() .item(LookupTableType.F_ROW) .retrieveQuery() - .item(LookupTableRowType.F_KEY) - .contains("xyz") + .item(LookupTableRowType.F_KEY) + .contains("xyz") .end(); PrismObject lookup = modelService.getObject(LookupTableType.class, LOOKUP_LANGUAGES_OID, optionsBuilder.build(), task, result); @@ -308,8 +286,8 @@ public void test130LookupLanguagesGetByValueExact() throws Exception { GetOperationOptionsBuilder optionsBuilder = schemaHelper.getOperationOptionsBuilder() .item(LookupTableType.F_ROW) .retrieveQuery() - .item(LookupTableRowType.F_VALUE) - .eq("sk") + .item(LookupTableRowType.F_VALUE) + .eq("sk") .end(); PrismObject lookup = modelService.getObject(LookupTableType.class, LOOKUP_LANGUAGES_OID, optionsBuilder.build(), task, result); @@ -322,7 +300,6 @@ public void test130LookupLanguagesGetByValueExact() throws Exception { /** * Disabled because it's not clear how to treat polystrings in searches. - * */ @Test public void test131LookupLanguagesGetByLabelStartingWith() throws Exception { @@ -338,8 +315,8 @@ public void test131LookupLanguagesGetByLabelStartingWith() throws Exception { GetOperationOptionsBuilder optionsBuilder = schemaHelper.getOperationOptionsBuilder() .item(LookupTableType.F_ROW) .retrieveQuery() - .item(LookupTableRowType.F_LABEL) - .startsWith(fragment) + .item(LookupTableRowType.F_LABEL) + .startsWith(fragment) .end(); PrismObject lookup = modelService.getObject(LookupTableType.class, LOOKUP_LANGUAGES_OID, optionsBuilder.build(), task, result); @@ -347,8 +324,8 @@ public void test131LookupLanguagesGetByLabelStartingWith() throws Exception { then(); result.computeStatus(); TestUtil.assertSuccess(result); - checkLookupResult(lookup, new String[]{"en_US", "en", "English (US)"}, - new String[]{"en_PR", "en", "English (pirate)"}); + checkLookupResult(lookup, new String[] { "en_US", "en", "English (US)" }, + new String[] { "en_PR", "en", "English (pirate)" }); } @Test @@ -364,11 +341,11 @@ public void test133LookupLanguagesGetByValueContainingWithPaging() throws Except GetOperationOptionsBuilder optionsBuilder = schemaHelper.getOperationOptionsBuilder() .item(LookupTableType.F_ROW) .retrieveQuery() - .item(LookupTableRowType.F_VALUE) - .contains("n") - .offset(0) - .maxSize(1) - .desc(LookupTableRowType.F_LABEL) // using sorting key other than the one used in search + .item(LookupTableRowType.F_VALUE) + .contains("n") + .offset(0) + .maxSize(1) + .desc(LookupTableRowType.F_LABEL) // using sorting key other than the one used in search .end(); PrismObject lookup = modelService.getObject(LookupTableType.class, LOOKUP_LANGUAGES_OID, optionsBuilder.build(), task, result); @@ -404,7 +381,6 @@ public void test140LookupLanguagesGetByIdExisting() throws Exception { checkLookupResult(lookup, new String[] { "en_US", "en", "English (US)" }); } - private void checkLookupResult(PrismObject lookup, String[]... tuples) { IntegrationTestTools.display("Languages", lookup); @@ -420,7 +396,6 @@ private void checkLookupResult(PrismObject lookup, String[]... assertSteadyResources(); } - @Test public void test150LookupLanguagesAddRowFull() throws Exception { @@ -906,30 +881,29 @@ public void test182LookupLanguagesReimport() throws Exception { assertEquals("Wrong lang lookup name", "Languages", lookup.asObjectable().getName().getOrig()); - checkLookupResult(lookup, new String[]{"en_US", "en", "English (US)"}, - new String[]{"en_PR", "en", "English (pirate)"}, - new String[]{"sk_SK", "sk", "Slovak"}, - new String[]{"tr_TR", "tr", "Turkish"}); + checkLookupResult(lookup, new String[] { "en_US", "en", "English (US)" }, + new String[] { "en_PR", "en", "English (pirate)" }, + new String[] { "sk_SK", "sk", "Slovak" }, + new String[] { "tr_TR", "tr", "Turkish" }); assertSteadyResources(); } - private void assertLookupRow(PrismContainer tableContainer, String key, String value, String label) { - for (PrismContainerValue row: tableContainer.getValues()) { + for (PrismContainerValue row : tableContainer.getValues()) { LookupTableRowType rowType = row.asContainerable(); if (key.equals(rowType.getKey())) { - assertEquals("Wrong value for key "+key, value, rowType.getValue()); + assertEquals("Wrong value for key " + key, value, rowType.getValue()); if (label == null) { - assertNull("Unexpected label for key "+key+": "+rowType.getLabel(), rowType.getLabel()); + assertNull("Unexpected label for key " + key + ": " + rowType.getLabel(), rowType.getLabel()); } else { - assertEquals("Wrong label for key "+key, PrismTestUtil.createPolyStringType(label), rowType.getLabel()); + assertEquals("Wrong label for key " + key, PrismTestUtil.createPolyStringType(label), rowType.getLabel()); } return; } } - AssertJUnit.fail("Row with key '"+key+"' was not found in lookup table"); + AssertJUnit.fail("Row with key '" + key + "' was not found in lookup table"); } private PrismObject getLookupTableAll(String oid, Task task, OperationResult result) throws ObjectNotFoundException, SchemaException, SecurityViolationException, CommunicationException, ConfigurationException, ExpressionEvaluationException { @@ -952,7 +926,6 @@ public void test200EditSchemaUser() throws Exception { // THEN then(); - PrismAsserts.assertEmphasized(editDef, UserType.F_NAME, true); PrismAsserts.assertEmphasized(editDef, UserType.F_GIVEN_NAME, false); PrismAsserts.assertEmphasized(editDef, UserType.F_FAMILY_NAME, true); @@ -968,7 +941,7 @@ public void test200EditSchemaUser() throws Exception { PrismPropertyDefinition costCenterDef = editDef.findPropertyDefinition(UserType.F_COST_CENTER); assertNotNull("No definition for costCenter in user", costCenterDef); - assertEquals("Wrong costCenter displayOrder", (Integer)123, costCenterDef.getDisplayOrder()); + assertEquals("Wrong costCenter displayOrder", (Integer) 123, costCenterDef.getDisplayOrder()); assertTrue("costCenter not readable", costCenterDef.canRead()); PrismAsserts.assertEmphasized(costCenterDef, true); FormItemValidationType validationAnnotation = costCenterDef.getAnnotation(ItemRefinedDefinitionType.F_VALIDATION); @@ -1005,7 +978,7 @@ public void test200EditSchemaUser() throws Exception { ItemPath passwordValPath = ItemPath.create(UserType.F_CREDENTIALS, CredentialsType.F_PASSWORD, PasswordType.F_VALUE); PrismPropertyDefinition passwordValDef = editDef.findPropertyDefinition(passwordValPath); - assertNotNull("No definition for "+passwordValPath+" in user", passwordValDef); + assertNotNull("No definition for " + passwordValPath + " in user", passwordValDef); assertTrue("Password not readable", passwordValDef.canRead()); assertSteadyResources(); @@ -1033,10 +1006,9 @@ public void test210UserDefinition() throws Exception { assertTrue("additionalName not readable", propDef.canRead()); }, PrismTestUtil.createPolyString("Jackie")); - assertPropertyValues(user, UserType.F_COST_CENTER, (Validator>) (propDef, name) -> { assertNotNull("No definition for costCenter in user", propDef); - assertEquals("Wrong costCenter displayOrder", (Integer)123, propDef.getDisplayOrder()); + assertEquals("Wrong costCenter displayOrder", (Integer) 123, propDef.getDisplayOrder()); assertTrue("costCenter not readable", propDef.canRead()); }); @@ -1051,12 +1023,12 @@ public void test210UserDefinition() throws Exception { }); assertContainer(user, UserType.F_CREDENTIALS, (credentialsDef, name) -> { - assertNotNull("No definition for credentials in user", credentialsDef); - assertTrue("Credentials not readable", credentialsDef.canRead()); - }, true); + assertNotNull("No definition for credentials in user", credentialsDef); + assertTrue("Credentials not readable", credentialsDef.canRead()); + }, true); assertProperty(user, ItemPath.create(UserType.F_CREDENTIALS, CredentialsType.F_PASSWORD, PasswordType.F_VALUE), - (propDef, name) -> assertTrue("Password not readable", propDef.canRead())); + (propDef, name) -> assertTrue("Password not readable", propDef.canRead())); assertSteadyResources(); } @@ -1099,9 +1071,9 @@ public void test213ModifiedUserJack() throws Exception { assertPropertyValues(user, UserType.F_COST_CENTER, (propDef, name) -> { assertNotNull("No definition for costCenter in user", propDef); - assertEquals("Wrong costCenter displayOrder", (Integer)123, propDef.getDisplayOrder()); + assertEquals("Wrong costCenter displayOrder", (Integer) 123, propDef.getDisplayOrder()); assertTrue("costCenter not readable", propDef.canRead()); - },"G001"); // This is set by user template + }, "G001"); // This is set by user template assertPropertyValues(user, UserType.F_PREFERRED_LANGUAGE, (propDef, name) -> { assertNotNull("No definition for preferredLanguage in user", propDef); @@ -1112,7 +1084,6 @@ public void test213ModifiedUserJack() throws Exception { assertEquals("Wrong valueEnumerationRef OID for preferredLanguage", LOOKUP_LANGUAGES_OID, valueEnumerationRef.getOid()); }, "en_PR"); - assertContainer(user, UserType.F_CREDENTIALS, (Validator>) (credentialsDef, name) -> { assertNotNull("No definition for credentials in user", credentialsDef); assertTrue("Credentials not readable", credentialsDef.canRead()); @@ -1132,7 +1103,7 @@ public void test240EditSchemaReconciliationTask() throws Exception { PrismObject task = taskDef.instantiate(); task.asObjectable() .beginAssignment() - .targetRef(ARCHETYPE_TASK_RECONCILIATION_OID, ArchetypeType.COMPLEX_TYPE); + .targetRef(ARCHETYPE_TASK_RECONCILIATION_OID, ArchetypeType.COMPLEX_TYPE); display("Task before", task); @@ -1144,7 +1115,7 @@ public void test240EditSchemaReconciliationTask() throws Exception { then(); assertObjectDefinition(editDef) - .container(ObjectType.F_EXTENSION) + .container(ObjectType.F_EXTENSION) .assertSize(7) .assertProperty(SchemaConstants.MODEL_EXTENSION_OBJECTCLASS) .assertProperty(SchemaConstants.MODEL_EXTENSION_KIND) @@ -1215,7 +1186,6 @@ public void test260EditShadowSchemaKindIntent() throws Exception { + "; "; assertClassType(message, identifiersDef, ResourceAttributeContainerDefinition.class); - assertSteadyResources(); } @@ -1227,7 +1197,7 @@ public void test261EditShadowSchemaObjectclass() throws Exception { OperationResult result = task.getResult(); ResourceShadowDiscriminator discr = new ResourceShadowDiscriminator(RESOURCE_DUMMY_OID, dummyResourceCtl.getAccountObjectClassQName()); - PrismTestUtil.display("Discr", discr); + displayDumpable("Discr", discr); // WHEN when(); @@ -1258,7 +1228,7 @@ public void test263EditShadowSchemaEmpty() throws Exception { OperationResult result = task.getResult(); ResourceShadowDiscriminator discr = new ResourceShadowDiscriminator(null, null); - PrismTestUtil.display("Discr", discr); + displayDumpable("Discr", discr); // WHEN when(); @@ -1316,8 +1286,8 @@ public void test310CustomRelations() { List relations = modelInteractionService.getRelationDefinitions(); // THEN - then(); - display("Relations", relations); + then(); + display("Relations", relations); assertRelationDef(relations, SchemaConstants.ORG_MANAGER, "RelationTypes.manager"); assertRelationDef(relations, SchemaConstants.ORG_OWNER, "Master"); assertRelationDef(relations, RELATION_PIRACY_CAPTAIN, "Captain"); @@ -1340,7 +1310,7 @@ public void test800OtisEditSchemaUser() throws Exception { // WHEN when(); PrismObjectDefinition editDef = getEditObjectDefinition(user); - display("Otis edit schema", editDef); + displayDumpable("Otis edit schema", editDef); // THEN then(); @@ -1361,7 +1331,7 @@ public void test800OtisEditSchemaUser() throws Exception { PrismPropertyDefinition costCenterDef = editDef.findPropertyDefinition(UserType.F_COST_CENTER); assertNotNull("No definition for costCenter in user", costCenterDef); - assertEquals("Wrong costCenter displayOrder", (Integer)123, costCenterDef.getDisplayOrder()); + assertEquals("Wrong costCenter displayOrder", (Integer) 123, costCenterDef.getDisplayOrder()); assertTrue("costCenter is readable", !costCenterDef.canRead()); assertTrue("costCenter is creatable", !costCenterDef.canAdd()); assertTrue("costCenter is modifiable", !costCenterDef.canModify()); @@ -1384,7 +1354,7 @@ public void test800OtisEditSchemaUser() throws Exception { ItemPath passwordValPath = ItemPath.create(UserType.F_CREDENTIALS, CredentialsType.F_PASSWORD, PasswordType.F_VALUE); PrismPropertyDefinition passwordValDef = editDef.findPropertyDefinition(passwordValPath); - assertNotNull("No definition for "+passwordValPath+" in user", passwordValDef); + assertNotNull("No definition for " + passwordValPath + " in user", passwordValDef); assertTrue("Password is readable", !passwordValDef.canRead()); assertTrue("Password is creatable", !passwordValDef.canAdd()); assertTrue("Password is modifiable", !passwordValDef.canModify()); @@ -1414,33 +1384,33 @@ public void test810OtisGetJack() throws Exception { assertPropertyValues(user, UserType.F_NAME, (propDef, name) -> { assertNotNull("No definition for name in user", propDef); assertEquals("Wrong name displayName", "ObjectType.name", propDef.getDisplayName()); - assertTrue(name+" not readable", propDef.canRead()); - assertTrue(name+" is creatable", !propDef.canAdd()); - assertTrue(name+" is modifiable", !propDef.canModify()); + assertTrue(name + " not readable", propDef.canRead()); + assertTrue(name + " is creatable", !propDef.canAdd()); + assertTrue(name + " is modifiable", !propDef.canModify()); }, PrismTestUtil.createPolyString("jack")); assertPropertyValues(user, UserType.F_DESCRIPTION, (propDef, name) -> { assertNotNull("No definition for description in user", propDef); assertEquals("Wrong description displayName", "Comment", propDef.getDisplayName()); - assertTrue(name+" not readable", propDef.canRead()); - assertTrue(name+" is creatable", !propDef.canAdd()); - assertTrue(name+" not modifiable", propDef.canModify()); + assertTrue(name + " not readable", propDef.canRead()); + assertTrue(name + " is creatable", !propDef.canAdd()); + assertTrue(name + " not modifiable", propDef.canModify()); }, "Where's the rum?"); assertPropertyValues(user, UserType.F_ADDITIONAL_NAME, (Validator>) (propDef, name) -> { assertNotNull("No definition for additionalName in user", propDef); assertEquals("Wrong additionalName displayName", "Middle Name", propDef.getDisplayName()); - assertTrue(name+" is readable", !propDef.canRead()); - assertTrue(name+" is creatable", !propDef.canAdd()); - assertTrue(name+" not modifiable", propDef.canModify()); + assertTrue(name + " is readable", !propDef.canRead()); + assertTrue(name + " is creatable", !propDef.canAdd()); + assertTrue(name + " not modifiable", propDef.canModify()); }); assertPropertyValues(user, UserType.F_COST_CENTER, (Validator>) (propDef, name) -> { assertNotNull("No definition for costCenter in user", propDef); - assertEquals("Wrong costCenter displayOrder", (Integer)123, propDef.getDisplayOrder()); - assertTrue(name+" is readable", !propDef.canRead()); - assertTrue(name+" is creatable", !propDef.canAdd()); - assertTrue(name+" is modifiable", !propDef.canModify()); + assertEquals("Wrong costCenter displayOrder", (Integer) 123, propDef.getDisplayOrder()); + assertTrue(name + " is readable", !propDef.canRead()); + assertTrue(name + " is creatable", !propDef.canAdd()); + assertTrue(name + " is modifiable", !propDef.canModify()); }); assertPropertyValues(user, UserType.F_PREFERRED_LANGUAGE, (Validator>) (propDef, name) -> { @@ -1449,9 +1419,9 @@ public void test810OtisGetJack() throws Exception { PrismReferenceValue valueEnumerationRef = propDef.getValueEnumerationRef(); assertNotNull("No valueEnumerationRef for preferredLanguage", valueEnumerationRef); assertEquals("Wrong valueEnumerationRef OID for preferredLanguage", LOOKUP_LANGUAGES_OID, valueEnumerationRef.getOid()); - assertTrue(name+" is readable", !propDef.canRead()); - assertTrue(name+" is creatable", !propDef.canAdd()); - assertTrue(name+" is modifiable", !propDef.canModify()); + assertTrue(name + " is readable", !propDef.canRead()); + assertTrue(name + " is creatable", !propDef.canAdd()); + assertTrue(name + " is modifiable", !propDef.canModify()); }); PrismAsserts.assertNoItem(user, UserType.F_CREDENTIALS); @@ -1480,27 +1450,27 @@ public void test820OtisSearchUsers() throws Exception { assertEquals("Unexpected number of users found", 7, users.size()); - for (final PrismObject user: users) { + for (final PrismObject user : users) { assertProperty(user, UserType.F_NAME, (Validator>) (propDef, name) -> { assertNotNull("No definition for name in user", propDef); assertEquals("Wrong name displayName", "ObjectType.name", propDef.getDisplayName()); - assertTrue(name+" of "+user+" not readable", propDef.canRead()); - assertTrue(name+" of "+user+" is creatable", !propDef.canAdd()); - assertTrue(name+" of "+user+" is modifiable", !propDef.canModify()); + assertTrue(name + " of " + user + " not readable", propDef.canRead()); + assertTrue(name + " of " + user + " is creatable", !propDef.canAdd()); + assertTrue(name + " of " + user + " is modifiable", !propDef.canModify()); }); assertProperty(user, UserType.F_ADDITIONAL_NAME, (Validator>) (propDef, name) -> { assertNotNull("No definition for additionalName in user", propDef); assertEquals("Wrong additionalName displayName", "Middle Name", propDef.getDisplayName()); - assertTrue(name+" of "+user+" is readable", !propDef.canRead()); - assertTrue(name+" of "+user+" is creatable", !propDef.canAdd()); - assertTrue(name+" of "+user+" not modifiable", propDef.canModify()); + assertTrue(name + " of " + user + " is readable", !propDef.canRead()); + assertTrue(name + " of " + user + " is creatable", !propDef.canAdd()); + assertTrue(name + " of " + user + " not modifiable", propDef.canModify()); }); assertProperty(user, UserType.F_COST_CENTER, (Validator>) (propDef, name) -> { assertNotNull("No definition for costCenter in user", propDef); - assertEquals("Wrong costCenter displayOrder", (Integer)123, propDef.getDisplayOrder()); - assertTrue(name+" of "+user+" is readable", !propDef.canRead()); - assertTrue(name+" of "+user+" is creatable", !propDef.canAdd()); - assertTrue(name+" of "+user+" is modifiable", !propDef.canModify()); + assertEquals("Wrong costCenter displayOrder", (Integer) 123, propDef.getDisplayOrder()); + assertTrue(name + " of " + user + " is readable", !propDef.canRead()); + assertTrue(name + " of " + user + " is creatable", !propDef.canAdd()); + assertTrue(name + " of " + user + " is modifiable", !propDef.canModify()); }); assertProperty(user, UserType.F_PREFERRED_LANGUAGE, (Validator>) (propDef, name) -> { @@ -1509,9 +1479,9 @@ public void test820OtisSearchUsers() throws Exception { PrismReferenceValue valueEnumerationRef = propDef.getValueEnumerationRef(); assertNotNull("No valueEnumerationRef for preferredLanguage", valueEnumerationRef); assertEquals("Wrong valueEnumerationRef OID for preferredLanguage", LOOKUP_LANGUAGES_OID, valueEnumerationRef.getOid()); - assertTrue(name+" of "+user+" is readable", !propDef.canRead()); - assertTrue(name+" of "+user+" is creatable", !propDef.canAdd()); - assertTrue(name+" of "+user+" is modifiable", !propDef.canModify()); + assertTrue(name + " of " + user + " is readable", !propDef.canRead()); + assertTrue(name + " of " + user + " is creatable", !propDef.canAdd()); + assertTrue(name + " of " + user + " is modifiable", !propDef.canModify()); }); PrismAsserts.assertNoItem(user, UserType.F_CREDENTIALS); @@ -1538,7 +1508,7 @@ public void test900AddReconciliationTask() throws Exception { .name("Reconciliation") .archetypeRef(ARCHETYPE_TASK_RECONCILIATION_OID, ArchetypeType.COMPLEX_TYPE) .beginAssignment() - .targetRef(ARCHETYPE_TASK_RECONCILIATION_OID, ArchetypeType.COMPLEX_TYPE) + .targetRef(ARCHETYPE_TASK_RECONCILIATION_OID, ArchetypeType.COMPLEX_TYPE) .end() .executionStatus(TaskExecutionStatusType.SUSPENDED) .recurrence(TaskRecurrenceType.SINGLE) @@ -1562,7 +1532,7 @@ public void test900AddReconciliationTask() throws Exception { private void assertProperty(PrismObject object, ItemPath path, Validator> validator) throws Exception { - assertPropertyValues(object, path, validator, (T[])null); + assertPropertyValues(object, path, validator, (T[]) null); } @SuppressWarnings("unchecked") @@ -1572,35 +1542,35 @@ private void assertPropertyValues(PrismObject objec if (expectedValues == null) { if (prop != null) { PrismPropertyDefinition propDef = prop.getDefinition(); - assertNotNull("No definition in property "+path, propDef); + assertNotNull("No definition in property " + path, propDef); try { - validator.validate(propDef, path.toString()+" (propDef) "); + validator.validate(propDef, path.toString() + " (propDef) "); } catch (Exception | Error e) { - PrismTestUtil.display("Wrong definition", propDef); + displayDumpable("Wrong definition", propDef); throw e; } } } else if (expectedValues.length == 0) { - assertNull("Unexpected property "+path+" in "+object+": "+prop, prop); + assertNull("Unexpected property " + path + " in " + object + ": " + prop, prop); } else { - assertNotNull("No property "+path+" in "+object, prop); + assertNotNull("No property " + path + " in " + object, prop); PrismAsserts.assertPropertyValue(prop, expectedValues); PrismPropertyDefinition propDef = prop.getDefinition(); - assertNotNull("No definition in property "+path, propDef); + assertNotNull("No definition in property " + path, propDef); try { - validator.validate(propDef, path.toString()+" (propDef) "); + validator.validate(propDef, path.toString() + " (propDef) "); } catch (Exception | Error e) { - PrismTestUtil.display("Wrong definition", propDef); + displayDumpable("Wrong definition", propDef); throw e; } } PrismPropertyDefinition objPropDef = object.getDefinition().findPropertyDefinition(path); - assertNotNull("No definition of property "+path+" in object "+object, objPropDef); + assertNotNull("No definition of property " + path + " in object " + object, objPropDef); try { - validator.validate(objPropDef, path.toString()+" (objectDef) "); + validator.validate(objPropDef, path.toString() + " (objectDef) "); } catch (Exception | Error e) { - PrismTestUtil.display("Wrong definition", objPropDef); + displayDumpable("Wrong definition", objPropDef); throw e; } @@ -1610,16 +1580,16 @@ private void assertContainer(Pri Validator> validator, boolean valueExpected) throws Exception { PrismContainer container = object.findContainer(contName); if (valueExpected) { - assertNotNull("No container "+contName+" in "+object, container); + assertNotNull("No container " + contName + " in " + object, container); PrismContainerDefinition contDef = container.getDefinition(); - assertNotNull("No definition in container "+contName, contDef); + assertNotNull("No definition in container " + contName, contDef); validator.validate(contDef, contName.toString()); } else { - assertNull("Unexpected container "+contName+" in "+object+": "+container, container); + assertNull("Unexpected container " + contName + " in " + object + ": " + container, container); } PrismContainerDefinition objContDef = object.getDefinition().findContainerDefinition(contName); - assertNotNull("No definition of container "+contName+" in object "+object, objContDef); + assertNotNull("No definition of container " + contName + " in object " + object, objContDef); validator.validate(objContDef, contName.toString()); } @@ -1627,7 +1597,6 @@ private void assertUntouchedUserDefinition() { // WHEN PrismObjectDefinition userDefinition = prismContext.getSchemaRegistry().findObjectDefinitionByCompileTimeClass(UserType.class); - // THEN PrismPropertyDefinition descriptionDef = userDefinition.findPropertyDefinition(UserType.F_DESCRIPTION); @@ -1646,7 +1615,7 @@ private void assertUntouchedUserDefinition() { PrismPropertyDefinition costCenterDef = userDefinition.findPropertyDefinition(UserType.F_COST_CENTER); assertNotNull("No definition for costCenter in user", costCenterDef); - assertEquals("Wrong costCenter displayOrder", (Integer)420, costCenterDef.getDisplayOrder()); + assertEquals("Wrong costCenter displayOrder", (Integer) 420, costCenterDef.getDisplayOrder()); assertTrue("costCenter not readable", costCenterDef.canRead()); assertTrue("costCenter not creatable", costCenterDef.canAdd()); assertTrue("costCenter not modifiable", costCenterDef.canModify()); @@ -1672,7 +1641,7 @@ private void assertUntouchedUserDefinition() { ItemPath passwordValPath = ItemPath.create(UserType.F_CREDENTIALS, CredentialsType.F_PASSWORD, PasswordType.F_VALUE); PrismPropertyDefinition passwordValDef = userDefinition.findPropertyDefinition(passwordValPath); - assertNotNull("No definition for "+passwordValPath+" in user", passwordValDef); + assertNotNull("No definition for " + passwordValPath + " in user", passwordValDef); assertTrue("Password not readable", passwordValDef.canRead()); assertTrue("Password not creatable", passwordValDef.canAdd()); assertTrue("Password not modifiable", passwordValDef.canModify()); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestRoleEntitlement.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestRoleEntitlement.java index 0bd26cc53b7..51cc8db2ac0 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestRoleEntitlement.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestRoleEntitlement.java @@ -130,7 +130,7 @@ public void test100ModifyRoleAddEntitlement() throws Exception { assertDummyGroup(GROUP_PIRATE_DUMMY_NAME, GROUP_PIRATE_DUMMY_DESCRIPTION); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -184,10 +184,10 @@ public void test102GetGroupNoFetch() throws Exception { PrismObject shadow = modelService.getObject(ShadowType.class, groupOid, options, task, result); display("Account", shadow); - display("Account def", shadow.getDefinition()); + displayDumpable("Account def", shadow.getDefinition()); PrismContainer accountContainer = shadow.findContainer(ShadowType.F_ATTRIBUTES); - display("Account attributes def", accountContainer.getDefinition()); - display("Account attributes def complex type def", accountContainer.getDefinition().getComplexTypeDefinition()); + displayDumpable("Account attributes def", accountContainer.getDefinition()); + displayDumpable("Account attributes def complex type def", accountContainer.getDefinition().getComplexTypeDefinition()); assertDummyGroupShadowRepo(shadow, groupOid, GROUP_PIRATE_DUMMY_NAME); result.computeStatus(); @@ -206,10 +206,10 @@ public void test103GetGroupRaw() throws Exception { PrismObject shadow = modelService.getObject(ShadowType.class, groupOid, options, task, result); display("Account", shadow); - display("Account def", shadow.getDefinition()); + displayDumpable("Account def", shadow.getDefinition()); PrismContainer accountContainer = shadow.findContainer(ShadowType.F_ATTRIBUTES); - display("Account attributes def", accountContainer.getDefinition()); - display("Account attributes def complex type def", accountContainer.getDefinition().getComplexTypeDefinition()); + displayDumpable("Account attributes def", accountContainer.getDefinition()); + displayDumpable("Account attributes def complex type def", accountContainer.getDefinition().getComplexTypeDefinition()); assertDummyGroupShadowRepo(shadow, groupOid, GROUP_PIRATE_DUMMY_NAME); result.computeStatus(); @@ -231,7 +231,7 @@ public void test108ModifyRoleAddEntitlementAgain() throws Exception { linkRefVal.setObject(group); ReferenceDelta groupDelta = prismContext.deltaFactory().reference().createModificationAdd(RoleType.F_LINK_REF, getRoleDefinition(), linkRefVal); roleDelta.addModification(groupDelta); - Collection> deltas = (Collection) MiscUtil.createCollection(roleDelta); + Collection> deltas = MiscUtil.createCollection(roleDelta); dummyAuditService.clear(); @@ -250,7 +250,7 @@ public void test108ModifyRoleAddEntitlementAgain() throws Exception { } // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -356,7 +356,7 @@ public void test119ModifyRoleDeleteEntitlement() throws Exception { .createEmptyModifyDelta(RoleType.class, ROLE_PIRATE_OID); ReferenceDelta linkDelta = prismContext.deltaFactory().reference().createModificationDelete(RoleType.F_LINK_REF, getUserDefinition(), group); roleDelta.addModification(linkDelta); - Collection> deltas = (Collection) MiscUtil.createCollection(roleDelta); + Collection> deltas = MiscUtil.createCollection(roleDelta); prepareNotifications(); @@ -385,7 +385,7 @@ public void test119ModifyRoleDeleteEntitlement() throws Exception { assertNoDummyGroup(GROUP_PIRATE_DUMMY_NAME); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -435,7 +435,7 @@ public void test120AddEntitlement() throws Exception { assertDummyGroup(GROUP_PIRATE_DUMMY_NAME, "Scurvy pirates"); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -484,7 +484,7 @@ public void test121ModifyRoleLinkEntitlement() throws Exception { assertDummyGroup(GROUP_PIRATE_DUMMY_NAME, "Scurvy pirates"); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -534,7 +534,7 @@ public void test128ModifyRoleUnlinkEntitlement() throws Exception { assertDummyGroup(GROUP_PIRATE_DUMMY_NAME, "Scurvy pirates"); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -573,7 +573,7 @@ public void test129DeleteEntitlement() throws Exception { assertNoDummyGroup(GROUP_PIRATE_DUMMY_NAME); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -628,7 +628,7 @@ public void test131ModifyRoleAssignEntitlement() throws Exception { assertNoProvisioningScripts(); // MID-4008 // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -693,7 +693,7 @@ public void test132ModifyEntitlement() throws Exception { assertNoProvisioningScripts(); // MID-4008 // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(3); dummyAuditService.assertAnyRequestDeltas(); @@ -738,7 +738,7 @@ public void test139ModifyRoleUnassignEntitlement() throws Exception { assertNoProvisioningScripts(); // MID-4008 // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -792,7 +792,7 @@ public void test151ModifyRoleAssignEntitlementRelativeEnforcement() throws Excep assertNoDummyGroup(ROLE_PIRATE_NAME); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -838,7 +838,7 @@ public void test158ModifyRoleUnassignEntitlementRelativeEnforcement() throws Exc assertNoDummyGroup(ROLE_PIRATE_NAME); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -895,7 +895,7 @@ public void test160ModifyRolePropertyAndAssignEntitlement() throws Exception { assertNoDummyGroup(ROLE_PIRATE_NAME); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -948,7 +948,7 @@ public void test161ModifyRole() throws Exception { assertNoDummyGroup(ROLE_PIRATE_NAME); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1002,7 +1002,7 @@ public void test180RenameRole() throws Exception { assertNoDummyGroup(ROLE_PIRATE_NAME); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1052,7 +1052,7 @@ public void test199DeleteRole() throws Exception { assertNoDummyGroup(ROLE_PIRATE_NAME); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1111,7 +1111,7 @@ public void test200AddRoleSwashbuckler() throws Exception { assertDummyGroup(GROUP_SWASHBUCKLER_DUMMY_NAME, ROLE_SWASHBUCKLER_DESCRIPTION); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(3); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/AbstractImportTest.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/AbstractImportTest.java index ab3d1d52ae3..eed79775912 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/AbstractImportTest.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/AbstractImportTest.java @@ -177,7 +177,7 @@ public void test001ImportConnector() throws FileNotFoundException, ObjectNotFoun assertMetadata(connector, startTime, endTime); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -241,7 +241,7 @@ public void test003ImportUsers() throws Exception { assertUsers(6); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(10); } @@ -273,7 +273,7 @@ public void test004DuplicateImportUsers() throws Exception { assertUsers(6); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(10); // 5 requests + 5 failed executions } @@ -335,7 +335,7 @@ public void test005ImportUsersWithOverwrite() throws Exception { assertUsers(7); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(14); // 7 request, 2 failed, 5 succeeded } @@ -396,7 +396,7 @@ public void test006ImportUsersWithOverwriteKeepOid() throws Exception { assertUsers(7); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(10); // 5 request, 5 succeeded } @@ -434,7 +434,7 @@ public void test020ImportTask() throws Exception { assertEquals("xsi:type'd property not imported correctly", Integer.valueOf(1000), delayProp.getValues().get(0).getValue()); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -483,7 +483,7 @@ public void test030ImportResource() throws Exception { assertDummyResource(importedRepoResource, true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -536,7 +536,7 @@ public void test031ReimportResource() throws Exception { assertNull("Synchronization not gone", resourceType.getSynchronization()); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -585,7 +585,7 @@ public void test032ImportResourceOidAndFilter() throws Exception { CONNECOTR_DBTABLE_OID); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -669,7 +669,7 @@ public void test040ImportUserHermanNoEncryption() throws Exception { assertUsers(8); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -708,7 +708,7 @@ public void test050ImportUserHermanOverwriteFullProcessing() throws Exception { assertUsers(8); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -747,7 +747,7 @@ public void test060ImportConstrainedWrongFullProcessing() throws Exception { assertUsers(8); // none should be added // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -780,7 +780,7 @@ public void test070ImportConstrainedWrong() throws Exception { assertUsers(9); // one should be added // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); } @Test diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractDirectManualResourceTest.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractDirectManualResourceTest.java index f14763ad47f..5a866c583af 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractDirectManualResourceTest.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractDirectManualResourceTest.java @@ -204,7 +204,7 @@ public void test230ModifyAccountWillChangePasswordAndEnable() throws Exception { ProtectedStringType ps = new ProtectedStringType(); ps.setClearValue(USER_WILL_PASSWORD_NEW); delta.addModificationReplaceProperty(SchemaConstants.PATH_PASSWORD_VALUE, ps); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); accountWillSecondReqestTimestampStart = clock.currentTimeXMLGregorianCalendar(); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractGroupingManualResourceTest.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractGroupingManualResourceTest.java index 3d4d8bdb0d8..9abda371733 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractGroupingManualResourceTest.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractGroupingManualResourceTest.java @@ -239,7 +239,7 @@ public void test230ModifyAccountWillChangePasswordAndEnable() throws Exception { ProtectedStringType ps = new ProtectedStringType(); ps.setClearValue(USER_WILL_PASSWORD_NEW); delta.addModificationReplaceProperty(SchemaConstants.PATH_PASSWORD_VALUE, ps); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); accountWillSecondReqestTimestampStart = clock.currentTimeXMLGregorianCalendar(); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java index c9bbe7c9998..e5694d3ceec 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java @@ -365,7 +365,7 @@ public void test016ParsedSchema() throws Exception { // Also test if the utility method returns the same thing ResourceSchema resourceSchema = RefinedResourceSchemaImpl.getResourceSchema(resourceType, prismContext); - display("Parsed resource schema", resourceSchema); + displayDumpable("Parsed resource schema", resourceSchema); // Check whether it is reusing the existing schema and not parsing it all over again // Not equals() but == ... we want to really know if exactly the same @@ -1008,7 +1008,7 @@ public void test200ModifyUserWillFullname() throws Exception { ObjectDelta delta = prismContext.deltaFactory().object().createModificationReplaceProperty(ShadowType.class, accountWillOid, ItemPath.create(ShadowType.F_ATTRIBUTES, ATTR_FULLNAME_QNAME), USER_WILL_FULL_NAME_PIRATE); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); accountWillReqestTimestampStart = clock.currentTimeXMLGregorianCalendar(); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestDummyItsmIntegration.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestDummyItsmIntegration.java index 0fe64d844f9..e6fd24a77df 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestDummyItsmIntegration.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestDummyItsmIntegration.java @@ -629,7 +629,7 @@ private void closeDummyTicket(String identifier) throws Exception { } private void dumpItsm() { - display("ITSM", DummyItsm.getInstance()); + displayDumpable("ITSM", DummyItsm.getInstance()); } } diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGroupingProposed.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGroupingProposed.java index 4f0b6edd465..2556e18045d 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGroupingProposed.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGroupingProposed.java @@ -94,7 +94,7 @@ protected void assertNewPropagationTask() throws Exception { PrismObject propTask = repositoryService.getObject(TaskType.class, getPropagationTaskOid(), null, result); display("Propagation task (new)", propTask); SearchFilterType filterType = propTask.asObjectable().getObjectRef().getFilter(); - display("Propagation task filter", filterType); + displayDumpable("Propagation task filter", filterType); assertFalse("Empty filter in propagation task", FilterUtil.isFilterEmpty(filterType)); } @@ -102,7 +102,7 @@ protected void assertNewPropagationTask() throws Exception { protected void assertFinishedPropagationTask(Task finishedTask, OperationResultStatusType expectedStatus) { super.assertFinishedPropagationTask(finishedTask, expectedStatus); SearchFilterType filterType = finishedTask.getObjectRefOrClone().getFilter(); - display("Propagation task filter", filterType); + displayDumpable("Propagation task filter", filterType); assertEquals("Unexpected propagation task progress", 1, finishedTask.getProgress()); } diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMapping.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMapping.java index 80fac366577..b04af3a5c16 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMapping.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMapping.java @@ -219,7 +219,7 @@ public void test100ModifyUserAssignAccountDummyBlue() throws Exception { DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_QUOTE_NAME, "Where's the rum? -- Jack Sparrow"); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -256,7 +256,7 @@ public void test101ModifyUserFullName() throws Exception { getQuote(USER_JACK_DESCRIPTION, CAPTAIN_JACK_FULL_NAME)); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -297,7 +297,7 @@ public void test102ModifyUserFullNameRecon() throws Exception { // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -326,7 +326,7 @@ public void test104ModifyUserOrganizationalUnit() throws Exception { assertAccountShip(userJack, USER_JACK_FULL_NAME, "Black Pearl", RESOURCE_DUMMY_BLUE_NAME, task); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -365,7 +365,7 @@ accountOid, getDummyResourceController(RESOURCE_DUMMY_BLUE_NAME).getAttributePat assertAccountShip(userJack, USER_JACK_FULL_NAME, "Flying Dutchman", RESOURCE_DUMMY_BLUE_NAME, task); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -408,7 +408,7 @@ accountOid, getDummyResourceController(RESOURCE_DUMMY_BLUE_NAME).getAttributePat assertAccountShip(userJack, USER_JACK_FULL_NAME, "Black Pearl", RESOURCE_DUMMY_BLUE_NAME, task); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -447,7 +447,7 @@ accountOid, getDummyResourceController(RESOURCE_DUMMY_BLUE_NAME).getAttributePat assertAccountShip(userJack, USER_JACK_FULL_NAME, "HMS Dauntless", RESOURCE_DUMMY_BLUE_NAME, task); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -490,7 +490,7 @@ accountOid, getDummyResourceController(RESOURCE_DUMMY_BLUE_NAME).getAttributePat assertAccountShip(userJack, USER_JACK_FULL_NAME, SHIP_BLACK_PEARL, RESOURCE_DUMMY_BLUE_NAME, task); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -879,7 +879,7 @@ public void test129ModifyUserUnassignAccountBlue() throws Exception { assertNoDummyAccount("jack"); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -931,7 +931,7 @@ public void test141DestroyAndRecompute() throws Exception { DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_COBALT_NAME, ACCOUNT_JACK_DUMMY_USERNAME); dummyAccountBefore.replaceAttributeValue(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, "Wrongland"); - display("Account before", dummyAccountBefore); + displayDumpable("Account before", dummyAccountBefore); // WHEN recomputeUser(USER_JACK_OID, task, result); @@ -944,7 +944,7 @@ public void test141DestroyAndRecompute() throws Exception { assertUserJack(userAfter); DummyAccount dummyAccountAfter = assertDummyAccount(RESOURCE_DUMMY_COBALT_NAME, ACCOUNT_JACK_DUMMY_USERNAME, USER_JACK_FULL_NAME, true); - display("Account after", dummyAccountAfter); + displayDumpable("Account after", dummyAccountAfter); assertDummyAccountAttribute(RESOURCE_DUMMY_COBALT_NAME, ACCOUNT_JACK_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, USER_JACK_LOCALITY); } @@ -962,7 +962,7 @@ public void test142DestroyAndReconcile() throws Exception { DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_COBALT_NAME, ACCOUNT_JACK_DUMMY_USERNAME); dummyAccountBefore.replaceAttributeValue(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, "Wrongland"); - display("Account before", dummyAccountBefore); + displayDumpable("Account before", dummyAccountBefore); // WHEN reconcileUser(USER_JACK_OID, task, result); @@ -975,7 +975,7 @@ public void test142DestroyAndReconcile() throws Exception { assertUserJack(userAfter); DummyAccount dummyAccountAfter = assertDummyAccount(RESOURCE_DUMMY_COBALT_NAME, ACCOUNT_JACK_DUMMY_USERNAME, USER_JACK_FULL_NAME, true); - display("Account after", dummyAccountAfter); + displayDumpable("Account after", dummyAccountAfter); assertDummyAccountAttribute(RESOURCE_DUMMY_COBALT_NAME, ACCOUNT_JACK_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, USER_JACK_LOCALITY); } @@ -993,7 +993,7 @@ public void test143ClearAndRecompute() throws Exception { DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_COBALT_NAME, ACCOUNT_JACK_DUMMY_USERNAME); dummyAccountBefore.replaceAttributeValues(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME /* no value */); - display("Account before", dummyAccountBefore); + displayDumpable("Account before", dummyAccountBefore); // WHEN recomputeUser(USER_JACK_OID, task, result); @@ -1006,7 +1006,7 @@ public void test143ClearAndRecompute() throws Exception { assertUserJack(userAfter); DummyAccount dummyAccountAfter = assertDummyAccount(RESOURCE_DUMMY_COBALT_NAME, ACCOUNT_JACK_DUMMY_USERNAME, USER_JACK_FULL_NAME, true); - display("Account after", dummyAccountAfter); + displayDumpable("Account after", dummyAccountAfter); assertDummyAccountAttribute(RESOURCE_DUMMY_COBALT_NAME, ACCOUNT_JACK_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, USER_JACK_LOCALITY); } @@ -1147,7 +1147,7 @@ public void test155DestroyAndRecompute() throws Exception { DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_COBALT_NAME, ACCOUNT_JACK_DUMMY_USERNAME); dummyAccountBefore.replaceAttributeValue(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, "Wrongland"); - display("Account before", dummyAccountBefore); + displayDumpable("Account before", dummyAccountBefore); // WHEN recomputeUser(USER_JACK_OID, task, result); @@ -1160,7 +1160,7 @@ public void test155DestroyAndRecompute() throws Exception { assertUserJack(userAfter); DummyAccount dummyAccountAfter = assertDummyAccount(RESOURCE_DUMMY_COBALT_NAME, ACCOUNT_JACK_DUMMY_USERNAME, USER_JACK_FULL_NAME, true); - display("Account after", dummyAccountAfter); + displayDumpable("Account after", dummyAccountAfter); assertDummyAccountAttribute(RESOURCE_DUMMY_COBALT_NAME, ACCOUNT_JACK_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, USER_JACK_LOCALITY); } @@ -1178,7 +1178,7 @@ public void test156ClearAndRecompute() throws Exception { DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_COBALT_NAME, ACCOUNT_JACK_DUMMY_USERNAME); dummyAccountBefore.replaceAttributeValues(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME /* no value */); - display("Account before", dummyAccountBefore); + displayDumpable("Account before", dummyAccountBefore); // WHEN recomputeUser(USER_JACK_OID, task, result); @@ -1191,7 +1191,7 @@ public void test156ClearAndRecompute() throws Exception { assertUserJack(userAfter); DummyAccount dummyAccountAfter = assertDummyAccount(RESOURCE_DUMMY_COBALT_NAME, ACCOUNT_JACK_DUMMY_USERNAME, USER_JACK_FULL_NAME, true); - display("Account after", dummyAccountAfter); + displayDumpable("Account after", dummyAccountAfter); assertDummyAccountAttribute(RESOURCE_DUMMY_COBALT_NAME, ACCOUNT_JACK_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, USER_JACK_LOCALITY); } @@ -1316,7 +1316,7 @@ public void test160ModifyUserAssignAccountDummyRed() throws Exception { DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_QUOTE_NAME, "Where's the rum? -- red resource"); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1347,7 +1347,7 @@ public void test161ModifyUserFullName() throws Exception { assertAccountShip(userJack, CAPTAIN_JACK_FULL_NAME, null, RESOURCE_DUMMY_RED_NAME, task); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -1378,7 +1378,7 @@ public void test162ModifyUserOrganizationalUnit() throws Exception { assertAccountShip(userJack, CAPTAIN_JACK_FULL_NAME, "Black Pearl", RESOURCE_DUMMY_RED_NAME, task); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -1419,7 +1419,7 @@ accountOid, getDummyResourceController(RESOURCE_DUMMY_RED_NAME).getAttributePath assertAccountShip(userJack, CAPTAIN_JACK_FULL_NAME, "Black Pearl", RESOURCE_DUMMY_RED_NAME, task); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -1461,7 +1461,7 @@ accountOid, getDummyResourceController(RESOURCE_DUMMY_RED_NAME).getAttributePath assertAccountShip(userJack, CAPTAIN_JACK_FULL_NAME, "Black Pearl", RESOURCE_DUMMY_RED_NAME, task); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -1502,7 +1502,7 @@ accountOid, getDummyResourceController(RESOURCE_DUMMY_RED_NAME).getAttributePath assertAccountShip(userJack, CAPTAIN_JACK_FULL_NAME, "Black Pearl", RESOURCE_DUMMY_RED_NAME, task); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -1536,7 +1536,7 @@ public void test168ModifyUserOrganization() throws Exception { assertAccountShip(userJack, CAPTAIN_JACK_FULL_NAME, "Brethren of the Coast / Black Pearl", RESOURCE_DUMMY_RED_NAME, task); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -1591,7 +1591,7 @@ public void test178ModifyUserUnassignAccountRed() throws Exception { assertNoDummyAccount("jack"); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -1635,7 +1635,7 @@ public void test179DeleteAccountRed() throws Exception { assertNoDummyAccount(RESOURCE_DUMMY_RED_NAME, "jack"); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -1686,7 +1686,7 @@ public void test180ModifyUserAssignAccountDummyDefault() throws Exception { assertDummyAccount(null, "jack", USER_JACK_FULL_NAME, true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1720,7 +1720,7 @@ public void test181ModifyUserFullName() throws Exception { assertAccountShip(userJack, CAPTAIN_JACK_FULL_NAME, null, null, task); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -1754,7 +1754,7 @@ public void test182ModifyUserLocality() throws Exception { assertAccountLocation(userJack, CAPTAIN_JACK_FULL_NAME, "Fountain of Youth", dummyResourceCtl, task); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -1796,7 +1796,7 @@ public void test183ModifyAccountLocation() throws Exception { assertAccountLocation(userJack, CAPTAIN_JACK_FULL_NAME, "Fountain of Youth", dummyResourceCtl, task); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -1838,7 +1838,7 @@ public void test184ModifyAccountLocationReplaceEmpty() throws Exception { assertAccountLocation(userJack, CAPTAIN_JACK_FULL_NAME, "Fountain of Youth", dummyResourceCtl, task); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -1879,7 +1879,7 @@ public void test185ModifyAccountLocationDelete() throws Exception { assertAccountLocation(userJack, CAPTAIN_JACK_FULL_NAME, "Fountain of Youth", dummyResourceCtl, task); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -1908,7 +1908,7 @@ public void test188ModifyUserRename() throws Exception { assertAccountRename(userJack, "renamedJack", CAPTAIN_JACK_FULL_NAME, dummyResourceCtl, task); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -1945,7 +1945,7 @@ public void test189ModifyUserUnassignAccountDummy() throws Exception { assertNoDummyAccount("renamedJack"); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -2037,7 +2037,7 @@ public void test200ModifyUserAssignAccountDummyCrimson() throws Exception { // Check account in dummy resource DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account", dummyAccount); + displayDumpable("Dummy account", dummyAccount); assertDummyAccountAttribute(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, ACCOUNT_GUYBRUSH_DUMMY_LOCATION); @@ -2056,7 +2056,7 @@ public void test202NativeModifyDummyCrimsonThenReconcile() throws Exception { dummyAccountBefore.replaceAttributeValues(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_DRINK_NAME, DRINK_VODKA, DRINK_WHISKY); - display("Dummy account before", dummyAccountBefore); + displayDumpable("Dummy account before", dummyAccountBefore); // WHEN when(); @@ -2074,7 +2074,7 @@ public void test202NativeModifyDummyCrimsonThenReconcile() throws Exception { // Check account in dummy resource DummyAccount dummyAccountAfter = assertDummyAccount(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account after", dummyAccountAfter); + displayDumpable("Dummy account after", dummyAccountAfter); assertDummyAccountAttribute(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, ACCOUNT_GUYBRUSH_DUMMY_LOCATION); assertDummyAccountAttribute(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, @@ -2094,7 +2094,7 @@ public void test204DummyCrimsonReconcile() throws Exception { OperationResult result = getTestOperationResult(); DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME); - display("Dummy account before", dummyAccountBefore); + displayDumpable("Dummy account before", dummyAccountBefore); // WHEN when(); @@ -2117,7 +2117,7 @@ public void test204DummyCrimsonReconcile() throws Exception { // Check account in dummy resource DummyAccount dummyAccountAfter = assertDummyAccount(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account after", dummyAccountAfter); + displayDumpable("Dummy account after", dummyAccountAfter); assertDummyAccountAttribute(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, ACCOUNT_GUYBRUSH_DUMMY_LOCATION); assertDummyAccountAttribute(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, @@ -2137,7 +2137,7 @@ public void test206DummyCrimsonReconcileIOError() throws Exception { OperationResult result = getTestOperationResult(); DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME); - display("Dummy account before", dummyAccountBefore); + displayDumpable("Dummy account before", dummyAccountBefore); // Make sure that only get is broken and not modify. We want to give the test // a chance to destroy data. @@ -2167,7 +2167,7 @@ public void test206DummyCrimsonReconcileIOError() throws Exception { // Check account in dummy resource DummyAccount dummyAccountAfter = assertDummyAccount(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account after", dummyAccountAfter); + displayDumpable("Dummy account after", dummyAccountAfter); assertDummyAccountAttribute(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, ACCOUNT_GUYBRUSH_DUMMY_LOCATION); assertDummyAccountAttribute(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, @@ -2188,7 +2188,7 @@ public void test208DummyCrimsonReconcileAgain() throws Exception { getDummyResource(RESOURCE_DUMMY_CRIMSON_NAME).resetBreakMode(); DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME); - display("Dummy account before", dummyAccountBefore); + displayDumpable("Dummy account before", dummyAccountBefore); // WHEN when(); @@ -2211,7 +2211,7 @@ public void test208DummyCrimsonReconcileAgain() throws Exception { // Check account in dummy resource DummyAccount dummyAccountAfter = assertDummyAccount(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account after", dummyAccountAfter); + displayDumpable("Dummy account after", dummyAccountAfter); assertDummyAccountAttribute(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, ACCOUNT_GUYBRUSH_DUMMY_LOCATION); assertDummyAccountAttribute(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, @@ -2231,7 +2231,7 @@ public void test210ModifyUserLocality() throws Exception { getDummyResource(RESOURCE_DUMMY_CRIMSON_NAME).resetBreakMode(); DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME); - display("Dummy account before", dummyAccountBefore); + displayDumpable("Dummy account before", dummyAccountBefore); // WHEN when(); @@ -2254,7 +2254,7 @@ public void test210ModifyUserLocality() throws Exception { // Check account in dummy resource DummyAccount dummyAccountAfter = assertDummyAccount(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account after", dummyAccountAfter); + displayDumpable("Dummy account after", dummyAccountAfter); assertDummyAccountAttribute(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, LOCALITY_BLOOD_ISLAND); assertDummyAccountAttribute(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, @@ -2274,7 +2274,7 @@ public void test212ModifyUserLocalityRecon() throws Exception { getDummyResource(RESOURCE_DUMMY_CRIMSON_NAME).resetBreakMode(); DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME); - display("Dummy account before", dummyAccountBefore); + displayDumpable("Dummy account before", dummyAccountBefore); // WHEN when(); @@ -2301,7 +2301,7 @@ public void test212ModifyUserLocalityRecon() throws Exception { // Check account in dummy resource DummyAccount dummyAccountAfter = assertDummyAccount(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account after", dummyAccountAfter); + displayDumpable("Dummy account after", dummyAccountAfter); assertDummyAccountAttribute(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, LOCALITY_SCABB_ISLAND); assertDummyAccountAttribute(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, @@ -2321,7 +2321,7 @@ public void test214ModifyUserLocalityIOError() throws Exception { getDummyResource(RESOURCE_DUMMY_CRIMSON_NAME).resetBreakMode(); DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME); - display("Dummy account before", dummyAccountBefore); + displayDumpable("Dummy account before", dummyAccountBefore); // Make sure that only get is broken and not modify. We want to give the test // a chance to destroy data. @@ -2350,7 +2350,7 @@ public void test214ModifyUserLocalityIOError() throws Exception { // Check account in dummy resource DummyAccount dummyAccountAfter = assertDummyAccount(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account after", dummyAccountAfter); + displayDumpable("Dummy account after", dummyAccountAfter); // TODO: How? Why? assertDummyAccountAttribute(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, LOCALITY_BOOTY_ISLAND); @@ -2373,7 +2373,7 @@ public void test220NativeModifyDummyCrimsonThenChangePassword() throws Exception DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME); dummyAccountBefore.replaceAttributeValues(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_DRINK_NAME, DRINK_BRANDY, DRINK_GRAPPA); - display("Dummy account before", dummyAccountBefore); + displayDumpable("Dummy account before", dummyAccountBefore); // Make sure that only get is broken and not modify. We want to give the test // a chance to destroy data. @@ -2404,7 +2404,7 @@ public void test220NativeModifyDummyCrimsonThenChangePassword() throws Exception // Check account in dummy resource DummyAccount dummyAccountAfter = assertDummyAccount(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account after", dummyAccountAfter); + displayDumpable("Dummy account after", dummyAccountAfter); assertDummyAccountAttribute(RESOURCE_DUMMY_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, LOCALITY_BOOTY_ISLAND); // location haven't changed and recon was not requested. The mapping was not evaluated. @@ -2467,7 +2467,7 @@ public void test250ModifyUserAssignAccountDummyLightCrimson() throws Exception { // Check account in dummy resource DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account", dummyAccount); + displayDumpable("Dummy account", dummyAccount); assertDummyAccountAttribute(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, LOCALITY_BOOTY_ISLAND); @@ -2486,7 +2486,7 @@ public void test252NativeModifyDummyLightCrimsonThenReconcile() throws Exception dummyAccountBefore.replaceAttributeValues(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_DRINK_NAME, DRINK_GIN, DRINK_MEZCAL); - display("Dummy account before", dummyAccountBefore); + displayDumpable("Dummy account before", dummyAccountBefore); // WHEN when(); @@ -2504,7 +2504,7 @@ public void test252NativeModifyDummyLightCrimsonThenReconcile() throws Exception // Check account in dummy resource DummyAccount dummyAccountAfter = assertDummyAccount(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account after", dummyAccountAfter); + displayDumpable("Dummy account after", dummyAccountAfter); assertDummyAccountAttribute(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, LOCALITY_BOOTY_ISLAND); assertDummyAccountAttribute(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, @@ -2524,7 +2524,7 @@ public void test254DummyLightCrimsonReconcile() throws Exception { OperationResult result = getTestOperationResult(); DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME); - display("Dummy account before", dummyAccountBefore); + displayDumpable("Dummy account before", dummyAccountBefore); // WHEN when(); @@ -2547,7 +2547,7 @@ public void test254DummyLightCrimsonReconcile() throws Exception { // Check account in dummy resource DummyAccount dummyAccountAfter = assertDummyAccount(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account after", dummyAccountAfter); + displayDumpable("Dummy account after", dummyAccountAfter); assertDummyAccountAttribute(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, LOCALITY_BOOTY_ISLAND); assertDummyAccountAttribute(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, @@ -2568,7 +2568,7 @@ public void test256DummyLightCrimsonReconcileIOError() throws Exception { OperationResult result = getTestOperationResult(); DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME); - display("Dummy account before", dummyAccountBefore); + displayDumpable("Dummy account before", dummyAccountBefore); // Make sure that only get is broken and not modify. We want to give the test // a chance to destroy data. @@ -2598,7 +2598,7 @@ public void test256DummyLightCrimsonReconcileIOError() throws Exception { // Check account in dummy resource DummyAccount dummyAccountAfter = assertDummyAccount(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account after", dummyAccountAfter); + displayDumpable("Dummy account after", dummyAccountAfter); assertDummyAccountAttribute(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, LOCALITY_BOOTY_ISLAND); assertDummyAccountAttribute(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, @@ -2619,7 +2619,7 @@ public void test258DummyLightCrimsonReconcileAgain() throws Exception { getDummyResource(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME).resetBreakMode(); DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME); - display("Dummy account before", dummyAccountBefore); + displayDumpable("Dummy account before", dummyAccountBefore); // WHEN when(); @@ -2642,7 +2642,7 @@ public void test258DummyLightCrimsonReconcileAgain() throws Exception { // Check account in dummy resource DummyAccount dummyAccountAfter = assertDummyAccount(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account after", dummyAccountAfter); + displayDumpable("Dummy account after", dummyAccountAfter); assertDummyAccountAttribute(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, LOCALITY_BOOTY_ISLAND); assertDummyAccountAttribute(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, @@ -2662,7 +2662,7 @@ public void test260ModifyUserLocality() throws Exception { getDummyResource(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME).resetBreakMode(); DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME); - display("Dummy account before", dummyAccountBefore); + displayDumpable("Dummy account before", dummyAccountBefore); // WHEN when(); @@ -2685,7 +2685,7 @@ public void test260ModifyUserLocality() throws Exception { // Check account in dummy resource DummyAccount dummyAccountAfter = assertDummyAccount(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account after", dummyAccountAfter); + displayDumpable("Dummy account after", dummyAccountAfter); assertDummyAccountAttribute(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, LOCALITY_BLOOD_ISLAND); assertDummyAccountAttribute(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, @@ -2705,7 +2705,7 @@ public void test262ModifyUserLocalityRecon() throws Exception { getDummyResource(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME).resetBreakMode(); DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME); - display("Dummy account before", dummyAccountBefore); + displayDumpable("Dummy account before", dummyAccountBefore); // WHEN when(); @@ -2732,7 +2732,7 @@ public void test262ModifyUserLocalityRecon() throws Exception { // Check account in dummy resource DummyAccount dummyAccountAfter = assertDummyAccount(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account after", dummyAccountAfter); + displayDumpable("Dummy account after", dummyAccountAfter); assertDummyAccountAttribute(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, LOCALITY_SCABB_ISLAND); assertDummyAccountAttribute(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, @@ -2752,7 +2752,7 @@ public void test264ModifyUserLocalityIOError() throws Exception { getDummyResource(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME).resetBreakMode(); DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME); - display("Dummy account before", dummyAccountBefore); + displayDumpable("Dummy account before", dummyAccountBefore); // Make sure that only get is broken and not modify. We want to give the test // a chance to destroy data. @@ -2781,7 +2781,7 @@ public void test264ModifyUserLocalityIOError() throws Exception { // Check account in dummy resource DummyAccount dummyAccountAfter = assertDummyAccount(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account after", dummyAccountAfter); + displayDumpable("Dummy account after", dummyAccountAfter); // TODO: How? Why? assertDummyAccountAttribute(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, LOCALITY_BOOTY_ISLAND); @@ -2804,7 +2804,7 @@ public void test270NativeModifyDummyLightCrimsonThenChangePassword() throws Exce DummyAccount dummyAccountBefore = getDummyAccount(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME); dummyAccountBefore.replaceAttributeValues(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_DRINK_NAME, DRINK_BRANDY, DRINK_GRAPPA); - display("Dummy account before", dummyAccountBefore); + displayDumpable("Dummy account before", dummyAccountBefore); // Make sure that only get is broken and not modify. We want to give the test // a chance to destroy data. @@ -2835,7 +2835,7 @@ public void test270NativeModifyDummyLightCrimsonThenChangePassword() throws Exce // Check account in dummy resource DummyAccount dummyAccountAfter = assertDummyAccount(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account after", dummyAccountAfter); + displayDumpable("Dummy account after", dummyAccountAfter); assertDummyAccountAttribute(RESOURCE_DUMMY_LIGHT_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, LOCALITY_BOOTY_ISLAND); // location haven't changed and recon was not requested. The mapping was not evaluated. @@ -2896,7 +2896,7 @@ public void test300AssignGuybrushDummyYellow() throws Exception { // Check account in dummy resource DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_YELLOW_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account", dummyAccount); + displayDumpable("Dummy account", dummyAccount); assertDummyAccountAttribute(RESOURCE_DUMMY_YELLOW_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_DRINK_NAME, IntegrationTestTools.CONST_DRINK); @@ -2930,7 +2930,7 @@ public void test302ModifyGuybrushLocality() throws Exception { // Check account in dummy resource DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_YELLOW_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account", dummyAccount); + displayDumpable("Dummy account", dummyAccount); assertDummyAccountAttribute(RESOURCE_DUMMY_YELLOW_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, "Forbidden dodecahedron"); @@ -2983,7 +2983,7 @@ public void test400ModifyUserAssignAccountDummyCrimsonCustomFunction() throws Ex // Check account in dummy resource DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_CUSTOM_FUNCTION_CRIMSON_NAME, USER_GUYBRUSH_USERNAME.toUpperCase(), ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account", dummyAccount); + displayDumpable("Dummy account", dummyAccount); } @@ -3009,7 +3009,7 @@ public void test401ModifyUserLocalityDummyCrisomCustomFunction() throws Exceptio // Check account in dummy resource DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_CUSTOM_FUNCTION_CRIMSON_NAME, USER_GUYBRUSH_USERNAME.toUpperCase(), ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account", dummyAccount); + displayDumpable("Dummy account", dummyAccount); assertDummyAccountAttribute(RESOURCE_DUMMY_CUSTOM_FUNCTION_CRIMSON_NAME, USER_GUYBRUSH_USERNAME.toUpperCase(), DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, LOCALITY_SCABB_ISLAND); } @@ -3037,7 +3037,7 @@ public void test402ModifyDrinkDummyCustomFunctionCrimson() throws Exception { // Check account in dummy resource DummyAccount dummyAccountAfter = assertDummyAccount(RESOURCE_DUMMY_CUSTOM_FUNCTION_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME.toUpperCase(), ACCOUNT_GUYBRUSH_DUMMY_FULLNAME, true); - display("Dummy account after", dummyAccountAfter); + displayDumpable("Dummy account after", dummyAccountAfter); assertDummyAccountAttribute(RESOURCE_DUMMY_CUSTOM_FUNCTION_CRIMSON_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME.toUpperCase(), DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, LOCALITY_BLOOD_ISLAND); // location haven't changed and recon was not requested. The mapping was not evaluated. diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMappingInbound.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMappingInbound.java index 6f7a3cb015e..d6d45a36aef 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMappingInbound.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMappingInbound.java @@ -119,7 +119,7 @@ public void test010SanitySchema() throws Exception { ResourceType resourceType = getDummyResourceType(RESOURCE_DUMMY_TEA_GREEN_NAME); ResourceSchema returnedSchema = RefinedResourceSchemaImpl.getResourceSchema(resourceType, prismContext); - display("Parsed resource schema (tea-green)", returnedSchema); + displayDumpable("Parsed resource schema (tea-green)", returnedSchema); ObjectClassComplexTypeDefinition accountDef = getDummyResourceController(RESOURCE_DUMMY_TEA_GREEN_NAME) .assertDummyResourceSchemaSanityExtended(returnedSchema, resourceType, false, DummyResourceContoller.PIRATE_SCHEMA_NUMBER_OF_DEFINITIONS + 4); // MID-5197 @@ -353,7 +353,7 @@ public void test150UserReconcile() throws Exception { // notifications notificationManager.setDisabled(true); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); } @@ -440,7 +440,7 @@ public void test400AddUserLeeloo() throws Exception { .assertAdministrativeStatus(ActivationStatusType.ENABLED) .getOid(); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -478,7 +478,7 @@ public void test402UserLeelooRecompute() throws Exception { .end() .assertAdministrativeStatus(ActivationStatusType.ENABLED); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(0); } @@ -509,7 +509,7 @@ public void test404UserLeelooReconcile() throws Exception { .end() .assertAdministrativeStatus(ActivationStatusType.ENABLED); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -548,7 +548,7 @@ public void test410UserLeeloominaiReconcile() throws Exception { .end() .assertAdministrativeStatus(ActivationStatusType.ENABLED); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -584,7 +584,7 @@ public void test412UserLeeloominaiRecompute() throws Exception { .end() .assertAdministrativeStatus(ActivationStatusType.ENABLED); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(0); } @@ -615,7 +615,7 @@ public void test414UserLeeloominaiReconcile() throws Exception { .end() .assertAdministrativeStatus(ActivationStatusType.ENABLED); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -655,7 +655,7 @@ public void test420UserLeelooStrangeReconcile() throws Exception { .end() .assertAdministrativeStatus(ActivationStatusType.ENABLED); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -692,7 +692,7 @@ public void test424UserLeelooStrangeReconcile() throws Exception { .end() .assertAdministrativeStatus(ActivationStatusType.ENABLED); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/misc/TestMisc.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/misc/TestMisc.java index 058aa335850..1cc332c8b36 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/misc/TestMisc.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/misc/TestMisc.java @@ -133,7 +133,7 @@ public void test200ExportUsers() throws Exception { for (PrismObject user : users) { display("Exporting user", user); assertNotNull("Null definition in " + user, user.getDefinition()); - display("Definition", user.getDefinition()); + displayDumpable("Definition", user.getDefinition()); String xmlString = prismContext.serializerFor(PrismContext.LANG_XML).serialize(user); displayValue("Exported user", xmlString); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/multi/TestMultiResource.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/multi/TestMultiResource.java index e59db83100c..8f73629039e 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/multi/TestMultiResource.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/multi/TestMultiResource.java @@ -485,7 +485,7 @@ public void test223JackKillDefaultDummyAccounAndRecompute() throws Exception { OperationResult result = task.getResult(); getDummyResource().deleteAccountByName(ACCOUNT_JACK_DUMMY_USERNAME); - display("dummy resource before", getDummyResource()); + displayDumpable("dummy resource before", getDummyResource()); // WHEN when(); @@ -498,7 +498,7 @@ public void test223JackKillDefaultDummyAccounAndRecompute() throws Exception { assertUserAfter(USER_JACK_OID) .assertLinks(2); - display("dummy resource after", getDummyResource()); + displayDumpable("dummy resource after", getDummyResource()); assertDummyAccount(null, ACCOUNT_JACK_DUMMY_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, true); assertDummyAccount(RESOURCE_DUMMY_BEIGE_NAME, ACCOUNT_JACK_DUMMY_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, true); @@ -521,7 +521,7 @@ public void test224JackKillBeigeAccounAndRecompute() throws Exception { OperationResult result = task.getResult(); getDummyResource(RESOURCE_DUMMY_BEIGE_NAME).deleteAccountByName(ACCOUNT_JACK_DUMMY_USERNAME); - display("beige dummy resource before", getDummyResource(RESOURCE_DUMMY_BEIGE_NAME)); + displayDumpable("beige dummy resource before", getDummyResource(RESOURCE_DUMMY_BEIGE_NAME)); // WHEN when(); @@ -554,7 +554,7 @@ public void test224JackKillBeigeAccounAndRecompute() throws Exception { .end() .end(); - display("beige dummy resource after", getDummyResource(RESOURCE_DUMMY_BEIGE_NAME)); + displayDumpable("beige dummy resource after", getDummyResource(RESOURCE_DUMMY_BEIGE_NAME)); assertDummyAccountByUsername(null, ACCOUNT_JACK_DUMMY_USERNAME) .assertFullName(ACCOUNT_JACK_DUMMY_FULLNAME) @@ -633,10 +633,10 @@ public void test226JackKillBothAccountsAndRecompute() throws Exception { .assertLinks(2); getDummyResource().deleteAccountByName(ACCOUNT_JACK_DUMMY_USERNAME); - display("dummy resource before", getDummyResource()); + displayDumpable("dummy resource before", getDummyResource()); getDummyResource(RESOURCE_DUMMY_BEIGE_NAME).deleteAccountByName(ACCOUNT_JACK_DUMMY_USERNAME); - display("beige dummy resource before", getDummyResource(RESOURCE_DUMMY_BEIGE_NAME)); + displayDumpable("beige dummy resource before", getDummyResource(RESOURCE_DUMMY_BEIGE_NAME)); // WHEN when(); @@ -674,8 +674,8 @@ public void test226JackKillBothAccountsAndRecompute() throws Exception { .find() .end(); - display("dummy resource after", getDummyResource()); - display("beige dummy resource after", getDummyResource(RESOURCE_DUMMY_BEIGE_NAME)); + displayDumpable("dummy resource after", getDummyResource()); + displayDumpable("beige dummy resource after", getDummyResource(RESOURCE_DUMMY_BEIGE_NAME)); assertDummyAccountByUsername(null, ACCOUNT_JACK_DUMMY_USERNAME) .assertFullName(ACCOUNT_JACK_DUMMY_FULLNAME) @@ -737,8 +737,8 @@ public void test227ModifyUserJackDefaultDummyBrokenSchemaViolation() throws Exce .find() .end(); - display("dummy resource after", getDummyResource()); - display("beige dummy resource after", getDummyResource(RESOURCE_DUMMY_BEIGE_NAME)); + displayDumpable("dummy resource after", getDummyResource()); + displayDumpable("beige dummy resource after", getDummyResource(RESOURCE_DUMMY_BEIGE_NAME)); assertDummyAccountByUsername(null, ACCOUNT_JACK_DUMMY_USERNAME) // Full name is NOT modified here because of (simulated) schema exception. @@ -801,8 +801,8 @@ public void test228ModifyUserJackDefaultDummyNoError() throws Exception { .find() .end(); - display("dummy resource after", getDummyResource()); - display("beige dummy resource after", getDummyResource(RESOURCE_DUMMY_BEIGE_NAME)); + displayDumpable("dummy resource after", getDummyResource()); + displayDumpable("beige dummy resource after", getDummyResource(RESOURCE_DUMMY_BEIGE_NAME)); assertDummyAccountByUsername(null, ACCOUNT_JACK_DUMMY_USERNAME) .assertFullName(ACCOUNT_JACK_DUMMY_FULLNAME) @@ -1188,7 +1188,7 @@ public void test300AddAndAssignRelative() throws Exception { ReferenceDelta accountDelta = prismContext.deltaFactory().reference() .createModificationAdd(UserType.F_LINK_REF, getUserDefinition(), accountRefVal); userDelta.addModification(accountDelta); - Collection> deltas = (Collection)MiscUtil.createCollection(userDelta); + Collection> deltas = MiscUtil.createCollection(userDelta); modelService.executeChanges(deltas, null, task, result); result.computeStatus(); TestUtil.assertSuccess(result); @@ -1728,7 +1728,7 @@ public void test400DavidAndGoliathAssignRole() throws Exception { assertDavidGoliath(userBefore.getOid(), "stone", USER_WORLD_NAME, true, true, true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(4); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1746,7 +1746,7 @@ public void test400DavidAndGoliathAssignRole() throws Exception { // Have a closer look at the last shadow modify delta. Make sure there are no phantom changes. ObjectDeltaOperation executionDeltaOp = dummyAuditService.getExecutionDelta(2, ChangeType.MODIFY, ShadowType.class); ObjectDelta executionDelta = executionDeltaOp.getObjectDelta(); - display("Last execution delta", executionDelta); + displayDumpable("Last execution delta", executionDelta); PrismAsserts.assertModifications("Phantom changes in last delta:", executionDelta, 7); } @@ -1808,7 +1808,7 @@ public void test401DavidAndGoliathModifyOu() throws Exception { assertDavidGoliath(userBefore.getOid(), "rock", USER_WORLD_NAME, true, true, true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(4); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1826,7 +1826,7 @@ public void test401DavidAndGoliathModifyOu() throws Exception { // Have a closer look at the last shadow modify delta. Make sure there are no phantom changes. ObjectDeltaOperation executionDeltaOp = dummyAuditService.getExecutionDelta(2, ChangeType.MODIFY, ShadowType.class); ObjectDelta executionDelta = executionDeltaOp.getObjectDelta(); - display("Last execution delta", executionDelta); + displayDumpable("Last execution delta", executionDelta); PrismAsserts.assertModifications("Phantom changes in last delta:", executionDelta, 7); } @@ -1853,7 +1853,7 @@ public void test403DavidAndGoliathDisableUser() throws Exception { assertDavidGoliath(userBefore.getOid(), "rock", USER_WORLD_NAME, false, false, false); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(3); // last one is duplicate dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1888,7 +1888,7 @@ public void test404DavidAndGoliathEnableUser() throws Exception { assertDavidGoliath(userBefore.getOid(), "rock", USER_WORLD_NAME, true, true, true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(3); // last one is duplicate dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1925,7 +1925,7 @@ public void test405DavidAndGoliathDisableAccountDavid() throws Exception { assertDavidGoliath(userBefore.getOid(), "rock", USER_WORLD_NAME, true, false, true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1961,7 +1961,7 @@ public void test406DavidAndGoliathRecompute() throws Exception { assertDavidGoliath(userBefore.getOid(), "rock", USER_WORLD_NAME, true, false, true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertNoRecord(); } @@ -1989,7 +1989,7 @@ public void test408DavidAndGoliathEnableAccountDavid() throws Exception { assertDavidGoliath(userBefore.getOid(), "rock", USER_WORLD_NAME, true, true, true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2021,7 +2021,7 @@ public void test410DavidAndGoliathRename() throws Exception { assertDavidGoliath(userBefore.getOid(), "rock", USER_FIELD_NAME, true, true, true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(4); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2039,7 +2039,7 @@ public void test410DavidAndGoliathRename() throws Exception { // Have a closer look at the last shadow modify delta. Make sure there are no phantom changes. ObjectDeltaOperation executionDeltaOp = dummyAuditService.getExecutionDelta(2, ChangeType.MODIFY, ShadowType.class); ObjectDelta executionDelta = executionDeltaOp.getObjectDelta(); - display("Last execution delta", executionDelta); + displayDumpable("Last execution delta", executionDelta); PrismAsserts.assertModifications("Phantom changes in last delta:", executionDelta, 7); } @@ -2071,7 +2071,7 @@ public void test419DavidAndGoliathUnassignRole() throws Exception { assertNoDummyAccount(RESOURCE_DUMMY_GOLIATH_NAME, USER_FIELD_NAME); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(4); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2141,7 +2141,7 @@ public void test420DavidAndGoliathAssignRoleGoliathDown() throws Exception { assertNoDummyAccount(RESOURCE_DUMMY_GOLIATH_NAME, USER_FIELD_NAME); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(4); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2200,7 +2200,7 @@ public void test421DavidAndGoliathAssignRoleGoliathUpRecompute() throws Exceptio assertNoDummyAccount(RESOURCE_DUMMY_GOLIATH_NAME, USER_FIELD_NAME); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); } @@ -2254,7 +2254,7 @@ public void test422DavidAndGoliathAssignRoleGoliathUpRecompute() throws Exceptio assertNoDummyAccount(RESOURCE_DUMMY_GOLIATH_NAME, USER_FIELD_NAME); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(0); } @@ -2285,7 +2285,7 @@ public void test423DavidAndGoliathAssignRoleGoliathUpReconcile() throws Exceptio assertDavidGoliath(userBefore.getOid(), "rock", USER_FIELD_NAME, true, true, true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); } @@ -2323,7 +2323,7 @@ public void test428DavidAndGoliathUnassignRole() throws Exception { assertNoDummyAccount(RESOURCE_DUMMY_GOLIATH_NAME, USER_FIELD_NAME); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(4); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2421,7 +2421,7 @@ public void test430DavidAndGoliathAssignRoleDavidDown() throws Exception { assertNoDummyAccount(RESOURCE_DUMMY_GOLIATH_NAME, USER_FIELD_NAME); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(3); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2484,7 +2484,7 @@ public void test440DavidAndGoliathAssignRoleAndCreateUserInOneStep() throws Exce assertDavidGoliath(userBefore.getOid(), "stone", USER_WORLD_NAME, true, true, true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); } @Test diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestAssignmentErrors.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestAssignmentErrors.java index 8eab91cb89b..aaebd9357c8 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestAssignmentErrors.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestAssignmentErrors.java @@ -84,7 +84,7 @@ public void test010RefinedSchemaWhite() throws Exception { // WHEN PrismObject resourceWhite = getObject(ResourceType.class, RESOURCE_DUMMY_WHITE_OID); RefinedResourceSchema refinedSchema = RefinedResourceSchemaImpl.getRefinedSchema(resourceWhite, prismContext); - display("Refined schema", refinedSchema); + displayDumpable("Refined schema", refinedSchema); RefinedObjectClassDefinition accountDef = refinedSchema.getDefaultRefinedDefinition(ShadowKindType.ACCOUNT); assertNotNull("Account definition is missing", accountDef); @@ -161,7 +161,7 @@ public void test100UserJackAssignBlankAccount() throws Exception { TestUtil.assertPartialError(result); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -205,7 +205,7 @@ public void test101AddUserCharlesAssignBlankAccount() throws Exception { assertUser(userAfter, userOid, "charles", "Charles L. Charles", null, null, null); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -244,7 +244,7 @@ public void test200UserLemonheadAssignAccountBrokenNetwork() throws Exception { assertInProgress(result); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); @@ -325,7 +325,7 @@ public void test210UserSharptoothAssignAccountBrokenGeneric() throws Exception { assertFailure(result); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertAnyRequestDeltas(); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java index 75bd636c477..8c4c5cf4647 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java @@ -799,7 +799,7 @@ public void test401AssignTwoResourcesBroken() throws Exception { private ObjectDelta createAssignTwoResourcesDelta(String badResourceOid) throws SchemaException { ObjectDelta userDelta = createAccountAssignmentUserDelta(USER_JACK_OID, badResourceOid, null, true); userDelta.addModification(createAccountAssignmentModification(RESOURCE_DUMMY_OID, null, true)); - display("input delta", userDelta); + displayDumpable("input delta", userDelta); return userDelta; } diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java index 88bd5f0493a..00db3b22efa 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java @@ -1715,7 +1715,7 @@ private void assertManager(String userOid, String managerOid, String orgType, bo private void assertJackOrgtarget(String expectedShip, String... expectedTitleValues) throws Exception { DummyAccount account = assertDummyAccount(RESOURCE_DUMMY_ORGTARGET_NAME, ACCOUNT_JACK_DUMMY_USERNAME, USER_JACK_FULL_NAME, true); - display("orgtarget account", account); + displayDumpable("orgtarget account", account); String shipAccountValue = account.getAttributeValue(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_SHIP_NAME); assertEquals("Jack's ship is wrong", expectedShip, shipAccountValue); Set titleAccountValues = account.getAttributeValues(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_TITLE_NAME, String.class); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java index e7ecc2f99c0..a6cc6f3823d 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java @@ -127,7 +127,6 @@ public abstract class AbstractPasswordTest extends AbstractInitializedModelInteg protected String accountJackMaverickOid; protected XMLGregorianCalendar lastPasswordChangeStart; protected XMLGregorianCalendar lastPasswordChangeEnd; - private String ministrySecurityPolicyOid; @Override public void initSystem(Task initTask, OperationResult initResult) throws Exception { @@ -827,7 +826,7 @@ public void test140JackAssignAccountDummyYellow() throws Exception { // Check account in dummy resource (yellow) DummyAccount dummyAccountYellow = assertDummyAccount(RESOURCE_DUMMY_YELLOW_NAME, ACCOUNT_JACK_DUMMY_USERNAME, ACCOUNT_JACK_DUMMY_FULLNAME, true); - display("Yellow dummy account", dummyAccountYellow); + displayDumpable("Yellow dummy account", dummyAccountYellow); assertDummyPasswordConditionalGenerated(RESOURCE_DUMMY_YELLOW_NAME, ACCOUNT_JACK_DUMMY_USERNAME, USER_PASSWORD_1_CLEAR); // Other resources should have unchanged passwords @@ -4043,7 +4042,7 @@ public void test952SetupOrgPolicy() throws Exception { .beginPassword() .valuePolicyRef(PASSWORD_POLICY_GLOBAL_OID, ValuePolicyType.COMPLEX_TYPE) .historyLength(ORG_MINISTRY_OF_OFFENSE_PASSWORD_HISTORY_LENGTH); - ministrySecurityPolicyOid = addObject(securityPolicy, task, result); + String ministrySecurityPolicyOid = addObject(securityPolicy, task, result); PrismReferenceValue securityPolicyRef = itemFactory().createReferenceValue(); securityPolicyRef.setOid(ministrySecurityPolicyOid); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestMetaMeta.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestMetaMeta.java index c13256e0f6e..6c3cad53dcd 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestMetaMeta.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestMetaMeta.java @@ -215,7 +215,7 @@ public void test300AssignAlphaToJack() throws Exception { // THEN assertSuccess(result); - display("Dummy resource", getDummyResource()); + displayDumpable("Dummy resource", getDummyResource()); readAndAssertGreekGroupMember(USER_JACK_OID, GROUP_ALPHA_NAME); } @@ -232,7 +232,7 @@ public void test309UnassignAlphaFromJack() throws Exception { // THEN assertSuccess(result); - display("Dummy resource", getDummyResource()); + displayDumpable("Dummy resource", getDummyResource()); PrismObject user = getUser(USER_JACK_OID); display("User after", user); @@ -258,7 +258,7 @@ public void test310AssignAToJack() throws Exception { // THEN assertSuccess(result); - display("Dummy resource", getDummyResource()); + displayDumpable("Dummy resource", getDummyResource()); readAndAssertGreekGroupMember(USER_JACK_OID, GROUP_A_NAME); } @@ -278,7 +278,7 @@ public void test312AssignBetaToJack() throws Exception { // THEN assertSuccess(result); - display("Dummy resource", getDummyResource()); + displayDumpable("Dummy resource", getDummyResource()); readAndAssertGreekGroupMember(USER_JACK_OID, GROUP_BETA_NAME, GROUP_A_NAME); } @@ -301,7 +301,7 @@ UserType.class, USER_JACK_OID, getGroupRoleOid(GROUP_BETA_NAME), // THEN assertSuccess(result); - display("Dummy resource", getDummyResource()); + displayDumpable("Dummy resource", getDummyResource()); PrismObject user = getUser(USER_JACK_OID); display("User after", user); @@ -430,7 +430,7 @@ public void test930LegacyAssignGroupOneToJack() throws Exception { // THEN assertSuccess(result); - display("Dummy resource", getDummyResource()); + displayDumpable("Dummy resource", getDummyResource()); PrismObject user = getUser(USER_JACK_OID); display("User after", user); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java index 78d1ad8a20f..896396b5978 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java @@ -2779,7 +2779,7 @@ public void test763PreviewChanges() throws Exception { then(); assertSuccess(result); - display("Preview context", context); + displayDumpable("Preview context", context); assertNotNull("Null focus context", context.getFocusContext()); assertEquals("Wrong number of projection contexts", 1, context.getProjectionContexts().size()); DeltaSetTriple> evaluatedAssignmentTriple = context.getEvaluatedAssignmentTriple(); @@ -2790,7 +2790,7 @@ public void test763PreviewChanges() throws Exception { assertNotNull("null zero set in evaluatedAssignmentTriple", assignmentZeroSet); assertEquals("Wrong size of zero set in evaluatedAssignmentTriple", 1, assignmentZeroSet.size()); EvaluatedAssignment evaluatedAssignment = assignmentZeroSet.iterator().next(); - display("Evaluated weak assignment", evaluatedAssignment); + displayDumpable("Evaluated weak assignment", evaluatedAssignment); DeltaSetTriple evaluatedConstructions = evaluatedAssignment.getEvaluatedConstructions(task, result); assertTrue("Unexpected plus set in evaluatedConstructions", evaluatedConstructions.getPlusSet().isEmpty()); @@ -2798,7 +2798,7 @@ public void test763PreviewChanges() throws Exception { Collection constructionsZeroSet = evaluatedConstructions.getZeroSet(); assertEquals("Wrong size of zero set in evaluatedConstructions", 1, constructionsZeroSet.size()); EvaluatedConstruction evaluatedConstruction = constructionsZeroSet.iterator().next(); - display("Evaluated weak evaluatedConstruction", evaluatedConstruction); + displayDumpable("Evaluated weak evaluatedConstruction", evaluatedConstruction); assertTrue("Construction not weak", evaluatedConstruction.isWeak()); PrismObject userAfter = getUser(USER_JACK_OID); @@ -4245,7 +4245,7 @@ public void test850JackAssignRoleBloodyFool() throws Exception { assertDummyAccountAttribute(null, ACCOUNT_JACK_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_TITLE_NAME, "Fool", "Simpleton"); - display("Simpleton groups", getDummyResource().getGroupByName(GROUP_SIMPLETONS_NAME)); + displayDumpable("Simpleton groups", getDummyResource().getGroupByName(GROUP_SIMPLETONS_NAME)); assertDummyGroupMember(null, GROUP_FOOLS_NAME, ACCOUNT_JACK_DUMMY_USERNAME); assertDummyGroupMember(null, GROUP_SIMPLETONS_NAME, ACCOUNT_JACK_DUMMY_USERNAME); @@ -4310,7 +4310,7 @@ public void test857JackReconcile() throws Exception { assertDummyAccountAttribute(null, ACCOUNT_JACK_DUMMY_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_TITLE_NAME, "Fool", "Simpleton"); - display("Simpleton groups", getDummyResource().getGroupByName(GROUP_SIMPLETONS_NAME)); + displayDumpable("Simpleton groups", getDummyResource().getGroupByName(GROUP_SIMPLETONS_NAME)); assertDummyGroupMember(null, GROUP_FOOLS_NAME, ACCOUNT_JACK_DUMMY_USERNAME); // Group association is non-tolerant. It should be removed. @@ -4340,7 +4340,7 @@ public void test870AssignRoleScreaming() throws Exception { PrismObject userJackAfter = getUser(USER_JACK_OID); display("user after", userJackAfter); - display("dummy transport", dummyTransport); + displayDumpable("dummy transport", dummyTransport); List messages = dummyTransport.getMessages("dummy:policyRuleNotifier"); assertNotNull("No notification messages", messages); assertEquals("Wrong # of notification messages", 1, messages.size()); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.java index 86961bb28dd..8ddf6d4b3b6 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.java @@ -1510,7 +1510,7 @@ public void test922GuybrushPreviewAssignRoleMinister() throws Exception { then(); assertSuccess(result); - display("Preview context", modelContext); + displayDumpable("Preview context", modelContext); DeltaSetTriple> evaluatedAssignmentTriple = modelContext.getEvaluatedAssignmentTriple(); @@ -1533,10 +1533,10 @@ public void test922GuybrushPreviewAssignRoleMinister() throws Exception { assertEquals("Wrong number of evaluated policy rules", 2, allTargetsPolicyRules.size()); EvaluatedPolicyRule evaluatedSodPolicyRule = getEvaluatedPolicyRule(allTargetsPolicyRules, GLOBAL_POLICY_RULE_SOD_APPROVAL_NAME); EvaluatedPolicyRuleTrigger sodTrigger = getSinglePolicyRuleTrigger(evaluatedSodPolicyRule, evaluatedSodPolicyRule.getTriggers()); - display("Own trigger", sodTrigger); + displayDumpable("Own trigger", sodTrigger); assertEvaluatedPolicyRuleTriggers(evaluatedSodPolicyRule, evaluatedSodPolicyRule.getAllTriggers(), 2); EvaluatedPolicyRuleTrigger situationTrigger = getEvaluatedPolicyRuleTrigger(evaluatedSodPolicyRule.getAllTriggers(), PolicyConstraintKindType.SITUATION); - display("Situation trigger", situationTrigger); + displayDumpable("Situation trigger", situationTrigger); PolicyActionsType sodActions = evaluatedSodPolicyRule.getActions(); display("Actions", sodActions); assertPolicyActionApproval(evaluatedSodPolicyRule); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java index 11db5ad9ddd..ce899e566e9 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java @@ -717,7 +717,7 @@ public void test420NotificationAboutJack() throws Exception { assertOutputData(output, 1, OperationResultStatus.SUCCESS); assertEquals("Produced 1 event(s)\n", output.getConsoleOutput()); - display("Dummy transport", dummyTransport); + displayDumpable("Dummy transport", dummyTransport); checkDummyTransportMessages("Custom", 1); Message m = dummyTransport.getMessages("dummy:Custom").get(0); assertEquals("Wrong message body", "jack/" + USER_JACK_OID, m.getBody()); @@ -742,7 +742,7 @@ public void test430NotificationAboutJackType2() throws Exception { assertOutputData(output, 1, OperationResultStatus.SUCCESS); assertEquals("Produced 1 event(s)\n", output.getConsoleOutput()); - display("Dummy transport", dummyTransport); + displayDumpable("Dummy transport", dummyTransport); checkDummyTransportMessages("Custom", 1); Message m = dummyTransport.getMessages("dummy:Custom").get(0); assertEquals("Wrong message body", "1", m.getBody()); @@ -819,7 +819,7 @@ public void test505ScriptingUsersInBackground() throws Exception { display("admin after operation", admin); assertEquals("Wrong description", "admin description", admin.asObjectable().getDescription()); - display("dummy transport", dummyTransport); + displayDumpable("dummy transport", dummyTransport); notificationManager.setDisabled(notificationsDisabled); assertEquals("Wrong # of messages in dummy transport", 1, @@ -855,7 +855,7 @@ public void test507ScriptingUsersInBackgroundAssign() throws Exception { display("admin after operation", admin); assertAssignedRole(admin, ROLE_EMPTY_OID); - display("dummy transport", dummyTransport); + displayDumpable("dummy transport", dummyTransport); notificationManager.setDisabled(notificationsDisabled); assertEquals("Wrong # of messages in dummy transport", 1, @@ -1159,8 +1159,8 @@ public void test600ModifyJackPasswordInBackground() throws Exception { displayValue("task", xml); assertFalse("Plaintext password is present in the task", xml.contains(PASSWORD_PLAINTEXT_FRAGMENT)); - display("Dummy transport", dummyTransport); - display("Audit", dummyAuditService); + displayDumpable("Dummy transport", dummyTransport); + displayDumpable("Audit", dummyAuditService); } // MID-5359 @@ -1195,8 +1195,8 @@ public void test610ModifyJackPasswordImportingTask() throws Exception { displayValue("task", xml); assertFalse("Plaintext password is present in the task", xml.contains(PASSWORD_PLAINTEXT_FRAGMENT)); - display("Dummy transport", dummyTransport); - display("Audit", dummyAuditService); + displayDumpable("Dummy transport", dummyTransport); + displayDumpable("Audit", dummyAuditService); } // not using scripting as such, but related... MID-5359 @@ -1236,8 +1236,8 @@ public void test620ModifyJackPasswordViaExecuteChangesAsynchronously() throws Ex displayValue("task", xml); assertFalse("Plaintext password is present in the task", xml.contains(PASSWORD_PLAINTEXT_FRAGMENT)); - display("Dummy transport", dummyTransport); - display("Audit", dummyAuditService); + displayDumpable("Dummy transport", dummyTransport); + displayDumpable("Audit", dummyAuditService); } private void assertNoOutputData(ExecutionContext output) { @@ -1275,7 +1275,7 @@ private void assertAttributesFetched(List data) { } private void dumpOutput(ExecutionContext output, OperationResult result) throws JAXBException, SchemaException { - display("output", output.getFinalOutput()); + displayDumpable("output", output.getFinalOutput()); displayValue("stdout", output.getConsoleOutput()); display(result); if (output.getFinalOutput() != null) { diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java index 0764e01fc25..f32e0a5c1fd 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java @@ -1012,7 +1012,7 @@ protected void assertImportStreamAllow(File file) throws FileNotFoundException { } protected void assertJack(MidPointPrincipal principal) { - display("Principal jack", principal); + displayDumpable("Principal jack", principal); assertEquals("wrong username", USER_JACK_USERNAME, principal.getUsername()); assertEquals("wrong oid", USER_JACK_OID, principal.getOid()); assertJack((UserType) principal.getFocus()); @@ -1171,7 +1171,7 @@ protected void assertReadSomeModifySome(int expectedJackAssignments) throws Exce assertModifyDeny(UserType.class, USER_JACK_OID, UserType.F_HONORIFIC_PREFIX, createPolyString("Captain")); assertModifyDeny(UserType.class, USER_GUYBRUSH_OID, UserType.F_HONORIFIC_PREFIX, createPolyString("Pirate")); - assertModifyDeny(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, createPolyString("Mutinier")); + assertModifyDeny(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, createPolyString("Mutineer")); assertModifyDeny(UserType.class, USER_JACK_OID, UserType.F_COST_CENTER, "V3RYC0STLY"); assertModifyDeny(UserType.class, USER_JACK_OID, UserType.F_ORGANIZATION, createPolyString("Brethren of the Coast")); @@ -1194,7 +1194,7 @@ protected void assertUserJackReadSomeModifySome(PrismObject userJack, protected void assertJackEditSchemaReadSomeModifySome(PrismObject userJack) throws SchemaException, ConfigurationException, ObjectNotFoundException, ExpressionEvaluationException, CommunicationException, SecurityViolationException { PrismObjectDefinition userJackEditSchema = getEditObjectDefinition(userJack); - display("Jack's edit schema", userJackEditSchema); + displayDumpable("Jack's edit schema", userJackEditSchema); assertItemFlags(userJackEditSchema, UserType.F_NAME, true, false, false); assertItemFlags(userJackEditSchema, UserType.F_FULL_NAME, true, false, true); assertItemFlags(userJackEditSchema, UserType.F_DESCRIPTION, false, false, true); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java index 9415c3b7186..b3326fee3cb 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java @@ -1384,7 +1384,7 @@ public void test230AttorneyCaribbeanUnlimited() throws Exception { OperationResult result = task.getResult(); ObjectFilter donorFilterAll = modelInteractionService.getDonorFilter(UserType.class, null, null, task, result); - display("donorFilterAll", donorFilterAll); + displayDumpable("donorFilterAll", donorFilterAll); assertSearchFilter(UserType.class, donorFilterAll, USER_JACK_OID, USER_BARBOSSA_OID); assertAuthenticated(); @@ -1454,11 +1454,11 @@ public void test232ManagerAttorneyNoOrg() throws Exception { OperationResult result = task.getResult(); ObjectFilter donorFilterAll = modelInteractionService.getDonorFilter(UserType.class, null, null, task, result); - display("donorFilterAll", donorFilterAll); + displayDumpable("donorFilterAll", donorFilterAll); assertSearchFilter(UserType.class, donorFilterAll, 0); ObjectFilter donorFilterWorkitems = modelInteractionService.getDonorFilter(UserType.class, null, AUTHORIZATION_ACTION_WORKITEMS, task, result); - display("donorFilterWorkitems", donorFilterWorkitems); + displayDumpable("donorFilterWorkitems", donorFilterWorkitems); assertSearchFilter(UserType.class, donorFilterWorkitems, 0); assertLoggedInUserOid(USER_JACK_OID); @@ -1499,11 +1499,11 @@ public void test234ManagerAttorneyRum() throws Exception { OperationResult result = task.getResult(); ObjectFilter donorFilterAll = modelInteractionService.getDonorFilter(UserType.class, null, null, task, result); - display("donorFilterAll", donorFilterAll); + displayDumpable("donorFilterAll", donorFilterAll); assertSearchFilter(UserType.class, donorFilterAll, 4); ObjectFilter donorFilterWorkitems = modelInteractionService.getDonorFilter(UserType.class, null, AUTHORIZATION_ACTION_WORKITEMS, task, result); - display("donorFilterWorkitems", donorFilterWorkitems); + displayDumpable("donorFilterWorkitems", donorFilterWorkitems); assertSearchFilter(UserType.class, donorFilterWorkitems, 4); assertLoggedInUserOid(USER_JACK_OID); @@ -1566,11 +1566,11 @@ public void test235ManagerAttorneyRumRogersEntitled() throws Exception { OperationResult result = task.getResult(); ObjectFilter donorFilterAll = modelInteractionService.getDonorFilter(UserType.class, null, null, task, result); - display("donorFilterAll", donorFilterAll); + displayDumpable("donorFilterAll", donorFilterAll); assertSearchFilter(UserType.class, donorFilterAll, 4); ObjectFilter donorFilterWorkitems = modelInteractionService.getDonorFilter(UserType.class, null, AUTHORIZATION_ACTION_WORKITEMS, task, result); - display("donorFilterWorkitems", donorFilterWorkitems); + displayDumpable("donorFilterWorkitems", donorFilterWorkitems); assertSearchFilter(UserType.class, donorFilterWorkitems, 4); assertLoggedInUserOid(USER_JACK_OID); @@ -1635,11 +1635,11 @@ public void test236ManagerAttorneyCaribbeanRum() throws Exception { OperationResult result = task.getResult(); ObjectFilter donorFilterAll = modelInteractionService.getDonorFilter(UserType.class, null, null, task, result); - display("donorFilterAll", donorFilterAll); + displayDumpable("donorFilterAll", donorFilterAll); assertSearchFilter(UserType.class, donorFilterAll, 5); ObjectFilter donorFilterWorkitems = modelInteractionService.getDonorFilter(UserType.class, null, AUTHORIZATION_ACTION_WORKITEMS, task, result); - display("donorFilterWorkitems", donorFilterWorkitems); + displayDumpable("donorFilterWorkitems", donorFilterWorkitems); assertSearchFilter(UserType.class, donorFilterWorkitems, 5); assumePowerOfAttorneyAllow(USER_BARBOSSA_OID); @@ -1955,7 +1955,7 @@ public void test260AutzJackLimitedRoleAdministrator() throws Exception { // display("Exclusion role def", roleExclusion.getDefinition()); PrismObjectDefinition roleExclusionEditSchema = getEditObjectDefinition(roleExclusion); - display("Exclusion role edit schema", roleExclusionEditSchema); + displayDumpable("Exclusion role edit schema", roleExclusionEditSchema); assertItemFlags(roleExclusionEditSchema, RoleType.F_NAME, true, true, true); assertItemFlags(roleExclusionEditSchema, RoleType.F_DESCRIPTION, true, true, true); assertItemFlags(roleExclusionEditSchema, RoleType.F_SUBTYPE, true, true, true); @@ -2212,7 +2212,7 @@ public void test264AutzJackLimitedReadRoleAdministrator() throws Exception { display("Empty role", roleEmpty); PrismObjectDefinition roleEmptyEditSchema = getEditObjectDefinition(roleEmpty); - display("Exclusion role edit schema", roleEmptyEditSchema); + displayDumpable("Exclusion role edit schema", roleEmptyEditSchema); assertItemFlags(roleEmptyEditSchema, RoleType.F_NAME, true, true, true); assertItemFlags(roleEmptyEditSchema, RoleType.F_DESCRIPTION, true, true, true); assertItemFlags(roleEmptyEditSchema, RoleType.F_SUBTYPE, true, true, true); @@ -2625,7 +2625,7 @@ public void test300AutzJackExceptAssignment() throws Exception { assertAssignments(userJack, 0); PrismObjectDefinition userJackEditSchema = getEditObjectDefinition(userJack); - display("Jack's edit schema", userJackEditSchema); + displayDumpable("Jack's edit schema", userJackEditSchema); assertItemFlags(userJackEditSchema, UserType.F_NAME, true, false, true); assertItemFlags(userJackEditSchema, UserType.F_FULL_NAME, true, false, true); assertItemFlags(userJackEditSchema, UserType.F_DESCRIPTION, true, false, true); @@ -2652,7 +2652,7 @@ public void test300AutzJackExceptAssignment() throws Exception { assertModifyAllow(UserType.class, USER_JACK_OID, UserType.F_HONORIFIC_PREFIX, createPolyString("Captain")); assertModifyAllow(UserType.class, USER_GUYBRUSH_OID, UserType.F_HONORIFIC_PREFIX, createPolyString("Pirate")); - assertModifyAllow(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, createPolyString("Mutinier")); + assertModifyAllow(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, createPolyString("Mutineer")); assertModifyAllow(UserType.class, USER_JACK_OID, UserType.F_COST_CENTER, "V3RYC0STLY"); assertModifyAllow(UserType.class, USER_JACK_OID, UserType.F_ORGANIZATION, createPolyString("Brethren of the Coast")); @@ -2687,7 +2687,7 @@ public void test302AutzJackExceptAdministrativeStatus() throws Exception { assertAssignments(userJack, 1); PrismObjectDefinition userJackEditSchema = getEditObjectDefinition(userJack); - display("Jack's edit schema", userJackEditSchema); + displayDumpable("Jack's edit schema", userJackEditSchema); assertItemFlags(userJackEditSchema, UserType.F_NAME, true, false, true); assertItemFlags(userJackEditSchema, UserType.F_FULL_NAME, true, false, true); assertItemFlags(userJackEditSchema, UserType.F_DESCRIPTION, true, false, true); @@ -2714,7 +2714,7 @@ public void test302AutzJackExceptAdministrativeStatus() throws Exception { assertModifyAllow(UserType.class, USER_JACK_OID, UserType.F_HONORIFIC_PREFIX, createPolyString("Captain")); assertModifyAllow(UserType.class, USER_GUYBRUSH_OID, UserType.F_HONORIFIC_PREFIX, createPolyString("Pirate")); - assertModifyAllow(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, createPolyString("Mutinier")); + assertModifyAllow(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, createPolyString("Mutineer")); assertModifyAllow(UserType.class, USER_JACK_OID, UserType.F_COST_CENTER, "V3RYC0STLY"); assertModifyAllow(UserType.class, USER_JACK_OID, UserType.F_ORGANIZATION, createPolyString("Brethren of the Coast")); @@ -2750,7 +2750,7 @@ public void test304AutzJackPropExceptAssignmentReadSomeModifySomeUser() throws E PrismAsserts.assertNoItem(userJack, SchemaConstants.PATH_ACTIVATION_VALID_TO); PrismObjectDefinition userJackEditSchema = getEditObjectDefinition(userJack); - display("Jack's edit schema", userJackEditSchema); + displayDumpable("Jack's edit schema", userJackEditSchema); assertItemFlags(userJackEditSchema, UserType.F_NAME, true, false, true); assertItemFlags(userJackEditSchema, UserType.F_FULL_NAME, true, false, true); assertItemFlags(userJackEditSchema, UserType.F_DESCRIPTION, true, false, true); @@ -2806,7 +2806,7 @@ public void test306AutzJackPropExceptAssignmentExceptAdministrativeStatus() thro PrismAsserts.assertPropertyValue(userJack, SchemaConstants.PATH_ACTIVATION_VALID_TO, JACK_VALID_TO_LONG_AHEAD); PrismObjectDefinition userJackEditSchema = getEditObjectDefinition(userJack); - display("Jack's edit schema", userJackEditSchema); + displayDumpable("Jack's edit schema", userJackEditSchema); assertItemFlags(userJackEditSchema, UserType.F_NAME, true, false, true); assertItemFlags(userJackEditSchema, UserType.F_FULL_NAME, true, false, true); assertItemFlags(userJackEditSchema, UserType.F_DESCRIPTION, true, false, true); @@ -2867,7 +2867,7 @@ public void test308AutzJackPropExceptAssignmentAssignApplicationRoles() throws E assertAssignments(userJack, 2); PrismObjectDefinition userJackEditSchema = getEditObjectDefinition(userJack); - display("Jack's edit schema", userJackEditSchema); + displayDumpable("Jack's edit schema", userJackEditSchema); assertItemFlags(userJackEditSchema, UserType.F_NAME, true, false, true); assertItemFlags(userJackEditSchema, UserType.F_FULL_NAME, true, false, true); assertItemFlags(userJackEditSchema, UserType.F_DESCRIPTION, true, false, true); @@ -2894,7 +2894,7 @@ public void test308AutzJackPropExceptAssignmentAssignApplicationRoles() throws E assertModifyAllow(UserType.class, USER_JACK_OID, UserType.F_HONORIFIC_PREFIX, createPolyString("Captain")); assertModifyAllow(UserType.class, USER_GUYBRUSH_OID, UserType.F_HONORIFIC_PREFIX, createPolyString("Pirate")); - assertModifyAllow(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, createPolyString("Mutinier")); + assertModifyAllow(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, createPolyString("Mutineer")); assertModifyAllow(UserType.class, USER_JACK_OID, UserType.F_COST_CENTER, "V3RYC0STLY"); assertModifyAllow(UserType.class, USER_JACK_OID, UserType.F_ORGANIZATION, createPolyString("Brethren of the Coast")); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java index d631c9818df..e90b759f0cc 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java @@ -6,20 +6,12 @@ */ package com.evolveum.midpoint.model.intest.security; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertNotNull; -import static org.testng.AssertJUnit.assertNull; +import static org.testng.AssertJUnit.*; import java.util.ArrayList; import java.util.Collection; - import javax.xml.namespace.QName; -import com.evolveum.midpoint.prism.path.ItemName; -import com.evolveum.midpoint.prism.path.ItemPath; - -import com.evolveum.midpoint.prism.query.ObjectFilter; -import com.evolveum.midpoint.xml.ns._public.common.common_3.*; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ContextConfiguration; @@ -29,16 +21,14 @@ import com.evolveum.midpoint.common.refinery.RefinedObjectClassDefinition; import com.evolveum.midpoint.model.api.ModelExecuteOptions; import com.evolveum.midpoint.model.api.context.ModelContext; -import com.evolveum.midpoint.prism.Item; -import com.evolveum.midpoint.prism.ItemDefinition; -import com.evolveum.midpoint.prism.PrismContainerValue; -import com.evolveum.midpoint.prism.PrismObject; -import com.evolveum.midpoint.prism.PrismObjectDefinition; -import com.evolveum.midpoint.prism.PrismReference; +import com.evolveum.midpoint.prism.*; import com.evolveum.midpoint.prism.delta.ContainerDelta; import com.evolveum.midpoint.prism.delta.ItemDelta; import com.evolveum.midpoint.prism.delta.ObjectDelta; import com.evolveum.midpoint.prism.delta.ReferenceDelta; +import com.evolveum.midpoint.prism.path.ItemName; +import com.evolveum.midpoint.prism.path.ItemPath; +import com.evolveum.midpoint.prism.query.ObjectFilter; import com.evolveum.midpoint.prism.query.ObjectQuery; import com.evolveum.midpoint.prism.query.TypeFilter; import com.evolveum.midpoint.prism.util.PrismAsserts; @@ -55,20 +45,13 @@ import com.evolveum.midpoint.schema.util.ShadowUtil; import com.evolveum.midpoint.task.api.Task; import com.evolveum.midpoint.test.util.TestUtil; -import com.evolveum.midpoint.util.exception.CommunicationException; -import com.evolveum.midpoint.util.exception.ConfigurationException; -import com.evolveum.midpoint.util.exception.ExpressionEvaluationException; -import com.evolveum.midpoint.util.exception.ObjectAlreadyExistsException; -import com.evolveum.midpoint.util.exception.ObjectNotFoundException; -import com.evolveum.midpoint.util.exception.PolicyViolationException; -import com.evolveum.midpoint.util.exception.SchemaException; -import com.evolveum.midpoint.util.exception.SecurityViolationException; +import com.evolveum.midpoint.util.exception.*; +import com.evolveum.midpoint.xml.ns._public.common.common_3.*; /** * @author semancik - * */ -@ContextConfiguration(locations = {"classpath:ctx-model-intest-test-main.xml"}) +@ContextConfiguration(locations = { "classpath:ctx-model-intest-test-main.xml" }) @DirtiesContext(classMode = ClassMode.AFTER_CLASS) public class TestSecurityBasic extends AbstractSecurityTest { @@ -523,7 +506,7 @@ public void test205AutzJackObjectFilterModifyCaribbeanfRole() throws Exception { assertModifyAllow(UserType.class, USER_JACK_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Captain")); assertModifyDeny(UserType.class, USER_GUYBRUSH_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Pirate")); - assertModifyAllow(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Mutinier")); + assertModifyAllow(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Mutineer")); assertDeleteDeny(); @@ -559,7 +542,7 @@ public void test207AutzJackObjectFilterCaribbeanRole() throws Exception { assertModifyAllow(UserType.class, USER_JACK_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Captain")); assertModifyDeny(UserType.class, USER_GUYBRUSH_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Pirate")); - assertModifyAllow(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Mutinier")); + assertModifyAllow(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Mutineer")); assertModifyDenyRaw(); assertDeleteDeny(); @@ -597,8 +580,8 @@ public void test207rAutzJackObjectFilterCaribbeanRole() throws Exception { assertModifyAllow(UserType.class, USER_JACK_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Captain")); assertModifyAllowOptions(UserType.class, USER_JACK_OID, UserType.F_HONORIFIC_PREFIX, ModelExecuteOptions.createRaw(), PrismTestUtil.createPolyString("Raw Captain")); assertModifyDeny(UserType.class, USER_GUYBRUSH_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Pirate")); - assertModifyAllow(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Mutinier")); - assertModifyAllowOptions(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, ModelExecuteOptions.createRaw(), PrismTestUtil.createPolyString("Raw Mutinier")); + assertModifyAllow(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Mutineer")); + assertModifyAllowOptions(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, ModelExecuteOptions.createRaw(), PrismTestUtil.createPolyString("Raw Mutineer")); assertDeleteDeny(); @@ -695,7 +678,7 @@ public void test210AutzJackPropReadAllModifySome() throws Exception { assertModifyDeny(UserType.class, USER_JACK_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Captain")); assertModifyDeny(UserType.class, USER_GUYBRUSH_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Pirate")); - assertModifyDeny(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Mutinier")); + assertModifyDeny(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Mutineer")); assertModifyDenyRaw(); @@ -744,7 +727,7 @@ public void test211AutzJackPropReadAllModifySomeUser() throws Exception { assertModifyDeny(UserType.class, USER_JACK_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Captain")); assertModifyDeny(UserType.class, USER_GUYBRUSH_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Pirate")); - assertModifyDeny(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Mutinier")); + assertModifyDeny(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Mutineer")); assertDeleteDeny(); @@ -791,7 +774,7 @@ public void test212AutzJackPropReadAllModifySomeUserPartial() throws Exception { assertModifyDeny(UserType.class, USER_JACK_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Captain")); assertModifyDeny(UserType.class, USER_GUYBRUSH_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Pirate")); - assertModifyDeny(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Mutinier")); + assertModifyDeny(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Mutineer")); assertDeleteDeny(); @@ -804,7 +787,7 @@ public void test212AutzJackPropReadAllModifySomeUserPartial() throws Exception { private void assertJackEditSchemaReadAllModifySome(PrismObject userJack) throws SchemaException, ConfigurationException, ObjectNotFoundException, ExpressionEvaluationException, CommunicationException, SecurityViolationException { PrismObjectDefinition userJackEditSchema = getEditObjectDefinition(userJack); - display("Jack's edit schema", userJackEditSchema); + displayDumpable("Jack's edit schema", userJackEditSchema); assertItemFlags(userJackEditSchema, UserType.F_NAME, true, false, false); assertItemFlags(userJackEditSchema, UserType.F_FULL_NAME, true, false, true); assertItemFlags(userJackEditSchema, UserType.F_DESCRIPTION, true, false, true); @@ -878,7 +861,7 @@ private void doReadSomeModifySomeUser() throws Exception { assertModifyDeny(UserType.class, USER_JACK_OID, UserType.F_HONORIFIC_PREFIX, createPolyString("Captain")); assertModifyDeny(UserType.class, USER_GUYBRUSH_OID, UserType.F_HONORIFIC_PREFIX, createPolyString("Pirate")); - assertModifyDeny(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, createPolyString("Mutinier")); + assertModifyDeny(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, createPolyString("Mutineer")); assertModifyDeny(UserType.class, USER_JACK_OID, UserType.F_COST_CENTER, "V3RYC0STLY"); assertModifyDeny(UserType.class, USER_JACK_OID, UserType.F_ORGANIZATION, createPolyString("Brethren of the Coast")); @@ -922,7 +905,7 @@ public void test218AutzJackPropReadSomeModifySomeExecAll() throws Exception { PrismAsserts.assertPropertyValue(userJack, UserType.F_FULL_NAME, PrismTestUtil.createPolyString(USER_JACK_FULL_NAME)); PrismAsserts.assertPropertyValue(userJack, UserType.F_FAMILY_NAME, PrismTestUtil.createPolyString(USER_JACK_FAMILY_NAME)); PrismAsserts.assertPropertyValue(userJack, ItemPath.create(UserType.F_ACTIVATION, ActivationType.F_ADMINISTRATIVE_STATUS), - ActivationStatusType.ENABLED); + ActivationStatusType.ENABLED); PrismAsserts.assertNoItem(userJack, UserType.F_GIVEN_NAME); PrismAsserts.assertNoItem(userJack, UserType.F_ADDITIONAL_NAME); PrismAsserts.assertNoItem(userJack, UserType.F_DESCRIPTION); @@ -930,7 +913,7 @@ public void test218AutzJackPropReadSomeModifySomeExecAll() throws Exception { assertAssignmentsWithTargets(userJack, 1); PrismObjectDefinition userJackEditSchema = getEditObjectDefinition(userJack); - display("Jack's edit schema", userJackEditSchema); + displayDumpable("Jack's edit schema", userJackEditSchema); assertItemFlags(userJackEditSchema, UserType.F_NAME, true, false, false); assertItemFlags(userJackEditSchema, UserType.F_FULL_NAME, true, false, true); assertItemFlags(userJackEditSchema, UserType.F_DESCRIPTION, false, false, true); @@ -966,7 +949,7 @@ public void test218AutzJackPropReadSomeModifySomeExecAll() throws Exception { assertModifyDeny(UserType.class, USER_JACK_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Captain")); assertModifyDeny(UserType.class, USER_GUYBRUSH_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Pirate")); - assertModifyDeny(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Mutinier")); + assertModifyDeny(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Mutineer")); assertModifyDeny(UserType.class, USER_JACK_OID, UserType.F_ORGANIZATION, PrismTestUtil.createPolyString("Brethren of the Coast")); @@ -995,19 +978,19 @@ public void test219AutzJackPropReadSomeModifySomeFullName() throws Exception { PrismObject userJack = getUser(USER_JACK_OID); assertUser(userJack, "before modify (read by jack)") - .assertName(USER_JACK_USERNAME) - .assertNoFullName() - .assertGivenName(USER_JACK_GIVEN_NAME) - .assertNoFamilyName() - .assertNoAdditionalName() - .assertNoDescription() - .activation() + .assertName(USER_JACK_USERNAME) + .assertNoFullName() + .assertGivenName(USER_JACK_GIVEN_NAME) + .assertNoFamilyName() + .assertNoAdditionalName() + .assertNoDescription() + .activation() .assertAdministrativeStatus(ActivationStatusType.ENABLED) .assertNoEffectiveStatus(); ObjectDelta jackGivenNameDelta = deltaFor(UserType.class) - .item(UserType.F_GIVEN_NAME).replace(createPolyString("Jackie")) - .asObjectDelta(USER_JACK_OID); + .item(UserType.F_GIVEN_NAME).replace(createPolyString("Jackie")) + .asObjectDelta(USER_JACK_OID); Task task = getTestTask(); OperationResult result = task.getResult(); @@ -1017,93 +1000,92 @@ public void test219AutzJackPropReadSomeModifySomeFullName() throws Exception { assertSuccess(result); assertPreviewContext(previewContext) - .focusContext() + .focusContext() .objectOld() - .assertName(USER_JACK_USERNAME) - .asUser() - .assertNoFullName() - .assertGivenName(USER_JACK_GIVEN_NAME) - .assertNoFamilyName() - .end() - .end() + .assertName(USER_JACK_USERNAME) + .asUser() + .assertNoFullName() + .assertGivenName(USER_JACK_GIVEN_NAME) + .assertNoFamilyName() + .end() + .end() .objectCurrent() - .assertName(USER_JACK_USERNAME) - .asUser() - .assertNoFullName() - .assertGivenName(USER_JACK_GIVEN_NAME) - .assertNoFamilyName() - .end() - .end() + .assertName(USER_JACK_USERNAME) + .asUser() + .assertNoFullName() + .assertGivenName(USER_JACK_GIVEN_NAME) + .assertNoFamilyName() + .end() + .end() .objectNew() - .assertName(USER_JACK_USERNAME) - .asUser() - .assertNoFullName() - .assertGivenName("Jackie") - .assertNoFamilyName() - .end() - .end() + .assertName(USER_JACK_USERNAME) + .asUser() + .assertNoFullName() + .assertGivenName("Jackie") + .assertNoFamilyName() + .end() + .end() .primaryDelta() - .assertModify() - .assertModifications(1) - .property(UserType.F_GIVEN_NAME) - .valuesToReplace() - .single() - .assertPolyStringValue("Jackie") - .end() - .end() - .end() - .end() + .assertModify() + .assertModifications(1) + .property(UserType.F_GIVEN_NAME) + .valuesToReplace() + .single() + .assertPolyStringValue("Jackie") + .end() + .end() + .end() + .end() .secondaryDelta() - // Secondary delta should be there. Because we are changing something. - // But the user does not have authorization to read fullname. - // Therefore the delta should be empty. - .assertModify() - .assertModifications(0) - .end() + // Secondary delta should be there. Because we are changing something. + // But the user does not have authorization to read fullname. + // Therefore the delta should be empty. + .assertModify() + .assertModifications(0) + .end() .end() - .projectionContexts() + .projectionContexts() .single() - .objectOld() - .assertKind(ShadowKindType.ACCOUNT) - .assertObjectClass() - .assertNoAttributes() - .end() - .objectCurrent() - .assertKind(ShadowKindType.ACCOUNT) - .assertObjectClass() - .assertNoAttributes() - .assertAdministrativeStatus(ActivationStatusType.ENABLED) - .end() - .objectNew() - .assertKind(ShadowKindType.ACCOUNT) - .assertObjectClass() - .assertNoAttributes() - .assertAdministrativeStatus(ActivationStatusType.ENABLED) - .end() - .assertNoPrimaryDelta() - .secondaryDelta() - .assertModify() - // Read of shadow attributes not allowed - .assertModifications(0); - + .objectOld() + .assertKind(ShadowKindType.ACCOUNT) + .assertObjectClass() + .assertNoAttributes() + .end() + .objectCurrent() + .assertKind(ShadowKindType.ACCOUNT) + .assertObjectClass() + .assertNoAttributes() + .assertAdministrativeStatus(ActivationStatusType.ENABLED) + .end() + .objectNew() + .assertKind(ShadowKindType.ACCOUNT) + .assertObjectClass() + .assertNoAttributes() + .assertAdministrativeStatus(ActivationStatusType.ENABLED) + .end() + .assertNoPrimaryDelta() + .secondaryDelta() + .assertModify() + // Read of shadow attributes not allowed + .assertModifications(0); // WHEN: real modification assertModifyAllow(UserType.class, USER_JACK_OID, UserType.F_GIVEN_NAME, createPolyString("Jackie")); userJack = getUser(USER_JACK_OID); assertUser(userJack, "after modify (read by jack)") - .assertName(USER_JACK_USERNAME) - .assertNoFullName() - .assertGivenName("Jackie") - .assertNoFamilyName() - .assertNoAdditionalName() - .assertNoDescription() - .activation() + .assertName(USER_JACK_USERNAME) + .assertNoFullName() + .assertGivenName("Jackie") + .assertNoFamilyName() + .assertNoAdditionalName() + .assertNoDescription() + .activation() .assertAdministrativeStatus(ActivationStatusType.ENABLED) .assertNoEffectiveStatus(); PrismObjectDefinition userJackEditSchema = getEditObjectDefinition(userJack); - display("Jack's edit schema", userJackEditSchema); + displayDumpable("Jack's edit schema", userJackEditSchema); assertItemFlags(userJackEditSchema, UserType.F_NAME, true, false, false); assertItemFlags(userJackEditSchema, UserType.F_FULL_NAME, false, false, false); assertItemFlags(userJackEditSchema, UserType.F_DESCRIPTION, false, false, true); @@ -1126,13 +1108,13 @@ public void test219AutzJackPropReadSomeModifySomeFullName() throws Exception { userJack = getUser(USER_JACK_OID); assertUser(userJack, "after modify (read by administrator)") - .assertName(USER_JACK_USERNAME) - .assertFullName("Jackie Sparrow") - .assertGivenName("Jackie") - .assertFamilyName(USER_JACK_FAMILY_NAME) - .assertAdditionalName(USER_JACK_ADDITIONAL_NAME) - .assertDescription(USER_JACK_DESCRIPTION) - .activation() + .assertName(USER_JACK_USERNAME) + .assertFullName("Jackie Sparrow") + .assertGivenName("Jackie") + .assertFamilyName(USER_JACK_FAMILY_NAME) + .assertAdditionalName(USER_JACK_ADDITIONAL_NAME) + .assertDescription(USER_JACK_DESCRIPTION) + .activation() .assertAdministrativeStatus(ActivationStatusType.ENABLED) .assertEffectiveStatus(ActivationStatusType.ENABLED); @@ -1159,13 +1141,13 @@ public void test220AutzJackPropDenyModifySome() throws Exception { PrismAsserts.assertPropertyValue(userJack, UserType.F_GIVEN_NAME, PrismTestUtil.createPolyString(USER_JACK_GIVEN_NAME)); PrismAsserts.assertPropertyValue(userJack, UserType.F_FAMILY_NAME, PrismTestUtil.createPolyString(USER_JACK_FAMILY_NAME)); PrismAsserts.assertPropertyValue(userJack, ItemPath.create(UserType.F_ACTIVATION, ActivationType.F_ADMINISTRATIVE_STATUS), - ActivationStatusType.ENABLED); + ActivationStatusType.ENABLED); PrismAsserts.assertNoItem(userJack, UserType.F_ADDITIONAL_NAME); PrismAsserts.assertNoItem(userJack, UserType.F_DESCRIPTION); assertAssignmentsWithTargets(userJack, 1); PrismObjectDefinition userJackEditSchema = getEditObjectDefinition(userJack); - display("Jack's edit schema", userJackEditSchema); + displayDumpable("Jack's edit schema", userJackEditSchema); assertItemFlags(userJackEditSchema, UserType.F_NAME, true, true, true); assertItemFlags(userJackEditSchema, UserType.F_FULL_NAME, true, true, true); assertItemFlags(userJackEditSchema, UserType.F_DESCRIPTION, false, true, false); @@ -1586,7 +1568,6 @@ private void assertJack24xManager(boolean fullControl) throws Exception { result.computeStatus(); TestUtil.assertFailure(result); - assertDeleteAllow(UserType.class, USER_ESTEVAN_OID); assertVisibleUsers(4); @@ -1792,7 +1773,7 @@ public void test255AutzJackSelfAccountsReadWrite() throws Exception { Task task = getTestTask(); RefinedObjectClassDefinition rOcDef = modelInteractionService.getEditObjectClassDefinition(shadow, getDummyResourceObject(), null, task, task.getResult()); - display("Refined objectclass def", rOcDef); + displayDumpable("Refined objectclass def", rOcDef); assertAttributeFlags(rOcDef, SchemaConstants.ICFS_UID, true, false, false); assertAttributeFlags(rOcDef, SchemaConstants.ICFS_NAME, true, true, true); @@ -1858,7 +1839,7 @@ public void test256AutzJackSelfAccountsPartialControl() throws Exception { Task task = getTestTask(); OperationResult result = task.getResult(); RefinedObjectClassDefinition rOcDef = modelInteractionService.getEditObjectClassDefinition(shadow, getDummyResourceObject(), null, task, result); - display("Refined objectclass def", rOcDef); + displayDumpable("Refined objectclass def", rOcDef); assertAttributeFlags(rOcDef, SchemaConstants.ICFS_UID, true, false, false); assertAttributeFlags(rOcDef, SchemaConstants.ICFS_NAME, true, false, false); assertAttributeFlags(rOcDef, new QName("location"), true, true, true); @@ -1916,7 +1897,7 @@ public void test258AutzJackSelfAccountsPartialControlPassword() throws Exception Task task = getTestTask(); OperationResult result = task.getResult(); RefinedObjectClassDefinition rOcDef = modelInteractionService.getEditObjectClassDefinition(shadow, getDummyResourceObject(), null, task, result); - display("Refined objectclass def", rOcDef); + displayDumpable("Refined objectclass def", rOcDef); assertAttributeFlags(rOcDef, SchemaConstants.ICFS_UID, true, false, false); assertAttributeFlags(rOcDef, SchemaConstants.ICFS_NAME, true, false, false); assertAttributeFlags(rOcDef, new QName("location"), true, true, true); @@ -1985,11 +1966,11 @@ public void test259AutzJackSelfAccountsPartialControl() throws Exception { Item attr = resourceAttributeCOntainer.findItem(new ItemName("weapon")); ItemDefinition attrDf = attr.getDefinition(); - AssertJUnit.assertTrue("Expected that attribute can be read", attrDf.canRead()); - AssertJUnit.assertTrue("Expected that attribute cannot be added", !attrDf.canAdd()); - AssertJUnit.assertTrue("Expected that attribute cannot be modified", !attrDf.canModify()); + assertTrue("Expected that attribute can be read", attrDf.canRead()); + assertFalse("Expected that attribute cannot be added", attrDf.canAdd()); + assertFalse("Expected that attribute cannot be modified", attrDf.canModify()); - display("Refined objectclass def", containerDef); + displayDumpable("Refined objectclass def", containerDef); assertAttributeFlags(containerDef, SchemaConstants.ICFS_UID, true, false, false); assertAttributeFlags(containerDef, SchemaConstants.ICFS_NAME, true, false, false); assertAttributeFlags(containerDef, new ItemName("location"), true, true, true); @@ -2043,13 +2024,13 @@ public void test260AutzJackObjectFilterLocationShadowRole() throws Exception { assertModifyAllow(UserType.class, USER_JACK_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Captain")); assertModifyDeny(UserType.class, USER_GUYBRUSH_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Pirate")); - assertModifyAllow(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Mutinier")); + assertModifyAllow(UserType.class, USER_BARBOSSA_OID, UserType.F_HONORIFIC_PREFIX, PrismTestUtil.createPolyString("Mutineer")); assertDeleteDeny(); // Linked to jack assertAllow("add jack's account to jack", - (task, result) -> modifyUserAddAccount(USER_JACK_OID, ACCOUNT_JACK_DUMMY_RED_FILE, task, result)); + (task, result) -> modifyUserAddAccount(USER_JACK_OID, ACCOUNT_JACK_DUMMY_RED_FILE, task, result)); PrismObject user = getUser(USER_JACK_OID); display("Jack after red account link", user); String accountRedOid = getLinkRefOid(user, RESOURCE_DUMMY_RED_OID); @@ -2075,7 +2056,6 @@ public void test260AutzJackObjectFilterLocationShadowRole() throws Exception { assertLinks(user, 0); } - /** * Creates user and assigns role at the same time. */ @@ -2133,7 +2113,7 @@ public void test270AutzJackAssignApplicationRoles() throws Exception { assertAllow("assign application role to jack", (task, result) -> assignRole(USER_JACK_OID, ROLE_APPLICATION_1_OID, task, result) - ); + ); user = getUser(USER_JACK_OID); assertAssignments(user, 2); @@ -2144,15 +2124,15 @@ public void test270AutzJackAssignApplicationRoles() throws Exception { assertAllow("unassign application role from jack", (task, result) -> unassignRole(USER_JACK_OID, ROLE_APPLICATION_1_OID, task, result) - ); + ); user = getUser(USER_JACK_OID); assertAssignments(user, 1); assertAssignableRoleSpecification(getUser(USER_JACK_OID)) .relationDefault() - .filter() - .assertClass(TypeFilter.class); + .filter() + .assertClass(TypeFilter.class); assertAllowRequestAssignmentItems(USER_JACK_OID, ROLE_APPLICATION_1_OID, SchemaConstants.PATH_ASSIGNMENT_TARGET_REF, @@ -2185,8 +2165,8 @@ public void test272AutzJackAssignAnyRoles() throws Exception { assertAssignedRole(user, ROLE_ASSIGN_ANY_ROLES_OID); assertAllow("assign application role to jack", - (task, result) -> assignRole(USER_JACK_OID, ROLE_APPLICATION_1_OID, task, result) - ); + (task, result) -> assignRole(USER_JACK_OID, ROLE_APPLICATION_1_OID, task, result) + ); user = getUser(USER_JACK_OID); assertAssignments(user, 2); @@ -2197,15 +2177,15 @@ public void test272AutzJackAssignAnyRoles() throws Exception { assertAllow("unassign application role from jack", (task, result) -> unassignRole(USER_JACK_OID, ROLE_APPLICATION_1_OID, task, result) - ); + ); user = getUser(USER_JACK_OID); assertAssignments(user, 2); assertAssignableRoleSpecification(getUser(USER_JACK_OID)) .relationDefault() - .filter() - .assertClass(TypeFilter.class); + .filter() + .assertClass(TypeFilter.class); assertAllowRequestAssignmentItems(USER_JACK_OID, ROLE_APPLICATION_1_OID, SchemaConstants.PATH_ASSIGNMENT_DESCRIPTION, @@ -2243,28 +2223,27 @@ public void test273AutzJackRedyAssignmentExceptionRules() throws Exception { assertAssignedRole(user, ROLE_ASSIGN_ANY_ROLES_OID); assertDeny("assign application role to jack", - (task, result) -> assignRole(USER_JACK_OID, ROLE_APPLICATION_1_OID, null, + (task, result) -> assignRole(USER_JACK_OID, ROLE_APPLICATION_1_OID, null, assignment -> { PolicyExceptionType policyException = new PolicyExceptionType(); policyException.setRuleName("whatever"); assignment.getPolicyException().add(policyException); }, task, result) - ); + ); user = getUser(USER_JACK_OID); assertAssignments(user, 1); assertDeny("assign application role to jack", - (task, result) -> assignRole(USER_JACK_OID, ROLE_BUSINESS_1_OID, null, + (task, result) -> assignRole(USER_JACK_OID, ROLE_BUSINESS_1_OID, null, assignment -> { PolicyRuleType policyRule = new PolicyRuleType(); policyRule.setName("whatever"); assignment.setPolicyRule(policyRule); }, task, result) - ); - + ); user = getUser(USER_JACK_OID); assertAssignments(user, 1); @@ -2311,9 +2290,9 @@ public void test274AutzJackAssignNonApplicationRoles() throws Exception { assertAssignments(user, 1); assertAssignableRoleSpecification(getUser(USER_JACK_OID)) - .relationDefault() + .relationDefault() .filter() - .assertClass(TypeFilter.class); + .assertClass(TypeFilter.class); assertGlobalStateUntouched(); } @@ -2357,12 +2336,12 @@ public void test275aAutzJackAssignRequestableRoles() throws Exception { assertAssignments(user, 1); assertAssignableRoleSpecification(getUser(USER_JACK_OID)) - .relationDefault() + .relationDefault() .filter() - .assertClass(TypeFilter.class); + .assertClass(TypeFilter.class); assertAssignableRoleSpecification(getRole(ROLE_ASSIGN_REQUESTABLE_ROLES_OID), RoleType.class, 1) - .assertNoAccess(); + .assertNoAccess(); assertGlobalStateUntouched(); } @@ -2391,12 +2370,12 @@ public void test275bAutzJackAssignRequestableOrgs() throws Exception { (task, result) -> assignOrg(USER_JACK_OID, ORG_REQUESTABLE_OID, task, result)); user = getUser(USER_JACK_OID); - assertAssignments(user, OrgType.class,1); + assertAssignments(user, OrgType.class, 1); ObjectFilter jackAssignableRoleFilter = assertAssignableRoleSpecification(getUser(USER_JACK_OID)) .relationDefault() - .filter() - .getFilter(); + .filter() + .getFilter(); ObjectQuery query = prismContext.queryFactory().createQuery(); query.addFilter(jackAssignableRoleFilter); @@ -2406,7 +2385,7 @@ public void test275bAutzJackAssignRequestableOrgs() throws Exception { (task, result) -> unassignOrg(USER_JACK_OID, ORG_REQUESTABLE_OID, task, result)); user = getUser(USER_JACK_OID); - assertAssignments(user, OrgType.class,0); + assertAssignments(user, OrgType.class, 0); assertGlobalStateUntouched(); } @@ -2455,13 +2434,13 @@ public void test275cAutzJackAssignRequestableRolesAndInduceAnyRole() throws Exce assertAssignableRoleSpecification(getUser(USER_JACK_OID)) .relationDefault() - .filter() - .assertClass(TypeFilter.class); + .filter() + .assertClass(TypeFilter.class); assertAssignableRoleSpecification(getRole(ROLE_ASSIGN_REQUESTABLE_ROLES_OID), RoleType.class, 1) .relationDefault() - .filter() - .assertNull(); + .filter() + .assertNull(); assertGlobalStateUntouched(); } @@ -2510,8 +2489,8 @@ public void test276AutzJackAssignRequestableRolesWithOrgRef() throws Exception { assertAssignableRoleSpecification(user) .relationDefault() - .filter() - .assertClass(TypeFilter.class); + .filter() + .assertClass(TypeFilter.class); assertGlobalStateUntouched(); } @@ -2593,8 +2572,8 @@ public void test277AutzJackAssignRequestableRolesWithOrgRefSecondTime() throws E assertAssignableRoleSpecification(user) .relationDefault() - .filter() - .assertClass(TypeFilter.class); + .filter() + .assertClass(TypeFilter.class); assertGlobalStateUntouched(); } @@ -2632,24 +2611,24 @@ public void test278AutzJackAssignRequestableRolesWithOrgRefTweakedDelta() throws assertAssignedRole(user, ROLE_BUSINESS_1_OID); assertDeny("assign application role to jack", - (task, result) -> { - Collection> modifications = new ArrayList<>(); - ContainerDelta assignmentDelta1 = prismContext.deltaFactory().container().createDelta(UserType.F_ASSIGNMENT, getUserDefinition()); - PrismContainerValue cval = prismContext.itemFactory().createContainerValue(); - assignmentDelta1.addValueToAdd(cval); - PrismReference targetRef = cval.findOrCreateReference(AssignmentType.F_TARGET_REF); - targetRef.getValue().setOid(ROLE_BUSINESS_2_OID); - targetRef.getValue().setTargetType(RoleType.COMPLEX_TYPE); - targetRef.getValue().setRelation(null); - cval.setId(123L); - ContainerDelta assignmentDelta = assignmentDelta1; - modifications.add(assignmentDelta); - ObjectDelta userDelta1 = prismContext.deltaFactory().object() - .createModifyDelta(USER_JACK_OID, modifications, UserType.class); - ObjectDelta userDelta = userDelta1; - Collection> deltas = MiscSchemaUtil.createCollection(userDelta); - modelService.executeChanges(deltas, null, task, result); - }); + (task, result) -> { + Collection> modifications = new ArrayList<>(); + ContainerDelta assignmentDelta1 = prismContext.deltaFactory().container().createDelta(UserType.F_ASSIGNMENT, getUserDefinition()); + PrismContainerValue cval = prismContext.itemFactory().createContainerValue(); + assignmentDelta1.addValueToAdd(cval); + PrismReference targetRef = cval.findOrCreateReference(AssignmentType.F_TARGET_REF); + targetRef.getValue().setOid(ROLE_BUSINESS_2_OID); + targetRef.getValue().setTargetType(RoleType.COMPLEX_TYPE); + targetRef.getValue().setRelation(null); + cval.setId(123L); + ContainerDelta assignmentDelta = assignmentDelta1; + modifications.add(assignmentDelta); + ObjectDelta userDelta1 = prismContext.deltaFactory().object() + .createModifyDelta(USER_JACK_OID, modifications, UserType.class); + ObjectDelta userDelta = userDelta1; + Collection> deltas = MiscSchemaUtil.createCollection(userDelta); + modelService.executeChanges(deltas, null, task, result); + }); assertAllow("unassign business role from jack", (task, result) -> unassignParametricRole(USER_JACK_OID, ROLE_BUSINESS_1_OID, ORG_MINISTRY_OF_RUM_OID, null, task, result)); @@ -2660,8 +2639,8 @@ public void test278AutzJackAssignRequestableRolesWithOrgRefTweakedDelta() throws assertAssignableRoleSpecification(user) .relationDefault() - .filter() - .assertClass(TypeFilter.class); + .filter() + .assertClass(TypeFilter.class); assertGlobalStateUntouched(); } @@ -2692,8 +2671,8 @@ public void test279AutzJackAssignRequestableRolesWithTenantRef() throws Exceptio assertAssignedRole(user, ROLE_ASSIGN_REQUESTABLE_ROLES_OID); assertAllow("assign business role to jack", - (task, result) -> - assignParametricRole(USER_JACK_OID, ROLE_BUSINESS_1_OID, null, ORG_GOVERNOR_OFFICE_OID, task, result)); + (task, result) -> + assignParametricRole(USER_JACK_OID, ROLE_BUSINESS_1_OID, null, ORG_GOVERNOR_OFFICE_OID, task, result)); user = getUser(USER_JACK_OID); assertAssignments(user, 2); @@ -2703,8 +2682,8 @@ public void test279AutzJackAssignRequestableRolesWithTenantRef() throws Exceptio assignRole(USER_JACK_OID, ROLE_BUSINESS_2_OID, task, result)); assertAllow("unassign business role from jack", - (task, result) -> - unassignParametricRole(USER_JACK_OID, ROLE_BUSINESS_1_OID, null, ORG_GOVERNOR_OFFICE_OID, task, result)); + (task, result) -> + unassignParametricRole(USER_JACK_OID, ROLE_BUSINESS_1_OID, null, ORG_GOVERNOR_OFFICE_OID, task, result)); user = getUser(USER_JACK_OID); display("user after (expected 1 assignments)", user); @@ -2712,8 +2691,8 @@ public void test279AutzJackAssignRequestableRolesWithTenantRef() throws Exceptio assertAssignableRoleSpecification(user) .relationDefault() - .filter() - .assertClass(TypeFilter.class); + .filter() + .assertClass(TypeFilter.class); assertGlobalStateUntouched(); } @@ -2863,9 +2842,9 @@ private void assertCredentialsPolicy(PrismObject user) throws ObjectNo CredentialsPolicyType credentialsPolicy = modelInteractionService.getCredentialsPolicy(user, null, result); result.computeStatus(); TestUtil.assertSuccess(result); - assertNotNull("No credentials policy for "+user, credentialsPolicy); + assertNotNull("No credentials policy for " + user, credentialsPolicy); SecurityQuestionsCredentialsPolicyType securityQuestions = credentialsPolicy.getSecurityQuestions(); - assertEquals("Unexpected number of security questions for "+user, 2, securityQuestions.getQuestion().size()); + assertEquals("Unexpected number of security questions for " + user, 2, securityQuestions.getQuestion().size()); } /** @@ -2899,7 +2878,7 @@ public void test282AutzJackEndUserAndModify() throws Exception { display("RESULT", result); // MID-5066, check for normal case. Search for personaRef is OK here. assertOperationResult(result) - .repoSearches() + .repoSearches() .display() .assertContainsQuerySubstring("personaRef"); @@ -2909,7 +2888,6 @@ public void test282AutzJackEndUserAndModify() throws Exception { assertGlobalStateUntouched(); } - @Test public void test283AutzJackModifyAndEndUser() throws Exception { // GIVEN @@ -2918,7 +2896,6 @@ public void test283AutzJackModifyAndEndUser() throws Exception { assignRole(USER_JACK_OID, ROLE_USER_MODIFY_OID); assignRole(USER_JACK_OID, ROLE_END_USER_OID); - assumeAssignmentPolicy(AssignmentPolicyEnforcementType.RELATIVE); login(USER_JACK_USERNAME); @@ -2935,7 +2912,7 @@ public void test283AutzJackModifyAndEndUser() throws Exception { assertAssignments(user, 2); assertAllow("modify jack's familyName", - (task, result) -> modifyObjectReplaceProperty(UserType.class, USER_JACK_OID, UserType.F_FAMILY_NAME, task, result, PrismTestUtil.createPolyString("changed"))); + (task, result) -> modifyObjectReplaceProperty(UserType.class, USER_JACK_OID, UserType.F_FAMILY_NAME, task, result, PrismTestUtil.createPolyString("changed"))); user = getUser(USER_JACK_OID); assertUser(user, USER_JACK_OID, USER_JACK_USERNAME, "Jack changed", "Jack", "changed"); @@ -2971,7 +2948,6 @@ public void test285AutzJackEndUserAndAdd() throws Exception { assertModifyDeny(); assertDeleteDeny(); - assertGlobalStateUntouched(); } @@ -2990,9 +2966,9 @@ public void test295AutzJackAssignOrgRelation() throws Exception { ObjectFilter jackAssignableRoleFilter = assertAssignableRoleSpecification(getUser(USER_JACK_OID)) .relationDefault() - .filter() - .assertNotNull() - .getFilter(); + .filter() + .assertNotNull() + .getFilter(); Task task = createPlainTask(); SearchResultList> assignableRolesJack = @@ -3002,9 +2978,9 @@ public void test295AutzJackAssignOrgRelation() throws Exception { ObjectFilter rumAssignableRoleFilter = assertAssignableRoleSpecification(getUser(userRumRogersOid)) .relationDefault() - .filter() - .assertClass(TypeFilter.class) - .getFilter(); + .filter() + .assertClass(TypeFilter.class) + .getFilter(); SearchResultList> assignableRolesRum = modelService.searchObjects(AbstractRoleType.class, prismContext.queryFactory().createQuery(rumAssignableRoleFilter), null, task, task.getResult()); @@ -3039,16 +3015,16 @@ public void test310AutzJackNoRolePrivileged() throws Exception { // WHEN (security context elevated) runPrivileged(() -> { - try { + try { - assertSuperuserAccess(NUMBER_OF_ALL_USERS + 1); + assertSuperuserAccess(NUMBER_OF_ALL_USERS + 1); - } catch (Exception e) { - throw new RuntimeException(e.getMessage(), e); - } + } catch (Exception e) { + throw new RuntimeException(e.getMessage(), e); + } - return null; - }); + return null; + }); // WHEN (security context back to normal) assertNoAccess(userJack); @@ -3068,16 +3044,16 @@ public void test312AutzAnonymousPrivileged() throws Exception { // WHEN (security context elevated) runPrivileged(() -> { - try { + try { - assertSuperuserAccess(NUMBER_OF_ALL_USERS + 1); + assertSuperuserAccess(NUMBER_OF_ALL_USERS + 1); - } catch (Exception e) { - throw new RuntimeException(e.getMessage(), e); - } + } catch (Exception e) { + throw new RuntimeException(e.getMessage(), e); + } - return null; - }); + return null; + }); // WHEN (security context back to normal) assertNoAccess(userJack); @@ -3095,10 +3071,10 @@ public void test313AutzAnonymousPrivilegedRestore() throws Exception { // WHEN (security context elevated) runPrivileged(() -> { - // do nothing. + // do nothing. - return null; - }); + return null; + }); // WHEN (security context back to normal) assertNoAccess(userJack); @@ -3193,12 +3169,12 @@ public void test380AutzJackSelfTaskOwner() throws Exception { } private void assertTaskAddAllow(String oid, String name, String ownerOid, String handlerUri) throws Exception { - assertAllow("add task "+name, + assertAllow("add task " + name, (task, result) -> addTask(oid, name, ownerOid, handlerUri, task, result)); } private void assertTaskAddDeny(String oid, String name, String ownerOid, String handlerUri) throws Exception { - assertDeny("add task "+name, + assertDeny("add task " + name, (task, result) -> addTask(oid, name, ownerOid, handlerUri, task, result)); } diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityPrincipal.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityPrincipal.java index babb347fcd9..8d8fd106f2c 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityPrincipal.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityPrincipal.java @@ -43,7 +43,7 @@ public void test010GetUserAdministrator() throws Exception { MidPointPrincipal principal = focusProfileService.getPrincipal(USER_ADMINISTRATOR_USERNAME, UserType.class); // THEN - display("Administrator principal", principal); + displayDumpable("Administrator principal", principal); assertEquals("Wrong number of authorizations", 1, principal.getAuthorities().size()); assertHasAuthorizationAllow(principal.getAuthorities().iterator().next(), AuthorizationConstants.AUTZ_ALL_URL); @@ -77,7 +77,7 @@ public void test051GetUserBarbossa() throws Exception { MidPointPrincipal principal = focusProfileService.getPrincipal(USER_BARBOSSA_USERNAME, UserType.class); // THEN - display("Principal barbossa", principal); + displayDumpable("Principal barbossa", principal); assertNotNull("No principal for username "+USER_BARBOSSA_USERNAME, principal); assertEquals("wrong username", USER_BARBOSSA_USERNAME, principal.getUsername()); assertEquals("wrong oid", USER_BARBOSSA_OID, principal.getOid()); @@ -98,7 +98,7 @@ public void test052GetUserGuybrush() throws Exception { MidPointPrincipal principal = focusProfileService.getPrincipal(USER_GUYBRUSH_USERNAME, UserType.class); // THEN - display("Principal guybrush", principal); + displayDumpable("Principal guybrush", principal); assertEquals("wrong username", USER_GUYBRUSH_USERNAME, principal.getUsername()); assertEquals("wrong oid", USER_GUYBRUSH_OID, principal.getOid()); assertTrue("Unexpected authorizations", principal.getAuthorities().isEmpty()); @@ -122,7 +122,7 @@ public void test060GuybrushConditionalRoleFalse() throws Exception { MidPointPrincipal principal = focusProfileService.getPrincipal(USER_GUYBRUSH_USERNAME, UserType.class); // THEN - display("Principal guybrush", principal); + displayDumpable("Principal guybrush", principal); assertEquals("wrong username", USER_GUYBRUSH_USERNAME, principal.getUsername()); assertEquals("wrong oid", USER_GUYBRUSH_OID, principal.getOid()); assertTrue("Unexpected authorizations", principal.getAuthorities().isEmpty()); @@ -152,7 +152,7 @@ public void test061GuybrushConditionalRoleTrue() throws Exception { // THEN then(); - display("Principal guybrush", principal); + displayDumpable("Principal guybrush", principal); assertEquals("wrong username", USER_GUYBRUSH_USERNAME, principal.getUsername()); assertEquals("wrong oid", USER_GUYBRUSH_OID, principal.getOid()); display("User in principal guybrush", principal.getFocus().asPrismObject()); @@ -178,7 +178,7 @@ public void test062GuybrushConditionalRoleUnassign() throws Exception { MidPointPrincipal principal = focusProfileService.getPrincipal(USER_GUYBRUSH_USERNAME, UserType.class); // THEN - display("Principal guybrush", principal); + displayDumpable("Principal guybrush", principal); assertEquals("wrong username", USER_GUYBRUSH_USERNAME, principal.getUsername()); assertEquals("wrong oid", USER_GUYBRUSH_OID, principal.getOid()); assertTrue("Unexpected authorizations", principal.getAuthorities().isEmpty()); @@ -267,7 +267,7 @@ public void test110GuybrushRoleNicePirate() throws Exception { // THEN then(); - display("Principal guybrush", principal); + displayDumpable("Principal guybrush", principal); assertEquals("Wrong number of authorizations", 2, principal.getAuthorities().size()); assertNotAuthorized(principal, AUTZ_LOOT_URL); @@ -290,7 +290,7 @@ public void test111GuybrushRoleCaptain() throws Exception { // THEN then(); - display("Principal guybrush", principal); + displayDumpable("Principal guybrush", principal); assertEquals("Wrong number of authorizations", 3, principal.getAuthorities().size()); assertNotAuthorized(principal, AUTZ_LOOT_URL); @@ -342,7 +342,7 @@ public void test120JackRoleIndirectPirate() throws Exception { // THEN then(); - display("Principal guybrush", principal); + displayDumpable("Principal guybrush", principal); assertEquals("Wrong number of authorizations", 1, principal.getAuthorities().size()); assertAuthorized(principal, AUTZ_LOOT_URL, AuthorizationPhaseType.EXECUTION); @@ -373,7 +373,7 @@ public void test122JackOrgIndirectPirate() throws Exception { // THEN then(); - display("Principal guybrush", principal); + displayDumpable("Principal guybrush", principal); assertEquals("Wrong number of authorizations", 1, principal.getAuthorities().size()); assertAuthorized(principal, AUTZ_LOOT_URL, AuthorizationPhaseType.EXECUTION); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java index 012fe3e19a4..465b75ebf79 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java @@ -355,7 +355,7 @@ public void test360ModifyUserAddDummyDefaultAccount() throws Exception { assertEquals("OID of user wally have changed", userWallyOid, userWally.getOid()); ObjectDelta userDelta = createModifyUserAddAccount(userWally.getOid(), getDummyResourceObject()); - Collection> deltas = (Collection) MiscUtil.createCollection(userDelta); + Collection> deltas = MiscUtil.createCollection(userDelta); /// WHEN when(); @@ -953,7 +953,7 @@ private PrismObject checkWallyAccount(PrismObject reso } DummyAccount dummyAccount = dummy.getAccountByUsername(ACCOUNT_WALLY_DUMMY_USERNAME); - display("Account wally (" + resourceDesc + ")", dummyAccount); + displayDumpable("Account wally (" + resourceDesc + ")", dummyAccount); assertNotNull("No dummy account (" + resourceDesc + ")", dummyAccount); if (expectedFullName != null) { assertEquals("Wrong dummy account fullname (" + resourceDesc + ")", expectedFullName, 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 5bbe5e4849e..27079c14d62 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 @@ -266,12 +266,12 @@ protected void loginImportUser() throws CommonException { @Test public void test001SanityAzure() throws Exception { - display("Dummy resource azure", dummyResourceAzure); + displayDumpable("Dummy resource azure", dummyResourceAzure); // WHEN ResourceSchema resourceSchemaAzure = RefinedResourceSchemaImpl.getResourceSchema(resourceDummyAzureType, prismContext); - display("Dummy azure resource schema", resourceSchemaAzure); + displayDumpable("Dummy azure resource schema", resourceSchemaAzure); // THEN dummyResourceCtlAzure.assertDummyResourceSchemaSanityExtended(resourceSchemaAzure); @@ -285,7 +285,7 @@ public void test002SanityAzureRefined() throws Exception { // WHEN RefinedResourceSchema refinedSchemaAzure = RefinedResourceSchemaImpl.getRefinedSchema(resourceDummyAzureType, prismContext); - display("Dummy azure refined schema", refinedSchemaAzure); + displayDumpable("Dummy azure refined schema", refinedSchemaAzure); // THEN dummyResourceCtlAzure.assertRefinedSchemaSanity(refinedSchemaAzure); @@ -515,7 +515,7 @@ public void test160ImportFromResourceDummyLime() throws Exception { dummyAuditService.clear(); rememberCounter(InternalCounters.SHADOW_FETCH_OPERATION_COUNT); - display("Rapp lime account before", dummyResourceLime.getAccountByUsername(USER_RAPP_USERNAME)); + displayDumpable("Rapp lime account before", dummyResourceLime.getAccountByUsername(USER_RAPP_USERNAME)); PrismObject userRappBefore = getUser(USER_RAPP_OID); display("User rapp before", userRappBefore); @@ -576,7 +576,7 @@ public void test160ImportFromResourceDummyLime() throws Exception { assertNoImporterUserByUsername(ACCOUNT_DAVIEJONES_DUMMY_USERNAME); assertNoImporterUserByUsername(ACCOUNT_CALYPSO_DUMMY_USERNAME); - display("Rapp lime account after", dummyResourceLime.getAccountByUsername(USER_RAPP_USERNAME)); + displayDumpable("Rapp lime account after", dummyResourceLime.getAccountByUsername(USER_RAPP_USERNAME)); assertUsers(getNumberOfUsers() + 4); @@ -597,7 +597,7 @@ public void test162ImportFromResourceDummyLimeRappOrganizationScummBar() throws DummyAccount accountRappLimeBefore = dummyResourceLime.getAccountByUsername(USER_RAPP_USERNAME); accountRappLimeBefore.replaceAttributeValue(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME, ORG_SCUMM_BAR_NAME); - display("Rapp lime account before", accountRappLimeBefore); + displayDumpable("Rapp lime account before", accountRappLimeBefore); // Preconditions @@ -657,7 +657,7 @@ public void test162ImportFromResourceDummyLimeRappOrganizationScummBar() throws assertNoImporterUserByUsername(ACCOUNT_CALYPSO_DUMMY_USERNAME); DummyAccount accountRappLimeAfter = dummyResourceLime.getAccountByUsername(USER_RAPP_USERNAME); - display("Rapp lime account after", accountRappLimeAfter); + displayDumpable("Rapp lime account after", accountRappLimeAfter); assertAssignedOrg(userRappAfter, ORG_SCUMM_BAR_OID); assertAssignments(userRappAfter, 1); @@ -679,7 +679,7 @@ public void test164ImportFromResourceDummyLimeRappOrganizationNull() throws Exce DummyAccount accountRappLimeBefore = dummyResourceLime.getAccountByUsername(USER_RAPP_USERNAME); accountRappLimeBefore.replaceAttributeValues(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_LOCATION_NAME /* no value */); - display("Rapp lime account before", accountRappLimeBefore); + displayDumpable("Rapp lime account before", accountRappLimeBefore); // Preconditions @@ -741,7 +741,7 @@ public void test164ImportFromResourceDummyLimeRappOrganizationNull() throws Exce assertNoImporterUserByUsername(ACCOUNT_CALYPSO_DUMMY_USERNAME); DummyAccount accountRappLimeAfter = dummyResourceLime.getAccountByUsername(USER_RAPP_USERNAME); - display("Rapp lime account after", accountRappLimeAfter); + displayDumpable("Rapp lime account after", accountRappLimeAfter); assertNoAssignments(userRappAfter); assertUsers(getNumberOfUsers() + 4); @@ -941,7 +941,7 @@ public void test210ReconcileDummyBroken() throws Exception { TestUtil.assertFailure(reconTaskResult); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertExecutionOutcome(OperationResultStatus.FATAL_ERROR); @@ -1109,7 +1109,7 @@ public void test220ReconcileDummyBrokenGuybrush() throws Exception { assertTrue("Errors not mentioned in the task message", reconTaskResult.getMessage().contains("got 1 error")); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); assertReconAuditModifications(1, TASK_RECONCILE_DUMMY_OID); } @@ -1349,7 +1349,7 @@ public void test300ReconcileDummyAzureAddAccountOtis() throws Exception { // Create some illegal account dummyResourceCtlAzure.addAccount(ACCOUNT_OTIS_NAME, ACCOUNT_OTIS_FULLNAME); - display("Otis account before", dummyResourceAzure.getAccountByUsername(ACCOUNT_OTIS_NAME)); + displayDumpable("Otis account before", dummyResourceAzure.getAccountByUsername(ACCOUNT_OTIS_NAME)); dummyResourceAzure.purgeScriptHistory(); dummyAuditService.clear(); @@ -1382,7 +1382,7 @@ public void test300ReconcileDummyAzureAddAccountOtis() throws Exception { // Otis assertNoImporterUserByUsername(ACCOUNT_OTIS_NAME); - display("Otis account after", dummyResourceAzure.getAccountByUsername(ACCOUNT_OTIS_NAME)); + displayDumpable("Otis account after", dummyResourceAzure.getAccountByUsername(ACCOUNT_OTIS_NAME)); assertDummyAccount(RESOURCE_DUMMY_AZURE_NAME, ACCOUNT_OTIS_NAME, ACCOUNT_OTIS_FULLNAME, false); // These are protected accounts, they should not be imported @@ -1548,7 +1548,7 @@ public void test330ReconcileDummyAzureAddAccountRapp() throws Exception { dummyResourceAzure.setBreakMode(BreakMode.NONE); dummyResourceCtlAzure.addAccount(USER_RAPP_USERNAME, USER_RAPP_FULLNAME); - display("Rapp azure account before", dummyResourceAzure.getAccountByUsername(USER_RAPP_USERNAME)); + displayDumpable("Rapp azure account before", dummyResourceAzure.getAccountByUsername(USER_RAPP_USERNAME)); PrismObject userRappBefore = getUser(USER_RAPP_OID); display("User rapp before", userRappBefore); @@ -1584,7 +1584,7 @@ public void test330ReconcileDummyAzureAddAccountRapp() throws Exception { assertImportedUserByUsername(ACCOUNT_HTM_NAME, RESOURCE_DUMMY_OID); // Rapp - display("Rapp azure account after", dummyResourceAzure.getAccountByUsername(USER_RAPP_USERNAME)); + displayDumpable("Rapp azure account after", dummyResourceAzure.getAccountByUsername(USER_RAPP_USERNAME)); assertImportedUserByOid(USER_RAPP_OID, RESOURCE_DUMMY_OID, RESOURCE_DUMMY_LIME_OID, RESOURCE_DUMMY_AZURE_OID); assertDummyAccount(RESOURCE_DUMMY_AZURE_NAME, USER_RAPP_USERNAME, USER_RAPP_FULLNAME, true); assertDummyAccountAttribute(RESOURCE_DUMMY_AZURE_NAME, USER_RAPP_USERNAME, @@ -1643,7 +1643,7 @@ public void test332ModifyUserRappAndReconcileDummyAzure() throws Exception { getDummyResource().setBreakMode(BreakMode.NONE); dummyResourceAzure.setBreakMode(BreakMode.NONE); - display("Rapp azure account before", dummyResourceAzure.getAccountByUsername(USER_RAPP_USERNAME)); + displayDumpable("Rapp azure account before", dummyResourceAzure.getAccountByUsername(USER_RAPP_USERNAME)); assertDummyAccountAttribute(RESOURCE_DUMMY_AZURE_NAME, USER_RAPP_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_SHIP_NAME, "The crew of The Elaine"); @@ -1691,7 +1691,7 @@ public void test332ModifyUserRappAndReconcileDummyAzure() throws Exception { assertImportedUserByUsername(ACCOUNT_HTM_NAME, RESOURCE_DUMMY_OID); // Rapp - display("Rapp azure account after", dummyResourceAzure.getAccountByUsername(USER_RAPP_USERNAME)); + displayDumpable("Rapp azure account after", dummyResourceAzure.getAccountByUsername(USER_RAPP_USERNAME)); assertImportedUserByOid(USER_RAPP_OID, RESOURCE_DUMMY_OID, RESOURCE_DUMMY_LIME_OID, RESOURCE_DUMMY_AZURE_OID); assertDummyAccount(RESOURCE_DUMMY_AZURE_NAME, USER_RAPP_USERNAME, USER_RAPP_FULLNAME, true); assertDummyAccountAttribute(RESOURCE_DUMMY_AZURE_NAME, USER_RAPP_USERNAME, @@ -1726,7 +1726,7 @@ public void test334AssignRoleCorpseToRappAndReconcileDummyAzure() throws Excepti getDummyResource().setBreakMode(BreakMode.NONE); dummyResourceAzure.setBreakMode(BreakMode.NONE); - display("Rapp azure account before", dummyResourceAzure.getAccountByUsername(USER_RAPP_USERNAME)); + displayDumpable("Rapp azure account before", dummyResourceAzure.getAccountByUsername(USER_RAPP_USERNAME)); assertNoDummyGroupMember(RESOURCE_DUMMY_AZURE_NAME, GROUP_CORPSES_NAME, USER_RAPP_USERNAME); ObjectDelta userRappDelta = createAssignmentUserDelta(USER_RAPP_OID, ROLE_CORPSE.oid, @@ -1765,7 +1765,7 @@ public void test334AssignRoleCorpseToRappAndReconcileDummyAzure() throws Excepti assertImportedUserByUsername(ACCOUNT_HTM_NAME, RESOURCE_DUMMY_OID); // Rapp - display("Rapp azure account after", dummyResourceAzure.getAccountByUsername(USER_RAPP_USERNAME)); + displayDumpable("Rapp azure account after", dummyResourceAzure.getAccountByUsername(USER_RAPP_USERNAME)); assertImportedUserByOid(USER_RAPP_OID, RESOURCE_DUMMY_OID, RESOURCE_DUMMY_LIME_OID, RESOURCE_DUMMY_AZURE_OID); assertDummyAccount(RESOURCE_DUMMY_AZURE_NAME, USER_RAPP_USERNAME, USER_RAPP_FULLNAME, true); assertDummyGroupMember(RESOURCE_DUMMY_AZURE_NAME, GROUP_CORPSES_NAME, USER_RAPP_USERNAME); @@ -1943,7 +1943,7 @@ public void test401ReconcileDummyLimeKateOnlyEmpty() throws Exception { PrismAsserts.assertPropertyValue(userAfter, UserType.F_COST_CENTER, ""); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -1988,7 +1988,7 @@ public void test402ReconcileDummyLimeKateOnlyGrog() throws Exception { PrismAsserts.assertPropertyValue(userAfter, UserType.F_COST_CENTER, "grog"); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2034,7 +2034,7 @@ public void test403ReconcileDummyLimeKateOnlyNoValue() throws Exception { PrismAsserts.assertNoItem(userAfter, UserType.F_COST_CENTER); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2077,7 +2077,7 @@ public void test404ReconcileDummyLimeKateOnlyRum() throws Exception { PrismAsserts.assertPropertyValue(userAfter, UserType.F_COST_CENTER, "rum"); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2122,7 +2122,7 @@ public void test405ReconcileDummyLimeKateOnlyEmpty() throws Exception { PrismAsserts.assertPropertyValue(userAfter, UserType.F_COST_CENTER, ""); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2164,7 +2164,7 @@ public void test406ReconcileDummyLimeKateOnlyEmptyAgain() throws Exception { PrismAsserts.assertPropertyValue(userAfter, UserType.F_COST_CENTER, ""); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2206,7 +2206,7 @@ public void test410ReconcileDummyLimeKatePassword() throws Exception { assertPassword(userAfter, "d0d3c4h3dr0n"); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertAnyRequestDeltas(); @@ -2693,7 +2693,7 @@ private void assertDummyAccountShadows(int expected, boolean raw, Task task, Ope } private void assertImportAuditModifications(int expectedModifications) { - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); List auditRecords = dummyAuditService.getRecords(); @@ -2731,7 +2731,7 @@ private void assertImportAuditModifications(int expectedModifications) { private void assertReconAuditModifications(int expectedModifications, String taskOid) { // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); List auditRecords = dummyAuditService.getRecords(); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestInboundReconTask.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestInboundReconTask.java index b2f7d15dc0a..304009f383d 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestInboundReconTask.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestInboundReconTask.java @@ -92,7 +92,7 @@ public void test180NoChange() throws Exception { // notifications notificationManager.setDisabled(true); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertRecords(2); // reconciliation request + execution } diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestParallelDiscovery.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestParallelDiscovery.java index aa8dd916ef3..1ecfd5cbe43 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestParallelDiscovery.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestParallelDiscovery.java @@ -194,14 +194,14 @@ protected PrismObject getDefaultActor() { @Test public void test001Sanity() throws Exception { - display("Dummy resource azure", dummyResourceSteelBlue); + displayDumpable("Dummy resource azure", dummyResourceSteelBlue); // WHEN ResourceSchema resourceSchemaSteelBlue = RefinedResourceSchemaImpl.getResourceSchema(resourceDummySteelBlueType, prismContext); ResourceSchema resourceSchemaSteelGrey = RefinedResourceSchemaImpl.getResourceSchema(resourceDummySteelGreyType, prismContext); - display("Dummy steel blue resource schema", resourceSchemaSteelBlue); - display("Dummy steel grey resource schema", resourceSchemaSteelGrey); + displayDumpable("Dummy steel blue resource schema", resourceSchemaSteelBlue); + displayDumpable("Dummy steel grey resource schema", resourceSchemaSteelGrey); // THEN dummyResourceCtlSteelBlue.assertDummyResourceSchemaSanityExtended(resourceSchemaSteelBlue); @@ -214,8 +214,8 @@ public void test002SanityRefined() throws Exception { RefinedResourceSchema refinedSchemaSteelBlue = RefinedResourceSchemaImpl.getRefinedSchema(resourceDummySteelBlueType, prismContext); RefinedResourceSchema refinedSchemaSteelGrey = RefinedResourceSchemaImpl.getRefinedSchema(resourceDummySteelGreyType, prismContext); - display("Dummy steel blue refined schema", refinedSchemaSteelBlue); - display("Dummy steel grey refined schema", refinedSchemaSteelGrey); + displayDumpable("Dummy steel blue refined schema", refinedSchemaSteelBlue); + displayDumpable("Dummy steel grey refined schema", refinedSchemaSteelGrey); // THEN dummyResourceCtlSteelBlue.assertRefinedSchemaSanity(refinedSchemaSteelBlue); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestParallelSynchronization.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestParallelSynchronization.java index 13fbd6f945f..333297536c1 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestParallelSynchronization.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestParallelSynchronization.java @@ -164,12 +164,12 @@ protected PrismObject getDefaultActor() { @Test public void test001SanityAzure() throws Exception { - display("Dummy resource azure", dummyResourceSteelBlue); + displayDumpable("Dummy resource azure", dummyResourceSteelBlue); // WHEN ResourceSchema resourceSchemaAzure = RefinedResourceSchemaImpl.getResourceSchema(resourceDummySteelBlueType, prismContext); - display("Dummy azure resource schema", resourceSchemaAzure); + displayDumpable("Dummy azure resource schema", resourceSchemaAzure); // THEN dummyResourceCtlSteelBlue.assertDummyResourceSchemaSanityExtended(resourceSchemaAzure); @@ -180,7 +180,7 @@ public void test002SanityAzureRefined() throws Exception { // WHEN RefinedResourceSchema refinedSchemaAzure = RefinedResourceSchemaImpl.getRefinedSchema(resourceDummySteelBlueType, prismContext); - display("Dummy azure refined schema", refinedSchemaAzure); + displayDumpable("Dummy azure refined schema", refinedSchemaAzure); // THEN dummyResourceCtlSteelBlue.assertRefinedSchemaSanity(refinedSchemaAzure); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestProgressReporting.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestProgressReporting.java index 65d5c7800b4..8e8374ac440 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestProgressReporting.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestProgressReporting.java @@ -108,7 +108,7 @@ private void executeReconciliation(TestResource reconciliationTask, String accou displayValue("Tree after suspension", TaskDebugUtil.dumpTaskTree(rootAfterSuspension1.asObjectable())); TaskProgressExtract progress1 = TaskProgressExtract.fromTask(rootAfterSuspension1.asObjectable()); - display("Progress after suspension", progress1); + displayDumpable("Progress after suspension", progress1); System.out.println("Resuming task tree."); taskManager.resumeTaskTree(reconciliationTask.oid, result); @@ -125,7 +125,7 @@ private void executeReconciliation(TestResource reconciliationTask, String accou displayValue("Tree after second suspension", TaskDebugUtil.dumpTaskTree(rootAfterSuspension2.asObjectable())); TaskProgressExtract progress2 = TaskProgressExtract.fromTask(rootAfterSuspension2.asObjectable()); - display("Progress after second suspension", progress2); + displayDumpable("Progress after second suspension", progress2); // THEN @@ -195,7 +195,7 @@ private void executeRecomputation(TestResource recomputationTask, String rolePre displayValue("Tree after suspension", TaskDebugUtil.dumpTaskTree(rootAfterSuspension1.asObjectable())); TaskProgressExtract progress1 = TaskProgressExtract.fromTask(rootAfterSuspension1.asObjectable()); - display("Progress after suspension", progress1); + displayDumpable("Progress after suspension", progress1); System.out.println("Resuming task tree."); taskManager.resumeTaskTree(recomputationTask.oid, result); @@ -212,7 +212,7 @@ private void executeRecomputation(TestResource recomputationTask, String rolePre displayValue("Tree after second suspension", TaskDebugUtil.dumpTaskTree(rootAfterSuspension2.asObjectable())); TaskProgressExtract progress2 = TaskProgressExtract.fromTask(rootAfterSuspension2.asObjectable()); - display("Progress after second suspension", progress2); + displayDumpable("Progress after second suspension", progress2); // THEN diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java index 45d2eb41393..ebfd11b9c92 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java @@ -145,7 +145,7 @@ public void test100RecomputeAll() throws Exception { newAttrCVal.asPrismContainerValue().setId(null); rolePirateDelta.addModificationAddContainer(attrItemPath, newAttrCVal); - display("Role pirate delta", rolePirateDelta); + displayDumpable("Role pirate delta", rolePirateDelta); modelService.executeChanges(MiscSchemaUtil.createCollection(rolePirateDelta), null, task, result); displayRoles(task, result); @@ -204,7 +204,7 @@ public void test100RecomputeAll() throws Exception { assertUsers(7); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); List auditRecords = dummyAuditService.getRecords(); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestUuid.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestUuid.java index 4dd84882ae0..d9dddbc8bdb 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestUuid.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestUuid.java @@ -216,7 +216,7 @@ public void test220ReconcileDummyUuidDeleteAddAugustus() throws Exception { assumeAssignmentPolicy(AssignmentPolicyEnforcementType.NONE); DummyAccount oldAccount = dummyResourceUuid.getAccountByUsername(ACCOUNT_AUGUSTUS_NAME); - display("Deleting account", oldAccount); + displayDumpable("Deleting account", oldAccount); dummyResourceUuid.deleteAccountByName(ACCOUNT_AUGUSTUS_NAME); assertNoDummyAccount(ACCOUNT_AUGUSTUS_NAME, ACCOUNT_AUGUSTUS_NAME); @@ -226,7 +226,7 @@ public void test220ReconcileDummyUuidDeleteAddAugustus() throws Exception { newAccount.addAttributeValues(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_SHIP_NAME, USER_AUGUSTUS_NAME); dummyResourceUuid.addAccount(newAccount); newAccount = dummyResourceUuid.getAccountByUsername(ACCOUNT_AUGUSTUS_NAME); - display("Created account", newAccount); + displayDumpable("Created account", newAccount); assertFalse("Account IDs not changed", oldAccount.getId().equals(newAccount.getId())); @@ -376,7 +376,7 @@ public void test230ReconcileDummyUuidDeleteAugustusAddAugustina() throws Excepti private void assertReconAuditModifications(int expectedModifications, String taskOid) { // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); List auditRecords = dummyAuditService.getRecords(); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestValidityRecomputeTask.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestValidityRecomputeTask.java index 77ec9825fe0..f7c5ffc29a3 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestValidityRecomputeTask.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestValidityRecomputeTask.java @@ -851,7 +851,7 @@ public void test139BarbossaDisableBothAssignmentsUnassign() throws Exception { USER_BARBOSSA_OID, UserType.F_ASSIGNMENT, judgeAssignmentLight); objectDelta.addModificationDeleteContainer(UserType.F_ASSIGNMENT, sailorAssignmentLight); - display("Unassign delta", objectDelta); + displayDumpable("Unassign delta", objectDelta); // WHEN when(); @@ -1267,7 +1267,7 @@ public void test149BarbossaDisableBothRedAssignmentsUnassign() throws Exception USER_BARBOSSA_OID, UserType.F_ASSIGNMENT, judgeAssignmentLight); objectDelta.addModificationDeleteContainer(UserType.F_ASSIGNMENT, sailorAssignmentLight); - display("Unassign delta", objectDelta); + displayDumpable("Unassign delta", objectDelta); // WHEN when(); diff --git a/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java b/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java index 7642c2b82a4..186acdb39f7 100644 --- a/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java +++ b/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.net.ConnectException; import java.util.*; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Consumer; import java.util.function.Function; @@ -1575,7 +1576,7 @@ protected Collection> deltas = MiscSchemaUtil.createCollection(objectDelta); return modelService.executeChanges(deltas, options, task, result); } @@ -1601,7 +1602,7 @@ protected Collection ModelContext previewChanges(ObjectDelta objectDelta, ModelExecuteOptions options, Task task, OperationResult result) throws ObjectAlreadyExistsException, ObjectNotFoundException, SchemaException, ExpressionEvaluationException, CommunicationException, ConfigurationException, PolicyViolationException, SecurityViolationException { - display("Preview changes for delta", objectDelta); + displayDumpable("Preview changes for delta", objectDelta); Collection> deltas = MiscSchemaUtil.createCollection(objectDelta); return modelInteractionService.previewChanges(deltas, options, task, result); } @@ -3377,13 +3378,13 @@ protected OperationResult waitForTaskTreeNextFinishedRun(Task origRootTask, int Long origLastRunStartTimestamp = origRootTask.getLastRunStartTimestamp(); Long origLastRunFinishTimestamp = origRootTask.getLastRunFinishTimestamp(); long start = System.currentTimeMillis(); - Holder triggered = new Holder<>(false); // to avoid repeated checking for start-finish timestamps + AtomicBoolean triggered = new AtomicBoolean(false); OperationResult aggregateResult = new OperationResult("aggregate"); Checker checker = () -> { Task freshRootTask = taskManager.getTaskWithResult(origRootTask.getOid(), waitResult); - String s = TaskDebugUtil.dumpTaskTree(freshRootTask, waitResult); - displayValue("task tree", s); + displayValue("task tree", TaskDebugUtil.dumpTaskTree(freshRootTask, waitResult)); + displayValue("task-tree-alt", TaskDebugUtil.dumpTaskTree(freshRootTask, freshRootTask.getResult())); long waiting = (System.currentTimeMillis() - start) / 1000; String description = @@ -3391,15 +3392,22 @@ protected OperationResult waitForTaskTreeNextFinishedRun(Task origRootTask, int freshRootTask.getResultStatus() + ", p:" + freshRootTask.getProgress() + ", n:" + freshRootTask.getNode() + "] (waiting for: " + waiting + ")"; // was the whole task tree refreshed at least once after we were called? - if (!triggered.getValue() && (freshRootTask.getLastRunStartTimestamp() == null - || freshRootTask.getLastRunStartTimestamp().equals(origLastRunStartTimestamp) - || freshRootTask.getLastRunFinishTimestamp() == null - || freshRootTask.getLastRunFinishTimestamp().equals(origLastRunFinishTimestamp) - || freshRootTask.getLastRunStartTimestamp() >= freshRootTask.getLastRunFinishTimestamp())) { - display("Root (triggering) task next run has not been completed yet: " + description); + Long lastRunStartTimestamp = freshRootTask.getLastRunStartTimestamp(); + Long lastRunFinishTimestamp = freshRootTask.getLastRunFinishTimestamp(); + if (!triggered.get() && + (lastRunStartTimestamp == null + || lastRunStartTimestamp.equals(origLastRunStartTimestamp) + || lastRunFinishTimestamp == null + || lastRunFinishTimestamp.equals(origLastRunFinishTimestamp) + || lastRunStartTimestamp >= lastRunFinishTimestamp)) { + display("Root (triggering) task next run has not been completed yet: " + description + + "\n lastRunStartTimestamp=" + lastRunStartTimestamp + + ", origLastRunStartTimestamp=" + origLastRunStartTimestamp + + ", lastRunFinishTimestamp=" + lastRunFinishTimestamp + + ", origLastRunFinishTimestamp=" + origLastRunFinishTimestamp); return false; } - triggered.setValue(true); + triggered.set(true); aggregateResult.getSubresults().clear(); List subtasks = freshRootTask.listSubtasksDeeply(waitResult); @@ -5170,7 +5178,7 @@ protected void assertAllowRequestAssignmentItems(String userOid, String targetRo PrismObject target = getRole(targetRoleOid); ItemSecurityConstraints constraints = modelInteractionService.getAllowedRequestAssignmentItems(user, target, task, result); - display("Request decisions for " + target, constraints); + displayDumpable("Request decisions for " + target, constraints); for (ItemPath expectedAllowedItemPath : expectedAllowedItemPaths) { AuthorizationDecisionType decision = constraints.findItemDecision(expectedAllowedItemPath); diff --git a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTestPolicy.java b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTestPolicy.java index 3d26fee2fdb..a420267eb2c 100644 --- a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTestPolicy.java +++ b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTestPolicy.java @@ -145,7 +145,7 @@ protected OperationResult executeTest(TestDetails testDeta OperationResult result = opTask.getResult(); LensContext modelContext = testDetails.createModelContext(result); - display("Model context at test start", modelContext); + displayDumpable("Model context at test start", modelContext); // this has problems with deleting assignments by ID //assertFocusModificationSanity(modelContext); @@ -162,7 +162,7 @@ protected OperationResult executeTest(TestDetails testDeta // THEN - display("Model context after first clockwork.run", modelContext); + displayDumpable("Model context after first clockwork.run", modelContext); assertEquals("Unexpected state of the context", ModelState.PRIMARY, modelContext.getState()); assertEquals("Wrong mode after clockwork.run in " + modelContext.getState(), HookOperationMode.BACKGROUND, mode); opTask.refresh(result); @@ -184,7 +184,7 @@ protected OperationResult executeTest(TestDetails testDeta List workItems = modelService.searchContainers(CaseWorkItemType.class, getOpenItemsQuery(), options1, opTask, result); - display("changes by state after first clockwork run", workflowManager + displayDumpable("changes by state after first clockwork run", workflowManager .getChangesByState(rootCase, modelInteractionService, prismContext, opTask, result)); testDetails.afterFirstClockworkRun(rootCase, case0, subcases, workItems, opTask, result); @@ -193,7 +193,7 @@ protected OperationResult executeTest(TestDetails testDeta if (case0 != null) { testHelper.waitForCaseClose(case0, 20000); } - display("changes by state after case0 finishes", workflowManager + displayDumpable("changes by state after case0 finishes", workflowManager .getChangesByState(rootCase, modelInteractionService, prismContext, opTask, result)); testDetails.afterCase0Finishes(rootCase, opTask, result); } @@ -272,7 +272,7 @@ protected OperationResult executeTest(TestDetails testDeta subcases = miscHelper.getSubcases(rootCaseAfter, result); WfTestHelper.findAndRemoveCase0(subcases); - display("changes by state after root case finishes", workflowManager + displayDumpable("changes by state after root case finishes", workflowManager .getChangesByState(rootCaseAfter, modelInteractionService, prismContext, opTask, result)); testDetails.afterRootCaseFinishes(rootCaseAfter, subcases, opTask, result); @@ -280,8 +280,8 @@ protected OperationResult executeTest(TestDetails testDeta notificationManager.setDisabled(true); // Check audit - display("Audit", dummyAuditService); - display("Output context", modelContext); + displayDumpable("Audit", dummyAuditService); + displayDumpable("Output context", modelContext); return result; } diff --git a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/association/TestAddAssociation.java b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/association/TestAddAssociation.java index 11d7b4daabd..6f6b66ee9d1 100644 --- a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/association/TestAddAssociation.java +++ b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/association/TestAddAssociation.java @@ -186,7 +186,7 @@ public void assertsAfterClockworkRun(CaseType rootCase, CaseType case0, List subcases, Task opTask, OperationResult result) throws Exception { ModelContext taskModelContext = miscHelper.getModelContext(rootCase, opTask, result); - PrismTestUtil.display("model context from the root task", taskModelContext); + displayDumpable("model context from the root task", taskModelContext); // assertEquals("Wrong # of projection contexts in root task", 1, taskModelContext.getProjectionContexts().size()); // assertTrue("There are modifications in primary focus delta", ObjectDelta.isEmpty(taskModelContext.getFocusContext().getPrimaryDelta())); // assertTrue("There are modifications left in primary projection delta", @@ -266,7 +266,7 @@ public void assertsAfterClockworkRun(CaseType rootCase, CaseType case0, List subcases, Task opTask, OperationResult result) throws Exception { ModelContext taskModelContext = miscHelper.getModelContext(rootCase, opTask, result); - PrismTestUtil.display("model context from the root task", taskModelContext); + displayDumpable("model context from the root task", taskModelContext); // assertEquals("Wrong # of projection contexts in root task", 1, taskModelContext.getProjectionContexts().size()); // assertTrue("There are modifications in primary focus delta", ObjectDelta.isEmpty(taskModelContext.getFocusContext().getPrimaryDelta())); // assertTrue("There are modifications left in primary projection delta", @@ -362,18 +362,19 @@ void assertsAfterClockworkRun(CaseType rootCase, CaseType case0, List subcases, Task opTask, OperationResult result) throws Exception { } - void assertsAfterImmediateExecutionFinished(CaseType task, OperationResult result) throws Exception { + void assertsAfterImmediateExecutionFinished(CaseType task, OperationResult result) { } - void assertsRootCaseFinishes(CaseType aCase, List subcases, Task opTask, - OperationResult result) throws Exception { + void assertsRootCaseFinishes( + CaseType aCase, List subcases, Task opTask, OperationResult result) + throws Exception { } - boolean decideOnApproval(CaseType subcase, ApprovalContextType wfContext) throws Exception { + boolean decideOnApproval(CaseType subcase, ApprovalContextType wfContext) { return true; } - String getObjectOid(CaseType task, OperationResult result) throws SchemaException { + String getObjectOid(CaseType task, OperationResult result) { return null; } @@ -398,7 +399,7 @@ private void executeTest(String testName, String focusOid, TestDetails testDetai //noinspection unchecked LensContext context = (LensContext) testDetails.createModelContext(task, result); - display("Input context", context); + displayDumpable("Input context", context); assertFocusModificationSanity(context); // WHEN @@ -479,9 +480,9 @@ private void executeTest(String testName, String focusOid, TestDetails testDetai notificationManager.setDisabled(true); // Check audit - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); - display("Output context", context); + displayDumpable("Output context", context); } private void assertObjectInTaskTree(CaseType rootCase, String oid, boolean checkObjectOnSubtasks, OperationResult result) throws SchemaException { diff --git a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/ManualResourceTest.java b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/ManualResourceTest.java index e09049727a7..e655c682ca8 100644 --- a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/ManualResourceTest.java +++ b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/ManualResourceTest.java @@ -183,8 +183,8 @@ public void test100AssignWillRoleOne() throws Exception { assertAccountWillAfterAssign(USER_WILL_FULL_NAME); - display("dummy audit", dummyAuditService); - display("dummy transport", dummyTransport); + displayDumpable("dummy audit", dummyAuditService); + displayDumpable("dummy transport", dummyTransport); } /** @@ -237,8 +237,8 @@ public void test110CloseCaseAndRecomputeWill() throws Exception { assertWillAfterCreateCaseClosed(); - display("dummy audit", dummyAuditService); - display("dummy transport", dummyTransport); + displayDumpable("dummy audit", dummyAuditService); + displayDumpable("dummy transport", dummyTransport); } private void assertAccountWillAfterAssign(String expectedFullName) throws Exception { diff --git a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/TestEscalation.java b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/TestEscalation.java index e2a8cd7b436..d0c95666ab7 100644 --- a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/TestEscalation.java +++ b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/TestEscalation.java @@ -7,6 +7,19 @@ package com.evolveum.midpoint.wf.impl.other; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertNotNull; + +import java.io.File; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.ContextConfiguration; +import org.testng.annotations.Test; + import com.evolveum.midpoint.audit.api.AuditEventRecord; import com.evolveum.midpoint.audit.api.AuditEventType; import com.evolveum.midpoint.notifications.api.transports.Message; @@ -24,23 +37,11 @@ import com.evolveum.midpoint.wf.impl.AbstractWfTestPolicy; import com.evolveum.midpoint.wf.util.ApprovalUtils; import com.evolveum.midpoint.xml.ns._public.common.common_3.*; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.ContextConfiguration; -import org.testng.annotations.Test; - -import java.io.File; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertNotNull; /** * @author mederly */ -@ContextConfiguration(locations = {"classpath:ctx-workflow-test-main.xml"}) +@ContextConfiguration(locations = { "classpath:ctx-workflow-test-main.xml" }) @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) public class TestEscalation extends AbstractWfTestPolicy { @@ -161,7 +162,6 @@ public void test120EscalateAfter12Days() throws Exception { public void test130CompleteAfter14Days() throws Exception { login(userAdministrator); - Task task = getTestTask(); OperationResult result = getTestOperationResult(); clock.resetOverride(); @@ -235,7 +235,7 @@ public void test210EscalateAfter3Days() throws Exception { assertEquals("Wrong # of triggers", 2, aCase.getTrigger().size()); displayCollection("audit records", dummyAuditService.getRecords()); - display("dummy transport", dummyTransport); + displayDumpable("dummy transport", dummyTransport); assertEquals("Wrong # of work items", 2, workItems.size()); assertEquals("The work item deadlines differ after escalation", workItems.get(0).getDeadline(), workItems.get(1).getDeadline()); @@ -271,12 +271,12 @@ public void test220Reject() throws Exception { if (event instanceof WorkItemCompletionEventType) { WorkItemCompletionEventType c = (WorkItemCompletionEventType) event; eventMap.put(c.getExternalWorkItemId(), c); - assertNotNull("No result in "+c, c.getOutput()); - assertEquals("Wrong outcome in "+c, WorkItemOutcomeType.REJECT, ApprovalUtils.fromUri(c.getOutput().getOutcome())); - assertNotNull("No cause in "+c, c.getCause()); - assertEquals("Wrong cause type in "+c, WorkItemEventCauseTypeType.TIMED_ACTION, c.getCause().getType()); - assertEquals("Wrong cause name in "+c, "auto-reject", c.getCause().getName()); - assertEquals("Wrong cause display name in "+c, "Automatic rejection at deadline", c.getCause().getDisplayName()); + assertNotNull("No result in " + c, c.getOutput()); + assertEquals("Wrong outcome in " + c, WorkItemOutcomeType.REJECT, ApprovalUtils.fromUri(c.getOutput().getOutcome())); + assertNotNull("No cause in " + c, c.getCause()); + assertEquals("Wrong cause type in " + c, WorkItemEventCauseTypeType.TIMED_ACTION, c.getCause().getType()); + assertEquals("Wrong cause name in " + c, "auto-reject", c.getCause().getName()); + assertEquals("Wrong cause display name in " + c, "Automatic rejection at deadline", c.getCause().getDisplayName()); } } displayValue("completion event map", eventMap); @@ -286,10 +286,10 @@ public void test220Reject() throws Exception { List workItemAuditRecords = dummyAuditService.getRecordsOfType(AuditEventType.WORK_ITEM); assertEquals("Wrong # of work item audit records", 2, workItemAuditRecords.size()); for (AuditEventRecord r : workItemAuditRecords) { - assertEquals("Wrong causeType in "+r, Collections.singleton("timedAction"), r.getPropertyValues(WorkflowConstants.AUDIT_CAUSE_TYPE)); - assertEquals("Wrong causeName in "+r, Collections.singleton("auto-reject"), r.getPropertyValues(WorkflowConstants.AUDIT_CAUSE_NAME)); - assertEquals("Wrong causeDisplayName in "+r, Collections.singleton("Automatic rejection at deadline"), r.getPropertyValues(WorkflowConstants.AUDIT_CAUSE_DISPLAY_NAME)); - assertEquals("Wrong result in "+r, "Rejected", r.getResult()); + assertEquals("Wrong causeType in " + r, Collections.singleton("timedAction"), r.getPropertyValues(WorkflowConstants.AUDIT_CAUSE_TYPE)); + assertEquals("Wrong causeName in " + r, Collections.singleton("auto-reject"), r.getPropertyValues(WorkflowConstants.AUDIT_CAUSE_NAME)); + assertEquals("Wrong causeDisplayName in " + r, Collections.singleton("Automatic rejection at deadline"), r.getPropertyValues(WorkflowConstants.AUDIT_CAUSE_DISPLAY_NAME)); + assertEquals("Wrong result in " + r, "Rejected", r.getResult()); } displayCollection("notifications - process", dummyTransport.getMessages("dummy:simpleWorkflowNotifier-Processes")); List notifications = dummyTransport.getMessages("dummy:simpleWorkflowNotifier-WorkItems"); @@ -302,8 +302,7 @@ public void test220Reject() throws Exception { private void assertContains(Message notification, String text) { if (!notification.getBody().contains(text)) { - fail("No '"+text+"' in "+notification); + fail("No '" + text + "' in " + notification); } } - } diff --git a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/TestMiscellaneous.java b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/TestMiscellaneous.java index a21d2a9b03c..763460786a7 100644 --- a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/TestMiscellaneous.java +++ b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/TestMiscellaneous.java @@ -7,6 +7,18 @@ package com.evolveum.midpoint.wf.impl.other; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertNotNull; + +import java.io.File; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.ContextConfiguration; +import org.testng.annotations.Test; + import com.evolveum.midpoint.audit.api.AuditEventRecord; import com.evolveum.midpoint.audit.api.AuditEventType; import com.evolveum.midpoint.model.api.ModelExecuteOptions; @@ -21,22 +33,11 @@ import com.evolveum.midpoint.wf.impl.AbstractWfTestPolicy; import com.evolveum.midpoint.wf.util.ApprovalUtils; import com.evolveum.midpoint.xml.ns._public.common.common_3.*; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.ContextConfiguration; -import org.testng.annotations.Test; - -import java.io.File; -import java.util.Collection; -import java.util.Collections; -import java.util.List; - -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertNotNull; /** * @author mederly */ -@ContextConfiguration(locations = {"classpath:ctx-workflow-test-main.xml"}) +@ContextConfiguration(locations = { "classpath:ctx-workflow-test-main.xml" }) @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) public class TestMiscellaneous extends AbstractWfTestPolicy { @@ -143,7 +144,7 @@ public void test100RequesterComment() throws Exception { assertNotNull("Original assignee is null", event2.getOriginalAssigneeRef()); assertEquals("Wrong original assignee OID", USER_SCOTT_OID, event2.getOriginalAssigneeRef().getOid()); - display("audit", dummyAuditService); + displayDumpable("audit", dummyAuditService); List records = dummyAuditService.getRecordsOfType(AuditEventType.WORKFLOW_PROCESS_INSTANCE); assertEquals("Wrong # of process instance audit records", 2, records.size()); for (int i = 0; i < records.size(); i++) { @@ -210,7 +211,7 @@ public void test105RequesterCommentImmediate() throws Exception { assertNotNull("Original assignee is null", event2.getOriginalAssigneeRef()); assertEquals("Wrong original assignee OID", USER_SCOTT_OID, event2.getOriginalAssigneeRef().getOid()); - display("audit", dummyAuditService); + displayDumpable("audit", dummyAuditService); List records = dummyAuditService.getRecordsOfType(AuditEventType.WORKFLOW_PROCESS_INSTANCE); assertEquals("Wrong # of process instance audit records", 2, records.size()); for (int i = 0; i < records.size(); i++) { @@ -352,9 +353,9 @@ public void test250SkippingApprovals() throws Exception { // WHEN ObjectDelta delta = prismContext.deltaFor(UserType.class) - .item(UserType.F_ASSIGNMENT) + .item(UserType.F_ASSIGNMENT) .add(ObjectTypeUtil.createAssignmentTo(ROLE_CAPTAIN_OID, ObjectTypes.ROLE, prismContext)) - .asObjectDelta(userJackOid); + .asObjectDelta(userJackOid); ModelExecuteOptions options = ModelExecuteOptions.createPartialProcessing( new PartialProcessingOptionsType().approvals(PartialProcessingTypeType.SKIP)); modelService.executeChanges(Collections.singletonList(delta), options, task, result); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/AbstractProvisioningIntegrationTest.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/AbstractProvisioningIntegrationTest.java index 55b34782e0b..84f96da1480 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/AbstractProvisioningIntegrationTest.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/AbstractProvisioningIntegrationTest.java @@ -189,7 +189,7 @@ protected void assertSteadyResource() throws SchemaException { assertConnectorInstanceUnchanged(resource); } - display("Resource cache", InternalMonitor.getResourceCacheStats()); + displayDumpable("Resource cache", InternalMonitor.getResourceCacheStats()); // We do not assert hits, there may be a lot of them assertResourceCacheMissesIncrement(0); } diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdate.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdate.java index 951a59b7321..d6a93c79dbf 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdate.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdate.java @@ -197,7 +197,7 @@ public void test005ParsedSchema() throws Exception { // Also test if the utility method returns the same thing ResourceSchema resourceSchema = RefinedResourceSchemaImpl.getResourceSchema(resource.asObjectable(), prismContext); - display("Parsed resource schema", resourceSchema); + displayDumpable("Parsed resource schema", resourceSchema); // Check whether it is reusing the existing schema and not parsing it all over again // Not equals() but == ... we want to really know if exactly the same @@ -231,7 +231,7 @@ public void test100ListeningForShadowAdd() throws Exception { provisioningService.processAsynchronousUpdates(coords, task, result); ResourceObjectShadowChangeDescription lastChange = syncServiceMock.getLastChange(); - display("The change", lastChange); + displayDumpable("The change", lastChange); PrismObject oldShadow = lastChange.getOldShadow(); assertNotNull("Old shadow missing", oldShadow); @@ -261,7 +261,7 @@ public void test110ListeningForValueAdd() throws Exception { provisioningService.processAsynchronousUpdates(coords, task, result); ResourceObjectShadowChangeDescription lastChange = syncServiceMock.getLastChange(); - display("The change", lastChange); + displayDumpable("The change", lastChange); PrismObject oldShadow = lastChange.getOldShadow(); assertNotNull("Old shadow missing", oldShadow); @@ -299,7 +299,7 @@ public void test112ListeningForValueAddMore() throws Exception { provisioningService.processAsynchronousUpdates(coords, task, result); ResourceObjectShadowChangeDescription lastChange = syncServiceMock.getLastChange(); - display("The change", lastChange); + displayDumpable("The change", lastChange); PrismObject oldShadow = lastChange.getOldShadow(); assertNotNull("Old shadow missing", oldShadow); @@ -337,7 +337,7 @@ public void test115ListeningForValueDelete() throws Exception { provisioningService.processAsynchronousUpdates(coords, task, result); ResourceObjectShadowChangeDescription lastChange = syncServiceMock.getLastChange(); - display("The change", lastChange); + displayDumpable("The change", lastChange); PrismObject oldShadow = lastChange.getOldShadow(); assertNotNull("Old shadow missing", oldShadow); @@ -375,7 +375,7 @@ public void test117ListeningForValueReplace() throws Exception { provisioningService.processAsynchronousUpdates(coords, task, result); ResourceObjectShadowChangeDescription lastChange = syncServiceMock.getLastChange(); - display("The change", lastChange); + displayDumpable("The change", lastChange); PrismObject oldShadow = lastChange.getOldShadow(); assertNotNull("Old shadow missing", oldShadow); @@ -413,7 +413,7 @@ public void test120ListeningForShadowReplace() throws Exception { provisioningService.processAsynchronousUpdates(coords, task, result); ResourceObjectShadowChangeDescription lastChange = syncServiceMock.getLastChange(); - display("The change", lastChange); + displayDumpable("The change", lastChange); PrismObject oldShadow = lastChange.getOldShadow(); assertNotNull("Old shadow missing", oldShadow); @@ -445,7 +445,7 @@ public void test125ListeningForNotificationOnly() throws Exception { provisioningService.processAsynchronousUpdates(coords, task, result); ResourceObjectShadowChangeDescription lastChange = syncServiceMock.getLastChange(); - display("The change", lastChange); + displayDumpable("The change", lastChange); PrismObject oldShadow = lastChange.getOldShadow(); assertNotNull("Old shadow missing", oldShadow); @@ -472,7 +472,7 @@ public void test130ListeningForShadowDelete() throws Exception { provisioningService.processAsynchronousUpdates(coords, task, result); ResourceObjectShadowChangeDescription lastChange = syncServiceMock.getLastChange(); - display("The change", lastChange); + displayDumpable("The change", lastChange); PrismObject oldShadow = lastChange.getOldShadow(); assertNotNull("Old shadow missing", oldShadow); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/csv/AbstractCsvTest.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/csv/AbstractCsvTest.java index ebff89f2938..fee1355078c 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/csv/AbstractCsvTest.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/csv/AbstractCsvTest.java @@ -201,7 +201,7 @@ public void test005ParsedSchema() throws Exception { // Also test if the utility method returns the same thing ResourceSchema resourceSchema = RefinedResourceSchemaImpl.getResourceSchema(resourceType, prismContext); - display("Parsed resource schema", resourceSchema); + displayDumpable("Parsed resource schema", resourceSchema); assertNotNull("No resource schema", resourceSchema); ObjectClassComplexTypeDefinition accountDef = resourceSchema.findObjectClassDefinition(RESOURCE_CSV_ACCOUNT_OBJECTCLASS); @@ -222,7 +222,7 @@ public void test005ParsedSchema() throws Exception { // Check whether it is reusing the existing schema and not parsing it all over again // Not equals() but == ... we want to really know if exactly the same // object instance is returned - assertTrue("Broken caching", resourceSchema == RefinedResourceSchemaImpl.getResourceSchema(resourceType, prismContext)); + assertSame("Broken caching", resourceSchema, RefinedResourceSchemaImpl.getResourceSchema(resourceType, prismContext)); } @@ -333,7 +333,7 @@ public void test120ModifyShadowPrimaryIdentifier() throws Exception { // getAccountJackOid(), ItemPath.create(ShadowType.F_ATTRIBUTES, getQNameOfUID()), newValueOfUIDAttr); PropertyDelta delta = prismContext.deltaFactory().property().createReplaceDelta(shadowBefore.getDefinition(), ShadowType.F_PRIMARY_IDENTIFIER_VALUE, newValueOfUIDAttr); - display("PropertyDelta", delta); + displayDumpable("PropertyDelta", delta); // WHEN when(); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractBasicDummyTest.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractBasicDummyTest.java index 7238f90e89f..17d67bbdf44 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractBasicDummyTest.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractBasicDummyTest.java @@ -166,7 +166,7 @@ public void test010ListConnectors() throws Exception { assertNotNull("Cannot parse schema", schema); assertFalse("Empty schema", schema.isEmpty()); - display("Parsed connector schema " + conn, schema); + displayDumpable("Parsed connector schema " + conn, schema); QName configurationElementQname = new QName(conn.getNamespace(), ResourceType.F_CONNECTOR_CONFIGURATION.getLocalPart()); PrismContainerDefinition configurationContainer = schema @@ -410,7 +410,7 @@ public void test022ParsedSchema() throws Exception { // Also test if the utility method returns the same thing ResourceSchema returnedSchema = RefinedResourceSchemaImpl.getResourceSchema(resourceType, prismContext); - display("Parsed resource schema", returnedSchema); + displayDumpable("Parsed resource schema", returnedSchema); // Check whether it is reusing the existing schema and not parsing it // all over again @@ -433,7 +433,7 @@ public void test023RefinedSchema() throws Exception { // WHEN RefinedResourceSchema refinedSchema = RefinedResourceSchemaImpl.getRefinedSchema(resourceType, prismContext); - display("Refined schema", refinedSchema); + displayDumpable("Refined schema", refinedSchema); // Check whether it is reusing the existing schema and not parsing it // all over again @@ -524,7 +524,7 @@ public void test024ParsedSchemaAgain() throws Exception { // Also test if the utility method returns the same thing ResourceSchema returnedSchema = RefinedResourceSchemaImpl.getResourceSchema(resourceType, prismContext); - display("Parsed resource schema", returnedSchema); + displayDumpable("Parsed resource schema", returnedSchema); assertSchemaSanity(returnedSchema, resourceType); assertResourceSchemaUnchanged(returnedSchema); @@ -809,7 +809,7 @@ public void test032ResourceAndConnectorCaching() throws Exception { resource.asObjectable().setFetchResult(null); resourceAgain.asObjectable().setFetchResult(null); ObjectDelta dummyResourceDiff = DiffUtil.diff(resource, resourceAgain); - display("Dummy resource diff", dummyResourceDiff); + displayDumpable("Dummy resource diff", dummyResourceDiff); assertTrue("The resource read again is not the same as the original. diff:" + dummyResourceDiff, dummyResourceDiff.isEmpty()); // Now we stick our nose deep inside the provisioning impl. But we need diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java index 5abae446ac5..82468071d3f 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java @@ -170,7 +170,7 @@ public void test101AddAccountWithoutName() throws Exception { // Check if the account was created in the dummy resource DummyAccount dummyAccount = getDummyAccountAssert(transformNameFromResource(ACCOUNT_MORGAN_NAME), getIcfUid(provisioningAccountType)); - display("Dummy account", dummyAccount); + displayDumpable("Dummy account", dummyAccount); assertNotNull("No dummy account", dummyAccount); assertEquals("Fullname is wrong", "Captain Morgan", dummyAccount.getAttributeValue("fullname")); assertTrue("The account is not enabled", dummyAccount.isEnabled()); @@ -572,7 +572,7 @@ public void test112SeachIterativeKindIntent() throws Exception { ObjectQuery query = ObjectQueryUtil.createResourceAndKindIntent(RESOURCE_DUMMY_OID, ShadowKindType.ACCOUNT, "default", prismContext); - display("query", query); + displayDumpable("query", query); final List> foundObjects = new ArrayList<>(); @@ -622,7 +622,7 @@ public void test113SearchAllShadowsInRepository() throws Exception { OperationResult result = new OperationResult(TestDummy.class.getName() + ".test113SearchAllShadowsInRepository"); ObjectQuery query = IntegrationTestTools.createAllShadowsQuery(resourceType, prismContext); - display("All shadows query", query); + displayDumpable("All shadows query", query); // WHEN List> allShadows = repositoryService.searchObjects(ShadowType.class, @@ -646,7 +646,7 @@ public void test114SearchAllAccounts() throws Exception { OperationResult result = createOperationResult(); ObjectQuery query = IntegrationTestTools.createAllShadowsQuery(resourceType, SchemaTestConstants.ICF_ACCOUNT_OBJECT_CLASS_LOCAL_NAME, prismContext); - display("All shadows query", query); + displayDumpable("All shadows query", query); // WHEN List> allShadows = provisioningService.searchObjects(ShadowType.class, @@ -674,7 +674,7 @@ public void test115CountAllAccounts() throws Exception { OperationResult result = createOperationResult(); ObjectQuery query = IntegrationTestTools.createAllShadowsQuery(resourceType, SchemaTestConstants.ICF_ACCOUNT_OBJECT_CLASS_LOCAL_NAME, prismContext); - display("All shadows query", query); + displayDumpable("All shadows query", query); // WHEN when(); @@ -750,7 +750,7 @@ public void test118SearchAllAccountsLongStaleness() throws Exception { OperationResult result = createOperationResult(); ObjectQuery query = IntegrationTestTools.createAllShadowsQuery(resourceType, SchemaTestConstants.ICF_ACCOUNT_OBJECT_CLASS_LOCAL_NAME, prismContext); - display("All shadows query", query); + displayDumpable("All shadows query", query); rememberCounter(InternalCounters.SHADOW_FETCH_OPERATION_COUNT); @@ -795,7 +795,7 @@ public void test119SearchAllAccountsMaxStaleness() throws Exception { OperationResult result = createOperationResult(); ObjectQuery query = IntegrationTestTools.createAllShadowsQuery(resourceType, SchemaTestConstants.ICF_ACCOUNT_OBJECT_CLASS_LOCAL_NAME, prismContext); - display("All shadows query", query); + displayDumpable("All shadows query", query); rememberCounter(InternalCounters.SHADOW_FETCH_OPERATION_COUNT); @@ -838,7 +838,7 @@ public void test120ModifyWillReplaceFullname() throws Exception { ObjectDelta delta = prismContext.deltaFactory().object().createModificationReplaceProperty(ShadowType.class, ACCOUNT_WILL_OID, dummyResourceCtl.getAttributeFullnamePath(), "Pirate Will Turner"); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -869,7 +869,7 @@ public void test121ModifyObjectAddPirate() throws Exception { ACCOUNT_WILL_OID, dummyResourceCtl.getAttributePath(DUMMY_ACCOUNT_ATTRIBUTE_TITLE_NAME), "Pirate"); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -901,7 +901,7 @@ public void test122ModifyObjectAddCaptain() throws Exception { ACCOUNT_WILL_OID, dummyResourceCtl.getAttributePath(DUMMY_ACCOUNT_ATTRIBUTE_TITLE_NAME), "Captain"); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -932,7 +932,7 @@ public void test123ModifyObjectDeletePirate() throws Exception { ObjectDelta delta = prismContext.deltaFactory().object().createModificationDeleteProperty(ShadowType.class, ACCOUNT_WILL_OID, dummyResourceCtl.getAttributePath(DUMMY_ACCOUNT_ATTRIBUTE_TITLE_NAME), "Pirate"); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -967,7 +967,7 @@ public void test124ModifyAccountWillAddCaptainAgain() throws Exception { ObjectDelta delta = prismContext.deltaFactory().object().createModificationAddProperty(ShadowType.class, ACCOUNT_WILL_OID, dummyResourceCtl.getAttributePath(DUMMY_ACCOUNT_ATTRIBUTE_TITLE_NAME), "Captain"); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -1010,7 +1010,7 @@ public void test126ModifyAccountWillPassword() throws Exception { syncServiceMock.reset(); ObjectDelta delta = createAccountPaswordDelta(ACCOUNT_WILL_OID, ACCOUNT_WILL_PASSWORD_123, null); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); // WHEN when(); @@ -1167,7 +1167,7 @@ public void test132ModifyScript() throws Exception { ObjectDelta delta = prismContext.deltaFactory().object().createModificationReplaceProperty(ShadowType.class, ACCOUNT_NEW_SCRIPT_OID, dummyResourceCtl.getAttributeFullnamePath(), "Will Turner"); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -1211,7 +1211,7 @@ public void test133ModifyScriptNoExec() throws Exception { ObjectDelta delta = prismContext.deltaFactory().object().createModificationReplaceProperty(ShadowType.class, ACCOUNT_NEW_SCRIPT_OID, ShadowType.F_DESCRIPTION, "Blah blah"); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -1319,7 +1319,7 @@ public void test150DisableAccount() throws Exception { ObjectDelta delta = prismContext.deltaFactory().object().createModificationReplaceProperty(ShadowType.class, ACCOUNT_WILL_OID, SchemaConstants.PATH_ACTIVATION_ADMINISTRATIVE_STATUS, ActivationStatusType.DISABLED); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -1390,7 +1390,7 @@ public void test152ActivationStatusUndefinedAccount() throws Exception { ObjectDelta delta = prismContext.deltaFactory().object().createModificationDeleteProperty(ShadowType.class, ACCOUNT_WILL_OID, SchemaConstants.PATH_ACTIVATION_ADMINISTRATIVE_STATUS, ActivationStatusType.DISABLED); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -1434,7 +1434,7 @@ public void test154EnableAccount() throws Exception { ObjectDelta delta = prismContext.deltaFactory().object().createModificationReplaceProperty(ShadowType.class, ACCOUNT_WILL_OID, SchemaConstants.PATH_ACTIVATION_ADMINISTRATIVE_STATUS, ActivationStatusType.ENABLED); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -1712,7 +1712,7 @@ public void test162UnlockAccount() throws Exception { ObjectDelta delta = prismContext.deltaFactory().object().createModificationReplaceProperty(ShadowType.class, ACCOUNT_WILL_OID, SchemaConstants.PATH_ACTIVATION_LOCKOUT_STATUS, LockoutStatusType.NORMAL); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -2048,7 +2048,7 @@ private ObjectQuery createOnOffQuery() throws SchemaException { .and().itemWithDef(attrDef, ShadowType.F_ATTRIBUTES, attrDef.getItemName()).eq("Sea Monkey") .and().item(ShadowType.F_DEAD).eq(true) .build(); - display("Query", query); + displayDumpable("Query", query); return query; } @@ -2104,7 +2104,7 @@ private SearchResultMetadata testSearchIterative( } } - display("Query", query); + displayDumpable("Query", query); final List> foundObjects = new ArrayList<>(); ResultHandler handler = new ResultHandler() { @@ -2181,7 +2181,7 @@ private SearchResultMetadata testSeachIterativePaging(ObjectFilter attrFilter, } query.setPaging(paging); - display("Query", query); + displayDumpable("Query", query); final List> foundObjects = new ArrayList<>(); ResultHandler handler = new ResultHandler() { @@ -2375,7 +2375,7 @@ public void test205ModifyGroupReplace() throws Exception { GROUP_PIRATES_OID, dummyResourceCtl.getAttributePath(DummyResourceContoller.DUMMY_GROUP_ATTRIBUTE_DESCRIPTION), "Bloodthirsty pirates"); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -2567,7 +2567,7 @@ public void test220EntitleAccountWillPirates() throws Exception { ObjectDelta delta = IntegrationTestTools.createEntitleDelta(ACCOUNT_WILL_OID, dummyResourceCtl.getAttributeQName(DummyResourceContoller.DUMMY_ENTITLEMENT_GROUP_NAME), GROUP_PIRATES_OID, prismContext); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -2638,7 +2638,7 @@ public void test222EntitleAccountWillPillage() throws Exception { ObjectDelta delta = IntegrationTestTools.createEntitleDelta(ACCOUNT_WILL_OID, ASSOCIATION_PRIV_NAME, PRIVILEGE_PILLAGE_OID, prismContext); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -2690,7 +2690,7 @@ public void test223EntitleAccountWillBargain() throws Exception { ObjectDelta delta = IntegrationTestTools.createEntitleDelta(ACCOUNT_WILL_OID, ASSOCIATION_PRIV_NAME, PRIVILEGE_BARGAIN_OID, prismContext); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -2913,7 +2913,7 @@ public void test230DetitleAccountWillPirates() throws Exception { ObjectDelta delta = IntegrationTestTools.createDetitleDelta(ACCOUNT_WILL_OID, dummyResourceCtl.getAttributeQName(DummyResourceContoller.DUMMY_ENTITLEMENT_GROUP_NAME), GROUP_PIRATES_OID, prismContext); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -2943,7 +2943,7 @@ public void test232EntitleAccountWillPiratesIdentifiersName() throws Exception { ObjectDelta delta = IntegrationTestTools.createEntitleDeltaIdentifiers(ACCOUNT_WILL_OID, dummyResourceCtl.getAttributeQName(DummyResourceContoller.DUMMY_ENTITLEMENT_GROUP_NAME), SchemaConstants.ICFS_NAME, GROUP_PIRATES_NAME, prismContext); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -2973,7 +2973,7 @@ public void test233DetitleAccountWillPiratesIdentifiersName() throws Exception { ObjectDelta delta = IntegrationTestTools.createDetitleDeltaIdentifiers(ACCOUNT_WILL_OID, dummyResourceCtl.getAttributeQName(DummyResourceContoller.DUMMY_ENTITLEMENT_GROUP_NAME), SchemaConstants.ICFS_NAME, GROUP_PIRATES_NAME, prismContext); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -3003,7 +3003,7 @@ public void test234EntitleAccountWillPiratesIdentifiersUid() throws Exception { ObjectDelta delta = IntegrationTestTools.createEntitleDeltaIdentifiers(ACCOUNT_WILL_OID, dummyResourceCtl.getAttributeQName(DummyResourceContoller.DUMMY_ENTITLEMENT_GROUP_NAME), SchemaConstants.ICFS_UID, piratesIcfUid, prismContext); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -3033,7 +3033,7 @@ public void test235DetitleAccountWillPiratesIdentifiersUid() throws Exception { ObjectDelta delta = IntegrationTestTools.createDetitleDeltaIdentifiers(ACCOUNT_WILL_OID, dummyResourceCtl.getAttributeQName(DummyResourceContoller.DUMMY_ENTITLEMENT_GROUP_NAME), SchemaConstants.ICFS_UID, piratesIcfUid, prismContext); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -3134,7 +3134,7 @@ public void test238DetitleAccountWillPillage() throws Exception { ObjectDelta delta = IntegrationTestTools.createDetitleDelta(ACCOUNT_WILL_OID, ASSOCIATION_PRIV_NAME, PRIVILEGE_PILLAGE_OID, prismContext); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -3179,7 +3179,7 @@ public void test239DetitleAccountWillBargain() throws Exception { ObjectDelta delta = IntegrationTestTools.createDetitleDelta(ACCOUNT_WILL_OID, ASSOCIATION_PRIV_NAME, PRIVILEGE_BARGAIN_OID, prismContext); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -3430,7 +3430,7 @@ public void test300AccountRename() throws Exception { ObjectDelta delta = prismContext.deltaFactory().object().createModificationReplaceProperty(ShadowType.class, ACCOUNT_MORGAN_OID, SchemaTestConstants.ICFS_NAME_PATH_PARTS, ACCOUNT_CPTMORGAN_NAME); provisioningService.applyDefinition(delta, task, result); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -3481,7 +3481,7 @@ public void test310ModifyMorganEnlistTimestamp() throws Exception { ACCOUNT_MORGAN_OID, dummyResourceCtl.getAttributePath(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_ENLIST_TIMESTAMP_NAME), XmlTypeConverter.createXMLGregorianCalendarFromIso8601(ACCOUNT_MORGAN_PASSWORD_ENLIST_TIMESTAMP_MODIFIED)); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -3496,7 +3496,7 @@ public void test310ModifyMorganEnlistTimestamp() throws Exception { delta.checkConsistence(); // check if attribute was changed DummyAccount dummyAccount = getDummyAccount(transformNameFromResource(ACCOUNT_CPTMORGAN_NAME), morganIcfUid); - display("Dummy account", dummyAccount); + displayDumpable("Dummy account", dummyAccount); ZonedDateTime enlistTimestamp = dummyAccount.getAttributeValue(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_ENLIST_TIMESTAMP_NAME, ZonedDateTime.class); assertEqualTime("wrong dummy enlist timestamp", ACCOUNT_MORGAN_PASSWORD_ENLIST_TIMESTAMP_MODIFIED, enlistTimestamp); @@ -3516,7 +3516,7 @@ public void test330ModifyAccountWillPasswordSelfService() throws Exception { syncServiceMock.reset(); ObjectDelta delta = createAccountPaswordDelta(ACCOUNT_WILL_OID, ACCOUNT_WILL_PASSWORD_321, ACCOUNT_WILL_PASSWORD_123); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); ProvisioningOperationOptions options = ProvisioningOperationOptions.createRunAsAccountOid(ACCOUNT_WILL_OID); @@ -3653,7 +3653,7 @@ public void test344ModifyWillDeleteGossipAvast() throws Exception { } protected void assertAccountWillGossip(String... values) throws ConnectException, FileNotFoundException, SchemaViolationException, ConflictException, InterruptedException { - display("Account will", getDummyAccount(transformNameFromResource(ACCOUNT_WILL_USERNAME), willIcfUid)); + displayDumpable("Account will", getDummyAccount(transformNameFromResource(ACCOUNT_WILL_USERNAME), willIcfUid)); assertDummyAccount(transformNameFromResource(ACCOUNT_WILL_USERNAME), willIcfUid) .assertAttribute(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_GOSSIP_NAME, values); } @@ -4034,7 +4034,7 @@ public void test801LiveSyncAddBlackbeard() throws Exception { syncServiceMock.assertNotifyChange(); ResourceObjectShadowChangeDescription lastChange = syncServiceMock.getLastChange(); - display("The change", lastChange); + displayDumpable("The change", lastChange); PrismObject oldShadow = lastChange.getOldShadow(); assertNotNull("Old shadow missing", oldShadow); @@ -4094,7 +4094,7 @@ public void test802LiveSyncModifyBlackbeard() throws Exception { syncServiceMock.assertNotifyChange(); ResourceObjectShadowChangeDescription lastChange = syncServiceMock.getLastChange(); - display("The change", lastChange); + displayDumpable("The change", lastChange); PrismObject oldShadow = lastChange.getOldShadow(); assertSyncOldShadow(oldShadow, getBlackbeardRepoIcfName()); @@ -4257,7 +4257,7 @@ public void testLiveSyncAddDrake(DummySyncStyle syncStyle, QName objectClass) th syncServiceMock.assertNotifyChange(); ResourceObjectShadowChangeDescription lastChange = syncServiceMock.getLastChange(); - display("The change", lastChange); + displayDumpable("The change", lastChange); PrismObject oldShadow = lastChange.getOldShadow(); assertNotNull("Old shadow missing", oldShadow); @@ -4327,7 +4327,7 @@ public void testLiveSyncModifyDrake(DummySyncStyle syncStyle, QName objectClass) syncServiceMock.assertNotifyChange(); ResourceObjectShadowChangeDescription lastChange = syncServiceMock.getLastChange(); - display("The change", lastChange); + displayDumpable("The change", lastChange); PrismObject oldShadow = lastChange.getOldShadow(); assertSyncOldShadow(oldShadow, getDrakeRepoIcfName()); @@ -4389,7 +4389,7 @@ public void testLiveSyncAddCorsairs( syncServiceMock.assertNotifyChange(); ResourceObjectShadowChangeDescription lastChange = syncServiceMock.getLastChange(); - display("The change", lastChange); + displayDumpable("The change", lastChange); PrismObject oldShadow = lastChange.getOldShadow(); assertNotNull("Old shadow missing", oldShadow); @@ -4529,7 +4529,7 @@ private void testLiveSyncDeleteDrake( syncServiceMock.assertNotifyChange(); ResourceObjectShadowChangeDescription lastChange = syncServiceMock.getLastChange(); - display("The change", lastChange); + displayDumpable("The change", lastChange); PrismObject oldShadow = lastChange.getOldShadow(); assertSyncOldShadow(oldShadow, getDrakeRepoIcfName()); @@ -4580,7 +4580,7 @@ public void test890LiveSyncModifyProtectedAccount() throws Exception { assertSuccess(result); ResourceObjectShadowChangeDescription lastChange = syncServiceMock.getLastChange(); - display("The change", lastChange); + displayDumpable("The change", lastChange); syncServiceMock.assertNoNotifyChange(); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaching.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaching.java index 76fadf84594..aa16d84a850 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaching.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaching.java @@ -276,7 +276,7 @@ public void test119SearchAllAccountsMaxStaleness() throws Exception { OperationResult result = createOperationResult(); ObjectQuery query = IntegrationTestTools.createAllShadowsQuery(resourceType, SchemaTestConstants.ICF_ACCOUNT_OBJECT_CLASS_LOCAL_NAME, prismContext); - display("All shadows query", query); + displayDumpable("All shadows query", query); XMLGregorianCalendar startTs = clock.currentTimeXMLGregorianCalendar(); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaseIgnore.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaseIgnore.java index a9a20b0911c..6727214c291 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaseIgnore.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaseIgnore.java @@ -117,7 +117,7 @@ public void test280EntitleAccountWillPiratesAlreadyThere() throws Exception { ObjectDelta delta = IntegrationTestTools.createEntitleDelta(ACCOUNT_WILL_OID, dummyResourceCtl.getAttributeQName(DummyResourceContoller.DUMMY_ENTITLEMENT_GROUP_NAME), GROUP_PIRATES_OID, prismContext); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -152,7 +152,7 @@ public void test282DetitleAccountWillPirates() throws Exception { ObjectDelta delta = IntegrationTestTools.createDetitleDelta(ACCOUNT_WILL_OID, dummyResourceCtl.getAttributeQName(DummyResourceContoller.DUMMY_ENTITLEMENT_GROUP_NAME), GROUP_PIRATES_OID, prismContext); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -192,7 +192,7 @@ public void test285EntitleAccountWillPiratesAlreadyThereCaseIgnore() throws Exce ObjectDelta delta = IntegrationTestTools.createEntitleDelta(ACCOUNT_WILL_OID, dummyResourceCtl.getAttributeQName(DummyResourceContoller.DUMMY_ENTITLEMENT_GROUP_NAME), GROUP_PIRATES_OID, prismContext); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -227,7 +227,7 @@ public void test289DetitleAccountWillPirates() throws Exception { ObjectDelta delta = IntegrationTestTools.createDetitleDelta(ACCOUNT_WILL_OID, dummyResourceCtl.getAttributeQName(DummyResourceContoller.DUMMY_ENTITLEMENT_GROUP_NAME), GROUP_PIRATES_OID, prismContext); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyConsistency.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyConsistency.java index f0bb8726a77..e92a3505042 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyConsistency.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyConsistency.java @@ -603,7 +603,7 @@ public void test120ModifyMorganFullNameCommunicationFailure() throws Exception { ObjectDelta delta = prismContext.deltaFactory().object().createModificationReplaceProperty(ShadowType.class, shadowMorganOid, dummyResourceCtl.getAttributeFullnamePath(), ACCOUNT_MORGAN_FULLNAME_HM); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); // WHEN when(); @@ -768,7 +768,7 @@ public void test130ModifyMorganFullNameAgainCommunicationFailure() throws Except ObjectDelta delta = prismContext.deltaFactory().object().createModificationReplaceProperty(ShadowType.class, shadowMorganOid, dummyResourceCtl.getAttributeFullnamePath(), ACCOUNT_MORGAN_FULLNAME_CHM); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); // WHEN when(); @@ -944,7 +944,7 @@ public void test170DeleteMorganCommunicationFailure() throws Exception { ObjectDelta delta = prismContext.deltaFactory().object().createModificationReplaceProperty(ShadowType.class, shadowMorganOid, dummyResourceCtl.getAttributeFullnamePath(), ACCOUNT_MORGAN_FULLNAME_HM); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); // WHEN when(); @@ -1107,7 +1107,7 @@ public void test180DeleteMorganCommunicationFailureAgain() throws Exception { ObjectDelta delta = prismContext.deltaFactory().object().createModificationReplaceProperty(ShadowType.class, shadowMorganOid, dummyResourceCtl.getAttributeFullnamePath(), ACCOUNT_MORGAN_FULLNAME_HM); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); // WHEN when(); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyExtra.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyExtra.java index 276c7a11652..bb7167be907 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyExtra.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyExtra.java @@ -153,7 +153,7 @@ public void test410AssociateCrewWillElizabeth() throws Exception { ObjectDelta delta = IntegrationTestTools.createEntitleDelta(ACCOUNT_WILL_OID, ASSOCIATION_CREW_NAME, ACCOUNT_ELIZABETH_OID, prismContext); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -171,7 +171,7 @@ public void test410AssociateCrewWillElizabeth() throws Exception { delta.checkConsistence(); DummyAccount dummyAccountWill = getDummyAccountAssert(ACCOUNT_WILL_USERNAME, ACCOUNT_WILL_USERNAME); - display("Dummy account will", dummyAccountWill); + displayDumpable("Dummy account will", dummyAccountWill); assertNotNull("No dummy account will", dummyAccountWill); assertTrue("The account will is not enabled", dummyAccountWill.isEnabled()); assertDummyAttributeValues(dummyAccountWill, DUMMY_ACCOUNT_ATTRIBUTE_MATE_NAME, ACCOUNT_ELIZABETH_USERNAME); @@ -196,7 +196,7 @@ public void test419DisassociateCrewWillElizabeth() throws Exception { ObjectDelta delta = IntegrationTestTools.createDetitleDelta(ACCOUNT_WILL_OID, ASSOCIATION_CREW_NAME, ACCOUNT_ELIZABETH_OID, prismContext); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -214,7 +214,7 @@ public void test419DisassociateCrewWillElizabeth() throws Exception { delta.checkConsistence(); DummyAccount dummyAccountWill = getDummyAccountAssert(ACCOUNT_WILL_USERNAME, ACCOUNT_WILL_USERNAME); - display("Dummy account will", dummyAccountWill); + displayDumpable("Dummy account will", dummyAccountWill); assertNotNull("No dummy account will", dummyAccountWill); assertTrue("The account will is not enabled", dummyAccountWill.isEnabled()); assertNoDummyAttribute(dummyAccountWill, DUMMY_ACCOUNT_ATTRIBUTE_MATE_NAME); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyLegacy.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyLegacy.java index 7c8e3938e73..44818a3692a 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyLegacy.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyLegacy.java @@ -160,7 +160,7 @@ public void test105NativeParsedSchema() throws Exception { resourceTypeNative = resourceNative.asObjectable(); ResourceSchema returnedSchema = RefinedResourceSchemaImpl.getResourceSchema(resourceTypeNative, prismContext); - display("Parsed resource schema", returnedSchema); + displayDumpable("Parsed resource schema", returnedSchema); assertNotNull("No parsed schema", returnedSchema); assertObjectClass(returnedSchema, OBJECTCLASS_NATIVE_ACCOUNT); @@ -237,7 +237,7 @@ public void test205LegacyParsedSchema() throws Exception { resourceTypeLegacy = resourceLegacy.asObjectable(); ResourceSchema returnedSchema = RefinedResourceSchemaImpl.getResourceSchema(resourceTypeLegacy, prismContext); - display("Parsed resource schema", returnedSchema); + displayDumpable("Parsed resource schema", returnedSchema); assertNotNull("No parsed schema", returnedSchema); assertObjectClass(returnedSchema, OBJECTCLASS_LEGACY_ACCOUNT); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyLimited.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyLimited.java index 675d93a8937..b957b5e688a 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyLimited.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyLimited.java @@ -43,7 +43,6 @@ * Let's test that we are able to do all the operations without NPEs and other side effects. * * @author Radovan Semancik - * */ @ContextConfiguration(locations = "classpath:ctx-provisioning-test-main.xml") @DirtiesContext @@ -104,13 +103,13 @@ public void test150DisableAccount() throws Exception { ObjectDelta delta = prismContext.deltaFactory().object().createModificationReplaceProperty(ShadowType.class, ACCOUNT_WILL_OID, SchemaConstants.PATH_ACTIVATION_ADMINISTRATIVE_STATUS, ActivationStatusType.DISABLED); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); try { // WHEN provisioningService.modifyObject(ShadowType.class, delta.getOid(), - delta.getModifications(), new OperationProvisioningScriptsType(), null, task, result); + delta.getModifications(), new OperationProvisioningScriptsType(), null, task, result); AssertJUnit.fail("Unexpected success"); } catch (SchemaException e) { @@ -126,7 +125,7 @@ public void test150DisableAccount() throws Exception { delta.checkConsistence(); // check if activation was unchanged DummyAccount dummyAccount = dummyResource.getAccountByUsername(ACCOUNT_WILL_USERNAME); - assertTrue("Dummy account "+ACCOUNT_WILL_USERNAME+" is disabled, expected enabled", dummyAccount.isEnabled()); + assertTrue("Dummy account " + ACCOUNT_WILL_USERNAME + " is disabled, expected enabled", dummyAccount.isEnabled()); syncServiceMock.assertNotifyFailureOnly(); @@ -149,14 +148,13 @@ public void test152ActivationStatusUndefinedAccount() throws Exception { ObjectDelta delta = prismContext.deltaFactory().object().createModificationDeleteProperty(ShadowType.class, ACCOUNT_WILL_OID, SchemaConstants.PATH_ACTIVATION_ADMINISTRATIVE_STATUS, ActivationStatusType.DISABLED); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); - try { // WHEN provisioningService.modifyObject(ShadowType.class, delta.getOid(), - delta.getModifications(), new OperationProvisioningScriptsType(), null, task, result); + delta.getModifications(), new OperationProvisioningScriptsType(), null, task, result); AssertJUnit.fail("Unexpected success"); } catch (SchemaException e) { @@ -172,7 +170,7 @@ public void test152ActivationStatusUndefinedAccount() throws Exception { delta.checkConsistence(); // check if activation was unchanged DummyAccount dummyAccount = dummyResource.getAccountByUsername(ACCOUNT_WILL_USERNAME); - assertTrue("Dummy account "+ACCOUNT_WILL_USERNAME+" is disabled, expected enabled", dummyAccount.isEnabled()); + assertTrue("Dummy account " + ACCOUNT_WILL_USERNAME + " is disabled, expected enabled", dummyAccount.isEnabled()); syncServiceMock.assertNotifyFailureOnly(); @@ -191,14 +189,13 @@ public void test154EnableAccount() throws Exception { ObjectDelta delta = prismContext.deltaFactory().object().createModificationReplaceProperty(ShadowType.class, ACCOUNT_WILL_OID, SchemaConstants.PATH_ACTIVATION_ADMINISTRATIVE_STATUS, ActivationStatusType.ENABLED); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); - try { // WHEN provisioningService.modifyObject(ShadowType.class, delta.getOid(), - delta.getModifications(), new OperationProvisioningScriptsType(), null, task, result); + delta.getModifications(), new OperationProvisioningScriptsType(), null, task, result); AssertJUnit.fail("Unexpected success"); } catch (SchemaException e) { @@ -214,7 +211,7 @@ public void test154EnableAccount() throws Exception { delta.checkConsistence(); // check if activation was unchanged DummyAccount dummyAccount = dummyResource.getAccountByUsername(ACCOUNT_WILL_USERNAME); - assertTrue("Dummy account "+ACCOUNT_WILL_USERNAME+" is disabled, expected enabled", dummyAccount.isEnabled()); + assertTrue("Dummy account " + ACCOUNT_WILL_USERNAME + " is disabled, expected enabled", dummyAccount.isEnabled()); syncServiceMock.assertNotifyFailureOnly(); @@ -243,7 +240,7 @@ public void test156SetValidFrom() throws Exception { try { // WHEN provisioningService.modifyObject(ShadowType.class, delta.getOid(), - delta.getModifications(), new OperationProvisioningScriptsType(), null, task, result); + delta.getModifications(), new OperationProvisioningScriptsType(), null, task, result); AssertJUnit.fail("Unexpected success"); } catch (SchemaException e) { @@ -259,9 +256,9 @@ public void test156SetValidFrom() throws Exception { delta.checkConsistence(); // check if activation was not changed DummyAccount dummyAccount = dummyResource.getAccountByUsername(ACCOUNT_WILL_USERNAME); - assertTrue("Dummy account "+ACCOUNT_WILL_USERNAME+" is disabled, expected enabled", dummyAccount.isEnabled()); - assertNull("Unexpected account validFrom in account "+ACCOUNT_WILL_USERNAME+": "+dummyAccount.getValidFrom(), dummyAccount.getValidFrom()); - assertNull("Unexpected account validTo in account "+ACCOUNT_WILL_USERNAME+": "+dummyAccount.getValidTo(), dummyAccount.getValidTo()); + assertTrue("Dummy account " + ACCOUNT_WILL_USERNAME + " is disabled, expected enabled", dummyAccount.isEnabled()); + assertNull("Unexpected account validFrom in account " + ACCOUNT_WILL_USERNAME + ": " + dummyAccount.getValidFrom(), dummyAccount.getValidFrom()); + assertNull("Unexpected account validTo in account " + ACCOUNT_WILL_USERNAME + ": " + dummyAccount.getValidTo(), dummyAccount.getValidTo()); syncServiceMock.assertNotifyFailureOnly(); @@ -285,7 +282,7 @@ public void test157SetValidTo() throws Exception { try { // WHEN provisioningService.modifyObject(ShadowType.class, delta.getOid(), - delta.getModifications(), new OperationProvisioningScriptsType(), null, task, result); + delta.getModifications(), new OperationProvisioningScriptsType(), null, task, result); AssertJUnit.fail("Unexpected success"); } catch (SchemaException e) { @@ -301,9 +298,9 @@ public void test157SetValidTo() throws Exception { delta.checkConsistence(); // check if activation was changed DummyAccount dummyAccount = dummyResource.getAccountByUsername(ACCOUNT_WILL_USERNAME); - assertTrue("Dummy account "+ACCOUNT_WILL_USERNAME+" is disabled, expected enabled", dummyAccount.isEnabled()); - assertNull("Unexpected account validFrom in account "+ACCOUNT_WILL_USERNAME+": "+dummyAccount.getValidFrom(), dummyAccount.getValidFrom()); - assertNull("Unexpected account validTo in account "+ACCOUNT_WILL_USERNAME+": "+dummyAccount.getValidTo(), dummyAccount.getValidTo()); + assertTrue("Dummy account " + ACCOUNT_WILL_USERNAME + " is disabled, expected enabled", dummyAccount.isEnabled()); + assertNull("Unexpected account validFrom in account " + ACCOUNT_WILL_USERNAME + ": " + dummyAccount.getValidFrom(), dummyAccount.getValidFrom()); + assertNull("Unexpected account validTo in account " + ACCOUNT_WILL_USERNAME + ": " + dummyAccount.getValidTo(), dummyAccount.getValidTo()); syncServiceMock.assertNotifyFailureOnly(); @@ -318,22 +315,20 @@ public void test158DeleteValidToValidFrom() throws Exception { OperationResult result = task.getResult(); syncServiceMock.reset(); - ObjectDelta delta = prismContext.deltaFactory().object().createModificationDeleteProperty(ShadowType.class, ACCOUNT_WILL_OID, SchemaConstants.PATH_ACTIVATION_VALID_TO, XmlTypeConverter.createXMLGregorianCalendar(VALID_TO_MILLIS)); - PrismObjectDefinition def = prismContext.getSchemaRegistry().findObjectDefinitionByCompileTimeClass(ShadowType.class); - PropertyDelta validFromDelta = prismContext.deltaFactory().property().createModificationDeleteProperty(SchemaConstants.PATH_ACTIVATION_VALID_FROM, + PrismObjectDefinition def = prismContext.getSchemaRegistry().findObjectDefinitionByCompileTimeClass(ShadowType.class); + PropertyDelta validFromDelta = prismContext.deltaFactory().property().createModificationDeleteProperty(SchemaConstants.PATH_ACTIVATION_VALID_FROM, def.findPropertyDefinition(SchemaConstants.PATH_ACTIVATION_VALID_FROM), XmlTypeConverter.createXMLGregorianCalendar(VALID_FROM_MILLIS)); delta.addModification(validFromDelta); delta.checkConsistence(); - try { // WHEN provisioningService.modifyObject(ShadowType.class, delta.getOid(), - delta.getModifications(), new OperationProvisioningScriptsType(), null, task, result); + delta.getModifications(), new OperationProvisioningScriptsType(), null, task, result); AssertJUnit.fail("Unexpected success"); } catch (SchemaException e) { @@ -349,14 +344,13 @@ public void test158DeleteValidToValidFrom() throws Exception { delta.checkConsistence(); // check if activation was changed DummyAccount dummyAccount = dummyResource.getAccountByUsername(ACCOUNT_WILL_USERNAME); - assertTrue("Dummy account "+ACCOUNT_WILL_USERNAME+" is disabled, expected enabled", dummyAccount.isEnabled()); - assertNull("Unexpected account validFrom in account "+ACCOUNT_WILL_USERNAME+": "+dummyAccount.getValidFrom(), dummyAccount.getValidFrom()); - assertNull("Unexpected account validTo in account "+ACCOUNT_WILL_USERNAME+": "+dummyAccount.getValidTo(), dummyAccount.getValidTo()); + assertTrue("Dummy account " + ACCOUNT_WILL_USERNAME + " is disabled, expected enabled", dummyAccount.isEnabled()); + assertNull("Unexpected account validFrom in account " + ACCOUNT_WILL_USERNAME + ": " + dummyAccount.getValidFrom(), dummyAccount.getValidFrom()); + assertNull("Unexpected account validTo in account " + ACCOUNT_WILL_USERNAME + ": " + dummyAccount.getValidTo(), dummyAccount.getValidTo()); syncServiceMock.assertNotifyFailureOnly(); assertSteadyResource(); - } @Test @@ -383,20 +377,19 @@ public void test162UnlockAccount() throws Exception { ObjectDelta delta = prismContext.deltaFactory().object().createModificationReplaceProperty(ShadowType.class, ACCOUNT_WILL_OID, SchemaConstants.PATH_ACTIVATION_LOCKOUT_STATUS, LockoutStatusType.NORMAL); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); try { // WHEN provisioningService.modifyObject(ShadowType.class, delta.getOid(), - delta.getModifications(), new OperationProvisioningScriptsType(), null, task, result); + delta.getModifications(), new OperationProvisioningScriptsType(), null, task, result); AssertJUnit.fail("Unexpected success"); } catch (SchemaException e) { // This is expected } - // THEN then(); result.computeStatus(); @@ -435,5 +428,4 @@ public void test181SearchNullPagingOffset0Size3Desc() { public void test183SearchNullPagingOffset2Size3Desc() { // Nothing to do. No sorting support. So desc sorting won't work at all. } - } diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyParallelism.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyParallelism.java index 53584bf7f16..b16f0d31f70 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyParallelism.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyParallelism.java @@ -129,7 +129,7 @@ public void test120ModifyWillReplaceFullname() throws Exception { ObjectDelta delta = prismContext.deltaFactory().object().createModificationReplaceProperty(ShadowType.class, ACCOUNT_WILL_OID, dummyResourceCtl.getAttributeFullnamePath(), "Pirate Will Turner"); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -314,7 +314,7 @@ private PrismObject parallelModifyTest( logger.info("{} starting to do some work", Thread.currentThread().getName()); ObjectDelta delta = deltaProducer.run(); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); provisioningService.modifyObject(ShadowType.class, accountMorganOid, delta.getModifications(), null, null, localTask, localResult); @@ -515,7 +515,7 @@ private PrismObject parallelModifyTestSlow( logger.info("{} starting to do some work", Thread.currentThread().getName()); ObjectDelta delta = deltaProducer.run(); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); provisioningService.modifyObject(ShadowType.class, accountElizabethOid, delta.getModifications(), null, null, localTask, localResult); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyPrioritiesAndReadReplace.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyPrioritiesAndReadReplace.java index 4e6147b542c..fa225aed711 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyPrioritiesAndReadReplace.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyPrioritiesAndReadReplace.java @@ -198,7 +198,7 @@ public void test123ModifyObjectReplace() throws Exception { titleDelta.setRealValuesToReplace("Pirate Master"); objectDelta.addModification(titleDelta); - display("ObjectDelta", objectDelta); + displayDumpable("ObjectDelta", objectDelta); objectDelta.checkConsistence(); // WHEN @@ -306,7 +306,7 @@ public void test150ModifyObjectAddDelete() throws Exception { drinkDelta.addRealValuesToAdd("orange juice"); objectDelta.addModification(drinkDelta); - display("ObjectDelta", objectDelta); + displayDumpable("ObjectDelta", objectDelta); objectDelta.checkConsistence(); // WHEN diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyResourceAndSchemaCaching.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyResourceAndSchemaCaching.java index f06eeb893fb..7be70a5ed1d 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyResourceAndSchemaCaching.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyResourceAndSchemaCaching.java @@ -105,7 +105,7 @@ public void test010GetResource() throws Exception { assertSchemaMetadataUnchanged(resourceRepoAfter); - display("Resource cache", InternalMonitor.getResourceCacheStats()); + displayDumpable("Resource cache", InternalMonitor.getResourceCacheStats()); assertResourceCacheHitsIncrement(0); assertResourceCacheMissesIncrement(1); @@ -143,7 +143,7 @@ public void test011GetResourceAgain() throws Exception { assertResourceVersionIncrement(resourceProvisioning, 0); - display("Resource cache (1)", InternalMonitor.getResourceCacheStats()); + displayDumpable("Resource cache (1)", InternalMonitor.getResourceCacheStats()); assertResourceCacheHitsIncrement(1); assertResourceCacheMissesIncrement(0); @@ -171,7 +171,7 @@ public void test011GetResourceAgain() throws Exception { assertResourceVersionIncrement(resourceProvisioning, 0); - display("Resource cache (1)", InternalMonitor.getResourceCacheStats()); + displayDumpable("Resource cache (1)", InternalMonitor.getResourceCacheStats()); assertResourceCacheHitsIncrement(1); assertResourceCacheMissesIncrement(0); @@ -195,7 +195,7 @@ public void test012AddAccountGetResource() throws Exception { addAccount(ACCOUNT_WILL_FILE); // THEN - display("Resource cache (1)", InternalMonitor.getResourceCacheStats()); + displayDumpable("Resource cache (1)", InternalMonitor.getResourceCacheStats()); assertResourceCacheHitsIncrement(1); assertResourceCacheMissesIncrement(0); @@ -217,7 +217,7 @@ public void test012AddAccountGetResource() throws Exception { assertResourceVersionIncrement(resourceProvisioning, 0); - display("Resource cache (2)", InternalMonitor.getResourceCacheStats()); + displayDumpable("Resource cache (2)", InternalMonitor.getResourceCacheStats()); assertResourceCacheHitsIncrement(1); assertResourceCacheMissesIncrement(0); @@ -253,7 +253,7 @@ public void test013GetResourceNoFetch() throws Exception { assertResourceVersionIncrement(resourceProvisioning, 0); - display("Resource cache (1)", InternalMonitor.getResourceCacheStats()); + displayDumpable("Resource cache (1)", InternalMonitor.getResourceCacheStats()); assertResourceCacheHitsIncrement(1); assertResourceCacheMissesIncrement(0); @@ -281,7 +281,7 @@ public void test013GetResourceNoFetch() throws Exception { assertResourceVersionIncrement(resourceProvisioning, 0); - display("Resource cache (1)", InternalMonitor.getResourceCacheStats()); + displayDumpable("Resource cache (1)", InternalMonitor.getResourceCacheStats()); assertResourceCacheHitsIncrement(1); assertResourceCacheMissesIncrement(0); @@ -339,7 +339,7 @@ public void test020ModifyAndGetResource() throws Exception { assertResourceVersionIncrement(resourceProvisioning, 0); - display("Resource cache", InternalMonitor.getResourceCacheStats()); + displayDumpable("Resource cache", InternalMonitor.getResourceCacheStats()); assertResourceCacheHitsIncrement(0); assertResourceCacheMissesIncrement(1); @@ -364,7 +364,7 @@ public void test022GetAccountGetResource() throws Exception { getAccount(ACCOUNT_WILL_OID); // THEN - display("Resource cache (1)", InternalMonitor.getResourceCacheStats()); + displayDumpable("Resource cache (1)", InternalMonitor.getResourceCacheStats()); assertResourceCacheHitsIncrement(2); // one hit is "regular", the other one when availability state update is considered assertResourceCacheMissesIncrement(0); @@ -387,7 +387,7 @@ public void test022GetAccountGetResource() throws Exception { assertResourceVersionIncrement(resourceProvisioning, 0); - display("Resource cache (2)", InternalMonitor.getResourceCacheStats()); + displayDumpable("Resource cache (2)", InternalMonitor.getResourceCacheStats()); assertResourceCacheHitsIncrement(1); assertResourceCacheMissesIncrement(0); @@ -446,7 +446,7 @@ public void test023ModifyRepoAndGetResource() throws Exception { assertResourceVersionIncrement(resourceProvisioning, 0); - display("Resource cache", InternalMonitor.getResourceCacheStats()); + displayDumpable("Resource cache", InternalMonitor.getResourceCacheStats()); assertResourceCacheHitsIncrement(0); assertResourceCacheMissesIncrement(1); @@ -579,7 +579,7 @@ private void assertConnectorConfigChanged() throws ObjectNotFoundException, Sche assertResourceVersionIncrement(resourceProvisioning, 0); - display("Resource cache", InternalMonitor.getResourceCacheStats()); + displayDumpable("Resource cache", InternalMonitor.getResourceCacheStats()); assertResourceCacheHitsIncrement(0); assertResourceCacheMissesIncrement(1); @@ -592,7 +592,7 @@ private void assertConnectorConfigChanged() throws ObjectNotFoundException, Sche getAccount(ACCOUNT_WILL_OID); // THEN - display("Resource cache (2)", InternalMonitor.getResourceCacheStats()); + displayDumpable("Resource cache (2)", InternalMonitor.getResourceCacheStats()); assertResourceCacheHitsIncrement(2); // one hit is "regular", the other one when availability state update is considered assertResourceCacheMissesIncrement(0); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySchemaless.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySchemaless.java index 5dcc1e9ba82..b6b8fb5a004 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySchemaless.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySchemaless.java @@ -211,7 +211,7 @@ public void test005ParsedSchemaSchemaless() throws Exception { // Also test if the utility method returns the same thing ResourceSchema returnedSchema = RefinedResourceSchemaImpl.getResourceSchema(resourceTypeSchemaless, prismContext); - display("Parsed resource schema", returnedSchema); + displayDumpable("Parsed resource schema", returnedSchema); assertNull("Unexpected schema after parsing", returnedSchema); } @@ -388,7 +388,7 @@ private void resourceStaticSchemaResourceAndConnectorCaching() throws Exception resourceStaticSchema.asObjectable().setFetchResult(null); resourceAgain.asObjectable().setFetchResult(null); ObjectDelta dummyResourceDiff = DiffUtil.diff(resourceStaticSchema, resourceAgain); - display("Dummy resource diff", dummyResourceDiff); + displayDumpable("Dummy resource diff", dummyResourceDiff); assertTrue("The resource read again is not the same as the original. diff:" + dummyResourceDiff, dummyResourceDiff.isEmpty()); // Now we stick our nose deep inside the provisioning impl. But we need @@ -518,7 +518,7 @@ public void test105ParsedSchemaStaticSchema() throws Exception { // Also test if the utility method returns the same thing ResourceSchema returnedSchema = RefinedResourceSchemaImpl.getResourceSchema(resourceStaticSchema.asObjectable(), prismContext); - display("Parsed resource schema", returnedSchema); + displayDumpable("Parsed resource schema", returnedSchema); assertNotNull("Null resource schema", returnedSchema); assertStaticSchemaSanity(returnedSchema); @@ -537,7 +537,7 @@ public void test106GetObjectStaticSchema() throws Exception { ResourceSchema returnedSchema = RefinedResourceSchemaImpl.getResourceSchema(resource, prismContext); - display("Parsed resource schema", returnedSchema); + displayDumpable("Parsed resource schema", returnedSchema); assertNotNull("Null resource schema", returnedSchema); assertStaticSchemaSanity(returnedSchema); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySecurity.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySecurity.java index 0a6f86fc537..26e64160c8a 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySecurity.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySecurity.java @@ -118,7 +118,7 @@ public void test200ModifyAccountDrink() throws Exception { ACCOUNT_WILL_OID, dummyResourceCtl.getAttributePath(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_DRINK_NAME), "RUM"); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -148,7 +148,7 @@ public void test201ModifyAccountGossip() throws Exception { ACCOUNT_WILL_OID, dummyResourceCtl.getAttributePath(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_GOSSIP_NAME), "pirate"); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -178,7 +178,7 @@ public void test210ModifyAccountQuote() throws Exception { ACCOUNT_WILL_OID, dummyResourceCtl.getAttributePath(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_QUOTE_NAME), "eh?"); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); try { @@ -220,7 +220,7 @@ public void test310SearchAllShadows() throws Exception { OperationResult result = createOperationResult(); ObjectQuery query = IntegrationTestTools.createAllShadowsQuery(resourceType, SchemaTestConstants.ICF_ACCOUNT_OBJECT_CLASS_LOCAL_NAME, prismContext); - display("All shadows query", query); + displayDumpable("All shadows query", query); // WHEN List> allShadows = provisioningService.searchObjects(ShadowType.class, diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/manual/AbstractManualResourceTest.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/manual/AbstractManualResourceTest.java index 89d13e58a55..32dc721a035 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/manual/AbstractManualResourceTest.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/manual/AbstractManualResourceTest.java @@ -260,7 +260,7 @@ public void test005ParsedSchema() throws Exception { // Also test if the utility method returns the same thing ResourceSchema resourceSchema = RefinedResourceSchemaImpl.getResourceSchema(resourceType, prismContext); - display("Parsed resource schema", resourceSchema); + displayDumpable("Parsed resource schema", resourceSchema); // Check whether it is reusing the existing schema and not parsing it all over again // Not equals() but == ... we want to really know if exactly the same @@ -820,7 +820,7 @@ public void test200ModifyAccountWillFullname() throws Exception { ObjectDelta delta = prismContext.deltaFactory().object().createModificationReplaceProperty(ShadowType.class, ACCOUNT_WILL_OID, ItemPath.create(ShadowType.F_ATTRIBUTES, ATTR_FULLNAME_QNAME), ACCOUNT_WILL_FULLNAME_PIRATE); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); accountWillReqestTimestampStart = clock.currentTimeXMLGregorianCalendar(); @@ -1202,7 +1202,7 @@ public void test220ModifyAccountWillDisable() throws Exception { ObjectDelta delta = prismContext.deltaFactory().object().createModificationReplaceProperty(ShadowType.class, ACCOUNT_WILL_OID, SchemaConstants.PATH_ACTIVATION_ADMINISTRATIVE_STATUS, ActivationStatusType.DISABLED); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); accountWillReqestTimestampStart = clock.currentTimeXMLGregorianCalendar(); @@ -1287,7 +1287,7 @@ public void test230ModifyAccountWillChangePasswordAndEnable() throws Exception { ProtectedStringType ps = new ProtectedStringType(); ps.setClearValue(ACCOUNT_WILL_PASSWORD_NEW); delta.addModificationReplaceProperty(SchemaConstants.PATH_PASSWORD_VALUE, ps); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); accountWillSecondReqestTimestampStart = clock.currentTimeXMLGregorianCalendar(); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java index 5c113ffd5c8..d5bb39f0400 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java @@ -334,7 +334,7 @@ protected void assertPasswordCapability(PasswordCapabilityType capPassword) { public void test006Schema() throws Exception { // WHEN ResourceSchema resourceSchema = RefinedResourceSchemaImpl.getResourceSchema(resourceType, prismContext); - display("Resource schema", resourceSchema); + displayDumpable("Resource schema", resourceSchema); ObjectClassComplexTypeDefinition accountDef = resourceSchema.findObjectClassDefinition(RESOURCE_OPENDJ_ACCOUNT_OBJECTCLASS); assertNotNull("Account definition is missing", accountDef); @@ -482,13 +482,13 @@ public void test006Schema() throws Exception { assertEquals("Wrong " + OpenDJController.RESOURCE_OPENDJ_SECONDARY_IDENTIFIER_LOCAL_NAME + " frameworkAttributeName", ProvisioningTestUtil.CONNID_NAME_NAME, posixIdSecondaryDef.getFrameworkAttributeName()); ObjectClassComplexTypeDefinition normalDef = resourceSchema.findObjectClassDefinition(new QName(RESOURCE_NS, "normalTestingObjectClass")); - display("normalTestingObjectClass object class def", normalDef); + displayDumpable("normalTestingObjectClass object class def", normalDef); assertNotNull("No definition for normalTestingObjectClass", normalDef); assertNotNull("The cn attribute missing in normalTestingObjectClass", normalDef.findAttributeDefinition(new QName(normalDef.getTypeName().getNamespaceURI(), "cn"))); ObjectClassComplexTypeDefinition hybridDef = resourceSchema.findObjectClassDefinition(new QName(RESOURCE_NS, "hybridTestingObjectClass")); - display("Hybrid object class def", hybridDef); + displayDumpable("Hybrid object class def", hybridDef); assertNotNull("No definition for hybridTestingObjectClass", hybridDef); assertNotNull("The cn attribute missing in hybridTestingObjectClass", hybridDef.findAttributeDefinition(new QName(hybridDef.getTypeName().getNamespaceURI(), "cn"))); @@ -496,7 +496,7 @@ public void test006Schema() throws Exception { hybridDef.findAttributeDefinition(new QName(hybridDef.getTypeName().getNamespaceURI(), "uuidIdentifiedAttribute"))); ObjectClassComplexTypeDefinition uuidDef = resourceSchema.findObjectClassDefinition(new QName(RESOURCE_NS, "uuidIdentifiedObjectClass")); - display("uuidIdentifiedObjectClass object class def", uuidDef); + displayDumpable("uuidIdentifiedObjectClass object class def", uuidDef); assertNotNull("No definition for uuidIdentifiedObjectClass", uuidDef); assertNotNull("The uuidIdentifiedAttribute attribute missing in uuidIdentifiedObjectClass", uuidDef.findAttributeDefinition(new QName(uuidDef.getTypeName().getNamespaceURI(), "uuidIdentifiedAttribute"))); @@ -518,7 +518,7 @@ public void test007RefinedSchema() throws Exception { // WHEN RefinedResourceSchema refinedSchema = RefinedResourceSchemaImpl.getRefinedSchema(resourceType, prismContext); - display("Refined schema", refinedSchema); + displayDumpable("Refined schema", refinedSchema); // Check whether it is reusing the existing schema and not parsing it // all over again @@ -924,7 +924,7 @@ public void test140AddAndModifyAccountJack() throws Exception { .createModificationReplaceProperty(icfNamePath, icfNameDef, "uid=rename,ou=People,dc=example,dc=com"); ((Collection) delta.getModifications()).add(renameDelta); - display("Object change", delta); + displayDumpable("Object change", delta); // WHEN when(); @@ -1099,7 +1099,7 @@ public void test150ChangePassword() throws Exception { ObjectModificationType objectChange = PrismTestUtil.parseAtomicValue( new File(TEST_DIR, "account-change-password.xml"), ObjectModificationType.COMPLEX_TYPE); ObjectDelta delta = DeltaConvertor.createObjectDelta(objectChange, accountType.asPrismObject().getDefinition()); - display("Object change", delta); + displayDumpable("Object change", delta); // WHEN when(); @@ -1348,7 +1348,7 @@ public void test170DisableAccount() throws Exception { ObjectModificationType objectChange = PrismTestUtil.parseAtomicValue( REQUEST_DISABLE_ACCOUNT_SIMULATED_FILE, ObjectModificationType.COMPLEX_TYPE); ObjectDelta delta = DeltaConvertor.createObjectDelta(objectChange, object.asPrismObject().getDefinition()); - display("Object change", delta); + displayDumpable("Object change", delta); // WHEN when(); @@ -2104,7 +2104,7 @@ public void test322ModifyAccountPosix() throws Exception { ObjectModificationType objectChange = PrismTestUtil.parseAtomicValue(ACCOUNT_POSIX_MCMUTTON_CHANGE_FILE, ObjectModificationType.COMPLEX_TYPE); ObjectDelta delta = DeltaConvertor.createObjectDelta(objectChange, getShadowDefinition()); - display("Object change", delta); + displayDumpable("Object change", delta); // WHEN when(); @@ -2485,7 +2485,7 @@ public void test416AssociateUserToCorsairs() throws Exception { ObjectDelta delta = IntegrationTestTools.createEntitleDelta(ACCOUNT_MORGAN_OID, ASSOCIATION_GROUP_NAME, GROUP_CORSAIRS_OID, prismContext); - display("ObjectDelta", delta); + displayDumpable("ObjectDelta", delta); delta.checkConsistence(); // WHEN @@ -2573,7 +2573,7 @@ public void test450ListGroupsObjectclass() throws Exception { ObjectQuery query = ObjectQueryUtil.createResourceAndObjectClassQuery(RESOURCE_OPENDJ_OID, RESOURCE_OPENDJ_GROUP_OBJECTCLASS, prismContext); - display("query", query); + displayDumpable("query", query); // WHEN when(); @@ -2597,7 +2597,7 @@ public void test452ListLdapGroupsKindIntent() throws Exception { ObjectQuery query = ObjectQueryUtil.createResourceAndKindIntent(RESOURCE_OPENDJ_OID, ShadowKindType.ENTITLEMENT, "ldapGroup", prismContext); - display("query", query); + displayDumpable("query", query); // WHEN when(); @@ -2621,7 +2621,7 @@ public void test454ListSpecialGroupsKindIntent() throws Exception { ObjectQuery query = ObjectQueryUtil.createResourceAndKindIntent(RESOURCE_OPENDJ_OID, ShadowKindType.ENTITLEMENT, "specialGroup", prismContext); - display("query", query); + displayDumpable("query", query); // WHEN when(); @@ -2686,7 +2686,7 @@ public void test457ListLdapGroupsKindIntent() throws Exception { ObjectQuery query = ObjectQueryUtil.createResourceAndKindIntent(RESOURCE_OPENDJ_OID, ShadowKindType.ENTITLEMENT, "ldapGroup", prismContext); - display("query", query); + displayDumpable("query", query); // WHEN when(); @@ -2710,7 +2710,7 @@ public void test458ListSpecialGroupsKindIntent() throws Exception { ObjectQuery query = ObjectQueryUtil.createResourceAndKindIntent(RESOURCE_OPENDJ_OID, ShadowKindType.ENTITLEMENT, "specialGroup", prismContext); - display("query", query); + displayDumpable("query", query); // WHEN when(); @@ -2742,7 +2742,7 @@ public void test460ListOrganizationalUnitPeopleKindIntent() throws Exception { ObjectQuery query = ObjectQueryUtil.createResourceAndKindIntent(RESOURCE_OPENDJ_OID, ShadowKindType.GENERIC, "ou-people", prismContext); - display("query", query); + displayDumpable("query", query); // WHEN when(); @@ -2795,7 +2795,7 @@ public void test470AddAccountPolyDescription() throws Exception { PrismContainer attributesContainer = shadow.findContainer(ShadowType.F_ATTRIBUTES); PrismProperty descAttr = attributesContainer.findProperty(ATTRIBUTE_DESCRIPTION_QNAME); PolyString descriptionPolyStringAfter = descAttr.getValues().get(0).getValue(); - display("description after (shadow)", descriptionPolyStringAfter); + displayDumpable("description after (shadow)", descriptionPolyStringAfter); assertEquals("Wrong orig in description polystring (shadow)", ACCOUNT_POLY_DESCRIPTION_ORIG, descriptionPolyStringAfter.getOrig()); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDjNegative.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDjNegative.java index 4bc255ff639..f464f9ecda4 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDjNegative.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDjNegative.java @@ -313,7 +313,7 @@ public void test150ModifyObject() throws Exception { ObjectModificationType objectChange = PrismTestUtil.parseAtomicValue(ACCOUNT_JACK_CHANGE_FILE, ObjectModificationType.COMPLEX_TYPE); ObjectDelta delta = DeltaConvertor.createObjectDelta(objectChange, ShadowType.class, PrismTestUtil.getPrismContext()); - display("Object change", delta); + displayDumpable("Object change", delta); try { @@ -591,7 +591,7 @@ public void test550ModifyObject() throws Exception { ObjectModificationType objectChange = PrismTestUtil.parseAtomicValue(ACCOUNT_JACK_CHANGE_FILE, ObjectModificationType.COMPLEX_TYPE); ObjectDelta delta = DeltaConvertor.createObjectDelta(objectChange, ShadowType.class, PrismTestUtil.getPrismContext()); - display("Object change", delta); + displayDumpable("Object change", delta); // WHEN provisioningService.modifyObject(ShadowType.class, objectChange.getOid(), diff --git a/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/AbstractUcfDummyTest.java b/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/AbstractUcfDummyTest.java index afe8a6ae961..108f94688ef 100644 --- a/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/AbstractUcfDummyTest.java +++ b/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/AbstractUcfDummyTest.java @@ -28,8 +28,7 @@ import com.evolveum.midpoint.schema.processor.ResourceSchema; import com.evolveum.midpoint.test.DummyResourceContoller; import com.evolveum.midpoint.test.util.AbstractSpringTest; -import com.evolveum.midpoint.test.util.OperationResultTestMixin; -import com.evolveum.midpoint.util.DebugDumpable; +import com.evolveum.midpoint.test.util.InfraTestMixin; import com.evolveum.midpoint.util.PrettyPrinter; import com.evolveum.midpoint.xml.ns._public.common.common_3.ConnectorType; import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType; @@ -45,7 +44,7 @@ */ @ContextConfiguration(locations = { "classpath:ctx-ucf-connid-test.xml" }) public abstract class AbstractUcfDummyTest extends AbstractSpringTest - implements OperationResultTestMixin { + implements InfraTestMixin { protected static final File RESOURCE_DUMMY_FILE = new File(UcfTestUtil.TEST_DIR, "resource-dummy.xml"); protected static final File CONNECTOR_DUMMY_FILE = new File(UcfTestUtil.TEST_DIR, "connector-dummy.xml"); @@ -102,10 +101,6 @@ protected void assertContainerDefinition(PrismContainer container, String con PrismAsserts.assertDefinition(container.getDefinition(), qName, xsdType, minOccurs, maxOccurs); } - protected void displayValue(String title, DebugDumpable value) { - PrismTestUtil.display(title, value); - } - public void displayValue(String title, Object value) { PrismTestUtil.display(title, value); } diff --git a/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummy.java b/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummy.java index 8fdb998ea61..5482cd45057 100644 --- a/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummy.java +++ b/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummy.java @@ -71,7 +71,7 @@ public void test000PrismContextSanity() { @Test public void test001ResourceSanity() { - displayValue("Resource", resource); + displayDumpable("Resource", resource); assertEquals("Wrong oid", "ef2bc95b-76e0-59e2-86d6-9999dddddddd", resource.getOid()); // assertEquals("Wrong version", "42", resource.getVersion()); @@ -152,7 +152,7 @@ public void test020CreateConfiguredConnector() throws Exception { OperationResult result = createOperationResult(); PrismContainerValue configContainer = resourceType.getConnectorConfiguration().asPrismContainerValue(); - displayValue("Configuration container", configContainer); + displayDumpable("Configuration container", configContainer); // WHEN cc.configure(configContainer, ResourceTypeUtil.getSchemaGenerationConstraints(resourceType), result); @@ -168,7 +168,7 @@ public void test022ConnectorStatsConfigured() throws Exception { ConnectorOperationalStatus operationalStatus = cc.getOperationalStatus(); // THEN - displayValue("Connector operational status", operationalStatus); + displayDumpable("Connector operational status", operationalStatus); assertNotNull("null operational status", operationalStatus); assertEquals("Wrong connectorClassName", DummyConnector.class.getName(), operationalStatus.getConnectorClassName()); @@ -193,7 +193,7 @@ public void test030ResourceSchema() throws Exception { PrismContainerValue configContainer = resourceType.getConnectorConfiguration().asPrismContainerValue(); - displayValue("Configuration container", configContainer); + displayDumpable("Configuration container", configContainer); //ResourceTypeUtil.getSchemaGenerationConstraints(resourceType) cc.configure(configContainer, null, result); @@ -201,7 +201,7 @@ public void test030ResourceSchema() throws Exception { resourceSchema = cc.fetchResourceSchema(result); // THEN - displayValue("Generated resource schema", resourceSchema); + displayDumpable("Generated resource schema", resourceSchema); assertEquals("Unexpected number of definitions", 4, resourceSchema.getDefinitions().size()); dummyResourceCtl.assertDummyResourceSchemaSanityExtended(resourceSchema, resourceType, true); @@ -213,7 +213,7 @@ public void test030ResourceSchema() throws Exception { // Try to re-parse ResourceSchema reparsedResourceSchema = ResourceSchemaImpl.parse(DOMUtil.getFirstChildElement(xsdSchemaDom), "serialized schema", PrismTestUtil.getPrismContext()); - displayValue("Re-parsed resource schema", reparsedResourceSchema); + displayDumpable("Re-parsed resource schema", reparsedResourceSchema); assertEquals("Unexpected number of definitions in re-parsed schema", 4, reparsedResourceSchema.getDefinitions().size()); dummyResourceCtl.assertDummyResourceSchemaSanityExtended(reparsedResourceSchema, resourceType, true); @@ -230,7 +230,7 @@ public void test031ResourceSchemaAccountObjectClass() throws Exception { PrismContainerValue configContainer = resourceType.getConnectorConfiguration().asPrismContainerValue(); - displayValue("Configuration container", configContainer); + displayDumpable("Configuration container", configContainer); List objectClassesToGenerate = new ArrayList<>(); QName accountObjectClass = new QName(resource.asObjectable().getNamespace(), "AccountObjectClass"); objectClassesToGenerate.add(accountObjectClass); @@ -241,7 +241,7 @@ public void test031ResourceSchemaAccountObjectClass() throws Exception { resourceSchema = cc.fetchResourceSchema(result); // THEN - displayValue("Generated resource schema", resourceSchema); + displayDumpable("Generated resource schema", resourceSchema); assertEquals("Unexpected number of definitions", 1, resourceSchema.getDefinitions().size()); assertEquals("Unexpected number of object class definitions", 1, resourceSchema.getObjectClassDefinitions().size()); @@ -255,7 +255,7 @@ public void test033ConnectorStatsInitialized() throws Exception { ConnectorOperationalStatus operationalStatus = cc.getOperationalStatus(); // THEN - displayValue("Connector operational status", operationalStatus); + displayDumpable("Connector operational status", operationalStatus); assertNotNull("null operational status", operationalStatus); assertEquals("Wrong connectorClassName", DummyConnector.class.getName(), operationalStatus.getConnectorClassName()); @@ -309,7 +309,7 @@ public void test050Search() throws Exception { @Override public boolean handle(PrismObject shadow) { - displayValue("Search: found", shadow); + displayDumpable("Search: found", shadow); checkUcfShadow(shadow, accountDefinition); searchResults.add(shadow); return true; diff --git a/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummyMulti.java b/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummyMulti.java index 393c6bf61ec..5d6b79eb454 100644 --- a/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummyMulti.java +++ b/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummyMulti.java @@ -73,7 +73,7 @@ public void test020CreateConfiguredConnector() throws Exception { OperationResult result = createOperationResult(); PrismContainerValue configContainer = resourceType.getConnectorConfiguration().asPrismContainerValue(); - displayValue("Configuration container", configContainer); + displayDumpable("Configuration container", configContainer); // WHEN cc.configure(configContainer, ResourceTypeUtil.getSchemaGenerationConstraints(resourceType), result); @@ -142,7 +142,7 @@ public boolean handle(PrismObject shadow) { assertEquals("Unexpected number of search results", 1, searchResults.size()); ConnectorOperationalStatus opStat = cc.getOperationalStatus(); - displayValue("stats", opStat); + displayDumpable("stats", opStat); assertEquals("Wrong pool active", (Integer) 0, opStat.getPoolStatusNumActive()); assertEquals("Wrong pool active", (Integer) 1, opStat.getPoolStatusNumIdle()); } @@ -190,7 +190,7 @@ public void run() { Thread.sleep(500); ConnectorOperationalStatus opStat = cc.getOperationalStatus(); - displayValue("stats (blocked)", opStat); + displayDumpable("stats (blocked)", opStat); assertEquals("Wrong pool active", (Integer) 1, opStat.getPoolStatusNumActive()); assertEquals("Wrong pool active", (Integer) 0, opStat.getPoolStatusNumIdle()); @@ -206,12 +206,12 @@ public void run() { assertEquals("Unexpected number of search results", 1, searchResults.size()); opStat = cc.getOperationalStatus(); - displayValue("stats (final)", opStat); + displayDumpable("stats (final)", opStat); assertEquals("Wrong pool active", (Integer) 0, opStat.getPoolStatusNumActive()); assertEquals("Wrong pool active", (Integer) 1, opStat.getPoolStatusNumIdle()); PrismObject searchResult = searchResults.get(0); - displayValue("Search result", searchResult); + displayDumpable("Search result", searchResult); } @Test @@ -265,7 +265,7 @@ public void run() { Thread.sleep(500); ConnectorOperationalStatus opStat = cc.getOperationalStatus(); - displayValue("stats (blocked 1)", opStat); + displayDumpable("stats (blocked 1)", opStat); assertEquals("Wrong pool active", (Integer) 1, opStat.getPoolStatusNumActive()); assertEquals("Wrong pool active", (Integer) 0, opStat.getPoolStatusNumIdle()); @@ -290,7 +290,7 @@ public void run() { Thread.sleep(500); opStat = cc.getOperationalStatus(); - displayValue("stats (blocked 2)", opStat); + displayDumpable("stats (blocked 2)", opStat); assertEquals("Wrong pool active", (Integer) 2, opStat.getPoolStatusNumActive()); assertEquals("Wrong pool active", (Integer) 0, opStat.getPoolStatusNumIdle()); @@ -308,15 +308,15 @@ public void run() { assertEquals("Unexpected number of search results 2", 1, searchResults2.size()); opStat = cc.getOperationalStatus(); - displayValue("stats (final)", opStat); + displayDumpable("stats (final)", opStat); assertEquals("Wrong pool active", (Integer) 0, opStat.getPoolStatusNumActive()); assertEquals("Wrong pool active", (Integer) 2, opStat.getPoolStatusNumIdle()); PrismObject searchResult1 = searchResults1.get(0); - displayValue("Search result 1", searchResult1); + displayDumpable("Search result 1", searchResult1); PrismObject searchResult2 = searchResults2.get(0); - displayValue("Search result 2", searchResult2); + displayDumpable("Search result 2", searchResult2); } private void checkUcfShadow(PrismObject shadow, ObjectClassComplexTypeDefinition objectClassDefinition) { diff --git a/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfOpenDj.java b/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfOpenDj.java index b63fec34f29..2c151b8b75b 100644 --- a/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfOpenDj.java +++ b/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfOpenDj.java @@ -137,7 +137,7 @@ public void initUcf() throws Exception { connectorSchema = factory.generateConnectorConfigurationSchema(connectorType); AssertJUnit.assertNotNull("Cannot generate connector schema", connectorSchema); - displayValue("Connector schema", connectorSchema); + displayDumpable("Connector schema", connectorSchema); cc = factory.createConnectorInstance(connectorType, ResourceTypeUtil.getResourceNamespace(resourceType), "OpenDJ resource", @@ -149,7 +149,7 @@ public void initUcf() throws Exception { // TODO: assert something resourceSchema = cc.fetchResourceSchema(result); - displayValue("Resource schema", resourceSchema); + displayDumpable("Resource schema", resourceSchema); AssertJUnit.assertNotNull(resourceSchema); @@ -433,7 +433,7 @@ public void test310TestConnectionNegative() throws Exception { // THEN result.computeStatus("test failed"); - displayValue("Test result (FAILURE EXPECTED)", result); + displayDumpable("Test result (FAILURE EXPECTED)", result); AssertJUnit.assertNotNull(result); OperationResult connectorConnectionResult = result.getSubresults().get(1); AssertJUnit.assertNotNull(connectorConnectionResult); diff --git a/repo/repo-cache/src/test/java/com/evolveum/midpoint/repo/cache/TestRepositoryCache.java b/repo/repo-cache/src/test/java/com/evolveum/midpoint/repo/cache/TestRepositoryCache.java index 91a2603f893..7593adbb998 100644 --- a/repo/repo-cache/src/test/java/com/evolveum/midpoint/repo/cache/TestRepositoryCache.java +++ b/repo/repo-cache/src/test/java/com/evolveum/midpoint/repo/cache/TestRepositoryCache.java @@ -35,6 +35,7 @@ import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.schema.statistics.RepositoryPerformanceInformationUtil; import com.evolveum.midpoint.test.util.AbstractSpringTest; +import com.evolveum.midpoint.test.util.InfraTestMixin; import com.evolveum.midpoint.util.PrettyPrinter; import com.evolveum.midpoint.util.exception.ObjectAlreadyExistsException; import com.evolveum.midpoint.util.exception.ObjectNotFoundException; @@ -47,7 +48,7 @@ @SuppressWarnings("SameParameterValue") @ContextConfiguration(locations = { "classpath:ctx-repo-cache-test.xml" }) -public class TestRepositoryCache extends AbstractSpringTest { +public class TestRepositoryCache extends AbstractSpringTest implements InfraTestMixin { private static final String CLASS_DOT = TestRepositoryCache.class.getName() + "."; @@ -105,18 +106,18 @@ private void testGetObject(Class objectClass, boolean String oid = repositoryCache.addObject(object, null, result); PrismObject object1 = repositoryCache.getObject(objectClass, oid, null, result); - PrismTestUtil.display("1st object retrieved", object1); + displayDumpable("1st object retrieved", object1); assertEquals("Wrong object1", object, object1); object1.asObjectable().setDescription("garbage"); PrismObject object2 = repositoryCache.getObject(objectClass, oid, null, result); - PrismTestUtil.display("2nd object retrieved", object2); + displayDumpable("2nd object retrieved", object2); assertEquals("Wrong object2", object, object2); object2.asObjectable().setDescription("total garbage"); PrismObject object3 = repositoryCache.getObject(objectClass, oid, null, result); assertEquals("Wrong object3", object, object3); - PrismTestUtil.display("3rd object retrieved", object3); + displayDumpable("3rd object retrieved", object3); dumpStatistics(); assertAddOperations(1); @@ -212,7 +213,7 @@ private void deleteExistingObjects(Class objectClass, ObjectNotFoundException { SearchResultList> existingObjects = repositoryCache.searchObjects(objectClass, null, null, result); for (PrismObject existingObject : existingObjects) { - System.out.println("Deleting " + existingObject); + display("Deleting " + existingObject); repositoryCache.deleteObject(objectClass, existingObject.getOid(), result); } } diff --git a/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java b/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java index 8d49cda7f95..42afd4cebd1 100644 --- a/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java +++ b/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java @@ -58,7 +58,7 @@ import com.evolveum.midpoint.schema.constants.SchemaConstants; import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.test.util.AbstractSpringTest; -import com.evolveum.midpoint.test.util.OperationResultTestMixin; +import com.evolveum.midpoint.test.util.InfraTestMixin; import com.evolveum.midpoint.test.util.TestUtil; import com.evolveum.midpoint.util.DebugDumpable; import com.evolveum.midpoint.util.PrettyPrinter; @@ -69,7 +69,7 @@ import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType; public class BaseSQLRepoTest extends AbstractSpringTest - implements OperationResultTestMixin { + implements InfraTestMixin { static final File FOLDER_BASE = new File("./src/test/resources"); @@ -302,7 +302,7 @@ protected void assertSearch(ItemName item, String value, int expectedCount, Oper } protected void displayValue(String title, DebugDumpable value) { - PrismTestUtil.display(title, value); + displayDumpable(title, value); } public void displayValue(String title, Object value) { diff --git a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractHigherUnitTest.java b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractHigherUnitTest.java index 2de1dc04e3b..491f25722f0 100644 --- a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractHigherUnitTest.java +++ b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractHigherUnitTest.java @@ -51,6 +51,7 @@ import com.evolveum.midpoint.schema.util.ResourceTypeUtil; import com.evolveum.midpoint.schema.util.ShadowUtil; import com.evolveum.midpoint.task.api.Task; +import com.evolveum.midpoint.test.util.InfraTestMixin; import com.evolveum.midpoint.test.util.MidPointTestConstants; import com.evolveum.midpoint.test.util.TestUtil; import com.evolveum.midpoint.tools.testng.AbstractUnitTest; @@ -70,7 +71,7 @@ * * @author Radovan Semancik */ -public abstract class AbstractHigherUnitTest extends AbstractUnitTest { +public abstract class AbstractHigherUnitTest extends AbstractUnitTest implements InfraTestMixin { public static final String COMMON_DIR_NAME = "common"; public static final File COMMON_DIR = new File(MidPointTestConstants.TEST_RESOURCES_DIR, COMMON_DIR_NAME); @@ -517,10 +518,6 @@ public static void display(String title, List elements) { IntegrationTestTools.display(title, elements); } - public static void display(String title, DebugDumpable dumpable) { - PrismTestUtil.display(title, dumpable); - } - public static void display(String title, Object value) { IntegrationTestTools.display(title, value); } 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 61394bfa099..74006cd66dc 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 @@ -120,7 +120,7 @@ */ @Listeners({ CurrentTestResultHolder.class }) public abstract class AbstractIntegrationTest extends AbstractSpringTest - implements OperationResultTestMixin { + implements InfraTestMixin { protected static final String USER_ADMINISTRATOR_USERNAME = "administrator"; @@ -300,7 +300,7 @@ public void finishTestContext(ITestResult testResult) { if (result != null) { result.computeStatusIfUnknown(); if (result.isTraced()) { - System.out.println("Storing the trace."); + display("Storing the trace."); tracer.storeTrace(task, result, null); } task.getResult().computeStatusIfUnknown(); @@ -1155,7 +1155,7 @@ protected long getCounterIncrement(InternalCounters counter) { protected void assertCounterIncrement(InternalCounters counter, int expectedIncrement) { long currentCount = InternalMonitor.getCount(counter); long actualIncrement = currentCount - getLastCount(counter); - assertEquals("Unexpected increment in " + counter.getLabel(), (long) expectedIncrement, actualIncrement); + assertEquals("Unexpected increment in " + counter.getLabel(), expectedIncrement, actualIncrement); lastCountMap.put(counter, currentCount); } @@ -1182,13 +1182,13 @@ protected void assertResourceCacheMissesIncrement(int expectedIncrement) { protected void assertCacheHits(CachingStatistics lastStats, CachingStatistics currentStats, String desc, int expectedIncrement) { long actualIncrement = currentStats.getHits() - lastStats.getHits(); - assertEquals("Unexpected increment in " + desc + " hit count", (long) expectedIncrement, actualIncrement); + assertEquals("Unexpected increment in " + desc + " hit count", expectedIncrement, actualIncrement); lastStats.setHits(currentStats.getHits()); } protected void assertCacheMisses(CachingStatistics lastStats, CachingStatistics currentStats, String desc, int expectedIncrement) { long actualIncrement = currentStats.getMisses() - lastStats.getMisses(); - assertEquals("Unexpected increment in " + desc + " miss count", (long) expectedIncrement, actualIncrement); + assertEquals("Unexpected increment in " + desc + " miss count", expectedIncrement, actualIncrement); lastStats.setMisses(currentStats.getMisses()); } @@ -1221,7 +1221,7 @@ protected void rememberDummyResourceGroupMembersReadCount(String instanceName) { protected void assertDummyResourceGroupMembersReadCountIncrement(String instanceName, int expectedIncrement) { long currentDummyResourceGroupMembersReadCount = DummyResource.getInstance(instanceName).getGroupMembersReadCount(); long actualIncrement = currentDummyResourceGroupMembersReadCount - lastDummyResourceGroupMembersReadCount; - assertEquals("Unexpected increment in group members read count in dummy resource '" + instanceName + "'", (long) expectedIncrement, actualIncrement); + assertEquals("Unexpected increment in group members read count in dummy resource '" + instanceName + "'", expectedIncrement, actualIncrement); lastDummyResourceGroupMembersReadCount = currentDummyResourceGroupMembersReadCount; } @@ -1232,7 +1232,7 @@ protected void rememberDummyResourceWriteOperationCount(String instanceName) { protected void assertDummyResourceWriteOperationCountIncrement(String instanceName, int expectedIncrement) { long currentCount = DummyResource.getInstance(instanceName).getWriteOperationCount(); long actualIncrement = currentCount - lastDummyResourceWriteOperationCount; - assertEquals("Unexpected increment in write operation count in dummy resource '" + instanceName + "'", (long) expectedIncrement, actualIncrement); + assertEquals("Unexpected increment in write operation count in dummy resource '" + instanceName + "'", expectedIncrement, actualIncrement); lastDummyResourceWriteOperationCount = currentCount; } @@ -1273,7 +1273,9 @@ protected PrismObject createShadow(PrismObject resourc return shadow; } - protected PrismObject findAccountShadowByUsername(String username, PrismObject resource, OperationResult result) throws SchemaException, ObjectNotFoundException, SecurityViolationException, CommunicationException, ConfigurationException { + protected PrismObject findAccountShadowByUsername( + String username, PrismObject resource, OperationResult result) + throws SchemaException { ObjectQuery query = createAccountShadowQuerySecondaryIdentifier(username, resource); List> accounts = repositoryService.searchObjects(ShadowType.class, query, null, result); if (accounts.isEmpty()) { @@ -1283,7 +1285,7 @@ protected PrismObject findAccountShadowByUsername(String username, P return accounts.iterator().next(); } - protected PrismObject findShadowByName(ShadowKindType kind, String intent, String name, PrismObject resource, OperationResult result) throws SchemaException, ObjectNotFoundException, SecurityViolationException, CommunicationException, ConfigurationException { + protected PrismObject findShadowByName(ShadowKindType kind, String intent, String name, PrismObject resource, OperationResult result) throws SchemaException { RefinedResourceSchema rSchema = RefinedResourceSchemaImpl.getRefinedSchema(resource); RefinedObjectClassDefinition rOcDef = rSchema.getRefinedDefinition(kind, intent); ObjectQuery query = createShadowQuerySecondaryIdentifier(rOcDef, name, resource); @@ -1295,7 +1297,7 @@ protected PrismObject findShadowByName(ShadowKindType kind, String i return shadows.iterator().next(); } - protected PrismObject findShadowByName(QName objectClass, String name, PrismObject resource, OperationResult result) throws SchemaException, ObjectNotFoundException, SecurityViolationException, CommunicationException, ConfigurationException { + protected PrismObject findShadowByName(QName objectClass, String name, PrismObject resource, OperationResult result) throws SchemaException { RefinedResourceSchema rSchema = RefinedResourceSchemaImpl.getRefinedSchema(resource); RefinedObjectClassDefinition rOcDef = rSchema.getRefinedDefinition(objectClass); ObjectQuery query = createShadowQuerySecondaryIdentifier(rOcDef, name, resource); @@ -1327,7 +1329,7 @@ protected ObjectQuery createAccountShadowQuerySecondaryIdentifier(String identif return createShadowQuerySecondaryIdentifier(rAccount, identifier, resource); } - protected ObjectQuery createShadowQuerySecondaryIdentifier(ObjectClassComplexTypeDefinition rAccount, String identifier, PrismObject resource) throws SchemaException { + protected ObjectQuery createShadowQuerySecondaryIdentifier(ObjectClassComplexTypeDefinition rAccount, String identifier, PrismObject resource) { Collection identifierDefs = rAccount.getSecondaryIdentifiers(); assert identifierDefs.size() == 1 : "Unexpected identifier set in " + resource + " refined schema: " + identifierDefs; ResourceAttributeDefinition identifierDef = identifierDefs.iterator().next(); @@ -1345,7 +1347,7 @@ protected ObjectQuery createAccountShadowQueryByAttribute(String attributeName, return createShadowQueryByAttribute(rAccount, attributeName, attributeValue, resource); } - protected ObjectQuery createShadowQueryByAttribute(ObjectClassComplexTypeDefinition rAccount, String attributeName, String attributeValue, PrismObject resource) throws SchemaException { + protected ObjectQuery createShadowQueryByAttribute(ObjectClassComplexTypeDefinition rAccount, String attributeName, String attributeValue, PrismObject resource) { ResourceAttributeDefinition attrDef = rAccount.findAttributeDefinition(attributeName); return prismContext.queryFor(ShadowType.class) .itemWithDef(attrDef, ShadowType.F_ATTRIBUTES, attrDef.getItemName()).eq(attributeValue) @@ -1354,7 +1356,7 @@ protected ObjectQuery createShadowQueryByAttribute(ObjectClassComplexTypeDefinit .build(); } - protected ObjectQuery createOrgSubtreeQuery(String orgOid) throws SchemaException { + protected ObjectQuery createOrgSubtreeQuery(String orgOid) { return queryFor(ObjectType.class) .isChildOf(orgOid) .build(); @@ -1378,9 +1380,8 @@ protected PrismObjectDefinition getShadowDefinition() { // objectClassName may be null protected RefinedAttributeDefinition getAttributeDefinition(ResourceType resourceType, - ShadowKindType kind, - QName objectClassName, - String attributeLocalName) throws SchemaException { + ShadowKindType kind, QName objectClassName, String attributeLocalName) + throws SchemaException { RefinedResourceSchema refinedResourceSchema = RefinedResourceSchemaImpl.getRefinedSchema(resourceType); RefinedObjectClassDefinition refinedObjectClassDefinition = refinedResourceSchema.findRefinedDefinitionByObjectClassQName(kind, objectClassName); @@ -1887,10 +1888,6 @@ public static void display(String title, List elements) { IntegrationTestTools.display(title, elements); } - public void display(String title, DebugDumpable dumpable) { - PrismTestUtil.display(title, dumpable); - } - public void displayValue(String title, Object value) { PrismTestUtil.display(title, value); } @@ -2398,10 +2395,7 @@ protected void assertRoleMembershipRef(PrismObject focu if (!expectedOid.equals(hasRef.getOid())) { return false; } - if (!prismContext.relationMatches(relation, hasRef.getRelation())) { - return false; - } - return true; + return prismContext.relationMatches(relation, hasRef.getRelation()); })) { AssertJUnit.fail("Wrong values in roleMembershipRef in " + focus + ", expected relation " + relation + ", OIDs " + Arrays.toString(roleOids) diff --git a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ShadowAsserter.java b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ShadowAsserter.java index 6e814297aa6..66ac7b53467 100644 --- a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ShadowAsserter.java +++ b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ShadowAsserter.java @@ -6,6 +6,10 @@ */ package com.evolveum.midpoint.test.asserter; +import static org.testng.AssertJUnit.*; + +import javax.xml.namespace.QName; + import com.evolveum.midpoint.prism.PrismObject; import com.evolveum.midpoint.prism.PrismProperty; import com.evolveum.midpoint.prism.util.PrismAsserts; @@ -14,14 +18,8 @@ import com.evolveum.midpoint.xml.ns._public.common.common_3.*; import com.evolveum.prism.xml.ns._public.types_3.PolyStringType; -import javax.xml.namespace.QName; - -import static org.testng.AssertJUnit.*; - -/** - * @author semancik - */ -public class ShadowAsserter extends PrismObjectAsserter { +@SuppressWarnings("UnusedReturnValue") +public class ShadowAsserter extends PrismObjectAsserter { public ShadowAsserter(PrismObject shadow) { super(shadow); @@ -80,62 +78,64 @@ public ShadowAsserter assertActiveLifecycleState() { } public ShadowAsserter assertObjectClass() { - assertNotNull("No objectClass in "+desc(), getObject().asObjectable().getObjectClass()); + assertNotNull("No objectClass in " + desc(), getObject().asObjectable().getObjectClass()); return this; } public ShadowAsserter assertObjectClass(QName expected) { - PrismAsserts.assertMatchesQName("Wrong objectClass in "+desc(), expected, getObject().asObjectable().getObjectClass()); + PrismAsserts.assertMatchesQName("Wrong objectClass in " + desc(), expected, getObject().asObjectable().getObjectClass()); return this; } public ShadowAsserter assertKind() { - assertNotNull("No kind in "+desc(), getObject().asObjectable().getKind()); + assertNotNull("No kind in " + desc(), getObject().asObjectable().getKind()); return this; } public ShadowAsserter assertKind(ShadowKindType expected) { - assertEquals("Wrong kind in "+desc(), expected, getObject().asObjectable().getKind()); + assertEquals("Wrong kind in " + desc(), expected, getObject().asObjectable().getKind()); return this; } public ShadowAsserter assertIntent(String expected) { - assertEquals("Wrong intent in "+desc(), expected, getObject().asObjectable().getIntent()); + assertEquals("Wrong intent in " + desc(), expected, getObject().asObjectable().getIntent()); return this; } public ShadowAsserter assertTag(String expected) { - assertEquals("Wrong tag in "+desc(), expected, getObject().asObjectable().getTag()); + assertEquals("Wrong tag in " + desc(), expected, getObject().asObjectable().getTag()); return this; } public ShadowAsserter assertTagIsOid() { - assertEquals("Wrong tag in "+desc(), getObject().getOid(), getObject().asObjectable().getTag()); + assertEquals("Wrong tag in " + desc(), getObject().getOid(), getObject().asObjectable().getTag()); return this; } public ShadowAsserter assertPrimaryIdentifierValue(String expected) { - assertEquals("Wrong primaryIdentifierValue in "+desc(), expected, getObject().asObjectable().getPrimaryIdentifierValue()); + assertEquals("Wrong primaryIdentifierValue in " + desc(), expected, getObject().asObjectable().getPrimaryIdentifierValue()); return this; } public ShadowAsserter assertNoPrimaryIdentifierValue() { - assertNull("Unexpected primaryIdentifierValue in "+desc(), getObject().asObjectable().getPrimaryIdentifierValue()); + assertNull("Unexpected primaryIdentifierValue in " + desc(), getObject().asObjectable().getPrimaryIdentifierValue()); return this; } public ShadowAsserter assertIteration(Integer expected) { - assertEquals("Wrong iteration in "+desc(), expected, getObject().asObjectable().getIteration()); + assertEquals("Wrong iteration in " + desc(), expected, getObject().asObjectable().getIteration()); return this; } public ShadowAsserter assertIterationToken(String expected) { - assertEquals("Wrong iteration token in "+desc(), expected, getObject().asObjectable().getIterationToken()); + assertEquals("Wrong iteration token in " + desc(), + expected, getObject().asObjectable().getIterationToken()); return this; } public ShadowAsserter assertSynchronizationSituation(SynchronizationSituationType expected) { - assertEquals("Wrong synchronization situation in "+desc(), expected, getObject().asObjectable().getSynchronizationSituation()); + assertEquals("Wrong synchronization situation in " + desc(), + expected, getObject().asObjectable().getSynchronizationSituation()); return this; } @@ -145,19 +145,20 @@ public ShadowAsserter assertAdministrativeStatus(ActivationStatusType expect if (expected == null) { return this; } else { - fail("No activation in "+desc()); + fail("No activation in " + desc()); } } - assertEquals("Wrong activation administrativeStatus in "+desc(), expected, activation.getAdministrativeStatus()); + assertEquals("Wrong activation administrativeStatus in " + desc(), + expected, activation.getAdministrativeStatus()); return this; } public ShadowAsserter assertResource(String expectedResourceOid) { ObjectReferenceType resourceRef = getObject().asObjectable().getResourceRef(); if (resourceRef == null) { - fail("No resourceRef in "+desc()); + fail("No resourceRef in " + desc()); } - assertEquals("Wrong resourceRef OID in "+desc(), expectedResourceOid, resourceRef.getOid()); + assertEquals("Wrong resourceRef OID in " + desc(), expectedResourceOid, resourceRef.getOid()); return this; } @@ -181,13 +182,13 @@ public ShadowAsserter assertDead() { public ShadowAsserter assertNotDead() { Boolean isDead = getObject().asObjectable().isDead(); if (isDead != null && isDead) { - fail("Wrong isDead in "+desc()+", expected null or false, but was true"); + fail("Wrong isDead in " + desc() + ", expected null or false, but was true"); } return this; } public ShadowAsserter assertIsDead(Boolean expected) { - assertEquals("Wrong isDead in "+desc(), expected, getObject().asObjectable().isDead()); + assertEquals("Wrong isDead in " + desc(), expected, getObject().asObjectable().isDead()); assertNoPrimaryIdentifierValue(); return this; } @@ -195,7 +196,7 @@ public ShadowAsserter assertIsDead(Boolean expected) { public ShadowAsserter assertIsExists() { Boolean isExists = getObject().asObjectable().isExists(); if (isExists != null && !isExists) { - fail("Wrong isExists in "+desc()+", expected null or true, but was false"); + fail("Wrong isExists in " + desc() + ", expected null or true, but was false"); } return this; } @@ -206,7 +207,7 @@ public ShadowAsserter assertIsNotExists() { } public ShadowAsserter assertIsExists(Boolean expected) { - assertEquals("Wrong isExists in "+desc(), expected, getObject().asObjectable().isExists()); + assertEquals("Wrong isExists in " + desc(), expected, getObject().asObjectable().isExists()); return this; } @@ -250,7 +251,7 @@ public PendingOperationsAsserter pendingOperations() { public ShadowAsserter hasUnfinishedPendingOperations() { pendingOperations() - .assertUnfinishedOperation(); + .assertUnfinishedOperation(); return this; } @@ -261,7 +262,7 @@ public ShadowAttributesAsserter attributes() { } public ShadowAsserter assertNoAttributes() { - assertNull("Unexpected attributes in "+desc(), getObject().findContainer(ShadowType.F_ATTRIBUTES)); + assertNull("Unexpected attributes in " + desc(), getObject().findContainer(ShadowType.F_ATTRIBUTES)); return this; } @@ -272,7 +273,7 @@ public ShadowAssociationsAsserter associations() { } public ShadowAsserter assertNoAssociations() { - assertNull("Unexpected associations in "+desc(), getObject().findContainer(ShadowType.F_ASSOCIATION)); + assertNull("Unexpected associations in " + desc(), getObject().findContainer(ShadowType.F_ASSOCIATION)); return this; } @@ -298,7 +299,7 @@ public ShadowAsserter assertOidDifferentThan(String oid) { public ShadowAsserter assertNoPassword() { PrismProperty passValProp = getPasswordValueProperty(); - assertNull("Unexpected password value property in "+desc()+": "+passValProp, passValProp); + assertNull("Unexpected password value property in " + desc() + ": " + passValProp, passValProp); return this; } diff --git a/repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/TestEmpty.java b/repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/TestEmpty.java index 7e3ae8d1c66..302066a276e 100644 --- a/repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/TestEmpty.java +++ b/repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/TestEmpty.java @@ -75,7 +75,7 @@ public void test020GuiProfiledPrincipalManagerMockUsername() throws Exception { } private void assertPrincipalJack(MidPointPrincipal principal) { - display("principal", principal); + displayDumpable("principal", principal); assertEquals("Bad principal name", USER_JACK_USERNAME, principal.getName().getOrig()); assertEquals("Bad principal name", USER_JACK_USERNAME, principal.getUsername()); FocusType user = principal.getFocus(); diff --git a/repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/AbstractTaskManagerTest.java b/repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/AbstractTaskManagerTest.java index 95680a415d2..b2d826ea8dc 100644 --- a/repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/AbstractTaskManagerTest.java +++ b/repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/AbstractTaskManagerTest.java @@ -37,7 +37,7 @@ import com.evolveum.midpoint.task.api.TaskExecutionStatus; import com.evolveum.midpoint.test.IntegrationTestTools; import com.evolveum.midpoint.test.util.AbstractSpringTest; -import com.evolveum.midpoint.test.util.OperationResultTestMixin; +import com.evolveum.midpoint.test.util.InfraTestMixin; import com.evolveum.midpoint.util.DebugDumpable; import com.evolveum.midpoint.util.PrettyPrinter; import com.evolveum.midpoint.util.exception.CommonException; @@ -46,7 +46,7 @@ import com.evolveum.midpoint.util.exception.SchemaException; import com.evolveum.midpoint.xml.ns._public.common.common_3.*; -public class AbstractTaskManagerTest extends AbstractSpringTest implements OperationResultTestMixin { +public class AbstractTaskManagerTest extends AbstractSpringTest implements InfraTestMixin { private static final String CYCLE_TASK_HANDLER_URI = "http://midpoint.evolveum.com/test/cycle-task-handler"; private static final String CYCLE_FINISHING_TASK_HANDLER_URI = "http://midpoint.evolveum.com/test/cycle-finishing-task-handler"; @@ -338,8 +338,9 @@ private Set getCachingProfiles(Task task) { return env != null ? new HashSet<>(env.getCachingProfile()) : Collections.emptySet(); } + @Deprecated // inline protected void displayValue(String title, DebugDumpable value) { - PrismTestUtil.display(title, value); + displayDumpable(title, value); } public void displayValue(String title, Object value) { diff --git a/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsDnTest.java b/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsDnTest.java index 9b06ca531fd..e4445d9b63e 100644 --- a/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsDnTest.java +++ b/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsDnTest.java @@ -42,7 +42,7 @@ protected boolean isUsingGroupShortcutAttribute() { @Test public void test025SchemaDn() { ResourceAttributeDefinition dnDef = accountObjectClassDefinition.findAttributeDefinition("dn"); - display("DN defintion", dnDef); + displayDumpable("DN defintion", dnDef); PrismAsserts.assertDefinition(dnDef, new QName(MidPointConstants.NS_RI, "dn"), DOMUtil.XSD_STRING, 1, 1); assertTrue("dn read", dnDef.canRead()); assertTrue("dn modify", dnDef.canModify()); diff --git a/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java b/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java index d6cff6bce65..84671c3fe52 100644 --- a/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java +++ b/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java @@ -345,20 +345,20 @@ public void test010Connection() throws Exception { // Set lsof baseline only after the first connection. // We will have more reasonable number here. lsof.rememberBaseline(); - display("lsof baseline", lsof); + displayDumpable("lsof baseline", lsof); } } @Test public void test020Schema() throws Exception { ResourceSchema resourceSchema = RefinedResourceSchema.getResourceSchema(resource, prismContext); - display("Resource schema", resourceSchema); + displayDumpable("Resource schema", resourceSchema); RefinedResourceSchema refinedSchema = RefinedResourceSchema.getRefinedSchema(resource); - display("Refined schema", refinedSchema); + displayDumpable("Refined schema", refinedSchema); accountObjectClassDefinition = refinedSchema.findObjectClassDefinition(getAccountObjectClass()); assertNotNull("No definition for object class " + getAccountObjectClass(), accountObjectClassDefinition); - display("Account object class def", accountObjectClassDefinition); + displayDumpable("Account object class def", accountObjectClassDefinition); ResourceAttributeDefinition cnDef = accountObjectClassDefinition.findAttributeDefinition("cn"); PrismAsserts.assertDefinition(cnDef, new QName(MidPointConstants.NS_RI, "cn"), DOMUtil.XSD_STRING, 1, 1); @@ -470,7 +470,7 @@ public boolean handle(PrismObject object, OperationResult parentResu // WHEN when(); - display("Searching shadows, options=" + options + ", query", query); + displayDumpable("Searching shadows, options=" + options + ", query", query); SearchResultMetadata searchResultMetadata = modelService.searchObjectsIterative(ShadowType.class, query, handler, options, task, result); // THEN diff --git a/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AdTestMixin.java b/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AdTestMixin.java index fcf48f4e6ce..0777a7449c9 100644 --- a/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AdTestMixin.java +++ b/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AdTestMixin.java @@ -1,253 +1,224 @@ -/* - * Copyright (c) 2016 Evolveum and contributors - * - * This work is dual-licensed under the Apache License 2.0 - * and European Union Public License. See LICENSE file for details. - */ -package com.evolveum.midpoint.testing.conntest.ad; - -import static org.testng.AssertJUnit.*; - -import javax.xml.namespace.QName; - -import com.evolveum.midpoint.common.refinery.RefinedResourceSchema; -import com.evolveum.midpoint.common.refinery.RefinedResourceSchemaImpl; -import com.evolveum.midpoint.prism.PrimitiveType; -import com.evolveum.midpoint.prism.PrismContext; -import com.evolveum.midpoint.prism.PrismObject; -import com.evolveum.midpoint.prism.util.PrismAsserts; -import com.evolveum.midpoint.prism.util.PrismTestUtil; -import com.evolveum.midpoint.schema.constants.MidPointConstants; -import com.evolveum.midpoint.schema.processor.ObjectClassComplexTypeDefinition; -import com.evolveum.midpoint.schema.processor.ResourceAttributeDefinition; -import com.evolveum.midpoint.schema.processor.ResourceSchema; -import com.evolveum.midpoint.schema.util.ResourceTypeUtil; -import com.evolveum.midpoint.tools.testng.MidpointTestMixin; -import com.evolveum.midpoint.util.DOMUtil; -import com.evolveum.midpoint.util.DebugDumpable; -import com.evolveum.midpoint.util.exception.SchemaException; -import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType; - -/** - * Mixin providing common methods/utilities for Active Directory (AD) related tests. - */ -public interface AdTestMixin extends MidpointTestMixin { - - String ATTRIBUTE_OBJECT_GUID_NAME = "objectGUID"; - String ATTRIBUTE_OBJECT_SID_NAME = "objectSid"; - String ATTRIBUTE_OBJECT_CATEGORY_NAME = "objectCategory"; - String ATTRIBUTE_SAM_ACCOUNT_NAME_NAME = "sAMAccountName"; - String ATTRIBUTE_USER_ACCOUNT_CONTROL_NAME = "userAccountControl"; - QName ATTRIBUTE_USER_ACCOUNT_CONTROL_QNAME = new QName(MidPointConstants.NS_RI, ATTRIBUTE_USER_ACCOUNT_CONTROL_NAME); - String ATTRIBUTE_UNICODE_PWD_NAME = "unicodePwd"; - String ATTRIBUTE_MS_EXCH_HIDE_FROM_ADDRESS_LISTS_NAME = "msExchHideFromAddressLists"; - QName ATTRIBUTE_MS_EXCH_HIDE_FROM_ADDRESS_LISTS_QNAME = new QName(MidPointConstants.NS_RI, ATTRIBUTE_MS_EXCH_HIDE_FROM_ADDRESS_LISTS_NAME); - String ATTRIBUTE_TITLE_NAME = "title"; - String ATTRIBUTE_PROXY_ADDRESSES_NAME = "proxyAddresses"; - String ATTRIBUTE_USER_PARAMETERS_NAME = "userParameters"; - - QName OBJECT_CLASS_MS_EXCH_BASE_CLASS_QNAME = new QName(MidPointConstants.NS_RI, "msExchBaseClass"); - - String AD_CONNECTOR_TYPE = "com.evolveum.polygon.connector.ldap.ad.AdLdapConnector"; - - /** - * Returns dashed GUID notation formatted from simple hex-encoded binary. - *

- * E.g. "2f01c06bb1d0414e9a69dd3841a13506" -> "6bc0012f-d0b1-4e41-9a69-dd3841a13506" - */ - default String formatGuidToDashedNotation(String hexValue) { - if (hexValue == null) { - return null; - } - return hexValue.substring(6, 8) - + hexValue.substring(4, 6) - + hexValue.substring(2, 4) - + hexValue.substring(0, 2) - + '-' - + hexValue.substring(10, 12) - + hexValue.substring(8, 10) - + '-' - + hexValue.substring(14, 16) - + hexValue.substring(12, 14) - + '-' - + hexValue.substring(16, 20) - + '-' - + hexValue.substring(20, 32); - } - - default ObjectClassComplexTypeDefinition assertAdResourceSchema( - PrismObject resource, QName accountObjectClass, PrismContext prismContext) - throws SchemaException { - ResourceSchema resourceSchema = RefinedResourceSchema.getResourceSchema(resource, prismContext); - display("Resource schema", resourceSchema); - ResourceTypeUtil.validateSchema(resourceSchema, resource); - return assertAdSchema(resource, accountObjectClass); - } - - default ObjectClassComplexTypeDefinition assertAdResourceSchemaLongTimestamp( - PrismObject resource, QName accountObjectClass, PrismContext prismContext) - throws SchemaException { - ResourceSchema resourceSchema = RefinedResourceSchema.getResourceSchema(resource, prismContext); - display("Resource schema", resourceSchema); - ResourceTypeUtil.validateSchema(resourceSchema, resource); - return assertAdSchemaLongTimestamp(resource, accountObjectClass); - } - - default ObjectClassComplexTypeDefinition assertAdRefinedSchema( - PrismObject resource, QName accountObjectClass) throws SchemaException { - RefinedResourceSchema refinedSchema = RefinedResourceSchema.getRefinedSchema(resource); - display("Refined schema", refinedSchema); - RefinedResourceSchemaImpl.validateRefinedSchema(refinedSchema, resource); - return assertAdSchema(resource, accountObjectClass); - } - - // Assumes string timestamp - default ObjectClassComplexTypeDefinition assertAdSchema( - PrismObject resource, QName accountObjectClass) throws SchemaException { - ObjectClassComplexTypeDefinition accountObjectClassDefinition = assertAdSchemaBase(resource, accountObjectClass); - - ResourceAttributeDefinition createTimestampDef = - accountObjectClassDefinition.findAttributeDefinition("createTimeStamp"); - PrismAsserts.assertDefinition(createTimestampDef, - new QName(MidPointConstants.NS_RI, "createTimeStamp"), DOMUtil.XSD_DATETIME, 0, 1); - assertTrue("createTimeStampDef read", createTimestampDef.canRead()); - assertFalse("createTimeStampDef modify", createTimestampDef.canModify()); - assertFalse("createTimeStampDef add", createTimestampDef.canAdd()); - - ResourceAttributeDefinition whenChangedDef = - accountObjectClassDefinition.findAttributeDefinition("whenChanged"); - PrismAsserts.assertDefinition(whenChangedDef, - new QName(MidPointConstants.NS_RI, "createTimeStamp"), DOMUtil.XSD_DATETIME, 0, 1); - assertTrue("whenChanged read", whenChangedDef.canRead()); - assertFalse("whenChanged modify", whenChangedDef.canModify()); - assertFalse("whenChanged add", whenChangedDef.canAdd()); - - return accountObjectClassDefinition; - } - - // Assumes string timestamp - default ObjectClassComplexTypeDefinition assertAdSchemaLongTimestamp( - PrismObject resource, QName accountObjectClass) throws SchemaException { - ObjectClassComplexTypeDefinition accountObjectClassDefinition = assertAdSchemaBase(resource, accountObjectClass); - - ResourceAttributeDefinition createTimestampDef = accountObjectClassDefinition.findAttributeDefinition("createTimeStamp"); - PrismAsserts.assertDefinition(createTimestampDef, new QName(MidPointConstants.NS_RI, "createTimeStamp"), - DOMUtil.XSD_LONG, 0, 1); - assertTrue("createTimeStampDef read", createTimestampDef.canRead()); - assertFalse("createTimeStampDef modify", createTimestampDef.canModify()); - assertFalse("createTimeStampDef add", createTimestampDef.canAdd()); - - return accountObjectClassDefinition; - } - - // TODO after ditching JDK 8 - /*private*/ default ObjectClassComplexTypeDefinition assertAdSchemaBase( - PrismObject resource, QName accountObjectClass) throws SchemaException { - - RefinedResourceSchema refinedSchema = RefinedResourceSchema.getRefinedSchema(resource); - display("Refined schema", refinedSchema); - ObjectClassComplexTypeDefinition accountObjectClassDefinition = refinedSchema.findObjectClassDefinition(accountObjectClass); - assertNotNull("No definition for object class " + accountObjectClass, accountObjectClassDefinition); - display("Account object class def", accountObjectClassDefinition); - - ResourceAttributeDefinition cnDef = accountObjectClassDefinition.findAttributeDefinition("cn"); - PrismAsserts.assertDefinition(cnDef, new QName(MidPointConstants.NS_RI, "cn"), DOMUtil.XSD_STRING, 0, 1); - assertTrue("cn read", cnDef.canRead()); - assertTrue("cn modify", cnDef.canModify()); - assertTrue("cn add", cnDef.canAdd()); - - ResourceAttributeDefinition samAccountNameDef = accountObjectClassDefinition.findAttributeDefinition(ATTRIBUTE_SAM_ACCOUNT_NAME_NAME); - PrismAsserts.assertDefinition(samAccountNameDef, - new QName(MidPointConstants.NS_RI, ATTRIBUTE_SAM_ACCOUNT_NAME_NAME), DOMUtil.XSD_STRING, 0, 1); - assertTrue("samAccountNameDef read", samAccountNameDef.canRead()); - assertTrue("samAccountNameDef modify", samAccountNameDef.canModify()); - assertTrue("samAccountNameDef add", samAccountNameDef.canAdd()); - - ResourceAttributeDefinition oDef = accountObjectClassDefinition.findAttributeDefinition("o"); - PrismAsserts.assertDefinition(oDef, new QName(MidPointConstants.NS_RI, "o"), DOMUtil.XSD_STRING, 0, -1); - assertTrue("o read", oDef.canRead()); - assertTrue("o modify", oDef.canModify()); - assertTrue("o add", oDef.canAdd()); - - ResourceAttributeDefinition isCriticalSystemObjectDef = accountObjectClassDefinition.findAttributeDefinition("isCriticalSystemObject"); - PrismAsserts.assertDefinition(isCriticalSystemObjectDef, new QName(MidPointConstants.NS_RI, "isCriticalSystemObject"), - PrimitiveType.XSD_BOOLEAN, 0, 1); - assertTrue("isCriticalSystemObject read", isCriticalSystemObjectDef.canRead()); - assertTrue("isCriticalSystemObject modify", isCriticalSystemObjectDef.canModify()); - assertTrue("isCriticalSystemObject add", isCriticalSystemObjectDef.canAdd()); - - ResourceAttributeDefinition nTSecurityDescriptorDef = accountObjectClassDefinition.findAttributeDefinition("nTSecurityDescriptor"); - PrismAsserts.assertDefinition(nTSecurityDescriptorDef, new QName(MidPointConstants.NS_RI, "nTSecurityDescriptor"), - PrimitiveType.XSD_BASE64BINARY, 0, 1); - assertTrue("nTSecurityDescriptor read", nTSecurityDescriptorDef.canRead()); - assertTrue("nTSecurityDescriptor modify", nTSecurityDescriptorDef.canModify()); - assertTrue("nTSecurityDescriptor add", nTSecurityDescriptorDef.canAdd()); - - ResourceAttributeDefinition objectSidDef = accountObjectClassDefinition.findAttributeDefinition(ATTRIBUTE_OBJECT_SID_NAME); - PrismAsserts.assertDefinition(objectSidDef, new QName(MidPointConstants.NS_RI, ATTRIBUTE_OBJECT_SID_NAME), - PrimitiveType.XSD_STRING, 0, 1); - assertTrue("objectSid read", objectSidDef.canRead()); - assertFalse("objectSid modify", objectSidDef.canModify()); - assertFalse("objectSid add", objectSidDef.canAdd()); - - ResourceAttributeDefinition lastLogonDef = accountObjectClassDefinition.findAttributeDefinition("lastLogon"); - PrismAsserts.assertDefinition(lastLogonDef, new QName(MidPointConstants.NS_RI, "lastLogon"), - PrimitiveType.XSD_LONG, 0, 1); - assertTrue("lastLogonDef read", lastLogonDef.canRead()); - assertTrue("lastLogonDef modify", lastLogonDef.canModify()); - assertTrue("lastLogonDef add", lastLogonDef.canAdd()); - - ResourceAttributeDefinition proxyAddressesDef = accountObjectClassDefinition.findAttributeDefinition(ATTRIBUTE_PROXY_ADDRESSES_NAME); - PrismAsserts.assertDefinition(proxyAddressesDef, new QName(MidPointConstants.NS_RI, ATTRIBUTE_PROXY_ADDRESSES_NAME), - PrimitiveType.XSD_STRING, 0, -1); - assertTrue("proxyAddressesDef read", proxyAddressesDef.canRead()); - assertTrue("proxyAddressesDef modify", proxyAddressesDef.canModify()); - assertTrue("proxyAddressesDef add", proxyAddressesDef.canAdd()); - // TODO: proxyAddressesDef.getMatchingRuleQName() - - return accountObjectClassDefinition; - } - - default void assertExchangeSchema(PrismObject resource, QName accountObjectClassQName, PrismContext prismContext) throws SchemaException { - - ResourceSchema resourceSchema = RefinedResourceSchema.getResourceSchema(resource, prismContext); - assertExchangeSchema(resourceSchema, accountObjectClassQName); - - RefinedResourceSchema refinedSchema = RefinedResourceSchema.getRefinedSchema(resource); - assertExchangeSchema(refinedSchema, accountObjectClassQName); - } - - default void assertExchangeSchema(ResourceSchema resourceSchema, QName accountObjectClassQName) { - ObjectClassComplexTypeDefinition msExchBaseClassObjectClassDefinition = resourceSchema.findObjectClassDefinition(OBJECT_CLASS_MS_EXCH_BASE_CLASS_QNAME); - assertNotNull("No definition for object class " + OBJECT_CLASS_MS_EXCH_BASE_CLASS_QNAME, msExchBaseClassObjectClassDefinition); - display("Object class " + OBJECT_CLASS_MS_EXCH_BASE_CLASS_QNAME + " def", msExchBaseClassObjectClassDefinition); - - ResourceAttributeDefinition msExchHideFromAddressListsDef = msExchBaseClassObjectClassDefinition.findAttributeDefinition(ATTRIBUTE_MS_EXCH_HIDE_FROM_ADDRESS_LISTS_NAME); - PrismAsserts.assertDefinition(msExchHideFromAddressListsDef, new QName(MidPointConstants.NS_RI, ATTRIBUTE_MS_EXCH_HIDE_FROM_ADDRESS_LISTS_NAME), DOMUtil.XSD_BOOLEAN, 0, 1); - assertTrue("msExchHideFromAddressLists read", msExchHideFromAddressListsDef.canRead()); - assertTrue("msExchHideFromAddressLists modify", msExchHideFromAddressListsDef.canModify()); - assertTrue("msExchHideFromAddressLists add", msExchHideFromAddressListsDef.canAdd()); - - ObjectClassComplexTypeDefinition accountObjectClassDef = resourceSchema.findObjectClassDefinition(accountObjectClassQName); - assertNotNull("No definition for object class " + accountObjectClassQName, accountObjectClassDef); - display("Object class " + accountObjectClassQName + " def", accountObjectClassDef); - - ResourceAttributeDefinition accountMsExchHideFromAddressListsDef = accountObjectClassDef.findAttributeDefinition(ATTRIBUTE_MS_EXCH_HIDE_FROM_ADDRESS_LISTS_NAME); - PrismAsserts.assertDefinition(accountMsExchHideFromAddressListsDef, new QName(MidPointConstants.NS_RI, ATTRIBUTE_MS_EXCH_HIDE_FROM_ADDRESS_LISTS_NAME), DOMUtil.XSD_BOOLEAN, 0, 1); - assertTrue("msExchHideFromAddressLists read", accountMsExchHideFromAddressListsDef.canRead()); - assertTrue("msExchHideFromAddressLists modify", accountMsExchHideFromAddressListsDef.canModify()); - assertTrue("msExchHideFromAddressLists add", accountMsExchHideFromAddressListsDef.canAdd()); - } - - default long getWin32Filetime(long millis) { - return (millis + 11644473600000L) * 10000L; - } - - default void display(String title, DebugDumpable value) { - PrismTestUtil.display(title, value); - } - - default void displayValue(String title, Object value) { - PrismTestUtil.display(title, value); - } -} +/* + * Copyright (c) 2016 Evolveum and contributors + * + * This work is dual-licensed under the Apache License 2.0 + * and European Union Public License. See LICENSE file for details. + */ +package com.evolveum.midpoint.testing.conntest.ad; + +import static org.testng.AssertJUnit.*; + +import javax.xml.namespace.QName; + +import com.evolveum.midpoint.common.refinery.RefinedResourceSchema; +import com.evolveum.midpoint.common.refinery.RefinedResourceSchemaImpl; +import com.evolveum.midpoint.prism.PrimitiveType; +import com.evolveum.midpoint.prism.PrismContext; +import com.evolveum.midpoint.prism.PrismObject; +import com.evolveum.midpoint.prism.util.PrismAsserts; +import com.evolveum.midpoint.prism.util.PrismTestUtil; +import com.evolveum.midpoint.schema.constants.MidPointConstants; +import com.evolveum.midpoint.schema.processor.ObjectClassComplexTypeDefinition; +import com.evolveum.midpoint.schema.processor.ResourceAttributeDefinition; +import com.evolveum.midpoint.schema.processor.ResourceSchema; +import com.evolveum.midpoint.schema.util.ResourceTypeUtil; +import com.evolveum.midpoint.test.util.InfraTestMixin; +import com.evolveum.midpoint.util.DOMUtil; +import com.evolveum.midpoint.util.exception.SchemaException; +import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType; + +/** + * Mixin providing common methods/utilities for Active Directory (AD) related tests. + */ +public interface AdTestMixin extends InfraTestMixin { + + String ATTRIBUTE_OBJECT_GUID_NAME = "objectGUID"; + String ATTRIBUTE_OBJECT_SID_NAME = "objectSid"; + String ATTRIBUTE_OBJECT_CATEGORY_NAME = "objectCategory"; + String ATTRIBUTE_SAM_ACCOUNT_NAME_NAME = "sAMAccountName"; + String ATTRIBUTE_USER_ACCOUNT_CONTROL_NAME = "userAccountControl"; + QName ATTRIBUTE_USER_ACCOUNT_CONTROL_QNAME = new QName(MidPointConstants.NS_RI, ATTRIBUTE_USER_ACCOUNT_CONTROL_NAME); + String ATTRIBUTE_UNICODE_PWD_NAME = "unicodePwd"; + String ATTRIBUTE_MS_EXCH_HIDE_FROM_ADDRESS_LISTS_NAME = "msExchHideFromAddressLists"; + String ATTRIBUTE_TITLE_NAME = "title"; + String ATTRIBUTE_PROXY_ADDRESSES_NAME = "proxyAddresses"; + String ATTRIBUTE_USER_PARAMETERS_NAME = "userParameters"; + + QName OBJECT_CLASS_MS_EXCH_BASE_CLASS_QNAME = new QName(MidPointConstants.NS_RI, "msExchBaseClass"); + + String AD_CONNECTOR_TYPE = "com.evolveum.polygon.connector.ldap.ad.AdLdapConnector"; + + /** + * Returns dashed GUID notation formatted from simple hex-encoded binary. + *

+ * E.g. "2f01c06bb1d0414e9a69dd3841a13506" -> "6bc0012f-d0b1-4e41-9a69-dd3841a13506" + */ + default String formatGuidToDashedNotation(String hexValue) { + if (hexValue == null) { + return null; + } + return hexValue.substring(6, 8) + + hexValue.substring(4, 6) + + hexValue.substring(2, 4) + + hexValue.substring(0, 2) + + '-' + + hexValue.substring(10, 12) + + hexValue.substring(8, 10) + + '-' + + hexValue.substring(14, 16) + + hexValue.substring(12, 14) + + '-' + + hexValue.substring(16, 20) + + '-' + + hexValue.substring(20, 32); + } + + default ObjectClassComplexTypeDefinition assertAdResourceSchema( + PrismObject resource, QName accountObjectClass, PrismContext prismContext) + throws SchemaException { + ResourceSchema resourceSchema = RefinedResourceSchema.getResourceSchema(resource, prismContext); + displayDumpable("Resource schema", resourceSchema); + ResourceTypeUtil.validateSchema(resourceSchema, resource); + return assertAdSchema(resource, accountObjectClass); + } + + default ObjectClassComplexTypeDefinition assertAdRefinedSchema( + PrismObject resource, QName accountObjectClass) throws SchemaException { + RefinedResourceSchema refinedSchema = RefinedResourceSchema.getRefinedSchema(resource); + displayDumpable("Refined schema", refinedSchema); + RefinedResourceSchemaImpl.validateRefinedSchema(refinedSchema, resource); + return assertAdSchema(resource, accountObjectClass); + } + + // Assumes string timestamp + default ObjectClassComplexTypeDefinition assertAdSchema( + PrismObject resource, QName accountObjectClass) throws SchemaException { + ObjectClassComplexTypeDefinition accountObjectClassDefinition = assertAdSchemaBase(resource, accountObjectClass); + + ResourceAttributeDefinition createTimestampDef = + accountObjectClassDefinition.findAttributeDefinition("createTimeStamp"); + PrismAsserts.assertDefinition(createTimestampDef, + new QName(MidPointConstants.NS_RI, "createTimeStamp"), DOMUtil.XSD_DATETIME, 0, 1); + assertTrue("createTimeStampDef read", createTimestampDef.canRead()); + assertFalse("createTimeStampDef modify", createTimestampDef.canModify()); + assertFalse("createTimeStampDef add", createTimestampDef.canAdd()); + + ResourceAttributeDefinition whenChangedDef = + accountObjectClassDefinition.findAttributeDefinition("whenChanged"); + PrismAsserts.assertDefinition(whenChangedDef, + new QName(MidPointConstants.NS_RI, "createTimeStamp"), DOMUtil.XSD_DATETIME, 0, 1); + assertTrue("whenChanged read", whenChangedDef.canRead()); + assertFalse("whenChanged modify", whenChangedDef.canModify()); + assertFalse("whenChanged add", whenChangedDef.canAdd()); + + return accountObjectClassDefinition; + } + + // TODO after ditching JDK 8 + /*private*/ + default ObjectClassComplexTypeDefinition assertAdSchemaBase( + PrismObject resource, QName accountObjectClass) throws SchemaException { + + RefinedResourceSchema refinedSchema = RefinedResourceSchema.getRefinedSchema(resource); + displayDumpable("Refined schema", refinedSchema); + ObjectClassComplexTypeDefinition accountObjectClassDefinition = refinedSchema.findObjectClassDefinition(accountObjectClass); + assertNotNull("No definition for object class " + accountObjectClass, accountObjectClassDefinition); + displayDumpable("Account object class def", accountObjectClassDefinition); + + ResourceAttributeDefinition cnDef = accountObjectClassDefinition.findAttributeDefinition("cn"); + PrismAsserts.assertDefinition(cnDef, new QName(MidPointConstants.NS_RI, "cn"), DOMUtil.XSD_STRING, 0, 1); + assertTrue("cn read", cnDef.canRead()); + assertTrue("cn modify", cnDef.canModify()); + assertTrue("cn add", cnDef.canAdd()); + + ResourceAttributeDefinition samAccountNameDef = accountObjectClassDefinition.findAttributeDefinition(ATTRIBUTE_SAM_ACCOUNT_NAME_NAME); + PrismAsserts.assertDefinition(samAccountNameDef, + new QName(MidPointConstants.NS_RI, ATTRIBUTE_SAM_ACCOUNT_NAME_NAME), DOMUtil.XSD_STRING, 0, 1); + assertTrue("samAccountNameDef read", samAccountNameDef.canRead()); + assertTrue("samAccountNameDef modify", samAccountNameDef.canModify()); + assertTrue("samAccountNameDef add", samAccountNameDef.canAdd()); + + ResourceAttributeDefinition oDef = accountObjectClassDefinition.findAttributeDefinition("o"); + PrismAsserts.assertDefinition(oDef, new QName(MidPointConstants.NS_RI, "o"), DOMUtil.XSD_STRING, 0, -1); + assertTrue("o read", oDef.canRead()); + assertTrue("o modify", oDef.canModify()); + assertTrue("o add", oDef.canAdd()); + + ResourceAttributeDefinition isCriticalSystemObjectDef = accountObjectClassDefinition.findAttributeDefinition("isCriticalSystemObject"); + PrismAsserts.assertDefinition(isCriticalSystemObjectDef, new QName(MidPointConstants.NS_RI, "isCriticalSystemObject"), + PrimitiveType.XSD_BOOLEAN, 0, 1); + assertTrue("isCriticalSystemObject read", isCriticalSystemObjectDef.canRead()); + assertTrue("isCriticalSystemObject modify", isCriticalSystemObjectDef.canModify()); + assertTrue("isCriticalSystemObject add", isCriticalSystemObjectDef.canAdd()); + + ResourceAttributeDefinition nTSecurityDescriptorDef = accountObjectClassDefinition.findAttributeDefinition("nTSecurityDescriptor"); + PrismAsserts.assertDefinition(nTSecurityDescriptorDef, new QName(MidPointConstants.NS_RI, "nTSecurityDescriptor"), + PrimitiveType.XSD_BASE64BINARY, 0, 1); + assertTrue("nTSecurityDescriptor read", nTSecurityDescriptorDef.canRead()); + assertTrue("nTSecurityDescriptor modify", nTSecurityDescriptorDef.canModify()); + assertTrue("nTSecurityDescriptor add", nTSecurityDescriptorDef.canAdd()); + + ResourceAttributeDefinition objectSidDef = accountObjectClassDefinition.findAttributeDefinition(ATTRIBUTE_OBJECT_SID_NAME); + PrismAsserts.assertDefinition(objectSidDef, new QName(MidPointConstants.NS_RI, ATTRIBUTE_OBJECT_SID_NAME), + PrimitiveType.XSD_STRING, 0, 1); + assertTrue("objectSid read", objectSidDef.canRead()); + assertFalse("objectSid modify", objectSidDef.canModify()); + assertFalse("objectSid add", objectSidDef.canAdd()); + + ResourceAttributeDefinition lastLogonDef = accountObjectClassDefinition.findAttributeDefinition("lastLogon"); + PrismAsserts.assertDefinition(lastLogonDef, new QName(MidPointConstants.NS_RI, "lastLogon"), + PrimitiveType.XSD_LONG, 0, 1); + assertTrue("lastLogonDef read", lastLogonDef.canRead()); + assertTrue("lastLogonDef modify", lastLogonDef.canModify()); + assertTrue("lastLogonDef add", lastLogonDef.canAdd()); + + ResourceAttributeDefinition proxyAddressesDef = accountObjectClassDefinition.findAttributeDefinition(ATTRIBUTE_PROXY_ADDRESSES_NAME); + PrismAsserts.assertDefinition(proxyAddressesDef, new QName(MidPointConstants.NS_RI, ATTRIBUTE_PROXY_ADDRESSES_NAME), + PrimitiveType.XSD_STRING, 0, -1); + assertTrue("proxyAddressesDef read", proxyAddressesDef.canRead()); + assertTrue("proxyAddressesDef modify", proxyAddressesDef.canModify()); + assertTrue("proxyAddressesDef add", proxyAddressesDef.canAdd()); + // TODO: proxyAddressesDef.getMatchingRuleQName() + + return accountObjectClassDefinition; + } + + default void assertExchangeSchema(PrismObject resource, QName accountObjectClassQName, PrismContext prismContext) throws SchemaException { + + ResourceSchema resourceSchema = RefinedResourceSchema.getResourceSchema(resource, prismContext); + assertExchangeSchema(resourceSchema, accountObjectClassQName); + + RefinedResourceSchema refinedSchema = RefinedResourceSchema.getRefinedSchema(resource); + assertExchangeSchema(refinedSchema, accountObjectClassQName); + } + + default void assertExchangeSchema(ResourceSchema resourceSchema, QName accountObjectClassQName) { + ObjectClassComplexTypeDefinition msExchBaseClassObjectClassDefinition = resourceSchema.findObjectClassDefinition(OBJECT_CLASS_MS_EXCH_BASE_CLASS_QNAME); + assertNotNull("No definition for object class " + OBJECT_CLASS_MS_EXCH_BASE_CLASS_QNAME, msExchBaseClassObjectClassDefinition); + displayDumpable("Object class " + OBJECT_CLASS_MS_EXCH_BASE_CLASS_QNAME + " def", msExchBaseClassObjectClassDefinition); + + ResourceAttributeDefinition msExchHideFromAddressListsDef = msExchBaseClassObjectClassDefinition.findAttributeDefinition(ATTRIBUTE_MS_EXCH_HIDE_FROM_ADDRESS_LISTS_NAME); + PrismAsserts.assertDefinition(msExchHideFromAddressListsDef, new QName(MidPointConstants.NS_RI, ATTRIBUTE_MS_EXCH_HIDE_FROM_ADDRESS_LISTS_NAME), DOMUtil.XSD_BOOLEAN, 0, 1); + assertTrue("msExchHideFromAddressLists read", msExchHideFromAddressListsDef.canRead()); + assertTrue("msExchHideFromAddressLists modify", msExchHideFromAddressListsDef.canModify()); + assertTrue("msExchHideFromAddressLists add", msExchHideFromAddressListsDef.canAdd()); + + ObjectClassComplexTypeDefinition accountObjectClassDef = resourceSchema.findObjectClassDefinition(accountObjectClassQName); + assertNotNull("No definition for object class " + accountObjectClassQName, accountObjectClassDef); + displayDumpable("Object class " + accountObjectClassQName + " def", accountObjectClassDef); + + ResourceAttributeDefinition accountMsExchHideFromAddressListsDef = accountObjectClassDef.findAttributeDefinition(ATTRIBUTE_MS_EXCH_HIDE_FROM_ADDRESS_LISTS_NAME); + PrismAsserts.assertDefinition(accountMsExchHideFromAddressListsDef, new QName(MidPointConstants.NS_RI, ATTRIBUTE_MS_EXCH_HIDE_FROM_ADDRESS_LISTS_NAME), DOMUtil.XSD_BOOLEAN, 0, 1); + assertTrue("msExchHideFromAddressLists read", accountMsExchHideFromAddressListsDef.canRead()); + assertTrue("msExchHideFromAddressLists modify", accountMsExchHideFromAddressListsDef.canModify()); + assertTrue("msExchHideFromAddressLists add", accountMsExchHideFromAddressListsDef.canAdd()); + } + + default long getWin32Filetime(long millis) { + return (millis + 11644473600000L) * 10000L; + } + + default void displayValue(String title, Object value) { + PrismTestUtil.display(title, value); + } +} diff --git a/testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestRunAs.java b/testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestRunAs.java index f696fb2ef3d..8c896f14936 100644 --- a/testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestRunAs.java +++ b/testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestRunAs.java @@ -121,7 +121,7 @@ public void test100AssignAccountDummyToBarbossa() throws Exception { // Check account in dummy resource DummyAccount dummyAccount = assertDummyAccount(RESOURCE_DUMMY_NAME, USER_BARBOSSA_USERNAME, USER_BARBOSSA_FULL_NAME, true); - display("Dummy account", dummyAccount); + displayDumpable("Dummy account", dummyAccount); assertDummyAccountAttribute(RESOURCE_DUMMY_NAME, USER_BARBOSSA_USERNAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_GOSSIP_NAME, "Some say robot -- administrator"); diff --git a/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java b/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java index fca7d5fc625..69be9edf934 100644 --- a/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java +++ b/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java @@ -137,7 +137,7 @@ public void test001GetUserAdministrator() { assertNotNull("Returned entity in body must not be null.", userType); logger.info("Returned entity: {}", userType.asPrismObject().debugDump()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -159,7 +159,7 @@ public void test002GetNonExistingUser() { logger.info("Returned result: {}", result); assertEquals("Unexpected operation result status", OperationResultStatusType.FATAL_ERROR, result.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -177,7 +177,7 @@ public void test003GetNoAuthHeaders() { then(); assertStatus(response, 401); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); // No records. There are no auth headers so this is not considered to be a login attempt getDummyAuditService().assertRecords(0); } @@ -195,7 +195,7 @@ public void test004GetAuthBadUsernameNullPassword() { then(); assertStatus(response, 401); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(1); getDummyAuditService().assertFailedLogin(SchemaConstants.CHANNEL_REST_URI); } @@ -213,7 +213,7 @@ public void test005GetAuthBadUsernameEmptyPassword() { then(); assertStatus(response, 401); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(1); getDummyAuditService().assertFailedLogin(SchemaConstants.CHANNEL_REST_URI); } @@ -231,7 +231,7 @@ public void test006GetAuthBadUsernameBadPassword() { then(); assertStatus(response, 401); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(1); getDummyAuditService().assertFailedLogin(SchemaConstants.CHANNEL_REST_URI); } @@ -249,7 +249,7 @@ public void test007GetAuthNoPassword() { then(); assertStatus(response, 401); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(1); getDummyAuditService().assertFailedLogin(SchemaConstants.CHANNEL_REST_URI); } @@ -267,7 +267,7 @@ public void test016GetAuthBadPassword() { then(); assertStatus(response, 401); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(1); getDummyAuditService().assertFailedLogin(SchemaConstants.CHANNEL_REST_URI); } @@ -285,7 +285,7 @@ public void test017GetUnauthorizedUser() { then(); assertStatus(response, 401); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(1); getDummyAuditService().assertFailedLogin(SchemaConstants.CHANNEL_REST_URI); } @@ -303,7 +303,7 @@ public void test018GetUserAdministratorByCyclops() { then(); assertStatus(response, 403); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -326,7 +326,7 @@ public void test019GetUserAdministratorBySomebody() { assertNotNull("Returned entity in body must not be null.", userType); logger.info("Returned entity: {}", userType.asPrismObject().debugDump()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -346,7 +346,7 @@ public void test102AddUserTemplate() { assertStatus(response, 201); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); getDummyAuditService().assertHasDelta(1, ChangeType.ADD, ObjectTemplateType.class); @@ -371,7 +371,7 @@ public void test103AddUserBadTargetCollection() { logger.info("Returned result: {}", result); assertEquals("Unexpected operation result status", OperationResultStatusType.FATAL_ERROR, result.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -408,7 +408,7 @@ public void test104AddAccountRawResourceDoesNotExist() throws Exception { // the repository } - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); getDummyAuditService().assertHasDelta(1, ChangeType.ADD, ShadowType.class); @@ -428,7 +428,7 @@ public void test120AddRoleAdder() { displayResponse(response); assertStatus(response, 201); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); getDummyAuditService().assertHasDelta(1, ChangeType.ADD, RoleType.class); @@ -448,7 +448,7 @@ public void test121AddUserDarthAdder() { displayResponse(response); assertStatus(response, 201); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); getDummyAuditService().assertHasDelta(1, ChangeType.ADD, UserType.class); @@ -468,7 +468,7 @@ public void test122AddRoleModifierAsDarthAdder() { displayResponse(response); assertStatus(response, 201); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); getDummyAuditService().assertHasDelta(1, ChangeType.ADD, RoleType.class); @@ -492,7 +492,7 @@ public void test123DarthAdderAssignModifierHimself() throws Exception { logger.info("Returned result: {}", result); assertEquals("Unexpected operation result status", OperationResultStatusType.FATAL_ERROR, result.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); getDummyAuditService().assertExecutionOutcome(1, OperationResultStatus.FATAL_ERROR); @@ -512,7 +512,7 @@ public void test124DarthAdderAssignModifierByAdministrator() throws Exception { displayResponse(response); assertStatus(response, 204); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); getDummyAuditService().assertHasDelta(1, ChangeType.MODIFY, UserType.class); @@ -536,7 +536,7 @@ public void test130DarthAdderDisableHimself() throws Exception { displayResponse(response); assertStatus(response, 204); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); getDummyAuditService().assertHasDelta(1, ChangeType.MODIFY, UserType.class); @@ -560,7 +560,7 @@ public void test131GetUserAdministratorByDarthAdder() { assertStatus(response, 401); // assertNoEmptyResponse(response); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(1); getDummyAuditService().assertFailedLogin(SchemaConstants.CHANNEL_REST_URI); } @@ -579,7 +579,7 @@ public void test132DarthAdderEnableByAdministrator() throws Exception { displayResponse(response); assertStatus(response, 204); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); getDummyAuditService().assertHasDelta(1, ChangeType.MODIFY, UserType.class); @@ -605,7 +605,7 @@ public void test133GetUserAdministratorByDarthAdder() { assertNotNull("Returned entity in body must not be null.", userType); logger.info("Returned entity: {}", userType.asPrismObject().debugDump()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -624,7 +624,7 @@ public void test135AddUserNopasswordAsDarthAdder() { displayResponse(response); assertStatus(response, 201); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); getDummyAuditService().assertHasDelta(1, ChangeType.ADD, UserType.class); @@ -644,7 +644,7 @@ public void test140GetUserAdministratorByNopassword() { assertStatus(response, 401); // assertNoEmptyResponse(response); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(1); getDummyAuditService().assertFailedLogin(SchemaConstants.CHANNEL_REST_URI); } @@ -663,7 +663,7 @@ public void test141GetUserAdministratorByNopasswordBadPassword() { assertStatus(response, 401); // assertNoEmptyResponse(response); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(1); getDummyAuditService().assertFailedLogin(SchemaConstants.CHANNEL_REST_URI); } @@ -683,7 +683,7 @@ public void test200searchAllUsers() { assertStatus(response, 200); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -711,7 +711,7 @@ public void test401AddUserTemplateOverwrite() { expected, location); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); getDummyAuditService().assertHasDelta(1, ChangeType.ADD, ObjectTemplateType.class); @@ -743,7 +743,7 @@ public void test410AddFunctionLibraryHello() { expected, location); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); getDummyAuditService().assertHasDelta(1, ChangeType.ADD, FunctionLibraryType.class); @@ -771,7 +771,7 @@ public void test412GetFunctionLibraryHello() { displayValue("Code", code); assertEquals("Wrong hello code", HELLO_CODE, code); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -793,7 +793,7 @@ public void test501generateValue() { assertEquals("Expected 200 but got " + response.getStatus(), 200, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -813,7 +813,7 @@ public void test502generateValueBadPath() { assertEquals("Expected 400 but got " + response.getStatus(), 400, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -834,7 +834,7 @@ public void test503generateValueExecute() { assertEquals("Expected 200 but got " + response.getStatus(), 200, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); getDummyAuditService().assertHasDelta(1, ChangeType.MODIFY, UserType.class); @@ -877,7 +877,7 @@ public void test505generatePasswordExecute() { assertEquals("Expected 200 but got " + response.getStatus(), 200, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); getDummyAuditService().assertHasDelta(1, ChangeType.MODIFY, UserType.class); @@ -902,7 +902,7 @@ public void test506generateHonorificPrefixNameExecute() { assertEquals("Expected 200 but got " + response.getStatus(), 200, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); getDummyAuditService().assertHasDelta(1, ChangeType.MODIFY, UserType.class); @@ -966,7 +966,7 @@ public void test510validateValueExplicit() { assertEquals("Expected 200 but got " + response.getStatus(), 200, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -987,7 +987,7 @@ public void test511validateValueExplicitConflict() { assertEquals("Expected 409 but got " + response.getStatus(), 409, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -1007,7 +1007,7 @@ public void test512validateValueImplicitSingle() { assertEquals("Expected 200 but got " + response.getStatus(), 200, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -1028,7 +1028,7 @@ public void test513validateValueImplicitMulti() { assertEquals("Expected 200 but got " + response.getStatus(), 200, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -1049,7 +1049,7 @@ public void test514validateValueImplicitMultiConflict() { assertEquals("Expected 409 but got " + response.getStatus(), 409, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -1071,7 +1071,7 @@ public void test515validatePasswordHistoryConflict() { assertEquals("Expected 409 but got " + response.getStatus(), 409, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -1093,7 +1093,7 @@ public void test516validateValueExplicitNoValuePolicy() { assertEquals("Expected 200 but got " + response.getStatus(), 200, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -1115,7 +1115,7 @@ public void test517generateValueExplicit() { assertEquals("Expected 200 but got " + response.getStatus(), 200, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -1141,7 +1141,7 @@ public void test518validateValueImplicitPassword() throws Exception { assertEquals("Expected 200 but got " + response.getStatus(), 200, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } finally { @@ -1196,7 +1196,7 @@ public void test520GeneratePasswordsUsingScripting() throws Exception { display("jack after", jackAfter); assertNotNull("password not set", jackAfter.getCredentials().getPassword().getValue()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); @@ -1219,7 +1219,7 @@ public void test530ModifyValidToUsingScripting() throws Exception { assertEquals("Expected 200 but got " + response.getStatus(), 200, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); @@ -1350,7 +1350,7 @@ public void test600ModifySecurityQuestionReplaceAnswerId1Existing() throws Excep assertEquals("Expected 204 but got " + response.getStatus(), 204, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); getDummyAuditService().assertHasDelta(1, ChangeType.MODIFY, UserType.class); @@ -1392,7 +1392,7 @@ public void test602ModifySecurityQuestionReplaceTwoAnswersExisting() throws Exce assertEquals("Expected 204 but got " + response.getStatus(), 204, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); getDummyAuditService().assertHasDelta(1, ChangeType.MODIFY, UserType.class); @@ -1426,7 +1426,7 @@ public void test604ModifySecurityQuestionReplaceNoAnswer() throws Exception { assertEquals("Expected 204 but got " + response.getStatus(), 204, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); getDummyAuditService().assertHasDelta(1, ChangeType.MODIFY, UserType.class); @@ -1460,7 +1460,7 @@ public void test606ModifySecurityQuestionReplaceAnswer() throws Exception { assertEquals("Expected 204 but got " + response.getStatus(), 204, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); getDummyAuditService().assertHasDelta(1, ChangeType.MODIFY, UserType.class); @@ -1489,7 +1489,7 @@ public void test607validateSecurityAnswerCheckExpressionFail() { assertEquals("Expected 409 but got " + response.getStatus(), 409, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -1509,7 +1509,7 @@ public void test608validateSecurityAnswerCheckExpression() { assertEquals("Expected 200 but got " + response.getStatus(), 200, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -1580,7 +1580,7 @@ public void test610ModifyPasswordForceChange() { assertEquals("Expected 204 but got " + response.getStatus(), 204, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); getDummyAuditService().assertHasDelta(1, ChangeType.MODIFY, UserType.class); @@ -1620,7 +1620,7 @@ public void test612ResetPassword() throws Exception { assertEquals("Expected 200 but got " + response.getStatus(), 200, response.getStatus()); - display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(4); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); getDummyAuditService().assertHasDelta(1, ChangeType.MODIFY, UserType.class); diff --git a/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceProxyAuthentication.java b/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceProxyAuthentication.java index f2397916492..3836247df7b 100644 --- a/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceProxyAuthentication.java +++ b/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceProxyAuthentication.java @@ -18,7 +18,6 @@ import org.testng.annotations.Test; import com.evolveum.midpoint.common.rest.MidpointAbstractProvider; -import com.evolveum.midpoint.prism.util.PrismTestUtil; import com.evolveum.midpoint.schema.constants.SchemaConstants; import com.evolveum.midpoint.schema.internals.InternalMonitor; import com.evolveum.midpoint.schema.result.OperationResult; @@ -79,7 +78,7 @@ public void test001getUserSelfBySomebody() { AssertJUnit.assertNotNull("Returned entity in body must not be null.", userType); logger.info("Returned entity: {}", userType.asPrismObject().debugDump()); - PrismTestUtil.display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -100,7 +99,7 @@ public void test002getUserSelfByEgoist() { assertNotNull("Returned entity in body must not be null.", userType); logger.info("Returned entity: {}", userType.asPrismObject().debugDump()); - PrismTestUtil.display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -122,7 +121,7 @@ public void test003getUserAdministratorByEgoist() { then(); assertStatus(response, 403); - PrismTestUtil.display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -146,7 +145,7 @@ public void test004getUserSelfByHead() { assertNotNull("Returned entity in body must not be null.", userType); logger.info("Returned entity: {}", userType.asPrismObject().debugDump()); - PrismTestUtil.display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertLoginLogout(SchemaConstants.CHANNEL_REST_URI); } @@ -168,7 +167,7 @@ public void test005getUserSelfByProxyHead() { then(); assertStatus(response, 403); - PrismTestUtil.display("Audit", getDummyAuditService()); + displayDumpable("Audit", getDummyAuditService()); getDummyAuditService().assertRecords(2); getDummyAuditService().assertFailedProxyLogin(SchemaConstants.CHANNEL_REST_URI); } diff --git a/testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java b/testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java index ec994cb9666..91056c84e38 100644 --- a/testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java +++ b/testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java @@ -502,7 +502,7 @@ private void checkOpenDjSchema(ResourceType resource, String source) throws Sche // There is simulated activation capability, check if the attribute is in schema. QName enableAttrName = capActivation.getStatus().getAttribute(); ResourceAttributeDefinition enableAttrDef = accountDefinition.findAttributeDefinition(enableAttrName); - display("Simulated activation attribute definition", enableAttrDef); + displayDumpable("Simulated activation attribute definition", enableAttrDef); assertNotNull("No definition for enable attribute " + enableAttrName + " in account (resource from " + source + ")", enableAttrDef); assertTrue("Enable attribute " + enableAttrName + " is not ignored (resource from " + source + ")", enableAttrDef.isIgnored()); } diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java index 02b1a0db24b..5b0413063c3 100644 --- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java +++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java @@ -200,7 +200,7 @@ protected void resetGlobalCachePerformanceCollector() { } protected void dumpGlobalCachePerformanceData() { - display("Cache performance data for " + getTestNameShort() + displayDumpable("Cache performance data for " + getTestNameShort() + " (got from cache performance collector)", CachePerformanceCollector.INSTANCE); } diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestConfiguredCapabilitiesActivation.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestConfiguredCapabilitiesActivation.java index cc0e25a7b0d..418e2272c4e 100644 --- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestConfiguredCapabilitiesActivation.java +++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestConfiguredCapabilitiesActivation.java @@ -147,12 +147,12 @@ public void test110AssignJackPirate() throws Exception { .assertAdministrativeStatus(ActivationStatusType.ENABLED); DummyAccount jackNativeSimulatedAccount = getDummyResource(RESOURCE_DUMMY_ACTIVATION_NATIVE_SIMULATED_NAME).getAccountByUsername(USER_JACK_USERNAME); - display("Jack Dummy native-simulated account", jackNativeSimulatedAccount); + displayDumpable("Jack Dummy native-simulated account", jackNativeSimulatedAccount); String privilegesNativeSimulatedValue = jackNativeSimulatedAccount.getAttributeValue("privileges"); AssertJUnit.assertEquals("Unexpected 'native-simulated' privileges attribute value: " + privilegesNativeSimulatedValue, "false", privilegesNativeSimulatedValue); DummyAccount jackNativeAccount = getDummyResource(RESOURCE_DUMMY_ACTIVATION_NATIVE_NAME).getAccountByUsername(USER_JACK_USERNAME); - display("Jack Dummy native account", jackNativeAccount); + displayDumpable("Jack Dummy native account", jackNativeAccount); AssertJUnit.assertTrue("Unexpected 'native' activation status value: " + jackNativeAccount.isEnabled(), jackNativeAccount.isEnabled()); String privilegesNativeValue = jackNativeAccount.getAttributeValue("privileges"); AssertJUnit.assertNull("Unexpected 'native' privileges attribute: " + privilegesNativeValue, privilegesNativeValue); @@ -200,12 +200,12 @@ public void test112ModifyActivationJack() throws Exception { .assertAdministrativeStatus(ActivationStatusType.DISABLED); DummyAccount jackNativeSimulatedAccount = getDummyResource(RESOURCE_DUMMY_ACTIVATION_NATIVE_SIMULATED_NAME).getAccountByUsername(USER_JACK_USERNAME); - display("Jack Dummy native-simulated account", jackNativeSimulatedAccount); + displayDumpable("Jack Dummy native-simulated account", jackNativeSimulatedAccount); String privilegesNativeSimulatedValue = jackNativeSimulatedAccount.getAttributeValue("privileges"); AssertJUnit.assertEquals("Unexpected 'native-simulated' privileges attribute value: " + privilegesNativeSimulatedValue, "true", privilegesNativeSimulatedValue); DummyAccount jackNativeAccount = getDummyResource(RESOURCE_DUMMY_ACTIVATION_NATIVE_NAME).getAccountByUsername(USER_JACK_USERNAME); - display("Jack Dummy native account", jackNativeAccount); + displayDumpable("Jack Dummy native account", jackNativeAccount); AssertJUnit.assertFalse("Unexpected 'native' activation status value: " + jackNativeAccount.isEnabled(), jackNativeAccount.isEnabled()); String privilegesNativeValue = jackNativeAccount.getAttributeValue("privileges"); AssertJUnit.assertNull("Unexpected 'native' privileges attribute: " + privilegesNativeValue, privilegesNativeValue); diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestConsistencyMechanism.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestConsistencyMechanism.java index 4360780566c..454adca3c57 100644 --- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestConsistencyMechanism.java +++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestConsistencyMechanism.java @@ -2731,7 +2731,7 @@ private void checkOpenDjSchema(ResourceType resource, String source) throws Sche // There is simulated activation capability, check if the attribute is in schema. QName enableAttrName = capActivation.getStatus().getAttribute(); ResourceAttributeDefinition enableAttrDef = accountDefinition.findAttributeDefinition(enableAttrName); - display("Simulated activation attribute definition", enableAttrDef); + displayDumpable("Simulated activation attribute definition", enableAttrDef); assertNotNull("No definition for enable attribute " + enableAttrName + " in account (resource from " + source + ")", enableAttrDef); assertTrue("Enable attribute " + enableAttrName + " is not ignored (resource from " + source + ")", enableAttrDef.isIgnored()); } diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestInboundOutboundAssociation.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestInboundOutboundAssociation.java index d122449618d..f89598a7987 100644 --- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestInboundOutboundAssociation.java +++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestInboundOutboundAssociation.java @@ -98,7 +98,7 @@ public void test100ImportGroupPirates() throws Exception { // THEN then(); - display("dir after", getDummyResourceDir()); + displayDumpable("dir after", getDummyResourceDir()); RoleAsserter rolePiratesAsserter = assertRoleAfterByName(groupRoleName(GROUP_PIRATES_NAME)); rolePiratesAsserter @@ -130,7 +130,7 @@ public void test110AssignJackDirAccount() throws Exception { then(); assertSuccess(result); - display("dir after", getDummyResourceDir()); + displayDumpable("dir after", getDummyResourceDir()); assertUserAfter(USER_JACK_OID) .assignments() @@ -155,7 +155,7 @@ public void test115Stability() throws Exception { // THEN then(); - display("dir after", getDummyResourceDir()); + displayDumpable("dir after", getDummyResourceDir()); assertDummyAccountByUsername(RESOURCE_DUMMY_DIR_NAME, USER_JACK_USERNAME) .assertFullName(USER_JACK_FULL_NAME); @@ -185,7 +185,7 @@ public void test120AddJackToGroupPirates() throws Exception { // THEN then(); - display("dir after", getDummyResourceDir()); + displayDumpable("dir after", getDummyResourceDir()); assertUserAfter(USER_JACK_OID) .assignments() @@ -215,7 +215,7 @@ public void test130JackUnassignRolePirates() throws Exception { then(); assertSuccess(result); - display("dir after", getDummyResourceDir()); + displayDumpable("dir after", getDummyResourceDir()); assertUserAfter(USER_JACK_OID) .assignments() @@ -242,7 +242,7 @@ public void test140JackAssignRolePirates() throws Exception { then(); assertSuccess(result); - display("dir after", getDummyResourceDir()); + displayDumpable("dir after", getDummyResourceDir()); assertUserAfter(USER_JACK_OID) .assignments() @@ -276,7 +276,7 @@ public void test142JackUnAssignDirAccount() throws Exception { then(); assertSuccess(result); - display("dir after", getDummyResourceDir()); + displayDumpable("dir after", getDummyResourceDir()); assertUserAfter(USER_JACK_OID) .assignments() @@ -309,7 +309,7 @@ public void test149JackUnassignRolePirates() throws Exception { then(); assertSuccess(result); - display("dir after", getDummyResourceDir()); + displayDumpable("dir after", getDummyResourceDir()); assertUserAfter(USER_JACK_OID) .assignments() @@ -334,7 +334,7 @@ public void test150AssignJackDirAccount() throws Exception { then(); assertSuccess(result); - display("dir after", getDummyResourceDir()); + displayDumpable("dir after", getDummyResourceDir()); assertUserAfter(USER_JACK_OID) .assignments() @@ -360,7 +360,7 @@ public void test152JackAssignRolePirates() throws Exception { then(); assertSuccess(result); - display("dir after", getDummyResourceDir()); + displayDumpable("dir after", getDummyResourceDir()); assertUserAfter(USER_JACK_OID) .assignments() @@ -439,7 +439,7 @@ public void test154JackUnassignRolePirates() throws Exception { then(); assertSuccess(result); - display("dir after", getDummyResourceDir()); + displayDumpable("dir after", getDummyResourceDir()); assertUserAfter(USER_JACK_OID) .assignments() @@ -469,7 +469,7 @@ public void test159JackUnassignDirAccount() throws Exception { then(); assertSuccess(result); - display("dir after", getDummyResourceDir()); + displayDumpable("dir after", getDummyResourceDir()); assertUserAfter(USER_JACK_OID) .assignments() @@ -497,7 +497,7 @@ public void test200MancombAssignAccount() throws Exception { then(); assertSuccess(result); - display("dir after", getDummyResourceDir()); + displayDumpable("dir after", getDummyResourceDir()); assertUserAfter(USER_MANCOMB_OID) .assignments() .assertAssignments(1); diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLiveSyncMadness.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLiveSyncMadness.java index 687db05ae28..1dfefcedafb 100644 --- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLiveSyncMadness.java +++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLiveSyncMadness.java @@ -140,7 +140,7 @@ public void test100AddHrAccountHerman() throws Exception { .assertFullName(ACCOUNT_HERMAN_FIST_NAME + " " + ACCOUNT_HERMAN_LAST_NAME) .assertAttribute(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_TITLE_NAME, "Mr. " + ACCOUNT_HERMAN_LAST_NAME + " " + ACCOUNT_HERMAN_FIST_NAME); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); } @Test @@ -176,7 +176,7 @@ public void test110RenameHrAccountHerman() throws Exception { .assertFullName(ACCOUNT_HT_FIST_NAME + " " + ACCOUNT_HT_LAST_NAME) .assertAttribute(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_TITLE_NAME, "Mr. " + ACCOUNT_HT_LAST_NAME + " " + ACCOUNT_HT_FIST_NAME); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); } /** @@ -214,7 +214,7 @@ public void test112HrAccountHermanEmptyDelta() throws Exception { .assertFullName(ACCOUNT_HT_FIST_NAME + " " + ACCOUNT_HT_LAST_NAME) .assertAttribute(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_TITLE_NAME, "Mr. " + ACCOUNT_HT_LAST_NAME + " " + ACCOUNT_HT_FIST_NAME); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertNoRecord(); } } diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestNullAttribute.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestNullAttribute.java index 0d8b179f746..2e68165111a 100644 --- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestNullAttribute.java +++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestNullAttribute.java @@ -113,7 +113,7 @@ public void test000Sanity() throws Exception { PrismObjectDefinition userDefinition = getUserDefinition(); PrismContainerDefinition userExtensionDef = userDefinition.getExtensionDefinition(); - display("User extension definition", userExtensionDef); + displayDumpable("User extension definition", userExtensionDef); PrismAsserts.assertPropertyDefinition(userExtensionDef, new QName(NS_PIRACY, "ship"), DOMUtil.XSD_STRING, 0, 1); @@ -230,7 +230,7 @@ public void test030UserSmackRemoveAttribute() throws Exception { ext.setPropertyRealValue(PIRACY_SHIP_QNAME, null); ObjectDelta delta = userBefore.diff(userNewPrism); - display("Modifying user with delta", delta); + displayDumpable("Modifying user with delta", delta); Collection> deltas = MiscSchemaUtil.createCollection(delta); diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOperationPerf.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOperationPerf.java index 0ad3b3af926..36e47e2ab0e 100644 --- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOperationPerf.java +++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOperationPerf.java @@ -134,8 +134,8 @@ public void testAddUser(File userFile, String userOid, int roles) throws Excepti display("Added user in "+(endMillis - startMillis)+" ms"); - display("Model diagnostics", profilingModelInspectorManager); - display("Internal inspector", internalInspector); + displayDumpable("Model diagnostics", profilingModelInspectorManager); + displayDumpable("Internal inspector", internalInspector); displayValue("Internal counters", InternalMonitor.debugDumpStatic(1)); PrismObject userAfter = getUser(userOid); 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 d561e70891a..a9642ff8966 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 @@ -184,7 +184,7 @@ public void test100AddCheese() throws Exception { displayValue("Repo reads", InternalMonitor.getCount(InternalCounters.REPOSITORY_READ_COUNT)); displayValue("Object compares", InternalMonitor.getCount(InternalCounters.PRISM_OBJECT_COMPARE_COUNT)); - display("Inspector", inspector); + displayDumpable("Inspector", inspector); // inspector.assertRead(RoleType.class, NUMBER_OF_CHEESE_ASSIGNMENTS); // assertRepositoryReadCount(xxx); // may be influenced by tasks @@ -224,7 +224,7 @@ public void test110RecomputeCheese() throws Exception { displayValue("Repo reads", InternalMonitor.getCount(InternalCounters.REPOSITORY_READ_COUNT)); displayValue("Object compares", InternalMonitor.getCount(InternalCounters.PRISM_OBJECT_COMPARE_COUNT)); - display("Inspector", inspector); + displayDumpable("Inspector", inspector); inspector.assertRead(RoleType.class, 1); // assertRepositoryReadCount(4); // may be influenced by tasks @@ -266,7 +266,7 @@ public void test120CheesePreviewChanges() throws Exception { displayValue("Repo reads", InternalMonitor.getCount(InternalCounters.REPOSITORY_READ_COUNT)); displayValue("Object compares", InternalMonitor.getCount(InternalCounters.PRISM_OBJECT_COMPARE_COUNT)); - display("Inspector", inspector); + displayDumpable("Inspector", inspector); inspector.assertRead(RoleType.class, 1); // assertRepositoryReadCount(4); // may be influenced by tasks @@ -401,7 +401,7 @@ public void test210AddBob() throws Exception { displayValue("Repo reads", InternalMonitor.getCount(InternalCounters.REPOSITORY_READ_COUNT)); displayValue("Object compares", InternalMonitor.getCount(InternalCounters.PRISM_OBJECT_COMPARE_COUNT)); - display("Inspector", inspector); + displayDumpable("Inspector", inspector); inspector.assertRead(RoleType.class, NUMBER_OF_BOB_DUMMY_ROLE_ASSIGNMENTS); // assertRepositoryReadCount(xxx); // may be influenced by tasks @@ -443,7 +443,7 @@ public void test212RecomputeBob() throws Exception { displayValue("Repo reads", InternalMonitor.getCount(InternalCounters.REPOSITORY_READ_COUNT)); displayValue("Object compares", InternalMonitor.getCount(InternalCounters.PRISM_OBJECT_COMPARE_COUNT)); - display("Inspector", inspector); + displayDumpable("Inspector", inspector); inspector.assertRead(RoleType.class, NUMBER_OF_BOB_DUMMY_ROLE_ASSIGNMENTS); // assertRepositoryReadCount(xxx); // may be influenced by tasks @@ -485,7 +485,7 @@ public void test2124ReconcileBob() throws Exception { displayValue("Repo reads", InternalMonitor.getCount(InternalCounters.REPOSITORY_READ_COUNT)); displayValue("Object compares", InternalMonitor.getCount(InternalCounters.PRISM_OBJECT_COMPARE_COUNT)); - display("Inspector", inspector); + displayDumpable("Inspector", inspector); inspector.assertRead(RoleType.class, NUMBER_OF_BOB_DUMMY_ROLE_ASSIGNMENTS); // assertRepositoryReadCount(xxx); // may be influenced by tasks @@ -503,7 +503,7 @@ private void assertBobRoleMembershipRef(PrismObject user) { private void assertBobDummy(int expectedBottlesOfRum) throws Exception { DummyAccount dummyAccount = assertDummyAccount(null, USER_BOB_USERNAME, USER_BOB_FULLNAME, true); - display("Dummy account", dummyAccount); + displayDumpable("Dummy account", dummyAccount); List expectedDrinks = new ArrayList<>(expectedBottlesOfRum + 1); for (int i = 0; i < expectedBottlesOfRum; i++) { expectedDrinks.add(formatRum(i)); @@ -551,7 +551,7 @@ public void test220AddAlice() throws Exception { displayValue("Object compares", InternalMonitor.getCount(InternalCounters.PRISM_OBJECT_COMPARE_COUNT)); displayValue("Prism clones", InternalMonitor.getCount(InternalCounters.PRISM_OBJECT_CLONE_COUNT)); - display("Inspector", inspector); + displayDumpable("Inspector", inspector); inspector.assertRead(RoleType.class, NUMBER_OF_GENERATED_DUMMY_GROUPS); // assertRepositoryReadCount(xxx); // may be influenced by tasks @@ -593,7 +593,7 @@ public void test222RecomputeAlice() throws Exception { displayValue("Repo reads", InternalMonitor.getCount(InternalCounters.REPOSITORY_READ_COUNT)); displayValue("Object compares", InternalMonitor.getCount(InternalCounters.PRISM_OBJECT_COMPARE_COUNT)); - display("Inspector", inspector); + displayDumpable("Inspector", inspector); inspector.assertRead(RoleType.class, NUMBER_OF_GENERATED_DUMMY_GROUPS); // assertRepositoryReadCount(xxx); // may be influenced by tasks @@ -635,7 +635,7 @@ public void test224ReconcileAlice() throws Exception { displayValue("Repo reads", InternalMonitor.getCount(InternalCounters.REPOSITORY_READ_COUNT)); displayValue("Object compares", InternalMonitor.getCount(InternalCounters.PRISM_OBJECT_COMPARE_COUNT)); - display("Inspector", inspector); + displayDumpable("Inspector", inspector); inspector.assertRead(RoleType.class, NUMBER_OF_GENERATED_DUMMY_GROUPS); // assertRepositoryReadCount(xxx); // may be influenced by tasks @@ -653,7 +653,7 @@ private void assertAliceRoleMembershipRef(PrismObject user) { private void assertAliceDummy(int expectedGroups) throws Exception { DummyAccount dummyAccount = assertDummyAccount(null, USER_ALICE_USERNAME, USER_ALICE_FULLNAME, true); - display("Dummy account", dummyAccount); + displayDumpable("Dummy account", dummyAccount); for (int i = 0; i < expectedGroups; i++) { assertDummyGroupMember(null, formatGroupName(i), USER_ALICE_USERNAME); } diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestReconNullValue.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestReconNullValue.java index 726a019f60f..fdf11d235c7 100644 --- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestReconNullValue.java +++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestReconNullValue.java @@ -162,7 +162,7 @@ public void test130AddHonorificPrefix() throws Exception { userNew.setHonorificPrefix(new PolyStringType("Princess")); ObjectDelta delta = userBefore.diff(userNewPrism); - display("Modifying user with delta", delta); + displayDumpable("Modifying user with delta", delta); Collection> deltas = MiscSchemaUtil.createCollection(delta); @@ -214,7 +214,7 @@ public void test140dDeleteHonorificPrefixGivenName() throws Exception { userNew.setGivenName(null); ObjectDelta delta = userBefore.diff(userNewPrism); - display("Modifying user with delta", delta); + displayDumpable("Modifying user with delta", delta); Collection> deltas = MiscSchemaUtil.createCollection(delta); diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java index 165bde4b01a..39ca236134c 100644 --- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java +++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java @@ -251,7 +251,7 @@ public void test100SimpleAssignmentStart() throws Exception { assertMessage(processMessages.get(0), "administrator@evolveum.com", "Workflow process instance has been started", "Process instance name: Assigning role \"a-test-1\" to user \"bob\""); - display("audit", dummyAuditService); + displayDumpable("audit", dummyAuditService); } @Test @@ -338,7 +338,7 @@ public void test102SimpleAssignmentApproveByLechuck() throws Exception { List events = assertEvents(aCase, 2); assertCompletionEvent(events.get(1), userLechuckOid, userLechuckOid, 1, WorkItemOutcomeType.APPROVE, "OK. LeChuck"); - display("audit", dummyAuditService); + displayDumpable("audit", dummyAuditService); } @Test @@ -417,7 +417,7 @@ public void test104SimpleAssignmentApproveByAdministrator() throws Exception { "Work item: Assigning role \"a-test-1\" to user \"bob\"", "Role approvers (all) (3/3)", "Allocated to: Scumm Bar Chef (chef)", "^Result:", "(in 5 days)"); - display("audit", dummyAuditService); + displayDumpable("audit", dummyAuditService); } @Test @@ -474,7 +474,7 @@ public void test106SimpleAssignmentApproveByCheese() throws Exception { "Allocated to: Ignatius Cheese (cheese)", "Carried out by: Ignatius Cheese (cheese)", "Result: APPROVED", "^Deadline:"); - display("audit", dummyAuditService); + displayDumpable("audit", dummyAuditService); } @Test @@ -532,7 +532,7 @@ public void test108SimpleAssignmentApproveByChef() throws Exception { assertMessage(processMessages.get(0), "administrator@evolveum.com", "Workflow process instance has finished", "Process instance name: Assigning role \"a-test-1\" to user \"bob\"", "Result: APPROVED"); - display("audit", dummyAuditService); + displayDumpable("audit", dummyAuditService); // TODO after audit is OK // List workItemEvents = filter(getParamAuditRecords( @@ -596,7 +596,7 @@ public void test200EscalatedApprovalStart() throws Exception { assertMessage(processMessages.get(0), "administrator@evolveum.com", "Workflow process instance has been started", "Process instance name: Assigning role \"a-test-1\" to user \"carla\""); - display("audit", dummyAuditService); + displayDumpable("audit", dummyAuditService); } @Test @@ -623,7 +623,7 @@ public void test202FourDaysLater() throws Exception { "Stage: Line managers (1/3)", "Allocated to (before escalation): Guybrush Threepwood (guybrush)"); assertNull("process messages", processMessages); - display("audit", dummyAuditService); + displayDumpable("audit", dummyAuditService); } // escalation should occur here @@ -690,7 +690,7 @@ public void test204SixDaysLater() throws Exception { "|Allocated to (after escalation): Guybrush Threepwood (guybrush), Ignatius Cheese (cheese)|Allocated to (after escalation): Ignatius Cheese (cheese), Guybrush Threepwood (guybrush)", "(in 9 days)"); - display("audit", dummyAuditService); + displayDumpable("audit", dummyAuditService); } @Test @@ -738,7 +738,7 @@ public void test205EightDaysLater() throws Exception { "|Allocated to: Guybrush Threepwood (guybrush), Ignatius Cheese (cheese)|Allocated to: Ignatius Cheese (cheese), Guybrush Threepwood (guybrush)", "(in 9 days)"); - display("audit", dummyAuditService); + displayDumpable("audit", dummyAuditService); } @Test @@ -829,7 +829,7 @@ public void test206ApproveByCheese() throws Exception { "Work item: Assigning role \"a-test-1\" to user \"carla\"", "Stage: Security (2/3)", "Allocated to: Horridly Scarred Barkeep (barkeeper)", "(in 7 days)", "^Result:"); - display("audit", dummyAuditService); + displayDumpable("audit", dummyAuditService); } // notification should be send @@ -871,7 +871,7 @@ public void test208SixDaysLater() throws Exception { "Work item will be automatically completed in 2 days", "Security (2/3)", "Allocated to: Horridly Scarred Barkeep (barkeeper)", "(in 7 days)"); - display("audit", dummyAuditService); + displayDumpable("audit", dummyAuditService); } @Test @@ -903,7 +903,7 @@ public void test209EightDaysLater() throws Exception { assertMessage(processMessages.get(0), "administrator@evolveum.com", "Workflow process instance has finished", "Process instance name: Assigning role \"a-test-1\" to user \"carla\"", "Result: REJECTED"); - display("audit", dummyAuditService); + displayDumpable("audit", dummyAuditService); } private void checkTwoCompleted(List lifecycleMessages) { @@ -965,7 +965,7 @@ public void test220FormRoleAssignmentStart() throws Exception { display("work items allocation notifications", allocationMessages); display("processes notifications", processMessages); - display("audit", dummyAuditService); + displayDumpable("audit", dummyAuditService); } @Test @@ -1008,7 +1008,7 @@ public void test221FormApproveByLechuck() throws Exception { display("processes notifications", processMessages); dummyTransport.clearMessages(); - display("audit", dummyAuditService); + displayDumpable("audit", dummyAuditService); } @@ -1059,7 +1059,7 @@ public void test222FormApproveByCheese() throws Exception { display("processes notifications", processMessages); // audit - display("audit", dummyAuditService); + displayDumpable("audit", dummyAuditService); List records = dummyAuditService.getRecords(); assertEquals("Wrong # of audit records", 4, records.size()); AuditEventRecord record = records.get(0); @@ -1114,7 +1114,7 @@ public void test250ApproverAssignment() throws Exception { display("work items allocation notifications", allocationMessages); display("processes notifications", processMessages); - display("audit", dummyAuditService); + displayDumpable("audit", dummyAuditService); } diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java index eddfac505d9..a963b744a35 100644 --- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java +++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java @@ -262,7 +262,7 @@ public void test010Schema() throws Exception { IntegrationTestTools.displayXml("Initialized resource", resourceOpenDj); ResourceSchema resourceSchema = RefinedResourceSchema.getResourceSchema(resourceOpenDj, prismContext); - display("OpenDJ schema (resource)", resourceSchema); + displayDumpable("OpenDJ schema (resource)", resourceSchema); ObjectClassComplexTypeDefinition ocDefPosixAccount = resourceSchema.findObjectClassDefinition(OPENDJ_ACCOUNT_POSIX_AUXILIARY_OBJECTCLASS_NAME); assertNotNull("No objectclass " + OPENDJ_ACCOUNT_POSIX_AUXILIARY_OBJECTCLASS_NAME + " in resource schema", ocDefPosixAccount); @@ -273,7 +273,7 @@ public void test010Schema() throws Exception { assertTrue("Objectclass " + OPENDJ_GROUP_POSIX_AUXILIARY_OBJECTCLASS_NAME + " is not auxiliary", ocDefPosixGroup.isAuxiliary()); RefinedResourceSchema refinedSchema = RefinedResourceSchema.getRefinedSchema(resourceOpenDj); - display("OpenDJ schema (refined)", refinedSchema); + displayDumpable("OpenDJ schema (refined)", refinedSchema); RefinedObjectClassDefinition rOcDefPosixAccount = refinedSchema.getRefinedDefinition(OPENDJ_ACCOUNT_POSIX_AUXILIARY_OBJECTCLASS_NAME); assertNotNull("No refined objectclass " + OPENDJ_ACCOUNT_POSIX_AUXILIARY_OBJECTCLASS_NAME + " in resource schema", rOcDefPosixAccount); @@ -353,7 +353,7 @@ public void test111AccountMancombEditObjectClassDefinition() throws Exception { then(); result.computeStatus(); TestUtil.assertSuccess(result); - display("OC def", editObjectClassDefinition); + displayDumpable("OC def", editObjectClassDefinition); PrismAsserts.assertPropertyDefinition(editObjectClassDefinition, new QName(RESOURCE_OPENDJ_NAMESPACE, "cn"), DOMUtil.XSD_STRING, 1, -1); @@ -659,7 +659,7 @@ public void test131ReconcileUserLargo() throws Exception { display("Shadow (model)", shadow); assertPosixAccount(shadow, USER_LARGO_UID_NUMBER); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertExecutionDeltas(0); @@ -724,7 +724,7 @@ protected void assertTest132User(PrismObject userAfter) { } protected void assertTest132Audit() { - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertExecutionDeltas(2); @@ -766,7 +766,7 @@ public void test133ReconcileUserLargoAgain() throws Exception { display("Shadow (model)", shadow); assertPosixAccount(shadow, USER_LARGO_UID_NUMBER); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertExecutionDeltas(0); @@ -800,7 +800,7 @@ public void test134AssignUserLargoBasic() throws Exception { display("Shadow (model)", shadow); assertPosixAccount(shadow, USER_LARGO_UID_NUMBER); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertExecutionDeltas(1); @@ -839,7 +839,7 @@ public void test135UnAssignUserLargoUnix() throws Exception { } protected void assertTest135Audit() { - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertExecutionDeltas(2); @@ -940,7 +940,7 @@ public void test137ReconcileUserLargoAgain() throws Exception { display("Shadow (model)", shadow); assertTest137Account(shadow); - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(2); dummyAuditService.assertExecutionDeltas(0); @@ -1630,7 +1630,7 @@ public void test401ListAllAccountsKindIntent() throws Exception { ObjectQuery query = ObjectQueryUtil.createResourceAndKindIntent(getResourceOid(), ShadowKindType.ACCOUNT, "default", prismContext); - display("query", query); + displayDumpable("query", query); // WHEN when(); @@ -1652,7 +1652,7 @@ public void test402ListLdapGroupsKindIntent() throws Exception { ObjectQuery query = ObjectQueryUtil.createResourceAndKindIntent(getResourceOid(), ShadowKindType.ENTITLEMENT, "ldapGroup", prismContext); - display("query", query); + displayDumpable("query", query); // WHEN when(); @@ -1674,7 +1674,7 @@ public void test403ListUnixGroupsKindIntent() throws Exception { ObjectQuery query = ObjectQueryUtil.createResourceAndKindIntent(getResourceOid(), ShadowKindType.ENTITLEMENT, "unixGroup", prismContext); - display("query", query); + displayDumpable("query", query); // WHEN when(); diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnixTolerantAux.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnixTolerantAux.java index db4e003d329..d477a690c00 100644 --- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnixTolerantAux.java +++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnixTolerantAux.java @@ -71,7 +71,7 @@ protected void assertTest132User(PrismObject userAfter) { @Override protected void assertTest132Audit() { - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(3); dummyAuditService.assertExecutionDeltas(2); @@ -81,7 +81,7 @@ protected void assertTest132Audit() { @Override protected void assertTest135Audit() { - display("Audit", dummyAuditService); + displayDumpable("Audit", dummyAuditService); dummyAuditService.assertSimpleRecordSanity(); dummyAuditService.assertRecords(3); dummyAuditService.assertExecutionDeltas(2); diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/ldap/TestLdapAssociationPerformance.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/ldap/TestLdapAssociationPerformance.java index b2699991550..1cb884a8187 100644 --- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/ldap/TestLdapAssociationPerformance.java +++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/ldap/TestLdapAssociationPerformance.java @@ -284,7 +284,7 @@ private void dumpRepoSnapshotPerUser(PerformanceInformation performanceInformati private void dumpRepoSnapshot( PerformanceInformation performanceInformation, String unit, int unitCount) { String label = "SQL operations for " + getTestNameShort(); - display(label + " (" + NUMBER_OF_GENERATED_USERS + " users, " + NUMBER_OF_GENERATED_ROLES + displayDumpable(label + " (" + NUMBER_OF_GENERATED_USERS + " users, " + NUMBER_OF_GENERATED_ROLES + " roles) (got from global monitor)", performanceInformation); // per unit: diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/ldap/TestLdapComplex.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/ldap/TestLdapComplex.java index df94444f8cd..c573a0602b2 100644 --- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/ldap/TestLdapComplex.java +++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/ldap/TestLdapComplex.java @@ -243,7 +243,7 @@ public void test055Shadows() throws Exception { OperationResult result = task.getResult(); ObjectQuery query = ObjectQueryUtil.createResourceQuery(RESOURCE_OPENDJ_OID, prismContext); - display("Query", query); + displayDumpable("Query", query); // WHEN when(); diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/ldap/TestLdapMutilated.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/ldap/TestLdapMutilated.java index 67ea6592612..2df488aa555 100644 --- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/ldap/TestLdapMutilated.java +++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/ldap/TestLdapMutilated.java @@ -159,7 +159,7 @@ public void test105Shadows() throws Exception { OperationResult result = task.getResult(); ObjectQuery query = ObjectQueryUtil.createResourceQuery(RESOURCE_OPENDJ_OID, prismContext); - display("Query", query); + displayDumpable("Query", query); // WHEN when(); diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/ldap/hierarchy/AbstractLdapHierarchyTest.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/ldap/hierarchy/AbstractLdapHierarchyTest.java index 2049c72c73c..b0f770a0950 100644 --- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/ldap/hierarchy/AbstractLdapHierarchyTest.java +++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/ldap/hierarchy/AbstractLdapHierarchyTest.java @@ -412,7 +412,7 @@ public void test322MoveOrgZblo() throws Exception { // WHEN when(); - display("Modifying " + orgBefore + "with delta", delta); + displayDumpable("Modifying " + orgBefore + "with delta", delta); modelService.executeChanges(MiscSchemaUtil.createCollection(delta), null, task, result); // THEN diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/AbstractNotoriousTest.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/AbstractNotoriousTest.java index f44b105df42..2bb3d3c767f 100644 --- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/AbstractNotoriousTest.java +++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/AbstractNotoriousTest.java @@ -1147,7 +1147,7 @@ private void displayCountersAndInspector() { InternalCounters.ROLE_EVALUATION_COUNT, InternalCounters.ROLE_EVALUATION_SKIP_COUNT, InternalCounters.PRISM_OBJECT_COMPARE_COUNT); - display("Inspector", inspector); + displayDumpable("Inspector", inspector); } diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/security/TestRoleMembers.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/security/TestRoleMembers.java index 642bdd1cc24..1c7eda91663 100644 --- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/security/TestRoleMembers.java +++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/security/TestRoleMembers.java @@ -161,7 +161,7 @@ private ModelContext previewUser(String userOid) throws SchemaExceptio OperationResult result = task.getResult(); ObjectDelta emptyMancombDelta = deltaFor(UserType.class).asObjectDelta(userOid); ModelContext previewContext = modelInteractionService.previewChanges(Collections.singleton(emptyMancombDelta), null, task, result); - display("Preview context", previewContext); + displayDumpable("Preview context", previewContext); result.computeStatus(); if (!result.isSuccess() && !result.isHandledError() && !result.isWarning()) { display("Unexpected preview result", result); diff --git a/tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/MidpointTestMixin.java b/tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/MidpointTestMixin.java index 273578daa0b..bf923f5391f 100644 --- a/tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/MidpointTestMixin.java +++ b/tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/MidpointTestMixin.java @@ -6,6 +6,7 @@ */ package com.evolveum.midpoint.tools.testng; +import java.time.LocalTime; import java.util.Objects; import org.apache.commons.lang3.StringUtils; @@ -22,18 +23,19 @@ public interface MidpointTestMixin { String TEST_LOG_PREFIX = "=====[ "; String TEST_LOG_SUFFIX = " ]======================================"; - String TEST_OUT_PREFIX = "\n=====[ "; - String TEST_OUT_SUFFIX = " ]======================================\n"; + String TEST_OUT_PREFIX = "=====[ "; + String TEST_OUT_SUFFIX = " ]======================================"; String TEST_OUT_FOOTER_PREFIX = "====== "; String TEST_OUT_FOOTER_SUFFIX = "\n"; - String TEST_OUT_SECTION_PREFIX = "\n----- "; - String TEST_OUT_SECTION_SUFFIX = " --------------------------------------\n"; + String TEST_OUT_SECTION_PREFIX = "----- "; + String TEST_OUT_SECTION_SUFFIX = " --------------------------------------"; String TEST_LOG_SECTION_PREFIX = "----- "; String TEST_LOG_SECTION_SUFFIX = " --------------------------------------"; - String DISPLAY_OUT_PREFIX = "\n*** "; - String DISPLAY_LOG_FORMAT1 = "*** {}:"; + String DISPLAY_OUT_PREFIX = "*** "; + String DISPLAY_LOG_FORMAT1 = "*** {}"; + String DISPLAY_LOG_FORMAT1_COLON = "*** {}:"; String DISPLAY_LOG_FORMAT2 = "*** {}:\n{}"; /** @@ -115,12 +117,23 @@ default String getTestNumber() { "Current test-method context MUST NOT be null"); } + /** + * Common print to stdout to add common stuff to text, e.g. time and thread header. + */ + // TODO switch to private after ditching JDK 8, DON'T USE/DON'T OVERRIDE! + /*private*/ + default void println(String string) { + System.out.println("\n>>> " + LocalTime.now().toString() + + " thread=[" + Thread.currentThread().getName() + "]"); + System.out.println(string); + } + /** * Displays test header with provided title text. * Not intended for test method body, used by lifecycle methods in our test superclasses. */ default void displayTestTitle(String testTitle) { - System.out.println(TEST_OUT_PREFIX + testTitle + TEST_OUT_SUFFIX); + println(TEST_OUT_PREFIX + testTitle + TEST_OUT_SUFFIX); logger().info(TEST_LOG_PREFIX + testTitle + TEST_LOG_SUFFIX); } @@ -146,21 +159,20 @@ default void displayTestFooter(String testTitle, ITestResult testResult) { * Not intended for test method body, used by lifecycle methods in our test superclasses. */ default void displayTestFooter(String footerText) { - System.out.println(TEST_OUT_FOOTER_PREFIX + footerText + TEST_OUT_FOOTER_SUFFIX); + println(TEST_OUT_FOOTER_PREFIX + footerText + TEST_OUT_FOOTER_SUFFIX); logger().info(TEST_LOG_PREFIX + footerText + TEST_LOG_SUFFIX); } default void display(String text) { - System.out.println("\n*** " + text); - logger().info("*** {}", text); + println(DISPLAY_OUT_PREFIX + text); + logger().info(DISPLAY_LOG_FORMAT1, text); } - /** * Displays value prefixed with provided title. */ default void displayValue(String title, Object value) { - System.out.println(DISPLAY_OUT_PREFIX + title + "\n" + value); + println(DISPLAY_OUT_PREFIX + title + "\n" + value); logger().info(DISPLAY_LOG_FORMAT2, title, value); } @@ -169,9 +181,9 @@ default void displayValue(String title, Object value) { * Use for "bad" exceptions, for expected exceptions use {@link #displayExpectedException}. */ default void displayException(String title, Throwable e) { - System.out.println(DISPLAY_OUT_PREFIX + title + ":"); + println(DISPLAY_OUT_PREFIX + title + ":"); e.printStackTrace(System.out); - logger().warn(DISPLAY_LOG_FORMAT1, title, e); + logger().warn(DISPLAY_LOG_FORMAT1_COLON, title, e); } /** @@ -179,7 +191,7 @@ default void displayException(String title, Throwable e) { */ default void displayExpectedException(Throwable e) { String expectedExceptionWithClass = "Expected exception " + e.getClass(); - System.out.println(DISPLAY_OUT_PREFIX + expectedExceptionWithClass + ":\n" + e.getMessage()); + println(DISPLAY_OUT_PREFIX + expectedExceptionWithClass + ":\n" + e.getMessage()); logger().info(DISPLAY_LOG_FORMAT2, expectedExceptionWithClass, e.getMessage()); } @@ -199,7 +211,7 @@ default void given(String description) { if (description == null) { description = ""; } - System.out.println(TEST_OUT_SECTION_PREFIX + testName + ": GIVEN " + description + TEST_OUT_SECTION_SUFFIX); + println(TEST_OUT_SECTION_PREFIX + testName + ": GIVEN " + description + TEST_OUT_SECTION_SUFFIX); logger().info(TEST_LOG_SECTION_PREFIX + testName + ": GIVEN " + description + TEST_LOG_SECTION_SUFFIX); } @@ -219,7 +231,7 @@ default void when(String description) { if (description == null) { description = ""; } - System.out.println(TEST_OUT_SECTION_PREFIX + testName + ": WHEN " + description + TEST_OUT_SECTION_SUFFIX); + println(TEST_OUT_SECTION_PREFIX + testName + ": WHEN " + description + TEST_OUT_SECTION_SUFFIX); logger().info(TEST_LOG_SECTION_PREFIX + testName + ": WHEN " + description + TEST_LOG_SECTION_SUFFIX); } @@ -239,7 +251,7 @@ default void then(String description) { if (description == null) { description = ""; } - System.out.println(TEST_OUT_SECTION_PREFIX + testName + ": THEN " + description + TEST_OUT_SECTION_SUFFIX); + println(TEST_OUT_SECTION_PREFIX + testName + ": THEN " + description + TEST_OUT_SECTION_SUFFIX); logger().info(TEST_LOG_SECTION_PREFIX + testName + ": THEN " + description + TEST_LOG_SECTION_SUFFIX); } @@ -261,7 +273,7 @@ default void expect(String description) { if (description == null) { description = ""; } - System.out.println(TEST_OUT_SECTION_PREFIX + testName + ": EXPECT " + description + TEST_OUT_SECTION_SUFFIX); + println(TEST_OUT_SECTION_PREFIX + testName + ": EXPECT " + description + TEST_OUT_SECTION_SUFFIX); logger().info(TEST_LOG_SECTION_PREFIX + testName + ": EXPECT " + description + TEST_LOG_SECTION_SUFFIX); } From 4d0e9802ef80f5951cddc6c32534d371c6b0272b Mon Sep 17 00:00:00 2001 From: kate Date: Sun, 29 Mar 2020 01:11:40 +0100 Subject: [PATCH 2/4] mid-5668 polystring tracing deltas --- .../midpoint/prism/impl/PrismPropertyValueImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyValueImpl.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyValueImpl.java index a7118e6ae11..e73bb5a86ee 100644 --- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyValueImpl.java +++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyValueImpl.java @@ -587,12 +587,15 @@ public String toHumanReadableString() { // (displaying the aux information in user-visible context). But for e.g. deltas we need this information. PolyString ps = (PolyString) this.value; StringBuilder sb = new StringBuilder(); - sb.append(ps.getOrig()); + sb.append("orig=" + ps.getOrig()); if (ps.getTranslation() != null) { - sb.append(" (has translation key)"); + sb.append(", translation="+ps.getTranslation().getKey()); } if (ps.getLang() != null) { - sb.append(" (").append(ps.getLang().size()).append(" lang map entry/entries)"); + sb.append("; lang:"); + ps.getLang().keySet().forEach(langKey -> { + sb.append(" " + langKey + "=" + ps.getLang().get(langKey) + ","); + }); } return sb.toString(); } else { From a221ea2ca4f982ae306979f881e44a2d55b92d41 Mon Sep 17 00:00:00 2001 From: lskublik Date: Mon, 30 Mar 2020 08:58:02 +0200 Subject: [PATCH 3/4] trying to fix Schrodinger tests --- .../midpoint/testing/schrodinger/AbstractSchrodingerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/AbstractSchrodingerTest.java b/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/AbstractSchrodingerTest.java index 46132e1e1de..cf7216ffcdc 100644 --- a/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/AbstractSchrodingerTest.java +++ b/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/AbstractSchrodingerTest.java @@ -46,7 +46,7 @@ @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) @ActiveProfiles("default") @SpringBootTest(classes = MidPointSpringApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT) -@TestPropertySource(properties = { "server.port=8180", "midpoint.schrodinger=true", "webdriverLocation=234234234" }) +@TestPropertySource(properties = { "server.port=8180", "midpoint.schrodinger=true" })//, "webdriverLocation=234234234" }) @Listeners({ BrowserPerClass.class }) public abstract class AbstractSchrodingerTest extends AbstractIntegrationTest { From fb2fe8a683082077dd624f3a1cc7e0942ec9de83 Mon Sep 17 00:00:00 2001 From: kate Date: Mon, 30 Mar 2020 12:26:35 +0200 Subject: [PATCH 4/4] shortDump for PolyString fix --- .../midpoint/prism/polystring/PolyString.java | 11 ++++++++++- .../midpoint/prism/impl/PrismPropertyValueImpl.java | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java b/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java index 776a9e9483b..414545cea0f 100644 --- a/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java +++ b/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java @@ -337,7 +337,16 @@ public String debugDump(int indent) { @Override public void shortDump(StringBuilder sb) { - sb.append(orig); + sb.append("orig=" + orig); + if (getTranslation() != null) { + sb.append("; translation.key=" + getTranslation().getKey()); + } + if (getLang() != null) { + sb.append("; lang:"); + getLang().keySet().forEach(langKey -> { + sb.append(" " + langKey + "=" + getLang().get(langKey) + ","); + }); + } } public static String getOrig(PolyString s) { diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyValueImpl.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyValueImpl.java index e73bb5a86ee..2631607de1f 100644 --- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyValueImpl.java +++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyValueImpl.java @@ -589,7 +589,7 @@ public String toHumanReadableString() { StringBuilder sb = new StringBuilder(); sb.append("orig=" + ps.getOrig()); if (ps.getTranslation() != null) { - sb.append(", translation="+ps.getTranslation().getKey()); + sb.append(", translation.key=" + ps.getTranslation().getKey()); } if (ps.getLang() != null) { sb.append("; lang:");