[midPoint-git] [Evolveum/midpoint] 1a2b72: updating sotry test

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 1a2b727bdd908985262da196a6bd33c22a0dd1b6
      https://github.com/Evolveum/midpoint/commit/1a2b727bdd908985262da196a6bd33c22a0dd1b6
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-01-15 (Sun, 15 Jan 2017)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMachineIntelligence.java
    A testing/story/src/test/resources/machineintelligence/HR.csv
    M testing/story/src/test/resources/machineintelligence/resource-csv-HR.xml
    M testing/story/src/test/resources/machineintelligence/shadow-chappie.xml

  Log Message:
  -----------
  updating sotry test


  Commit: 0097cd255ce1d1d76c96986b5e8da0a6ded2d157
      https://github.com/Evolveum/midpoint/commit/0097cd255ce1d1d76c96986b5e8da0a6ded2d157
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-01-15 (Sun, 15 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/DecisionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugDumpable.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/OrgStructFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    M model/model-intest/src/test/resources/mapping/resource-dummy-crimson.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/LightweightObjectRef.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/LightweightObjectRefImpl.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/ApprovalRequestImpl.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/ApprovalSchemaImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalProcessInterface.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/MidpointUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ProcessVariableNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RecordIndividualDecision.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ReferenceResolver.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RelationResolver.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/SummarizeDecisionsInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/modifyAssignment/AssignmentModification.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/BasePrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleAssignmentAspect.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/ModifyAbstractRoleAssignmentAspect.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/ModifyResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ResourceAssignmentHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/RoleAssignmentHelper.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
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/SerializationSafeContainer.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/SingleItemSerializationSafeContainerImpl.java
    M model/workflow-impl/src/test/resources/legacy/role12.xml
    M model/workflow-impl/src/test/resources/legacy/role13.xml
    M model/workflow-impl/src/test/resources/legacy/users-and-roles.xml
    M model/workflow-impl/src/test/resources/policy/metarole-security.xml
    M model/workflow-impl/src/test/resources/policy/user-security-approver.xml
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/REmbeddedReference.java
    A testing/story/src/test/resources/strings/orgs/0-org-monkey-island-modified.xml
    A testing/story/src/test/resources/strings/orgs/1-teams.xml
    A testing/story/src/test/resources/strings/orgs/security-approvers.xml
    A testing/story/src/test/resources/strings/orgs/sod-approvers.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-line-managers.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-all.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-first.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-security.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml
    A testing/story/src/test/resources/strings/roles/test-1.xml
    A testing/story/src/test/resources/strings/users/barkeeper.xml
    A testing/story/src/test/resources/strings/users/bob.xml
    A testing/story/src/test/resources/strings/users/carla.xml
    A testing/story/src/test/resources/strings/users/cheese.xml
    A testing/story/src/test/resources/strings/users/chef.xml
    A testing/story/src/test/resources/strings/users/elaine.xml
    A testing/story/src/test/resources/strings/users/guybrush.xml
    A testing/story/src/test/resources/strings/users/lechuck.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


Compare: https://github.com/Evolveum/midpoint/compare/41f08936a900...0097cd255ce1