From a96073a848328dede8106bf81933826596f7470c Mon Sep 17 00:00:00 2001 From: Matt Bemis Date: Fri, 28 Feb 2025 10:46:37 -0500 Subject: [PATCH] [JN-1634] Fix flaky testImportEnrolleeMultipleKitRequests assertion (#1510) --- .../core/service/export/EnrolleeImportServiceTests.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/test/java/bio/terra/pearl/core/service/export/EnrolleeImportServiceTests.java b/core/src/test/java/bio/terra/pearl/core/service/export/EnrolleeImportServiceTests.java index f25824ae04..6fe8b3deef 100644 --- a/core/src/test/java/bio/terra/pearl/core/service/export/EnrolleeImportServiceTests.java +++ b/core/src/test/java/bio/terra/pearl/core/service/export/EnrolleeImportServiceTests.java @@ -46,6 +46,7 @@ import java.util.*; import java.util.stream.Collectors; +import static java.util.Comparator.comparing; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; import static org.junit.jupiter.api.Assertions.*; @@ -1025,9 +1026,12 @@ private void verifySurveyQuestionAnswer(ImportItem importItem, String surveyStab } private void verifyKitRequests(ImportItem importItem, List expectedKitRequests) { - List kitRequestDtos = kitRequestService.findByEnrollee(enrolleeService.find(importItem.getCreatedEnrolleeId()).get()); assertThat(kitRequestDtos.size(), equalTo(expectedKitRequests.size())); + + kitRequestDtos.sort(comparing(KitRequestDto::getTrackingNumber)); + expectedKitRequests.sort(comparing(KitRequestDto::getTrackingNumber)); + for (int i = 0; i < expectedKitRequests.size(); i++) { KitRequestDto kitRequestDto = kitRequestDtos.get(i); KitRequestDto expectedKit = expectedKitRequests.get(i);