[midPoint-git] [Evolveum/midpoint] 15215a: Fixed null values in legacy approval aspects.

Pavol Mederly mederly at evolveum.com
Thu Nov 17 23:45:29 CET 2016


  Branch: refs/heads/feature/policy-based-approvals
  Home:   https://github.com/Evolveum/midpoint
  Commit: 15215a73220d56167fdf0b4a53601f1e3b320603
      https://github.com/Evolveum/midpoint/commit/15215a73220d56167fdf0b4a53601f1e3b320603
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java

  Log Message:
  -----------
  Fixed null values in legacy approval aspects.


  Commit: 53e1c8687d144e166d65bc0f0ccc7923aeb138f2
      https://github.com/Evolveum/midpoint/commit/53e1c8687d144e166d65bc0f0ccc7923aeb138f2
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractInitializedGuiIntegrationTest.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/BasicCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/CriticalRolesCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/RoleInducementCertificationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractModelImplementationIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPasswordPolicyProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestCorrelationConfiramtionEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestCaseIgnore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorMultiInstance.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLoggingConfiguration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplateWithRanges.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestVolatility.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/AbstractGenericSyncTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStructMeta.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractObjTemplateSyncTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestValidityRecomputeTask.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/TestReport.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevelImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchema.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseConfigurationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/RuleBasedAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddUserAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddUserResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyUserAbstractRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyUserResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestAddAssociation.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateModifyUser.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateOrg.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestInfrastructure.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestUserChangeApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/general/TestGeneralChangeProcessor.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestAddAssociationLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestCreateModifyUserLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestCreateOrgLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestInfrastructure.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestUserChangeApprovalLegacy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApproval.java
    R model/workflow-impl/src/test/resources/common/account-shadow-elisabeth-dummy.xml
    R model/workflow-impl/src/test/resources/common/group-guests-dummy.xml
    R model/workflow-impl/src/test/resources/common/group-testers-dummy.xml
    R model/workflow-impl/src/test/resources/common/role11.xml
    R model/workflow-impl/src/test/resources/common/role12.xml
    R model/workflow-impl/src/test/resources/common/role13.xml
    M model/workflow-impl/src/test/resources/common/system-configuration.xml
    R model/workflow-impl/src/test/resources/common/user-bill.xml
    R model/workflow-impl/src/test/resources/common/users-and-roles.xml
    A model/workflow-impl/src/test/resources/legacy/account-shadow-elisabeth-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/group-guests-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/group-testers-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/org-test1.xml
    A model/workflow-impl/src/test/resources/legacy/role11.xml
    A model/workflow-impl/src/test/resources/legacy/role12.xml
    A model/workflow-impl/src/test/resources/legacy/role13.xml
    A model/workflow-impl/src/test/resources/legacy/shadow-modify-add-entitlement-guests.xml
    A model/workflow-impl/src/test/resources/legacy/shadow-modify-add-entitlement-testers.xml
    A model/workflow-impl/src/test/resources/legacy/user-bill.xml
    A model/workflow-impl/src/test/resources/legacy/user-elisabeth-modify-add-assignment-role3.xml
    A model/workflow-impl/src/test/resources/legacy/user-elisabeth.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-activation-disable.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-activation-enable.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-dummy.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role-r1.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role1.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role10.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role2-change-gn.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-role3-change-gn2.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-add-assignment-roles2-3-4.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-change-password-2.xml
    A model/workflow-impl/src/test/resources/legacy/user-jack-modify-change-password.xml
    A model/workflow-impl/src/test/resources/legacy/users-and-roles.xml
    R model/workflow-impl/src/test/resources/org-test1.xml
    A model/workflow-impl/src/test/resources/policy/role-role1.xml
    A model/workflow-impl/src/test/resources/policy/role-superuser.xml
    A model/workflow-impl/src/test/resources/policy/system-configuration.xml
    A model/workflow-impl/src/test/resources/policy/user-administrator.xml
    A model/workflow-impl/src/test/resources/policy/user-jack.xml
    A model/workflow-impl/src/test/resources/policy/user-lead1.xml
    R model/workflow-impl/src/test/resources/shadow-modify-add-entitlement-guests.xml
    R model/workflow-impl/src/test/resources/shadow-modify-add-entitlement-testers.xml
    R model/workflow-impl/src/test/resources/user-elisabeth-modify-add-assignment-role3.xml
    R model/workflow-impl/src/test/resources/user-elisabeth.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-activation-disable.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-activation-enable.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-dummy.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role-r1.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role1.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role10.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role2-change-gn.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-role3-change-gn2.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-roles2-3-4.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-change-password-2.xml
    R model/workflow-impl/src/test/resources/user-jack-modify-change-password.xml
    M model/workflow-impl/testng-integration.xml
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyHacks.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestSynchronization.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/TestEmpty.java
    M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSampleImport.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapMultidomainTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractEDirTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestGenericSynchronization.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapComplex.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapUniversity.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestOrgHierarchy.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java

  Log Message:
  -----------
  First "policy rule" wf test almost working.


  Commit: a975257bc5b66831e70aa3b703729393f9b8a0ab
      https://github.com/Evolveum/midpoint/commit/a975257bc5b66831e70aa3b703729393f9b8a0ab
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/RuleBasedAspect.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/plain/TestAssignmentApproval.java

  Log Message:
  -----------
  The test is now passing. BEWARE: changed roleMembershipRef to contain relation as well.


Compare: https://github.com/Evolveum/midpoint/compare/85a42a8d9a2b...a975257bc5b6


More information about the midPoint-svn mailing list