diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml index 855d937c8c..3085439976 100644 --- a/testsuite/integration-arquillian/pom.xml +++ b/testsuite/integration-arquillian/pom.xml @@ -164,7 +164,7 @@ maven-resources-plugin - 3.0.0 + 3.0.1 org.commonjava.maven.plugins diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/eap/src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAPAppServerProvider.java b/testsuite/integration-arquillian/servers/app-server/jboss/eap/src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAPAppServerProvider.java index d3d5031f66..20850dc145 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/eap/src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAPAppServerProvider.java +++ b/testsuite/integration-arquillian/servers/app-server/jboss/eap/src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAPAppServerProvider.java @@ -86,6 +86,8 @@ public class EAPAppServerProvider implements AppServerContainerProvider { createChild("javaHome", appServerJavaHome); createChild("jbossArguments", "-Djboss.server.base.dir=" + appServerHome + "/standalone-test " + + "-Djboss.server.config.dir=" + appServerHome + "/standalone-test/configuration " + + "-Djboss.server.log.dir=" + appServerHome + "/standalone-test/log " + "-Djboss.socket.binding.port-offset=" + appServerPortOffset + " " + System.getProperty("adapter.test.props", " ") + System.getProperty("kie.maven.settings", " ") diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/eap6-fuse/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/eap6-fuse/pom.xml deleted file mode 100644 index 16c615b54e..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/jboss/eap6-fuse/pom.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - integration-arquillian-servers-app-server-jboss - org.keycloak.testsuite - 4.2.0.Final-SNAPSHOT - - 4.0.0 - - integration-arquillian-servers-app-server-eap6-fuse - pom - App Server - JBoss - EAP 6 + Fuse integration - - - eap6-fuse - - org.jboss.as - jboss-as-dist - ${eap6.version} - jboss-eap-6.4 - - com.redhat.fuse.eap - fuse-eap-installer - 6.3.0.redhat-224 - - keycloak-eap6-adapter-dist - - - - - - maven-dependency-plugin - - - unpack-fuse-installer - generate-resources - - copy - - - - - ${fuse.installer.groupId} - ${fuse.installer.artifactId} - ${fuse.installer.version} - jar - ${app.server.jboss.home} - - - - - - - - org.codehaus.mojo - exec-maven-plugin - - - install-fuse - process-resources - - exec - - - ${common.resources}/install-fuse.${script.suffix} - ${app.server.jboss.home} - - ${app.server.java.home} - ${app.server.jboss.home} - ${fuse.installer.artifactId}-${fuse.installer.version}.jar - - - - - - - maven-resources-plugin - 3.0.1 - - - copy-hawtio-jsons - process-test-resources - - copy-resources - - - ${app.server.jboss.home}/standalone/configuration - - - ${common.resources} - - keycloak-hawtio.json - keycloak-hawtio-client.json - - true - - - - - - - - - org.codehaus.mojo - xml-maven-plugin - - - add-hawtio-to-standalone - process-test-resources - - transform - - - - - ${app.server.jboss.home}/standalone/configuration - - standalone.xml - - ${common.resources}/add-hawtio.xsl - ${app.server.jboss.home}/standalone/configuration - - - - - - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/eap6-fuse/src/adapter-supported b/testsuite/integration-arquillian/servers/app-server/jboss/eap6-fuse/src/adapter-supported deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/eap6/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/eap6/pom.xml index 7fc61d206a..0c8575d787 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/eap6/pom.xml +++ b/testsuite/integration-arquillian/servers/app-server/jboss/eap6/pom.xml @@ -28,15 +28,19 @@ integration-arquillian-servers-app-server-eap6 jar App Server - EAP 6 - + eap6 - + org.jboss.as jboss-as-dist ${eap6.version} jboss-eap-6.4 - + + com.redhat.fuse.eap + fuse-eap-installer + ${fuse63.version} + keycloak-eap6-adapter-dist keycloak-saml-eap6-adapter-dist @@ -76,11 +80,77 @@ eap6.version + + fuse63.version + + + maven-resources-plugin + + + backup-configs-fuse + generate-test-sources + + copy-resources + + + ${app.server.jboss.home}/standalone-default + + + ${app.server.jboss.home}/standalone + + + + + + copy-hawtio-jsons + generate-test-resources + + copy-resources + + + ${app.server.jboss.home}/standalone-fuse/configuration + + + ${basedir}/src/main/resources/config/fuse + + keycloak-hawtio.json + keycloak-hawtio-client.json + + true + + + + + + + + maven-dependency-plugin + + + unpack-fuse-installer + process-resources + + copy + + + + + ${fuse.installer.groupId} + ${fuse.installer.artifactId} + ${fuse.installer.version} + jar + ${app.server.jboss.home} + + + + + + org.codehaus.mojo exec-maven-plugin @@ -118,6 +188,22 @@ + + install-fuse + generate-test-sources + + exec + + + ${basedir}/src/main/resources/config/fuse/install-fuse.${script.suffix} + ${app.server.jboss.home}/standalone-fuse + + ${app.server.java.home} + ${app.server.jboss.home} + ${fuse.installer.artifactId}-${fuse.installer.version}.jar + + + add-secured-deployments-eap6 generate-test-sources @@ -136,6 +222,64 @@ + + org.codehaus.mojo + xml-maven-plugin + + + add-hawtio-to-standalone-fuse + process-test-resources + + transform + + + + + ${app.server.jboss.home}/standalone-fuse/configuration + + standalone.xml + + ${basedir}/src/main/resources/config/fuse/add-hawtio.xsl + ${app.server.jboss.home}/standalone-fuse/configuration + + + + + + + + maven-antrun-plugin + + + move-configs-fuse + process-test-sources + + run + + + + + + + + + + restore-configs-after-fuse-installation + process-test-sources + + run + + + + + + + + + + diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/eap6/src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAP6AppServerProvider.java b/testsuite/integration-arquillian/servers/app-server/jboss/eap6/src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAP6AppServerProvider.java index 98c95bd4cc..a66a5896a4 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/eap6/src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAP6AppServerProvider.java +++ b/testsuite/integration-arquillian/servers/app-server/jboss/eap6/src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAP6AppServerProvider.java @@ -86,6 +86,8 @@ public class EAP6AppServerProvider implements AppServerContainerProvider { createChild("javaHome", appServerJavaHome); createChild("jbossArguments", "-Djboss.server.base.dir=" + appServerHome + "/standalone-test " + + "-Djboss.server.config.dir=" + appServerHome + "/standalone-test/configuration " + + "-Djboss.server.log.dir=" + appServerHome + "/standalone-test/log " + "-Djboss.socket.binding.port-offset=" + appServerPortOffset + " " + System.getProperty("adapter.test.props", " ") + System.getProperty("kie.maven.settings", " ") diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/common/add-hawtio.xsl b/testsuite/integration-arquillian/servers/app-server/jboss/eap6/src/main/resources/config/fuse/add-hawtio.xsl similarity index 100% rename from testsuite/integration-arquillian/servers/app-server/jboss/common/add-hawtio.xsl rename to testsuite/integration-arquillian/servers/app-server/jboss/eap6/src/main/resources/config/fuse/add-hawtio.xsl diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/common/install-fuse.bat b/testsuite/integration-arquillian/servers/app-server/jboss/eap6/src/main/resources/config/fuse/install-fuse.bat similarity index 100% rename from testsuite/integration-arquillian/servers/app-server/jboss/common/install-fuse.bat rename to testsuite/integration-arquillian/servers/app-server/jboss/eap6/src/main/resources/config/fuse/install-fuse.bat diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/common/install-fuse.sh b/testsuite/integration-arquillian/servers/app-server/jboss/eap6/src/main/resources/config/fuse/install-fuse.sh similarity index 100% rename from testsuite/integration-arquillian/servers/app-server/jboss/common/install-fuse.sh rename to testsuite/integration-arquillian/servers/app-server/jboss/eap6/src/main/resources/config/fuse/install-fuse.sh diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/common/keycloak-hawtio-client.json b/testsuite/integration-arquillian/servers/app-server/jboss/eap6/src/main/resources/config/fuse/keycloak-hawtio-client.json similarity index 100% rename from testsuite/integration-arquillian/servers/app-server/jboss/common/keycloak-hawtio-client.json rename to testsuite/integration-arquillian/servers/app-server/jboss/eap6/src/main/resources/config/fuse/keycloak-hawtio-client.json diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/common/keycloak-hawtio.json b/testsuite/integration-arquillian/servers/app-server/jboss/eap6/src/main/resources/config/fuse/keycloak-hawtio.json similarity index 100% rename from testsuite/integration-arquillian/servers/app-server/jboss/common/keycloak-hawtio.json rename to testsuite/integration-arquillian/servers/app-server/jboss/eap6/src/main/resources/config/fuse/keycloak-hawtio.json diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml index 2ac27f72d1..20b9d69eee 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml +++ b/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml @@ -646,18 +646,6 @@ relative - - app-server-eap6-fuse - - - app.server - eap6-fuse - - - - eap6-fuse - - diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyAppServerProvider.java b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyAppServerProvider.java index 53df1174c4..6b56ce78c7 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyAppServerProvider.java +++ b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyAppServerProvider.java @@ -86,6 +86,8 @@ public class WildflyAppServerProvider implements AppServerContainerProvider { createChild("javaHome", appServerJavaHome); createChild("jbossArguments", "-Djboss.server.base.dir=" + appServerHome + "/standalone-test " + + "-Djboss.server.config.dir=" + appServerHome + "/standalone-test/configuration " + + "-Djboss.server.log.dir=" + appServerHome + "/standalone-test/log " + "-Djboss.socket.binding.port-offset=" + appServerPortOffset + " " + System.getProperty("adapter.test.props", " ") + System.getProperty("kie.maven.settings", " ") diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly10AppServerProvider.java b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly10AppServerProvider.java index b9541cf43e..f2f042c80b 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly10AppServerProvider.java +++ b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly10AppServerProvider.java @@ -86,6 +86,8 @@ public class Wildfly10AppServerProvider implements AppServerContainerProvider { createChild("javaHome", appServerJavaHome); createChild("jbossArguments", "-Djboss.server.base.dir=" + appServerHome + "/standalone-test " + + "-Djboss.server.config.dir=" + appServerHome + "/standalone-test/configuration " + + "-Djboss.server.log.dir=" + appServerHome + "/standalone-test/log " + "-Djboss.socket.binding.port-offset=" + appServerPortOffset + " " + System.getProperty("adapter.test.props", " ") + System.getProperty("kie.maven.settings", " ") diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly9AppServerProvider.java b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly9AppServerProvider.java index 5a1b30a968..a386d73a0e 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly9AppServerProvider.java +++ b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly9AppServerProvider.java @@ -86,6 +86,8 @@ public class Wildfly9AppServerProvider implements AppServerContainerProvider { createChild("javaHome", appServerJavaHome); createChild("jbossArguments", "-Djboss.server.base.dir=" + appServerHome + "/standalone-test " + + "-Djboss.server.config.dir=" + appServerHome + "/standalone-test/configuration " + + "-Djboss.server.log.dir=" + appServerHome + "/standalone-test/log " + "-Djboss.socket.binding.port-offset=" + appServerPortOffset + " " + System.getProperty("adapter.test.props", " ") + System.getProperty("kie.maven.settings", " ") diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentArchiveProcessor.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentArchiveProcessor.java index 2ca18808e4..b4a7f30371 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentArchiveProcessor.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentArchiveProcessor.java @@ -104,21 +104,12 @@ public class DeploymentArchiveProcessor implements ApplicationArchiveProcessor { // Ignore archives modifed in specific DeploymentArchiveProcessors, see e.g. // org.keycloak.testsuite.arquillian.wildfly.container.WildflyDeploymentArchiveProcessor - if (isEAP6AppServer() || - isEAPAppServer() || - isWildflyAppServer() || - isWildfly10AppServer() || - isWildfly9AppServer() || - isUndertowAppServer()) { - - return; - } - - log.info("Processing archive " + archive.getName()); - modifyAdapterConfigs(archive, testClass); - modifyWebXml(archive, testClass); - if (isWLSAppServer() || isWASAppServer()) { + + log.info("Processing archive " + archive.getName()); + modifyAdapterConfigs(archive, testClass); + modifyWebXml(archive, testClass); + MavenResolverSystem resolver = Maven.resolver(); MavenFormatStage dependencies = resolver .loadPomFromFile("pom.xml") diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/SelfManagedAppContainerLifecycle.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/SelfManagedAppContainerLifecycle.java index 7a0d93aea3..66c7c1bd78 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/SelfManagedAppContainerLifecycle.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/SelfManagedAppContainerLifecycle.java @@ -17,11 +17,20 @@ package org.keycloak.testsuite.arquillian.containers; /** - * + * The test implementing the interface is expected to maintain container lifecycle + * itself. No app server container will be started. + * * @author vramik */ public interface SelfManagedAppContainerLifecycle { - + + /** + * Should be called @Before + */ void startServer(); + + /** + * Should be called @After + */ void stopServer(); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/AbstractHawtioAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/AbstractHawtioAdapterTest.java deleted file mode 100644 index 7f64ae87ff..0000000000 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/AbstractHawtioAdapterTest.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.keycloak.testsuite.adapter.example; - -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.adapter.AbstractExampleAdapterTest; -import org.keycloak.testsuite.adapter.page.HawtioPage; -import org.openqa.selenium.By; - -import java.util.List; - -import static org.keycloak.testsuite.auth.page.AuthRealm.DEMO; -import static org.keycloak.testsuite.utils.io.IOUtil.loadRealm; -import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWith; -import static org.keycloak.testsuite.util.WaitUtils.pause; -import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement; - -/** - * @author mhajas - */ -public abstract class AbstractHawtioAdapterTest extends AbstractExampleAdapterTest { - - @Page - private HawtioPage hawtioPage; - - @Override - public void addAdapterTestRealms(List testRealms) { - testRealms.add(loadRealm("/adapter-test/hawtio-realm/demorealm.json")); - } - - @Test - public void hawtioLoginAndLogoutTest() { - testRealmLoginPage.setAuthRealm(DEMO); - - hawtioPage.navigateTo(); - waitUntilElement(By.xpath("//body")).is().present(); - - assertCurrentUrlStartsWith(testRealmLoginPage); - testRealmLoginPage.form().login("root", "password"); - - waitUntilElement(By.xpath("//body")).is().present(); - assertCurrentUrlStartsWith(hawtioPage.toString() + "/welcome", hawtioPage.getDriver()); - - hawtioPage.logout(); - pause(1000); - waitUntilElement(By.xpath("//body")).is().present(); - assertCurrentUrlStartsWith(testRealmLoginPage); - - hawtioPage.navigateTo(); - waitUntilElement(By.xpath("//body")).is().present(); - assertCurrentUrlStartsWith(testRealmLoginPage); - } -} diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/fuse/EAP6Fuse6HawtioAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/fuse/EAP6Fuse6HawtioAdapterTest.java new file mode 100644 index 0000000000..1ebadfc666 --- /dev/null +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/fuse/EAP6Fuse6HawtioAdapterTest.java @@ -0,0 +1,120 @@ +/* + * 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. + */ +package org.keycloak.testsuite.adapter.example.fuse; + +import static org.keycloak.testsuite.auth.page.AuthRealm.DEMO; +import static org.keycloak.testsuite.utils.io.IOUtil.loadRealm; +import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWith; + +import java.io.IOException; +import java.util.List; + +import org.jboss.arquillian.container.test.api.ContainerController; +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.jboss.arquillian.graphene.page.Page; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.testsuite.adapter.AbstractExampleAdapterTest; +import org.keycloak.testsuite.adapter.page.HawtioPage; +import org.keycloak.testsuite.arquillian.AppServerTestEnricher; +import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; +import org.keycloak.testsuite.arquillian.containers.ContainerConstants; +import org.keycloak.testsuite.arquillian.containers.SelfManagedAppContainerLifecycle; +import org.keycloak.testsuite.auth.page.login.OIDCLogin; +import org.keycloak.testsuite.util.DroneUtils; +import org.keycloak.testsuite.util.JavascriptBrowser; +import org.keycloak.testsuite.util.WaitUtils; + +import org.openqa.selenium.WebDriver; + +/** + * @author mhajas + */ +@AppServerContainer(ContainerConstants.APP_SERVER_EAP6) +public class EAP6Fuse6HawtioAdapterTest extends AbstractExampleAdapterTest implements SelfManagedAppContainerLifecycle { + + @ArquillianResource + private ContainerController controller; + + @Drone + @JavascriptBrowser + protected WebDriver jsDriver; + + @Page + @JavascriptBrowser + private HawtioPage hawtioPage; + + @Page + @JavascriptBrowser + private OIDCLogin testRealmLoginPageFuse; + + @Override + public void addAdapterTestRealms(List testRealms) { + testRealms.add(loadRealm("/adapter-test/hawtio-realm/demorealm.json")); + } + + @Before + public void addJSDriver() { + DroneUtils.addWebDriver(jsDriver); + } + + @Before + @Override + public void startServer() { + try { + AppServerTestEnricher.prepareServerDir("standalone-fuse"); + } catch (IOException ex) { + throw new RuntimeException("Wasn't able to prepare server dir.", ex); + } + + controller.start(testContext.getAppServerInfo().getQualifier()); + } + + @After + @Override + public void stopServer() { + controller.stop(testContext.getAppServerInfo().getQualifier()); + } + + @Test + public void hawtioLoginAndLogoutTest() { + testRealmLoginPageFuse.setAuthRealm(DEMO); + + log.debug("Go to hawtioPage"); + hawtioPage.navigateTo(); + WaitUtils.waitForPageToLoad(); + + log.debug("log in"); + testRealmLoginPageFuse.form().login("root", "password"); + WaitUtils.waitForPageToLoad(); + + assertCurrentUrlStartsWith(hawtioPage.toString() + "/welcome", DroneUtils.getCurrentDriver()); + + hawtioPage.logout(); + WaitUtils.waitForPageToLoad(); + + assertCurrentUrlStartsWith(testRealmLoginPageFuse); + + hawtioPage.navigateTo(); + WaitUtils.waitForPageToLoad(); + assertCurrentUrlStartsWith(testRealmLoginPageFuse); + } +} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6-fuse/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6-fuse/pom.xml deleted file mode 100644 index cbc699411a..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6-fuse/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - 4.0.0 - - - org.keycloak.testsuite - integration-arquillian-tests-adapters-jboss - 4.2.0.Final-SNAPSHOT - - - integration-arquillian-tests-adapters-eap6-fuse - - Adapter Tests - JBoss - EAP 6 Fuse - - - eap6-fuse - - remote - ${app.server.management.port.jmx} - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6-fuse/src/test/java/org/keycloak/testsuite/adapter/example/EAP6FUSEHawtioAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6-fuse/src/test/java/org/keycloak/testsuite/adapter/example/EAP6FUSEHawtioAdapterTest.java deleted file mode 100644 index ab23db94dd..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6-fuse/src/test/java/org/keycloak/testsuite/adapter/example/EAP6FUSEHawtioAdapterTest.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.keycloak.testsuite.adapter.example; - -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * @author mhajas - */ -@AppServerContainer("app-server-eap6-fuse") -public class EAP6FUSEHawtioAdapterTest extends AbstractHawtioAdapterTest { -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/jboss/pom.xml index d2a43c48f8..b3e41b0afc 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/pom.xml +++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/pom.xml @@ -83,12 +83,6 @@ remote - - app-server-eap6-fuse - - eap6-fuse - -