<html>
<head>
</head>
<body>
<table border='0' cellpadding='3'>
<tr><td>Author: </td><td><b>semancik</b></td></tr>
<tr><td>Date:</td><td>2013-02-27 11:35:01 +0100 (Wed, 27 Feb 2013)</td></tr>
<tr><td>New Revision: </td><td>5196</td></tr>
</table>
<hr/><b>Log:</b><div style='padding-left: 20px; color:black'>
Tests for MID-1171.<br/>
Partial solution to MID-1171.<br/>
Fixing a bug in prism delta merging (+tests).<br/>
Some rearranging of model intest dummy resource definitions.<br/>
Rough fix for occassionaly missing prism context in PageDebugView.<br/>
Additional consistency checks in the system.<br/>
<br/>
</div><hr/>
<b>Added:</b><div style='padding-left: 20px; color:green'>
trunk/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java?r=5196"><see></a><br/>
trunk/model/model-intest/src/test/resources/common/resource-dummy-yellow.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/resources/common/resource-dummy-yellow.xml?r=5196"><see></a><br/>
</div>
<b>Modified:</b><div style='padding-left: 20px; color:blue'>
trunk/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java?r2=5196&r1=5195"><see></a><br/>
trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java?r2=5196&r1=5195"><see></a><br/>
trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java?r2=5196&r1=5195"><see></a><br/>
trunk/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java?r2=5196&r1=5195"><see></a><br/>
trunk/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDiff.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDiff.java?r2=5196&r1=5195"><see></a><br/>
trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ChangeExecutor.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ChangeExecutor.java?r2=5196&r1=5195"><see></a><br/>
trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/Clockwork.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/Clockwork.java?r2=5196&r1=5195"><see></a><br/>
trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/Projector.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/Projector.java?r2=5196&r1=5195"><see></a><br/>
trunk/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java?r2=5196&r1=5195"><see></a><br/>
trunk/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java?r2=5196&r1=5195"><see></a><br/>
trunk/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java?r2=5196&r1=5195"><see></a><br/>
trunk/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java?r2=5196&r1=5195"><see></a><br/>
trunk/model/model-intest/src/test/resources/common/resource-dummy-blue.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/resources/common/resource-dummy-blue.xml?r2=5196&r1=5195"><see></a><br/>
trunk/model/model-intest/src/test/resources/common/resource-dummy-red.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/resources/common/resource-dummy-red.xml?r2=5196&r1=5195"><see></a><br/>
trunk/model/model-intest/src/test/resources/common/role-dummies.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/resources/common/role-dummies.xml?r2=5196&r1=5195"><see></a><br/>
trunk/model/model-intest/testng.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/testng.xml?r2=5196&r1=5195"><see></a><br/>
trunk/model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyResourceContoller.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyResourceContoller.java?r2=5196&r1=5195"><see></a><br/>
trunk/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java?r2=5196&r1=5195"><see></a><br/>
trunk/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java?r2=5196&r1=5195"><see></a><br/>
</div>
</body></html>