fixing trafo tests (story)

Evolveum · Mar 4, 2019 · 5cfe7c3 · 5cfe7c3
1 parent 7e885c1
commit 5cfe7c3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/...ain/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java b/...ain/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java
@@ -34,6 +34,7 @@
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.schema.GetOperationOptions;
 import com.evolveum.midpoint.schema.SelectorOptions;
+import com.evolveum.midpoint.schema.processor.ResourceAttributeDefinition;
 import com.evolveum.midpoint.schema.util.ResourceTypeUtil;
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.web.component.search.Search;
@@ -97,7 +98,7 @@ private <T extends ObjectType> List<SearchItemDefinition> createAttributeDefinit
 
 		ItemPath attributePath = ShadowType.F_ATTRIBUTES;
 
-		for (ItemDefinition def : (List<ItemDefinition>) ocDef.getDefinitions()) {
+		for (ResourceAttributeDefinition def : ocDef.getAttributeDefinitions()) {
 			if (!(def instanceof PrismPropertyDefinition) && !(def instanceof PrismReferenceDefinition)) {
 				continue;
 			}

diff --git a/...del-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java b/...del-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
@@ -345,6 +345,10 @@ protected void cleanUpSecurity() {
 		securityContext.setAuthentication(null);
 	}
 
+	protected void initDummyResource(String name, DummyResourceContoller controller) {
+		dummyResourceCollection.initDummyResource(name, controller);
+	}
+
 	protected DummyResourceContoller initDummyResource(String name, File resourceFile, String resourceOid,
 			FailableProcessor<DummyResourceContoller> controllerInitLambda,
 			Task task, OperationResult result) throws Exception {

diff --git a/model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyResourceCollection.java b/model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyResourceCollection.java
@@ -75,6 +75,13 @@ public DummyResourceContoller initDummyResource(String name, File resourceFile,
 		map.put(name, controller);
 		return controller;
 	}
+
+	public void initDummyResource(String name, DummyResourceContoller controller) {
+		if (map.containsKey(name)) {
+			throw new IllegalArgumentException("Dummy resource "+name+" already initialized");
+		}
+		map.put(name, controller);
+	}
 
 	public DummyResourceContoller get(String name) {
 		DummyResourceContoller contoller = map.get(name);

diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java
@@ -168,6 +168,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
 		resourceDummyAd = importAndGetObjectFromFileIgnoreWarnings(ResourceType.class, RESOURCE_DUMMY_AD_FILE, RESOURCE_DUMMY_AD_OID, initTask, initResult);
 		resourceDummyAdType = resourceDummyAd.asObjectable();
 		dummyResourceCtlAd.setResource(resourceDummyAd);
+		initDummyResource(RESOURCE_DUMMY_AD_ID, dummyResourceCtlAd);
 
 		dummyResourceCtlMail = DummyResourceContoller.create(RESOURCE_DUMMY_MAIL_ID, resourceDummyMail);
 		dummyResourceCtlMail.populateWithDefaultSchema();
@@ -186,6 +187,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
 		resourceDummyMail = importAndGetObjectFromFile(ResourceType.class, RESOURCE_DUMMY_MAIL_FILE, RESOURCE_DUMMY_MAIL_OID, initTask, initResult);
 		resourceDummyMailType = resourceDummyMail.asObjectable();
 		dummyResourceCtlMail.setResource(resourceDummyMail);
+		initDummyResource(RESOURCE_DUMMY_MAIL_ID, dummyResourceCtlMail);
 
 	}
 

diff --git a/testing/story/src/test/resources/trafo/resource-dummy-ad.xml b/testing/story/src/test/resources/trafo/resource-dummy-ad.xml
@@ -172,16 +172,16 @@ else {
 				<attribute>
 					<ref>ri:groups</ref>
 					<displayName>Groups</displayName>
-
 					<limitations>
 						<access>
 							<read>true</read>
 							<add>true</add>
 							<modify>true</modify>
 						</access>
 					</limitations>
-					<tolerant>true</tolerant>
 					<matchingRule>mr:stringIgnoreCase</matchingRule>
+					<tolerant>true</tolerant>
+
 					<outbound>
 						<strength>strong</strength><!-- See above -->
 						<source>
@@ -220,16 +220,15 @@ return null;
 				<attribute>
 					<ref>icfs:name</ref>
 					<displayName>Distinguished Name</displayName>
-
 					<limitations>
 						<access>
 							<read>true</read>
 							<add>true</add>
 							<modify>true</modify>
 						</access>
 					</limitations>
-
 					<matchingRule>mr:stringIgnoreCase</matchingRule>
+
 					<outbound>
 						<!--<strength>weak</strength>-->
 						<source>