From 88df3880575518665573fa785d696719df7deeb9 Mon Sep 17 00:00:00 2001 From: Radovan Semancik Date: Mon, 13 Mar 2017 10:36:41 +0100 Subject: [PATCH] Fixing intests --- .../LayerRefinedAttributeDefinitionImpl.java | 7 ++++++- .../evolveum/midpoint/prism/ItemDefinition.java | 7 ++++++- .../midpoint/prism/ItemDefinitionImpl.java | 3 ++- .../com/evolveum/midpoint/prism/PrismProperty.java | 4 ++-- .../model/intest/TestConnectorMultiInstance.java | 2 ++ .../model/intest/TestModelServiceContract.java | 2 +- .../midpoint/model/intest/TestPreviewChanges.java | 14 +++++++------- .../model/test/AbstractModelIntegrationTest.java | 4 +++- 8 files changed, 29 insertions(+), 14 deletions(-) diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java b/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java index da51745b2bc..f0a8cae66cb 100644 --- a/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java +++ b/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2016 Evolveum + * Copyright (c) 2010-2017 Evolveum * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -588,6 +588,11 @@ public boolean isHeterogeneousListItem() { return refinedAttributeDefinition.isHeterogeneousListItem(); } + @Override + public void debugDumpShortToString(StringBuilder sb) { + refinedAttributeDefinition.debugDumpShortToString(sb); + } + //endregion } diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java index 09fa5d47590..d7a845fd6e4 100644 --- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java +++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2016 Evolveum + * Copyright (c) 2010-2017 Evolveum * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -143,4 +143,9 @@ public interface ItemDefinition extends Definition { @Override void revive(PrismContext prismContext); + /** + * Used in debugDumping items. Does not need to have name in it as item already has it. Does not need + * to have class as that is just too much info that is almost anytime pretty obvious anyway. + */ + void debugDumpShortToString(StringBuilder sb); } diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinitionImpl.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinitionImpl.java index 3b3cefeae6c..d8ad57d6e57 100644 --- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinitionImpl.java +++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinitionImpl.java @@ -430,7 +430,8 @@ public String toString() { * Used in debugDumping items. Does not need to have name in it as item already has it. Does not need * to have class as that is just too much info that is almost anytime pretty obvious anyway. */ - void debugDumpShortToString(StringBuilder sb) { + @Override + public void debugDumpShortToString(StringBuilder sb) { sb.append(PrettyPrinter.prettyPrint(getTypeName())); debugMultiplicity(sb); debugFlags(sb); diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java index 8d4fd5e87cc..fcb3f1b8bf1 100644 --- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java +++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2016 Evolveum + * Copyright (c) 2010-2017 Evolveum * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -565,7 +565,7 @@ public String debugDump(int indent) { if (def != null && DebugUtil.isDetailedDebugDump()) { sb.append(" def("); - ((PrismPropertyDefinitionImpl) def).debugDumpShortToString(sb); + def.debugDumpShortToString(sb); // if (def.isIndexed() != null) { // sb.append(def.isIndexed() ? ",i+" : ",i-"); // } diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorMultiInstance.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorMultiInstance.java index 74180891324..cae51f52dbc 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorMultiInstance.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorMultiInstance.java @@ -80,6 +80,8 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti initDummyResourcePirate(RESOURCE_DUMMY_BLACK_NAME, RESOURCE_DUMMY_BLACK_FILE, RESOURCE_DUMMY_BLACK_OID, initTask, initResult); + repoAddObjectFromFile(SECURITY_POLICY_FILE, initResult); + repoAddObjectFromFile(USER_JACK_FILE, true, initResult); repoAddObjectFromFile(USER_GUYBRUSH_FILE, true, initResult); } diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java index 31be5bffe81..5df5f75c995 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java @@ -1132,7 +1132,7 @@ public void test131ModifyUserJackAssignAccount() throws Exception { TestUtil.assertSuccess("executeChanges result", result); XMLGregorianCalendar endTime = clock.currentTimeXMLGregorianCalendar(); assertShadowFetchOperationCountIncrement(0); - assertPrismObjectCloneIncrement(63); + assertPrismObjectCloneIncrement(64); PrismObject userJack = getUser(USER_JACK_OID); display("User after change execution", userJack); diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java index 99b35736c7a..cb065e1674a 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java @@ -93,7 +93,7 @@ public class TestPreviewChanges extends AbstractInitializedModelIntegrationTest public static final File TEST_DIR = new File("src/test/resources/preview"); - // YELLOW dummy resource has a STRICT dependency on default dummy resource + // LEMON dummy resource has a STRICT dependency on default dummy resource protected static final File RESOURCE_DUMMY_LEMON_FILE = new File(TEST_DIR, "resource-dummy-lemon.xml"); protected static final String RESOURCE_DUMMY_LEMON_OID = "10000000-0000-0000-0000-000000000504"; protected static final String RESOURCE_DUMMY_LEMON_NAME = "lemon"; @@ -1264,7 +1264,7 @@ public void test620AddUserCapsize() throws Exception { } - // testing multiple resources with dependencies (dummy -> dummy yellow) + // testing multiple resources with dependencies (dummy -> dummy lemon) @Test public void test630AddUserRogers() throws Exception { @@ -1298,7 +1298,7 @@ public void test630AddUserRogers() throws Exception { ObjectDelta userSecondaryDelta = focusContext.getSecondaryDelta(); // inbound from ship (explicitly specified) to organizationalUnit (dummy resource) - // inbound from gossip (computed via outbound) to description (yellow resource) + // inbound from gossip (computed via outbound) to description (lemon resource) assertEffectualDeltas(userSecondaryDelta, "focus secondary delta", ActivationStatusType.ENABLED, 2); PrismObject finalUser = user.clone(); @@ -1328,10 +1328,10 @@ public void test630AddUserRogers() throws Exception { PrismAsserts.assertNoItemDelta(accountSecondaryDelta, getAttributePath(getDummyResourceObject(), DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_FULLNAME_NAME)); - // YELLOW dummy resource + // LEMON dummy resource accContext = modelContext.findProjectionContext( - new ResourceShadowDiscriminator(RESOURCE_DUMMY_YELLOW_OID, ShadowKindType.ACCOUNT, null)); - assertNotNull("Null model projection context (yellow)", accContext); + new ResourceShadowDiscriminator(RESOURCE_DUMMY_LEMON_OID, ShadowKindType.ACCOUNT, null)); + assertNotNull("Null model projection context (lemon)", accContext); assertEquals("Wrong policy decision", SynchronizationPolicyDecision.ADD, accContext.getSynchronizationPolicyDecision()); accountPrimaryDelta = accContext.getPrimaryDelta(); @@ -1339,7 +1339,7 @@ public void test630AddUserRogers() throws Exception { PrismAsserts.assertIsAdd(accountPrimaryDelta); accountSecondaryDelta = accContext.getSecondaryDelta(); - assertNotNull("No account secondary delta (yellow)", accountSecondaryDelta); + assertNotNull("No account secondary delta (lemon)", accountSecondaryDelta); // administrativeStatus (ENABLED), enableTimestamp, ship (from organizationalUnit), name, gossip, water, iteration, iterationToken, password/value PrismAsserts.assertModifications(accountSecondaryDelta, 9); PrismAsserts.assertPropertyReplace(accountSecondaryDelta, diff --git a/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java b/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java index d54db04abb9..668c5f50f74 100644 --- a/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java +++ b/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java @@ -280,7 +280,9 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti @Override public void postInitSystem(Task initTask, OperationResult initResult) throws Exception { super.postInitSystem(initTask, initResult); - dummyResourceCollection.resetResources(); + if (dummyResourceCollection != null) { + dummyResourceCollection.resetResources(); + } } protected void startResources() throws Exception {