From 6cb7289db0d084e72c39baeeaff1cd9a576e03c7 Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Thu, 12 Sep 2013 09:19:02 +0100
Subject: [PATCH] Fixed testsuite for changes to KeycloakApplication

---
 .../keycloak/testsuite/TestApplication.java   | 42 +++++++++----------
 testsuite/src/test/resources/web.xml          | 10 +++++
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/testsuite/src/test/java/org/keycloak/testsuite/TestApplication.java b/testsuite/src/test/java/org/keycloak/testsuite/TestApplication.java
index 0b1dcf5df8..6b8b1218ae 100755
--- a/testsuite/src/test/java/org/keycloak/testsuite/TestApplication.java
+++ b/testsuite/src/test/java/org/keycloak/testsuite/TestApplication.java
@@ -25,6 +25,9 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import javax.servlet.ServletContext;
+import javax.ws.rs.core.Context;
+
 import org.jboss.resteasy.jwt.JsonSerialization;
 import org.keycloak.representations.idm.CredentialRepresentation;
 import org.keycloak.representations.idm.RealmRepresentation;
@@ -40,27 +43,8 @@ import org.keycloak.services.resources.SaasService;
  */
 public class TestApplication extends KeycloakApplication {
 
-    public static RealmRepresentation loadJson(String path)
-    {
-        InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(path);
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        int c;
-        try {
-            while ( (c = is.read()) != -1)
-            {
-                os.write(c);
-            }
-            byte[] bytes = os.toByteArray();
-            //System.out.println(new String(bytes));
-
-            return JsonSerialization.fromBytes(RealmRepresentation.class, bytes);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public TestApplication() {
-        super();
+    public TestApplication(@Context ServletContext servletContext) {
+        super(servletContext);
         KeycloakSession session = factory.createSession();
         session.getTransaction().begin();
         RealmManager realmManager = new RealmManager(session);
@@ -90,5 +74,21 @@ public class TestApplication extends KeycloakApplication {
 
     }
 
+    public static RealmRepresentation loadJson(String path) {
+        InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(path);
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        int c;
+        try {
+            while ((c = is.read()) != -1) {
+                os.write(c);
+            }
+            byte[] bytes = os.toByteArray();
+            // System.out.println(new String(bytes));
+
+            return JsonSerialization.fromBytes(RealmRepresentation.class, bytes);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
 }
diff --git a/testsuite/src/test/resources/web.xml b/testsuite/src/test/resources/web.xml
index 76426e6ccd..243f73a3ed 100755
--- a/testsuite/src/test/resources/web.xml
+++ b/testsuite/src/test/resources/web.xml
@@ -21,6 +21,16 @@
         <async-supported>true</async-supported>
     </servlet>
 
+    <filter>
+        <filter-name>Keycloak Session Management</filter-name>
+        <filter-class>org.keycloak.services.filters.KeycloakSessionServletFilter</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>Keycloak Session Management</filter-name>
+        <url-pattern>/rest/*</url-pattern>
+    </filter-mapping>
+
     <servlet-mapping>
         <servlet-name>Resteasy</servlet-name>
         <url-pattern>/rest/*</url-pattern>