[JN-1634] Fix flaky testImportEnrolleeMultipleKitRequests assertion (#…

…1510)
broadinstitute · Feb 28, 2025 · a96073a · a96073a
1 parent 6f5d29c
commit a96073a
Showing 1 changed file with 5 additions and 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
@@ -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<KitRequestDto> expectedKitRequests) {
-
         List<KitRequestDto> 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);