keycloak-aplcache

diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/ModalDialog.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/ModalDialog.java
index 8159d34..6dc9007 100644
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/ModalDialog.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/ModalDialog.java
@@ -53,7 +53,7 @@ public class ModalDialog {
         waitUntilElement(deleteButton).is().present();
         deleteButton.click();
         waitUntilElement(root).is().not().present();
-        pause(100);
+        pause(200);
     }
 
     public void cancel() {

diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/Form.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/Form.java
index f3de88d..8f3232b 100644
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/Form.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/Form.java
@@ -45,6 +45,7 @@ public class Form {
 
     public void save() {
 //        guardAjax(save).click();
+        waitUntilElement(save).is().present();
         save.click();
     }
 

diff --git a/testsuite/integration-arquillian/tests/other/console/src/main/java/org/keycloak/testsuite/console/page/federation/LdapUserProviderForm.java b/testsuite/integration-arquillian/tests/other/console/src/main/java/org/keycloak/testsuite/console/page/federation/LdapUserProviderForm.java
index 88e207c..2b77ee9 100644
--- a/testsuite/integration-arquillian/tests/other/console/src/main/java/org/keycloak/testsuite/console/page/federation/LdapUserProviderForm.java
+++ b/testsuite/integration-arquillian/tests/other/console/src/main/java/org/keycloak/testsuite/console/page/federation/LdapUserProviderForm.java
@@ -192,6 +192,7 @@ public class LdapUserProviderForm extends Form {
     }
 
     public void selectVendor(int index) {
+        waitUntilElement(By.id("vendor")).is().present();
         vendorSelect.selectByIndex(index);
     }
 
@@ -233,20 +234,11 @@ public class LdapUserProviderForm extends Form {
     }
 
     public void setAccountAfterPasswordUpdateEnabled(boolean enabled) {
-        if ((!enableAccountAfterPasswordUpdate.isOn() && enabled)
-                || !enabled && enableAccountAfterPasswordUpdate.isOn()) {
-            driver.findElement(By
-                    .xpath("//div[contains(@class,'onoffswitch') and ./input[@id='userAccountControlsAfterPasswordUpdate']]"))
-                    .findElements(By.tagName("span")).get(0).click();
-        }
+        enableAccountAfterPasswordUpdate.setOn(enabled);
     }
 
     public void setAllowKerberosAuthEnabled(boolean enabled) {
-        if ((!allowKerberosAuth.isOn() && enabled) || !enabled && allowKerberosAuth.isOn()) {
-            driver.findElement(
-                    By.xpath("//div[contains(@class,'onoffswitch') and ./input[@id='allowKerberosAuthentication']]"))
-                    .findElements(By.tagName("span")).get(0).click();
-        }
+        allowKerberosAuth.setOn(enabled);
     }
 
     public void setDebugEnabled(boolean debugEnabled) {

diff --git a/testsuite/integration-arquillian/tests/other/console/src/test/java/org/keycloak/testsuite/console/authentication/OTPPolicyTest.java b/testsuite/integration-arquillian/tests/other/console/src/test/java/org/keycloak/testsuite/console/authentication/OTPPolicyTest.java
index 73173a7..1f2e22f 100644
--- a/testsuite/integration-arquillian/tests/other/console/src/test/java/org/keycloak/testsuite/console/authentication/OTPPolicyTest.java
+++ b/testsuite/integration-arquillian/tests/other/console/src/test/java/org/keycloak/testsuite/console/authentication/OTPPolicyTest.java
@@ -52,7 +52,7 @@ public class OTPPolicyTest extends AbstractConsoleTest {
     @Test
     public void otpPolicyTest() {
         otpPolicyPage.form().setValues(OTPType.COUNTER_BASED, OTPHashAlg.SHA256, Digits.EIGHT, "10", "50");
-        assertEquals("Success! Your changes have been saved to the realm.", otpPolicyPage.getSuccessMessage());
+        assertAlertSuccess();
         
         RealmRepresentation realm = testRealmResource().toRepresentation();
         assertEquals("hotp", realm.getOtpPolicyType());
@@ -62,7 +62,7 @@ public class OTPPolicyTest extends AbstractConsoleTest {
         assertEquals(Integer.valueOf(50), realm.getOtpPolicyInitialCounter());
         
         otpPolicyPage.form().setValues(OTPType.TIME_BASED, OTPHashAlg.SHA512, Digits.EIGHT, "10", "40");
-        assertEquals("Success! Your changes have been saved to the realm.", otpPolicyPage.getSuccessMessage());
+        assertAlertSuccess();
         
         realm = testRealmResource().toRepresentation();
         assertEquals(Integer.valueOf(40), realm.getOtpPolicyPeriod());
@@ -71,54 +71,45 @@ public class OTPPolicyTest extends AbstractConsoleTest {
     @Test
     public void invalidValuesTest() {
         otpPolicyPage.form().setValues(OTPType.TIME_BASED, OTPHashAlg.SHA1, Digits.SIX, "", "30");
-        assertEquals("Error! Missing or invalid field(s). Please verify the fields in red.", otpPolicyPage.getErrorMessage());
-        otpPolicyPage.closeNotification();
+        assertAlertDanger();
         otpPolicyPage.navigateTo();// workaround: input.clear() doesn't work when <input type="number" ...
         
         otpPolicyPage.form().setValues(OTPType.TIME_BASED, OTPHashAlg.SHA1, Digits.SIX, " ", "30");
-        assertEquals("Error! Missing or invalid field(s). Please verify the fields in red.", otpPolicyPage.getErrorMessage());
-        otpPolicyPage.closeNotification();
+        assertAlertDanger();
         otpPolicyPage.navigateTo();
         
         otpPolicyPage.form().setValues(OTPType.TIME_BASED, OTPHashAlg.SHA1, Digits.SIX, "no number", "30");
-        assertEquals("Error! Missing or invalid field(s). Please verify the fields in red.", otpPolicyPage.getErrorMessage());
-        otpPolicyPage.closeNotification();
+        assertAlertDanger();
         otpPolicyPage.navigateTo();
         
         RealmRepresentation realm = testRealmResource().toRepresentation();
         assertEquals(Integer.valueOf(1), realm.getOtpPolicyLookAheadWindow());
 
         otpPolicyPage.form().setValues(OTPType.TIME_BASED, OTPHashAlg.SHA1, Digits.SIX, "1", "");
-        assertEquals("Error! Missing or invalid field(s). Please verify the fields in red.", otpPolicyPage.getErrorMessage());
-        otpPolicyPage.closeNotification();
+        assertAlertDanger();
         otpPolicyPage.navigateTo();
         
         otpPolicyPage.form().setValues(OTPType.TIME_BASED, OTPHashAlg.SHA1, Digits.SIX, "1", " ");
-        assertEquals("Error! Missing or invalid field(s). Please verify the fields in red.", otpPolicyPage.getErrorMessage());
-        otpPolicyPage.closeNotification();
+        assertAlertDanger();
         otpPolicyPage.navigateTo();
         
         otpPolicyPage.form().setValues(OTPType.TIME_BASED, OTPHashAlg.SHA1, Digits.SIX, "1", "no number");
-        assertEquals("Error! Missing or invalid field(s). Please verify the fields in red.", otpPolicyPage.getErrorMessage());
-        otpPolicyPage.closeNotification();
+        assertAlertDanger();
         otpPolicyPage.navigateTo();
         
         realm = testRealmResource().toRepresentation();
         assertEquals(Integer.valueOf(30), realm.getOtpPolicyPeriod());
         
         otpPolicyPage.form().setValues(OTPType.COUNTER_BASED, OTPHashAlg.SHA1, Digits.SIX, "1", "");
-        assertEquals("Error! Missing or invalid field(s). Please verify the fields in red.", otpPolicyPage.getErrorMessage());
-        otpPolicyPage.closeNotification();
+        assertAlertDanger();
         otpPolicyPage.navigateTo();
         
         otpPolicyPage.form().setValues(OTPType.COUNTER_BASED, OTPHashAlg.SHA1, Digits.SIX, "1", " ");
-        assertEquals("Error! Missing or invalid field(s). Please verify the fields in red.", otpPolicyPage.getErrorMessage());
-        otpPolicyPage.closeNotification();
+        assertAlertDanger();
         otpPolicyPage.navigateTo();
         
         otpPolicyPage.form().setValues(OTPType.COUNTER_BASED, OTPHashAlg.SHA1, Digits.SIX, "1", "no number");
-        assertEquals("Error! Missing or invalid field(s). Please verify the fields in red.", otpPolicyPage.getErrorMessage());
-        otpPolicyPage.closeNotification();
+        assertAlertDanger();
         otpPolicyPage.navigateTo();
         
         realm = testRealmResource().toRepresentation();

diff --git a/testsuite/integration-arquillian/tests/other/console/src/test/java/org/keycloak/testsuite/console/realm/InternationalizationTest.java b/testsuite/integration-arquillian/tests/other/console/src/test/java/org/keycloak/testsuite/console/realm/InternationalizationTest.java
index 2dec996..785158d 100644
--- a/testsuite/integration-arquillian/tests/other/console/src/test/java/org/keycloak/testsuite/console/realm/InternationalizationTest.java
+++ b/testsuite/integration-arquillian/tests/other/console/src/test/java/org/keycloak/testsuite/console/realm/InternationalizationTest.java
@@ -26,6 +26,7 @@ public class InternationalizationTest extends AbstractRealmTest {
 
     @Before
     public void beforeInternationalizationTest() {
+        realmSettingsPage.navigateTo();
         tabs().themes();
         themeSettingsPage.setInternatEnabled(true);
         themeSettingsPage.saveTheme();