Merge remote-tracking branch 'upstream/master'

testsuite/integration-arquillian/servers/auth-server/jboss/wildfly/pom.xml

@@ -30,6 +30,14 @@
     <artifactId>integration-arquillian-servers-auth-server-wildfly</artifactId>
     
     <name>Auth Server - JBoss - Wildfly</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-server-dist</artifactId>
+            <type>zip</type>
+        </dependency>
+    </dependencies>
     
     <properties>
         <auth.server.jboss>wildfly</auth.server.jboss>

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LoginStatusIframeEndpointTest.java

@@ -42,6 +42,7 @@ import org.keycloak.representations.idm.RealmRepresentation;
 import org.keycloak.testsuite.AbstractKeycloakTest;
 import org.keycloak.testsuite.ActionURIUtils;
 import org.keycloak.testsuite.runonserver.RunOnServerDeployment;
+import org.keycloak.testsuite.runonserver.ServerVersion;
 
 import java.io.IOException;
 import java.net.URLEncoder;
@@ -63,7 +64,7 @@ public class LoginStatusIframeEndpointTest extends AbstractKeycloakTest {
 
     @Deployment
     public static WebArchive deploy() {
-        return RunOnServerDeployment.create(LoginStatusIframeEndpointTest.class);
+        return RunOnServerDeployment.create(LoginStatusIframeEndpointTest.class, ServerVersion.class);
     }
 
     @Test
@@ -197,20 +198,24 @@ public class LoginStatusIframeEndpointTest extends AbstractKeycloakTest {
 
     @Test
     public void checkIframeCache() throws IOException {
-        String version = testingClient.server().fetch(session -> Version.RESOURCES_VERSION, String.class);
+        String version = testingClient.server().fetch(new ServerVersion());
 
         CloseableHttpClient client = HttpClients.createDefault();
-        HttpGet get = new HttpGet(suiteContext.getAuthServerInfo().getContextRoot() + "/auth/realms/master/protocol/openid-connect/login-status-iframe.html");
-        CloseableHttpResponse response = client.execute(get);
+        try {
+            HttpGet get = new HttpGet(suiteContext.getAuthServerInfo().getContextRoot() + "/auth/realms/master/protocol/openid-connect/login-status-iframe.html");
+            CloseableHttpResponse response = client.execute(get);
 
-        assertEquals(200, response.getStatusLine().getStatusCode());
-        assertEquals("no-cache, must-revalidate, no-transform, no-store", response.getHeaders("Cache-Control")[0].getValue());
+            assertEquals(200, response.getStatusLine().getStatusCode());
+            assertEquals("no-cache, must-revalidate, no-transform, no-store", response.getHeaders("Cache-Control")[0].getValue());
 
-        get = new HttpGet(suiteContext.getAuthServerInfo().getContextRoot() + "/auth/realms/master/protocol/openid-connect/login-status-iframe.html?version=" + version);
-        response = client.execute(get);
+            get = new HttpGet(suiteContext.getAuthServerInfo().getContextRoot() + "/auth/realms/master/protocol/openid-connect/login-status-iframe.html?version=" + version);
+            response = client.execute(get);
 
-        assertEquals(200, response.getStatusLine().getStatusCode());
-        assertTrue(response.getHeaders("Cache-Control")[0].getValue().contains("max-age"));
+            assertEquals(200, response.getStatusLine().getStatusCode());
+            assertTrue(response.getHeaders("Cache-Control")[0].getValue().contains("max-age"));
+        } finally {
+            client.close();
+        }
     }
 
     @Override

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/runonserver/ServerVersion.java

@@ -0,0 +1,22 @@
+package org.keycloak.testsuite.runonserver;
+
+import org.keycloak.common.Version;
+import org.keycloak.models.utils.ModelToRepresentation;
+import org.keycloak.representations.idm.ComponentRepresentation;
+
+/**
+ * Created by st on 26.01.17.
+ */
+public class ServerVersion implements FetchOnServerWrapper<String> {
+
+    @Override
+    public FetchOnServer getRunOnServer() {
+        return (FetchOnServer) session -> Version.RESOURCES_VERSION;
+    }
+
+    @Override
+    public Class<String> getResultClass() {
+        return String.class;
+    }
+
+}

testsuite/integration-arquillian/tests/base/src/test/resources/log4j.properties

@@ -21,21 +21,15 @@ log4j.appender.keycloak=org.apache.log4j.ConsoleAppender
 log4j.appender.keycloak.layout=org.apache.log4j.PatternLayout
 log4j.appender.keycloak.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p [%c] %m%n
 
-log4j.appender.testsuite=org.apache.log4j.ConsoleAppender
-log4j.appender.testsuite.layout=org.apache.log4j.PatternLayout
-log4j.appender.testsuite.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p [%C{1}] %m%n
-
 # Logging with "info" when running test from IDE, but disabled when running test with "mvn" . Both cases can be overriden by use system property "keycloak.logging.level" (eg. -Dkeycloak.logging.level=debug )
-keycloak.logging.level=info
-log4j.logger.org.keycloak=${keycloak.logging.level}
+log4j.logger.org.keycloak=${keycloak.logging.level:info}
 
 log4j.logger.org.jboss.resteasy.resteasy_jaxrs.i18n=off
 
 #log4j.logger.org.keycloak.keys.DefaultKeyManager=trace
 #log4j.logger.org.keycloak.services.managers.AuthenticationManager=trace
 
-log4j.logger.org.keycloak.testsuite=debug, testsuite
-log4j.additivity.org.keycloak.testsuite=false
+log4j.logger.org.keycloak.testsuite=${keycloak.testsuite.logging.level:debug}
 
 # Enable to view events
 # log4j.logger.org.keycloak.events=debug

testsuite/pom.xml

@@ -53,6 +53,7 @@
         <module>integration</module>
         <module>tomcat8</module>
         <module>integration-arquillian</module>
+        <module>utils</module>
     </modules>
 
     <profiles>

testsuite/utils/pom.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2016 Red Hat, Inc. and/or its affiliates
+  ~ and other contributors as indicated by the @author tags.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>keycloak-testsuite-pom</artifactId>
+        <groupId>org.keycloak</groupId>
+        <version>3.3.0.CR1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>keycloak-testsuite-utils</artifactId>
+    <name>Keycloak TestSuite Utils</name>
+    <description />
+
+    <properties>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+</project>

testsuite/utils/src/main/java/org/keycloak/testsuite/LogTrimmer.java

@@ -0,0 +1,44 @@
+package org.keycloak.testsuite;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+/**
+ * Created by st on 03/07/17.
+ */
+public class LogTrimmer {
+
+    public static void main(String[] args) throws IOException {
+        BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
+        String testRunning = null;
+        StringBuilder sb = new StringBuilder();
+        for(String l = br.readLine(); l != null; l = br.readLine()) {
+            if (testRunning == null) {
+                if (l.startsWith("Running")) {
+                    testRunning = l.split(" ")[1];
+                    System.out.println(l);
+                } else {
+                    System.out.println("-- " + l);
+                }
+            } else {
+                if (l.contains("Tests run:")) {
+                    if (!(l.contains("Failures: 0") && l.contains("Errors: 0"))) {
+                        System.out.println("--------- " + testRunning + " output start ---------");
+                        System.out.println(sb.toString());
+                        System.out.println("--------- " + testRunning + " output end  ---------");
+                    }
+                    System.out.println(l);
+
+
+                    testRunning = null;
+                    sb = new StringBuilder();
+                } else {
+                    sb.append(testRunning.substring(testRunning.lastIndexOf('.') + 1) + " ++ " + l);
+                    sb.append("\n");
+                }
+            }
+        }
+    }
+
+}