From f7a6d39b015b662fa27552a0e88c976a87eee2ec Mon Sep 17 00:00:00 2001 From: mposolda Date: Fri, 21 Oct 2016 11:19:42 +0200 Subject: [PATCH] KEYCLOAK-3792 Fix failing tests on MySQL --- .../storage/ComponentExportImportTest.java | 28 ++++++-------- .../FederatedStorageExportImportTest.java | 37 ++++++++++--------- 2 files changed, 31 insertions(+), 34 deletions(-) diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ComponentExportImportTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ComponentExportImportTest.java index ef4ddba61b..8247ae89d2 100644 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ComponentExportImportTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ComponentExportImportTest.java @@ -16,32 +16,23 @@ */ package org.keycloak.testsuite.federation.storage; +import org.junit.After; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; -import org.keycloak.credential.CredentialModel; -import org.keycloak.credential.hash.PasswordHashProvider; import org.keycloak.exportimport.ExportImportConfig; import org.keycloak.exportimport.ExportImportManager; -import org.keycloak.exportimport.dir.DirExportProviderFactory; import org.keycloak.exportimport.singlefile.SingleFileExportProviderFactory; -import org.keycloak.models.GroupModel; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.PasswordPolicy; import org.keycloak.models.RealmModel; -import org.keycloak.models.RoleModel; -import org.keycloak.policy.HashAlgorithmPasswordPolicyProviderFactory; import org.keycloak.services.managers.RealmManager; import org.keycloak.storage.UserStorageProvider; import org.keycloak.testsuite.rule.KeycloakRule; import java.io.File; import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; import java.util.Properties; import java.util.Set; @@ -67,12 +58,14 @@ public class ComponentExportImportTest { } - protected PasswordHashProvider getHashProvider(KeycloakSession session, PasswordPolicy policy) { - PasswordHashProvider hash = session.getProvider(PasswordHashProvider.class, policy.getHashAlgorithm()); - if (hash == null) { - return session.getProvider(PasswordHashProvider.class, HashAlgorithmPasswordPolicyProviderFactory.DEFAULT_VALUE); + @After + public void cleanup() { + KeycloakSession session = keycloakRule.startSession(); + RealmModel realm = session.realms().getRealmByName("exported-component"); + if (realm != null) { + session.realms().removeRealm(realm.getId()); } - return hash; + keycloakRule.stopSession(session, true); } @@ -118,6 +111,9 @@ public class ComponentExportImportTest { Assert.assertNull(session.realms().getRealmByName("exported-component")); ExportImportConfig.setAction(ExportImportConfig.ACTION_IMPORT); new ExportImportManager(session).runImport(); + keycloakRule.stopSession(session, true); + + session = keycloakRule.startSession(); realm = session.realms().getRealmByName("exported-component"); Assert.assertNotNull(realm); component = realm.getComponent(component.getId()); @@ -135,7 +131,7 @@ public class ComponentExportImportTest { Assert.assertEquals(subComponent.getProviderId(), UserMapStorageFactory.PROVIDER_ID); Assert.assertEquals(subComponent.getProviderType(), UserStorageProvider.class.getName()); Assert.assertEquals(subComponent.getConfig().getFirst("attr"), "value2"); - session.realms().removeRealm(realmId); + keycloakRule.stopSession(session, true); } diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/FederatedStorageExportImportTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/FederatedStorageExportImportTest.java index 420ca7a16d..cafe113c75 100644 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/FederatedStorageExportImportTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/FederatedStorageExportImportTest.java @@ -16,20 +16,16 @@ */ package org.keycloak.testsuite.federation.storage; +import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; -import org.junit.Rule; import org.junit.Test; -import org.keycloak.OAuth2Constants; import org.keycloak.common.util.MultivaluedHashMap; -import org.keycloak.component.ComponentModel; import org.keycloak.credential.CredentialModel; import org.keycloak.credential.hash.PasswordHashProvider; import org.keycloak.exportimport.ExportImportConfig; import org.keycloak.exportimport.ExportImportManager; -import org.keycloak.exportimport.UsersExportStrategy; import org.keycloak.exportimport.dir.DirExportProviderFactory; import org.keycloak.exportimport.singlefile.SingleFileExportProviderFactory; import org.keycloak.models.GroupModel; @@ -37,20 +33,9 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.PasswordPolicy; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; -import org.keycloak.models.UserCredentialModel; -import org.keycloak.models.UserModel; -import org.keycloak.models.cache.infinispan.UserAdapter; import org.keycloak.policy.HashAlgorithmPasswordPolicyProviderFactory; import org.keycloak.services.managers.RealmManager; -import org.keycloak.storage.StorageId; -import org.keycloak.storage.UserStorageProviderModel; -import org.keycloak.testsuite.OAuthClient; -import org.keycloak.testsuite.pages.AppPage; -import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.rule.KeycloakRule; -import org.keycloak.testsuite.rule.WebResource; -import org.keycloak.testsuite.rule.WebRule; -import org.openqa.selenium.WebDriver; import java.io.File; import java.util.HashSet; @@ -81,6 +66,16 @@ public class FederatedStorageExportImportTest { } + @After + public void cleanup() { + KeycloakSession session = keycloakRule.startSession(); + RealmModel realm = session.realms().getRealmByName("exported"); + if (realm != null) { + session.realms().removeRealm(realm.getId()); + } + keycloakRule.stopSession(session, true); + } + protected PasswordHashProvider getHashProvider(KeycloakSession session, PasswordPolicy policy) { PasswordHashProvider hash = session.getProvider(PasswordHashProvider.class, policy.getHashAlgorithm()); if (hash == null) { @@ -132,6 +127,9 @@ public class FederatedStorageExportImportTest { Assert.assertNull(session.realms().getRealmByName("exported")); ExportImportConfig.setAction(ExportImportConfig.ACTION_IMPORT); new ExportImportManager(session).runImport(); + keycloakRule.stopSession(session, true); + + session = keycloakRule.startSession(); realm = session.realms().getRealmByName("exported"); Assert.assertNotNull(realm); role = realm.getRole("test-role"); @@ -149,7 +147,7 @@ public class FederatedStorageExportImportTest { List creds = session.userFederatedStorage().getStoredCredentials(realm, userId); Assert.assertEquals(1, creds.size()); Assert.assertTrue(getHashProvider(session, realm.getPasswordPolicy()).verify("password", creds.get(0))); - session.realms().removeRealm(realmId); + keycloakRule.stopSession(session, true); } @@ -195,6 +193,9 @@ public class FederatedStorageExportImportTest { Assert.assertNull(session.realms().getRealmByName("exported")); ExportImportConfig.setAction(ExportImportConfig.ACTION_IMPORT); new ExportImportManager(session).runImport(); + keycloakRule.stopSession(session, true); + + session = keycloakRule.startSession(); realm = session.realms().getRealmByName("exported"); Assert.assertNotNull(realm); role = realm.getRole("test-role"); @@ -212,7 +213,7 @@ public class FederatedStorageExportImportTest { List creds = session.userFederatedStorage().getStoredCredentials(realm, userId); Assert.assertEquals(1, creds.size()); Assert.assertTrue(getHashProvider(session, realm.getPasswordPolicy()).verify("password", creds.get(0))); - session.realms().removeRealm(realmId); + keycloakRule.stopSession(session, true); }