keycloak-memoizeit

Removed Arquillian from testsuite

9/26/2013 10:09:02 AM

Changes

pom.xml 20(+9 -11)

testsuite/pom.xml 205(+136 -69)

testsuite/src/test/java/org/keycloak/testsuite/AbstractDroneTest.java 75(+0 -75)

testsuite/src/test/java/org/keycloak/testsuite/AccountTest.java 88(+0 -88)

testsuite/src/test/java/org/keycloak/testsuite/Deployments.java 32(+0 -32)

testsuite/src/test/java/org/keycloak/testsuite/pages/AppPage.java 38(+0 -38)

testsuite/src/test/java/org/keycloak/testsuite/rule/Page.java 12(+0 -12)

testsuite/src/test/java/org/keycloak/testsuite/SystemPropertiesSetter.java 55(+0 -55)

testsuite/src/test/java/org/keycloak/testsuite/TestApplication.java 94(+0 -94)

testsuite/src/test/java/org/keycloak/testsuite/TotpTest.java 115(+0 -115)

testsuite/src/test/resources/app-jboss-web.xml 5(+0 -5)

testsuite/src/test/resources/app-resteasy-oauth.json 11(+0 -11)

testsuite/src/test/resources/app-web.xml 27(+0 -27)

testsuite/src/test/resources/arquillian.xml 9(+0 -9)

testsuite/src/test/resources/jboss-deployment-structure.xml 12(+0 -12)

testsuite/src/test/resources/testrealm-email.json 76(+0 -76)

testsuite/src/test/resources/testrealm-totp.json 75(+0 -75)

testsuite/src/test/resources/user.jsp 14(+0 -14)

testsuite/src/test/resources/web.xml 49(+0 -49)

testsuite/src/test/resources/web-properties-email-verfication.xml 26(+0 -26)

Details

pom.xml 20(+9 -11)

diff --git a/pom.xml b/pom.xml
index 8966893..e844793 100755
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,7 @@
         <module>forms</module>
         <module>admin-ui-styles</module>
         <module>examples</module>
+        <module>testsuite</module>
         <!--<module>ui</module> -->
     </modules>
 
@@ -234,21 +235,18 @@
     			<artifactId>greenmail</artifactId>
 	    		<version>1.3.1b</version>
 			</dependency>  			
-			
-			<!-- Arquillian -->
-			<dependency>
-  				<groupId>org.jboss.arquillian</groupId>
-  				<artifactId>arquillian-bom</artifactId>
-  				<version>1.1.1.Final</version>
-  				<type>pom</type>
-  				<scope>import</scope>
-			</dependency>		
-				
+
+			<!-- Selenium -->				
 			<dependency>
 				<groupId>org.seleniumhq.selenium</groupId>
 				<artifactId>selenium-java</artifactId>
-				<version>2.26.0</version>
+				<version>2.35.0</version>
   			</dependency>
+			<dependency>
+				<groupId>org.seleniumhq.selenium</groupId>
+				<artifactId>selenium-chrome-driver</artifactId>
+				<version>2.35.0</version>
+			</dependency>  			
         </dependencies>
     </dependencyManagement>
 

testsuite/pom.xml 205(+136 -69)

diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 973b7a3..cd9c0b5 100755
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -23,11 +23,11 @@
 	</dependencyManagement>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.jboss.resteasy</groupId>
-			<artifactId>jose-jwt</artifactId>
-			<scope>provided</scope>
-		</dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk16</artifactId>
+            <scope>provided</scope>
+        </dependency>
 		<dependency>
 			<groupId>org.keycloak</groupId>
 			<artifactId>keycloak-core</artifactId>
@@ -63,76 +63,143 @@
 			<artifactId>keycloak-forms</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.picketlink</groupId>
+            <artifactId>picketlink-idm-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.picketlink</groupId>
+            <artifactId>picketlink-common</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.picketlink</groupId>
+            <artifactId>picketlink-idm-impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.picketlink</groupId>
+            <artifactId>picketlink-idm-simple-schema</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.picketlink</groupId>
+            <artifactId>picketlink-config</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxrs</artifactId>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-simple</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+         <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>jaxrs-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-client</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-crypto</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>jose-jwt</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-undertow</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.undertow</groupId>
+            <artifactId>undertow-servlet</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.undertow</groupId>
+            <artifactId>undertow-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-core-asl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.servlet</groupId>
+            <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-xc</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.javax.persistence</groupId>
+            <artifactId>hibernate-jpa-2.0-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.3.161</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+            <version>3.6.6.Final</version>
+            <scope>test</scope>
+        </dependency>
 		<dependency>
-			<groupId>org.picketlink</groupId>
-			<artifactId>picketlink-idm-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.picketlink</groupId>
-			<artifactId>picketlink-idm-impl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.picketlink</groupId>
-			<artifactId>picketlink-idm-simple-schema</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.picketlink</groupId>
-			<artifactId>picketlink-config</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.resteasy</groupId>
-			<artifactId>resteasy-jaxrs</artifactId>
-			<scope>provided</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>log4j</groupId>
-					<artifactId>log4j</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-api</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-simple</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.resteasy</groupId>
-			<artifactId>jaxrs-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<version>1.3.161</version>
-		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.arquillian.junit</groupId>
-			<artifactId>arquillian-junit-container</artifactId>
-			<scope>test</scope>
-		</dependency>
+    		<groupId>com.icegreen</groupId>
+    		<artifactId>greenmail</artifactId>
+            <scope>test</scope>
+		</dependency>     
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-java</artifactId>
 			<scope>test</scope>
   		</dependency>
