From 8fdadcc596b4ed0df6a651235c9080525a4a497e Mon Sep 17 00:00:00 2001 From: vramik Date: Wed, 20 Jun 2018 12:47:36 +0200 Subject: [PATCH] KEYCLOAK-7475 adapter tests - add Wildfly10 and Wildfly9 providers --- .../servers/app-server/jboss/eap6/pom.xml | 1 + .../servers/app-server/jboss/pom.xml | 4 +- .../app-server/jboss/wildfly10/pom.xml | 20 +- ...Wildfly10AppServerArquillianExtension.java | 34 ++++ .../container/Wildfly10AppServerProvider.java | 162 +++++++++++++++ .../Wildfly10DeploymentArchiveProcessor.java | 71 +++++++ ...boss.arquillian.core.spi.LoadableExtension | 1 + ...llian.container.AppServerContainerProvider | 1 + .../servers/app-server/jboss/wildfly9/pom.xml | 21 +- .../Wildfly9AppServerArquillianExtension.java | 34 ++++ .../container/Wildfly9AppServerProvider.java | 162 +++++++++++++++ .../Wildfly9DeploymentArchiveProcessor.java | 71 +++++++ ...boss.arquillian.core.spi.LoadableExtension | 1 + ...llian.container.AppServerContainerProvider | 1 + .../integration-arquillian/tests/base/pom.xml | 75 +++++++ .../arquillian/AppServerTestEnricher.java | 8 + .../DeploymentArchiveProcessor.java | 4 + .../containers/ContainerConstants.java | 5 + .../DefaultAuthzConfigAdapterTest.java | 1 + .../PermissiveModeAdapterTest.java | 1 + ...PhotozExampleLazyLoadPathsAdapterTest.java | 1 + ...otozExampleNoLazyLoadPathsAdapterTest.java | 1 + .../ServletAuthzCIPAdapterTest.java | 1 + .../ServletAuthzCacheDisabledAdapterTest.java | 1 + .../ServletAuthzCacheLifespanAdapterTest.java | 1 + .../ServletAuthzLazyLoadPathsAdapterTest.java | 1 + ...ervletAuthzNoLazyLoadPathsAdapterTest.java | 1 + .../ServletPolicyEnforcerTest.java | 1 + .../example/cors/CorsExampleAdapterTest.java | 3 +- .../example/hal/ConsoleProtectionTest.java | 1 - .../BrokerLinkAndTokenExchangeTest.java | 1 + .../ClientInitiatedAccountLinkTest.java | 1 + .../servlet/DemoFilterServletAdapterTest.java | 1 + .../servlet/DemoServletsAdapterTest.java | 2 + .../OIDCPublicKeyRotationAdapterTest.java | 2 + .../servlet/OfflineServletsAdapterTest.java | 2 + .../servlet/SAMLFilterServletAdapterTest.java | 2 + .../servlet/SAMLServletAdapterTest.java | 2 + .../SecuredDeploymentsAdapterTest.java | 2 + .../servlet/SessionServletAdapterTest.java | 2 + .../servlet/UserStorageConsentTest.java | 1 + .../cluster/SAMLAdapterClusterTest.java | 1 + .../crossdc/SAMLAdapterCrossDCTest.java | 1 + .../cluster/EAP6SAMLAdapterClusterTest.java | 129 ------------ .../crossdc/EAP6SAMLAdapterCrossDCTest.java | 192 ------------------ .../employee-distributable/WEB-INF/web.xml | 62 ------ .../other/adapters/jboss/wildfly10/pom.xml | 67 ------ ...ldfly10ClientInitiatedAccountLinkTest.java | 29 --- .../adapter/Wildfly10OIDCAdapterTest.java | 13 -- .../Wildfly10OIDCFilterAdapterTest.java | 12 -- ...fly10OIDCPublicKeyRotationAdapterTest.java | 28 --- .../Wildfly10OIDCSessionAdapterTest.java | 13 -- .../Wildfly10OfflineServletsAdapterTest.java | 11 - .../adapter/Wildfly10SAMLAdapterTest.java | 12 -- .../Wildfly10SAMLFilterAdapterTest.java | 11 - ...ildfly10SecuredDeploymentsAdapterTest.java | 13 -- .../Wildfly10SAMLAdapterClusterTest.java | 54 ----- .../Wildfly10SAMLAdapterCrossDCTest.java | 79 ------- ...ildfly10DefaultAuthzConfigAdapterTest.java | 30 --- .../Wildfly10PermissiveModeAdapterTest.java | 31 --- .../Wildfly10PhotozExampleAdapterTest.java | 30 --- .../Wildfly10ServletAuthzAdapterTest.java | 31 --- ...fly10ServletPolicyEnforcerAdapterTest.java | 30 --- .../cors/Wildfly10CorsExampleAdapterTest.java | 12 -- .../employee-distributable/WEB-INF/web.xml | 62 ------ .../other/adapters/jboss/wildfly9/pom.xml | 38 ---- .../adapter/Wildfly9OIDCAdapterTest.java | 13 -- ...dfly9OIDCPublicKeyRotationAdapterTest.java | 28 --- .../Wildfly9OIDCSessionAdapterTest.java | 13 -- .../Wildfly9OfflineServletsAdapterTest.java | 11 - .../adapter/Wildfly9SAMLAdapterTest.java | 12 -- .../Wildfly9SAMLFilterAdapterTest.java | 11 - ...Wildfly9SecuredDeploymentsAdapterTest.java | 13 -- 73 files changed, 702 insertions(+), 1098 deletions(-) create mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/java/org/keycloak/testsuite/arquillian/wildfly/Wildfly10AppServerArquillianExtension.java create mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly10AppServerProvider.java create mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly10DeploymentArchiveProcessor.java create mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension create mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider create mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/java/org/keycloak/testsuite/arquillian/wildfly/Wildfly9AppServerArquillianExtension.java create mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly9AppServerProvider.java create mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly9DeploymentArchiveProcessor.java create mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension create mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/cluster/EAP6SAMLAdapterClusterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/crossdc/EAP6SAMLAdapterCrossDCTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/resources/adapter-test/keycloak-saml/employee-distributable/WEB-INF/web.xml delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/pom.xml delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10ClientInitiatedAccountLinkTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCFilterAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCPublicKeyRotationAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCSessionAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OfflineServletsAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10SAMLAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10SAMLFilterAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10SecuredDeploymentsAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/cluster/Wildfly10SAMLAdapterClusterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/crossdc/Wildfly10SAMLAdapterCrossDCTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10DefaultAuthzConfigAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10PermissiveModeAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10PhotozExampleAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10ServletAuthzAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10ServletPolicyEnforcerAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/cors/Wildfly10CorsExampleAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/resources/adapter-test/keycloak-saml/employee-distributable/WEB-INF/web.xml delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/pom.xml delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCPublicKeyRotationAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCSessionAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OfflineServletsAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SAMLAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SAMLFilterAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SecuredDeploymentsAdapterTest.java 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 456f968ec4..e8dc52326c 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/eap6/pom.xml +++ b/testsuite/integration-arquillian/servers/app-server/jboss/eap6/pom.xml @@ -41,6 +41,7 @@ keycloak-saml-eap6-adapter-dist true + true diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml index d3101b3ef9..0df69aadfa 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml +++ b/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml @@ -413,7 +413,7 @@ exec - ${skip.apply.offline.cli} + ${skip.configure.clustered.scenario} ${app.server.jboss.home}/bin ./jboss-cli.sh @@ -429,7 +429,7 @@ exec - ${skip.apply.offline.cli} + ${skip.configure.clustered.scenario} ${app.server.jboss.home}/bin ./jboss-cli.sh diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/pom.xml index eb302fd3d1..85c2378f54 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/pom.xml +++ b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/pom.xml @@ -26,8 +26,8 @@ 4.0.0 integration-arquillian-servers-app-server-wildfly10 - pom - App Server - JBoss - Wildfly 10 + jar + App Server - Wildfly 10 wildfly10 @@ -43,4 +43,20 @@ false + + + org.keycloak.testsuite + integration-arquillian-servers-app-server-spi + ${project.version} + + + org.wildfly.arquillian + wildfly-arquillian-container-managed + + + org.keycloak.testsuite + integration-arquillian-util + ${project.version} + + diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/java/org/keycloak/testsuite/arquillian/wildfly/Wildfly10AppServerArquillianExtension.java b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/java/org/keycloak/testsuite/arquillian/wildfly/Wildfly10AppServerArquillianExtension.java new file mode 100644 index 0000000000..ab68180cdd --- /dev/null +++ b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/java/org/keycloak/testsuite/arquillian/wildfly/Wildfly10AppServerArquillianExtension.java @@ -0,0 +1,34 @@ +/* + * Copyright 2018 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.arquillian.wildfly; + +import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; +import org.jboss.arquillian.core.spi.LoadableExtension; +import org.keycloak.testsuite.arquillian.wildfly.container.Wildfly10DeploymentArchiveProcessor; + +/** + * + * @author Vlasta Ramik + */ +public class Wildfly10AppServerArquillianExtension implements LoadableExtension { + + @Override + public void register(ExtensionBuilder builder) { + builder.service(ApplicationArchiveProcessor.class, Wildfly10DeploymentArchiveProcessor.class); + } + +} 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 new file mode 100644 index 0000000000..3bbcba47fa --- /dev/null +++ b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly10AppServerProvider.java @@ -0,0 +1,162 @@ +/* + * Copyright 2018 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.arquillian.wildfly.container; + +import java.util.ArrayList; +import java.util.List; +import org.jboss.arquillian.core.spi.Validate; +import org.jboss.as.arquillian.container.managed.ManagedDeployableContainer; +import org.jboss.shrinkwrap.descriptor.spi.node.Node; +import org.keycloak.testsuite.arquillian.container.AppServerContainerProvider; + +/** + * @author Vlasta Ramik + */ +public class Wildfly10AppServerProvider implements AppServerContainerProvider { + + private Node configuration; + private static final String containerName = "wildfly10"; + + private final String appServerHome; + private final String appServerJavaHome; + private final String appServerPortOffset; + private final String managementProtocol; + private final String managementPort; + private final String startupTimeoutInSeconds; + + public Wildfly10AppServerProvider() { + appServerHome = System.getProperty("app.server.home"); + appServerJavaHome = System.getProperty("app.server.java.home"); + appServerPortOffset = System.getProperty("app.server.port.offset"); + managementProtocol = System.getProperty("app.server.management.protocol"); + managementPort = System.getProperty("app.server.management.port"); + startupTimeoutInSeconds = System.getProperty("app.server.startup.timeout"); + + Validate.notNullOrEmpty(appServerHome, "app.server.home is not set."); + Validate.notNullOrEmpty(appServerJavaHome, "app.server.java.home is not set."); + Validate.notNullOrEmpty(appServerPortOffset, "app.server.port.offset is not set."); + Validate.notNullOrEmpty(managementProtocol, "app.server.management.protocol is not set."); + Validate.notNullOrEmpty(managementPort, "app.server.management.port is not set."); + Validate.notNullOrEmpty(startupTimeoutInSeconds, "app.server.startup.timeout is not set."); + } + + @Override + public String getName() { + return containerName; + } + + @Override + public List getContainers() { + List containers = new ArrayList<>(); + + containers.add(standaloneContainer()); + containers.add(clusterGroup()); + + return containers; + } + + private void createChild(String name, String text) { + configuration.createChild("property").attribute("name", name).text(text); + } + + private Node standaloneContainer() { + Node container = new Node("container"); + container.attribute("mode", "manual"); + container.attribute("qualifier", AppServerContainerProvider.APP_SERVER + "-" + containerName); + + configuration = container.createChild("configuration"); + createChild("enabled", "true"); + createChild("adapterImplClass", ManagedDeployableContainer.class.getName()); + createChild("jbossHome", appServerHome); + createChild("javaHome", appServerJavaHome); + createChild("jbossArguments", + "-Djboss.socket.binding.port-offset=" + appServerPortOffset + " " + + System.getProperty("adapter.test.props", " ") + + System.getProperty("kie.maven.settings", " ") + ); + createChild("javaVmArguments", + System.getProperty("app.server.jboss.jvm.debug.args", "") + " " + + System.getProperty("app.server.memory.settings", "") + " " + + "-Djava.net.preferIPv4Stack=true" + ); + createChild("managementProtocol", managementProtocol); + createChild("managementPort", managementPort); + createChild("startupTimeoutInSeconds", startupTimeoutInSeconds); + + return container; + } + + private Node clusterGroup() { + Node group = new Node("group"); + group.attribute("qualifier", "app-server-wildfly10-clustered"); + addHaNodeContainer(group, 1); + addHaNodeContainer(group, 2); + return group; + } + + private void addHaNodeContainer(Node group, int number) { + String portOffset = System.getProperty("app.server." + number + ".port.offset"); + String managementPort = System.getProperty("app.server." + number + ".management.port"); + + Validate.notNullOrEmpty(portOffset, "app.server." + number + ".port.offset is not set."); + Validate.notNullOrEmpty(managementPort, "app.server." + number + ".management.port is not set."); + + Node container = group.createChild("container"); + container.attribute("mode", "manual"); + container.attribute("qualifier", AppServerContainerProvider.APP_SERVER + "-" + containerName + "-ha-node-" + number); + + configuration = container.createChild("configuration"); + createChild("enabled", "true"); + createChild("adapterImplClass", ManagedDeployableContainer.class.getName()); + createChild("jbossHome", appServerHome); + createChild("javaHome", appServerJavaHome); + //cleanServerBaseDir cannot be used until WFARQ-44 is fixed +// createChild("cleanServerBaseDir", appServerHome + "/standalone-ha-node-" + number); + createChild("serverConfig", "standalone-ha.xml"); + createChild("jbossArguments", + "-Djboss.server.base.dir=" + appServerHome + "/standalone-ha-node-" + number + " " + + "-Djboss.socket.binding.port-offset=" + portOffset + " " + + "-Djboss.node.name=ha-node-" + number + " " + + getCrossDCProperties(number, portOffset) + + System.getProperty("adapter.test.props", " ") + + System.getProperty("kie.maven.settings", " ") + ); + createChild("javaVmArguments", + "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=790" + number + " " + + System.getProperty("app.server.memory.settings", "") + " " + + "-Djava.net.preferIPv4Stack=true" + ); + createChild("managementProtocol", managementProtocol); + createChild("managementPort", managementPort); + createChild("startupTimeoutInSeconds", startupTimeoutInSeconds); + } + + private String getCrossDCProperties(int number, String portOffset) { + if (System.getProperty("cache.server") == null || System.getProperty("cache.server").equals("undefined")) { + return ""; + } + String cacheHotrodPortString = System.getProperty("cache.server." + number + ".port.offset"); + Validate.notNullOrEmpty(cacheHotrodPortString, "cache.server." + number + ".port.offset is not set."); + + int tcppingPort = 7600 + Integer.parseInt(portOffset); + int cacheHotrodPort = 11222 + Integer.parseInt(cacheHotrodPortString); + + //properties used in servers/app-server/jboss/common/cli/configure-crossdc-config.cli + return "-Dtcpping.port=" + tcppingPort + " -Dcache.hotrod.port=" + cacheHotrodPort + " "; + } +} diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly10DeploymentArchiveProcessor.java b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly10DeploymentArchiveProcessor.java new file mode 100644 index 0000000000..5c61ab5ee2 --- /dev/null +++ b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly10DeploymentArchiveProcessor.java @@ -0,0 +1,71 @@ +/* + * Copyright 2018 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.arquillian.wildfly.container; + +import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; +import org.jboss.arquillian.test.spi.TestClass; +import org.jboss.logging.Logger; +import org.jboss.shrinkwrap.api.Archive; +import org.keycloak.testsuite.utils.annotation.UseServletFilter; +import org.keycloak.testsuite.utils.arquillian.DeploymentArchiveProcessorUtils; + +/** + * + * @author Vlasta Ramik + */ +public class Wildfly10DeploymentArchiveProcessor implements ApplicationArchiveProcessor { + + private final Logger log = Logger.getLogger(Wildfly10DeploymentArchiveProcessor.class); + + @Override + public void process(Archive archive, TestClass testClass) { + if (DeploymentArchiveProcessorUtils.checkRunOnServerDeployment(archive)) { + return; + } + modifyWebXML(archive, testClass); + + modifyOIDCAdapterConfig(archive, DeploymentArchiveProcessorUtils.ADAPTER_CONFIG_PATH); + modifyOIDCAdapterConfig(archive, DeploymentArchiveProcessorUtils.ADAPTER_CONFIG_PATH_JS); + + modifySAMLAdapterConfig(archive); + } + + private void modifyWebXML(Archive archive, TestClass testClass) { + if (!archive.contains(DeploymentArchiveProcessorUtils.WEBXML_PATH)) return; + if (!testClass.getJavaClass().isAnnotationPresent(UseServletFilter.class)) return; + if (!archive.contains(DeploymentArchiveProcessorUtils.JBOSS_DEPLOYMENT_XML_PATH)) return; + + log.debug("Modifying WEB.XML in " + archive.getName() + " for Servlet Filter."); + DeploymentArchiveProcessorUtils.modifyWebXMLForServletFilter(archive, testClass); + DeploymentArchiveProcessorUtils.addFilterDependencies(archive, testClass); + } + + private void modifyOIDCAdapterConfig(Archive archive, String adapterConfigPath) { + if (!archive.contains(adapterConfigPath)) return; + + log.debug("Modifying adapter config " + adapterConfigPath + " in " + archive.getName()); + + DeploymentArchiveProcessorUtils.modifyOIDCAdapterConfig(archive, adapterConfigPath); + } + + private void modifySAMLAdapterConfig(Archive archive) { + if (!archive.contains(DeploymentArchiveProcessorUtils.SAML_ADAPTER_CONFIG_PATH)) return; + + log.debug("Modifying adapter config " + DeploymentArchiveProcessorUtils.SAML_ADAPTER_CONFIG_PATH + " in " + archive.getName()); + DeploymentArchiveProcessorUtils.modifySAMLAdapterConfig(archive); + } +} diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension new file mode 100644 index 0000000000..e7eeca19d4 --- /dev/null +++ b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension @@ -0,0 +1 @@ +org.keycloak.testsuite.arquillian.wildfly.Wildfly10AppServerArquillianExtension diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider new file mode 100644 index 0000000000..607739071c --- /dev/null +++ b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider @@ -0,0 +1 @@ +org.keycloak.testsuite.arquillian.wildfly.container.Wildfly10AppServerProvider diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/pom.xml index dec414fe2c..a1fbcb2302 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/pom.xml +++ b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/pom.xml @@ -26,8 +26,8 @@ 4.0.0 integration-arquillian-servers-app-server-wildfly9 - pom - App Server - JBoss - Wildfly 9 + jar + App Server - Wildfly 9 wildfly9 @@ -41,6 +41,23 @@ keycloak-saml-wildfly-adapter-dist false + true + + + org.keycloak.testsuite + integration-arquillian-servers-app-server-spi + ${project.version} + + + org.wildfly.arquillian + wildfly-arquillian-container-managed + + + org.keycloak.testsuite + integration-arquillian-util + ${project.version} + + diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/java/org/keycloak/testsuite/arquillian/wildfly/Wildfly9AppServerArquillianExtension.java b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/java/org/keycloak/testsuite/arquillian/wildfly/Wildfly9AppServerArquillianExtension.java new file mode 100644 index 0000000000..c99477a0b0 --- /dev/null +++ b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/java/org/keycloak/testsuite/arquillian/wildfly/Wildfly9AppServerArquillianExtension.java @@ -0,0 +1,34 @@ +/* + * Copyright 2018 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.arquillian.wildfly; + +import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; +import org.jboss.arquillian.core.spi.LoadableExtension; +import org.keycloak.testsuite.arquillian.wildfly.container.Wildfly9DeploymentArchiveProcessor; + +/** + * + * @author Vlasta Ramik + */ +public class Wildfly9AppServerArquillianExtension implements LoadableExtension { + + @Override + public void register(ExtensionBuilder builder) { + builder.service(ApplicationArchiveProcessor.class, Wildfly9DeploymentArchiveProcessor.class); + } + +} 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 new file mode 100644 index 0000000000..c1983ef38a --- /dev/null +++ b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly9AppServerProvider.java @@ -0,0 +1,162 @@ +/* + * Copyright 2018 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.arquillian.wildfly.container; + +import java.util.ArrayList; +import java.util.List; +import org.jboss.arquillian.core.spi.Validate; +import org.jboss.as.arquillian.container.managed.ManagedDeployableContainer; +import org.jboss.shrinkwrap.descriptor.spi.node.Node; +import org.keycloak.testsuite.arquillian.container.AppServerContainerProvider; + +/** + * @author Vlasta Ramik + */ +public class Wildfly9AppServerProvider implements AppServerContainerProvider { + + private Node configuration; + private static final String containerName = "wildfly9"; + + private final String appServerHome; + private final String appServerJavaHome; + private final String appServerPortOffset; + private final String managementProtocol; + private final String managementPort; + private final String startupTimeoutInSeconds; + + public Wildfly9AppServerProvider() { + appServerHome = System.getProperty("app.server.home"); + appServerJavaHome = System.getProperty("app.server.java.home"); + appServerPortOffset = System.getProperty("app.server.port.offset"); + managementProtocol = System.getProperty("app.server.management.protocol"); + managementPort = System.getProperty("app.server.management.port"); + startupTimeoutInSeconds = System.getProperty("app.server.startup.timeout"); + + Validate.notNullOrEmpty(appServerHome, "app.server.home is not set."); + Validate.notNullOrEmpty(appServerJavaHome, "app.server.java.home is not set."); + Validate.notNullOrEmpty(appServerPortOffset, "app.server.port.offset is not set."); + Validate.notNullOrEmpty(managementProtocol, "app.server.management.protocol is not set."); + Validate.notNullOrEmpty(managementPort, "app.server.management.port is not set."); + Validate.notNullOrEmpty(startupTimeoutInSeconds, "app.server.startup.timeout is not set."); + } + + @Override + public String getName() { + return containerName; + } + + @Override + public List getContainers() { + List containers = new ArrayList<>(); + + containers.add(standaloneContainer()); +// containers.add(clusterGroup()); + + return containers; + } + + private void createChild(String name, String text) { + configuration.createChild("property").attribute("name", name).text(text); + } + + private Node standaloneContainer() { + Node container = new Node("container"); + container.attribute("mode", "manual"); + container.attribute("qualifier", AppServerContainerProvider.APP_SERVER + "-" + containerName); + + configuration = container.createChild("configuration"); + createChild("enabled", "true"); + createChild("adapterImplClass", ManagedDeployableContainer.class.getName()); + createChild("jbossHome", appServerHome); + createChild("javaHome", appServerJavaHome); + createChild("jbossArguments", + "-Djboss.socket.binding.port-offset=" + appServerPortOffset + " " + + System.getProperty("adapter.test.props", " ") + + System.getProperty("kie.maven.settings", " ") + ); + createChild("javaVmArguments", + System.getProperty("app.server.jboss.jvm.debug.args", "") + " " + + System.getProperty("app.server.memory.settings", "") + " " + + "-Djava.net.preferIPv4Stack=true" + ); + createChild("managementProtocol", managementProtocol); + createChild("managementPort", managementPort); + createChild("startupTimeoutInSeconds", startupTimeoutInSeconds); + + return container; + } + + private Node clusterGroup() { + Node group = new Node("group"); + group.attribute("qualifier", "app-server-wildfly9-clustered"); + addHaNodeContainer(group, 1); + addHaNodeContainer(group, 2); + return group; + } + + private void addHaNodeContainer(Node group, int number) { + String portOffset = System.getProperty("app.server." + number + ".port.offset"); + String managementPort = System.getProperty("app.server." + number + ".management.port"); + + Validate.notNullOrEmpty(portOffset, "app.server." + number + ".port.offset is not set."); + Validate.notNullOrEmpty(managementPort, "app.server." + number + ".management.port is not set."); + + Node container = group.createChild("container"); + container.attribute("mode", "manual"); + container.attribute("qualifier", AppServerContainerProvider.APP_SERVER + "-" + containerName + "-ha-node-" + number); + + configuration = container.createChild("configuration"); + createChild("enabled", "true"); + createChild("adapterImplClass", ManagedDeployableContainer.class.getName()); + createChild("jbossHome", appServerHome); + createChild("javaHome", appServerJavaHome); + //cleanServerBaseDir cannot be used until WFARQ-44 is fixed +// createChild("cleanServerBaseDir", appServerHome + "/standalone-ha-node-" + number); + createChild("serverConfig", "standalone-ha.xml"); + createChild("jbossArguments", + "-Djboss.server.base.dir=" + appServerHome + "/standalone-ha-node-" + number + " " + + "-Djboss.socket.binding.port-offset=" + portOffset + " " + + "-Djboss.node.name=ha-node-" + number + " " + + getCrossDCProperties(number, portOffset) + + System.getProperty("adapter.test.props", " ") + + System.getProperty("kie.maven.settings", " ") + ); + createChild("javaVmArguments", + "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=790" + number + " " + + System.getProperty("app.server.memory.settings", "") + " " + + "-Djava.net.preferIPv4Stack=true" + ); + createChild("managementProtocol", managementProtocol); + createChild("managementPort", managementPort); + createChild("startupTimeoutInSeconds", startupTimeoutInSeconds); + } + + private String getCrossDCProperties(int number, String portOffset) { + if (System.getProperty("cache.server") == null || System.getProperty("cache.server").equals("undefined")) { + return ""; + } + String cacheHotrodPortString = System.getProperty("cache.server." + number + ".port.offset"); + Validate.notNullOrEmpty(cacheHotrodPortString, "cache.server." + number + ".port.offset is not set."); + + int tcppingPort = 7600 + Integer.parseInt(portOffset); + int cacheHotrodPort = 11222 + Integer.parseInt(cacheHotrodPortString); + + //properties used in servers/app-server/jboss/common/cli/configure-crossdc-config.cli + return "-Dtcpping.port=" + tcppingPort + " -Dcache.hotrod.port=" + cacheHotrodPort + " "; + } +} diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly9DeploymentArchiveProcessor.java b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly9DeploymentArchiveProcessor.java new file mode 100644 index 0000000000..ef2294762f --- /dev/null +++ b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly9DeploymentArchiveProcessor.java @@ -0,0 +1,71 @@ +/* + * Copyright 2018 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.arquillian.wildfly.container; + +import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; +import org.jboss.arquillian.test.spi.TestClass; +import org.jboss.logging.Logger; +import org.jboss.shrinkwrap.api.Archive; +import org.keycloak.testsuite.utils.annotation.UseServletFilter; +import org.keycloak.testsuite.utils.arquillian.DeploymentArchiveProcessorUtils; + +/** + * + * @author Vlasta Ramik + */ +public class Wildfly9DeploymentArchiveProcessor implements ApplicationArchiveProcessor { + + private final Logger log = Logger.getLogger(Wildfly9DeploymentArchiveProcessor.class); + + @Override + public void process(Archive archive, TestClass testClass) { + if (DeploymentArchiveProcessorUtils.checkRunOnServerDeployment(archive)) { + return; + } + modifyWebXML(archive, testClass); + + modifyOIDCAdapterConfig(archive, DeploymentArchiveProcessorUtils.ADAPTER_CONFIG_PATH); + modifyOIDCAdapterConfig(archive, DeploymentArchiveProcessorUtils.ADAPTER_CONFIG_PATH_JS); + + modifySAMLAdapterConfig(archive); + } + + private void modifyWebXML(Archive archive, TestClass testClass) { + if (!archive.contains(DeploymentArchiveProcessorUtils.WEBXML_PATH)) return; + if (!testClass.getJavaClass().isAnnotationPresent(UseServletFilter.class)) return; + if (!archive.contains(DeploymentArchiveProcessorUtils.JBOSS_DEPLOYMENT_XML_PATH)) return; + + log.debug("Modifying WEB.XML in " + archive.getName() + " for Servlet Filter."); + DeploymentArchiveProcessorUtils.modifyWebXMLForServletFilter(archive, testClass); + DeploymentArchiveProcessorUtils.addFilterDependencies(archive, testClass); + } + + private void modifyOIDCAdapterConfig(Archive archive, String adapterConfigPath) { + if (!archive.contains(adapterConfigPath)) return; + + log.debug("Modifying adapter config " + adapterConfigPath + " in " + archive.getName()); + + DeploymentArchiveProcessorUtils.modifyOIDCAdapterConfig(archive, adapterConfigPath); + } + + private void modifySAMLAdapterConfig(Archive archive) { + if (!archive.contains(DeploymentArchiveProcessorUtils.SAML_ADAPTER_CONFIG_PATH)) return; + + log.debug("Modifying adapter config " + DeploymentArchiveProcessorUtils.SAML_ADAPTER_CONFIG_PATH + " in " + archive.getName()); + DeploymentArchiveProcessorUtils.modifySAMLAdapterConfig(archive); + } +} diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension new file mode 100644 index 0000000000..e27917baac --- /dev/null +++ b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension @@ -0,0 +1 @@ +org.keycloak.testsuite.arquillian.wildfly.Wildfly9AppServerArquillianExtension diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider new file mode 100644 index 0000000000..134e751573 --- /dev/null +++ b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider @@ -0,0 +1 @@ +org.keycloak.testsuite.arquillian.wildfly.container.Wildfly9AppServerProvider diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml index ac5e4d4fa8..e76af7f4f3 100644 --- a/testsuite/integration-arquillian/tests/base/pom.xml +++ b/testsuite/integration-arquillian/tests/base/pom.xml @@ -349,6 +349,81 @@ + + app-server-wildfly10 + + + app.server + wildfly10 + + + + wildfly10 + false + + 2.0.0.Final + 8.2.5.Final + + + + org.keycloak.testsuite + integration-arquillian-servers-app-server-wildfly10 + ${project.version} + runtime + + + + org.wildfly.core + wildfly-cli + test + ${wildfly10.core.version} + + + + + + org.commonjava.maven.plugins + directory-maven-plugin + + + + + + app-server-wildfly9 + + + app.server + wildfly9 + + + + wildfly9 + false + + + + org.keycloak.testsuite + integration-arquillian-servers-app-server-wildfly9 + ${project.version} + runtime + + + + org.wildfly.core + wildfly-cli + test + ${wildfly.core.version} + + + + + + org.commonjava.maven.plugins + directory-maven-plugin + + + + app-server-eap diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java index df35f7f066..7e8cc7e2fa 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java @@ -198,6 +198,14 @@ public class AppServerTestEnricher { return CURRENT_APP_SERVER.equals("wildfly"); } + public static boolean isWildfly10AppServer() { + return CURRENT_APP_SERVER.equals("wildfly10"); + } + + public static boolean isWildfly9AppServer() { + return CURRENT_APP_SERVER.equals("wildfly9"); + } + public static boolean isTomcatAppServer() { return CURRENT_APP_SERVER.equals("tomcat"); } 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 4a3ee67b1a..90a9850a34 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 @@ -49,6 +49,8 @@ import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.isUndertow import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.isWLSAppServer; import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.isWASAppServer; import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.isWildflyAppServer; +import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.isWildfly10AppServer; +import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.isWildfly9AppServer; import static org.keycloak.testsuite.arquillian.AuthServerTestEnricher.getAuthServerContextRoot; import static org.keycloak.testsuite.utils.io.IOUtil.appendChildInDocument; import static org.keycloak.testsuite.utils.io.IOUtil.documentToString; @@ -96,6 +98,8 @@ public class DeploymentArchiveProcessor implements ApplicationArchiveProcessor { if (isEAP6AppServer() || isEAPAppServer() || isWildflyAppServer() || + isWildfly10AppServer() || + isWildfly9AppServer() || isUndertowAppServer()) { return; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/ContainerConstants.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/ContainerConstants.java index e13c26de6b..6f4faa1d63 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/ContainerConstants.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/ContainerConstants.java @@ -24,6 +24,11 @@ public interface ContainerConstants { public static final String APP_SERVER_WILDFLY = APP_SERVER_PREFIX + "wildfly"; public static final String APP_SERVER_WILDFLY_CLUSTER = APP_SERVER_WILDFLY + "-ha-node-1;" + APP_SERVER_WILDFLY + "-ha-node-2"; + public static final String APP_SERVER_WILDFLY10 = APP_SERVER_PREFIX + "wildfly10"; + public static final String APP_SERVER_WILDFLY10_CLUSTER = APP_SERVER_WILDFLY10 + "-ha-node-1;" + APP_SERVER_WILDFLY10 + "-ha-node-2"; + + public static final String APP_SERVER_WILDFLY9 = APP_SERVER_PREFIX + "wildfly9"; + public static final String APP_SERVER_EAP = APP_SERVER_PREFIX + "eap"; public static final String APP_SERVER_EAP_CLUSTER = APP_SERVER_EAP + "-ha-node-1;" + APP_SERVER_EAP + "-ha-node-2"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/DefaultAuthzConfigAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/DefaultAuthzConfigAdapterTest.java index 3ba0977e84..d2cee9428e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/DefaultAuthzConfigAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/DefaultAuthzConfigAdapterTest.java @@ -47,6 +47,7 @@ import static org.keycloak.testsuite.utils.io.IOUtil.loadRealm; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) public class DefaultAuthzConfigAdapterTest extends AbstractExampleAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PermissiveModeAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PermissiveModeAdapterTest.java index cce80ffa86..6a5cc831c3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PermissiveModeAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PermissiveModeAdapterTest.java @@ -31,6 +31,7 @@ import org.keycloak.testsuite.arquillian.containers.ContainerConstants; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) public class PermissiveModeAdapterTest extends AbstractBaseServletAuthzAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleLazyLoadPathsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleLazyLoadPathsAdapterTest.java index 50dc0e22c5..75418b75b7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleLazyLoadPathsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleLazyLoadPathsAdapterTest.java @@ -29,6 +29,7 @@ import org.keycloak.testsuite.arquillian.containers.ContainerConstants; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) public class PhotozExampleLazyLoadPathsAdapterTest extends AbstractPhotozExampleAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleNoLazyLoadPathsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleNoLazyLoadPathsAdapterTest.java index a8cefd64c3..54ebc5feb4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleNoLazyLoadPathsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleNoLazyLoadPathsAdapterTest.java @@ -28,6 +28,7 @@ import org.keycloak.testsuite.arquillian.containers.ContainerConstants; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) public class PhotozExampleNoLazyLoadPathsAdapterTest extends AbstractPhotozExampleAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCIPAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCIPAdapterTest.java index 465642a176..32d9135302 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCIPAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCIPAdapterTest.java @@ -29,6 +29,7 @@ import org.keycloak.testsuite.arquillian.containers.ContainerConstants; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) public class ServletAuthzCIPAdapterTest extends AbstractServletAuthzAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheDisabledAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheDisabledAdapterTest.java index f05fe9f2f8..e8302bbadc 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheDisabledAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheDisabledAdapterTest.java @@ -31,6 +31,7 @@ import org.keycloak.testsuite.arquillian.containers.ContainerConstants; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) public class ServletAuthzCacheDisabledAdapterTest extends AbstractServletAuthzAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheLifespanAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheLifespanAdapterTest.java index a1a4db33b7..d2dd4a1f93 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheLifespanAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheLifespanAdapterTest.java @@ -30,6 +30,7 @@ import org.keycloak.testsuite.arquillian.containers.ContainerConstants; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) public class ServletAuthzCacheLifespanAdapterTest extends AbstractServletAuthzAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzLazyLoadPathsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzLazyLoadPathsAdapterTest.java index 9a50b5acca..ae46a04e47 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzLazyLoadPathsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzLazyLoadPathsAdapterTest.java @@ -29,6 +29,7 @@ import org.keycloak.testsuite.arquillian.containers.ContainerConstants; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) public class ServletAuthzLazyLoadPathsAdapterTest extends AbstractServletAuthzAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzNoLazyLoadPathsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzNoLazyLoadPathsAdapterTest.java index 6d5bde6e44..d5272dda34 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzNoLazyLoadPathsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzNoLazyLoadPathsAdapterTest.java @@ -27,6 +27,7 @@ import org.keycloak.testsuite.arquillian.containers.ContainerConstants; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) public class ServletAuthzNoLazyLoadPathsAdapterTest extends AbstractServletAuthzAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerTest.java index 7b8f331027..76e11d6925 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerTest.java @@ -53,6 +53,7 @@ import org.openqa.selenium.By; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) public class ServletPolicyEnforcerTest extends AbstractExampleAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/cors/CorsExampleAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/cors/CorsExampleAdapterTest.java index 1200605786..5df2624f45 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/cors/CorsExampleAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/cors/CorsExampleAdapterTest.java @@ -57,6 +57,7 @@ import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement; * Created by fkiss. */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) public class CorsExampleAdapterTest extends AbstractExampleAdapterTest { @@ -189,4 +190,4 @@ public class CorsExampleAdapterTest extends AbstractExampleAdapterTest { public static void afterCorsTest() { System.setProperty("auth.server.host", hostBackup); } -} \ No newline at end of file +} diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/hal/ConsoleProtectionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/hal/ConsoleProtectionTest.java index 3e60a9cfd9..6bb09bdb22 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/hal/ConsoleProtectionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/hal/ConsoleProtectionTest.java @@ -52,7 +52,6 @@ import org.wildfly.extras.creaper.core.online.operations.admin.Administration; */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) -@AppServerContainer(ContainerConstants.APP_SERVER_EAP6) public class ConsoleProtectionTest extends AbstractAdapterTest { // Javascript browser needed KEYCLOAK-4703 diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/BrokerLinkAndTokenExchangeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/BrokerLinkAndTokenExchangeTest.java index 3cf5cd2fea..696bb58c5c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/BrokerLinkAndTokenExchangeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/BrokerLinkAndTokenExchangeTest.java @@ -90,6 +90,7 @@ import static org.keycloak.testsuite.arquillian.DeploymentTargetModifier.AUTH_SE */ @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) public class BrokerLinkAndTokenExchangeTest extends AbstractServletsAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkTest.java index c9c4266b7d..a837f8f99f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkTest.java @@ -75,6 +75,7 @@ import static org.keycloak.testsuite.admin.ApiUtil.createUserAndResetPasswordWit */ @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) public class ClientInitiatedAccountLinkTest extends AbstractServletsAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoFilterServletAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoFilterServletAdapterTest.java index 87331941dc..cb532178ff 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoFilterServletAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoFilterServletAdapterTest.java @@ -24,6 +24,7 @@ import org.keycloak.testsuite.arquillian.containers.ContainerConstants; @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @UseServletFilter(filterName = "oidc-filter", filterClass = "org.keycloak.adapters.servlet.KeycloakOIDCFilter", diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoServletsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoServletsAdapterTest.java index d3af0ba7d4..3048cb9bf3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoServletsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoServletsAdapterTest.java @@ -131,6 +131,8 @@ import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; */ @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY9) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) public class DemoServletsAdapterTest extends AbstractServletsAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OIDCPublicKeyRotationAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OIDCPublicKeyRotationAdapterTest.java index a30e4c733b..a1cb309366 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OIDCPublicKeyRotationAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OIDCPublicKeyRotationAdapterTest.java @@ -80,6 +80,8 @@ import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement; */ @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY9) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) public class OIDCPublicKeyRotationAdapterTest extends AbstractServletsAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OfflineServletsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OfflineServletsAdapterTest.java index 7372f00e10..a3e9287613 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OfflineServletsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OfflineServletsAdapterTest.java @@ -37,6 +37,8 @@ import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement; */ @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY9) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) public class OfflineServletsAdapterTest extends AbstractServletsAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLFilterServletAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLFilterServletAdapterTest.java index b21a82155b..a9de50f918 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLFilterServletAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLFilterServletAdapterTest.java @@ -12,6 +12,8 @@ import org.keycloak.testsuite.arquillian.containers.ContainerConstants; * @author mhajas */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY9) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @UseServletFilter(filterName = "saml-filter", filterClass = "org.keycloak.adapters.saml.servlet.SamlFilter", diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java index cb022cd33e..18df393ce6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java @@ -158,6 +158,8 @@ import org.xml.sax.SAXException; * @author mhajas */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY9) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) public class SAMLServletAdapterTest extends AbstractServletsAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SecuredDeploymentsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SecuredDeploymentsAdapterTest.java index 49fe49bd84..7b891302df 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SecuredDeploymentsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SecuredDeploymentsAdapterTest.java @@ -35,6 +35,8 @@ import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlEquals; import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWithLoginUrlOf; @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY9) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) public class SecuredDeploymentsAdapterTest extends AbstractServletsAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SessionServletAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SessionServletAdapterTest.java index a8e40938e9..7ee5ca1343 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SessionServletAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SessionServletAdapterTest.java @@ -52,6 +52,8 @@ import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWithLo */ @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY9) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) public class SessionServletAdapterTest extends AbstractServletsAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/UserStorageConsentTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/UserStorageConsentTest.java index 1831dd21b4..7680dbcf49 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/UserStorageConsentTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/UserStorageConsentTest.java @@ -67,6 +67,7 @@ import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWithLo */ @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) public class UserStorageConsentTest extends AbstractServletsAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/SAMLAdapterClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/SAMLAdapterClusterTest.java index 3f4c01c4dc..daefe7da05 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/SAMLAdapterClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/SAMLAdapterClusterTest.java @@ -33,6 +33,7 @@ import static org.keycloak.testsuite.adapter.AbstractServletsAdapterTest.samlSer * @author hmlnarik */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_CLUSTER) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10_CLUSTER) @AppServerContainer(ContainerConstants.APP_SERVER_EAP_CLUSTER) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6_CLUSTER) public class SAMLAdapterClusterTest extends AbstractSAMLAdapterClusteredTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/crossdc/SAMLAdapterCrossDCTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/crossdc/SAMLAdapterCrossDCTest.java index df20436981..419d8e83c0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/crossdc/SAMLAdapterCrossDCTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/crossdc/SAMLAdapterCrossDCTest.java @@ -37,6 +37,7 @@ import static org.keycloak.testsuite.adapter.AbstractServletsAdapterTest.samlSer * @author hmlnarik */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_CLUSTER) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10_CLUSTER) @AppServerContainer(ContainerConstants.APP_SERVER_EAP_CLUSTER) public class SAMLAdapterCrossDCTest extends AbstractSAMLAdapterClusteredTest { diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/cluster/EAP6SAMLAdapterClusterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/cluster/EAP6SAMLAdapterClusterTest.java deleted file mode 100644 index b75c8ca2f4..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/cluster/EAP6SAMLAdapterClusterTest.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright 2017 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.cluster; - -import org.keycloak.testsuite.adapter.page.EmployeeServletDistributable; -import org.keycloak.testsuite.arquillian.annotation.*; - -import java.io.*; -import java.util.concurrent.TimeoutException; - -import org.keycloak.testsuite.adapter.AbstractSAMLAdapterClusteredTest; -import org.keycloak.testsuite.adapter.servlet.SendUsernameServlet; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.TargetsContainer; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Assert; -import org.junit.Before; -import org.wildfly.extras.creaper.core.*; -import org.wildfly.extras.creaper.core.online.*; -import org.wildfly.extras.creaper.core.online.operations.*; -import org.wildfly.extras.creaper.core.online.operations.admin.Administration; - -import static org.keycloak.testsuite.adapter.AbstractServletsAdapterTest.samlServletDeployment; -import org.keycloak.testsuite.arquillian.ContainerInfo; - -/** - * - * @author hmlnarik - */ -@AppServerContainer("app-server-eap6") -public class EAP6SAMLAdapterClusterTest extends AbstractSAMLAdapterClusteredTest { - - @TargetsContainer(value = "app-server-eap6-" + NODE_1_NAME) - @Deployment(name = EmployeeServletDistributable.DEPLOYMENT_NAME, managed = false) - protected static WebArchive employee() { - return samlServletDeployment(EmployeeServletDistributable.DEPLOYMENT_NAME, EmployeeServletDistributable.DEPLOYMENT_NAME + "/WEB-INF/web.xml", SendUsernameServlet.class); - } - - @TargetsContainer(value = "app-server-eap6-" + NODE_2_NAME) - @Deployment(name = EmployeeServletDistributable.DEPLOYMENT_NAME + "_2", managed = false) - protected static WebArchive employee2() { - return employee(); - } - - protected void prepareWorkerNode(int nodeIndex, Integer managementPort) throws IOException, NumberFormatException, TimeoutException, InterruptedException { - log.infov("Preparing worker node ({0} @ {1})", nodeIndex, managementPort); - - OnlineManagementClient clientWorkerNodeClient = ManagementClient.online(OnlineOptions - .standalone() - .hostAndPort("localhost", managementPort) - .protocol(ManagementProtocol.REMOTE) - .build()); - Administration administration = new Administration(clientWorkerNodeClient); - Operations op = new Operations(clientWorkerNodeClient); - - Batch b = new Batch(); - Address tcppingStack = Address - .subsystem("jgroups") - .and("stack", "tcpping"); - b.add(tcppingStack); - b.add(tcppingStack.and("transport", "TRANSPORT"), Values.of("socket-binding", "jgroups-tcp").and("type", "TCP")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "TCPPING")); - b.add(tcppingStack.and("protocol", "TCPPING").and("property", "initial_hosts"), Values.of("value", "localhost[" + (7600 + PORT_OFFSET_NODE_1) + "],localhost[" + (7600 + PORT_OFFSET_NODE_2) + "]")); - b.add(tcppingStack.and("protocol", "TCPPING").and("property", "port_range"), Values.of("value", "0")); - b.add(tcppingStack.and("protocol", "TCPPING").and("property", "num_initial_members"), Values.of("value", "2")); - b.add(tcppingStack.and("protocol", "TCPPING").and("property", "timeout"), Values.of("value", "3000")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "MERGE2")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "FD_SOCK").and("socket-binding", "jgroups-tcp-fd")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "FD")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "VERIFY_SUSPECT")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "pbcast.NAKACK")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "UNICAST2")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "pbcast.STABLE")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "pbcast.GMS")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "UFC")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "MFC")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "FRAG2")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "RSVP")); - Assert.assertTrue("Could not add TCPPING JGroups stack", op.batch(b).isSuccess()); - - Assert.assertTrue(op.writeAttribute(Address.subsystem("jgroups"), "default-stack", "tcpping").isSuccess()); - Assert.assertTrue(op.writeAttribute(Address.subsystem("web"), "instance-id", "${jboss.node.name}").isSuccess()); - Assert.assertTrue(op.add(Address.extension("org.keycloak.keycloak-saml-adapter-subsystem"), Values.of("module", "org.keycloak.keycloak-saml-adapter-subsystem")).isSuccess()); - Assert.assertTrue(op.add(Address.subsystem("keycloak-saml")).isSuccess()); - - //clientWorkerNodeClient.execute("reload"); - administration.reload(); - - log.infov("Worker node ({0}) Prepared", managementPort); - } - - @Before - @Override - public void startServers() throws Exception { - prepareServerDirectories(); - - for (ContainerInfo containerInfo : testContext.getAppServerBackendsInfo()) { - controller.start(containerInfo.getQualifier()); - } - - prepareWorkerNode(0, Integer.valueOf(System.getProperty("app.server.1.management.port"))); - prepareWorkerNode(1, Integer.valueOf(System.getProperty("app.server.2.management.port"))); - - deployer.deploy(EmployeeServletDistributable.DEPLOYMENT_NAME); - deployer.deploy(EmployeeServletDistributable.DEPLOYMENT_NAME + "_2"); - } - - @Override - protected void prepareServerDirectories() throws Exception { - prepareServerDirectory("standalone-cluster", "standalone-" + NODE_1_NAME); - prepareServerDirectory("standalone-cluster", "standalone-" + NODE_2_NAME); - } - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/crossdc/EAP6SAMLAdapterCrossDCTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/crossdc/EAP6SAMLAdapterCrossDCTest.java deleted file mode 100644 index 259f285658..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/crossdc/EAP6SAMLAdapterCrossDCTest.java +++ /dev/null @@ -1,192 +0,0 @@ -/* - * Copyright 2017 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.crossdc; - -import org.keycloak.testsuite.adapter.page.EmployeeServletDistributable; -import org.keycloak.testsuite.arquillian.annotation.*; - -import java.io.*; - -import org.keycloak.testsuite.adapter.AbstractSAMLAdapterClusteredTest; -import org.keycloak.testsuite.adapter.servlet.SendUsernameServlet; - -import org.apache.commons.lang3.math.NumberUtils; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.TargetsContainer; -import org.jboss.dmr.ModelNode; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.wildfly.extras.creaper.core.*; -import org.wildfly.extras.creaper.core.online.*; -import org.wildfly.extras.creaper.core.online.operations.*; - -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import org.junit.Before; -import static org.keycloak.testsuite.adapter.AbstractServletsAdapterTest.samlServletDeployment; -import org.keycloak.testsuite.arquillian.ContainerInfo; - -/** - * - * @author hmlnarik - */ -@Ignore("Infinispan version 5 does not support remote cache events, hence this test is left here for development purposes only") -@AppServerContainer("app-server-eap6") -public class EAP6SAMLAdapterCrossDCTest extends AbstractSAMLAdapterClusteredTest { - - @BeforeClass - public static void checkCrossDcTest() { - Assume.assumeThat("Seems not to be running cross-DC tests", System.getProperty("cache.server"), not(is("undefined"))); - } - - protected static final int PORT_OFFSET_CACHE_1 = NumberUtils.toInt(System.getProperty("cache.server.1.port.offset"), 0); - protected static final int CACHE_HOTROD_PORT_CACHE_1 = 11222 + PORT_OFFSET_CACHE_1; - protected static final int PORT_OFFSET_CACHE_2 = NumberUtils.toInt(System.getProperty("cache.server.2.port.offset"), 0); - protected static final int CACHE_HOTROD_PORT_CACHE_2 = 11222 + PORT_OFFSET_CACHE_2; - - private final int[] CACHE_HOTROD_PORTS = new int[] { CACHE_HOTROD_PORT_CACHE_1, CACHE_HOTROD_PORT_CACHE_2 }; - private final int[] TCPPING_PORTS = new int[] { 7600 + PORT_OFFSET_NODE_1, 7600 + PORT_OFFSET_NODE_2 }; - - private static final String SESSION_CACHE_NAME = EmployeeServletDistributable.DEPLOYMENT_NAME + "-cache"; - private static final String SSO_CACHE_NAME = SESSION_CACHE_NAME + ".ssoCache"; - - private static final Address SESSION_CACHE_ADDR = Address.subsystem("infinispan") - .and("cache-container", "web") - .and("replicated-cache", SESSION_CACHE_NAME); - private static final Address SSO_CACHE_ADDR = Address.subsystem("infinispan") - .and("cache-container", "web") - .and("replicated-cache", SSO_CACHE_NAME); - - private static final String JBOSS_WEB_XML = "\n" - + "\n" - + " \n" - + " SESSION\n" - + " " + "web." + SESSION_CACHE_NAME + "\n" - + " \n" - + ""; - - @TargetsContainer(value = "app-server-eap6-" + NODE_1_NAME) - @Deployment(name = EmployeeServletDistributable.DEPLOYMENT_NAME, managed = false) - protected static WebArchive employee() { - return samlServletDeployment(EmployeeServletDistributable.DEPLOYMENT_NAME, - EmployeeServletDistributable.DEPLOYMENT_NAME + "/WEB-INF/web.xml", - SendUsernameServlet.class) - .addAsWebInfResource(new StringAsset(JBOSS_WEB_XML), "jboss-web.xml"); - } - - @TargetsContainer(value = "app-server-eap6-" + NODE_2_NAME) - @Deployment(name = EmployeeServletDistributable.DEPLOYMENT_NAME + "_2", managed = false) - protected static WebArchive employee2() { - return employee(); - } - - protected void prepareWorkerNode(int nodeIndex, Integer managementPort) throws IOException, CliException, NumberFormatException { - log.infov("Preparing worker node ({0} @ {1})", nodeIndex, managementPort); - - OnlineManagementClient clientWorkerNodeClient = ManagementClient.online(OnlineOptions - .standalone() - .hostAndPort("localhost", managementPort) - .protocol(ManagementProtocol.REMOTE) - .build()); - Operations op = new Operations(clientWorkerNodeClient); - - Batch b = new Batch(); - Address tcppingStack = Address - .subsystem("jgroups") - .and("stack", "tcpping"); - b.add(tcppingStack); - b.add(tcppingStack.and("transport", "TRANSPORT"), Values.of("socket-binding", "jgroups-tcp").and("type", "TCP")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "TCPPING")); - b.add(tcppingStack.and("protocol", "TCPPING").and("property", "initial_hosts"), Values.of("value", "localhost[" + TCPPING_PORTS[nodeIndex] + "]")); - b.add(tcppingStack.and("protocol", "TCPPING").and("property", "port_range"), Values.of("value", "0")); - b.add(tcppingStack.and("protocol", "TCPPING").and("property", "num_initial_members"), Values.of("value", "1")); - b.add(tcppingStack.and("protocol", "TCPPING").and("property", "timeout"), Values.of("value", "3000")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "MERGE2")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "FD_SOCK").and("socket-binding", "jgroups-tcp-fd")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "FD")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "VERIFY_SUSPECT")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "pbcast.NAKACK")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "UNICAST2")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "pbcast.STABLE")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "pbcast.GMS")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "UFC")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "MFC")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "FRAG2")); - b.invoke("add-protocol", tcppingStack, Values.of("type", "RSVP")); - Assert.assertTrue("Could not add TCPPING JGroups stack", op.batch(b).isSuccess()); - - op.add(Address.of("socket-binding-group", "standard-sockets").and("remote-destination-outbound-socket-binding", "cache-server"), - Values.of("host", "localhost") - .and("port", CACHE_HOTROD_PORTS[nodeIndex])); - - op.add(SESSION_CACHE_ADDR, Values.of("statistics-enabled", "true").and("mode", "SYNC")); - op.add(SESSION_CACHE_ADDR.and("remote-store", "REMOTE_STORE"), - Values.of("remote-servers", ModelNode.fromString("[{\"outbound-socket-binding\"=>\"cache-server\"}]")) - .and("cache", SESSION_CACHE_NAME) - .and("passivation", false) - .and("purge", false) - .and("preload", false) - .and("shared", true) - ); - - op.add(SSO_CACHE_ADDR, Values.of("statistics-enabled", "true").and("mode", "SYNC")); - op.add(SSO_CACHE_ADDR.and("remote-store", "REMOTE_STORE"), - Values.of("remote-servers", ModelNode.fromString("[{\"outbound-socket-binding\"=>\"cache-server\"}]")) - .and("cache", SSO_CACHE_NAME) - .and("passivation", false) - .and("purge", false) - .and("preload", false) - .and("shared", true) - ); - - Assert.assertTrue(op.writeAttribute(Address.subsystem("jgroups"), "default-stack", "tcpping").isSuccess()); - Assert.assertTrue(op.writeAttribute(Address.subsystem("web"), "instance-id", "${jboss.node.name}").isSuccess()); - op.add(Address.extension("org.keycloak.keycloak-saml-adapter-subsystem"), Values.of("module", "org.keycloak.keycloak-saml-adapter-subsystem")); - op.add(Address.subsystem("keycloak-saml")); - - clientWorkerNodeClient.execute("reload"); - - log.infov("Worker node ({0}) Prepared", managementPort); - } - - @Before - @Override - public void startServers() throws Exception { - prepareServerDirectories(); - - for (ContainerInfo containerInfo : testContext.getAppServerBackendsInfo()) { - controller.start(containerInfo.getQualifier()); - } - - prepareWorkerNode(0, Integer.valueOf(System.getProperty("app.server.1.management.port"))); - prepareWorkerNode(1, Integer.valueOf(System.getProperty("app.server.2.management.port"))); - - deployer.deploy(EmployeeServletDistributable.DEPLOYMENT_NAME); - deployer.deploy(EmployeeServletDistributable.DEPLOYMENT_NAME + "_2"); - } - - @Override - protected void prepareServerDirectories() throws Exception { - prepareServerDirectory("standalone-crossdc", "standalone-" + NODE_1_NAME); - prepareServerDirectory("standalone-crossdc", "standalone-" + NODE_2_NAME); - } - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/resources/adapter-test/keycloak-saml/employee-distributable/WEB-INF/web.xml b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/resources/adapter-test/keycloak-saml/employee-distributable/WEB-INF/web.xml deleted file mode 100644 index 767eb6c161..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/resources/adapter-test/keycloak-saml/employee-distributable/WEB-INF/web.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - %CONTEXT_PATH% - - - javax.ws.rs.core.Application - /* - - - - /error.html - - - - - Application - /* - - - manager - - - - - KEYCLOAK-SAML - demo - - - - manager - - - - keycloak.sessionIdMapperUpdater.classes - org.keycloak.adapters.saml.jbossweb.infinispan.InfinispanSessionCacheIdMapperUpdater - - diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/pom.xml deleted file mode 100644 index 749dd4b1d9..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - 4.0.0 - - - org.keycloak.testsuite - integration-arquillian-tests-adapters-jboss - 4.1.0.Final-SNAPSHOT - - - integration-arquillian-tests-adapters-wildfly10 - - Adapter Tests - JBoss - Wildfly 10 - - - - org.wildfly.extras.creaper - creaper-core - test - 1.6.1 - - - com.google.guava - guava - - - - - org.wildfly.core - wildfly-cli - test - ${wildfly10.core.version} - - - org.wildfly.core - wildfly-controller-client - test - ${wildfly10.core.version} - - - - - wildfly10 - 2.0.0.Final - 8.2.5.Final - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10ClientInitiatedAccountLinkTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10ClientInitiatedAccountLinkTest.java deleted file mode 100644 index 934b8833f2..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10ClientInitiatedAccountLinkTest.java +++ /dev/null @@ -1,29 +0,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. - */ -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.ClientInitiatedAccountLinkTest; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * - * @author Vlastislav Ramik - */ -@AppServerContainer("app-server-wildfly10") -public class Wildfly10ClientInitiatedAccountLinkTest extends ClientInitiatedAccountLinkTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCAdapterTest.java deleted file mode 100644 index 337249666a..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCAdapterTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.DemoServletsAdapterTest; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * - * @author tkyjovsk - */ -@AppServerContainer("app-server-wildfly10") -public class Wildfly10OIDCAdapterTest extends DemoServletsAdapterTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCFilterAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCFilterAdapterTest.java deleted file mode 100644 index f73a7ee68f..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCFilterAdapterTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.DemoFilterServletAdapterTest; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * Created by zschwarz on 9/14/16. - */ - -@AppServerContainer("app-server-wildfly10") -public class Wildfly10OIDCFilterAdapterTest extends DemoFilterServletAdapterTest{ -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCPublicKeyRotationAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCPublicKeyRotationAdapterTest.java deleted file mode 100644 index f1230ec277..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCPublicKeyRotationAdapterTest.java +++ /dev/null @@ -1,28 +0,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. - */ - -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.OIDCPublicKeyRotationAdapterTest; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * @author Marek Posolda - */ -@AppServerContainer("app-server-wildfly10") -public class Wildfly10OIDCPublicKeyRotationAdapterTest extends OIDCPublicKeyRotationAdapterTest { -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCSessionAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCSessionAdapterTest.java deleted file mode 100644 index 69170f1688..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OIDCSessionAdapterTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.SessionServletAdapterTest; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * - * @author tkyjovsk - */ -@AppServerContainer("app-server-wildfly10") -public class Wildfly10OIDCSessionAdapterTest extends SessionServletAdapterTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OfflineServletsAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OfflineServletsAdapterTest.java deleted file mode 100644 index 980fc47c50..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10OfflineServletsAdapterTest.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.OfflineServletsAdapterTest; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * @author Bruno Oliveira. - */ -@AppServerContainer("app-server-wildfly10") -public class Wildfly10OfflineServletsAdapterTest extends OfflineServletsAdapterTest { -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10SAMLAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10SAMLAdapterTest.java deleted file mode 100644 index a867a98602..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10SAMLAdapterTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.SAMLServletsAdapterTest; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * @author mhajas - */ -@AppServerContainer("app-server-wildfly10") -public class Wildfly10SAMLAdapterTest extends SAMLServletsAdapterTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10SAMLFilterAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10SAMLFilterAdapterTest.java deleted file mode 100644 index a673991560..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10SAMLFilterAdapterTest.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.SAMLFilterServletAdapterTest; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * @author mhajas - */ -@AppServerContainer("app-server-wildfly10") -public class Wildfly10SAMLFilterAdapterTest extends SAMLFilterServletAdapterTest { -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10SecuredDeploymentsAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10SecuredDeploymentsAdapterTest.java deleted file mode 100644 index 92490aa105..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/Wildfly10SecuredDeploymentsAdapterTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.SecuredDeploymentsAdapterTest; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * - * @author tkyjovsk - */ -@AppServerContainer("app-server-wildfly10") -public class Wildfly10SecuredDeploymentsAdapterTest extends SecuredDeploymentsAdapterTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/cluster/Wildfly10SAMLAdapterClusterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/cluster/Wildfly10SAMLAdapterClusterTest.java deleted file mode 100644 index 5b91a171d1..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/cluster/Wildfly10SAMLAdapterClusterTest.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2017 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.cluster; - -import org.keycloak.testsuite.adapter.page.EmployeeServletDistributable; -import org.keycloak.testsuite.arquillian.annotation.*; -import org.keycloak.testsuite.adapter.AbstractSAMLAdapterClusteredTest; -import org.keycloak.testsuite.adapter.servlet.SendUsernameServlet; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.TargetsContainer; -import org.jboss.shrinkwrap.api.spec.WebArchive; - -import static org.keycloak.testsuite.adapter.AbstractServletsAdapterTest.samlServletDeployment; - -/** - * - * @author hmlnarik - */ -@AppServerContainer("app-server-wildfly10") -public class Wildfly10SAMLAdapterClusterTest extends AbstractSAMLAdapterClusteredTest { - - @TargetsContainer(value = "app-server-wildfly10-" + NODE_1_NAME) - @Deployment(name = EmployeeServletDistributable.DEPLOYMENT_NAME, managed = false) - protected static WebArchive employee() { - return samlServletDeployment(EmployeeServletDistributable.DEPLOYMENT_NAME, EmployeeServletDistributable.DEPLOYMENT_NAME + "/WEB-INF/web.xml", SendUsernameServlet.class); - } - - @TargetsContainer(value = "app-server-wildfly10-" + NODE_2_NAME) - @Deployment(name = EmployeeServletDistributable.DEPLOYMENT_NAME + "_2", managed = false) - protected static WebArchive employee2() { - return employee(); - } - - @Override - protected void prepareServerDirectories() throws Exception { - prepareServerDirectory("standalone-cluster", "standalone-" + NODE_1_NAME); - prepareServerDirectory("standalone-cluster", "standalone-" + NODE_2_NAME); - } - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/crossdc/Wildfly10SAMLAdapterCrossDCTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/crossdc/Wildfly10SAMLAdapterCrossDCTest.java deleted file mode 100644 index 5ff07799ad..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/crossdc/Wildfly10SAMLAdapterCrossDCTest.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright 2017 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.crossdc; - -import org.keycloak.testsuite.adapter.page.EmployeeServletDistributable; -import org.keycloak.testsuite.arquillian.annotation.*; - -import org.keycloak.testsuite.adapter.AbstractSAMLAdapterClusteredTest; -import org.keycloak.testsuite.adapter.servlet.SendUsernameServlet; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.TargetsContainer; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Assume; -import org.junit.BeforeClass; - -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.keycloak.testsuite.adapter.AbstractServletsAdapterTest.samlServletDeployment; - -/** - * - * @author hmlnarik - */ -@AppServerContainer("app-server-wildfly10") -public class Wildfly10SAMLAdapterCrossDCTest extends AbstractSAMLAdapterClusteredTest { - - @BeforeClass - public static void checkCrossDcTest() { - Assume.assumeThat("Seems not to be running cross-DC tests", System.getProperty("cache.server"), not(is("undefined"))); - } - - private static final String SESSION_CACHE_NAME = EmployeeServletDistributable.DEPLOYMENT_NAME + "-cache"; - - private static final String JBOSS_WEB_XML = "\n" - + "\n" - + " \n" - + " SESSION\n" - + " " + "web." + SESSION_CACHE_NAME + "\n" - + " \n" - + ""; - - @TargetsContainer(value = "app-server-wildfly10-" + NODE_1_NAME) - @Deployment(name = EmployeeServletDistributable.DEPLOYMENT_NAME, managed = false) - protected static WebArchive employee() { - return samlServletDeployment(EmployeeServletDistributable.DEPLOYMENT_NAME, - EmployeeServletDistributable.DEPLOYMENT_NAME + "/WEB-INF/web.xml", - SendUsernameServlet.class) - .addAsWebInfResource(new StringAsset(JBOSS_WEB_XML), "jboss-web.xml"); - } - - @TargetsContainer(value = "app-server-wildfly10-" + NODE_2_NAME) - @Deployment(name = EmployeeServletDistributable.DEPLOYMENT_NAME + "_2", managed = false) - protected static WebArchive employee2() { - return employee(); - } - - @Override - protected void prepareServerDirectories() throws Exception { - prepareServerDirectory("standalone-crossdc", "standalone-" + NODE_1_NAME); - prepareServerDirectory("standalone-crossdc", "standalone-" + NODE_2_NAME); - } - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10DefaultAuthzConfigAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10DefaultAuthzConfigAdapterTest.java deleted file mode 100644 index 200829aa16..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10DefaultAuthzConfigAdapterTest.java +++ /dev/null @@ -1,30 +0,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. - */ -package org.keycloak.testsuite.adapter.example.authorization; - -import org.keycloak.testsuite.adapter.example.authorization.DefaultAuthzConfigAdapterTest; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * - * @author tkyjovsk - */ -@AppServerContainer("app-server-wildfly10") -//@AdapterLibsLocationProperty("adapter.libs.wildfly") -public class Wildfly10DefaultAuthzConfigAdapterTest extends DefaultAuthzConfigAdapterTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10PermissiveModeAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10PermissiveModeAdapterTest.java deleted file mode 100644 index 99a6f18c84..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10PermissiveModeAdapterTest.java +++ /dev/null @@ -1,31 +0,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. - */ -package org.keycloak.testsuite.adapter.example.authorization; - -import org.jboss.arquillian.container.test.api.RunAsClient; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * - * @author tkyjovsk - */ -@RunAsClient -@AppServerContainer("app-server-wildfly10") -//@AdapterLibsLocationProperty("adapter.libs.wildfly") -public class Wildfly10PermissiveModeAdapterTest extends PermissiveModeAdapterTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10PhotozExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10PhotozExampleAdapterTest.java deleted file mode 100644 index 9921e641a3..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10PhotozExampleAdapterTest.java +++ /dev/null @@ -1,30 +0,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. - */ -package org.keycloak.testsuite.adapter.example.authorization; - -import org.keycloak.testsuite.adapter.example.authorization.AbstractPhotozExampleAdapterTest; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * - * @author tkyjovsk - */ -@AppServerContainer("app-server-wildfly10") -//@AdapterLibsLocationProperty("adapter.libs.wildfly") -public class Wildfly10PhotozExampleAdapterTest extends AbstractPhotozExampleAdapterTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10ServletAuthzAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10ServletAuthzAdapterTest.java deleted file mode 100644 index b97170c69a..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10ServletAuthzAdapterTest.java +++ /dev/null @@ -1,31 +0,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. - */ -package org.keycloak.testsuite.adapter.example.authorization; - -import org.jboss.arquillian.container.test.api.RunAsClient; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * - * @author tkyjovsk - */ -@RunAsClient -@AppServerContainer("app-server-wildfly10") -//@AdapterLibsLocationProperty("adapter.libs.wildfly") -public class Wildfly10ServletAuthzAdapterTest extends AbstractServletAuthzAdapterTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10ServletPolicyEnforcerAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10ServletPolicyEnforcerAdapterTest.java deleted file mode 100644 index b520a2f197..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/authorization/Wildfly10ServletPolicyEnforcerAdapterTest.java +++ /dev/null @@ -1,30 +0,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. - */ -package org.keycloak.testsuite.adapter.example.authorization; - -import org.jboss.arquillian.container.test.api.RunAsClient; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * @author Pedro Igor - */ -@RunAsClient -@AppServerContainer("app-server-wildfly10") -//@AdapterLibsLocationProperty("adapter.libs.wildfly") -public class Wildfly10ServletPolicyEnforcerAdapterTest extends ServletPolicyEnforcerTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/cors/Wildfly10CorsExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/cors/Wildfly10CorsExampleAdapterTest.java deleted file mode 100644 index 4910d6eddd..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/java/org/keycloak/testsuite/adapter/example/cors/Wildfly10CorsExampleAdapterTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.keycloak.testsuite.adapter.example.cors; - -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * - * @author tkyjovsk - */ -@AppServerContainer("app-server-wildfly10") -public class Wildfly10CorsExampleAdapterTest extends CorsExampleAdapterTest { - -} \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/resources/adapter-test/keycloak-saml/employee-distributable/WEB-INF/web.xml b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/resources/adapter-test/keycloak-saml/employee-distributable/WEB-INF/web.xml deleted file mode 100644 index b57928f585..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly10/src/test/resources/adapter-test/keycloak-saml/employee-distributable/WEB-INF/web.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - %CONTEXT_PATH% - - - javax.ws.rs.core.Application - /* - - - - /error.html - - - - - Application - /* - - - manager - - - - - KEYCLOAK-SAML - demo - - - - manager - - - - keycloak.sessionIdMapperUpdater.classes - org.keycloak.adapters.saml.wildfly.infinispan.InfinispanSessionCacheIdMapperUpdater - - diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/pom.xml deleted file mode 100644 index d66cdc163f..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - 4.0.0 - - - org.keycloak.testsuite - integration-arquillian-tests-adapters-jboss - 4.1.0.Final-SNAPSHOT - - - integration-arquillian-tests-adapters-wildfly9 - - Adapter Tests - JBoss - Wildfly 9 - - - wildfly9 - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCAdapterTest.java deleted file mode 100644 index 3626e1dad9..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCAdapterTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.DemoServletsAdapterTest; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * - * @author tkyjovsk - */ -@AppServerContainer("app-server-wildfly9") -public class Wildfly9OIDCAdapterTest extends DemoServletsAdapterTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCPublicKeyRotationAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCPublicKeyRotationAdapterTest.java deleted file mode 100644 index 3ea239569a..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCPublicKeyRotationAdapterTest.java +++ /dev/null @@ -1,28 +0,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. - */ - -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.OIDCPublicKeyRotationAdapterTest; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * @author Marek Posolda - */ -@AppServerContainer("app-server-wildfly9") -public class Wildfly9OIDCPublicKeyRotationAdapterTest extends OIDCPublicKeyRotationAdapterTest { -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCSessionAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCSessionAdapterTest.java deleted file mode 100644 index 32c8e6b9c7..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCSessionAdapterTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.SessionServletAdapterTest; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * - * @author tkyjovsk - */ -@AppServerContainer("app-server-wildfly9") -public class Wildfly9OIDCSessionAdapterTest extends SessionServletAdapterTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OfflineServletsAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OfflineServletsAdapterTest.java deleted file mode 100644 index 5e28b828d3..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OfflineServletsAdapterTest.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.OfflineServletsAdapterTest; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * @author Bruno Oliveira. - */ -@AppServerContainer("app-server-wildfly9") -public class Wildfly9OfflineServletsAdapterTest extends OfflineServletsAdapterTest { -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SAMLAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SAMLAdapterTest.java deleted file mode 100644 index 1792eeadf6..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SAMLAdapterTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.SAMLServletsAdapterTest; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * @author mhajas - */ -@AppServerContainer("app-server-wildfly9") -public class Wildfly9SAMLAdapterTest extends SAMLServletsAdapterTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SAMLFilterAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SAMLFilterAdapterTest.java deleted file mode 100644 index 2cb0c34d20..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SAMLFilterAdapterTest.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.SAMLFilterServletAdapterTest; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * @author mhajas - */ -@AppServerContainer("app-server-wildfly9") -public class Wildfly9SAMLFilterAdapterTest extends SAMLFilterServletAdapterTest { -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SecuredDeploymentsAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SecuredDeploymentsAdapterTest.java deleted file mode 100644 index 15f4834ae5..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SecuredDeploymentsAdapterTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.SecuredDeploymentsAdapterTest; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * - * @author tkyjovsk - */ -@AppServerContainer("app-server-wildfly9") -public class Wildfly9SecuredDeploymentsAdapterTest extends SecuredDeploymentsAdapterTest { - -}