Adapt TestImportRecon to recent changes

After letting Synchronizer propagate protected accounts' sync events
to SynchronizationServiceImpl (7971415,
point #3), the "objects processed" and "shadow fetched" counters went
down (because protected shadows are no longer re-processed in 3rd stage
of reconciliation).

TestImportRecon had to be adapted.

model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java

@@ -985,22 +985,22 @@ public void test200ReconcileDummy() throws Exception {
                 .activityState(RECONCILIATION_REMAINING_SHADOWS_PATH)
                     .itemProcessingStatistics()
                         .display()
-                        .assertTotalCounts(0, 0, 2)
+                        .assertTotalCounts(0, 0, 0)
                     .end()
                     .progress()
                         .display()
-                        .assertCommitted(0, 0, 2)
+                        .assertNoCommitted()
                         .assertNoUncommitted()
                     .end()
                 .end()
-                .assertProgress(9);
+                .assertProgress(7);
         // @formatter:on
 
         and("given number of fetch operations should be there");
-        assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 6);
+        assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 4);
 
         and("reconciliation result listener should contain correct counters");
-        reconciliationResultListener.assertResult(RESOURCE_DUMMY_OID, 0, 7, 0, 2);
+        reconciliationResultListener.assertResult(RESOURCE_DUMMY_OID, 0, 7, 0, 0);
 
         and("users should be as expected");
         List<PrismObject<UserType>> users = modelService.searchObjects(UserType.class, null, null, task, result);
@@ -1165,9 +1165,9 @@ public void test219ReconcileDummyFixed() throws Exception {
 
         dumpStatistics(taskAfter);
 
-        assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 6);
+        assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 4);
 
-        reconciliationResultListener.assertResult(RESOURCE_DUMMY_OID, 0, 7, 0, 2);
+        reconciliationResultListener.assertResult(RESOURCE_DUMMY_OID, 0, 7, 0, 0);
 
         List<PrismObject<UserType>> users = modelService.searchObjects(UserType.class, null, null, task, result);
         display("Users after import", users);
@@ -1274,7 +1274,7 @@ public void test220ReconcileDummyBrokenGuybrush() throws Exception {
         List<PrismObject<UserType>> users = modelService.searchObjects(UserType.class, null, null, task, result);
         display("Users after reconciliation (broken resource account)", users);
 
-        reconciliationResultListener.assertResult(RESOURCE_DUMMY_OID, 0, 7, 1, 2);
+        reconciliationResultListener.assertResult(RESOURCE_DUMMY_OID, 0, 7, 1, 0);
 
         assertImportedUserByOid(USER_ADMINISTRATOR_OID);
         assertImportedUserByOid(USER_JACK_OID);
@@ -1346,9 +1346,9 @@ public void test229ReconcileDummyFixed() throws Exception {
 
         dumpStatistics(taskAfter);
 
-        assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 6);
+        assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 4);
 
-        reconciliationResultListener.assertResult(RESOURCE_DUMMY_OID, 0, 7, 0, 2);
+        reconciliationResultListener.assertResult(RESOURCE_DUMMY_OID, 0, 7, 0, 0);
 
         List<PrismObject<UserType>> users = modelService.searchObjects(UserType.class, null, null, task, result);
         display("Users after import", users);
@@ -1464,27 +1464,26 @@ public void test230ReconcileDummyRename() throws Exception {
                         // for ht (old name for htm)
                         .assertTransition(LINKED, DELETED, DELETED, null, 1, 0, 0)
                         // two protected accounts (daviejones, calypso)
-                        .assertTransition(null, null, null, PROTECTED, 0, 0, 2)
-                        .assertTransitions(2)
+                        .assertTransitions(1)
                     .end()
                     .itemProcessingStatistics()
                         .display()
-                        .assertTotalCounts(1, 0, 2) // 1 renamed, 2 protected
+                        .assertTotalCounts(1, 0, 0) // 1 renamed
                     .end()
                     .progress()
                         .display()
-                        .assertCommitted(1, 0, 2)
+                        .assertCommitted(1, 0, 0)
                         .assertNoUncommitted()
                     .end()
                 .end()
-                .assertProgress(10);
+                .assertProgress(8);
         // @formatter:on
 
         dumpShadowSituations(RESOURCE_DUMMY_OID, result);
 
-        assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 6);
+        assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 4);
 
-        reconciliationResultListener.assertResult(RESOURCE_DUMMY_OID, 0, 7, 0, 3);
+        reconciliationResultListener.assertResult(RESOURCE_DUMMY_OID, 0, 7, 0, 1);
 
         List<PrismObject<UserType>> users = modelService.searchObjects(UserType.class, null, null, task, result);
         display("Users after import", users);