Fix test failures due to incorrect ordering assumption

Signed-off-by: nscuro <[email protected]>
DependencyTrack · Feb 14, 2024 · 0c77e6f · 0c77e6f
1 parent 76528db
commit 0c77e6f
Show file tree

Hide file tree

Showing 2 changed files with 144 additions and 110 deletions.
diff --git a/src/test/java/org/dependencytrack/resources/v1/BomResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/BomResourceTest.java
@@ -23,6 +23,7 @@
 import alpine.server.filters.AuthenticationFilter;
 import junitparams.JUnitParamsRunner;
 import junitparams.Parameters;
+import net.javacrumbs.jsonunit.core.Option;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpStatus;
@@ -185,6 +186,7 @@ public void exportProjectAsCycloneDxInventoryTest() {
 
         final String jsonResponse = getPlainTextBody(response);
         assertThatJson(jsonResponse)
+                .withOptions(Option.IGNORING_ARRAY_ORDER)
                 .withMatcher("projectUuid", equalTo(project.getUuid().toString()))
                 .withMatcher("componentWithoutVulnUuid", equalTo(componentWithoutVuln.getUuid().toString()))
                 .withMatcher("componentWithVulnUuid", equalTo(componentWithVuln.getUuid().toString()))
@@ -333,6 +335,7 @@ public void exportProjectAsCycloneDxInventoryWithVulnerabilitiesTest() {
 
         final String jsonResponse = getPlainTextBody(response);
         assertThatJson(jsonResponse)
+                .withOptions(Option.IGNORING_ARRAY_ORDER)
                 .withMatcher("vulnUuid", equalTo(vulnerability.getUuid().toString()))
                 .withMatcher("projectUuid", equalTo(project.getUuid().toString()))
                 .withMatcher("componentWithoutVulnUuid", equalTo(componentWithoutVuln.getUuid().toString()))
@@ -526,6 +529,7 @@ public void exportProjectAsCycloneDxVdrTest() {
 
         final String jsonResponse = getPlainTextBody(response);
         assertThatJson(jsonResponse)
+                .withOptions(Option.IGNORING_ARRAY_ORDER)
                 .withMatcher("vulnUuid", equalTo(vulnerability.getUuid().toString()))
                 .withMatcher("projectUuid", equalTo(project.getUuid().toString()))
                 .withMatcher("componentWithoutVulnUuid", equalTo(componentWithoutVuln.getUuid().toString()))