Few more test fixes

Evolveum · Jan 17, 2019 · fa0074f · fa0074f
1 parent 6af1a50
commit fa0074f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java b/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
@@ -877,7 +877,12 @@ private void distributeResourceObject(PrismObject<ShadowType> object, PrismObjec
 
 	private void distributeResourceValue(PrismReferenceValue resourceRefVal, PrismObject<ResourceType> resource) {
 		if (resourceRefVal != null) {
+			boolean immutable = resourceRefVal.isImmutable();
+			if (immutable) {
+				resourceRefVal.setImmutable(false);
+			}
 			resourceRefVal.setObject(resource);
+			resourceRefVal.setImmutable(immutable);
 		}
 	}
 

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
@@ -346,8 +346,7 @@ private void doPreview(Collection<ObjectDelta<? extends ObjectType>> deltas,
 		display("Preview context", modelContext);
 		checker.check(modelContext);
 
-		result.computeStatus();
-        TestUtil.assertSuccess(result);
+		assertSuccess(result);
 	}
 
 	private void doPreviewFail(Collection<ObjectDelta<? extends ObjectType>> deltas, Task task, OperationResult result)