fixing more tests in model

Evolveum · Feb 19, 2018 · 627516c · 627516c
1 parent a74ef8a
commit 627516c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java
@@ -572,7 +572,7 @@ public void test110GetResourceDummy() throws Exception {
 		displayThen(TEST_NAME);
 		assertSuccess(result);
 
-        assertCounterIncrement(InternalCounters.PRISM_OBJECT_CLONE_COUNT,  5);
+        assertCounterIncrement(InternalCounters.PRISM_OBJECT_CLONE_COUNT,  4);
 
         assertResourceDummy(resource, true);
 

diff --git a/...c/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGroupingProposed.java b/...c/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualGroupingProposed.java
@@ -26,6 +26,8 @@
 
 import java.io.File;
 
+import com.evolveum.midpoint.prism.PrismPropertyValue;
+import com.evolveum.prism.xml.ns._public.types_3.RawType;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.test.context.ContextConfiguration;
@@ -164,8 +166,10 @@ public void test500AssignBigmouthRoleOne() throws Exception {
 		display("Repo shadow", shadowRepo);
 		PendingOperationType pendingOperation = assertSinglePendingOperation(shadowRepo, null, null, executionStage);
 		assertNotNull("No ID in pending operation", pendingOperation.getId());
-		assertAttribute(shadowRepo, ATTR_USERNAME_QNAME, USER_BIGMOUTH_NAME.toLowerCase());
-		assertAttributeFromCache(shadowRepo, ATTR_FULLNAME_QNAME, USER_BIGMOUTH_FULLNAME);
+		assertAttribute(shadowRepo, ATTR_USERNAME_QNAME,
+				new RawType(new PrismPropertyValue(USER_BIGMOUTH_NAME.toLowerCase()), ATTR_USERNAME_QNAME, prismContext));
+		assertAttributeFromCache(shadowRepo, ATTR_FULLNAME_QNAME,
+				new RawType(new PrismPropertyValue(USER_BIGMOUTH_FULLNAME), ATTR_FULLNAME_QNAME, prismContext));
 		assertShadowActivationAdministrativeStatusFromCache(shadowRepo, ActivationStatusType.ENABLED);
 		assertShadowExists(shadowRepo, false);
 		assertNoShadowPassword(shadowRepo);
@@ -215,8 +219,10 @@ public void test502RunPropagation() throws Exception {
 		display("Repo shadow", shadowRepo);
 		PendingOperationType pendingOperation = assertSinglePendingOperation(shadowRepo, null, null, executionStage);
 		assertNotNull("No ID in pending operation", pendingOperation.getId());
-		assertAttribute(shadowRepo, ATTR_USERNAME_QNAME, USER_BIGMOUTH_NAME.toLowerCase());
-		assertAttributeFromCache(shadowRepo, ATTR_FULLNAME_QNAME, USER_BIGMOUTH_FULLNAME);
+		assertAttribute(shadowRepo, ATTR_USERNAME_QNAME,
+				new RawType(new PrismPropertyValue(USER_BIGMOUTH_NAME.toLowerCase()), ATTR_USERNAME_QNAME, prismContext));
+		assertAttributeFromCache(shadowRepo, ATTR_FULLNAME_QNAME,
+				new RawType(new PrismPropertyValue(USER_BIGMOUTH_FULLNAME), ATTR_FULLNAME_QNAME, prismContext));
 		assertShadowActivationAdministrativeStatusFromCache(shadowRepo, ActivationStatusType.ENABLED);
 		assertShadowExists(shadowRepo, false);
 		assertNoShadowPassword(shadowRepo);