-		<dependency>
-			<groupId>org.jboss.shrinkwrap.resolver</groupId>
-			<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-    		<groupId>com.icegreen</groupId>
-    		<artifactId>greenmail</artifactId>
-            <scope>test</scope>
-		</dependency>     		
 	</dependencies>
 	<build>
 		<plugins>
diff --git a/testsuite/src/test/java/org/keycloak/testsuite/ApplicationServlet.java b/testsuite/src/test/java/org/keycloak/testsuite/ApplicationServlet.java
new file mode 100644
index 0000000..300d089
--- /dev/null
+++ b/testsuite/src/test/java/org/keycloak/testsuite/ApplicationServlet.java
@@ -0,0 +1,17 @@
+package org.keycloak.testsuite;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class ApplicationServlet extends HttpServlet {
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        resp.getWriter().print("Hello world!");
+    }
+
+}
diff --git a/testsuite/src/test/java/org/keycloak/testsuite/Constants.java b/testsuite/src/test/java/org/keycloak/testsuite/Constants.java
index 389945d..8313995 100644
--- a/testsuite/src/test/java/org/keycloak/testsuite/Constants.java
+++ b/testsuite/src/test/java/org/keycloak/testsuite/Constants.java
@@ -2,8 +2,6 @@ package org.keycloak.testsuite;
 
 public class Constants {
 
-    public static String APP_ROOT = "http://localhost:8080/app";
-
-    public static String AUTH_SERVER_ROOT = "http://localhost:8080/auth-server";
+    public static String AUTH_SERVER_ROOT = "http://localhost:8081/auth-server";
 
 }
