keycloak-memoizeit

Merge pull request #3810 from vramik/KEYCLOAK-4337 KEYCLOAK-4337

2/13/2017 7:38:31 AM

Details

diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPBinaryAttributesTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPBinaryAttributesTest.java
index e1006cc..fb93cc0 100644
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPBinaryAttributesTest.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/storage/ldap/LDAPBinaryAttributesTest.java
@@ -43,7 +43,6 @@ import org.keycloak.models.LDAPConstants;
 import org.keycloak.models.RealmModel;
 import org.keycloak.models.RealmProvider;
 import org.keycloak.models.UserModel;
-import org.keycloak.models.mongo.keycloak.adapters.MongoRealmProviderFactory;
 import org.keycloak.models.utils.UserModelDelegate;
 import org.keycloak.representations.idm.ComponentRepresentation;
 import org.keycloak.representations.idm.UserRepresentation;
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java
index 260eefe..ae3a4a9 100755
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java
@@ -155,7 +155,7 @@ public class ExportImportTest extends AbstractKeycloakTest {
 
         removeRealm("test");
         removeRealm("test-realm");
-        assertEquals(1, adminClient.realms().findAll().size());
+        Assert.assertNames(adminClient.realms().findAll(), "master");
 
         assertNotAuthenticated("test", "test-user@localhost", "password");
         assertNotAuthenticated("test", "user1", "password");
@@ -168,7 +168,7 @@ public class ExportImportTest extends AbstractKeycloakTest {
         testingClient.testing().exportImport().runImport();
 
         // Ensure data are imported back
-        assertEquals(3, adminClient.realms().findAll().size());
+        Assert.assertNames(adminClient.realms().findAll(), "master", "test", "test-realm");
 
         assertAuthenticated("test", "test-user@localhost", "password");
         assertAuthenticated("test", "user1", "password");
@@ -191,7 +191,7 @@ public class ExportImportTest extends AbstractKeycloakTest {
         // Delete some realm (and some data in admin realm)
         adminClient.realm("test").remove();
 
-        assertEquals(2, adminClient.realms().findAll().size());
+        Assert.assertNames(adminClient.realms().findAll(), "test-realm", "master");
 
         assertNotAuthenticated("test", "test-user@localhost", "password");
         assertNotAuthenticated("test", "user1", "password");
@@ -204,7 +204,7 @@ public class ExportImportTest extends AbstractKeycloakTest {
         testingClient.testing().exportImport().runImport();
 
         // Ensure data are imported back, but just for "test" realm
-        assertEquals(3, adminClient.realms().findAll().size());
+        Assert.assertNames(adminClient.realms().findAll(), "master", "test", "test-realm");
 
         assertAuthenticated("test", "test-user@localhost", "password");
         assertAuthenticated("test", "user1", "password");
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/AccountPageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/AccountPageTest.java
index cc72876..4800b69 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/AccountPageTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/AccountPageTest.java
@@ -23,6 +23,7 @@ import org.keycloak.admin.client.resource.RealmResource;
 import org.keycloak.representations.idm.ClientRepresentation;
 import org.keycloak.testsuite.pages.AccountUpdateProfilePage;
 import org.keycloak.testsuite.pages.LoginPage;
+import org.keycloak.testsuite.ProfileAssume;
 
 import java.util.List;
 
@@ -56,6 +57,8 @@ public class AccountPageTest extends AbstractI18NTest {
 
     @Test
     public void testLocalizedReferrerLinkContent() {
+        ProfileAssume.assumeCommunity();
+        
         RealmResource testRealm = testRealm();
         List<ClientRepresentation> foundClients = testRealm.clients().findByClientId("var-named-test-app");
         if (foundClients.isEmpty()) {
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TestEventsLogger.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TestEventsLogger.java
index 92f3085..0bbe228 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TestEventsLogger.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TestEventsLogger.java
@@ -71,10 +71,14 @@ public class TestEventsLogger extends RunListener {
     }
 
     private void createPageSrcFile(Description d) throws IOException {
-        if (driver != null && driver.getPageSource() != null) {
-            String pageSourceLocation = System.getProperty("page.source.location", "target/failed-tests/page-source/");
-            FileUtils.writeStringToFile(new File(pageSourceLocation + d.getTestClass().getSimpleName() + "/" + d.getMethodName() + ".html"), 
-                    driver.getPageSource());
+        try {
+            if (driver != null && driver.getPageSource() != null) {
+                String pageSourceLocation = System.getProperty("page.source.location", "target/failed-tests/page-source/");
+                FileUtils.writeStringToFile(new File(pageSourceLocation + d.getTestClass().getSimpleName() + "/" + d.getMethodName() + ".html"), 
+                        driver.getPageSource());
+            }
+        } catch (IllegalStateException ex) {
+            Logger.getLogger(TestEventsLogger.class).warn(ex.getMessage());
         }
     }
 }