[midPoint-git] [Evolveum/midpoint] 447654: adding merge test for task

[Lukas Skublik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 447654f74fa8773979a93160fb4ea19bafa16c7e
      https://github.com/Evolveum/midpoint/commit/447654f74fa8773979a93160fb4ea19bafa16c7e
  Author: lskublik <lskublik at evolveum.com>
  Date:   2023-09-12 (Tue, 12 Sep 2023)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/object/ObjectMergeOperation.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/object/TaskMergeOperation.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/TestMerger.java
    R infra/schema/src/test/resources/merger/lookup-table-result.xml
    R infra/schema/src/test/resources/merger/lookup-table-source.xml
    R infra/schema/src/test/resources/merger/lookup-table-target.xml
    A infra/schema/src/test/resources/merger/lookup-table/lookup-table-result.xml
    A infra/schema/src/test/resources/merger/lookup-table/lookup-table-source.xml
    A infra/schema/src/test/resources/merger/lookup-table/lookup-table-target.xml
    R infra/schema/src/test/resources/merger/security-policy-result.xml
    R infra/schema/src/test/resources/merger/security-policy-source.xml
    R infra/schema/src/test/resources/merger/security-policy-target.xml
    A infra/schema/src/test/resources/merger/security-policy/security-policy-result.xml
    A infra/schema/src/test/resources/merger/security-policy/security-policy-source.xml
    A infra/schema/src/test/resources/merger/security-policy/security-policy-target.xml
    R infra/schema/src/test/resources/merger/system-configuration-result.xml
    R infra/schema/src/test/resources/merger/system-configuration-source.xml
    R infra/schema/src/test/resources/merger/system-configuration-target.xml
    A infra/schema/src/test/resources/merger/system-configuration/system-configuration-result.xml
    A infra/schema/src/test/resources/merger/system-configuration/system-configuration-source.xml
    A infra/schema/src/test/resources/merger/system-configuration/system-configuration-target.xml
    A infra/schema/src/test/resources/merger/task/task-validity-result.xml
    A infra/schema/src/test/resources/merger/task/task-validity-source.xml
    A infra/schema/src/test/resources/merger/task/task-validity-target.xml

  Log Message:
  -----------
  adding merge test for task


  Commit: a722316ac61875597dc0d64c6307e5cf65df12e0
      https://github.com/Evolveum/midpoint/commit/a722316ac61875597dc0d64c6307e5cf65df12e0
  Author: lskublik <lskublik at evolveum.com>
  Date:   2023-09-12 (Tue, 12 Sep 2023)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/TypeSpecificMergersConfigurator.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/object/ObjectMergeOperation.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/object/ReportMergeOperation.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/TestMerger.java
    A infra/schema/src/test/resources/merger/report/report-certification-campaigns-result.xml
    A infra/schema/src/test/resources/merger/report/report-certification-campaigns-source.xml
    A infra/schema/src/test/resources/merger/report/report-certification-campaigns-target.xml

  Log Message:
  -----------
  adding merge test for report


  Commit: 80fb59d6ced39a0d6aae64b53853876a1b2d1143
      https://github.com/Evolveum/midpoint/commit/80fb59d6ced39a0d6aae64b53853876a1b2d1143
  Author: lskublik <lskublik at evolveum.com>
  Date:   2023-09-12 (Tue, 12 Sep 2023)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/TypeSpecificMergersConfigurator.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/assignment/AssignmentMerger.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/object/ObjectCollectionMergeOperation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/object/ObjectMergeOperation.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/TestMerger.java
    A infra/schema/src/test/resources/merger/object-collection/object-collection-resource-up-result.xml
    A infra/schema/src/test/resources/merger/object-collection/object-collection-resource-up-source.xml
    A infra/schema/src/test/resources/merger/object-collection/object-collection-resource-up-target.xml

  Log Message:
  -----------
  adding merge test for object collection


  Commit: d95342a1ef649c979d3c975d191cd5e456effcc5
      https://github.com/Evolveum/midpoint/commit/d95342a1ef649c979d3c975d191cd5e456effcc5
  Author: lskublik <lskublik at evolveum.com>
  Date:   2023-09-12 (Tue, 12 Sep 2023)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/TypeSpecificMergersConfigurator.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/object/DashboardMergeOperation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/object/ObjectMergeOperation.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/TestMerger.java
    A infra/schema/src/test/resources/merger/dashboard/dashboard-admin-result.xml
    A infra/schema/src/test/resources/merger/dashboard/dashboard-admin-source.xml
    A infra/schema/src/test/resources/merger/dashboard/dashboard-admin-target.xml

  Log Message:
  -----------
  adding merge test for dashboard


  Commit: 8085a8e9f1fc04e0794fbd2b58dd3ec0040988cf
      https://github.com/Evolveum/midpoint/commit/8085a8e9f1fc04e0794fbd2b58dd3ec0040988cf
  Author: lskublik <lskublik at evolveum.com>
  Date:   2023-09-12 (Tue, 12 Sep 2023)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/object/ObjectMergeOperation.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/object/UserMergeOperation.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/TestMerger.java
    A infra/schema/src/test/resources/merger/user/user-administrator-result.xml
    A infra/schema/src/test/resources/merger/user/user-administrator-source.xml
    A infra/schema/src/test/resources/merger/user/user-administrator-target.xml

  Log Message:
  -----------
  adding merge test for user


  Commit: f96feec007e6aa89c496e7367060281d555aea60
      https://github.com/Evolveum/midpoint/commit/f96feec007e6aa89c496e7367060281d555aea60
  Author: lskublik <lskublik at evolveum.com>
  Date:   2023-09-12 (Tue, 12 Sep 2023)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/TypeSpecificMergersConfigurator.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/assignment/AssignmentMerger.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/object/ArchetypeMergeOperation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/object/ObjectMergeOperation.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/TestMerger.java
    A infra/schema/src/test/resources/merger/archetype/archetype-task-live-sync-result.xml
    A infra/schema/src/test/resources/merger/archetype/archetype-task-live-sync-source.xml
    A infra/schema/src/test/resources/merger/archetype/archetype-task-live-sync-target.xml

  Log Message:
  -----------
  adding merge test for archetype


Compare: https://github.com/Evolveum/midpoint/compare/35afc96cc259...f96feec007e6