diff --git a/testsuite/src/test/java/org/keycloak/testsuite/forms/AccountTest.java b/testsuite/src/test/java/org/keycloak/testsuite/forms/AccountTest.java
new file mode 100644
index 0000000..d00d926
--- /dev/null
+++ b/testsuite/src/test/java/org/keycloak/testsuite/forms/AccountTest.java
@@ -0,0 +1,146 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.keycloak.testsuite.forms;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.keycloak.representations.idm.CredentialRepresentation;
+import org.keycloak.services.managers.RealmManager;
+import org.keycloak.services.models.RealmModel;
+import org.keycloak.services.models.UserCredentialModel;
+import org.keycloak.services.models.UserModel;
+import org.keycloak.testsuite.OAuthClient;
+import org.keycloak.testsuite.pages.AccountPasswordPage;
+import org.keycloak.testsuite.pages.AccountTotpPage;
+import org.keycloak.testsuite.pages.AccountUpdateProfilePage;
+import org.keycloak.testsuite.pages.LoginPage;
+import org.keycloak.testsuite.rule.KeycloakRule;
+import org.keycloak.testsuite.rule.KeycloakRule.KeycloakSetup;
+import org.keycloak.testsuite.rule.WebResource;
+import org.keycloak.testsuite.rule.WebRule;
+import org.openqa.selenium.WebDriver;
+import org.picketlink.idm.credential.util.TimeBasedOTP;
+
+/**
+ * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
+ */
+public class AccountTest {
+
+    @ClassRule
+    public static KeycloakRule keycloakRule = new KeycloakRule();
+
+    @Rule
+    public WebRule webRule = new WebRule(this);
+
+    @WebResource
+    protected WebDriver driver;
+
+    @WebResource
+    protected OAuthClient oauth;
+
+    @WebResource
+    protected LoginPage loginPage;
+
+    @WebResource
+    protected AccountPasswordPage changePasswordPage;
+
+    @WebResource
+    protected AccountUpdateProfilePage profilePage;
+
+    @WebResource
+    protected AccountTotpPage totpPage;
+
+    private TimeBasedOTP totp = new TimeBasedOTP();
+
+    @After
+    public void after() {
+        keycloakRule.configure(new KeycloakSetup() {
+            @Override
+            public void config(RealmManager manager, RealmModel defaultRealm, RealmModel appRealm) {
+                UserModel user = appRealm.getUser("test-user@localhost");
+
+                UserCredentialModel cred = new UserCredentialModel();
+                cred.setType(CredentialRepresentation.PASSWORD);
+                cred.setValue("password");
+
+                appRealm.updateCredential(user, cred);
+            }
+        });
+    }
+
+    @Test
+    public void changePassword() {
+        loginPage.open();
+        loginPage.login("test-user@localhost", "password");
+
+        changePasswordPage.open();
+        changePasswordPage.changePassword("password", "new-password", "new-password");
+
+        oauth.openLogout();
+
+        loginPage.open();
+        loginPage.login("test-user@localhost", "password");
+
+        Assert.assertEquals("Invalid username or password", loginPage.getError());
+
+        loginPage.open();
+        loginPage.login("test-user@localhost", "new-password");
+
+        Assert.assertTrue("Expected authorization response", oauth.isAuthorizationResponse());
+    }
+
+    @Test
+    public void changeProfile() {
+        loginPage.open();
+        loginPage.login("test-user@localhost", "password");
+
+        profilePage.open();
+
+        Assert.assertEquals("", profilePage.getFirstName());
+        Assert.assertEquals("", profilePage.getLastName());
+        Assert.assertEquals("test-user@localhost", profilePage.getEmail());
+
+        profilePage.updateProfile("New first", "New last", "new@email.com");
+
+        Assert.assertEquals("New first", profilePage.getFirstName());
+        Assert.assertEquals("New last", profilePage.getLastName());
+        Assert.assertEquals("new@email.com", profilePage.getEmail());
+    }
+
+    @Test
+    public void setupTotp() {
+        loginPage.open();
+        loginPage.login("test-user@localhost", "password");
+
+        totpPage.open();
+
+        Assert.assertTrue(totpPage.isCurrent());
+
+        totpPage.configure(totp.generate(totpPage.getTotpSecret()));
+
+        Assert.assertTrue(driver.getPageSource().contains("Google Authenticator enabled"));
+    }
+
+}
diff --git a/testsuite/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java b/testsuite/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java
new file mode 100644
index 0000000..e38e958
--- /dev/null
+++ b/testsuite/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java
@@ -0,0 +1,119 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.keycloak.testsuite.forms;
+
+import java.net.MalformedURLException;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.keycloak.representations.idm.CredentialRepresentation;
+import org.keycloak.services.managers.RealmManager;
+import org.keycloak.services.models.RealmModel;
+import org.keycloak.services.models.UserCredentialModel;
+import org.keycloak.services.models.UserModel;
+import org.keycloak.testsuite.OAuthClient;
+import org.keycloak.testsuite.pages.LoginPage;
+import org.keycloak.testsuite.pages.LoginTotpPage;
+import org.keycloak.testsuite.rule.GreenMailRule;
+import org.keycloak.testsuite.rule.KeycloakRule;
+import org.keycloak.testsuite.rule.KeycloakRule.KeycloakSetup;
+import org.keycloak.testsuite.rule.WebResource;
+import org.keycloak.testsuite.rule.WebRule;
+import org.openqa.selenium.WebDriver;
+import org.picketlink.idm.credential.util.TimeBasedOTP;
+
+/**
+ * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
+ */
+public class LoginTotpTest {
+
+    @ClassRule
+    public static KeycloakRule keycloakRule = new KeycloakRule(new KeycloakSetup() {
+
+        @Override
+        public void config(RealmManager manager, RealmModel defaultRealm, RealmModel appRealm) {
+            UserModel user = appRealm.getUser("test-user@localhost");
+
+            UserCredentialModel credentials = new UserCredentialModel();
+            credentials.setType(CredentialRepresentation.TOTP);
+            credentials.setValue("totpSecret");
+            appRealm.updateCredential(user, credentials);
+
+            user.setTotp(true);
+        }
+
+    });
+
+    @Rule
+    public WebRule webRule = new WebRule(this);
+
+    @Rule
+    public GreenMailRule greenMail = new GreenMailRule();
+
+    @WebResource
+    protected WebDriver driver;
+
+    @WebResource
+    protected OAuthClient oauth;
+
+    @WebResource
+    protected LoginPage loginPage;
+
+    @WebResource
+    private LoginTotpPage loginTotpPage;
+
+    private TimeBasedOTP totp = new TimeBasedOTP();
+
+    @Before
+    public void before() throws MalformedURLException {
+        totp = new TimeBasedOTP();
+    }
+
+    @Test
+    public void loginWithTotpFailure() {
+        loginPage.open();
+        loginPage.login("test-user@localhost", "password");
+
+        loginTotpPage.assertCurrent();
+
+        loginTotpPage.login("123456");
+
+        loginPage.assertCurrent();
+        Assert.assertEquals("Invalid username or password", loginPage.getError());
+    }
+
+    @Test
+    public void loginWithTotpSuccess() {
+        loginPage.open();
+        loginPage.login("test-user@localhost", "password");
+
+        loginTotpPage.assertCurrent();
+
+        loginTotpPage.login(totp.generate("totpSecret"));
+
+        Assert.assertTrue("Expected authorization response", oauth.isAuthorizationResponse());
+    }
+
+}
diff --git a/testsuite/src/test/java/org/keycloak/testsuite/OAuthClient.java b/testsuite/src/test/java/org/keycloak/testsuite/OAuthClient.java
new file mode 100644
index 0000000..34ad2b8
--- /dev/null
+++ b/testsuite/src/test/java/org/keycloak/testsuite/OAuthClient.java
@@ -0,0 +1,152 @@
+package org.keycloak.testsuite;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.ws.rs.core.UriBuilder;
+
+import org.apache.http.NameValuePair;
+import org.apache.http.client.utils.URLEncodedUtils;
+import org.openqa.selenium.WebDriver;
+
+public class OAuthClient {
+
+    private WebDriver driver;
+
+    private String baseUrl = "http://localhost:8081/auth-server/rest";
+
+    private String realm = "test";
+
+    private String responseType = "code";
+
+    private String clientId = "test-app";
+
+    private String redirectUri = "http://localhost:8081/app/auth";
+
+    private String scope;
+
+    private String state;
+
+    public OAuthClient(WebDriver driver) {
+        this.driver = driver;
+    }
+
+    // public void login(String username, String password) throws UnsupportedEncodingException {
+    // HttpClient client = new DefaultHttpClient();
+    // HttpPost post = new HttpPost(getLoginFormUrl());
+    //
+    // List<NameValuePair> parameters = new LinkedList<NameValuePair>();
+    // parameters.add(new BasicNameValuePair("username", username));
+    // parameters.add(new BasicNameValuePair("password", password));
+    //
+    // UrlEncodedFormEntity formEntity = new UrlEncodedFormEntity(parameters, Charset.forName("UTF-8"));
+    // post.setEntity(formEntity);
+    // }
+
+    public boolean isAuthorizationResponse() {
+        return getCurrentRequest().equals(redirectUri) && getCurrentQuery().containsKey("code");
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    public String getResponseType() {
+        return responseType;
+    }
+
+    public String getCurrentRequest() {
+        return driver.getCurrentUrl().substring(0, driver.getCurrentUrl().indexOf('?'));
+    }
+
+    public URI getCurrentUri() {
+        try {
+            return new URI(driver.getCurrentUrl());
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public Map<String, String> getCurrentQuery() {
+        Map<String, String> m = new HashMap<String, String>();
+        List<NameValuePair> pairs = URLEncodedUtils.parse(getCurrentUri(), "UTF-8");
+        for (NameValuePair p : pairs) {
+            m.put(p.getName(), p.getValue());
+        }
+        return m;
+    }
+
+    public void openLoginForm() {
+        driver.navigate().to(getLoginFormUrl());
+    }
+
+    public void openLogout() {
+        UriBuilder b = UriBuilder.fromUri(baseUrl + "/realms/" + realm + "/tokens/logout");
+        if (redirectUri != null) {
+            b.queryParam("redirect_uri", redirectUri);
+        }
+        driver.navigate().to(b.build().toString());
+    }
+
+    public String getRedirectUri() {
+        return redirectUri;
+    }
+
+    public String getScope() {
+        return scope;
+    }
+
+    public String getLoginFormUrl() {
+        UriBuilder b = UriBuilder.fromUri(baseUrl + "/realms/" + realm + "/tokens/login");
+        b.queryParam("response_type", responseType);
+        b.queryParam("client_id", clientId);
+        if (redirectUri != null) {
+            b.queryParam("redirect_uri", redirectUri);
+        }
+        if (scope != null) {
+            b.queryParam("scope", scope);
+        }
+        if (state != null) {
+            b.queryParam("state", state);
+        }
+        return b.build().toString();
+    }
+
+    public OAuthClient realm(String realm) {
+        this.realm = realm;
+        return this;
+    }
+
+    public OAuthClient clientId(String clientId) {
+        this.clientId = clientId;
+        return this;
+    }
+
+    public OAuthClient redirectUri(String redirectUri) {
+        this.redirectUri = redirectUri;
+        return this;
+    }
+
+    public OAuthClient responseType(String responseType) {
+        this.responseType = responseType;
+        return this;
+    }
+
+    public OAuthClient scope(String scope) {
+        this.scope = scope;
+        return this;
+    }
+
+    public OAuthClient state(String state) {
+        this.state = state;
+        return this;
+    }
+
+}
diff --git a/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginConfigTotpPage.java b/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginConfigTotpPage.java
index 5a16097..e9e5d96 100644
--- a/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginConfigTotpPage.java
+++ b/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginConfigTotpPage.java
@@ -1,16 +1,13 @@
 package org.keycloak.testsuite.pages;
 
-import org.keycloak.testsuite.Constants;
-import org.keycloak.testsuite.rule.Driver;
+import org.keycloak.testsuite.rule.WebResource;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 
-public class LoginConfigTotpPage {
+public class LoginConfigTotpPage extends Page {
 
-    private static String PATH = Constants.AUTH_SERVER_ROOT + "/rest/realms/demo/account/totp";
-
-    @Driver
+    @WebResource
     private WebDriver browser;
 
     @FindBy(id = "totpSecret")
@@ -36,7 +33,7 @@ public class LoginConfigTotpPage {
     }
 
     public void open() {
-        browser.navigate().to(PATH);
+        throw new UnsupportedOperationException();
     }
 
 }
diff --git a/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginPage.java b/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginPage.java
index 8477863..cacd0d9 100644
--- a/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginPage.java
+++ b/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginPage.java
@@ -1,14 +1,9 @@
 package org.keycloak.testsuite.pages;
 
-import org.keycloak.testsuite.rule.Driver;
-import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 
-public class LoginPage {
-
-    @Driver
-    private WebDriver browser;
+public class LoginPage extends Page {
 
     @FindBy(id = "username")
     private WebElement usernameInput;
@@ -43,10 +38,10 @@ public class LoginPage {
     }
 
     public boolean isCurrent() {
-        return browser.getTitle().equals("Log in to demo");
+        return driver.getTitle().equals("Log in to test");
     }
 
-    public void register() {
+    public void clickRegister() {
         registerLink.click();
     }
 
@@ -54,4 +49,10 @@ public class LoginPage {
         resetPasswordLink.click();
     }
 
+    @Override
+    public void open() {
+        oauth.openLoginForm();
+        assertCurrent();
+    }
+
 }
diff --git a/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginPasswordResetPage.java b/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginPasswordResetPage.java
index 14da7d4..7cbb213 100644
--- a/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginPasswordResetPage.java
+++ b/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginPasswordResetPage.java
@@ -1,16 +1,13 @@
 package org.keycloak.testsuite.pages;
 
-import org.keycloak.testsuite.Constants;
-import org.keycloak.testsuite.rule.Driver;
+import org.keycloak.testsuite.rule.WebResource;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 
-public class LoginPasswordResetPage {
+public class LoginPasswordResetPage extends Page {
 
-    private static String PATH = Constants.AUTH_SERVER_ROOT + "/rest/realms/demo/account/password";
-
-    @Driver
+    @WebResource
     private WebDriver browser;
 
     @FindBy(id = "username")
@@ -34,7 +31,7 @@ public class LoginPasswordResetPage {
     }
 
     public void open() {
-        browser.navigate().to(PATH);
+        throw new UnsupportedOperationException();
     }
 
 }
diff --git a/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginPasswordUpdatePage.java b/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginPasswordUpdatePage.java
index 7136a2c..b06f5e2 100644
--- a/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginPasswordUpdatePage.java
+++ b/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginPasswordUpdatePage.java
@@ -1,16 +1,13 @@
 package org.keycloak.testsuite.pages;
 
-import org.keycloak.testsuite.Constants;
-import org.keycloak.testsuite.rule.Driver;
+import org.keycloak.testsuite.rule.WebResource;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 
-public class LoginPasswordUpdatePage {
+public class LoginPasswordUpdatePage extends Page {
 
-    private static String PATH = Constants.AUTH_SERVER_ROOT + "/rest/realms/demo/account/password";
-
-    @Driver
+    @WebResource
     private WebDriver browser;
 
     @FindBy(id = "password-new")
@@ -34,7 +31,7 @@ public class LoginPasswordUpdatePage {
     }
 
     public void open() {
-        browser.navigate().to(PATH);
+        throw new UnsupportedOperationException();
     }
 
 }
diff --git a/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginTotpPage.java b/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginTotpPage.java
index 18b6423..f0f2421 100644
--- a/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginTotpPage.java
+++ b/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginTotpPage.java
@@ -1,13 +1,14 @@
 package org.keycloak.testsuite.pages;
 
-import org.keycloak.testsuite.rule.Driver;
+import org.keycloak.testsuite.rule.WebResource;
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 
-public class LoginTotpPage {
+public class LoginTotpPage extends Page {
 
-    @Driver
+    @WebResource
     private WebDriver browser;
 
     @FindBy(id = "totp")
@@ -16,9 +17,6 @@ public class LoginTotpPage {
     @FindBy(css = "input[type=\"submit\"]")
     private WebElement submitButton;
 
-    @FindBy(linkText = "Register")
-    private WebElement registerLink;
-
     @FindBy(id = "loginError")
     private WebElement loginErrorMessage;
 
@@ -33,7 +31,19 @@ public class LoginTotpPage {
     }
 
     public boolean isCurrent() {
-        return browser.getTitle().equals("Log in to demo");
+        if (browser.getTitle().equals("Log in to test")) {
+            try {
+                browser.findElement(By.id("totp"));
+                return true;
+            } catch (Throwable t) {
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void open() {
+        throw new UnsupportedOperationException();
     }
 
 }
diff --git a/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginUpdateProfilePage.java b/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginUpdateProfilePage.java
index 73950f3..4020729 100644
--- a/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginUpdateProfilePage.java
+++ b/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginUpdateProfilePage.java
@@ -1,13 +1,13 @@
 package org.keycloak.testsuite.pages;
 
-import org.keycloak.testsuite.rule.Driver;
+import org.keycloak.testsuite.rule.WebResource;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 
-public class LoginUpdateProfilePage {
+public class LoginUpdateProfilePage extends Page {
 
-    @Driver
+    @WebResource
     private WebDriver browser;
 
     @FindBy(id = "firstName")
@@ -26,8 +26,11 @@ public class LoginUpdateProfilePage {
     private WebElement loginErrorMessage;
 
     public void update(String firstName, String lastName, String email) {
+        firstNameInput.clear();
         firstNameInput.sendKeys(firstName);
+        lastNameInput.clear();
         lastNameInput.sendKeys(lastName);
+        emailInput.clear();
         emailInput.sendKeys(email);
 
         submitButton.click();
@@ -41,4 +44,9 @@ public class LoginUpdateProfilePage {
         return browser.getTitle().equals("Update profile");
     }
 
+    @Override
+    public void open() {
+        throw new UnsupportedOperationException();
+    }
+
 }
diff --git a/testsuite/src/test/java/org/keycloak/testsuite/pages/Page.java b/testsuite/src/test/java/org/keycloak/testsuite/pages/Page.java
new file mode 100644
index 0000000..31836d2
--- /dev/null
+++ b/testsuite/src/test/java/org/keycloak/testsuite/pages/Page.java
@@ -0,0 +1,26 @@
+package org.keycloak.testsuite.pages;
+
+import org.junit.Assert;
+import org.keycloak.testsuite.OAuthClient;
+import org.keycloak.testsuite.rule.WebResource;
+import org.openqa.selenium.WebDriver;
+
+public abstract class Page {
+
+    @WebResource
+    protected WebDriver driver;
+
+    @WebResource
+    protected OAuthClient oauth;
+
+    public void assertCurrent() {
+        String name = getClass().getSimpleName();
+        Assert.assertTrue("Exptected " + name + " but was " + driver.getTitle() + " (" + driver.getCurrentUrl() + ")",
+                isCurrent());
+    }
+
+    abstract boolean isCurrent();
+
+    abstract void open();
+
+}
diff --git a/testsuite/src/test/java/org/keycloak/testsuite/pages/RegisterPage.java b/testsuite/src/test/java/org/keycloak/testsuite/pages/RegisterPage.java
index 6012a56..948da3a 100644
--- a/testsuite/src/test/java/org/keycloak/testsuite/pages/RegisterPage.java
+++ b/testsuite/src/test/java/org/keycloak/testsuite/pages/RegisterPage.java
@@ -1,13 +1,13 @@
 package org.keycloak.testsuite.pages;
 
-import org.keycloak.testsuite.rule.Driver;
+import org.keycloak.testsuite.rule.WebResource;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 
-public class RegisterPage {
+public class RegisterPage extends Page {
 
-    @Driver
+    @WebResource
     private WebDriver browser;
 
     @FindBy(id = "name")
@@ -60,7 +60,12 @@ public class RegisterPage {
     }
 
     public boolean isCurrent() {
-        return browser.getTitle().equals("Register with demo");
+        return browser.getTitle().equals("Register with test");
+    }
+
+    @Override
+    public void open() {
+        throw new UnsupportedOperationException();
     }
 
 }
diff --git a/testsuite/src/test/java/org/keycloak/testsuite/rule/GreenMailRule.java b/testsuite/src/test/java/org/keycloak/testsuite/rule/GreenMailRule.java
index da659d4..f57d666 100644
--- a/testsuite/src/test/java/org/keycloak/testsuite/rule/GreenMailRule.java
+++ b/testsuite/src/test/java/org/keycloak/testsuite/rule/GreenMailRule.java
@@ -2,6 +2,9 @@ package org.keycloak.testsuite.rule;
 
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.net.SocketException;
+import java.util.Iterator;
+import java.util.Map.Entry;
+import java.util.Properties;
 
 import javax.mail.internet.MimeMessage;
 
@@ -14,8 +17,23 @@ public class GreenMailRule extends ExternalResource {
 
     private GreenMail greenMail;
 
+    private Properties originalProperties = new Properties();
+
     @Override
     protected void before() throws Throwable {
+        Iterator<Entry<Object, Object>> itr = System.getProperties().entrySet().iterator();
+        while (itr.hasNext()) {
+            Entry<Object, Object> e = itr.next();
+            if (((String) e.getKey()).startsWith("keycloak.mail")) {
+                originalProperties.put(e.getKey(), e.getValue());
+                itr.remove();
+            }
+        }
+        
+        System.setProperty("keycloak.mail.smtp.from", "auto@keycloak.org");
+        System.setProperty("keycloak.mail.smtp.host", "localhost");
+        System.setProperty("keycloak.mail.smtp.port", "3025");
+        
         ServerSetup setup = new ServerSetup(3025, "localhost", "smtp");
 
         greenMail = new GreenMail(setup);
@@ -39,6 +57,11 @@ public class GreenMailRule extends ExternalResource {
 
             greenMail.stop();
         }
+
+        System.getProperties().remove("keycloak.mail.smtp.from");
+        System.getProperties().remove("keycloak.mail.smtp.host");
+        System.getProperties().remove("keycloak.mail.smtp.port");
+        System.getProperties().putAll(originalProperties);
     }
 
     public MimeMessage[] getReceivedMessages() {
diff --git a/testsuite/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java b/testsuite/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java
new file mode 100644
index 0000000..d69d8cd
--- /dev/null
+++ b/testsuite/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java
@@ -0,0 +1,179 @@
+package org.keycloak.testsuite.rule;
+
+import io.undertow.server.handlers.resource.ClassPathResourceManager;
+import io.undertow.servlet.Servlets;
+import io.undertow.servlet.api.DeploymentInfo;
+import io.undertow.servlet.api.FilterInfo;
+import io.undertow.servlet.api.ServletInfo;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.servlet.DispatcherType;
+
+import org.jboss.resteasy.jwt.JsonSerialization;
+import org.jboss.resteasy.plugins.server.undertow.UndertowJaxrsServer;
+import org.jboss.resteasy.spi.ResteasyDeployment;
+import org.junit.rules.ExternalResource;
+import org.keycloak.representations.idm.CredentialRepresentation;
+import org.keycloak.representations.idm.RealmRepresentation;
+import org.keycloak.services.filters.KeycloakSessionServletFilter;
+import org.keycloak.services.managers.RealmManager;
+import org.keycloak.services.models.KeycloakSession;
+import org.keycloak.services.models.KeycloakSessionFactory;
+import org.keycloak.services.models.RealmModel;
+import org.keycloak.services.models.RoleModel;
+import org.keycloak.services.models.UserModel;
+import org.keycloak.services.resources.KeycloakApplication;
+import org.keycloak.services.resources.SaasService;
+import org.keycloak.testsuite.ApplicationServlet;
+
+public class KeycloakRule extends ExternalResource {
+
+    private String testRealm = "testrealm.json";
+
+    private UndertowJaxrsServer server;
+    private KeycloakSessionFactory factory;
+
+    private KeycloakSetup setup;
+
+    public KeycloakRule() {
+    }
+
+    public KeycloakRule(String testRealm) {
+        this.testRealm = testRealm;
+    }
+    
+    public KeycloakRule(KeycloakSetup setup) {
+        this.setup = setup;
+    }
+
+    protected void before() throws Throwable {
+        ResteasyDeployment deployment = new ResteasyDeployment();
+        deployment.setApplicationClass(KeycloakApplication.class.getName());
+        server = new UndertowJaxrsServer().start();
+
+        DeploymentInfo di = server.undertowDeployment(deployment, "rest");
+        di.setClassLoader(getClass().getClassLoader());
+        di.setContextPath("/auth-server");
+        di.setDeploymentName("Keycloak");
+        di.setResourceManager(new ClassPathResourceManager(getClass().getClassLoader(), "META-INF/resources"));
+
+        FilterInfo filter = Servlets.filter("SessionFilter", KeycloakSessionServletFilter.class);
+        di.addFilter(filter);
+        di.addFilterUrlMapping("SessionFilter", "/rest/*", DispatcherType.REQUEST);
+
+        server.deploy(di);
+
+        factory = KeycloakApplication.buildSessionFactory();
+
+        setupDefaultRealm();
+
+        importRealm(testRealm);
+
+        if (setup != null) {
+            configure(setup);
+        }
+
+        DeploymentInfo deploymentInfo = new DeploymentInfo();
+        deploymentInfo.setClassLoader(getClass().getClassLoader());
+        deploymentInfo.setDeploymentName("app");
+        deploymentInfo.setContextPath("/app");
+
+        ServletInfo servlet = new ServletInfo(ApplicationServlet.class.getSimpleName(), ApplicationServlet.class);
+        servlet.addMapping("/*");
+
+        deploymentInfo.addServlet(servlet);
+        server.deploy(deploymentInfo);
+    }
+
+    @Override
+    protected void after() {
+        factory.close();
+        server.stop();
+    }
+
+    public RealmRepresentation loadJson(String path) throws IOException {
+        InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(path);
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        int c;
+        while ((c = is.read()) != -1) {
+            os.write(c);
+        }
+        byte[] bytes = os.toByteArray();
+        System.out.println(new String(bytes));
+
+        return JsonSerialization.fromBytes(RealmRepresentation.class, bytes);
+    }
+
+    public void setupDefaultRealm() {
+        KeycloakSession session = createSession();
+        session.getTransaction().begin();
+
+        RealmManager manager = new RealmManager(session);
+
+        RealmModel defaultRealm = manager.createRealm(RealmModel.DEFAULT_REALM, RealmModel.DEFAULT_REALM);
+        defaultRealm.setName(RealmModel.DEFAULT_REALM);
+        defaultRealm.setEnabled(true);
+        defaultRealm.setTokenLifespan(300);
+        defaultRealm.setAccessCodeLifespan(60);
+        defaultRealm.setAccessCodeLifespanUserAction(600);
+        defaultRealm.setSslNotRequired(false);
+        defaultRealm.setCookieLoginAllowed(true);
+        defaultRealm.setRegistrationAllowed(true);
+        defaultRealm.setAutomaticRegistrationAfterSocialLogin(false);
+        manager.generateRealmKeys(defaultRealm);
+        defaultRealm.addRequiredCredential(CredentialRepresentation.PASSWORD);
+        RoleModel role = defaultRealm.addRole(SaasService.REALM_CREATOR_ROLE);
+        UserModel admin = defaultRealm.addUser("admin");
+        defaultRealm.grantRole(admin, role);
+
+        session.getTransaction().commit();
+        session.close();
+    }
+
+    public void importRealm(String name) throws IOException {
+        KeycloakSession session = createSession();
+        session.getTransaction().begin();
+
+        RealmManager manager = new RealmManager(session);
+
+        RealmModel defaultRealm = manager.getRealm(RealmModel.DEFAULT_REALM);
+        UserModel admin = defaultRealm.getUser("admin");
+
+        RealmRepresentation rep = loadJson(name);
+        RealmModel realm = manager.createRealm("test", rep.getRealm());
+        manager.importRealm(rep, realm);
+        realm.addRealmAdmin(admin);
+
+        session.getTransaction().commit();
+        session.close();
+    }
+
+    public void configure(KeycloakSetup configurer) {
+        KeycloakSession session = createSession();
+        session.getTransaction().begin();
+
+        RealmManager manager = new RealmManager(session);
+
+        RealmModel defaultRealm = manager.getRealm(RealmModel.DEFAULT_REALM);
+        RealmModel appRealm = manager.getRealm("test");
+
+        configurer.config(manager, defaultRealm, appRealm);
+
+        session.getTransaction().commit();
+        session.close();
+    }
+
+    public KeycloakSession createSession() {
+        return factory.createSession();
+    }
+    
+    public interface KeycloakSetup {
+        
+        void config(RealmManager manager, RealmModel defaultRealm, RealmModel appRealm);
+        
+    }
+
+}
diff --git a/testsuite/src/test/java/org/keycloak/testsuite/rule/WebRule.java b/testsuite/src/test/java/org/keycloak/testsuite/rule/WebRule.java
index 1adcfa2..7b8d721 100644
--- a/testsuite/src/test/java/org/keycloak/testsuite/rule/WebRule.java
+++ b/testsuite/src/test/java/org/keycloak/testsuite/rule/WebRule.java
@@ -3,6 +3,8 @@ package org.keycloak.testsuite.rule;
 import java.lang.reflect.Field;
 
 import org.junit.rules.ExternalResource;
+import org.keycloak.testsuite.OAuthClient;
+import org.keycloak.testsuite.pages.Page;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.firefox.FirefoxDriver;
@@ -13,6 +15,7 @@ import com.gargoylesoftware.htmlunit.WebClient;
 public class WebRule extends ExternalResource {
 
     private WebDriver driver;
+    private OAuthClient oauth;
     private Object test;
 
     public WebRule(Object test) {
@@ -28,7 +31,7 @@ public class WebRule extends ExternalResource {
 
         if (browser.equals("htmlunit")) {
             HtmlUnitDriver d = new HtmlUnitDriver();
-            d.getWebClient().setCssEnabled(false);
+            d.getWebClient().getOptions().setCssEnabled(false);
             driver = d;
         } else if (browser.equals("chrome")) {
             driver = new ChromeDriver();
@@ -38,29 +41,26 @@ public class WebRule extends ExternalResource {
             throw new RuntimeException("Unsupported browser " + browser);
         }
 
-        initDriver(test);
-        initPages(test);
-    }
+        oauth = new OAuthClient(driver);
 
-    protected void initDriver(Object o) {
-        Class<?> c = o.getClass();
-        while (c != null) {
-            for (Field f : c.getDeclaredFields()) {
-                if (f.getAnnotation(Driver.class) != null) {
-                    set(f, o, driver);
-                }
-            }
-
-            c = c.getSuperclass();
-        }
+        initWebResources(test);
     }
 
-    protected void initPages(Object o) {
+    protected void initWebResources(Object o) {
         Class<?> c = o.getClass();
         while (c != null) {
             for (Field f : c.getDeclaredFields()) {
-                if (f.getAnnotation(Page.class) != null) {
-                    set(f, o, getPage(f.getType()));
+                if (f.getAnnotation(WebResource.class) != null) {
+                    Class<?> type = f.getType();
+                    if (type.equals(WebDriver.class)) {
+                        set(f, o, driver);
+                    } else if (Page.class.isAssignableFrom(type)) {
+                        set(f, o, getPage(f.getType()));
+                    } else if (type.equals(OAuthClient.class)) {
+                        set(f, o, oauth);
+                    } else {
+                        throw new RuntimeException("Unsupported type " + f);
+                    }
                 }
             }
 
@@ -84,7 +84,7 @@ public class WebRule extends ExternalResource {
     public <T> T getPage(Class<T> pageClass) {
         try {
             T instance = pageClass.newInstance();
-            initDriver(instance);
+            initWebResources(instance);
             PageFactory.initElements(driver, instance);
             return instance;
         } catch (Exception e) {
@@ -94,6 +94,7 @@ public class WebRule extends ExternalResource {
 
     @Override
     protected void after() {
+        driver.manage().deleteAllCookies();
         driver.close();
     }
 
diff --git a/testsuite/src/test/resources/testrealm.json b/testsuite/src/test/resources/testrealm.json
index fea7ab6..383b425 100755
--- a/testsuite/src/test/resources/testrealm.json
+++ b/testsuite/src/test/resources/testrealm.json
@@ -1,5 +1,5 @@
 {
-    "realm": "demo",
+    "realm": "test",
     "enabled": true,
     "tokenLifespan": 300,
     "accessCodeLifespan": 10,
@@ -16,47 +16,9 @@
     "defaultRoles": [ "user" ],
     "users" : [
         {
-            "username" : "bburke@redhat.com",
-            "enabled": true,
-            "email" : "bburke@redhat.com",
-            "credentials" : [
-                { "type" : "password",
-                    "value" : "password" }
-            ]
-        },
-        {
-            "username" : "reset@pass.com",
-            "enabled": true,
-            "requiredActions" : [ "UPDATE_PASSWORD" ],
-            "email" : "reset@pass.com",
-            "credentials" : [
-                { "type" : "password",
-                    "value" : "temp-password" }
-            ]
-        },
-        {
-            "username" : "updateprof@pass.com",
-            "enabled": true,
-            "requiredActions" : [ "UPDATE_PROFILE" ],
-            "email" : "reset@pass.com",
-            "credentials" : [
-                { "type" : "password",
-                    "value" : "password" }
-            ]
-        },
-        {
-            "username" : "multiple@actions.com",
-            "enabled": true,
-            "requiredActions" : [ "UPDATE_PROFILE", "UPDATE_PASSWORD" ],
-            "email" : "multiple@actions.com",
-            "credentials" : [
-                { "type" : "password",
-                    "value" : "temp-password" }
-            ]
-        },
-        {
-            "username" : "third-party",
+            "username" : "test-user@localhost",
             "enabled": true,
+            "email" : "test-user@localhost",
             "credentials" : [
                 { "type" : "password",
                     "value" : "password" }
@@ -75,37 +37,15 @@
     ],
     "roleMappings": [
         {
-            "username": "bburke@redhat.com",
-            "roles": ["user"]
-        },
-        {
-            "username": "reset@pass.com",
-            "roles": ["user"]
-        },
-        {
-            "username": "updateprof@pass.com",
-            "roles": ["user"]
-        },
-        {
-            "username": "multiple@actions.com",
-            "roles": ["user"]
-        },
-        {
-            "username": "third-party",
-            "roles": ["KEYCLOAK_IDENTITY_REQUESTER"]
-        }
-    ],
-    "scopeMappings": [
-        {
-            "username": "third-party",
+            "username": "test-user@localhost",
             "roles": ["user"]
         }
     ],
     "applications": [
         {
-            "name": "customer-portal",
+            "name": "test-app",
             "enabled": true,
-            "adminUrl": "http://localhost:8080/app/j_admin_request",
+            "adminUrl": "http://localhost:8081/app/logout",
             "useRealmMappings": true,
             "credentials": [
                 {