Adapt existing iterative task assertions

Evolveum · Feb 24, 2021 · 647ddf6 · 647ddf6
1 parent 3763954
commit 647ddf6
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 1 deletion.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/TaskTypeUtil.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/TaskTypeUtil.java
@@ -121,6 +121,14 @@ public static int getItemsProcessedWithFailure(IterativeTaskInformationType info
         }
     }
 
+    public static int getItemsProcessedWithSkip(IterativeTaskInformationType info) {
+        if (info != null) {
+            return getCounts(getProcessingComponents(info), TaskTypeUtil::isSkip);
+        } else {
+            return 0;
+        }
+    }
+
     /**
      * Provides aggregated operation statistics from this task and all its subtasks.
      * Works with stored operation stats, obviously. (We have no task instances here.)
@@ -277,4 +285,7 @@ public static boolean isFailure(ProcessedItemSetType set) {
         return set.getOutcome() != null && set.getOutcome().getOutcome() == ItemProcessingOutcomeType.FAILURE;
     }
 
+    public static boolean isSkip(ProcessedItemSetType set) {
+        return set.getOutcome() != null && set.getOutcome().getOutcome() == ItemProcessingOutcomeType.SKIP;
+    }
 }
diff --git a/...l/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java b/...l/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
@@ -407,6 +407,7 @@ public void test150ImportFromResourceDummy() throws Exception {
                     .assertTransitions(5)
                     .end()
                 .iterativeTaskInformation()
+                    .display()
                     .assertTotalCounts(7, 0)
                     .end()
                 .assertProgress(7);
@@ -484,6 +485,7 @@ public void test155ImportFromResourceDummyAgain() throws Exception {
                     .assertTransitions(2)
                     .end()
                 .iterativeTaskInformation()
+                    .display()
                     .assertTotalCounts(7, 0)
                     .end()
                 .assertProgress(7);
@@ -571,6 +573,7 @@ public void test160ImportFromResourceDummyLime() throws Exception {
                     .assertTransitions(2)
                     .end()
                 .iterativeTaskInformation()
+                    .display()
                     .assertTotalCounts(3, 0)
                     .end()
                 .assertProgress(3);
@@ -832,6 +835,7 @@ public void test200ReconcileDummy() throws Exception {
                     .assertTransitions(2)
                     .end()
                 .iterativeTaskInformation()
+                    .display()
                     .assertTotalCounts(9, 0)            // protected accounts are processed also in the third stage
                     .end();
                 //.assertProgress(7);         // TODO - specify meaning of progress for reconciliation tasks
@@ -1097,6 +1101,7 @@ public void test220ReconcileDummyBrokenGuybrush() throws Exception {
                     .assertTransitions(2)
                     .end()
                 .iterativeTaskInformation()
+                    .display()
                     .assertTotalCounts(8, 1)
                     .end();
                 //.assertProgress(7);         // TODO - specify meaning of progress for reconciliation tasks
@@ -1282,6 +1287,7 @@ public void test230ReconcileDummyRename() throws Exception {
                     .assertTransitions(3)
                     .end()
                 .iterativeTaskInformation()
+                    .display()
                     .assertTotalCounts(10, 0)
                     .end();
                 //.assertProgress(8);         // TODO - specify meaning of progress for reconciliation tasks

diff --git a/...est-util/src/main/java/com/evolveum/midpoint/test/asserter/IterativeTaskInfoAsserter.java b/...est-util/src/main/java/com/evolveum/midpoint/test/asserter/IterativeTaskInfoAsserter.java
@@ -27,9 +27,21 @@ public class IterativeTaskInfoAsserter<RA> extends AbstractAsserter<RA> {
         this.information = information;
     }
 
-    public IterativeTaskInfoAsserter<RA> assertTotalCounts(int success, int failure) {
+    public IterativeTaskInfoAsserter<RA> assertTotalCounts(int nonFailure, int failure) {
+        assertNonFailureCount(nonFailure);
+        assertFailureCount(failure);
+        return this;
+    }
+
+    public IterativeTaskInfoAsserter<RA> assertTotalCounts(int success, int failure, int skip) {
         assertSuccessCount(success);
         assertFailureCount(failure);
+        assertSkipCount(skip);
+        return this;
+    }
+
+    public IterativeTaskInfoAsserter<RA> assertNonFailureCount(int success) {
+        assertEquals("Wrong value of total 'non-failure' counter", success, getNonFailureCount());
         return this;
     }
 
@@ -38,6 +50,11 @@ public IterativeTaskInfoAsserter<RA> assertSuccessCount(int success) {
         return this;
     }
 
+    public IterativeTaskInfoAsserter<RA> assertSkipCount(int skip) {
+        assertEquals("Wrong value of total skip counter", skip, getSkipCount());
+        return this;
+    }
+
     public IterativeTaskInfoAsserter<RA> assertSuccessCount(int min, int max) {
         assertBetween(getSuccessCount(), min, max, "Total success counter");
         return this;
@@ -84,6 +101,14 @@ private int getFailureCount() {
         return TaskTypeUtil.getItemsProcessedWithFailure(information);
     }
 
+    private int getSkipCount() {
+        return TaskTypeUtil.getItemsProcessedWithSkip(information);
+    }
+
+    private int getNonFailureCount() {
+        return getSuccessCount() + getSkipCount();
+    }
+
     private String getLastFailedObjectName() {
         return TaskTypeUtil.getLastProcessedObjectName(information, TaskTypeUtil::isFailure);
     }