Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Apr 7, 2015 · 20f27bd · 20f27bd
2 parents 7b47e2a + 6661b4b
commit 20f27bd
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...rc/test/java/com/evolveum/midpoint/model/intest/negative/TestModelWebServiceNegative.java b/...rc/test/java/com/evolveum/midpoint/model/intest/negative/TestModelWebServiceNegative.java
@@ -74,6 +74,7 @@
 import com.evolveum.midpoint.xml.ns._public.common.fault_3.FaultMessage;
 import com.evolveum.midpoint.xml.ns._public.common.fault_3.FaultType;
 import com.evolveum.midpoint.xml.ns._public.common.fault_3.IllegalArgumentFaultType;
+import com.evolveum.midpoint.xml.ns._public.common.fault_3.SchemaViolationFaultType;
 import com.evolveum.midpoint.xml.ns._public.common.fault_3.SystemFaultType;
 import com.evolveum.prism.xml.ns._public.types_3.ChangeTypeType;
 import com.evolveum.prism.xml.ns._public.types_3.ItemDeltaType;
@@ -172,7 +173,7 @@ public void test200ModifyAccountWrongExplicitType() throws Exception {
 		deltaList.getDelta().add(objectChange);
 
 		// WHEN, THEN
-		assertExecuteChangesFailure(deltaList, null, SystemFaultType.class, "The value of type", "cannot be applied to attribute");
+		assertExecuteChangesFailure(deltaList, null, SchemaViolationFaultType.class, "The value of type", "cannot be applied to attribute");
 	}