diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml index 65bc4ab627..a2a35d0d83 100644 --- a/testsuite/integration-arquillian/pom.xml +++ b/testsuite/integration-arquillian/pom.xml @@ -30,7 +30,7 @@ org.codehaus.mojo xml-maven-plugin - 1.0 + 1.0.1 org.apache.maven.plugins diff --git a/testsuite/integration-arquillian/servers/eap6/pom.xml b/testsuite/integration-arquillian/servers/eap6/pom.xml deleted file mode 100644 index b13f519045..0000000000 --- a/testsuite/integration-arquillian/servers/eap6/pom.xml +++ /dev/null @@ -1,250 +0,0 @@ - - - - org.keycloak.testsuite - integration-arquillian-servers - 1.9.0.CR1-SNAPSHOT - - 4.0.0 - - integration-arquillian-server-eap6 - pom - Server on EAP 6 - - - ${project.build.directory}/unpacked/jboss-eap-6.4 - - - - - org.jboss.as - jboss-as-dist - ${jboss.version} - zip - - - org.keycloak - keycloak-server-overlay-eap6 - ${project.version} - zip - - - org.keycloak - keycloak-eap6-adapter-dist - zip - - - org.keycloak - keycloak-saml-eap6-adapter-dist - zip - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-eap6-and-server-overlay - generate-resources - - unpack - - - - - org.jboss.as - jboss-as-dist - ${jboss.version} - zip - ${project.build.directory}/unpacked - - - org.keycloak - keycloak-server-overlay-eap6 - ${project.version} - zip - ${keycloak.server.home} - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.8 - - - move-standalone-keycloak-xml - process-resources - - run - - - - - - - - - - - maven-assembly-plugin - - - create-zip - package - - single - - - - assembly.xml - - false - - - - - - - - - - adapter-libs-provided - - - !adapter.libs.bundled - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-adapter - generate-resources - - unpack - - - - - org.keycloak - keycloak-eap6-adapter-dist - ${project.version} - zip - ${keycloak.server.home} - - - - - - - - org.codehaus.mojo - xml-maven-plugin - - - configure-adapter-subsystem - process-resources - - transform - - - - - ${keycloak.server.home}/standalone/configuration - - standalone.xml - - src/main/xslt/standalone.xsl - ${keycloak.server.home}/standalone/configuration - - - - - - - - - - - ssl - - - auth.server.ssl.required - - - - - - org.codehaus.mojo - xml-maven-plugin - - - configure-adapter-subsystem-security - process-resources - - transform - - - - - ${keycloak.server.home}/standalone/configuration - - standalone.xml - - src/main/xslt/security.xsl - ${keycloak.server.home}/standalone/configuration - - - - - - - - maven-resources-plugin - 2.7 - - - copy-keystore - process-resources - - copy-resources - - - ${keycloak.server.home}/standalone/configuration - - - src/main/keystore - - keycloak.jks - keycloak.truststore - - - - - - - - - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/eap6/src/main/keystore/keycloak.jks b/testsuite/integration-arquillian/servers/eap6/src/main/keystore/keycloak.jks deleted file mode 100644 index 81570ab529..0000000000 Binary files a/testsuite/integration-arquillian/servers/eap6/src/main/keystore/keycloak.jks and /dev/null differ diff --git a/testsuite/integration-arquillian/servers/eap6/src/main/keystore/keycloak.truststore b/testsuite/integration-arquillian/servers/eap6/src/main/keystore/keycloak.truststore deleted file mode 100644 index 2df5170f9b..0000000000 Binary files a/testsuite/integration-arquillian/servers/eap6/src/main/keystore/keycloak.truststore and /dev/null differ diff --git a/testsuite/integration-arquillian/servers/eap6/src/main/xslt/security.xsl b/testsuite/integration-arquillian/servers/eap6/src/main/xslt/security.xsl deleted file mode 100644 index 4c9667361d..0000000000 --- a/testsuite/integration-arquillian/servers/eap6/src/main/xslt/security.xsl +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/eap6/src/main/xslt/standalone.xsl b/testsuite/integration-arquillian/servers/eap6/src/main/xslt/standalone.xsl deleted file mode 100644 index c0df283ac9..0000000000 --- a/testsuite/integration-arquillian/servers/eap6/src/main/xslt/standalone.xsl +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/eap6/assembly.xml b/testsuite/integration-arquillian/servers/eap7/assembly.xml similarity index 75% rename from testsuite/integration-arquillian/servers/eap6/assembly.xml rename to testsuite/integration-arquillian/servers/eap7/assembly.xml index 537dd4ea25..98df2c8e54 100644 --- a/testsuite/integration-arquillian/servers/eap6/assembly.xml +++ b/testsuite/integration-arquillian/servers/eap7/assembly.xml @@ -1,6 +1,6 @@ - auth-server-eap6 + auth-server-eap7 zip @@ -11,14 +11,14 @@ ${keycloak.server.home} - keycloak-${project.version} + keycloak-${version.server.dist} **/*.sh ${keycloak.server.home} - keycloak-${project.version} + keycloak-${version.server.dist} **/*.sh diff --git a/testsuite/integration-arquillian/servers/eap7/pom.xml b/testsuite/integration-arquillian/servers/eap7/pom.xml new file mode 100644 index 0000000000..67110ef600 --- /dev/null +++ b/testsuite/integration-arquillian/servers/eap7/pom.xml @@ -0,0 +1,247 @@ + + + + org.keycloak.testsuite + integration-arquillian-servers + 1.9.0.CR1-SNAPSHOT + + 4.0.0 + + integration-arquillian-server-eap7 + pom + Server on EAP 7 + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + maven-assembly-plugin + + + create-zip + package + + single + + + + assembly.xml + + false + + + + + + + + + + auth-server-eap7 + + ${project.build.directory}/unpacked/jboss-iam-1.0 + + + + org.keycloak + keycloak-eap6-server-dist + ${version.server.dist} + zip + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-properties + + enforce + + + + + version.server.dist + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-server + generate-resources + + unpack + + + + + org.keycloak + keycloak-eap6-server-dist + ${version.server.dist} + zip + ${project.build.directory}/unpacked + + + + + + + + + + + + jpa + + ${keycloak.server.home}/modules/system/layers/base/com/${jdbc.mvn.artifactId}/main + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-properties + + enforce + + + + + jdbc.mvn.groupId + + + jdbc.mvn.artifactId + + + jdbc.mvn.version + + + keycloak.connectionsJpa.url + + + keycloak.connectionsJpa.user + + + keycloak.connectionsJpa.password + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + jdbc-driver + process-resources + + copy + + + + + ${jdbc.mvn.groupId} + ${jdbc.mvn.artifactId} + ${jdbc.mvn.version} + jar + + + ${jdbc.mvn.driver.deployment.dir} + true + + + + + + org.codehaus.mojo + xml-maven-plugin + + + configure-datasource + process-resources + + transform + + + + + ${keycloak.server.home}/modules/system/layers/base/com/h2database/h2/main + src/main/xslt/module.xsl + + module.xml + + ${jdbc.mvn.driver.deployment.dir} + + + database + ${jdbc.mvn.artifactId} + + + version + ${jdbc.mvn.version} + + + + + ${keycloak.server.home}/standalone/configuration + src/main/xslt/datasource.xsl + + standalone.xml + + ${keycloak.server.home}/standalone/configuration + + + jdbc.url + ${keycloak.connectionsJpa.url} + + + driver + ${jdbc.mvn.artifactId} + + + username + ${keycloak.connectionsJpa.user} + + + password + ${keycloak.connectionsJpa.password} + + + + + ${keycloak.server.home}/standalone/configuration + src/main/xslt/add-dialect-logger.xsl + + standalone.xml + + ${keycloak.server.home}/standalone/configuration + + + + + + + + + + + diff --git a/testsuite/integration-arquillian/servers/eap7/src/main/xslt/add-dialect-logger.xsl b/testsuite/integration-arquillian/servers/eap7/src/main/xslt/add-dialect-logger.xsl new file mode 100644 index 0000000000..b5dc8c4e02 --- /dev/null +++ b/testsuite/integration-arquillian/servers/eap7/src/main/xslt/add-dialect-logger.xsl @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/eap6/src/main/xslt/datasource.xsl b/testsuite/integration-arquillian/servers/eap7/src/main/xslt/datasource.xsl similarity index 90% rename from testsuite/integration-arquillian/servers/eap6/src/main/xslt/datasource.xsl rename to testsuite/integration-arquillian/servers/eap7/src/main/xslt/datasource.xsl index c06899fd74..b33991d51f 100644 --- a/testsuite/integration-arquillian/servers/eap6/src/main/xslt/datasource.xsl +++ b/testsuite/integration-arquillian/servers/eap7/src/main/xslt/datasource.xsl @@ -1,11 +1,7 @@ + exclude-result-prefixes="xalan"> @@ -30,7 +26,7 @@ - + diff --git a/testsuite/integration-arquillian/servers/eap6/src/main/xslt/module.xsl b/testsuite/integration-arquillian/servers/eap7/src/main/xslt/module.xsl similarity index 85% rename from testsuite/integration-arquillian/servers/eap6/src/main/xslt/module.xsl rename to testsuite/integration-arquillian/servers/eap7/src/main/xslt/module.xsl index 88ac56b86c..b6484fa0de 100644 --- a/testsuite/integration-arquillian/servers/eap6/src/main/xslt/module.xsl +++ b/testsuite/integration-arquillian/servers/eap7/src/main/xslt/module.xsl @@ -1,8 +1,7 @@ + exclude-result-prefixes="xalan"> @@ -11,7 +10,7 @@ - + diff --git a/testsuite/integration-arquillian/servers/pom.xml b/testsuite/integration-arquillian/servers/pom.xml index 39111cbc5c..c91ada581d 100644 --- a/testsuite/integration-arquillian/servers/pom.xml +++ b/testsuite/integration-arquillian/servers/pom.xml @@ -24,10 +24,9 @@ - auth-server-eap6 + auth-server-eap7 - - eap6 + eap7 diff --git a/testsuite/integration-arquillian/servers/wildfly/pom.xml b/testsuite/integration-arquillian/servers/wildfly/pom.xml index c6fc965354..99fc5773ab 100644 --- a/testsuite/integration-arquillian/servers/wildfly/pom.xml +++ b/testsuite/integration-arquillian/servers/wildfly/pom.xml @@ -209,31 +209,6 @@ - - org.codehaus.mojo - xml-maven-plugin - - - configure-adapter-subsystem - process-resources - - transform - - - - - ${keycloak.server.home}/standalone/configuration - - standalone.xml - - src/main/xslt/standalone.xsl - ${keycloak.server.home}/standalone/configuration - - - - - - @@ -273,7 +248,6 @@ maven-resources-plugin - 2.7 copy-keystore @@ -309,7 +283,6 @@ org.apache.maven.plugins maven-enforcer-plugin - 1.4 enforce-properties diff --git a/testsuite/integration-arquillian/servers/wildfly/src/main/xslt/datasource.xsl b/testsuite/integration-arquillian/servers/wildfly/src/main/xslt/datasource.xsl index 0c6b3e241a..66e80feb72 100644 --- a/testsuite/integration-arquillian/servers/wildfly/src/main/xslt/datasource.xsl +++ b/testsuite/integration-arquillian/servers/wildfly/src/main/xslt/datasource.xsl @@ -30,7 +30,7 @@ - + diff --git a/testsuite/integration-arquillian/servers/wildfly/src/main/xslt/standalone.xsl b/testsuite/integration-arquillian/servers/wildfly/src/main/xslt/standalone.xsl deleted file mode 100644 index f711ed93b3..0000000000 --- a/testsuite/integration-arquillian/servers/wildfly/src/main/xslt/standalone.xsl +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/adapters/as7/pom.xml b/testsuite/integration-arquillian/tests/adapters/as7/pom.xml index 6abbae821d..e48bab0c82 100644 --- a/testsuite/integration-arquillian/tests/adapters/as7/pom.xml +++ b/testsuite/integration-arquillian/tests/adapters/as7/pom.xml @@ -15,9 +15,14 @@ 7.1.1.Final ${containers.home}/jboss-as-${as7.version} ${containers.home}/keycloak-as7-adapter-dist + 150 + + org.wildfly + wildfly-arquillian-container-managed + org.jboss.as jboss-as-dist @@ -25,12 +30,13 @@ zip - org.wildfly - wildfly-arquillian-container-managed + org.keycloak + keycloak-as7-adapter-dist + zip org.keycloak - keycloak-eap6-adapter-dist + keycloak-saml-as7-adapter-dist zip @@ -70,6 +76,13 @@ zip ${adapter.libs.as7} + + org.keycloak + keycloak-saml-as7-adapter-dist + ${project.version} + zip + ${adapter.libs.as7} + @@ -79,15 +92,36 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 true ${app.server.as7.home} ${adapter.libs.as7} + ${startup.timeout.sec} + ${adapter.as7.jdk7.path} + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-properties + + enforce + + + + + adapter.as7.jdk7.path + + + + + + @@ -102,35 +136,6 @@ ${app.server.as7.home} - - - - org.codehaus.mojo - xml-maven-plugin - - - configure-adapter-subsystem - process-resources - - transform - - - - - ${app.server.as7.home}/standalone/configuration - - standalone.xml - - src/main/xslt/standalone.xsl - ${app.server.as7.home}/standalone/configuration - - - - - - - - diff --git a/testsuite/integration-arquillian/tests/adapters/as7/src/main/xslt/arquillian.xsl b/testsuite/integration-arquillian/tests/adapters/as7/src/main/xslt/arquillian.xsl index 9ba1e9403f..1ffc5c347f 100644 --- a/testsuite/integration-arquillian/tests/adapters/as7/src/main/xslt/arquillian.xsl +++ b/testsuite/integration-arquillian/tests/adapters/as7/src/main/xslt/arquillian.xsl @@ -20,6 +20,8 @@ localhost remote ${app.server.management.port.jmx} + ${startup.timeout.sec} + ${adapter.as7.jdk7.path} diff --git a/testsuite/integration-arquillian/tests/adapters/as7/src/main/xslt/standalone.xsl b/testsuite/integration-arquillian/tests/adapters/as7/src/main/xslt/standalone.xsl deleted file mode 100644 index 5aac0f02d6..0000000000 --- a/testsuite/integration-arquillian/tests/adapters/as7/src/main/xslt/standalone.xsl +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml index a427bdb483..300d4b6f5b 100644 --- a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml +++ b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml @@ -14,19 +14,20 @@ ${containers.home}/jboss-eap-6.4 ${containers.home}/keycloak-eap6-adapter-dist + ${project.version} + + org.wildfly + wildfly-arquillian-container-managed + org.jboss.as jboss-as-dist ${jboss.version} zip - - org.wildfly - wildfly-arquillian-container-managed - org.keycloak keycloak-eap6-adapter-dist @@ -48,12 +49,23 @@ true + + org.apache.maven.plugins + maven-surefire-plugin + + + true + ${app.server.eap6.home} + ${adapter.libs.eap6} + + + org.apache.maven.plugins maven-dependency-plugin - unpack-as7-and-adapter + unpack-eap6-with-adapters generate-resources unpack @@ -70,7 +82,7 @@ org.keycloak keycloak-eap6-adapter-dist - ${project.version} + ${version.adapter.dist} zip ${adapter.libs.eap6} @@ -86,48 +98,53 @@ - - - org.apache.maven.plugins - maven-surefire-plugin - 2.18.1 - - - true - ${app.server.eap6.home} - ${adapter.libs.eap6} - - - - - org.codehaus.mojo - xml-maven-plugin - - - configure-adapter-subsystem - process-resources - - transform - - - - - ${app.server.eap6.home}/standalone/configuration - - standalone.xml - - src/main/xslt/standalone.xsl - ${app.server.eap6.home}/standalone/configuration - - - - - - + + adapter-jdk + + + adapter.jdk + + + + + + org.codehaus.mojo + xml-maven-plugin + + + add-java-home-to-arquillian-xml + process-resources + + transform + + + + + ${project.build.directory}/dependency + + arquillian.xml + + src/main/xslt/arquillian_jdk.xsl + + + javaHome + ${adapter.jdk} + + + ${project.build.directory}/dependency + + + + + + + + + adapter-libs-provided @@ -138,35 +155,6 @@ ${app.server.eap6.home} - - - - org.codehaus.mojo - xml-maven-plugin - - - configure-adapter-subsystem - process-resources - - transform - - - - - ${app.server.eap6.home}/standalone/configuration - - standalone.xml - - src/main/xslt/standalone.xsl - ${app.server.eap6.home}/standalone/configuration - - - - - - - - ssl @@ -204,7 +192,6 @@ maven-resources-plugin - 2.7 copy-keystore @@ -213,20 +200,20 @@ copy-resources - ${app.server.eap6.home}/standalone/configuration - - - src/main/keystore - - adapter.jks - keycloak.truststore - - - - + ${app.server.eap6.home}/standalone/configuration + + + src/main/keystore + + adapter.jks + keycloak.truststore + + + + jks truststore - + diff --git a/testsuite/integration-arquillian/tests/adapters/eap6/src/main/xslt/arquillian_jdk.xsl b/testsuite/integration-arquillian/tests/adapters/eap6/src/main/xslt/arquillian_jdk.xsl new file mode 100644 index 0000000000..53d0b2a3e6 --- /dev/null +++ b/testsuite/integration-arquillian/tests/adapters/eap6/src/main/xslt/arquillian_jdk.xsl @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/adapters/eap6/src/main/xslt/standalone.xsl b/testsuite/integration-arquillian/tests/adapters/eap6/src/main/xslt/standalone.xsl deleted file mode 100644 index 3ef9ff0bb8..0000000000 --- a/testsuite/integration-arquillian/tests/adapters/eap6/src/main/xslt/standalone.xsl +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/adapters/pom.xml b/testsuite/integration-arquillian/tests/adapters/pom.xml index 87d5617f77..4c2afc48ff 100644 --- a/testsuite/integration-arquillian/tests/adapters/pom.xml +++ b/testsuite/integration-arquillian/tests/adapters/pom.xml @@ -23,6 +23,7 @@ - src/main/xslt/arquillian.xsl + false @@ -50,12 +51,29 @@ + + unpack-add-user-json + generate-resources + + unpack + + + + + org.keycloak.testsuite + integration-arquillian-tests-base + ${project.version} + test-jar + **/keycloak-add-user.json + + + + org.codehaus.mojo xml-maven-plugin - 1.0 add-app-server-to-arquillian-xml @@ -109,6 +127,31 @@ + + org.apache.maven.plugins + maven-resources-plugin + + + copy-admin-user-json-file + process-test-resources + + copy-resources + + + ${jboss.server.config.dir} + + + ${project.build.directory}/dependency + + keycloak-add-user.json + + true + + + + + + @@ -190,7 +233,6 @@ org.apache.maven.plugins maven-dependency-plugin - 2.10 example-wars @@ -342,6 +384,12 @@ wildfly-relative + + app-server-eap6 + + eap6 + + app-server-wildfly @@ -372,12 +420,6 @@ karaf - - app-server-eap6 - - eap6 - - no-adapter-tests @@ -385,6 +427,13 @@ **/adapter/**/*Test.java + + no-relative + + + **/adapter/**/WildflyRelative*Test.java + + diff --git a/testsuite/integration-arquillian/tests/adapters/wildfly/pom.xml b/testsuite/integration-arquillian/tests/adapters/wildfly/pom.xml index 4f2bb53039..a8d7326474 100644 --- a/testsuite/integration-arquillian/tests/adapters/wildfly/pom.xml +++ b/testsuite/integration-arquillian/tests/adapters/wildfly/pom.xml @@ -31,6 +31,11 @@ keycloak-wildfly-adapter-dist zip + + org.keycloak + keycloak-saml-wildfly-adapter-dist + zip + @@ -68,6 +73,13 @@ zip ${adapter.libs.wildfly} + + org.keycloak + keycloak-saml-wildfly-adapter-dist + ${project.version} + zip + ${adapter.libs.wildfly} + @@ -77,7 +89,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 true @@ -100,35 +111,6 @@ ${app.server.wildfly.home} - - - - org.codehaus.mojo - xml-maven-plugin - - - configure-adapter-subsystem - process-resources - - transform - - - - - ${app.server.wildfly.home}/standalone/configuration - - standalone.xml - - src/main/xslt/standalone.xsl - ${app.server.wildfly.home}/standalone/configuration - - - - - - - - ssl @@ -166,7 +148,6 @@ maven-resources-plugin - 2.7 copy-keystore @@ -175,20 +156,20 @@ copy-resources - ${app.server.wildfly.home}/standalone/configuration - - - src/main/keystore - - adapter.jks - keycloak.truststore - - - - + ${app.server.wildfly.home}/standalone/configuration + + + src/main/keystore + + adapter.jks + keycloak.truststore + + + + jks truststore - + diff --git a/testsuite/integration-arquillian/tests/adapters/wildfly8/pom.xml b/testsuite/integration-arquillian/tests/adapters/wildfly8/pom.xml index de42ce3a3a..0828eda862 100644 --- a/testsuite/integration-arquillian/tests/adapters/wildfly8/pom.xml +++ b/testsuite/integration-arquillian/tests/adapters/wildfly8/pom.xml @@ -79,7 +79,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 true @@ -102,35 +101,6 @@ ${app.server.wildfly.home} - - - - org.codehaus.mojo - xml-maven-plugin - - - configure-adapter-subsystem - process-resources - - transform - - - - - ${app.server.wildfly.home}/standalone/configuration - - standalone.xml - - src/main/xslt/standalone.xsl - ${app.server.wildfly.home}/standalone/configuration - - - - - - - - diff --git a/testsuite/integration-arquillian/tests/adapters/wildfly8/src/main/xslt/standalone.xsl b/testsuite/integration-arquillian/tests/adapters/wildfly8/src/main/xslt/standalone.xsl deleted file mode 100644 index 364d8037c4..0000000000 --- a/testsuite/integration-arquillian/tests/adapters/wildfly8/src/main/xslt/standalone.xsl +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml index 42425032c5..97e05656e6 100644 --- a/testsuite/integration-arquillian/tests/base/pom.xml +++ b/testsuite/integration-arquillian/tests/base/pom.xml @@ -14,6 +14,8 @@ - - + - + - @@ -48,6 +50,8 @@ ${exclude.console} ${exclude.account} + ${exclude.client} + ${exclude.migration} @@ -69,11 +73,20 @@ **/account/**/*Test.java + + no-client + + + **/client/**/*Test.java + + adapters-only **/console/**/*Test.java **/account/**/*Test.java + **/client/**/*Test.java + **/migration/**/*Test.java diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SAMLServletWithLogout.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SAMLServletWithLogout.java index 2656fd43ce..c85ac68749 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SAMLServletWithLogout.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SAMLServletWithLogout.java @@ -11,7 +11,7 @@ public abstract class SAMLServletWithLogout extends AbstractPageWithInjectedUrl public void logout() { driver.navigate().to(getUriBuilder().queryParam("GLO", "true").build().toASCIIString()); - getUriBuilder().replaceQueryParam("GLO", null); + getUriBuilder().replaceQueryParam("GLO", new Object()); pause(300); } } diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainersTestEnricher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainersTestEnricher.java index 50beaa69e0..b2175d32a9 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainersTestEnricher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainersTestEnricher.java @@ -1,10 +1,14 @@ package org.keycloak.testsuite.arquillian; +import java.io.BufferedReader; import java.io.File; import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.net.MalformedURLException; import java.net.URL; import java.util.LinkedList; +import java.util.concurrent.TimeUnit; import org.apache.commons.io.FileUtils; import org.jboss.arquillian.container.spi.Container; import org.jboss.arquillian.container.spi.ContainerRegistry; @@ -30,6 +34,7 @@ import org.keycloak.testsuite.util.OAuthClient; import static org.keycloak.testsuite.auth.page.AuthRealm.ADMIN; import static org.keycloak.testsuite.auth.page.AuthRealm.MASTER; +import static org.keycloak.testsuite.util.WaitUtils.pause; /** * @@ -73,17 +78,20 @@ public class ContainersTestEnricher { private ContainerController controller; private LinkedList containers; + private String jbossHomePath; private final boolean migrationTests = System.getProperty("migration", "false").equals("true"); + private final boolean skipInstallAdapters = System.getProperty("skip.install.adapters", "false").equals("true"); + private boolean alreadyInstalled = false; private boolean alreadyStopped = false; private boolean init = false; private void init() { if (!init) { - containers = new LinkedList(containerRegistry.get().getContainers()); + containers = new LinkedList<>(containerRegistry.get().getContainers()); } init = true; } - + /* * non-javadoc * @@ -103,32 +111,34 @@ public class ContainersTestEnricher { * After start container. Server logs are checked (in case jboss based container). * In case of migration scenario: previous container is stopped. */ - public void afterStart(@Observes AfterStart event) throws IOException { - if (System.getProperty("check.server.log", "true").equals("true")) { - checkServerLog(); + public void afterStart(@Observes AfterStart event) throws IOException, InterruptedException { + Container container = containers.pollFirst(); + + if (isJBossBased(container)) { + jbossHomePath = container.getContainerConfiguration().getContainerProperties().get("jbossHome"); + log.debug("jbossHome: " + jbossHomePath + "\n"); } + checkServerLog(jbossHomePath); if (migrationTests && !alreadyStopped) { log.info("\n\n### Stopping keycloak " + System.getProperty("version", "- previous") + " ###\n"); stopSuiteContainers.fire(new StopSuiteContainers()); log.info("\n\n### Starting keycloak current version ###\n"); + alreadyStopped = true; } - alreadyStopped = true; + + installAdapters(container); } /* * non-javadoc * - * check server logs (in case jboss based container) whether there are no ERRORs or SEVEREs + * check server logs whether there are no ERRORs or SEVEREs */ - private void checkServerLog() throws IOException { - Container container = containers.removeFirst(); - if (container.getName().equals("auth-server-wildfly") - || container.getName().matches("auth-server-eap.")) { - String jbossHomePath = container.getContainerConfiguration().getContainerProperties().get("jbossHome"); - log.debug("jbossHome: " + jbossHomePath + "\n"); - - String serverLogContent = FileUtils.readFileToString(new File(jbossHomePath + "/standalone/log/server.log")); + private void checkServerLog(String jbossHomePath) throws IOException { + if (jbossHomePath != null && System.getProperty("check.server.log", "true").equals("true")) { + File serverLog = new File(jbossHomePath + "/standalone/log/server.log"); + String serverLogContent = FileUtils.readFileToString(serverLog); boolean containsError = serverLogContent.contains("ERROR") @@ -138,9 +148,10 @@ public class ContainersTestEnricher { //singleton org.keycloak.services.resources.ModelExceptionMapper if (containsError) { - throw new RuntimeException(container.getName() + ": Server log contains ERROR."); + throw new RuntimeException(serverLog.getPath() + " contains ERROR."); } - } + log.info(serverLog.getPath() + " doesn't contain Error"); + } } public void beforeSuite(@Observes BeforeSuite event) { @@ -154,9 +165,7 @@ public class ContainersTestEnricher { appServerQualifier = getAppServerQualifier(testClass); if (!controller.isStarted(appServerQualifier)) { - log.info("\nSTARTING APP SERVER: " + appServerQualifier + "\n"); controller.start(appServerQualifier); - log.info(""); } initializeTestContext(testClass); @@ -264,4 +273,60 @@ public class ContainersTestEnricher { return "http://localhost:" + Integer.parseInt(System.getProperty("app.server.http.port", "8280")); } + private void installAdapters(Container container) throws InterruptedException, IOException { + if (!alreadyInstalled && !skipInstallAdapters && isJBossBased(container)) { + String jbossCliPath = jbossHomePath + "/bin/jboss-cli.sh"; + String adapterScriptPathArg = "--file=" + jbossHomePath + "/bin/adapter-install.cli"; + String samlAdapterScriptPathArg = "--file=" + jbossHomePath + "/bin/adapter-install-saml.cli"; + String managementPort = container.getContainerConfiguration().getContainerProperties().get("managementPort"); + String controllerArg = "--controller=localhost:" + managementPort; + + log.info("Installing adapter to app server via cli script"); + execCommand(new String[]{"/bin/sh", jbossCliPath, "--connect", adapterScriptPathArg, controllerArg}); + log.info("Installing saml adapter to app server via cli script"); + execCommand(new String[]{"/bin/sh", jbossCliPath, "--connect", samlAdapterScriptPathArg, controllerArg}); + log.info("Restarting container"); + execCommand(new String[]{"/bin/sh", jbossCliPath, "--connect", "--command=:reload", controllerArg}); + pause(5000); + log.info("Container restarted"); + checkServerLog(jbossHomePath); + if (container.getName().startsWith("app-server")) { + alreadyInstalled = true; + } + } + } + + private void execCommand(String... command) throws IOException, InterruptedException { + Process process = Runtime.getRuntime().exec(command); + + if (process.waitFor(10, TimeUnit.SECONDS)) { + if (process.exitValue() != 0) { + throw new RuntimeException("Adapter installation failed. Process exitValue: " + + process.exitValue() + "; \n" + getOutput(process.getErrorStream()) + + ""); + } + log.debug("process.isAlive(): " + process.isAlive()); + } else { + process.destroyForcibly(); + throw new RuntimeException("Timeout after 10 seconds."); + } + } + + private String getOutput(InputStream is) throws IOException { + BufferedReader reader = new BufferedReader(new InputStreamReader(is)); + StringBuilder builder = new StringBuilder(); + while (reader.ready()) { + builder.append(reader.readLine()); + } + return builder.toString(); + } + + private boolean isJBossBased(Container container) { + if (container == null) { + return false; + } + return container.getName().matches("a.*-server-wildfly") + || container.getName().matches("a.*-server-eap.") + || container.getName().equals("app-server-as7"); + } } diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/SuiteContext.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/SuiteContext.java index 589c316211..b99d6b3b45 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/SuiteContext.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/SuiteContext.java @@ -10,24 +10,14 @@ import static org.keycloak.testsuite.util.MailServerConfiguration.*; */ public final class SuiteContext { - private boolean adminPasswordUpdated; private final Map smtpServer = new HashMap<>(); public SuiteContext() { - this.adminPasswordUpdated = false; smtpServer.put("from", FROM); smtpServer.put("host", HOST); smtpServer.put("port", PORT); } - public boolean isAdminPasswordUpdated() { - return adminPasswordUpdated; - } - - public void setAdminPasswordUpdated(boolean adminPasswordUpdated) { - this.adminPasswordUpdated = adminPasswordUpdated; - } - public Map getSmtpServer() { return smtpServer; } diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/roles/RoleCompositeRoles.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/roles/RoleCompositeRoles.java index 833acdd7ce..070f49acaf 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/roles/RoleCompositeRoles.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/roles/RoleCompositeRoles.java @@ -53,7 +53,7 @@ public class RoleCompositeRoles extends Form { Map> clientRoles = new HashMap<>(); for (String client : getSelectValues(clientSelect)) { clientSelect.selectByVisibleText(client); - clientRoles.put(client, new ArrayList(getSelectValues(assignedClientRolesSelect))); + clientRoles.put(client, new ArrayList<>(getSelectValues(assignedClientRolesSelect))); } composites.setClient(clientRoles); return composites; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java index 13ec96e4d6..9400f77adf 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java @@ -25,7 +25,6 @@ import org.keycloak.testsuite.util.OAuthClient; import org.openqa.selenium.WebDriver; import org.keycloak.testsuite.auth.page.AuthServer; import org.keycloak.testsuite.auth.page.AuthServerContextRoot; -import static org.keycloak.testsuite.util.URLAssert.*; import org.keycloak.testsuite.auth.page.AuthRealm; import static org.keycloak.testsuite.auth.page.AuthRealm.ADMIN; import static org.keycloak.testsuite.auth.page.AuthRealm.MASTER; @@ -90,12 +89,6 @@ public abstract class AbstractKeycloakTest { driverSettings(); - if (!suiteContext.isAdminPasswordUpdated()) { - log.debug("updating admin password"); - updateMasterAdminPassword(); - suiteContext.setAdminPasswordUpdated(true); - } - importTestRealms(); } @@ -106,13 +99,6 @@ public abstract class AbstractKeycloakTest { Timer.printStats(); } - private void updateMasterAdminPassword() { - welcomePage.navigateTo(); - if (!welcomePage.isPasswordSet()) { - welcomePage.setPassword("admin", "admin"); - } - } - public void deleteAllCookiesForMasterRealm() { masterRealmPage.navigateTo(); log.debug("deleting cookies in master realm"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterTest.java index 4a6f1c3b1e..11c17f0cd8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterTest.java @@ -80,14 +80,16 @@ public abstract class AbstractAdapterTest extends AbstractAuthTest { } protected void modifyClientUrls(RealmRepresentation realm, String regex, String replacement) { - for (ClientRepresentation client : realm.getClients()) { - String baseUrl = client.getBaseUrl(); - if (baseUrl != null) { - client.setBaseUrl(baseUrl.replaceAll(regex, replacement)); - } - String adminUrl = client.getAdminUrl(); - if (adminUrl != null) { - client.setAdminUrl(adminUrl.replaceAll(regex, replacement)); + if (realm.getClients() != null) { + for (ClientRepresentation client : realm.getClients()) { + String baseUrl = client.getBaseUrl(); + if (baseUrl != null) { + client.setBaseUrl(baseUrl.replaceAll(regex, replacement)); + } + String adminUrl = client.getAdminUrl(); + if (adminUrl != null) { + client.setAdminUrl(adminUrl.replaceAll(regex, replacement)); + } } } } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/clients/AbstractClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/clients/AbstractClientTest.java index a3a1463df1..211406c57e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/clients/AbstractClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/clients/AbstractClientTest.java @@ -119,7 +119,7 @@ public abstract class AbstractClientTest extends AbstractConsoleTest { } private static void setRedirectUris(ClientRepresentation client, String... redirectUris) { - List redirectUrisList = new ArrayList(); + List redirectUrisList = new ArrayList<>(); redirectUrisList.addAll(Arrays.asList(redirectUris)); client.setRedirectUris(redirectUrisList); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/demorealm.json b/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/demorealm.json index 5b82ec6387..70dc85aae4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/demorealm.json +++ b/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/demorealm.json @@ -21,7 +21,7 @@ { "type" : "password", "value" : "password" } ], - "realmRoles": [ "user", "admin" ], + "realmRoles": [ "user" ], "applicationRoles": { "account": [ "manage-account" ] } @@ -34,12 +34,36 @@ "lastName": "Posolda", "credentials" : [ { "type" : "password", - "value" : "password" } + "value" : "password" } ], "realmRoles": [ "user" ], "applicationRoles": { "account": [ "manage-account" ] } + }, + { + "username" : "topGroupUser", + "enabled": true, + "email" : "top@redhat.com", + "credentials" : [ + { "type" : "password", + "value" : "password" } + ], + "groups": [ + "/top" + ] + }, + { + "username" : "level2GroupUser", + "enabled": true, + "email" : "level2@redhat.com", + "credentials" : [ + { "type" : "password", + "value" : "password" } + ], + "groups": [ + "/top/level2" + ] } ], "roles" : { @@ -54,6 +78,29 @@ } ] }, + "groups" : [ + { + "name": "top", + "attributes": { + "topAttribute": ["true"] + + }, + "realmRoles": ["user"], + "clientRoles": { + "account": ["manage-account"] + }, + "subGroups": [ + { + "name": "level2", + "realmRoles": ["admin"], + "attributes": { + "level2Attribute": ["true"] + + } + } + ] + } + ], "scopeMappings": [ { "client": "third-party", @@ -69,38 +116,39 @@ } ], - "clients": [ + "applications": [ { - "clientId": "customer-portal", + "name": "customer-portal", "enabled": true, - "adminUrl": "/customer-portal", - "baseUrl": "/customer-portal", + "directAccessGrantsEnabled": true, + "adminUrl": "http://localhost:8081/customer-portal", + "baseUrl": "http://localhost:8081/customer-portal", "redirectUris": [ - "/customer-portal/*" + "http://localhost:8081/customer-portal/*" ], "secret": "password" }, { - "clientId": "customer-cookie-portal", + "name": "customer-cookie-portal", "enabled": true, - "baseUrl": "/customer-cookie-portal", + "baseUrl": "http://localhost:8081/customer-cookie-portal", "redirectUris": [ - "/customer-cookie-portal/*" + "http://localhost:8081/customer-cookie-portal/*" ], "secret": "password" }, { - "clientId": "customer-portal-js", + "name": "customer-portal-js", "enabled": true, "publicClient": true, - "adminUrl": "/customer-portal-js", - "baseUrl": "/customer-portal-js", + "adminUrl": "http://localhost:8081/customer-portal-js", + "baseUrl": "http://localhost:8081/customer-portal-js", "redirectUris": [ - "/customer-portal-js/*" + "http://localhost:8080/customer-portal-js/*" ] }, { - "clientId": "customer-portal-cli", + "name": "customer-portal-cli", "enabled": true, "publicClient": true, "redirectUris": [ @@ -109,51 +157,56 @@ ] }, { - "clientId": "product-portal", + "name": "product-portal", "enabled": true, - "adminUrl": "/product-portal", - "baseUrl": "/product-portal", + "adminUrl": "http://localhost:8081/product-portal", + "baseUrl": "http://localhost:8081/product-portal", "redirectUris": [ - "/product-portal/*" + "http://localhost:8081/product-portal/*" ], "secret": "password" }, { - "clientId": "secure-portal", + "name": "secure-portal", "enabled": true, - "adminUrl": "/secure-portal", - "baseUrl": "/secure-portal", + "adminUrl": "http://localhost:8081/secure-portal", + "baseUrl": "http://localhost:8081/secure-portal", + "clientAuthenticatorType": "client-jwt", "redirectUris": [ - "/secure-portal/*" + "http://localhost:8081/secure-portal/*" + ], + "attributes": { + "jwt.credential.certificate": "MIICnTCCAYUCBgFPPLDaTzANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdjbGllbnQxMB4XDTE1MDgxNzE3MjI0N1oXDTI1MDgxNzE3MjQyN1owEjEQMA4GA1UEAwwHY2xpZW50MTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIUjjgv+V3s96O+Za9002Lp/trtGuHBeaeVL9dFKMKzO2MPqdRmHB4PqNlDdd28Rwf5Xn6iWdFpyUKOnI/yXDLhdcuFpR0sMNK/C9Lt+hSpPFLuzDqgtPgDotlMxiHIWDOZ7g9/gPYNXbNvjv8nSiyqoguoCQiiafW90bPHsiVLdP7ZIUwCcfi1qQm7FhxRJ1NiW5dvUkuCnnWEf0XR+Wzc5eC9EgB0taLFiPsSEIlWMm5xlahYyXkPdNOqZjiRnrTWm5Y4uk8ZcsD/KbPTf/7t7cQXipVaswgjdYi1kK2/zRwOhg1QwWFX/qmvdd+fLxV0R6VqRDhn7Qep2cxwMxLsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAKE6OA46sf20bz8LZPoiNsqRwBUDkaMGXfnob7s/hJZIIwDEx0IAQ3uKsG7q9wb+aA6s+v7S340zb2k3IxuhFaHaZpAd4CyR5cn1FHylbzoZ7rI/3ASqHDqpljdJaFqPH+m7nZWtyDvtZf+gkZ8OjsndwsSBK1d/jMZPp29qYbl1+XfO7RCp/jDqro/R3saYFaIFiEZPeKn1hUJn6BO48vxH1xspSu9FmlvDOEAOz4AuM58z4zRMP49GcFdCWr1wkonJUHaSptJaQwmBwLFUkCbE5I1ixGMb7mjEud6Y5jhfzJiZMo2U8RfcjNbrN0diZl3jB6LQIwESnhYSghaTjNQ==" + } + }, + { + "name": "session-portal", + "enabled": true, + "adminUrl": "http://localhost:8081/session-portal", + "baseUrl": "http://localhost:8081/session-portal", + "redirectUris": [ + "http://localhost:8081/session-portal/*" ], "secret": "password" }, { - "clientId": "session-portal", + "name": "input-portal", "enabled": true, - "adminUrl": "/session-portal", - "baseUrl": "/session-portal", + "adminUrl": "http://localhost:8081/input-portal", + "baseUrl": "http://localhost:8081/input-portal", "redirectUris": [ - "/session-portal/*" + "http://localhost:8081/input-portal/*" ], "secret": "password" - }, + } + ], + "oauthClients": [ { - "clientId": "input-portal", - "enabled": true, - "adminUrl": "/input-portal", - "baseUrl": "/input-portal", - "redirectUris": [ - "/input-portal/*" - ], - "secret": "password" - }, - { - "clientId": "third-party", + "name": "third-party", "enabled": true, "redirectUris": [ - "/oauth-client/*", - "/oauth-client-cdi/*" + "http://localhost:8081/oauth-client/*", + "http://localhost:8081/oauth-client-cdi/*" ], "secret": "password" } diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml index e34790383e..afc3334429 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml +++ b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml @@ -7,6 +7,7 @@ ${browser} + ${firefox_binary} @@ -18,6 +19,7 @@ ${browser} + ${firefox_binary} @@ -92,7 +94,7 @@ ${migration.kc12} org.jboss.as.arquillian.container.managed.ManagedDeployableContainer - ${keycloak.migration.homee} + ${keycloak.migration.home} -Djboss.socket.binding.port-offset=${auth.server.port.offset} -Xms64m -Xmx512m -XX:MaxPermSize=256m ${auth.server.management.port} ${startup.timeout.sec} @@ -114,21 +116,20 @@ ${auth.server.wildfly} org.jboss.as.arquillian.container.managed.ManagedDeployableContainer - ${auth.server.wildfly.home} + ${keycloak.home} -Djboss.socket.binding.port-offset=${auth.server.port.offset} -Xms64m -Xmx512m -XX:MaxPermSize=256m ${adapter.test.props} ${auth.server.management.port} ${startup.timeout.sec} - + - ${auth.server.eap6} + ${auth.server.eap7} org.jboss.as.arquillian.container.managed.ManagedDeployableContainer - ${auth.server.eap6.home} + ${keycloak.home} -Djboss.socket.binding.port-offset=${auth.server.port.offset} -Xms64m -Xmx512m -XX:MaxPermSize=256m ${adapter.test.props} - localhost - ${auth.server.management.port.jmx} + ${auth.server.management.port} ${startup.timeout.sec} diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/keycloak-add-user.json b/testsuite/integration-arquillian/tests/base/src/test/resources/keycloak-add-user.json index 635f144a8e..60c0f098d1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/resources/keycloak-add-user.json +++ b/testsuite/integration-arquillian/tests/base/src/test/resources/keycloak-add-user.json @@ -5,12 +5,11 @@ "enabled" : true, "credentials" : [ { "type" : "password", - "hashedSaltedValue" : "6K5rvcPu3dXndZOhpzLAVbFtcdlUhbGCrUyV0NNzeS61IdhMpjH8Mf4y/Ag/vHZkw4Ayvtvb9/1iMNOzxR0M6g==", - "salt" : "/6M1jTMUB0uR8EOkksFn/A==", + "hashedSaltedValue" : "dqalJHLkWhUJZO/q6+z1fvXOohTcGCXcvoU8xCEyvTxGN4wmLx7DtyhKuefggh6Bkx1I2eBTEX4tiWggwyXMDw==", + "salt" : "3fBAt5GAGGxFrV9fznpZHQ==", "hashIterations" : 100000, "algorithm" : "pbkdf2" } ], "realmRoles" : [ "admin" ] - } ], - "identityFederationEnabled" : false + } ] } ] \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml index ce114d1a79..f8c817e618 100644 --- a/testsuite/integration-arquillian/tests/pom.xml +++ b/testsuite/integration-arquillian/tests/pom.xml @@ -31,6 +31,7 @@ 60 phantomjs + /usr/bin/firefox 1.1.8.Final 2.45.0 @@ -38,7 +39,9 @@ 2.1.0.Alpha2 8.2.0.Final 2.1.1 + true true + true @@ -81,6 +84,7 @@ ${browser} + ${firefox_binary} false ${auth.server.container} true @@ -92,6 +96,7 @@ ${auth.server.ssl.required} ${startup.timeout.sec} ${project.build.directory}/undertow-configuration + ${skip.install.adapters} @@ -114,6 +119,26 @@ ${skip.unpack.previous} + + + org.keycloak.testsuite + ${migrated.server.artifactId} + ${project.version} + zip + + + ${containers.home} + true + + + + unpack + generate-test-resources + + unpack + + + ${skip.unpack.server} org.keycloak.testsuite @@ -129,8 +154,8 @@ + org.apache.maven.plugins maven-resources-plugin - 2.7 copy-admin-user-json-file @@ -198,7 +223,7 @@ 2.1.0.Alpha3 -