keycloak-aplcache

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/AbstractBaseServletAuthzAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/AbstractBaseServletAuthzAdapterTest.java
index 66e69ef..fc58e43 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/AbstractBaseServletAuthzAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/AbstractBaseServletAuthzAdapterTest.java
@@ -29,7 +29,7 @@ import org.keycloak.representations.idm.authorization.ResourceServerRepresentati
 import org.keycloak.representations.idm.authorization.UserPolicyRepresentation;
 import org.keycloak.testsuite.ProfileAssume;
 import org.keycloak.testsuite.adapter.AbstractExampleAdapterTest;
-import org.keycloak.testsuite.util.WaitUtils;
+import org.keycloak.testsuite.util.UIUtils;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
@@ -42,9 +42,9 @@ import java.net.URL;
 import java.util.List;
 
 import static org.junit.Assert.assertFalse;
+import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad;
 import static org.keycloak.testsuite.utils.io.IOUtil.loadJson;
 import static org.keycloak.testsuite.utils.io.IOUtil.loadRealm;
-import static org.keycloak.testsuite.util.WaitUtils.pause;
 import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement;
 
 /**
@@ -113,24 +113,18 @@ public abstract class AbstractBaseServletAuthzAdapterTest extends AbstractExampl
 
     private void logOut() {
         navigateTo();
-        By by = By.xpath("//a[text() = 'Sign Out']");
-        WaitUtils.waitUntilElement(by);
-        this.driver.findElement(by).click();
-        pause(500);
+        UIUtils.clickLink(driver.findElement(By.xpath("//a[text() = 'Sign Out']")));
     }
 
+
     protected void login(String username, String password) {
         try {
             navigateTo();
-            Thread.sleep(2000);
             if (this.driver.getCurrentUrl().startsWith(getResourceServerUrl().toString())) {
-                Thread.sleep(2000);
                 logOut();
                 navigateTo();
             }
 
-            Thread.sleep(2000);
-
             this.loginPage.form().login(username, password);
         } catch (Exception cause) {
             throw new RuntimeException("Login failed", cause);
@@ -139,7 +133,7 @@ public abstract class AbstractBaseServletAuthzAdapterTest extends AbstractExampl
 
     protected void navigateTo() {
         this.driver.navigate().to(getResourceServerUrl() + "/");
-        WaitUtils.waitUntilElement(By.xpath("//a[text() = 'Dynamic Menu']"));
+        waitForPageToLoad();
     }
 
     protected void assertWasDenied() {
@@ -160,17 +154,17 @@ public abstract class AbstractBaseServletAuthzAdapterTest extends AbstractExampl
 
     protected void navigateToDynamicMenuPage() {
         navigateTo();
-        getLink("Dynamic Menu").click();
+        UIUtils.clickLink(getLink("Dynamic Menu"));
     }
 
     protected void navigateToUserPremiumPage() {
         navigateTo();
-        getLink("User Premium").click();
+        UIUtils.clickLink(getLink("User Premium"));
     }
 
     protected void navigateToAdminPage() {
         navigateTo();
-        getLink("Administration").click();
+        UIUtils.clickLink(getLink("Administration"));
     }
 
     protected void updatePermissionPolicies(String permissionName, String... policyNames) {

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerTest.java
index 2722142..1d54f28 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerTest.java
@@ -18,8 +18,8 @@ package org.keycloak.testsuite.adapter.example.authorization;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad;
 import static org.keycloak.testsuite.utils.io.IOUtil.loadRealm;
-import static org.keycloak.testsuite.util.WaitUtils.pause;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -46,7 +46,7 @@ import org.keycloak.testsuite.ProfileAssume;
 import org.keycloak.testsuite.adapter.AbstractExampleAdapterTest;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 import org.keycloak.testsuite.arquillian.containers.ContainerConstants;
-import org.keycloak.testsuite.util.WaitUtils;
+import org.keycloak.testsuite.util.UIUtils;
 import org.openqa.selenium.By;
 
 /**
@@ -524,10 +524,7 @@ public class ServletPolicyEnforcerTest extends AbstractExampleAdapterTest {
 
     private void logOut() {
         navigateTo();
-        By by = By.xpath("//a[text() = 'Sign Out']");
-        WaitUtils.waitUntilElement(by);
-        this.driver.findElement(by).click();
-        pause(500);
+        UIUtils.clickLink(driver.findElement(By.xpath("//a[text() = 'Sign Out']")));
     }
 
     private  void login(String username, String password) {
@@ -547,7 +544,7 @@ public class ServletPolicyEnforcerTest extends AbstractExampleAdapterTest {
 
     private void navigateTo() {
         this.driver.navigate().to(getResourceServerUrl() + "/");
-        WaitUtils.waitUntilElement(By.xpath("//p[text() = 'Welcome']"));
+        waitForPageToLoad();
     }
 
     private boolean wasDenied() {