From d09159a676e55f32cfe5ee8f0cc06fb05abc1c63 Mon Sep 17 00:00:00 2001
From: nscuro <nscuro@protonmail.com>
Date: Wed, 20 Mar 2024 14:00:33 +0100
Subject: [PATCH] Fix tests due to DataNucleus behavior change

This was also done for DT v4.11.0: https://github.com/DependencyTrack/dependency-track/pull/3515

Signed-off-by: nscuro <nscuro@protonmail.com>
---
 .../v1/NotificationRuleResourceTest.java      |  3 ++-
 .../resources/v1/ProjectResourceTest.java     | 22 ++++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/dependencytrack/resources/v1/NotificationRuleResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/NotificationRuleResourceTest.java
index 700d66a13..14b1b4279 100644
--- a/src/test/java/org/dependencytrack/resources/v1/NotificationRuleResourceTest.java
+++ b/src/test/java/org/dependencytrack/resources/v1/NotificationRuleResourceTest.java
@@ -432,7 +432,8 @@ public void addTeamToRuleWithCustomEmailPublisherTest() {
                           "teams": [
                             {
                               "uuid": "${json-unit.matches:teamUuid}",
-                              "name": "Team Example"
+                              "name": "Team Example",
+                              "permissions": []
                             }
                           ],
                           "notifyOn": [],
diff --git a/src/test/java/org/dependencytrack/resources/v1/ProjectResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/ProjectResourceTest.java
index 6e1ecf0e3..2ac4e03c6 100644
--- a/src/test/java/org/dependencytrack/resources/v1/ProjectResourceTest.java
+++ b/src/test/java/org/dependencytrack/resources/v1/ProjectResourceTest.java
@@ -49,6 +49,7 @@
 import org.glassfish.jersey.servlet.ServletContainer;
 import org.glassfish.jersey.test.DeploymentContext;
 import org.glassfish.jersey.test.ServletDeploymentContext;
+import org.hamcrest.CoreMatchers;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
@@ -639,9 +640,24 @@ public void patchProjectParentTest() {
 
         assertThat(response.getStatus()).isEqualTo(Response.Status.OK.getStatusCode());
 
-        final JsonObject responseJson = parseJsonObject(response);
-        assertThat(responseJson.getString("uuid")).isEqualTo(project.getUuid().toString());
-        assertThat(responseJson.getJsonObject("parent")).isNull(); // Parents are currently not returned
+        assertThatJson(getPlainTextBody(response))
+                .withMatcher("projectUuid", CoreMatchers.equalTo(project.getUuid().toString()))
+                .withMatcher("parentProjectUuid", CoreMatchers.equalTo(newParent.getUuid().toString()))
+                .isEqualTo("""
+                        {
+                          "name": "DEF",
+                          "version": "2.0",
+                          "uuid": "${json-unit.matches:projectUuid}",
+                          "parent": {
+                            "name": "GHI",
+                            "version": "3.0",
+                            "uuid": "${json-unit.matches:parentProjectUuid}"
+                          },
+                          "properties": [],
+                          "tags": [],
+                          "active": true
+                        }
+                        """);
 
         // Ensure the parent was updated.
         qm.getPersistenceManager().refresh(project);