[midPoint-git] [Evolveum/midpoint] aabc8d: fixing tests..

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: aabc8d540eb1b97d5d2bf005597a2e37da3d1982
      https://github.com/Evolveum/midpoint/commit/aabc8d540eb1b97d5d2bf005597a2e37da3d1982
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-13 (Fri, 13 May 2016)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SynchronizationSituationUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java

  Log Message:
  -----------
  fixing tests..


  Commit: c6ce3ce73d920ed6c3284da063096bfc9041e46e
      https://github.com/Evolveum/midpoint/commit/c6ce3ce73d920ed6c3284da063096bfc9041e46e
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-05-13 (Fri, 13 May 2016)

  Changed paths:
    M README.md
    M build-system/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/web/component/input/ObjectReferenceChoiceRenderer.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameChoiceRenderer.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/AttributeEditorUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/PropertyLimitationsTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.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/util/ExpressionUtil.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/match/MatchingRuleRegistry.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/TestActivation.java
    A model/model-intest/src/test/resources/common/service-ship-sea-monkey.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M samples/stories/multitenant-idm-saas/roles/role-customer-authz-enduser.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/ec9330d23489...c6ce3ce73d92