From 506b0dc02a9df0c985d451567ff72bc88d06144b Mon Sep 17 00:00:00 2001 From: RBickert Date: Tue, 29 Aug 2023 10:49:09 +0200 Subject: [PATCH] Make "getAllFindings" test consistent by ordering result Signed-off-by: RBickert --- .../resources/v1/FindingResourceTest.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/test/java/org/dependencytrack/resources/v1/FindingResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/FindingResourceTest.java index 63796e931..de3350915 100644 --- a/src/test/java/org/dependencytrack/resources/v1/FindingResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/FindingResourceTest.java @@ -327,9 +327,9 @@ public void getFindingsByProjectWithComponentLatestVersionWithoutRepositoryMetaC @Test public void getAllFindings() { - Project p1 = qm.createProject("Acme Example", null, "1.0", null, null, null, true, false); - Project p1_child = qm.createProject("Acme Example", null, "1.0", null, p1, null, true, false); - Project p2 = qm.createProject("Acme Example", null, "1.0", null, null, null, true, false); + Project p1 = qm.createProject("Acme Example 1", null, "1.0", null, null, null, true, false); + Project p1_child = qm.createProject("Acme Example 2", null, "1.0", null, p1, null, true, false); + Project p2 = qm.createProject("Acme Example 3", null, "1.0", null, null, null, true, false); Component c1 = createComponent(p1, "Component A", "1.0"); Component c2 = createComponent(p1, "Component B", "1.0"); Component c3 = createComponent(p1_child, "Component C", "1.0"); @@ -350,7 +350,10 @@ public void getAllFindings() { qm.addVulnerability(v2, c3, AnalyzerIdentity.NONE); qm.addVulnerability(v3, c2, AnalyzerIdentity.NONE); qm.addVulnerability(v4, c5, AnalyzerIdentity.NONE); - Response response = target(V1_FINDING).request() + Response response = target(V1_FINDING) + .queryParam("sortName", "component.projectName") + .queryParam("sortOrder", "asc") + .request() .header(X_API_KEY, apiKey) .get(Response.class); Assert.assertEquals(200, response.getStatus(), 0); @@ -367,13 +370,13 @@ public void getAllFindings() { Assert.assertEquals(p1.getVersion() ,json.getJsonObject(1).getJsonObject("component").getString("projectVersion")); Assert.assertEquals(p1.getUuid().toString(), json.getJsonObject(1).getJsonObject("component").getString("project")); Assert.assertEquals(date.getTime() ,json.getJsonObject(2).getJsonObject("vulnerability").getJsonNumber("published").longValue()); - Assert.assertEquals(p1_child.getName() ,json.getJsonObject(2).getJsonObject("component").getString("projectName")); - Assert.assertEquals(p1_child.getVersion() ,json.getJsonObject(2).getJsonObject("component").getString("projectVersion")); - Assert.assertEquals(p1_child.getUuid().toString(), json.getJsonObject(2).getJsonObject("component").getString("project")); + Assert.assertEquals(p1.getName() ,json.getJsonObject(2).getJsonObject("component").getString("projectName")); + Assert.assertEquals(p1.getVersion() ,json.getJsonObject(2).getJsonObject("component").getString("projectVersion")); + Assert.assertEquals(p1.getUuid().toString(), json.getJsonObject(2).getJsonObject("component").getString("project")); Assert.assertEquals(date.getTime() ,json.getJsonObject(3).getJsonObject("vulnerability").getJsonNumber("published").longValue()); - Assert.assertEquals(p1.getName() ,json.getJsonObject(3).getJsonObject("component").getString("projectName")); - Assert.assertEquals(p1.getVersion() ,json.getJsonObject(3).getJsonObject("component").getString("projectVersion")); - Assert.assertEquals(p1.getUuid().toString(), json.getJsonObject(3).getJsonObject("component").getString("project")); + Assert.assertEquals(p1_child.getName() ,json.getJsonObject(3).getJsonObject("component").getString("projectName")); + Assert.assertEquals(p1_child.getVersion() ,json.getJsonObject(3).getJsonObject("component").getString("projectVersion")); + Assert.assertEquals(p1_child.getUuid().toString(), json.getJsonObject(3).getJsonObject("component").getString("project")); Assert.assertEquals(date.getTime() ,json.getJsonObject(4).getJsonObject("vulnerability").getJsonNumber("published").longValue()); Assert.assertEquals(p2.getName() ,json.getJsonObject(4).getJsonObject("component").getString("projectName")); Assert.assertEquals(p2.getVersion() ,json.getJsonObject(4).getJsonObject("component").getString("projectVersion"));