Merge branch 'master' into DHIS2-18417

dhis2 · Dec 11, 2024 · 7074bfd · 7074bfd
2 parents 0b838bf + 926dee8
commit 7074bfd
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 146 deletions.
diff --git a/...test/java/org/hisp/dhis/analytics/enrollment/aggregate/EnrollmentsAggregate4AutoTest.java b/...test/java/org/hisp/dhis/analytics/enrollment/aggregate/EnrollmentsAggregate4AutoTest.java
@@ -155,9 +155,9 @@ public void queryAggregatedenrollmentsmacase2() throws JSONException {
         .validate()
         .statusCode(200)
         .body("headers", hasSize(equalTo(3)))
-        .body("rows", hasSize(equalTo(0)))
-        .body("height", equalTo(0))
-        .body("width", equalTo(0))
+        .body("rows", hasSize(equalTo(1)))
+        .body("height", equalTo(1))
+        .body("width", equalTo(3))
         .body("headerWidth", equalTo(3));
 
     // Assert metaData.
@@ -172,6 +172,7 @@ public void queryAggregatedenrollmentsmacase2() throws JSONException {
     validateHeader(response, 2, "pe", "Period", "TEXT", "java.lang.String", false, true);
 
     // Assert rows.
+    validateRow(response, List.of("1", "ImspTQPwCqd", "202304"));
   }
 
   @Test