[midPoint-git] [Evolveum/midpoint] 97929f: Add tests for fetching broken objects (get/search)
mederly
noreply at github.com
Fri Dec 18 12:25:08 CET 2020
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: 97929f4c2fcd5ae4036e7afa74fc78f9a47ac6bc
https://github.com/Evolveum/midpoint/commit/97929f4c2fcd5ae4036e7afa74fc78f9a47ac6bc
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-12-18 (Fri, 18 Dec 2020)
Changed paths:
M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/AbstractObjectDummyConnector.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/builder/S_ItemEntry.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/builder/DeltaBuilder.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestTaskReporting.java
A model/model-intest/src/test/resources/reporting/resource-source.xml
A model/model-intest/src/test/resources/reporting/resource-target.xml
A model/model-intest/src/test/resources/reporting/role-target.xml
A model/model-intest/src/test/resources/reporting/task-import.xml
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/errorhandling/CommunicationExceptionHandler.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/AbstractProvisioningIntegrationTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractBasicDummyTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractDummyTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaching.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyConsistency.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyConsistencyReaper.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyExpression.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyNegative.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyPrioritiesAndReadReplace.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyResourceAndSchemaCaching.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySecurity.java
M provisioning/provisioning-impl/src/test/resources/dummy/account-morgan.xml
M provisioning/provisioning-impl/src/test/resources/dummy/dummy-expression/resource-dummy.xml
A provisioning/provisioning-impl/src/test/resources/dummy/resource-dummy-broken-accounts.xml
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManagedConnectorInstance.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/prism/PrismObjectAsserter.java
Log Message:
-----------
Add tests for fetching broken objects (get/search)
Commit: 899a486e9f3d7e461554233baed631443bdbbd19
https://github.com/Evolveum/midpoint/commit/899a486e9f3d7e461554233baed631443bdbbd19
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-12-18 (Fri, 18 Dec 2020)
Changed paths:
M custom/testng-integration.xml
M custom/testng-unit.xml
M gui/admin-gui/pom.xml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/SearchFilterPanelFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/SearchFilterTypeModel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismValueWrapperImpl.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxDownloadBehaviorFromFile.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RepositoryObjectDataProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableBeanContainerDataProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/BaseMenuItem.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/LocalePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ContainerListDataProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsConfigPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/AbstractOrgTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreeAssignablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/PageValuePolicy.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/module/ModuleWebSecurityConfig.java
M gui/admin-gui/testng-integration.xml
M gui/admin-gui/testng-perf.xml
M gui/admin-gui/testng-unit.xml
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
M infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
M infra/common/testng-unit.xml
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/DeltaFactory.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ContainerDeltaFactoryImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ContainerDeltaImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/PropertyDeltaFactoryImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/PropertyDeltaImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ReferenceDeltaFactoryImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ReferenceDeltaImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/XmlEntityResolverImpl.java
M infra/prism-impl/testng-unit.xml
M infra/schema-pure-jaxb/pom.xml
M infra/schema/testng-perf.xml
M infra/schema/testng-unit.xml
M infra/test-util/testng-unit.xml
M infra/util/src/main/java/com/evolveum/midpoint/util/aspect/MethodUsageStatistics.java
M infra/util/src/main/java/com/evolveum/midpoint/util/aspect/PerformanceStatistics.java
M infra/util/src/main/java/com/evolveum/midpoint/util/aspect/ProfilingDataLog.java
M infra/util/testng-unit.xml
M model/certification-impl/pom.xml
M model/certification-impl/testng-integration.xml
M model/certification-impl/testng-unit.xml
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/util/DefaultColumnUtils.java
M model/model-common/testng-unit.xml
M model/model-impl/pom.xml
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelCrudService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ObjectImporter.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowCheckResult.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationExpressionsEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScannerTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/DeleteTaskHandler.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestCorrelationConfirmationEvaluator.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/util/mock/MockFactory.java
M model/model-impl/testng-unit.xml
M model/model-intest/pom.xml
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/sync/AbstractSynchronizationStoryTest.java
M model/model-intest/testng-db-specific.xml
M model/model-intest/testng-integration-fast.xml
M model/model-intest/testng-integration-full.xml
M model/model-intest/testng-unit.xml
M model/model-test/pom.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/notifications-impl/pom.xml
M model/notifications-impl/testng-unit.xml
M model/report-impl/pom.xml
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java
M model/report-impl/testng-integration.xml
M model/report-impl/testng-unit.xml
M model/workflow-impl/pom.xml
M model/workflow-impl/testng-integration.xml
M model/workflow-impl/testng-unit.xml
M pom.xml
M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
M provisioning/provisioning-impl/pom.xml
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadowmanager/ShadowManager.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyResourceAndSchemaCaching.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
M provisioning/provisioning-impl/testng-integration.xml
M provisioning/provisioning-impl/testng-unit.xml
M provisioning/ucf-impl-builtin/pom.xml
M provisioning/ucf-impl-connid/pom.xml
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdUtil.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
M provisioning/ucf-impl-connid/testng-integration.xml
M provisioning/ucf-impl-connid/testng-unit.xml
M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditService.java
R repo/audit-impl/pom.xml
R repo/audit-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceFactory.java
R repo/audit-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceImpl.java
R repo/audit-impl/src/main/resources/ctx-audit.xml
R repo/audit-impl/src/test/java/com/evolveum/midpoint/audit/impl/TestAuditServiceImpl.java
R repo/audit-impl/src/test/resources/ctx-audit-test.xml
R repo/audit-impl/src/test/resources/logback-test.xml
R repo/audit-impl/testng-integration.xml
R repo/audit-impl/testng-unit.xml
A repo/audit-log-impl/pom.xml
A repo/audit-log-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceFactory.java
A repo/audit-log-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceImpl.java
A repo/audit-log-impl/src/main/resources/ctx-audit.xml
A repo/audit-log-impl/src/test/java/com/evolveum/midpoint/audit/impl/TestAuditServiceImpl.java
A repo/audit-log-impl/src/test/resources/ctx-audit-test.xml
A repo/audit-log-impl/src/test/resources/logback-test.xml
A repo/audit-log-impl/testng-integration.xml
A repo/audit-log-impl/testng-unit.xml
M repo/pom.xml
M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryServiceFactory.java
M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryServiceFactoryException.java
M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/handlers/ModificationOpHandler.java
M repo/repo-cache/src/test/resources/ctx-configuration-test-no-audit.xml
M repo/repo-cache/testng-unit.xml
M repo/repo-common/pom.xml
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionUtil.java
M repo/repo-common/testng-integration.xml
M repo/repo-common/testng-unit.xml
M repo/repo-sqale/pom.xml
R repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryFactory.java
A repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryService.java
A repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryServiceFactory.java
M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryFactory.java
M repo/repo-sql-impl-test/src/main/resources/ctx-repository-test.xml
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AuditTest.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ConcurrencyTest.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/DeleteTest.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyUser.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/AbstractOrgClosureTest.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/OrgClosureConcurrencyTest.java
M repo/repo-sql-impl-test/src/test/resources/config-test.xml
M repo/repo-sql-impl-test/src/test/resources/ctx-configuration-sql-test.xml
M repo/repo-sql-impl-test/src/test/resources/ctx-test-datasource.xml
M repo/repo-sql-impl-test/testng-db-specific.xml
M repo/repo-sql-impl-test/testng-integration.xml
M repo/repo-sql-impl-test/testng-perf.xml
M repo/repo-sql-impl-test/testng-unit.xml
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/Database.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryBeanConfig.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryFactory.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/audit/SqlQueryExecutor.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/audit/SqlTransformerBase.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/audit/mapping/AuditDeltaSqlTransformer.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/audit/mapping/AuditEventRecordSqlTransformer.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/audit/mapping/QAuditDeltaMapping.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/audit/mapping/QAuditEventRecordMapping.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/SelectQueryBuilder.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/SqlQuery.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/JdbcSession.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/schemacheck/SchemaActionComputer.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/TemporaryTableDialect.java
M repo/repo-sql-impl/src/main/resources/ctx-repository.xml
M repo/repo-sqlbase/pom.xml
R repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/SqlConfiguration.java
M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/SqlPathContext.java
M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/SqlQueryContext.java
A repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/SqlRepoContext.java
A repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/SqlRepositoryBaseConfiguration.java
M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/QueryModelMapping.java
M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/SqlDetailFetchMapper.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M repo/repo-test-util/src/main/resources/ctx-configuration-test.xml
M repo/security-impl/pom.xml
M repo/security-impl/testng-unit.xml
M repo/system-init/src/main/java/com/evolveum/midpoint/init/RepositoryFactory.java
M repo/system-init/src/main/resources/ctx-configuration.xml
M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManager.java
M repo/task-quartz-impl/pom.xml
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/Initializer.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
M repo/task-quartz-impl/testng-integration.xml
M repo/task-quartz-impl/testng-unit.xml
M testing/conntest/pom.xml
M testing/conntest/testng-integration.xml
M testing/longtest/pom.xml
M testing/longtest/testng-integration.xml
M testing/rest/pom.xml
M testing/rest/testng-integration.xml
M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/AbstractLabTest.java
M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M10ObjectTemplate.java
M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M5AccountsAssignmentsAndRoles.java
M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M6ConfiguringMultipleAccountTypes.java
M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M7SynchronizationFlavours.java
M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M8ExtendingMidPointXMLSchema.java
M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M9OrganizationalStructure.java
M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/ObjectListArchetypeTests.java
M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/OrgMembersTests.java
A testing/schrodingertest/src/test/resources/labs/objects/users/kirk-tiberius-user.xml
R testing/schrodingertest/src/test/resources/labs/objects/users/kirk-user-10.xml
M testing/schrodingertest/testng-integration.xml
M testing/story/pom.xml
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/consistency/TestConsistencyMechanism.java
M testing/story/testng-integration.xml
M tools/ninja/pom.xml
M tools/ninja/testng-unit.xml
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/AssignmentsTab.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/assignmentholder/AssignmentHolderObjectListTable.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/PrismForm.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/TabPanel.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/search/Search.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/Table.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/TableRow.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/TableWithPageRedirect.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/modal/FocusSetAssignmentsModal.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/org/MemberPanel.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/org/OrgHierarchyPanel.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/resource/ResourceShadowTable.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/AssignmentHolderDetailsPage.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/BasicPage.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/resource/EditResourceConfigurationPage.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/util/ConstantsUtil.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/util/Utils.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
# Conflicts:
# provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java
# provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyResourceAndSchemaCaching.java
Compare: https://github.com/Evolveum/midpoint/compare/aec144dfcc16...899a486e9f3d
More information about the midPoint-svn
mailing list