libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

KEYCLOAK-2850 migrate RealmTest from old testsuite to new

Browse source
This commit is contained in:
mposolda 2016-04-19 16:25:40 +02:00
parent 656161ff61
commit 060527ac67
11 changed files with 111 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/Assert.java
View file

@ -31,7 +31,7 @@ import static org.junit.Assert.assertArrayEquals;
/** /**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a> * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
*/ */
public class Assert { public class Assert extends org.junit.Assert {
public static <T> void assertNames(List<T> actual, String... expected) { public static <T> void assertNames(List<T> actual, String... expected) {
Arrays.sort(expected); Arrays.sort(expected);

211
testsuite/integration/src/test/java/org/keycloak/testsuite/admin/RealmTest.java → testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/RealmTest.java
View file

@ -18,25 +18,21 @@
package org.keycloak.testsuite.admin; package org.keycloak.testsuite.admin;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.Keycloak;
import org.keycloak.admin.client.resource.ServerInfoResource; import org.keycloak.admin.client.resource.ServerInfoResource;
import org.keycloak.common.util.StreamUtil;
import org.keycloak.models.Constants; import org.keycloak.models.Constants;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
import org.keycloak.models.utils.KeycloakModelUtils;
import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.ClientRepresentation;
import org.keycloak.representations.idm.GroupRepresentation;
import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.RoleRepresentation;
import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.Assert;
import org.keycloak.testsuite.KeycloakServer; import org.keycloak.testsuite.arquillian.AuthServerTestEnricher;
import org.keycloak.testsuite.auth.page.AuthRealm;
import org.keycloak.util.JsonSerialization; import org.keycloak.util.JsonSerialization;
import javax.ws.rs.BadRequestException; import javax.ws.rs.BadRequestException;
import javax.ws.rs.NotFoundException; import javax.ws.rs.NotFoundException;
import javax.ws.rs.core.Response;
import java.io.IOException; import java.io.IOException;
import java.util.Collections; import java.util.Collections;
import java.util.LinkedList; import java.util.LinkedList;
@ -53,7 +49,7 @@ import static org.junit.Assert.fail;
/** /**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a> * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
*/ */
public class RealmTest extends AbstractClientTest { public class RealmTest extends AbstractAdminTest {
public static final String PRIVATE_KEY = "MIICXAIBAAKBgQCrVrCuTtArbgaZzL1hvh0xtL5mc7o0NqPVnYXkLvgcwiC3BjLGw1tGEGoJaXDuSaRllobm53JBhjx33UNv+5z/UMG4kytBWxheNVKnL6GgqlNabMaFfPLPCF8kAgKnsi79NMo+n6KnSY8YeUmec/p2vjO2NjsSAVcWEQMVhJ31LwIDAQABAoGAfmO8gVhyBxdqlxmIuglbz8bcjQbhXJLR2EoS8ngTXmN1bo2L90M0mUKSdc7qF10LgETBzqL8jYlQIbt+e6TH8fcEpKCjUlyq0Mf/vVbfZSNaVycY13nTzo27iPyWQHK5NLuJzn1xvxxrUeXI6A2WFpGEBLbHjwpx5WQG9A+2scECQQDvdn9NE75HPTVPxBqsEd2z10TKkl9CZxu10Qby3iQQmWLEJ9LNmy3acvKrE3gMiYNWb6xHPKiIqOR1as7L24aTAkEAtyvQOlCvr5kAjVqrEKXalj0Tzewjweuxc0pskvArTI2Oo070h65GpoIKLc9jf+UA69cRtquwP93aZKtW06U8dQJAF2Y44ks/mK5+eyDqik3koCI08qaC8HYq2wVl7G2QkJ6sbAaILtcvD92ToOvyGyeE0flvmDZxMYlvaZnaQ0lcSQJBAKZU6umJi3/xeEbkJqMfeLclD27XGEFoPeNrmdx0q10Azp4NfJAY+Z8KRyQCR2BEG+oNitBOZ+YXF9KCpH3cdmECQHEigJhYg+ykOvr1aiZUMFT72HU0jnmQe2FVekuG+LJUt2Tm7GtMjTFoGpf0JwrVuZN39fOYAlo+nTixgeW7X8Y="; public static final String PRIVATE_KEY = "MIICXAIBAAKBgQCrVrCuTtArbgaZzL1hvh0xtL5mc7o0NqPVnYXkLvgcwiC3BjLGw1tGEGoJaXDuSaRllobm53JBhjx33UNv+5z/UMG4kytBWxheNVKnL6GgqlNabMaFfPLPCF8kAgKnsi79NMo+n6KnSY8YeUmec/p2vjO2NjsSAVcWEQMVhJ31LwIDAQABAoGAfmO8gVhyBxdqlxmIuglbz8bcjQbhXJLR2EoS8ngTXmN1bo2L90M0mUKSdc7qF10LgETBzqL8jYlQIbt+e6TH8fcEpKCjUlyq0Mf/vVbfZSNaVycY13nTzo27iPyWQHK5NLuJzn1xvxxrUeXI6A2WFpGEBLbHjwpx5WQG9A+2scECQQDvdn9NE75HPTVPxBqsEd2z10TKkl9CZxu10Qby3iQQmWLEJ9LNmy3acvKrE3gMiYNWb6xHPKiIqOR1as7L24aTAkEAtyvQOlCvr5kAjVqrEKXalj0Tzewjweuxc0pskvArTI2Oo070h65GpoIKLc9jf+UA69cRtquwP93aZKtW06U8dQJAF2Y44ks/mK5+eyDqik3koCI08qaC8HYq2wVl7G2QkJ6sbAaILtcvD92ToOvyGyeE0flvmDZxMYlvaZnaQ0lcSQJBAKZU6umJi3/xeEbkJqMfeLclD27XGEFoPeNrmdx0q10Azp4NfJAY+Z8KRyQCR2BEG+oNitBOZ+YXF9KCpH3cdmECQHEigJhYg+ykOvr1aiZUMFT72HU0jnmQe2FVekuG+LJUt2Tm7GtMjTFoGpf0JwrVuZN39fOYAlo+nTixgeW7X8Y=";
public static final String PUBLIC_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrVrCuTtArbgaZzL1hvh0xtL5mc7o0NqPVnYXkLvgcwiC3BjLGw1tGEGoJaXDuSaRllobm53JBhjx33UNv+5z/UMG4kytBWxheNVKnL6GgqlNabMaFfPLPCF8kAgKnsi79NMo+n6KnSY8YeUmec/p2vjO2NjsSAVcWEQMVhJ31LwIDAQAB"; public static final String PUBLIC_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrVrCuTtArbgaZzL1hvh0xtL5mc7o0NqPVnYXkLvgcwiC3BjLGw1tGEGoJaXDuSaRllobm53JBhjx33UNv+5z/UMG4kytBWxheNVKnL6GgqlNabMaFfPLPCF8kAgKnsi79NMo+n6KnSY8YeUmec/p2vjO2NjsSAVcWEQMVhJ31LwIDAQAB";
@ -61,8 +57,8 @@ public class RealmTest extends AbstractClientTest {
@Test @Test
public void getRealms() { public void getRealms() {
List<RealmRepresentation> realms = keycloak.realms().findAll(); List<RealmRepresentation> realms = adminClient.realms().findAll();
assertNames(realms, "master", "test", REALM_NAME); Assert.assertNames(realms, "master", AuthRealm.TEST, REALM_NAME);
for (RealmRepresentation rep : realms) { for (RealmRepresentation rep : realms) {
assertNull(rep.getPrivateKey()); assertNull(rep.getPrivateKey());
@ -79,78 +75,64 @@ public class RealmTest extends AbstractClientTest {
rep.setRealm("old"); rep.setRealm("old");
try { try {
keycloak.realms().create(rep); adminClient.realms().create(rep);
rep.setRealm("new"); rep.setRealm("new");
keycloak.realm("old").update(rep); adminClient.realm("old").update(rep);
// Check client in master realm renamed // Check client in master realm renamed
assertEquals(0, keycloak.realm("master").clients().findByClientId("old-realm").size()); Assert.assertEquals(0, adminClient.realm("master").clients().findByClientId("old-realm").size());
assertEquals(1, keycloak.realm("master").clients().findByClientId("new-realm").size()); Assert.assertEquals(1, adminClient.realm("master").clients().findByClientId("new-realm").size());
ClientRepresentation adminClient = keycloak.realm("new").clients().findByClientId(Constants.ADMIN_CONSOLE_CLIENT_ID).get(0); ClientRepresentation adminConsoleClient = adminClient.realm("new").clients().findByClientId(Constants.ADMIN_CONSOLE_CLIENT_ID).get(0);
assertEquals("/auth/admin/new/console/index.html", adminClient.getBaseUrl()); assertEquals("/auth/admin/new/console/index.html", adminConsoleClient.getBaseUrl());
assertEquals("/auth/admin/new/console/*", adminClient.getRedirectUris().get(0)); assertEquals("/auth/admin/new/console/*", adminConsoleClient.getRedirectUris().get(0));
ClientRepresentation accountClient = keycloak.realm("new").clients().findByClientId(Constants.ACCOUNT_MANAGEMENT_CLIENT_ID).get(0); ClientRepresentation accountClient = adminClient.realm("new").clients().findByClientId(Constants.ACCOUNT_MANAGEMENT_CLIENT_ID).get(0);
assertEquals("/auth/realms/new/account", accountClient.getBaseUrl()); assertEquals("/auth/realms/new/account", accountClient.getBaseUrl());
assertEquals("/auth/realms/new/account/*", accountClient.getRedirectUris().get(0)); assertEquals("/auth/realms/new/account/*", accountClient.getRedirectUris().get(0));
} finally { } finally {
keycloak.realms().realm(rep.getRealm()).remove(); adminClient.realms().realm(rep.getRealm()).remove();
} }
} }
@Test @Test
public void createRealmEmpty() { public void createRealmEmpty() {
try {
RealmRepresentation rep = new RealmRepresentation(); RealmRepresentation rep = new RealmRepresentation();
rep.setRealm("new-realm"); rep.setRealm("new-realm");
keycloak.realms().create(rep); adminClient.realms().create(rep);
assertNames(keycloak.realms().findAll(), "master", "test", REALM_NAME, "new-realm"); Assert.assertNames(adminClient.realms().findAll(), "master", AuthRealm.TEST, REALM_NAME, "new-realm");
} finally {
KeycloakSession session = keycloakRule.startSession(); adminClient.realms().realm("new-realm").remove();
RealmManager manager = new RealmManager(session);
RealmModel newRealm = manager.getRealmByName("new-realm"); Assert.assertNames(adminClient.realms().findAll(), "master", AuthRealm.TEST, REALM_NAME);
if (newRealm != null) {
manager.removeRealm(newRealm);
}
keycloakRule.stopSession(session, true);
}
} }
@Test @Test
public void createRealm() { public void createRealmFromJson() {
try { RealmRepresentation rep = loadJson(getClass().getResourceAsStream("/admin-test/testrealm.json"), RealmRepresentation.class);
RealmRepresentation rep = KeycloakServer.loadJson(getClass().getResourceAsStream("/admin-test/testrealm.json"), RealmRepresentation.class); adminClient.realms().create(rep);
keycloak.realms().create(rep);
RealmRepresentation created = keycloak.realms().realm("admin-test-1").toRepresentation(); RealmRepresentation created = adminClient.realms().realm("admin-test-1").toRepresentation();
assertRealm(rep, created); assertRealm(rep, created);
} finally {
KeycloakSession session = keycloakRule.startSession(); adminClient.realms().realm("admin-test-1").remove();
RealmManager manager = new RealmManager(session);
RealmModel newRealm = manager.getRealmByName("admin-test-1");
if (newRealm != null) {
manager.removeRealm(newRealm);
}
keycloakRule.stopSession(session, true);
}
} }
@Test @Test
public void removeRealm() { public void removeRealm() {
realm.remove(); realm.remove();
assertNames(keycloak.realms().findAll(), "master", "test"); Assert.assertNames(adminClient.realms().findAll(), "master", AuthRealm.TEST);
} }
@Test @Test
public void loginAfterRemoveRealm() { public void loginAfterRemoveRealm() {
realm.remove(); realm.remove();
ServerInfoResource serverInfoResource = Keycloak.getInstance("http://localhost:8081/auth", "master", "admin", "admin", Constants.ADMIN_CLI_CLIENT_ID).serverInfo(); ServerInfoResource serverInfoResource = Keycloak.getInstance(AuthServerTestEnricher.getAuthServerContextRoot() + "/auth", "master", "admin", "admin", Constants.ADMIN_CLI_CLIENT_ID).serverInfo();
serverInfoResource.getInfo(); serverInfoResource.getInfo();
} }
@ -160,26 +142,21 @@ public class RealmTest extends AbstractClientTest {
*/ */
@Test @Test
public void renameRealmTest() throws Exception { public void renameRealmTest() throws Exception {
Keycloak keycloak = Keycloak.getInstance("http://localhost:8081/auth", "master", "admin", "admin", Constants.ADMIN_CLI_CLIENT_ID);
RealmRepresentation realm1 = new RealmRepresentation(); RealmRepresentation realm1 = new RealmRepresentation();
realm1.setRealm("test-immutable"); realm1.setRealm("test-immutable");
keycloak.realms().create(realm1); adminClient.realms().create(realm1);
realm1 = keycloak.realms().realm("test-immutable").toRepresentation(); realm1 = adminClient.realms().realm("test-immutable").toRepresentation();
realm1.setRealm("test-immutable-old"); realm1.setRealm("test-immutable-old");
keycloak.realms().realm("test-immutable").update(realm1); adminClient.realms().realm("test-immutable").update(realm1);
realm1 = keycloak.realms().realm("test-immutable-old").toRepresentation(); realm1 = adminClient.realms().realm("test-immutable-old").toRepresentation();
RealmRepresentation realm2 = new RealmRepresentation(); RealmRepresentation realm2 = new RealmRepresentation();
realm2.setRealm("test-immutable"); realm2.setRealm("test-immutable");
keycloak.realms().create(realm2); adminClient.realms().create(realm2);
realm2 = keycloak.realms().realm("test-immutable").toRepresentation(); realm2 = adminClient.realms().realm("test-immutable").toRepresentation();
keycloak.realms().realm("test-immutable-old").remove();
keycloak.realms().realm("test-immutable").remove();
adminClient.realms().realm("test-immutable-old").remove();
adminClient.realms().realm("test-immutable").remove();
} }
@Test @Test
@ -245,7 +222,7 @@ public class RealmTest extends AbstractClientTest {
@Test @Test
public void getRealmRepresentation() { public void getRealmRepresentation() {
RealmRepresentation rep = realm.toRepresentation(); RealmRepresentation rep = realm.toRepresentation();
assertEquals(REALM_NAME, rep.getRealm()); Assert.assertEquals(REALM_NAME, rep.getRealm());
assertTrue(rep.isEnabled()); assertTrue(rep.isEnabled());
assertNull(rep.getPrivateKey()); assertNull(rep.getPrivateKey());
@ -255,7 +232,7 @@ public class RealmTest extends AbstractClientTest {
} }
@Test @Test
// KEYCLOAK-1110 // KEYCLOAK-1110 TODO: Functionality more related to roles. So maybe rather move to RolesTest once we have it
public void deleteDefaultRole() { public void deleteDefaultRole() {
RoleRepresentation role = new RoleRepresentation("test", "test", false); RoleRepresentation role = new RoleRepresentation("test", "test", false);
realm.roles().create(role); realm.roles().create(role);
@ -274,6 +251,7 @@ public class RealmTest extends AbstractClientTest {
realm.roles().get("testsadfsadf").toRepresentation(); realm.roles().get("testsadfsadf").toRepresentation();
fail("Expected NotFoundException"); fail("Expected NotFoundException");
} catch (NotFoundException e) { } catch (NotFoundException e) {
// Expected
} }
} }
@ -309,60 +287,60 @@ public class RealmTest extends AbstractClientTest {
public static void assertRealm(RealmRepresentation realm, RealmRepresentation storedRealm) { public static void assertRealm(RealmRepresentation realm, RealmRepresentation storedRealm) {
if (realm.getId() != null) { if (realm.getId() != null) {
Assert.assertEquals(realm.getId(), storedRealm.getId()); assertEquals(realm.getId(), storedRealm.getId());
} }
if (realm.getRealm() != null) { if (realm.getRealm() != null) {
Assert.assertEquals(realm.getRealm(), storedRealm.getRealm()); assertEquals(realm.getRealm(), storedRealm.getRealm());
} }
if (realm.isEnabled() != null) Assert.assertEquals(realm.isEnabled(), storedRealm.isEnabled()); if (realm.isEnabled() != null) assertEquals(realm.isEnabled(), storedRealm.isEnabled());
if (realm.isBruteForceProtected() != null) Assert.assertEquals(realm.isBruteForceProtected(), storedRealm.isBruteForceProtected()); if (realm.isBruteForceProtected() != null) assertEquals(realm.isBruteForceProtected(), storedRealm.isBruteForceProtected());
if (realm.getMaxFailureWaitSeconds() != null) Assert.assertEquals(realm.getMaxFailureWaitSeconds(), storedRealm.getMaxFailureWaitSeconds()); if (realm.getMaxFailureWaitSeconds() != null) assertEquals(realm.getMaxFailureWaitSeconds(), storedRealm.getMaxFailureWaitSeconds());
if (realm.getMinimumQuickLoginWaitSeconds() != null) Assert.assertEquals(realm.getMinimumQuickLoginWaitSeconds(), storedRealm.getMinimumQuickLoginWaitSeconds()); if (realm.getMinimumQuickLoginWaitSeconds() != null) assertEquals(realm.getMinimumQuickLoginWaitSeconds(), storedRealm.getMinimumQuickLoginWaitSeconds());
if (realm.getWaitIncrementSeconds() != null) Assert.assertEquals(realm.getWaitIncrementSeconds(), storedRealm.getWaitIncrementSeconds()); if (realm.getWaitIncrementSeconds() != null) assertEquals(realm.getWaitIncrementSeconds(), storedRealm.getWaitIncrementSeconds());
if (realm.getQuickLoginCheckMilliSeconds() != null) Assert.assertEquals(realm.getQuickLoginCheckMilliSeconds(), storedRealm.getQuickLoginCheckMilliSeconds()); if (realm.getQuickLoginCheckMilliSeconds() != null) assertEquals(realm.getQuickLoginCheckMilliSeconds(), storedRealm.getQuickLoginCheckMilliSeconds());
if (realm.getMaxDeltaTimeSeconds() != null) Assert.assertEquals(realm.getMaxDeltaTimeSeconds(), storedRealm.getMaxDeltaTimeSeconds()); if (realm.getMaxDeltaTimeSeconds() != null) assertEquals(realm.getMaxDeltaTimeSeconds(), storedRealm.getMaxDeltaTimeSeconds());
if (realm.getFailureFactor() != null) Assert.assertEquals(realm.getFailureFactor(), storedRealm.getFailureFactor()); if (realm.getFailureFactor() != null) assertEquals(realm.getFailureFactor(), storedRealm.getFailureFactor());
if (realm.isRegistrationAllowed() != null) Assert.assertEquals(realm.isRegistrationAllowed(), storedRealm.isRegistrationAllowed()); if (realm.isRegistrationAllowed() != null) assertEquals(realm.isRegistrationAllowed(), storedRealm.isRegistrationAllowed());
if (realm.isRegistrationEmailAsUsername() != null) Assert.assertEquals(realm.isRegistrationEmailAsUsername(), storedRealm.isRegistrationEmailAsUsername()); if (realm.isRegistrationEmailAsUsername() != null) assertEquals(realm.isRegistrationEmailAsUsername(), storedRealm.isRegistrationEmailAsUsername());
if (realm.isRememberMe() != null) Assert.assertEquals(realm.isRememberMe(), storedRealm.isRememberMe()); if (realm.isRememberMe() != null) assertEquals(realm.isRememberMe(), storedRealm.isRememberMe());
if (realm.isVerifyEmail() != null) Assert.assertEquals(realm.isVerifyEmail(), storedRealm.isVerifyEmail()); if (realm.isVerifyEmail() != null) assertEquals(realm.isVerifyEmail(), storedRealm.isVerifyEmail());
if (realm.isResetPasswordAllowed() != null) Assert.assertEquals(realm.isResetPasswordAllowed(), storedRealm.isResetPasswordAllowed()); if (realm.isResetPasswordAllowed() != null) assertEquals(realm.isResetPasswordAllowed(), storedRealm.isResetPasswordAllowed());
if (realm.isEditUsernameAllowed() != null) Assert.assertEquals(realm.isEditUsernameAllowed(), storedRealm.isEditUsernameAllowed()); if (realm.isEditUsernameAllowed() != null) assertEquals(realm.isEditUsernameAllowed(), storedRealm.isEditUsernameAllowed());
if (realm.getSslRequired() != null) Assert.assertEquals(realm.getSslRequired(), storedRealm.getSslRequired()); if (realm.getSslRequired() != null) assertEquals(realm.getSslRequired(), storedRealm.getSslRequired());
if (realm.getAccessCodeLifespan() != null) Assert.assertEquals(realm.getAccessCodeLifespan(), storedRealm.getAccessCodeLifespan()); if (realm.getAccessCodeLifespan() != null) assertEquals(realm.getAccessCodeLifespan(), storedRealm.getAccessCodeLifespan());
if (realm.getAccessCodeLifespanUserAction() != null) if (realm.getAccessCodeLifespanUserAction() != null)
Assert.assertEquals(realm.getAccessCodeLifespanUserAction(), storedRealm.getAccessCodeLifespanUserAction()); assertEquals(realm.getAccessCodeLifespanUserAction(), storedRealm.getAccessCodeLifespanUserAction());
if (realm.getNotBefore() != null) Assert.assertEquals(realm.getNotBefore(), storedRealm.getNotBefore()); if (realm.getNotBefore() != null) assertEquals(realm.getNotBefore(), storedRealm.getNotBefore());
if (realm.getAccessTokenLifespan() != null) Assert.assertEquals(realm.getAccessTokenLifespan(), storedRealm.getAccessTokenLifespan()); if (realm.getAccessTokenLifespan() != null) assertEquals(realm.getAccessTokenLifespan(), storedRealm.getAccessTokenLifespan());
if (realm.getAccessTokenLifespanForImplicitFlow() != null) Assert.assertEquals(realm.getAccessTokenLifespanForImplicitFlow(), storedRealm.getAccessTokenLifespanForImplicitFlow()); if (realm.getAccessTokenLifespanForImplicitFlow() != null) assertEquals(realm.getAccessTokenLifespanForImplicitFlow(), storedRealm.getAccessTokenLifespanForImplicitFlow());
if (realm.getSsoSessionIdleTimeout() != null) Assert.assertEquals(realm.getSsoSessionIdleTimeout(), storedRealm.getSsoSessionIdleTimeout()); if (realm.getSsoSessionIdleTimeout() != null) assertEquals(realm.getSsoSessionIdleTimeout(), storedRealm.getSsoSessionIdleTimeout());
if (realm.getSsoSessionMaxLifespan() != null) Assert.assertEquals(realm.getSsoSessionMaxLifespan(), storedRealm.getSsoSessionMaxLifespan()); if (realm.getSsoSessionMaxLifespan() != null) assertEquals(realm.getSsoSessionMaxLifespan(), storedRealm.getSsoSessionMaxLifespan());
if (realm.getRequiredCredentials() != null) { if (realm.getRequiredCredentials() != null) {
Assert.assertNotNull(storedRealm.getRequiredCredentials()); assertNotNull(storedRealm.getRequiredCredentials());
for (String cred : realm.getRequiredCredentials()) { for (String cred : realm.getRequiredCredentials()) {
Assert.assertTrue(storedRealm.getRequiredCredentials().contains(cred)); assertTrue(storedRealm.getRequiredCredentials().contains(cred));
} }
} }
if (realm.getLoginTheme() != null) Assert.assertEquals(realm.getLoginTheme(), storedRealm.getLoginTheme()); if (realm.getLoginTheme() != null) assertEquals(realm.getLoginTheme(), storedRealm.getLoginTheme());
if (realm.getAccountTheme() != null) Assert.assertEquals(realm.getAccountTheme(), storedRealm.getAccountTheme()); if (realm.getAccountTheme() != null) assertEquals(realm.getAccountTheme(), storedRealm.getAccountTheme());
if (realm.getAdminTheme() != null) Assert.assertEquals(realm.getAdminTheme(), storedRealm.getAdminTheme()); if (realm.getAdminTheme() != null) assertEquals(realm.getAdminTheme(), storedRealm.getAdminTheme());
if (realm.getEmailTheme() != null) Assert.assertEquals(realm.getEmailTheme(), storedRealm.getEmailTheme()); if (realm.getEmailTheme() != null) assertEquals(realm.getEmailTheme(), storedRealm.getEmailTheme());
if (realm.getPasswordPolicy() != null) Assert.assertEquals(realm.getPasswordPolicy(), storedRealm.getPasswordPolicy()); if (realm.getPasswordPolicy() != null) assertEquals(realm.getPasswordPolicy(), storedRealm.getPasswordPolicy());
if (realm.getDefaultRoles() != null) { if (realm.getDefaultRoles() != null) {
Assert.assertNotNull(storedRealm.getDefaultRoles()); assertNotNull(storedRealm.getDefaultRoles());
for (String role : realm.getDefaultRoles()) { for (String role : realm.getDefaultRoles()) {
Assert.assertTrue(storedRealm.getDefaultRoles().contains(role)); assertTrue(storedRealm.getDefaultRoles().contains(role));
} }
} }
if (realm.getSmtpServer() != null) { if (realm.getSmtpServer() != null) {
Assert.assertEquals(realm.getSmtpServer(), storedRealm.getSmtpServer()); assertEquals(realm.getSmtpServer(), storedRealm.getSmtpServer());
} }
if (realm.getBrowserSecurityHeaders() != null) { if (realm.getBrowserSecurityHeaders() != null) {
Assert.assertEquals(realm.getBrowserSecurityHeaders(), storedRealm.getBrowserSecurityHeaders()); assertEquals(realm.getBrowserSecurityHeaders(), storedRealm.getBrowserSecurityHeaders());
} }
} }
@ -379,6 +357,7 @@ public class RealmTest extends AbstractClientTest {
realm.update(rep); realm.update(rep);
fail("Expected BadRequestException"); fail("Expected BadRequestException");
} catch (BadRequestException e) { } catch (BadRequestException e) {
// Expected
} }
rep.setPrivateKey(PRIVATE_KEY); rep.setPrivateKey(PRIVATE_KEY);
@ -388,17 +367,18 @@ public class RealmTest extends AbstractClientTest {
realm.update(rep); realm.update(rep);
fail("Expected BadRequestException"); fail("Expected BadRequestException");
} catch (BadRequestException e) { } catch (BadRequestException e) {
// Expected
} }
assertEquals(originalPublicKey, realm.toRepresentation().getPublicKey()); Assert.assertEquals(originalPublicKey, realm.toRepresentation().getPublicKey());
rep.setPublicKey(PUBLIC_KEY); rep.setPublicKey(PUBLIC_KEY);
realm.update(rep); realm.update(rep);
assertEquals(PUBLIC_KEY, rep.getPublicKey()); assertEquals(PUBLIC_KEY, rep.getPublicKey());
String privateKey2048 = IOUtils.toString(getClass().getResourceAsStream("/keys/private2048.pem")); String privateKey2048 = StreamUtil.readString(getClass().getResourceAsStream("/keys/private2048.pem"));
String publicKey2048 = IOUtils.toString(getClass().getResourceAsStream("/keys/public2048.pem")); String publicKey2048 = StreamUtil.readString(getClass().getResourceAsStream("/keys/public2048.pem"));
rep.setPrivateKey(privateKey2048); rep.setPrivateKey(privateKey2048);
@ -406,24 +386,25 @@ public class RealmTest extends AbstractClientTest {
realm.update(rep); realm.update(rep);
fail("Expected BadRequestException"); fail("Expected BadRequestException");
} catch (BadRequestException e) { } catch (BadRequestException e) {
// Expected
} }
assertEquals(PUBLIC_KEY, realm.toRepresentation().getPublicKey()); Assert.assertEquals(PUBLIC_KEY, realm.toRepresentation().getPublicKey());
rep.setPublicKey(publicKey2048); rep.setPublicKey(publicKey2048);
realm.update(rep); realm.update(rep);
assertEquals(publicKey2048, realm.toRepresentation().getPublicKey()); Assert.assertEquals(publicKey2048, realm.toRepresentation().getPublicKey());
String privateKey4096 = IOUtils.toString(getClass().getResourceAsStream("/keys/private4096.pem")); String privateKey4096 = StreamUtil.readString(getClass().getResourceAsStream("/keys/private4096.pem"));
String publicKey4096 = IOUtils.toString(getClass().getResourceAsStream("/keys/public4096.pem")); String publicKey4096 = StreamUtil.readString(getClass().getResourceAsStream("/keys/public4096.pem"));
rep.setPrivateKey(privateKey4096); rep.setPrivateKey(privateKey4096);
rep.setPublicKey(publicKey4096); rep.setPublicKey(publicKey4096);
realm.update(rep); realm.update(rep);
assertEquals(publicKey4096, realm.toRepresentation().getPublicKey()); Assert.assertEquals(publicKey4096, realm.toRepresentation().getPublicKey());
} }
@Test @Test
@ -443,22 +424,4 @@ public class RealmTest extends AbstractClientTest {
assertEquals(certificate, rep.getCertificate()); assertEquals(certificate, rep.getCertificate());
} }
@Test
// KEYCLOAK-2700
public void deleteRealmWithDefaultGroups() throws IOException {
RealmRepresentation rep = new RealmRepresentation();
rep.setRealm("foo");
GroupRepresentation group = new GroupRepresentation();
group.setName("default1");
group.setPath("/default1");
rep.setGroups(Collections.singletonList(group));
rep.setDefaultGroups(Collections.singletonList("/default1"));
keycloak.realms().create(rep);
keycloak.realm(rep.getRealm()).remove();
}
} }

20
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/group/GroupTest.java
View file

@ -37,6 +37,7 @@ import javax.ws.rs.NotFoundException;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.util.Collections;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@ -243,4 +244,23 @@ public class GroupTest extends AbstractGroupTest {
Assert.assertNull(login("direct-login", "resource-owner", "secret", user.getId()).getRealmAccess()); Assert.assertNull(login("direct-login", "resource-owner", "secret", user.getId()).getRealmAccess());
} }
@Test
// KEYCLOAK-2700
public void deleteRealmWithDefaultGroups() throws IOException {
RealmRepresentation rep = new RealmRepresentation();
rep.setRealm("foo");
GroupRepresentation group = new GroupRepresentation();
group.setName("default1");
group.setPath("/default1");
rep.setGroups(Collections.singletonList(group));
rep.setDefaultGroups(Collections.singletonList("/default1"));
adminClient.realms().create(rep);
adminClient.realm(rep.getRealm()).remove();
}
} }

0
testsuite/integration/src/test/resources/admin-test/testrealm.json → testsuite/integration-arquillian/tests/base/src/test/resources/admin-test/testrealm.json
View file

0
testsuite/integration/src/test/resources/client-descriptions/client-oidc.json → testsuite/integration-arquillian/tests/base/src/test/resources/client-descriptions/client-oidc.json
View file

0
testsuite/integration/src/test/resources/client-descriptions/saml-entity-descriptor.xml → testsuite/integration-arquillian/tests/base/src/test/resources/client-descriptions/saml-entity-descriptor.xml
View file

0
testsuite/integration/src/test/resources/keys/certificate.pem → testsuite/integration-arquillian/tests/base/src/test/resources/keys/certificate.pem
View file

0
testsuite/integration/src/test/resources/keys/private2048.pem → testsuite/integration-arquillian/tests/base/src/test/resources/keys/private2048.pem
View file

0
testsuite/integration/src/test/resources/keys/private4096.pem → testsuite/integration-arquillian/tests/base/src/test/resources/keys/private4096.pem
View file

0
testsuite/integration/src/test/resources/keys/public2048.pem → testsuite/integration-arquillian/tests/base/src/test/resources/keys/public2048.pem
View file

0
testsuite/integration/src/test/resources/keys/public4096.pem → testsuite/integration-arquillian/tests/base/src/test/resources/keys/public4096.pem
View file