diff --git a/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/EventExporterTest.java b/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/EventExporterTest.java index 16de491b955c..4b3a54905ee3 100644 --- a/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/EventExporterTest.java +++ b/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/EventExporterTest.java @@ -44,6 +44,7 @@ import java.io.IOException; import java.time.ZoneId; import java.time.temporal.ChronoUnit; +import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.Set; @@ -622,8 +623,9 @@ void shouldReturnEventsGivenCategoryOptionCombo() { "category options and combo of event " + e.getUid(), () -> assertEquals("cr89ebDZrac", e.getAttributeOptionCombo()), () -> - assertEquals( - "xwZ2u3WyQR0;M58XdOfhiJ7", e.getAttributeCategoryOptions()), + assertContainsOnly( + Set.of("xwZ2u3WyQR0", "M58XdOfhiJ7"), + Arrays.asList(e.getAttributeCategoryOptions().split(";"))), () -> assertEquals( 2,