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

Evolveum · Oct 15, 2014 · ee3dd98 · ee3dd98
2 parents d53f534 + 67a98ce
commit ee3dd98
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/...pl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java b/...pl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
@@ -292,19 +292,6 @@ private boolean isHigerOrder(ResourceObjectTypeDependencyType a,
 		}
 		return ao > bo;
 	}
-
-	private boolean isLowerOrder(ResourceObjectTypeDependencyType a,
-			ResourceObjectTypeDependencyType b) {
-		Integer ao = a.getOrder();
-		Integer bo = b.getOrder();
-		if (ao == null) {
-			ao = 0;
-		}
-		if (bo == null) {
-			bo = 0;
-		}
-		return ao < bo;
-	}
 
 	/**
 	 * Find context that has the closest order to the dependency.

diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
@@ -1518,13 +1518,14 @@ public void test419DavidAndGoliathUnassignRole() throws Exception {
 
         // Check audit
         display("Audit", dummyAuditService);
-        dummyAuditService.assertRecords(3);
+        dummyAuditService.assertRecords(4);
         dummyAuditService.assertSimpleRecordSanity();
         dummyAuditService.assertAnyRequestDeltas();
-        dummyAuditService.assertExecutionDeltas(0,3);
+        dummyAuditService.assertExecutionDeltas(0,1);
+        dummyAuditService.assertExecutionDeltas(1,2);
         dummyAuditService.asserHasDelta(0,ChangeType.MODIFY, UserType.class);
         dummyAuditService.asserHasDelta(1,ChangeType.DELETE, ShadowType.class);
-        dummyAuditService.assertExecutionDeltas(1,2);
+        dummyAuditService.assertExecutionDeltas(2,2);
         dummyAuditService.asserHasDelta(1,ChangeType.MODIFY, UserType.class);
         dummyAuditService.asserHasDelta(1,ChangeType.DELETE, ShadowType.class);
         dummyAuditService.assertExecutionSuccess();        
@@ -1676,13 +1677,14 @@ public void test429DavidAndGoliathUnassignRole() throws Exception {
 
         // Check audit
         display("Audit", dummyAuditService);
-        dummyAuditService.assertRecords(3);
+        dummyAuditService.assertRecords(4);
         dummyAuditService.assertSimpleRecordSanity();
         dummyAuditService.assertAnyRequestDeltas();
-        dummyAuditService.assertExecutionDeltas(0,3);
+        dummyAuditService.assertExecutionDeltas(0,1);
+        dummyAuditService.assertExecutionDeltas(1,2);
         dummyAuditService.asserHasDelta(0,ChangeType.MODIFY, UserType.class);
         dummyAuditService.asserHasDelta(1,ChangeType.DELETE, ShadowType.class);
-        dummyAuditService.assertExecutionDeltas(1,2);
+        dummyAuditService.assertExecutionDeltas(2,2);
         dummyAuditService.asserHasDelta(1,ChangeType.MODIFY, UserType.class);
         dummyAuditService.asserHasDelta(1,ChangeType.DELETE, ShadowType.class);
         dummyAuditService.assertExecutionSuccess();        

diff --git a/testing/story/testng.xml b/testing/story/testng.xml
@@ -25,6 +25,7 @@
             <class name="com.evolveum.midpoint.testing.story.TestTrafo"/>
             <class name="com.evolveum.midpoint.testing.story.TestOrgSync"/>
             <class name="com.evolveum.midpoint.testing.story.TestVillage"/>
+            <class name="com.evolveum.midpoint.testing.story.TestScience"/>
         </classes>
     </test>
 </suite>