[Test framework MVP] ApiUtil refactor, unused annotation and imports. (#35135)

Signed-off-by: Lukas Hanusovsky <lhanusov@redhat.com>
This commit is contained in:
Lukas Hanusovsky 2024-11-20 12:52:04 +01:00 • committed by GitHub
parent aaade6caab
commit b09ec601e9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 21 deletions

View file

@ -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;

View file

@ -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());
}

View file

@ -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) {