Test fix attempt (#15726)

* test: Attempt to fix failure on Jenkins only * refactor: Rename variable * fix: Update time for resource tables * add debug code --------- Co-authored-by: Viet Nguyen <[email protected]>
dhis2 · Nov 16, 2023 · 07efe3d · 07efe3d
1 parent 77a9662
commit 07efe3d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/...analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableGenerator.java b/...analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableGenerator.java
@@ -149,8 +149,6 @@ public void generateResourceTables(JobProgress progress) {
   // -------------------------------------------------------------------------
 
   private void generateResourceTablesInternal(JobProgress progress) {
-    final Date startTime = new Date();
-
     resourceTableService.dropAllSqlViews(progress);
 
     Map<String, Runnable> generators = new LinkedHashMap<>();
@@ -184,6 +182,6 @@ private void generateResourceTablesInternal(JobProgress progress) {
     resourceTableService.createAllSqlViews(progress);
 
     systemSettingManager.saveSystemSetting(
-        SettingKey.LAST_SUCCESSFUL_RESOURCE_TABLES_UPDATE, startTime);
+        SettingKey.LAST_SUCCESSFUL_RESOURCE_TABLES_UPDATE, new Date());
   }
 }
diff --git a/...his-test-integration/src/test/java/org/hisp/dhis/analytics/data/AnalyticsServiceTest.java b/...his-test-integration/src/test/java/org/hisp/dhis/analytics/data/AnalyticsServiceTest.java
@@ -1539,7 +1539,11 @@ void resourceTablesTimestampUpdated() {
         systemSettingManager.getSystemSetting(
             SettingKey.LAST_SUCCESSFUL_RESOURCE_TABLES_UPDATE, Date.class);
     assertNotEquals(null, resourceTablesUpdated);
-    assertTrue(tableLastUpdated.compareTo(processStartTime) > 0);
-    assertTrue(resourceTablesUpdated.compareTo(processStartTime) > 0);
+    assertTrue(
+        tableLastUpdated.compareTo(processStartTime) > 0,
+        String.format("%s > %s", tableLastUpdated, processStartTime));
+    assertTrue(
+        resourceTablesUpdated.compareTo(processStartTime) > 0,
+        String.format("%s > %s", resourceTablesUpdated, processStartTime));
   }
 }