8000 Introduce ManagedRealm in old testsuite by stianst · Pull Request #48305 · keycloak/keycloak · GitHub
[go: up one dir, main page]
Skip to content

Introduce ManagedRealm in old testsuite #48305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stianst merged 1 commit into from
Apr 21, 2026
Merged

Introduce ManagedRealm in old testsuite #48305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8000
1 change: 1 addition & 0 deletions ...uillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/TestClassProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public class TestClassProvider {

public static final String[] PERMITTED_PACKAGES = new String[] {
"/org/keycloak/testsuite",
"/org/keycloak/testframework",
"/org/junit",
"/org/opentest4j",
"/org/hamcrest",
Expand Down
24 changes: 24 additions & 0 deletions ...on-arquillian/tests/base/src/test/java/org/keycloak/testframework/realm/ManagedRealm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package org.keycloak.testframework.realm;

import org.keycloak.admin.client.resource.RealmResource;
import org.keycloak.testsuite.AbstractKeycloakTest;

public class ManagedRealm {

private final AbstractKeycloakTest test;
private final String realmName;

public ManagedRealm(AbstractKeycloakTest test, String realmName) {
this.test = test;
this.realmName = realmName;
}

public String getName() {
return realmName;
}

public RealmResource admin() {
return test.getAdminClient().realm(realmName);
}

}
2 changes: 1 addition & 1 deletion ...ts/base/src/test/java/org/keycloak/testsuite/AbstractChangeImportedUserPasswordsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void configureTestRealm(RealmRepresentation testRealm) {
}

protected String changePassword(String username) {
UserResource userRes = AdminApiUtil.findUserByUsernameId(testRealm(), username);
UserResource userRes = AdminApiUtil.findUserByUsernameId(managedRealm.admin(), username);
CredentialRepresentation credential = new CredentialRepresentation();
credential.setType(PasswordCredentialModel.TYPE);
credential.setTemporary(Boolean.FALSE);
Expand Down
10 changes: 4 additions & 6 deletions ...illian/tests/base/src/test/java/org/keycloak/testsuite/AbstractTestRealmKeycloakTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import java.lang.reflect.Field;
import java.util.List;

import org.keycloak.admin.client.resource.RealmResource;
import org.keycloak.common.util.reflections.Reflections;
import org.keycloak.events.Details;
import org.keycloak.models.KeycloakSession;
Expand All @@ -29,6 +28,7 @@
import org.keycloak.representations.idm.EventRepresentation;
import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.representations.idm.UserRepresentation;
import org.keycloak.testframework.realm.ManagedRealm;
import org.keycloak.testsuite.util.oauth.AccessTokenResponse;

import org.junit.Before;
Expand All @@ -47,18 +47,16 @@ public abstract class AbstractTestRealmKeycloakTest extends AbstractKeycloakTest
public static final String TEST_REALM_NAME = "test";
public static final String clientId = "test-app";

protected RealmResource testRealm() {
return adminClient.realm(TEST_REALM_NAME);
}
protected ManagedRealm managedRealm = new ManagedRealm(this, TEST_REALM_NAME);

protected UserRepresentation findUser(String userNameOrEmail) {
List<UserRepresentation> repList = testRealm().users().search(userNameOrEmail, -1, -1);
List<UserRepresentation> repList = managedRealm.admin().users().search(userNameOrEmail, -1, -1);
if (repList.size() != 1) throw new IllegalStateException("User search expected one result. Found " + repList.size() + " users.");
return repList.get(0);
}

protected void updateUser(UserRepresentation user) {
testRealm().users().get(user.getId()).update(user);
managedRealm.admin().users().get(user.getId()).update(user);
}

protected ClientRepresentation findTestApp(RealmRepresentation testRealm) {
Expand Down
16 changes: 8 additions & 8 deletions ...rc/test/java/org/keycloak/testsuite/account/AccountRestServiceReadOnlyAttributesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public class AccountRestServiceReadOnlyAttributesTest extends AbstractRestServic

@Before
public void configureUserProfile() {
UserProfileResource userProfileRes = testRealm().users().userProfile();
UserProfileResource userProfileRes = managedRealm.admin().users().userProfile();
UPConfig cfg = userProfileRes.getConfiguration();
//cfg.setUnmanagedAttributePolicy(UPConfig.UnmanagedAttributePolicy.ENABLED);
cfg.addOrReplaceAttribute(createUpAttribute("someOtherAttr"));
Expand Down Expand Up @@ -149,25 +149,25 @@ public void testUpdateProfileCannotUpdateReadOnlyAttributes() throws IOException

@Test
public void testUpdateProfileCannotUpdateReadOnlyAttributesUnmanagedEnabled() throws IOException {
UPConfig configuration = testRealm().users().userProfile().getConfiguration();
UPConfig configuration = managedRealm.admin().users().userProfile().getConfiguration();
UnmanagedAttributePolicy unmanagedAttributePolicy = configuration.getUnmanagedAttributePolicy();
configuration.setUnmanagedAttributePolicy(UnmanagedAttributePolicy.ENABLED);
getCleanup().addCleanup(() -> {
configuration.setUnmanagedAttributePolicy(unmanagedAttributePolicy);
testRealm().users().userProfile().update(configuration);
managedRealm.admin().users().userProfile().update(configuration);
});
testRealm().users().userProfile().update(configuration);
managedRealm.admin().users().userProfile().update(configuration);
UserRepresentation user = SimpleHttpDefault.doGet(getAccountUrl(null), httpClient).auth(tokenUtil.getToken()).asJson(UserRepresentation.class);
UserResource adminUserResource = AdminApiUtil.findUserByUsernameId(testRealm(), user.getUsername());
UserResource adminUserResource = AdminApiUtil.findUserByUsernameId(managedRealm.admin(), user.getUsername());
org.keycloak.representations.idm.UserRepresentation adminUserRep = adminUserResource.toRepresentation();
adminUserRep.singleAttribute("deniedFoo", "foo");
adminUserResource.update(adminUserRep);
adminUserResource = AdminApiUtil.findUserByUsernameId(testRealm(), user.getUsername());
adminUserResource = AdminApiUtil.findUserByUsernameId(managedRealm.admin(), user.getUsername());
adminUserRep = adminUserResource.toRepresentation();
assertEquals("foo", adminUserRep.getAttributes().get("deniedFoo").get(0));
assertNull(user.getAttributes());
updateAndGet(user);
adminUserResource = AdminApiUtil.findUserByUsernameId(testRealm(), user.getUsername());
adminUserResource = AdminApiUtil.findUserByUsernameId(managedRealm.admin(), user.getUsername());
adminUserRep = adminUserResource.toRepresentation();
assertEquals("foo", adminUserRep.getAttributes().get("deniedFoo").get(0));
}
Expand All @@ -189,7 +189,7 @@ private void testAccountUpdateAttributeExpectFailure(String attrName, boolean de
UserResource adminUserResource = null;
org.keycloak.representations.idm.UserRepresentation adminUserRep = null;
try {
adminUserResource = AdminApiUtil.findUserByUsernameId(testRealm(), user.getUsername());
adminUserResource = AdminApiUtil.findUserByUsernameId(managedRealm.admin(), user.getUsername());
adminUserRep = adminUserResource.toRepresentation();
adminUserRep.singleAttribute(attrName, "foo");
adminUserResource.update(adminUserRep);
Expand Down
Loading
Loading
0