From 9859c63f76e02b0ee06954d50aa3fe7d7d11f965 Mon Sep 17 00:00:00 2001 From: luca Date: Thu, 4 Jan 2024 15:52:03 +0100 Subject: [PATCH] fix: tests wrongly backported --- .../tracker/export/TrackerEventsExportControllerByIdTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/export/TrackerEventsExportControllerByIdTest.java b/dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/export/TrackerEventsExportControllerByIdTest.java index 7ad2446e756e..55bef378c3d8 100644 --- a/dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/export/TrackerEventsExportControllerByIdTest.java +++ b/dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/export/TrackerEventsExportControllerByIdTest.java @@ -219,14 +219,13 @@ void getEventByIdRelationshipsNoAccessToRelationshipItemFrom() { } @Test - void getEventByIdContainsCreatedByAndUpdateByAndAssignedUserInDataValues() { + void getEventByIdContainsCreatedByAndUpdateByInDataValues() { TrackedEntityInstance tei = trackedEntityInstance(); ProgramInstance programInstance = programInstance(tei); ProgramStageInstance programStageInstance = programStageInstance(programInstance); programStageInstance.setCreatedByUserInfo(UserInfoSnapshot.from(user)); programStageInstance.setLastUpdatedByUserInfo(UserInfoSnapshot.from(user)); - programStageInstance.setAssignedUser(user); EventDataValue eventDataValue = new EventDataValue(); eventDataValue.setValue("6"); DataElement dataElement = createDataElement('A'); @@ -249,7 +248,6 @@ void getEventByIdContainsCreatedByAndUpdateByAndAssignedUserInDataValues() { assertEquals(orgUnit.getUid(), event.getString("orgUnit").string()); assertEquals(user.getUsername(), event.getString("createdBy.username").string()); assertEquals(user.getUsername(), event.getString("updatedBy.username").string()); - assertEquals(user.getDisplayName(), event.getString("assignedUser.displayName").string()); assertFalse(event.getArray("dataValues").isEmpty()); assertEquals( user.getUsername(),