[midPoint-git] [Evolveum/midpoint] cb79f6: Fix TestObject class hierarchy

mederly noreply at github.com
Fri Feb 17 13:54:37 CET 2023


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: cb79f6de70976fb5c43dafb25efd98f3a905957a
      https://github.com/Evolveum/midpoint/commit/cb79f6de70976fb5c43dafb25efd98f3a905957a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2023-02-17 (Fri, 17 Feb 2023)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/AutoCompleteReferencePanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ReportParameterTypeUtil.java
    M model/model-intest/pom.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/simulation/TestPreviewChangesCoD.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/resources/ctx-model-intest-test-main.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/CommonInitialObjects.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyResourceCollection.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/asserter/ElementContextAsserter.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/asserter/ProcessedObjectAsserter.java
    M model/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportConstants.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/EmptyReportIntegrationTest.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/TestCsvReport.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/TestCsvReportExportClassic.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/TestCsvReportImportClassic.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/TestCsvSimulationReport.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/TestHtmlReportExportClassic.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/AbstractProvisioningIntegrationTest.java
    M repo/repo-test-util/pom.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    R repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractTestResource.java
    R repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AnyResource.java
    A repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AnyTestResource.java
    R repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/ClassPathTestResource.java
    R repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/CsvResource.java
    A repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/CsvTestResource.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyTestResource.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyTestResourceInitializer.java
    A repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/ObjectCustomizer.java
    A repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/ReportTestUtil.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/ResourceTester.java
    A repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/TestObject.java
    A repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/TestReport.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/TestResource.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/TestTask.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/AbstractAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/CsvAsserter.java
    A repo/system-init/src/main/resources/initial-objects/report/170-report-simulation-basic.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestFirstSteps.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMachineIntelligence.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/async/TestAsyncProvisioning.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/correlation/AbstractMediumIdMatchCorrelationTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/correlation/AbstractMultiAccountsIdMatchCorrelationTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/correlation/AbstractSimpleIdMatchCorrelationTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/correlation/AbstractSimpleInternalCorrelationTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/correlation/TestInternalCorrelationMedium.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/correlation/TestInternalCorrelationMultiAccounts.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/correlation/TestInternalCorrelationSimple.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/correlation/TestInternalCorrelationSimpleSimplified.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/grouper/AbstractGrouperTest.java

  Log Message:
  -----------
  Fix TestObject class hierarchy

For some years now, there has been the TestResource class. Gradually, it
grew into a whole class hierarchy, with specialized classes like
TestTask, CsvResource, AnyTestResource, ClassPathTestResource, etc.
It had a couple of design flaw that are addressed in this commit.

1. TestResource/AbstractTestResource was renamed to TestObject,
eliminating the confusion with midPoint ResourceType objects.

2. The storage mechanism (file, class path resource) is no longer
reflected in the class hierarchy. Instead, it is an internal aspect
of TestObject, and is chosen by selecting appropriate static factory
method. (A special, experimental, in-memory storage was added.)

3. TestReport was added. It should facilitate testing the reports.
The necessary supporting functionality was moved from report-impl
package classes to ReportTestUtil and ReportParameterTypeUtil ones.

Other changes:

- The model-intest now depends on report-api/report-impl, so reports
can be tested as part of those integration tests.

Work in progress. The TestResource uses were not migrated to TestObject
yet. Some TODOs remain. Some tests may fail.


  Commit: 5d7a06a7e94e0b2a5dd5105fc37e8af42998dad9
      https://github.com/Evolveum/midpoint/commit/5d7a06a7e94e0b2a5dd5105fc37e8af42998dad9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2023-02-17 (Fri, 17 Feb 2023)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ObjectReferenceAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ParentOrgRefAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/RoleMembershipRefAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ShadowReferenceAsserter.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/correlation/AbstractSimpleInternalCorrelationTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'

# Conflicts:
#	testing/story/src/test/java/com/evolveum/midpoint/testing/story/correlation/AbstractSimpleInternalCorrelationTest.java


Compare: https://github.com/Evolveum/midpoint/compare/52717c816d90...5d7a06a7e94e


More information about the midPoint-svn mailing list