From eaa70c24da27006d1fedca05075f7bcf9066550c Mon Sep 17 00:00:00 2001 From: Jason Pickering Date: Sun, 19 Jul 2026 19:18:51 +0200 Subject: [PATCH] fix: correct off-by-one header/row assertions in ENROLLMENT_OU e2e test queryWithProgramAndFilterByEnrollmentOuKeyword asserted 16 headers/columns, one short of the 17 its sibling queryWithProgramAndFilterByEnrollmentOrgUnit correctly asserts for the equivalent `.ou` query. 2.43's TrackedEntityStaticField includes a storedby field that master's does not, so the 16-header expectation (correct on master, where this test originated) became stale once cherry-picked onto 2.43. Verified the corrected assertions exactly match the sibling test's row data and pass against a live server. Co-Authored-By: Claude Sonnet 5 --- .../analytics/trackedentity/TrackedEntityQueryTest.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dhis-2/dhis-test-e2e/src/test/java/org/hisp/dhis/analytics/trackedentity/TrackedEntityQueryTest.java b/dhis-2/dhis-test-e2e/src/test/java/org/hisp/dhis/analytics/trackedentity/TrackedEntityQueryTest.java index d6ef5ba14282..a7bbcf42ec77 100644 --- a/dhis-2/dhis-test-e2e/src/test/java/org/hisp/dhis/analytics/trackedentity/TrackedEntityQueryTest.java +++ b/dhis-2/dhis-test-e2e/src/test/java/org/hisp/dhis/analytics/trackedentity/TrackedEntityQueryTest.java @@ -1478,13 +1478,13 @@ public void queryWithProgramAndFilterByEnrollmentOuKeyword() { response .validate() .statusCode(200) - .body("headers", hasSize(equalTo(16))) + .body("headers", hasSize(equalTo(17))) .body("rows", hasSize(equalTo(14))) .body("metaData.dimensions.ou", hasSize(equalTo(1))) .body("metaData.dimensions.ou", hasItem("BV4IomHvri4")) .body("height", equalTo(14)) - .body("width", equalTo(16)) - .body("headerWidth", equalTo(16)); + .body("width", equalTo(17)) + .body("headerWidth", equalTo(17)); // Validate the first three rows, as samples (identical to the `ou` variant). validateRow( @@ -1499,6 +1499,7 @@ public void queryWithProgramAndFilterByEnrollmentOuKeyword() { "", "", "", + "", "Ahmadiyya Muslim Hospital", "OU_268246", "Sierra Leone / Tonkolili / Yoni / Ahmadiyya Muslim Hospital", @@ -1520,6 +1521,7 @@ public void queryWithProgramAndFilterByEnrollmentOuKeyword() { "", "", "", + "", "Ahmadiyya Muslim Hospital", "OU_268246", "Sierra Leone / Tonkolili / Yoni / Ahmadiyya Muslim Hospital", @@ -1541,6 +1543,7 @@ public void queryWithProgramAndFilterByEnrollmentOuKeyword() { "", "", "", + "", "Ahmadiyya Muslim Hospital", "OU_268246", "Sierra Leone / Tonkolili / Yoni / Ahmadiyya Muslim Hospital",