From b09ec601e905e1580eae93e35f8e0e5ce4d4abef Mon Sep 17 00:00:00 2001
From: Lukas Hanusovsky <61745358+lhanusov@users.noreply.github.com>
Date: Wed, 20 Nov 2024 12:52:04 +0100
Subject: [PATCH] [Test framework MVP] ApiUtil refactor, unused annotation and
 imports. (#35135)

Signed-off-by: Lukas Hanusovsky <lhanusov@redhat.com>
---
 .../test/admin/ImpersonationDisabledTest.java |  2 --
 .../userprofile/UserProfileAdminTest.java     |  2 --
 .../keycloak/test/utils/admin/ApiUtil.java    | 23 +++++--------------
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/tests/base/src/test/java/org/keycloak/test/admin/ImpersonationDisabledTest.java b/tests/base/src/test/java/org/keycloak/test/admin/ImpersonationDisabledTest.java
index 6bfb144d29..196d294744 100644
--- a/tests/base/src/test/java/org/keycloak/test/admin/ImpersonationDisabledTest.java
+++ b/tests/base/src/test/java/org/keycloak/test/admin/ImpersonationDisabledTest.java
@@ -21,8 +21,6 @@ import jakarta.ws.rs.ServerErrorException;
 import jakarta.ws.rs.core.Response;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.keycloak.admin.client.Keycloak;
-import org.keycloak.test.framework.annotations.InjectAdminClient;
 import org.keycloak.test.framework.annotations.InjectRealm;
 import org.keycloak.test.framework.annotations.InjectUser;
 import org.keycloak.test.framework.annotations.KeycloakIntegrationTest;
diff --git a/tests/base/src/test/java/org/keycloak/test/admin/userprofile/UserProfileAdminTest.java b/tests/base/src/test/java/org/keycloak/test/admin/userprofile/UserProfileAdminTest.java
index f340ff08aa..488a938e53 100644
--- a/tests/base/src/test/java/org/keycloak/test/admin/userprofile/UserProfileAdminTest.java
+++ b/tests/base/src/test/java/org/keycloak/test/admin/userprofile/UserProfileAdminTest.java
@@ -1,7 +1,6 @@
 package org.keycloak.test.admin.userprofile;
 
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.keycloak.admin.client.resource.UserProfileResource;
 import org.keycloak.models.UserModel;
@@ -27,7 +26,6 @@ public class UserProfileAdminTest {
     private ManagedRealm realm;
 
     @Test
-    @Order(1)
     public void testDefaultConfigIfNoneSet() {
         JsonTestUtils.assertJsonEquals(UPConfigUtils.readSystemDefaultConfig(), realm.admin().users().userProfile().getConfiguration());
     }
diff --git a/tests/utils/src/main/java/org/keycloak/test/utils/admin/ApiUtil.java b/tests/utils/src/main/java/org/keycloak/test/utils/admin/ApiUtil.java
index 7a1487c19d..a1ff935c1c 100644
--- a/tests/utils/src/main/java/org/keycloak/test/utils/admin/ApiUtil.java
+++ b/tests/utils/src/main/java/org/keycloak/test/utils/admin/ApiUtil.java
@@ -17,6 +17,7 @@
 package org.keycloak.test.utils.admin;
 
 import org.jboss.logging.Logger;
+import org.junit.jupiter.api.Assertions;
 import org.keycloak.admin.client.resource.AuthorizationResource;
 import org.keycloak.admin.client.resource.ClientResource;
 import org.keycloak.admin.client.resource.ClientScopeResource;
@@ -34,11 +35,7 @@ import org.keycloak.representations.idm.RequiredActionProviderRepresentation;
 import org.keycloak.representations.idm.RoleRepresentation;
 import org.keycloak.representations.idm.UserRepresentation;
 
-import jakarta.ws.rs.WebApplicationException;
 import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.Response.StatusType;
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -54,19 +51,11 @@ public class ApiUtil {
     private static final Logger log = Logger.getLogger(ApiUtil.class);
 
     public static String getCreatedId(Response response) {
-        URI location = response.getLocation();
-        if (!response.getStatusInfo().equals(Status.CREATED)) {
-            StatusType statusInfo = response.getStatusInfo();
-            response.bufferEntity();
-            String body = response.readEntity(String.class);
-            throw new WebApplicationException("Create method returned status "
-                    + statusInfo.getReasonPhrase() + " (Code: " + statusInfo.getStatusCode() + "); expected status: Created (201). Response body: " + body, response);
-        }
-        if (location == null) {
-            return null;
-        }
-        String path = location.getPath();
-        return path.substring(path.lastIndexOf('/') + 1);
+        Assertions.assertEquals(201, response.getStatus());
+        String path = response.getLocation().getPath();
+        String createdId = path.substring(path.lastIndexOf('/') + 1);
+        response.close();
+        return createdId;
     }
 
     public static ClientResource findClientResourceById(RealmResource realm, String id) {