Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Jan 8, 2024 · 310070e · 310070e
2 parents bf66933 + c0af39e
commit 310070e
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/...ification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestEscalation.java b/...ification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestEscalation.java
@@ -476,7 +476,9 @@ public void test210Reports() throws Exception {
 
         login(getUserFromRepo(USER_ADMINISTRATOR_OID));
 
-        String year = currentYearFragment();
+        String startYear = currentYearFragment();
+        // Year could change because of clock override
+        String endYear = String.valueOf(clock.currentTimeXMLGregorianCalendar().getYear()  % 100);
         String definitionName = "Basic User Assignment Certification (ERoot only) with escalations";
         String campaignName = definitionName + " 1";
 
@@ -490,8 +492,8 @@ public void test210Reports() throws Exception {
                 .assertValue(C_DEF_OWNER, "")
                 .assertValue(C_DEF_CAMPAIGNS, "1")
                 .assertValue(C_DEF_OPEN_CAMPAIGNS, "1")
-                .assertValue(C_DEF_LAST_STARTED, v -> v.contains(year))
-                .assertValue(C_DEF_LAST_CLOSED, v -> v.contains(year));
+                .assertValue(C_DEF_LAST_STARTED, v -> v.contains(startYear))
+                .assertValue(C_DEF_LAST_CLOSED, v -> v.contains(endYear));
 
         var campaigns = REPORT_CERTIFICATION_CAMPAIGNS.export()
                 .execute(result);
@@ -501,7 +503,7 @@ public void test210Reports() throws Exception {
                 .record(0)
                 .assertValue(C_CMP_NAME, campaignName)
                 .assertValue(C_CMP_OWNER, "administrator")
-                .assertValue(C_CMP_START, v -> v.contains(year))
+                .assertValue(C_CMP_START, v -> v.contains(endYear))
                 .assertValue(C_CMP_FINISH, "")
                 .assertValue(C_CMP_CASES, "7")
                 .assertValue(C_CMP_STATE, "In review stage")
@@ -519,7 +521,7 @@ public void test210Reports() throws Exception {
                                 && "Role: Superuser".equals(r.get(C_CASES_TARGET)),
                         a -> a.assertValue(C_CASES_CAMPAIGN, campaignName)
                                 .assertValue(C_CASES_REVIEWERS, "")
-                                .assertValue(C_CASES_LAST_REVIEWED_ON, s -> s.contains(year))
+                                .assertValue(C_CASES_LAST_REVIEWED_ON, s -> s.contains(startYear))
                                 .assertValue(C_CASES_REVIEWED_BY, "administrator")
                                 .assertValue(C_CASES_ITERATION, "1")
                                 .assertValue(C_CASES_IN_STAGE, "1")
@@ -558,7 +560,7 @@ public void test210Reports() throws Exception {
                                 .assertValue(C_WI_OUTCOME, "")
                                 .assertValue(C_WI_COMMENT, "")
                                 .assertValue(C_WI_LAST_CHANGED, "")
-                                .assertValue(C_WI_CLOSED, s -> s.contains(year)))
+                                .assertValue(C_WI_CLOSED, s -> s.contains(endYear)))
                 .forRecords(1,
                         r -> "User: jack".equals(r.get(C_WI_OBJECT))
                                 && "Role: Reviewer".equals(r.get(C_WI_TARGET))