diff --git a/testsuite/integration-arquillian/HOW-TO-RUN.md b/testsuite/integration-arquillian/HOW-TO-RUN.md index 3e82ccc32e1..c4c13275580 100644 --- a/testsuite/integration-arquillian/HOW-TO-RUN.md +++ b/testsuite/integration-arquillian/HOW-TO-RUN.md @@ -126,97 +126,6 @@ You can use value `TRACE` if you want to enable even TRACE logging. There is no support for more packages ATM, you need to edit the file `testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/add-log-level.cli` and add packages manually. -## Run tests against remote container - -### remote server tests - -note: if there is a need to run server on http only testsuite providers has to be re-builded with `-Dauth.server.ssl.required=false` - - mvn -f testsuite/integration-arquillian/pom.xml clean install -Pauth-server-wildfly -Dauth.server.ssl.required=false -DskipTests - -unzip prepared server: - - unzip -q testsuite/integration-arquillian/servers/auth-server/jboss/wildfly/target/integration-arquillian-servers-auth-server-wildfly-*.zip - -create admin user: - - sh auth-server-wildfly/bin/add-user-keycloak.sh -r master -u admin -p admin - -start the server: - - sh auth-server-wildfly/bin/standalone.sh \ - -Dauth.server.ssl.required=false \ - -Djboss.socket.binding.port-offset=100 \ - -Dauth.server.http.port=8180 \ - -Dauth.server.https.port=8543 - -run base testsuite: - - mvn -f testsuite/integration-arquillian/tests/base/pom.xml clean install -Pauth-server-remote -Dauth.server.ssl.required=false - -note: it is also possible to run tests against server running on different host and port using `-Dauth.server.host=${server.host}` and `-Dauth.server.http.port=${server.port}`. The testsuite currently doesn't work with port 80. - -### remote adapter tests - -note: if there is a need to run server on http only testsuite providers has to be re-builded with `-Dauth.server.ssl.required=false` - - mvn -f keycloak/testsuite/integration-arquillian/pom.xml clean install -Pauth-server-wildfly -Papp-server-wildfly -Dauth.server.ssl.required=false -DskipTests ${MVN_DEFAULT_ARGS} - -unzip prepared servers: - - unzip -q keycloak/testsuite/integration-arquillian/servers/auth-server/jboss/wildfly/target/integration-arquillian-servers-auth-server-wildfly-*.zip - unzip -q keycloak/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/target/integration-arquillian-servers-app-server-wildfly-*.zip - -create admin user: - - sh auth-server-wildfly/bin/add-user-keycloak.sh -r master -u admin -p admin - -start both servers: - - sh auth-server-wildfly/bin/standalone.sh \ - -Dauth.server.ssl.required=false \ - -Djboss.socket.binding.port-offset=100 \ - -Dauth.server.http.port=8180 \ - -Dauth.server.https.port=8543 - - sh app-server-wildfly/bin/standalone.sh \ - -Djboss.socket.binding.port-offset=200 \ - -Dapp.server.ssl.required=false - -run other/adapters/jboss/remote tests: - - mvn -f keycloak/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/pom.xml clean install \ - -Pauth-server-remote,app-server-remote \ - -Dauth.server.ssl.required=false \ - -Dapp.server.ssl.required=false - -### Running tests against container not produced by the testsuite - -For running the testsuite, it is necessary to install/deploy so-called testsuite-providers. The testsuite rely on -testsuite-providers in many test scenarios for example for checking fired events, moving in time etc. When using -keycloak from `integration-arquillian-servers-auth-server-wildfly-*.zip`, it should not be necessary to do any steps -because testsuite-providers are already included in this archive. However, when a clean keycloak is used, e.g. -openshift image, testsuite-providers jar file is deployed to the container in the beginning of test run. -To be able to deploy the jar to the container, arquillian has to have an access to the management port. - -For example, to run testsuite against image in openshift, we need to first forward 9990 port from the running pod. -```shell script -oc port-forward "${POD}" 9990:9990 -``` -where ${POD} is a name of the pod - -Now just run testsuite against the image in openshift: -```shell script -mvn clean install -f testsuite/integration-arquillian/tests/base/pom.xml \ - -Pauth-server-remote \ - -Dauth.server.ssl.required=false \ - -Dauth.server.host="${HOST}" \ - -Dauth.server.http.port=80 \ - -Dauth.server.management.host=127.0.0.1 \ - -Dauth.server.management.port=9990 -``` -where ${HOST} is url of keycloak, for example: `keycloak-keycloak.192.168.42.91.nip.io`. - ## Run adapter tests ### Undertow diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml index 1d9340c17da..788d9680178 100644 --- a/testsuite/integration-arquillian/tests/base/pom.xml +++ b/testsuite/integration-arquillian/tests/base/pom.xml @@ -378,54 +378,6 @@ - - auth-server-remote - - - - maven-resources-plugin - - - copy-keystore - process-resources - - copy-resources - - - ${project.build.directory}/containers/auth-server-remote - - - ${common.resources}/keystore - - keycloak.jks - keycloak.truststore - client.jks - client-ca.jks - test-user-cert-intermediary-ca.jks - ca.crt - client.crt - client.key - *.crl - other_client.jks - test-user-obb.jks - - - - ${common.resources}/pki/root/ca - - certs/clients/test-user-san@localhost.cert.pem - certs/clients/test-user@localhost.key.pem - - - - - - - - - - - jpa diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java index a2314131844..bd2bcbc3de5 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java @@ -167,10 +167,6 @@ public class AuthServerTestEnricher { @ClassScoped private InstanceProducer oAuthClientProducer; - public static boolean isAuthServerRemote() { - return AUTH_SERVER_CONTAINER.equals("auth-server-remote"); - } - public static boolean isAuthServerQuarkus() { return AUTH_SERVER_CONTAINER.equals("auth-server-quarkus"); } @@ -400,28 +396,6 @@ public class AuthServerTestEnricher { } } - public void deployProviders(@Observes(precedence = -1) AfterStart event) throws DeploymentException { - if (isAuthServerRemote() && currentContainerName.contains("auth-server")) { - this.testsuiteProvidersArchive = ShrinkWrap.create(ZipImporter.class, "testsuiteProviders.jar") - .importFrom(Maven.configureResolverViaPlugin() - .resolve("org.keycloak.testsuite:integration-arquillian-testsuite-providers") - .withoutTransitivity() - .asSingleFile() - ).as(JavaArchive.class) - .addAsManifestResource("jboss-deployment-structure.xml"); - event.getDeployableContainer().deploy(testsuiteProvidersArchive); - - this.testsuiteProvidersDeploymentArchive = ShrinkWrap.create(ZipImporter.class, "testsuiteProvidersDeployment.jar") - .importFrom(Maven.configureResolverViaPlugin() - .resolve("org.keycloak.testsuite:integration-arquillian-testsuite-providers-deployment") - .withoutTransitivity() - .asSingleFile() - ).as(JavaArchive.class) - .addAsManifestResource("jboss-deployment-structure.xml"); - event.getDeployableContainer().deploy(testsuiteProvidersDeploymentArchive); - } - } - public void unDeployProviders(@Observes(precedence = 20) BeforeStop event) throws DeploymentException { if (testsuiteProvidersArchive != null) { event.getDeployableContainer().undeploy(testsuiteProvidersArchive); @@ -553,43 +527,33 @@ public class AuthServerTestEnricher { } public void restartAuthServer() throws Exception { - if (isAuthServerRemote()) { - try (OnlineManagementClient client = getManagementClient()) { - int timeoutInSec = Integer.getInteger(System.getProperty("auth.server.jboss.startup.timeout"), 300); - Administration administration = new Administration(client, timeoutInSec); - administration.reload(); - } - } else { - stopContainerEvent.fire(new StopContainer(suiteContext.getAuthServerInfo().getArquillianContainer())); - startContainerEvent.fire(new StartContainer(suiteContext.getAuthServerInfo().getArquillianContainer())); - } + stopContainerEvent.fire(new StopContainer(suiteContext.getAuthServerInfo().getArquillianContainer())); + startContainerEvent.fire(new StartContainer(suiteContext.getAuthServerInfo().getArquillianContainer())); } public void initializeTestContext(@Observes(precedence = 2) BeforeClass event) throws Exception { TestContext testContext = new TestContext(suiteContext, event.getTestClass().getJavaClass()); testContextProducer.set(testContext); - if (!isAuthServerRemote()) { - boolean wasUpdated = false; + boolean wasUpdated = false; - if (event.getTestClass().isAnnotationPresent(SetDefaultProvider.class)) { - SetDefaultProvider defaultProvider = event.getTestClass().getAnnotation(SetDefaultProvider.class); + if (event.getTestClass().isAnnotationPresent(SetDefaultProvider.class)) { + SetDefaultProvider defaultProvider = event.getTestClass().getAnnotation(SetDefaultProvider.class); - if (defaultProvider.beforeEnableFeature()) { - SpiProvidersSwitchingUtils.addProviderDefaultValue(suiteContext, defaultProvider); - wasUpdated = true; - } - } - - if (event.getTestClass().isAnnotationPresent(EnableVault.class)) { - VaultUtils.enableVault(suiteContext, event.getTestClass().getAnnotation(EnableVault.class).providerId()); + if (defaultProvider.beforeEnableFeature()) { + SpiProvidersSwitchingUtils.addProviderDefaultValue(suiteContext, defaultProvider); wasUpdated = true; } + } - if (wasUpdated) { - restartAuthServer(); - testContext.reconnectAdminClient(); - } + if (event.getTestClass().isAnnotationPresent(EnableVault.class)) { + VaultUtils.enableVault(suiteContext, event.getTestClass().getAnnotation(EnableVault.class).providerId()); + wasUpdated = true; + } + + if (wasUpdated) { + restartAuthServer(); + testContext.reconnectAdminClient(); } } @@ -899,24 +863,21 @@ public class AuthServerTestEnricher { removeTestRealms(testContext, adminClient); - if (!isAuthServerRemote()) { - - boolean wasUpdated = false; + boolean wasUpdated = false; - if (event.getTestClass().isAnnotationPresent(SetDefaultProvider.class)) { - SpiProvidersSwitchingUtils.resetProvider(suiteContext, event.getTestClass().getAnnotation(SetDefaultProvider.class)); - wasUpdated = true; - } + if (event.getTestClass().isAnnotationPresent(SetDefaultProvider.class)) { + SpiProvidersSwitchingUtils.resetProvider(suiteContext, event.getTestClass().getAnnotation(SetDefaultProvider.class)); + wasUpdated = true; + } - if (event.getTestClass().isAnnotationPresent(EnableVault.class) && !isAuthServerQuarkus()) { - VaultUtils.disableVault(suiteContext, event.getTestClass().getAnnotation(EnableVault.class).providerId()); - wasUpdated = true; - } + if (event.getTestClass().isAnnotationPresent(EnableVault.class) && !isAuthServerQuarkus()) { + VaultUtils.disableVault(suiteContext, event.getTestClass().getAnnotation(EnableVault.class).providerId()); + wasUpdated = true; + } - if (wasUpdated) { - restartAuthServer(); - testContext.reconnectAdminClient(); - } + if (wasUpdated) { + restartAuthServer(); + testContext.reconnectAdminClient(); } if (adminClient != null) { diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/AuthServerContainerExclude.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/AuthServerContainerExclude.java index da9508e89fa..3279104539d 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/AuthServerContainerExclude.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/AuthServerContainerExclude.java @@ -26,8 +26,8 @@ import java.lang.annotation.Target; /** * Serves for excluding test classes or methods from running in some specific auth server container * - * for example annotation @AuthServerContainerExclude(AuthServer.REMOTE) on a test class makes tests - * in the class NOT running when -Pauth-server-remote is used + * for example annotation @AuthServerContainerExclude(AuthServer.QUARKUS) on a test class makes tests + * in the class NOT running when -Pauth-server-quarkus is used * * The annotation has @Inherited property this means that annotation parent class will exclude all child class * @@ -41,8 +41,8 @@ public @interface AuthServerContainerExclude { AuthServer[] value(); String details() default ""; - public enum AuthServer { - REMOTE, + enum AuthServer { + UNDERTOW, QUARKUS } } diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerDeployController.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerDeployController.java index 9c91de423ec..e31e67e560e 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerDeployController.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerDeployController.java @@ -29,7 +29,6 @@ import org.jboss.arquillian.core.api.Event; import org.jboss.arquillian.core.api.Injector; import org.jboss.arquillian.core.api.Instance; import org.jboss.arquillian.core.api.annotation.Inject; -import org.keycloak.testsuite.arquillian.AuthServerTestEnricher; /** * Overrides a condition that container cannot be in manual mode, and deploys the deployment @@ -53,7 +52,6 @@ public class KeycloakContainerDeployController extends ContainerDeployController @Override public void perform(Container container, Deployment deployment) throws Exception { - if (runOnServerDeploymentOnRemote(deployment)) return; if (container.getState().equals(Container.State.STARTED)) { event.fire(new DeployDeployment(container, deployment)); } @@ -81,10 +79,4 @@ public class KeycloakContainerDeployController extends ContainerDeployController operation.perform(container, deployment); } } - - //do not deploy run-on-server-classes.war into server in remote mode - private boolean runOnServerDeploymentOnRemote(Deployment deployment) { - return AuthServerTestEnricher.isAuthServerRemote() && - deployment.getDescription().getArchive().getName().equals("run-on-server-classes.war"); - } } diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerEventsController.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerEventsController.java index 37cb8248612..40a2bf87d05 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerEventsController.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerEventsController.java @@ -55,7 +55,6 @@ import java.io.IOException; import java.util.Arrays; import org.jboss.shrinkwrap.api.Archive; -import org.keycloak.testsuite.util.ContainerAssume; /** * Changes behaviour of original ContainerEventController to stop manual containers @@ -97,10 +96,6 @@ public class KeycloakContainerEventsController extends ContainerEventController @Override public void execute(BeforeClass event) { if (event.getTestClass().isAnnotationPresent(RestartContainer.class)) { - - // stop executing the test - remote container cannot be restarted - ContainerAssume.assumeNotAuthServerRemote(); - RestartContainer restartContainer = event.getTestClass().getAnnotation(RestartContainer.class); beforeOriginalContainerStop(restartContainer); diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerFeaturesController.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerFeaturesController.java index b2529ac825f..0427cdc3042 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerFeaturesController.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerFeaturesController.java @@ -21,10 +21,7 @@ import org.keycloak.testsuite.arquillian.annotation.EnableFeatures; import org.keycloak.testsuite.arquillian.annotation.SetDefaultProvider; import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.testsuite.util.SpiProvidersSwitchingUtils; -import org.wildfly.extras.creaper.core.online.OnlineManagementClient; -import org.wildfly.extras.creaper.core.online.operations.admin.Administration; -import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; import java.util.Arrays; import java.util.HashSet; @@ -35,8 +32,6 @@ import java.util.stream.Collectors; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -import static org.keycloak.testsuite.arquillian.AuthServerTestEnricher.getManagementClient; -import static org.keycloak.testsuite.arquillian.AuthServerTestEnricher.isAuthServerRemote; /** * @author mhajas @@ -145,17 +140,9 @@ public class KeycloakContainerFeaturesController { } } - public void restartAuthServer() throws Exception { - if (isAuthServerRemote()) { - try (OnlineManagementClient client = getManagementClient()) { - int timeoutInSec = Integer.getInteger(System.getProperty("auth.server.jboss.startup.timeout"), 300); - Administration administration = new Administration(client, timeoutInSec); - administration.reload(); - } - } else { - stopContainerEvent.fire(new StopContainer(suiteContextInstance.get().getAuthServerInfo().getArquillianContainer())); - startContainerEvent.fire(new StartContainer(suiteContextInstance.get().getAuthServerInfo().getArquillianContainer())); - } + public void restartAuthServer() { + stopContainerEvent.fire(new StopContainer(suiteContextInstance.get().getAuthServerInfo().getArquillianContainer())); + startContainerEvent.fire(new StartContainer(suiteContextInstance.get().getAuthServerInfo().getArquillianContainer())); } private void updateFeatures(Set updateFeatures) throws Exception { diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/decider/AuthServerExcludeExecutionDecider.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/decider/AuthServerExcludeExecutionDecider.java index 5b4a8cc6ba1..06d772b3b5d 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/decider/AuthServerExcludeExecutionDecider.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/decider/AuthServerExcludeExecutionDecider.java @@ -47,10 +47,6 @@ public class AuthServerExcludeExecutionDecider implements TestExecutionDecider { if (method.isAnnotationPresent(AuthServerContainerExclude.class)) { List excluded = Arrays.asList(method.getAnnotation(AuthServerContainerExclude.class).value()); - - if (AuthServerTestEnricher.isAuthServerRemote() && excluded.contains(AuthServer.REMOTE)) { - return ExecutionDecision.dontExecute("Excluded by @AuthServerContainerExclude."); - } if (AuthServerTestEnricher.isAuthServerQuarkus() && excluded.contains(AuthServer.QUARKUS)) { return ExecutionDecision.dontExecute("Excluded by @AuthServerContainerExclude."); @@ -58,10 +54,6 @@ public class AuthServerExcludeExecutionDecider implements TestExecutionDecider { } else { //class if (testContext.getTestClass().isAnnotationPresent(AuthServerContainerExclude.class)) { List excluded = Arrays.asList(((AuthServerContainerExclude) testContext.getTestClass().getAnnotation(AuthServerContainerExclude.class)).value()); - - if (AuthServerTestEnricher.isAuthServerRemote() && excluded.contains(AuthServer.REMOTE)) { - return ExecutionDecision.dontExecute("Excluded by @AuthServerContainerExclude."); - } if (AuthServerTestEnricher.isAuthServerQuarkus() && excluded.contains(AuthServer.QUARKUS)) { return ExecutionDecision.dontExecute("Excluded by @AuthServerContainerExclude."); diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ContainerAssume.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ContainerAssume.java index 599440ae527..0cd02692634 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ContainerAssume.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ContainerAssume.java @@ -36,12 +36,6 @@ public class ContainerAssume { Assume.assumeTrue("Only works on auth-server-undertow", AuthServerTestEnricher.AUTH_SERVER_CONTAINER.equals(AuthServerTestEnricher.AUTH_SERVER_CONTAINER_DEFAULT)); } - - - public static void assumeNotAuthServerRemote() { - Assume.assumeFalse("Doesn't work on auth-server-remote", - AuthServerTestEnricher.AUTH_SERVER_CONTAINER.equals("auth-server-remote")); - } public static void assumeClusteredContainer() { Assume.assumeTrue( diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountFormServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountFormServiceTest.java index a7ec3658b6d..3026fa2bf46 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountFormServiceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountFormServiceTest.java @@ -46,7 +46,6 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.AuthServerTestEnricher; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.drone.Different; import org.keycloak.testsuite.pages.AccountApplicationsPage; @@ -101,8 +100,6 @@ import static org.junit.Assert.assertTrue; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; - /** * @author Stian Thorgersen * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. @@ -1308,7 +1305,7 @@ public class AccountFormServiceTest extends AbstractTestRealmKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) // we need to do domain name -> ip address to make this test work in remote testing + // we need to do domain name -> ip address to make this test work in remote testing public void sessions() { loginPage.open(); loginPage.clickRegister(); @@ -1371,7 +1368,7 @@ public class AccountFormServiceTest extends AbstractTestRealmKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) + public void applicationsVisibilityNoScopesNoConsent() throws Exception { try (ClientAttributeUpdater cau = ClientAttributeUpdater.forClient(adminClient, REALM_NAME, ROOT_URL_CLIENT) .setConsentRequired(false) @@ -1399,7 +1396,7 @@ public class AccountFormServiceTest extends AbstractTestRealmKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) + public void applicationsVisibilityNoScopesAndConsent() throws Exception { try (ClientAttributeUpdater cau = ClientAttributeUpdater.forClient(adminClient, REALM_NAME, ROOT_URL_CLIENT) .setConsentRequired(true) @@ -1419,7 +1416,7 @@ public class AccountFormServiceTest extends AbstractTestRealmKeycloakTest { // More tests (including revoke) are in OAuthGrantTest and OfflineTokenTest @Test - @AuthServerContainerExclude(AuthServer.REMOTE) + public void applications() { applicationsPage.open(); loginPage.login("test-user@localhost", "password"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceCorsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceCorsTest.java index c6c0ba73127..4d5d44b9ac4 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceCorsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceCorsTest.java @@ -32,9 +32,6 @@ import org.openqa.selenium.JavascriptExecutor; import java.io.IOException; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; - import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; @@ -42,7 +39,6 @@ import static org.junit.Assert.assertThat; /** * @author Stian Thorgersen */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class AccountRestServiceCorsTest extends AbstractTestRealmKeycloakTest { private static final String VALID_CORS_URL = "http://localtest.me:8180/auth"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceReadOnlyAttributesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceReadOnlyAttributesTest.java index 5fa56a11896..3fe050e169b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceReadOnlyAttributesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceReadOnlyAttributesTest.java @@ -31,18 +31,15 @@ import org.keycloak.representations.account.UserRepresentation; import org.keycloak.representations.idm.ErrorRepresentation; import org.keycloak.services.messages.Messages; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; /** * @author Marek Posolda */ -@AuthServerContainerExclude({REMOTE}) // TODO: Enable this for quarkus and hopefully for remote as well... public class AccountRestServiceReadOnlyAttributesTest extends AbstractRestServiceTest { private static final Logger logger = Logger.getLogger(AccountRestServiceReadOnlyAttributesTest.class); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java index ddb39a7133a..eef5d7ba20c 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java @@ -62,8 +62,6 @@ import org.keycloak.services.util.ResolveRelative; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.admin.authentication.AbstractAuthenticationTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.OAuthClient; import org.keycloak.testsuite.util.TokenUtil; import org.keycloak.testsuite.util.UserBuilder; @@ -92,7 +90,6 @@ import static org.junit.Assert.assertTrue; /** * @author Stian Thorgersen */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class AccountRestServiceTest extends AbstractRestServiceTest { @Rule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceWithUserProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceWithUserProfileTest.java index e303f3febb7..ded1b52c4e3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceWithUserProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceWithUserProfileTest.java @@ -39,7 +39,6 @@ import org.keycloak.events.EventType; import org.keycloak.representations.account.UserProfileAttributeMetadata; import org.keycloak.representations.account.UserRepresentation; import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.forms.VerifyProfileTest; import org.keycloak.userprofile.UserProfileContext; @@ -50,7 +49,6 @@ import org.keycloak.userprofile.UserProfileContext; * */ @EnableFeature(value = Profile.Feature.DECLARATIVE_USER_PROFILE) -@AuthServerContainerExclude(AuthServerContainerExclude.AuthServer.REMOTE) public class AccountRestServiceWithUserProfileTest extends AccountRestServiceTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/LinkedAccountsRestServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/LinkedAccountsRestServiceTest.java index edb2c4f11ae..471593299b3 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/LinkedAccountsRestServiceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/LinkedAccountsRestServiceTest.java @@ -52,8 +52,6 @@ import org.junit.FixMethodOrder; import org.junit.runners.MethodSorters; import org.keycloak.representations.account.AccountLinkUriRepresentation; import org.keycloak.representations.account.LinkedAccountRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @author Stan Silvert @@ -147,7 +145,7 @@ public class LinkedAccountsRestServiceTest extends AbstractTestRealmKeycloakTest } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) + public void testBuildLinkedAccountUri() throws IOException { AccountLinkUriRepresentation rep = SimpleHttp.doGet(getAccountUrl("linked-accounts/github?redirectUri=phonyUri"), client) .auth(tokenUtil.getToken()) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/SessionRestServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/SessionRestServiceTest.java index 8ad068fba59..db64da57d71 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/SessionRestServiceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/SessionRestServiceTest.java @@ -38,8 +38,6 @@ import org.keycloak.representations.account.ClientRepresentation; import org.keycloak.representations.account.DeviceRepresentation; import org.keycloak.representations.account.SessionRepresentation; import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.ContainerAssume; import org.keycloak.testsuite.util.OAuthClient; @@ -125,7 +123,6 @@ public class SessionRestServiceTest extends AbstractRestServiceTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testGetSessions() throws Exception { oauth.setDriver(secondBrowser); codeGrant("public-client-0"); @@ -145,7 +142,6 @@ public class SessionRestServiceTest extends AbstractRestServiceTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testGetDevicesResponse() throws Exception { assumeTrue("Browser must be htmlunit. Otherwise we are not able to set desired BrowserHeaders", System.getProperty("browser").equals("htmlUnit")); @@ -355,7 +351,6 @@ public class SessionRestServiceTest extends AbstractRestServiceTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testNullOrEmptyUserAgent() throws Exception { assumeTrue("Browser must be htmlunit. Otherwise we are not able to set desired BrowserHeaders", System.getProperty("browser").equals("htmlUnit")); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomAuthFlowOTPTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomAuthFlowOTPTest.java index ec99da6ef4a..67c3f3a3f06 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomAuthFlowOTPTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomAuthFlowOTPTest.java @@ -60,8 +60,6 @@ import static org.keycloak.authentication.authenticators.browser.ConditionalOtpF import static org.keycloak.models.UserModel.RequiredAction.CONFIGURE_TOTP; import static org.keycloak.representations.idm.CredentialRepresentation.PASSWORD; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_PORT; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWith; /** @@ -188,7 +186,7 @@ public class CustomAuthFlowOTPTest extends AbstractCustomAccountManagementTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) + public void conditionalOTPNoDefault() { configureRequiredActions(); configureOTP(); @@ -240,7 +238,7 @@ public class CustomAuthFlowOTPTest extends AbstractCustomAccountManagementTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) + public void conditionalOTPNoDefaultWithChecks() { configureRequiredActions(); configureOTP(); @@ -457,7 +455,7 @@ public class CustomAuthFlowOTPTest extends AbstractCustomAccountManagementTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) + public void conditionalOTPRequestHeaderSkip() { //prepare config - request header skip, default to force Map config = new HashMap<>(); @@ -474,7 +472,7 @@ public class CustomAuthFlowOTPTest extends AbstractCustomAccountManagementTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) + public void conditionalOTPRequestHeaderForce() { //prepare config - equest header force, default to skip Map config = new HashMap<>(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionTest.java index 054bd423589..2b46e00fbab 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionTest.java @@ -25,8 +25,6 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginPage; @@ -36,7 +34,6 @@ import static org.junit.Assert.assertTrue; /** * @author Hiroyuki Wada */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class AppInitiatedActionTest extends AbstractTestRealmKeycloakTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateProfileWithUserProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateProfileWithUserProfileTest.java index 617bf77317a..73df99b5b6b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateProfileWithUserProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateProfileWithUserProfileTest.java @@ -19,7 +19,6 @@ package org.keycloak.testsuite.actions; import org.junit.Before; import org.keycloak.common.Profile; import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.forms.VerifyProfileTest; @@ -30,7 +29,6 @@ import org.keycloak.testsuite.forms.VerifyProfileTest; * */ @EnableFeature(value = Profile.Feature.DECLARATIVE_USER_PROFILE) -@AuthServerContainerExclude(AuthServerContainerExclude.AuthServer.REMOTE) public class AppInitiatedActionUpdateProfileWithUserProfileTest extends AppInitiatedActionUpdateProfileTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java index 47f71939250..dba8c58ca73 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java @@ -77,13 +77,10 @@ import org.openqa.selenium.WebElement; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertEquals; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @author Stian Thorgersen */ -@AuthServerContainerExclude(AuthServer.REMOTE) @DisableFeature(value = Profile.Feature.ACCOUNT2, skipRestart = true) // TODO remove this (KEYCLOAK-16228) public class RequiredActionEmailVerificationTest extends AbstractTestRealmKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionPriorityTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionPriorityTest.java index 226cfc37ae6..795b1c11047 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionPriorityTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionPriorityTest.java @@ -37,8 +37,6 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.pages.LoginConfigTotpPage; @@ -51,7 +49,6 @@ import org.keycloak.testsuite.util.UserBuilder; /** * @author Hiroyuki Wada */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class RequiredActionPriorityTest extends AbstractTestRealmKeycloakTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileWithUserProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileWithUserProfileTest.java index d8074d730cb..340eaba06b0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileWithUserProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileWithUserProfileTest.java @@ -44,7 +44,6 @@ import org.keycloak.events.EventType; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.forms.RegisterWithUserProfileTest; import org.keycloak.testsuite.forms.VerifyProfileTest; @@ -59,7 +58,6 @@ import org.openqa.selenium.By; * */ @EnableFeature(value = Profile.Feature.DECLARATIVE_USER_PROFILE) -@AuthServerContainerExclude(AuthServerContainerExclude.AuthServer.REMOTE) public class RequiredActionUpdateProfileWithUserProfileTest extends RequiredActionUpdateProfileTest { protected static final String PASSWORD = "password"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterTest.java index 095c37f11d1..f8cb1b05770 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterTest.java @@ -30,7 +30,6 @@ import org.keycloak.testsuite.AbstractAuthTest; import org.keycloak.testsuite.adapter.page.AppServerContextRoot; import org.keycloak.testsuite.arquillian.SuiteContext; import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.util.ServerURLs; import java.io.IOException; @@ -44,7 +43,6 @@ import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.CURRENT_AP import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.enableHTTPSForAppServer; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_PORT; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @AppServerContainer is needed for stopping recursion in @@ -53,7 +51,6 @@ import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.A * @author tkyjovsk */ @AppServerContainer("") -@AuthServerContainerExclude(AuthServer.REMOTE) public abstract class AbstractAdapterTest extends AbstractAuthTest { @Page 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 4745c90f499..f90490a71d8 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 @@ -23,7 +23,6 @@ import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.RealmResource; @@ -66,7 +65,6 @@ import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.LoginUpdateProfilePage; import org.keycloak.testsuite.util.AdminClientUtil; -import org.keycloak.testsuite.util.ContainerAssume; import org.keycloak.testsuite.util.OAuthClient; import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.testsuite.utils.arquillian.ContainerConstants; @@ -499,8 +497,6 @@ public class BrokerLinkAndTokenExchangeTest extends AbstractServletsAdapterTest @Test @UncaughtServerErrorExpected public void testExportImport() throws Exception { - ContainerAssume.assumeNotAuthServerRemote(); - testExternalExchange(); try { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AttackDetectionResourceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AttackDetectionResourceTest.java index fe7612120fe..9db20ba97d6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AttackDetectionResourceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AttackDetectionResourceTest.java @@ -33,14 +33,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; - /** * * @author Stian Thorgersen */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class AttackDetectionResourceTest extends AbstractAdminTest { @ArquillianResource diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AuthzCleanupTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AuthzCleanupTest.java index a87b1104837..f5ec35daeff 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AuthzCleanupTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AuthzCleanupTest.java @@ -33,8 +33,6 @@ import org.keycloak.representations.idm.authorization.ResourceServerRepresentati import org.keycloak.representations.idm.authorization.RolePolicyRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.ProfileAssume; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.util.JsonSerialization; @@ -48,7 +46,6 @@ import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; * @author Bill Burke * @version $Revision: 1 $ */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class AuthzCleanupTest extends AbstractKeycloakTest { @BeforeClass diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ClientTest.java index 316f6924ed2..0cfa5d7bc64 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ClientTest.java @@ -61,8 +61,6 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.idm.UserSessionRepresentation; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.AdminEventPaths; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.CredentialBuilder; @@ -92,7 +90,6 @@ import javax.ws.rs.core.Response; public class ClientTest extends AbstractAdminTest { @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void getClients() { Assert.assertNames(realm.clients().findAll(), "account", "account-console", "realm-management", "security-admin-console", "broker", Constants.ADMIN_CLI_CLIENT_ID); } @@ -138,7 +135,6 @@ public class ClientTest extends AbstractAdminTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void createClientVerifyWithSecret() { String id = createClientNonPublic().getId(); @@ -149,7 +145,6 @@ public class ClientTest extends AbstractAdminTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void createClientVerify() { String id = createClient().getId(); @@ -342,7 +337,6 @@ public class ClientTest extends AbstractAdminTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void getAllClientsSearchAndPagination() { Set ids = new HashSet<>(); try { @@ -450,7 +444,6 @@ public class ClientTest extends AbstractAdminTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void serviceAccount() { Response response = realm.clients().create(ClientBuilder.create().clientId("serviceClient").serviceAccount().build()); String id = ApiUtil.getCreatedId(response); @@ -823,7 +816,6 @@ public class ClientTest extends AbstractAdminTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void updateClientWithProtocolMapper() { ClientRepresentation rep = new ClientRepresentation(); rep.setClientId("my-app"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ComponentsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ComponentsTest.java index 5621a306337..351aed8add7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ComponentsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ComponentsTest.java @@ -40,15 +40,12 @@ import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.hamcrest.Matchers; import static org.hamcrest.Matchers.contains; import static org.junit.Assert.*; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.not; /** * @author Stian Thorgersen */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class ComponentsTest extends AbstractAdminTest { private ComponentsResource components; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ConsentsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ConsentsTest.java index 7dee60ec4cf..e0798d1a09d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ConsentsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ConsentsTest.java @@ -61,8 +61,6 @@ import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson; import static org.keycloak.testsuite.admin.ApiUtil.createUserWithAdminClient; import static org.keycloak.testsuite.admin.ApiUtil.findClientByClientId; import static org.keycloak.testsuite.admin.ApiUtil.resetUserPassword; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.OAuthClient; import org.keycloak.testsuite.util.OAuthClient.AccessTokenResponse; import org.keycloak.testsuite.util.OAuthClient.AuthorizationEndpointResponse; @@ -269,7 +267,6 @@ public class ConsentsTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testConsents() { driver.navigate().to(getAccountUrl(consumerRealmName())); @@ -347,7 +344,6 @@ public class ConsentsTest extends AbstractKeycloakTest { * KEYCLOAK-18954 */ @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testRetrieveConsentsForUserWithClientsWithGrantedOfflineAccess() throws Exception { RealmResource providerRealm = adminClient.realm(providerRealmName()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/DeclarativeUserTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/DeclarativeUserTest.java index e8af28e3f03..12c47873b6c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/DeclarativeUserTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/DeclarativeUserTest.java @@ -4,7 +4,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; import static org.keycloak.testsuite.forms.VerifyProfileTest.PERMISSIONS_ALL; import static org.keycloak.testsuite.forms.VerifyProfileTest.enableDynamicUserProfile; import static org.keycloak.testsuite.forms.VerifyProfileTest.setUserProfileConfiguration; @@ -27,7 +26,6 @@ import org.keycloak.admin.client.resource.UserResource; import org.keycloak.common.Profile; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.userprofile.DeclarativeUserProfileProvider; import org.keycloak.userprofile.UserProfileProvider; @@ -36,7 +34,6 @@ import org.keycloak.userprofile.UserProfileProvider; * @author Pedro Igor */ @EnableFeature(value = Profile.Feature.DECLARATIVE_USER_PROFILE) -@AuthServerContainerExclude(REMOTE) public class DeclarativeUserTest extends AbstractAdminTest { @Before diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/FineGrainAdminUnitTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/FineGrainAdminUnitTest.java index 9bc1f587fd6..0b322e338fe 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/FineGrainAdminUnitTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/FineGrainAdminUnitTest.java @@ -73,8 +73,6 @@ import static org.hamcrest.Matchers.hasItem; import static org.junit.Assert.assertThat; import static org.keycloak.testsuite.admin.ImpersonationDisabledTest.IMPERSONATION_DISABLED; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; @@ -421,7 +419,6 @@ public class FineGrainAdminUnitTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testRestEvaluation() throws Exception { testingClient.server().run(FineGrainAdminUnitTest::setupPolices); testingClient.server().run(FineGrainAdminUnitTest::setupUsers); @@ -698,7 +695,6 @@ public class FineGrainAdminUnitTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testMasterRealm() throws Exception { // test that master realm can still perform operations when policies are in place // @@ -777,7 +773,6 @@ public class FineGrainAdminUnitTest extends AbstractKeycloakTest { // KEYCLOAK-5152 @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testRealmWithComposites() throws Exception { testingClient.server().run(FineGrainAdminUnitTest::setup5152); @@ -840,7 +835,6 @@ public class FineGrainAdminUnitTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testRemoveCleanup() throws Exception { testingClient.server().run(FineGrainAdminUnitTest::setupDeleteTest); testingClient.server().run(FineGrainAdminUnitTest::invokeDelete); @@ -938,7 +932,7 @@ public class FineGrainAdminUnitTest extends AbstractKeycloakTest { @Test @UncaughtServerErrorExpected - @AuthServerContainerExclude(AuthServer.REMOTE) + public void testTokenExchangeDisabled() throws Exception { checkTokenExchange(false); } @@ -950,7 +944,7 @@ public class FineGrainAdminUnitTest extends AbstractKeycloakTest { */ @Test @UncaughtServerErrorExpected - @AuthServerContainerExclude(AuthServer.REMOTE) + @EnableFeature(value = Profile.Feature.TOKEN_EXCHANGE, skipRestart = true) public void testWithTokenExchange() throws Exception { String exchanged = checkTokenExchange(true); @@ -962,7 +956,6 @@ public class FineGrainAdminUnitTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testUserPagination() { testingClient.server().run(session -> { RealmModel realm = session.realms().getRealmByName("test"); @@ -1058,7 +1051,6 @@ public class FineGrainAdminUnitTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testClientsSearch() { testingClient.server().run(session -> { RealmModel realm = session.realms().getRealmByName("test"); @@ -1238,7 +1230,6 @@ public class FineGrainAdminUnitTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testClientsSearchAfterFirstPage() { testingClient.server().run(session -> { RealmModel realm = session.realms().getRealmByName("test"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IdentityProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IdentityProviderTest.java index fa56c8e3501..89df124b753 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IdentityProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IdentityProviderTest.java @@ -22,7 +22,6 @@ import org.junit.Test; import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.broker.saml.SAMLIdentityProviderConfig; import org.keycloak.common.enums.SslRequired; -import org.keycloak.dom.saml.v2.assertion.AttributeType; import org.keycloak.dom.saml.v2.metadata.EndpointType; import org.keycloak.dom.saml.v2.metadata.EntityDescriptorType; import org.keycloak.dom.saml.v2.metadata.IndexedEndpointType; @@ -93,9 +92,6 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.XMLDSIG_NSURI; -import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; /** * @author Stian Thorgersen @@ -178,7 +174,6 @@ public class IdentityProviderTest extends AbstractAdminTest { } @Test - @AuthServerContainerExclude(REMOTE) public void failCreateInvalidUrl() throws Exception { try (AutoCloseable c = new RealmAttributeUpdater(realmsResouce().realm("test")) .updateWith(r -> r.setSslRequired(SslRequired.ALL.name())) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IllegalAdminUpgradeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IllegalAdminUpgradeTest.java index e1982854343..3bdb299fc92 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IllegalAdminUpgradeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IllegalAdminUpgradeTest.java @@ -42,15 +42,12 @@ import java.util.List; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; /** * @author Bill Burke * @version $Revision: 1 $ */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class IllegalAdminUpgradeTest extends AbstractKeycloakTest { public static final String CLIENT_NAME = "application"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ImpersonationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ImpersonationTest.java index aaa428a89ab..0f86660cf6a 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ImpersonationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ImpersonationTest.java @@ -54,8 +54,6 @@ import org.keycloak.representations.idm.*; import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginPage; @@ -79,7 +77,6 @@ import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; * * @author Bill Burke */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class ImpersonationTest extends AbstractKeycloakTest { static class UserSessionNotesHolder { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/InitialAccessTokenResourceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/InitialAccessTokenResourceTest.java index 1f901106670..38337c92b3d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/InitialAccessTokenResourceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/InitialAccessTokenResourceTest.java @@ -27,7 +27,6 @@ import org.keycloak.events.admin.ResourceType; import org.keycloak.representations.idm.ClientInitialAccessCreatePresentation; import org.keycloak.representations.idm.ClientInitialAccessPresentation; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.util.AdminEventPaths; import java.util.List; @@ -40,7 +39,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @author Stian Thorgersen @@ -55,7 +53,6 @@ public class InitialAccessTokenResourceTest extends AbstractAdminTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) // Time difference is possible on remote server public void testInitialAccessTokens() { ClientInitialAccessCreatePresentation rep = new ClientInitialAccessCreatePresentation(); rep.setCount(2); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/SMTPConnectionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/SMTPConnectionTest.java index a3f0952e2dd..712529821c0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/SMTPConnectionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/SMTPConnectionTest.java @@ -36,9 +36,6 @@ import java.util.Map; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import static org.keycloak.representations.idm.ComponentRepresentation.SECRET_VALUE; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; -import static org.keycloak.util.JsonSerialization.writeValueAsPrettyString; /** * @author Bruno Oliveira @@ -96,7 +93,6 @@ public class SMTPConnectionTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testWithProperSettings() throws Exception { Response response = realm.testSMTPConnection(settings("127.0.0.1", "3025", "auto@keycloak.org", null, null, null, null, null)); @@ -112,7 +108,6 @@ public class SMTPConnectionTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testWithAuthEnabledValidCredentials() throws Exception { greenMailRule.credentials("admin@localhost", "admin"); Response response = realm.testSMTPConnection(settings("127.0.0.1", "3025", "auto@keycloak.org", "true", null, null, @@ -121,7 +116,6 @@ public class SMTPConnectionTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testAuthEnabledAndSavedCredentials() throws Exception { RealmRepresentation realmRep = realm.toRepresentation(); Map oldSmtp = realmRep.getSmtpServer(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/SMTPConnectionVaultTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/SMTPConnectionVaultTest.java index 99edfb4d8b7..a4cc775e854 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/SMTPConnectionVaultTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/SMTPConnectionVaultTest.java @@ -1,14 +1,11 @@ package org.keycloak.testsuite.admin; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.arquillian.annotation.EnableVault; /** * @author Martin Kanis */ @EnableVault -@AuthServerContainerExclude({AuthServer.REMOTE}) public class SMTPConnectionVaultTest extends SMTPConnectionTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ServerInfoTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ServerInfoTest.java index 9d21c291919..1133f66154f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ServerInfoTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ServerInfoTest.java @@ -29,13 +29,10 @@ import java.util.Map; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @author Stian Thorgersen */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class ServerInfoTest extends AbstractKeycloakTest { @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserFederationLdapConnectionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserFederationLdapConnectionTest.java index f3c8e440989..63b98a23604 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserFederationLdapConnectionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserFederationLdapConnectionTest.java @@ -33,14 +33,11 @@ import org.keycloak.testsuite.util.LDAPRule; import javax.ws.rs.BadRequestException; import javax.ws.rs.core.Response; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @author Marek Posolda */ @EnableVault -@AuthServerContainerExclude(AuthServer.REMOTE) public class UserFederationLdapConnectionTest extends AbstractAdminTest { @ClassRule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserStorageRestTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserStorageRestTest.java index 102523256d7..71510abd99f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserStorageRestTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserStorageRestTest.java @@ -43,8 +43,6 @@ import org.keycloak.testsuite.util.AdminEventPaths; import javax.ws.rs.BadRequestException; import javax.ws.rs.core.Response; import java.util.List; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @author Marek Posolda @@ -85,7 +83,6 @@ public class UserStorageRestTest extends AbstractAdminTest { @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testKerberosAuthenticatorEnabledAutomatically() { // Assert kerberos authenticator DISABLED AuthenticationExecutionInfoRepresentation kerberosExecution = findKerberosExecution(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTest.java index 436ad4bef50..da04cdd3966 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTest.java @@ -63,8 +63,6 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.services.resources.RealmsResource; import org.keycloak.storage.UserStorageProvider; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.federation.DummyUserFederationProviderFactory; import org.keycloak.testsuite.page.LoginPasswordUpdatePage; @@ -120,7 +118,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.keycloak.testsuite.Assert.assertNames; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; /** @@ -298,7 +295,6 @@ public class UserTest extends AbstractAdminTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void createUserWithHashedCredentials() { UserRepresentation user = new UserRepresentation(); user.setUsername("user_creds"); @@ -415,7 +411,6 @@ public class UserTest extends AbstractAdminTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void createUserWithRawCredentials() { UserRepresentation user = new UserRepresentation(); user.setUsername("user_rawpw"); @@ -1450,7 +1445,6 @@ public class UserTest extends AbstractAdminTest { } @Test - @AuthServerContainerExclude({REMOTE}) // TODO: Enable for remote public void updateUserWithReadOnlyAttributes() { // Admin is able to update "usercertificate" attribute UserRepresentation user1 = new UserRepresentation(); @@ -1571,7 +1565,6 @@ public class UserTest extends AbstractAdminTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void sendResetPasswordEmailSuccess() throws IOException { UserRepresentation userRep = new UserRepresentation(); userRep.setEnabled(true); @@ -1619,7 +1612,6 @@ public class UserTest extends AbstractAdminTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testEmailLinkBasedOnRealmFrontEndUrl() throws Exception { try { updateRealmFrontEndUrl(adminClient.realm("master"), suiteContext.getAuthServerInfo().getContextRoot().toString()); @@ -1664,7 +1656,6 @@ public class UserTest extends AbstractAdminTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void sendResetPasswordEmailWithCustomLifespan() throws IOException { UserRepresentation userRep = new UserRepresentation(); userRep.setEnabled(true); @@ -1724,7 +1715,6 @@ public class UserTest extends AbstractAdminTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void sendResetPasswordEmailSuccessTwoLinks() throws IOException { UserRepresentation userRep = new UserRepresentation(); userRep.setEnabled(true); @@ -1768,7 +1758,6 @@ public class UserTest extends AbstractAdminTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void sendResetPasswordEmailSuccessTwoLinksReverse() throws IOException { UserRepresentation userRep = new UserRepresentation(); userRep.setEnabled(true); @@ -1814,7 +1803,6 @@ public class UserTest extends AbstractAdminTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void sendResetPasswordEmailSuccessLinkOpenDoesNotExpireWhenOpenedOnly() throws IOException { UserRepresentation userRep = new UserRepresentation(); userRep.setEnabled(true); @@ -1858,7 +1846,6 @@ public class UserTest extends AbstractAdminTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void sendResetPasswordEmailSuccessTokenShortLifespan() throws IOException { UserRepresentation userRep = new UserRepresentation(); userRep.setEnabled(true); @@ -1901,7 +1888,6 @@ public class UserTest extends AbstractAdminTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void sendResetPasswordEmailSuccessWithRecycledAuthSession() throws IOException { UserRepresentation userRep = new UserRepresentation(); userRep.setEnabled(true); @@ -1966,7 +1952,6 @@ public class UserTest extends AbstractAdminTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void sendResetPasswordEmailWithRedirect() throws IOException { UserRepresentation userRep = new UserRepresentation(); @@ -2035,7 +2020,6 @@ public class UserTest extends AbstractAdminTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void sendResetPasswordEmailWithRedirectAndCustomLifespan() throws IOException { UserRepresentation userRep = new UserRepresentation(); @@ -2121,7 +2105,6 @@ public class UserTest extends AbstractAdminTest { @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void sendVerifyEmail() throws IOException { UserRepresentation userRep = new UserRepresentation(); userRep.setUsername("user1"); @@ -2344,7 +2327,6 @@ public class UserTest extends AbstractAdminTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void updateUserWithRawCredentials() { UserRepresentation user = new UserRepresentation(); user.setUsername("user_rawpw"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ExecutionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ExecutionTest.java index e88c8b39aa4..e973fd73971 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ExecutionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ExecutionTest.java @@ -24,7 +24,6 @@ import org.keycloak.authentication.authenticators.browser.UsernameFormFactory; import org.keycloak.authentication.authenticators.browser.WebAuthnAuthenticatorFactory; import org.keycloak.authentication.authenticators.challenge.NoCookieFlowRedirectAuthenticatorFactory; import org.keycloak.authentication.authenticators.client.ClientIdAndSecretAuthenticator; -import org.keycloak.common.Profile; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.representations.idm.AuthenticationExecutionInfoRepresentation; @@ -32,9 +31,6 @@ import org.keycloak.representations.idm.AuthenticationExecutionRepresentation; import org.keycloak.representations.idm.AuthenticationFlowRepresentation; import org.keycloak.representations.idm.AuthenticatorConfigRepresentation; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; -import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.util.AdminEventPaths; import org.keycloak.testsuite.util.AssertAdminEvents; @@ -322,7 +318,6 @@ public class ExecutionTest extends AbstractAuthenticationTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testRequirementsInExecution() { HashMap params = new HashMap<>(); String newBrowserFlow = "new-exec-flow"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ProvidersTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ProvidersTest.java index 1040bf7f3a0..f064b3c2437 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ProvidersTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ProvidersTest.java @@ -32,9 +32,6 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; -import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import static org.hamcrest.Matchers.is; @@ -57,7 +54,6 @@ public class ProvidersTest extends AbstractAuthenticationTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testFormActionProviders() { List> result = authMgmtResource.getFormActionProviders(); @@ -77,7 +73,6 @@ public class ProvidersTest extends AbstractAuthenticationTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testClientAuthenticatorProviders() { List> result = authMgmtResource.getClientAuthenticatorProviders(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ScriptBasedAuthenticatorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ScriptBasedAuthenticatorTest.java index f63e8c07cf2..3466928a907 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ScriptBasedAuthenticatorTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ScriptBasedAuthenticatorTest.java @@ -6,13 +6,10 @@ import org.keycloak.testsuite.ProfileAssume; import javax.ws.rs.BadRequestException; import java.util.HashMap; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @author mhajas */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class ScriptBasedAuthenticatorTest extends AbstractAuthenticationTest { @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientSearchTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientSearchTest.java index c9bf5378497..8fc3fe36350 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientSearchTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientSearchTest.java @@ -26,7 +26,6 @@ import org.junit.Test; import org.keycloak.models.ClientProvider; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.testsuite.arquillian.AuthServerTestEnricher; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.containers.KeycloakQuarkusServerDeployableContainer; import org.wildfly.extras.creaper.core.online.OnlineManagementClient; import org.wildfly.extras.creaper.core.online.operations.admin.Administration; @@ -37,14 +36,12 @@ import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; -import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; +import static org.hamcrest.Matchers.containsInAnyOrder; /** * @author Vaclav Muzikar */ -@AuthServerContainerExclude(REMOTE) public class ClientSearchTest extends AbstractClientTest { @ArquillianResource protected ContainerController controller; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/authorization/ClaimInformationPointProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/authorization/ClaimInformationPointProviderTest.java index d2d5eeff76c..e69005d2e1a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/authorization/ClaimInformationPointProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/authorization/ClaimInformationPointProviderTest.java @@ -64,14 +64,11 @@ import org.keycloak.representations.adapters.config.PolicyEnforcerConfig.PathCon import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.ProfileAssume; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.util.JsonSerialization; /** * @author Pedro Igor */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class ClaimInformationPointProviderTest extends AbstractKeycloakTest { private static Undertow httpService; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/authorization/EnforcerConfigTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/authorization/EnforcerConfigTest.java index a5231d2e9fa..bac6b9c8132 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/authorization/EnforcerConfigTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/authorization/EnforcerConfigTest.java @@ -33,8 +33,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import org.keycloak.testsuite.ProfileAssume; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import static org.keycloak.common.Profile.Feature.AUTHORIZATION; import static org.keycloak.testsuite.utils.io.IOUtil.loadRealm; @@ -42,7 +40,6 @@ import static org.keycloak.testsuite.utils.io.IOUtil.loadRealm; /** * @author Pedro Igor */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class EnforcerConfigTest extends AbstractKeycloakTest { @BeforeClass diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/authorization/PolicyEnforcerClaimsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/authorization/PolicyEnforcerClaimsTest.java index f6dc17ba3b5..829b11b32b2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/authorization/PolicyEnforcerClaimsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/authorization/PolicyEnforcerClaimsTest.java @@ -67,9 +67,6 @@ import org.keycloak.representations.idm.authorization.ScopePermissionRepresentat import org.keycloak.representations.idm.authorization.ScopeRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.ProfileAssume; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; -import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.OAuthClient; import org.keycloak.testsuite.util.RealmBuilder; @@ -80,7 +77,6 @@ import org.keycloak.testsuite.util.UserBuilder; /** * @author Pedro Igor */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class PolicyEnforcerClaimsTest extends AbstractKeycloakTest { protected static final String REALM_NAME = "authz-test"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/authorization/PolicyEnforcerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/authorization/PolicyEnforcerTest.java index 8e22bf76fac..effcbfa8d3e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/authorization/PolicyEnforcerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/authorization/PolicyEnforcerTest.java @@ -82,8 +82,6 @@ import org.keycloak.representations.idm.authorization.ScopePermissionRepresentat import org.keycloak.representations.idm.authorization.ScopeRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.ProfileAssume; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.OAuthClient; import org.keycloak.testsuite.util.RealmBuilder; @@ -95,7 +93,6 @@ import org.keycloak.testsuite.util.WaitUtils; /** * @author Pedro Igor */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class PolicyEnforcerTest extends AbstractKeycloakTest { private static final String RESOURCE_SERVER_CLIENT_ID = "resource-server-test"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/authorization/ResourceManagementWithAuthzClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/authorization/ResourceManagementWithAuthzClientTest.java index cc79800ab4c..b5035f48791 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/authorization/ResourceManagementWithAuthzClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/authorization/ResourceManagementWithAuthzClientTest.java @@ -34,14 +34,11 @@ import org.junit.Test; import org.keycloak.authorization.client.AuthzClient; import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ScopeRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * * @author Pedro Igor */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class ResourceManagementWithAuthzClientTest extends ResourceManagementTest { private AuthzClient authzClient; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/GroupTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/GroupTest.java index f3522f92f8f..24af198ebd1 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/GroupTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/GroupTest.java @@ -20,7 +20,6 @@ package org.keycloak.testsuite.admin.group; import com.google.common.collect.Comparators; import org.hamcrest.Matchers; import org.junit.Assert; -import org.junit.Assume; import org.junit.Test; import org.keycloak.admin.client.resource.GroupResource; import org.keycloak.admin.client.resource.GroupsResource; @@ -28,7 +27,6 @@ import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.RoleMappingResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.admin.client.resource.UsersResource; -import org.keycloak.common.Profile; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.models.Constants; @@ -78,7 +76,6 @@ import org.keycloak.models.ModelDuplicateException; import org.keycloak.models.RealmModel; import org.keycloak.models.utils.KeycloakModelUtils; import static org.keycloak.testsuite.Assert.assertNames; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; @@ -296,7 +293,6 @@ public class GroupTest extends AbstractGroupTest { @Test @UncaughtServerErrorExpected - @AuthServerContainerExclude(REMOTE) public void doNotAllowSameGroupNameAtTopLevelInDatabase() throws Exception { final String id = KeycloakModelUtils.generateId(); testingClient.server().run(session -> { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/realm/RealmTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/realm/RealmTest.java index c4f8eee99ed..5345f4797d1 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/realm/RealmTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/realm/RealmTest.java @@ -57,8 +57,6 @@ import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.AbstractAdminTest; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.testsuite.events.TestEventsListenerProviderFactory; @@ -89,7 +87,6 @@ import java.util.Set; import java.util.stream.Collectors; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertEquals; @@ -103,7 +100,6 @@ import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; /** * @author Stian Thorgersen */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class RealmTest extends AbstractAdminTest { @Rule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/userprofile/UserProfileAdminTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/userprofile/UserProfileAdminTest.java index 91b7f473c05..5700f081429 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/userprofile/UserProfileAdminTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/userprofile/UserProfileAdminTest.java @@ -31,16 +31,12 @@ import org.keycloak.admin.client.resource.UserProfileResource; import org.keycloak.common.Profile; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.admin.AbstractAdminTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; -import org.keycloak.testsuite.arquillian.annotation.SetDefaultProvider; -import org.keycloak.userprofile.UserProfileSpi; /** * @author Pedro Igor */ @EnableFeature(value = Profile.Feature.DECLARATIVE_USER_PROFILE) -@AuthServerContainerExclude(AuthServerContainerExclude.AuthServer.REMOTE) public class UserProfileAdminTest extends AbstractAdminTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationAPITest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationAPITest.java index c6ab20382ee..d4ac84b4c24 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationAPITest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationAPITest.java @@ -47,8 +47,6 @@ import org.keycloak.representations.idm.authorization.PermissionRequest; import org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.OAuthClient; @@ -61,7 +59,6 @@ import org.keycloak.util.JsonSerialization; /** * @author Pedro Igor */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class AuthorizationAPITest extends AbstractAuthzTest { private static final String RESOURCE_SERVER_TEST = "resource-server-test"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationTest.java index 0d24fd2902b..28545976419 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationTest.java @@ -48,8 +48,6 @@ import org.keycloak.representations.idm.authorization.Permission; import org.keycloak.representations.idm.authorization.ResourceOwnerRepresentation; import org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.RoleBuilder; @@ -59,7 +57,6 @@ import org.keycloak.testsuite.util.UserBuilder; /** * @author Pedro Igor */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class AuthorizationTest extends AbstractAuthzTest { private AuthzClient authzClient; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthzClientCredentialsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthzClientCredentialsTest.java index e27ad1b13e2..574431b8978 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthzClientCredentialsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthzClientCredentialsTest.java @@ -64,8 +64,6 @@ import org.keycloak.representations.idm.authorization.PermissionResponse; import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ResourceServerRepresentation; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.RolesBuilder; @@ -75,7 +73,6 @@ import org.keycloak.testsuite.util.UserBuilder; * @author Bill Burke * @version $Revision: 1 $ */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class AuthzClientCredentialsTest extends AbstractAuthzTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/ClientScopePolicyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/ClientScopePolicyTest.java index 52ee41c8664..7b3f2848ee9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/ClientScopePolicyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/ClientScopePolicyTest.java @@ -40,8 +40,6 @@ import org.keycloak.representations.idm.authorization.ClientScopePolicyRepresent import org.keycloak.representations.idm.authorization.PermissionRequest; import org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.ClientScopeBuilder; import org.keycloak.testsuite.util.RealmBuilder; @@ -50,7 +48,6 @@ import org.keycloak.testsuite.util.UserBuilder; /** * @author Yoshiyuki Tabata */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class ClientScopePolicyTest extends AbstractAuthzTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/ConflictingScopePermissionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/ConflictingScopePermissionTest.java index aff96092f41..06f6180cdf5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/ConflictingScopePermissionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/ConflictingScopePermissionTest.java @@ -54,8 +54,6 @@ import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ResourceServerRepresentation; import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; import org.keycloak.representations.idm.authorization.ScopeRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; @@ -65,7 +63,6 @@ import org.keycloak.util.JsonSerialization; * @author Bill Burke * @version $Revision: 1 $ */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class ConflictingScopePermissionTest extends AbstractAuthzTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/EntitlementAPITest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/EntitlementAPITest.java index c5677095379..c8ebb3c51d3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/EntitlementAPITest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/EntitlementAPITest.java @@ -92,8 +92,6 @@ import org.keycloak.representations.idm.authorization.ScopePermissionRepresentat import org.keycloak.representations.idm.authorization.ScopeRepresentation; import org.keycloak.representations.idm.authorization.UserPolicyRepresentation; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.util.ClientBuilder; @@ -107,7 +105,6 @@ import org.keycloak.util.JsonSerialization; /** * @author Pedro Igor */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class EntitlementAPITest extends AbstractAuthzTest { private static final String RESOURCE_SERVER_TEST = "resource-server-test"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/GroupNamePolicyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/GroupNamePolicyTest.java index fa436e6f0c4..cbff66c6058 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/GroupNamePolicyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/GroupNamePolicyTest.java @@ -48,8 +48,6 @@ import org.keycloak.representations.idm.authorization.GroupPolicyRepresentation; import org.keycloak.representations.idm.authorization.PermissionRequest; import org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.GroupBuilder; import org.keycloak.testsuite.util.RealmBuilder; @@ -60,7 +58,6 @@ import org.keycloak.testsuite.util.UserBuilder; /** * @author Pedro Igor */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class GroupNamePolicyTest extends AbstractAuthzTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/GroupPathPolicyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/GroupPathPolicyTest.java index cc13a115b67..c94447ff921 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/GroupPathPolicyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/GroupPathPolicyTest.java @@ -48,8 +48,6 @@ import org.keycloak.representations.idm.authorization.GroupPolicyRepresentation; import org.keycloak.representations.idm.authorization.PermissionRequest; import org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.GroupBuilder; import org.keycloak.testsuite.util.RealmBuilder; @@ -60,7 +58,6 @@ import org.keycloak.testsuite.util.UserBuilder; /** * @author Pedro Igor */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class GroupPathPolicyTest extends AbstractAuthzTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/GroupPathWithoutGroupClaimPolicyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/GroupPathWithoutGroupClaimPolicyTest.java index 42e30f28695..899aa43acbf 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/GroupPathWithoutGroupClaimPolicyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/GroupPathWithoutGroupClaimPolicyTest.java @@ -29,8 +29,6 @@ import org.keycloak.protocol.oidc.mappers.OIDCAttributeMapperHelper; import org.keycloak.representations.idm.GroupRepresentation; import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.GroupBuilder; import org.keycloak.testsuite.util.RealmBuilder; @@ -41,7 +39,6 @@ import org.keycloak.testsuite.util.UserBuilder; /** * @author Pedro Igor */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class GroupPathWithoutGroupClaimPolicyTest extends GroupPathPolicyTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionClaimTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionClaimTest.java index 8dfd56d38d6..c7a13664558 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionClaimTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionClaimTest.java @@ -55,8 +55,6 @@ import org.keycloak.representations.idm.authorization.PermissionRequest; import org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.OAuthClient; import org.keycloak.testsuite.util.RealmBuilder; @@ -67,7 +65,6 @@ import org.keycloak.testsuite.util.UserBuilder; /** * @author Pedro Igor */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class PermissionClaimTest extends AbstractAuthzTest { private JSPolicyRepresentation claimAPolicy; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionManagementTest.java index e3aa50dc233..236382ffb39 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionManagementTest.java @@ -51,13 +51,10 @@ import org.keycloak.representations.idm.authorization.PermissionTicketRepresenta import org.keycloak.representations.idm.authorization.PermissionTicketToken; import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ScopeRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @author Pedro Igor */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class PermissionManagementTest extends AbstractResourceServerTest { @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PolicyEvaluationCompositeRoleTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PolicyEvaluationCompositeRoleTest.java index af91ada1257..53dad7a3edf 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PolicyEvaluationCompositeRoleTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PolicyEvaluationCompositeRoleTest.java @@ -43,8 +43,6 @@ import org.keycloak.representations.idm.authorization.ScopePermissionRepresentat import java.util.HashMap; import java.util.List; import java.util.Map; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; @@ -52,7 +50,6 @@ import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; * @author Bill Burke * @version $Revision: 1 $ */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class PolicyEvaluationCompositeRoleTest extends AbstractAuthzTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PolicyEvaluationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PolicyEvaluationTest.java index 29ce9f7f450..42f1e5dddad 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PolicyEvaluationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PolicyEvaluationTest.java @@ -50,8 +50,6 @@ import org.keycloak.representations.idm.authorization.Permission; import org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation; import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; import org.keycloak.representations.idm.authorization.TimePolicyRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.GroupBuilder; import org.keycloak.testsuite.util.RealmBuilder; @@ -74,7 +72,6 @@ import java.util.stream.Collectors; /** * @author Pedro Igor */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class PolicyEvaluationTest extends AbstractAuthzTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/RegexPolicyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/RegexPolicyTest.java index 702da1160bf..de67f64f69b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/RegexPolicyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/RegexPolicyTest.java @@ -42,8 +42,6 @@ import org.keycloak.representations.idm.authorization.PermissionRequest; import org.keycloak.representations.idm.authorization.RegexPolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; @@ -51,7 +49,6 @@ import org.keycloak.testsuite.util.UserBuilder; /** * @author Yoshiyuki Tabata */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class RegexPolicyTest extends AbstractAuthzTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/RolePolicyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/RolePolicyTest.java index 1ad343cc3a7..987e8090628 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/RolePolicyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/RolePolicyTest.java @@ -40,8 +40,6 @@ import org.keycloak.representations.idm.authorization.PermissionRequest; import org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.RolePolicyRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.GroupBuilder; import org.keycloak.testsuite.util.RealmBuilder; @@ -52,7 +50,6 @@ import org.keycloak.testsuite.util.UserBuilder; /** * @author Pedro Igor */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class RolePolicyTest extends AbstractAuthzTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaDiscoveryDocumentTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaDiscoveryDocumentTest.java index f5097be9985..2870a270c1e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaDiscoveryDocumentTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaDiscoveryDocumentTest.java @@ -36,12 +36,9 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.services.resources.RealmsResource; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.admin.AbstractAdminTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.OAuthClient; -@AuthServerContainerExclude(AuthServer.REMOTE) public class UmaDiscoveryDocumentTest extends AbstractKeycloakTest { @ArquillianResource diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaGrantTypeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaGrantTypeTest.java index f876453a8f6..7b59e39c4e8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaGrantTypeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaGrantTypeTest.java @@ -69,8 +69,6 @@ import org.keycloak.representations.idm.authorization.PermissionRequest; import org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.OAuthClient; import org.keycloak.testsuite.util.UserBuilder; @@ -80,7 +78,6 @@ import org.keycloak.util.JsonSerialization; /** * @author Pedro Igor */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class UmaGrantTypeTest extends AbstractResourceServerTest { private ResourceRepresentation resourceA; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaPermissionTicketPushedClaimsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaPermissionTicketPushedClaimsTest.java index ba37c00ee6f..55b89edee3e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaPermissionTicketPushedClaimsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaPermissionTicketPushedClaimsTest.java @@ -38,13 +38,10 @@ import org.keycloak.representations.idm.authorization.PermissionRequest; import org.keycloak.representations.idm.authorization.PermissionResponse; import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @author Pedro Igor */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class UmaPermissionTicketPushedClaimsTest extends AbstractResourceServerTest { @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaRepresentationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaRepresentationTest.java index 36d7b510d4e..8d67a1264c5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaRepresentationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaRepresentationTest.java @@ -30,13 +30,9 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.idm.authorization.*; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; - import java.util.List; import org.keycloak.authorization.model.ResourceServer; -@AuthServerContainerExclude(AuthServer.REMOTE) public class UmaRepresentationTest extends AbstractResourceServerTest { private ResourceRepresentation resource; private PermissionResource permission; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UserManagedAccessTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UserManagedAccessTest.java index df3e6f76c59..75509179f02 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UserManagedAccessTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UserManagedAccessTest.java @@ -48,13 +48,10 @@ import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ResourceServerRepresentation; import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @author Pedro Igor */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class UserManagedAccessTest extends AbstractResourceServerTest { private ResourceRepresentation resource; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UserManagedPermissionServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UserManagedPermissionServiceTest.java index 4acb3549b28..de887182b92 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UserManagedPermissionServiceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UserManagedPermissionServiceTest.java @@ -62,9 +62,6 @@ import org.keycloak.representations.idm.authorization.PermissionTicketRepresenta import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.UmaPermissionRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; -import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; import org.keycloak.testsuite.runonserver.RunOnServer; import org.keycloak.testsuite.util.ClientBuilder; @@ -77,7 +74,6 @@ import org.keycloak.testsuite.util.UserBuilder; /** * @author Pedro Igor */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class UserManagedPermissionServiceTest extends AbstractResourceServerTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBaseBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBaseBrokerTest.java index 73b2a3b26b9..4c4dadcba97 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBaseBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBaseBrokerTest.java @@ -32,8 +32,6 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.services.resources.RealmsResource; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.pages.AccountApplicationsPage; import org.keycloak.testsuite.pages.AccountFederatedIdentityPage; @@ -82,7 +80,6 @@ import static org.keycloak.testsuite.util.ServerURLs.removeDefaultPorts; /** * No test methods there. Just some useful common functionality */ -@AuthServerContainerExclude(AuthServer.REMOTE) @DisableFeature(value = Profile.Feature.ACCOUNT2, skipRestart = true) // TODO remove this (KEYCLOAK-16228) public abstract class AbstractBaseBrokerTest extends AbstractKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AccountLinkTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AccountLinkTest.java index 91f81946043..7b16031864c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AccountLinkTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AccountLinkTest.java @@ -59,8 +59,6 @@ import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; import static org.keycloak.testsuite.admin.ApiUtil.createUserAndResetPasswordWithAdminClient; import static org.keycloak.testsuite.admin.ApiUtil.createUserWithAdminClient; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.runonserver.RunOnServer; import org.keycloak.testsuite.util.FederatedIdentityBuilder; @@ -68,7 +66,6 @@ import org.keycloak.testsuite.util.FederatedIdentityBuilder; * @author Bill Burke * @version $Revision: 1 $ */ -@AuthServerContainerExclude(AuthServer.REMOTE) @DisableFeature(value = Profile.Feature.ACCOUNT2, skipRestart = true) // TODO remove this (KEYCLOAK-16228) public class AccountLinkTest extends AbstractKeycloakTest { public static final String CHILD_IDP = "child"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerVaultTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerVaultTest.java index d68481265a3..9ad69b6535a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerVaultTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerVaultTest.java @@ -1,15 +1,11 @@ package org.keycloak.testsuite.broker; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; - -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.EnableVault; /** * @author Martin Kanis */ @EnableVault -@AuthServerContainerExclude(REMOTE) public class KcOidcBrokerVaultTest extends AbstractBrokerTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginWithUserProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginWithUserProfileTest.java index 28540e4fbf8..8ba410fa2f9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginWithUserProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginWithUserProfileTest.java @@ -32,7 +32,6 @@ import org.junit.Test; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.common.Profile; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.forms.RegisterWithUserProfileTest; import org.keycloak.testsuite.forms.VerifyProfileTest; @@ -45,7 +44,6 @@ import org.openqa.selenium.By; * */ @EnableFeature(value = Profile.Feature.DECLARATIVE_USER_PROFILE) -@AuthServerContainerExclude(AuthServerContainerExclude.AuthServer.REMOTE) public class KcOidcFirstBrokerLoginWithUserProfileTest extends KcOidcFirstBrokerLoginTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlFirstBrokerLoginWithUserProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlFirstBrokerLoginWithUserProfileTest.java index 8d1ce3b3a44..b684b7476cd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlFirstBrokerLoginWithUserProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlFirstBrokerLoginWithUserProfileTest.java @@ -18,7 +18,6 @@ package org.keycloak.testsuite.broker; import org.junit.Before; import org.keycloak.common.Profile; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; /** @@ -27,7 +26,6 @@ import org.keycloak.testsuite.arquillian.annotation.EnableFeature; * */ @EnableFeature(value = Profile.Feature.DECLARATIVE_USER_PROFILE) -@AuthServerContainerExclude(AuthServerContainerExclude.AuthServer.REMOTE) public class KcSamlFirstBrokerLoginWithUserProfileTest extends KcSamlFirstBrokerLoginTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlIdPInitiatedSsoTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlIdPInitiatedSsoTest.java index bb3cd64ca07..ed82ab47189 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlIdPInitiatedSsoTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlIdPInitiatedSsoTest.java @@ -66,14 +66,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; - /** * * @author hmlnarik */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class KcSamlIdPInitiatedSsoTest extends AbstractKeycloakTest { private static final String PROVIDER_REALM_USER_NAME = "test"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/SocialLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/SocialLoginTest.java index f956575225c..3a41d6f7a97 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/SocialLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/SocialLoginTest.java @@ -70,8 +70,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertNotNull; import static org.junit.Assume.assumeTrue; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.AdminClientUtil; import static org.keycloak.testsuite.broker.SocialLoginTest.Provider.BITBUCKET; @@ -99,7 +97,6 @@ import com.google.common.collect.ImmutableMap; * @author Stian Thorgersen * @author Vaclav Muzikar */ -@AuthServerContainerExclude(AuthServer.REMOTE) @DisableFeature(value = Profile.Feature.ACCOUNT2, skipRestart = true) // TODO remove this (KEYCLOAK-16228) public class SocialLoginTest extends AbstractKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmCreateTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmCreateTest.java index c9734ed1d48..40e7b7b3d3e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmCreateTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmCreateTest.java @@ -3,34 +3,22 @@ package org.keycloak.testsuite.cli.admin; import org.junit.Assert; import org.junit.Test; import org.keycloak.admin.client.resource.RealmResource; -import org.keycloak.broker.saml.SAMLIdentityProviderConfig; -import org.keycloak.broker.saml.SAMLIdentityProviderFactory; import org.keycloak.client.admin.cli.config.FileConfigHandler; import org.keycloak.models.IdentityProviderModel; import org.keycloak.representations.idm.ClientRepresentation; -import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.testsuite.cli.KcAdmExec; -import org.keycloak.testsuite.updaters.IdentityProviderCreator; -import org.keycloak.testsuite.util.IdentityProviderBuilder; import org.keycloak.testsuite.util.TempFileResource; import org.keycloak.util.JsonSerialization; -import java.io.Closeable; import java.io.File; import java.io.IOException; import java.util.Arrays; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; - -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; import static org.keycloak.testsuite.cli.KcAdmExec.execute; /** * @author Marko Strukelj */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class KcAdmCreateTest extends AbstractAdmCliTest { @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmSessionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmSessionTest.java index ef94a29c348..fd63f1bcee9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmSessionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmSessionTest.java @@ -16,14 +16,11 @@ import java.util.stream.StreamSupport; import static org.hamcrest.Matchers.equalTo; import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import static org.keycloak.testsuite.cli.KcAdmExec.execute; /** * @author Marko Strukelj */ -@AuthServerContainerExclude({AuthServer.REMOTE}) public class KcAdmSessionTest extends AbstractAdmCliTest { static TypeReference> LIST_OF_JSON = new TypeReference>() {}; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmTest.java index 701a6581e21..7775fe814b6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmTest.java @@ -18,14 +18,11 @@ import java.util.UUID; import static org.keycloak.client.admin.cli.util.OsUtil.CMD; import static org.keycloak.client.admin.cli.util.OsUtil.EOL; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import static org.keycloak.testsuite.cli.KcAdmExec.execute; /** * @author Marko Strukelj */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class KcAdmTest extends AbstractAdmCliTest { @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmUpdateTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmUpdateTest.java index 49ff78d1adf..690abc8654c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmUpdateTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmUpdateTest.java @@ -19,8 +19,6 @@ import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.broker.saml.SAMLIdentityProviderConfig; import org.keycloak.broker.saml.SAMLIdentityProviderFactory; import org.keycloak.representations.idm.IdentityProviderRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import static org.keycloak.testsuite.cli.KcAdmExec.CMD; import static org.keycloak.testsuite.cli.KcAdmExec.execute; @@ -30,7 +28,6 @@ import org.keycloak.testsuite.util.IdentityProviderBuilder; /** * @author Marko Strukelj */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class KcAdmUpdateTest extends AbstractAdmCliTest { @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegTest.java index 8203b0c7795..6624ecf884a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegTest.java @@ -20,8 +20,6 @@ import java.util.UUID; import static org.keycloak.client.registration.cli.util.OsUtil.CMD; import static org.keycloak.client.registration.cli.util.OsUtil.EOL; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import static org.keycloak.testsuite.cli.KcRegExec.execute; /** @@ -263,7 +261,6 @@ public class KcRegTest extends AbstractRegCliTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testUserLoginWithDefaultConfig() { /* * Test most basic user login, using the default admin-cli as a client @@ -364,7 +361,6 @@ public class KcRegTest extends AbstractRegCliTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testUserLoginWithCustomConfig() { /* * Test user login using a custom config file @@ -402,7 +398,6 @@ public class KcRegTest extends AbstractRegCliTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testCustomConfigLoginCreateDelete() throws IOException { /* * Test user login, create, delete session using a custom config file @@ -459,7 +454,6 @@ public class KcRegTest extends AbstractRegCliTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testCRUDWithOnTheFlyUserAuth() throws IOException { /* * Test create, get, update, and delete using on-the-fly authentication - without using any config file. @@ -470,7 +464,6 @@ public class KcRegTest extends AbstractRegCliTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testCRUDWithOnTheFlyUserAuthWithClientSecret() throws IOException { /* * Test create, get, update, and delete using on-the-fly authentication - without using any config file. @@ -509,7 +502,6 @@ public class KcRegTest extends AbstractRegCliTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testCRUDWithOnTheFlyUserAuthWithSignedJwtClient() throws IOException { /* * Test create, get, update, and delete using on-the-fly authentication - without using any config file. @@ -557,7 +549,6 @@ public class KcRegTest extends AbstractRegCliTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testCRUDWithOnTheFlyServiceAccountWithClientSecret() throws IOException { /* * Test create, get, update, and delete using on-the-fly authentication - without using any config file. @@ -568,7 +559,6 @@ public class KcRegTest extends AbstractRegCliTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testCRUDWithOnTheFlyServiceAccountWithSignedJwtClient() throws IOException { /* * Test create, get, update, and delete using on-the-fly authentication - without using any config file. @@ -641,14 +631,12 @@ public class KcRegTest extends AbstractRegCliTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testCreateWithAllowedHostsWithoutAuthenticationNoConfig() throws IOException { testCreateWithAllowedHostsWithoutAuthentication("test", false); } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testCreateWithAllowedHostsWithoutAuthentication() throws IOException { testCreateWithAllowedHostsWithoutAuthentication("test", true); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegUpdateTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegUpdateTest.java index 73b0005483f..419d75469a0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegUpdateTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegUpdateTest.java @@ -13,14 +13,11 @@ import java.io.IOException; import java.util.Arrays; import static org.keycloak.client.registration.cli.util.OsUtil.CMD; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import static org.keycloak.testsuite.cli.KcRegExec.execute; /** * @author Marko Strukelj */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class KcRegUpdateTest extends AbstractRegCliTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegUpdateTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegUpdateTokenTest.java index 415fe9d83d4..3a57aac7c6f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegUpdateTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegUpdateTokenTest.java @@ -12,15 +12,12 @@ import org.keycloak.testsuite.util.TempFileResource; import org.keycloak.util.JsonSerialization; import java.io.IOException; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import static org.keycloak.testsuite.cli.KcRegExec.execute; /** * @author Marko Strukelj */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class KcRegUpdateTokenTest extends AbstractRegCliTest { @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/CIBATest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/CIBATest.java index 2570e71c313..6684c7a4adb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/CIBATest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/CIBATest.java @@ -37,7 +37,6 @@ import static org.keycloak.protocol.oidc.grants.ciba.channel.AuthenticationChann import static org.keycloak.protocol.oidc.grants.ciba.channel.AuthenticationChannelResponse.Status.UNAUTHORIZED; import static org.keycloak.testsuite.Assert.assertExpiration; import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientRolesConditionConfig; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientScopesConditionConfig; @@ -105,7 +104,6 @@ import org.keycloak.services.clientpolicy.executor.HolderOfKeyEnforcerExecutorFa import org.keycloak.services.clientpolicy.executor.SecureSigningAlgorithmForSignedJwtExecutorFactory; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; import org.keycloak.testsuite.rest.representation.TestAuthenticationChannelRequest; @@ -135,7 +133,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; * * @author Takashi Norimatsu */ -@AuthServerContainerExclude({REMOTE}) public class CIBATest extends AbstractClientPoliciesTest { private static final String TEST_USER_NAME = "test-user@localhost"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientPoliciesImportExportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientPoliciesImportExportTest.java index 638589c7bf6..dfaf0cf6af2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientPoliciesImportExportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientPoliciesImportExportTest.java @@ -27,19 +27,16 @@ import org.keycloak.representations.idm.ClientProfileRepresentation; import org.keycloak.representations.idm.ClientProfilesRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import java.io.File; import java.util.Arrays; import java.util.List; import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; /** * @author Takashi Norimatsu */ -@AuthServerContainerExclude({REMOTE}) public class ClientPoliciesImportExportTest extends AbstractClientPoliciesTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientPoliciesLoadUpdateTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientPoliciesLoadUpdateTest.java index ed1cd622982..3247d5d73c2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientPoliciesLoadUpdateTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientPoliciesLoadUpdateTest.java @@ -40,7 +40,6 @@ import org.keycloak.services.clientpolicy.executor.SecureClientAuthenticatorExec import org.keycloak.services.clientpolicy.executor.SecureClientUrisExecutorFactory; import org.keycloak.services.clientpolicy.executor.SecureSessionEnforceExecutorFactory; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPoliciesBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPolicyBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfileBuilder; @@ -54,7 +53,6 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientAccessTypeConditionConfig; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientRolesConditionConfig; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createPKCEEnforceExecutorConfig; @@ -63,7 +61,6 @@ import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureClientA /** * @author Takashi Norimatsu */ -@AuthServerContainerExclude({REMOTE}) public class ClientPoliciesLoadUpdateTest extends AbstractClientPoliciesTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientPoliciesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientPoliciesTest.java index dfbcd23960a..af5d9c02693 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientPoliciesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientPoliciesTest.java @@ -112,8 +112,6 @@ import org.keycloak.services.clientpolicy.executor.SecureSessionEnforceExecutorF import org.keycloak.services.clientpolicy.executor.SecureSigningAlgorithmExecutorFactory; import org.keycloak.services.clientpolicy.executor.SecureSigningAlgorithmForSignedJwtExecutorFactory; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; @@ -839,8 +837,6 @@ public class ClientPoliciesTest extends AbstractClientPoliciesTest { successfulLoginAndLogout(clientId, clientSecret); } - - @AuthServerContainerExclude(AuthServer.REMOTE) @Test public void testClientUpdateSourceHostsCondition() throws Exception { // register profiles diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationPoliciesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationPoliciesTest.java index 1f6f5d32d1f..9bae7727aa7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationPoliciesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationPoliciesTest.java @@ -60,13 +60,11 @@ import org.keycloak.services.clientregistration.policy.impl.ProtocolMappersClien import org.keycloak.services.clientregistration.policy.impl.TrustedHostClientRegistrationPolicyFactory; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.util.JsonSerialization; import javax.ws.rs.core.Response; import static org.junit.Assert.assertTrue; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @author Marek Posolda @@ -178,7 +176,6 @@ public class ClientRegistrationPoliciesTest extends AbstractClientRegistrationTe @Test - @AuthServerContainerExclude(AuthServer.REMOTE) // We would need to do domain name -> ip address to set trusted host public void testAnonCreateWithTrustedHost() throws Exception { // Failed to create client (untrusted host) OIDCClientRepresentation client = createRepOidc("http://root", "http://redirect"); @@ -203,7 +200,6 @@ public class ClientRegistrationPoliciesTest extends AbstractClientRegistrationTe @Test - @AuthServerContainerExclude(AuthServer.REMOTE) // We would need to do domain name -> ip address to set trusted host public void testAnonUpdateWithTrustedHost() throws Exception { setTrustedHost("localhost"); OIDCClientRepresentation client = create(); @@ -245,7 +241,6 @@ public class ClientRegistrationPoliciesTest extends AbstractClientRegistrationTe @Test - @AuthServerContainerExclude(AuthServer.REMOTE) // We would need to do domain name -> ip address to set trusted host public void testAnonConsentRequired() throws Exception { setTrustedHost("localhost"); OIDCClientRepresentation client = create(); @@ -266,7 +261,6 @@ public class ClientRegistrationPoliciesTest extends AbstractClientRegistrationTe @Test - @AuthServerContainerExclude(AuthServer.REMOTE) // We would need to do domain name -> ip address to set trusted host public void testAnonFullScopeAllowed() throws Exception { setTrustedHost("localhost"); OIDCClientRepresentation client = create(); @@ -287,7 +281,6 @@ public class ClientRegistrationPoliciesTest extends AbstractClientRegistrationTe @Test - @AuthServerContainerExclude(AuthServer.REMOTE) // We would need to do domain name -> ip address to set trusted host public void testClientDisabledPolicy() throws Exception { setTrustedHost("localhost"); @@ -328,7 +321,6 @@ public class ClientRegistrationPoliciesTest extends AbstractClientRegistrationTe @Test - @AuthServerContainerExclude(AuthServer.REMOTE) // We would need to do domain name -> ip address to set trusted host public void testMaxClientsPolicy() throws Exception { setTrustedHost("localhost"); @@ -431,7 +423,6 @@ public class ClientRegistrationPoliciesTest extends AbstractClientRegistrationTe @Test - @AuthServerContainerExclude(AuthServer.REMOTE) // We would need to do domain name -> ip address to set trusted host public void testClientScopesPolicy() throws Exception { setTrustedHost("localhost"); @@ -471,7 +462,6 @@ public class ClientRegistrationPoliciesTest extends AbstractClientRegistrationTe @Test - @AuthServerContainerExclude(AuthServer.REMOTE) // We would need to do domain name -> ip address to set trusted host public void testClientScopesPolicyWithPermittedScope() throws Exception { setTrustedHost("localhost"); @@ -506,7 +496,6 @@ public class ClientRegistrationPoliciesTest extends AbstractClientRegistrationTe // PROTOCOL MAPPERS @Test - @AuthServerContainerExclude(AuthServer.REMOTE) // We would need to do domain name -> ip address to set trusted host public void testProtocolMappersCreate() throws Exception { setTrustedHost("localhost"); @@ -553,7 +542,6 @@ public class ClientRegistrationPoliciesTest extends AbstractClientRegistrationTe @Test - @AuthServerContainerExclude(AuthServer.REMOTE) // We would need to do domain name -> ip address to set trusted host public void testProtocolMappersUpdate() throws Exception { setTrustedHost("localhost"); @@ -589,7 +577,6 @@ public class ClientRegistrationPoliciesTest extends AbstractClientRegistrationTe @Test - @AuthServerContainerExclude(AuthServer.REMOTE) // We would need to do domain name -> ip address to set trusted host public void testProtocolMappersConsentRequired() throws Exception { setTrustedHost("localhost"); @@ -605,7 +592,6 @@ public class ClientRegistrationPoliciesTest extends AbstractClientRegistrationTe @Test - @AuthServerContainerExclude(AuthServer.REMOTE) // We would need to do domain name -> ip address to set trusted host public void testProtocolMappersRemoveBuiltins() throws Exception { setTrustedHost("localhost"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationTest.java index dfc7acf37ee..6e0e22dc343 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationTest.java @@ -38,8 +38,6 @@ import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.OAuth2ErrorRepresentation; import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; import org.keycloak.util.JsonSerialization; @@ -73,7 +71,6 @@ import static org.keycloak.utils.MediaType.APPLICATION_JSON; /** * @author Stian Thorgersen */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class ClientRegistrationTest extends AbstractClientRegistrationTest { private static final String CLIENT_ID = "test-client"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientSecretRotationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientSecretRotationTest.java index 7de81ca4dee..0eedd5c91c4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientSecretRotationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientSecretRotationTest.java @@ -47,8 +47,6 @@ import org.keycloak.services.clientpolicy.executor.ClientSecretRotationExecutorF import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.account.AbstractRestServiceTest; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPoliciesBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPolicyBuilder; @@ -76,7 +74,6 @@ import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson; /** * @author Marcelo Sales */ -@AuthServerContainerExclude(AuthServer.REMOTE) @EnableFeature(value = Feature.CLIENT_SECRET_ROTATION) public class ClientSecretRotationTest extends AbstractRestServiceTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPI1Test.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPI1Test.java index 065cdcf76eb..1c0d159b5a4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPI1Test.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPI1Test.java @@ -63,7 +63,6 @@ import org.keycloak.services.clientpolicy.condition.AnyClientConditionFactory; import org.keycloak.services.clientpolicy.condition.ClientUpdaterContextConditionFactory; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; import org.keycloak.testsuite.pages.AppPage; @@ -104,7 +103,6 @@ import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateC * * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServerContainerExclude.AuthServer.REMOTE) public class FAPI1Test extends AbstractClientPoliciesTest { @Page diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPICIBATest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPICIBATest.java index a5431f899cc..463aa0d6036 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPICIBATest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPICIBATest.java @@ -88,7 +88,6 @@ import org.keycloak.services.clientpolicy.condition.AnyClientConditionFactory; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; import org.keycloak.testsuite.rest.representation.TestAuthenticationChannelRequest; @@ -110,7 +109,6 @@ import org.keycloak.util.JsonSerialization; * * @author Takashi Norimatsu */ -@AuthServerContainerExclude(AuthServerContainerExclude.AuthServer.REMOTE) public class FAPICIBATest extends AbstractClientPoliciesTest { private final String clientId = "foo"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCJwksClientRegistrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCJwksClientRegistrationTest.java index f108bb6cd11..2fe5d30cca7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCJwksClientRegistrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCJwksClientRegistrationTest.java @@ -60,18 +60,14 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.oidc.OIDCClientRepresentation; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.ProfileAssume; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; import org.keycloak.testsuite.rest.resource.TestingOIDCEndpointsApplicationResource; import org.keycloak.testsuite.util.OAuthClient; - /** * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class OIDCJwksClientRegistrationTest extends AbstractClientRegistrationTest { private static final String PRIVATE_KEY = "MIICXAIBAAKBgQCrVrCuTtArbgaZzL1hvh0xtL5mc7o0NqPVnYXkLvgcwiC3BjLGw1tGEGoJaXDuSaRllobm53JBhjx33UNv+5z/UMG4kytBWxheNVKnL6GgqlNabMaFfPLPCF8kAgKnsi79NMo+n6KnSY8YeUmec/p2vjO2NjsSAVcWEQMVhJ31LwIDAQABAoGAfmO8gVhyBxdqlxmIuglbz8bcjQbhXJLR2EoS8ngTXmN1bo2L90M0mUKSdc7qF10LgETBzqL8jYlQIbt+e6TH8fcEpKCjUlyq0Mf/vVbfZSNaVycY13nTzo27iPyWQHK5NLuJzn1xvxxrUeXI6A2WFpGEBLbHjwpx5WQG9A+2scECQQDvdn9NE75HPTVPxBqsEd2z10TKkl9CZxu10Qby3iQQmWLEJ9LNmy3acvKrE3gMiYNWb6xHPKiIqOR1as7L24aTAkEAtyvQOlCvr5kAjVqrEKXalj0Tzewjweuxc0pskvArTI2Oo070h65GpoIKLc9jf+UA69cRtquwP93aZKtW06U8dQJAF2Y44ks/mK5+eyDqik3koCI08qaC8HYq2wVl7G2QkJ6sbAaILtcvD92ToOvyGyeE0flvmDZxMYlvaZnaQ0lcSQJBAKZU6umJi3/xeEbkJqMfeLclD27XGEFoPeNrmdx0q10Azp4NfJAY+Z8KRyQCR2BEG+oNitBOZ+YXF9KCpH3cdmECQHEigJhYg+ykOvr1aiZUMFT72HU0jnmQe2FVekuG+LJUt2Tm7GtMjTFoGpf0JwrVuZN39fOYAlo+nTixgeW7X8Y="; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractClusterTest.java index d361a62f406..0bbb98c137d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractClusterTest.java @@ -11,7 +11,6 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.arquillian.AuthServerTestEnricher; import org.keycloak.testsuite.arquillian.ContainerInfo; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.testsuite.util.ContainerAssume; import org.keycloak.testsuite.utils.tls.TLSUtils; @@ -23,7 +22,6 @@ import java.util.Map; import java.util.Set; import static org.junit.Assert.assertTrue; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import static org.keycloak.testsuite.auth.page.AuthRealm.ADMIN; import static org.keycloak.testsuite.auth.page.AuthRealm.MASTER; import static org.keycloak.testsuite.util.WaitUtils.pause; @@ -32,7 +30,6 @@ import static org.keycloak.testsuite.util.WaitUtils.pause; * * @author tkyjovsk */ -@AuthServerContainerExclude(AuthServer.REMOTE) public abstract class AbstractClusterTest extends AbstractKeycloakTest { // Keep the following constants in sync with arquillian diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/AbstractCrossDCTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/AbstractCrossDCTest.java index 0b4c19a3b30..28dd71fcd97 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/AbstractCrossDCTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/AbstractCrossDCTest.java @@ -21,7 +21,6 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.arquillian.AuthServerTestEnricher; import org.keycloak.testsuite.arquillian.ContainerInfo; import org.keycloak.testsuite.arquillian.LoadBalancerController; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.LoadBalancer; import java.util.ArrayList; @@ -34,7 +33,6 @@ import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.arquillian.CrossDCTestEnricher; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.arquillian.annotation.InitialDcState; import static org.keycloak.testsuite.arquillian.CrossDCTestEnricher.forAllBackendNodesStream; @@ -45,7 +43,6 @@ import static org.keycloak.testsuite.arquillian.CrossDCTestEnricher.forAllBacken * @author hmlnarik */ @InitialDcState -@AuthServerContainerExclude(AuthServer.REMOTE) public abstract class AbstractCrossDCTest extends AbstractTestRealmKeycloakTest { // Keep the following constants in sync with arquillian diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/docker/DockerClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/docker/DockerClientTest.java index 5ff09b7a4b3..e2199a2ec5d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/docker/DockerClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/docker/DockerClientTest.java @@ -26,12 +26,9 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.junit.Assume.assumeTrue; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_PORT; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import static org.keycloak.testsuite.util.WaitUtils.pause; -@AuthServerContainerExclude(AuthServer.REMOTE) public class DockerClientTest extends AbstractKeycloakTest { public static final String REALM_ID = "docker-test-realm"; public static final String CLIENT_ID = "docker-test-client"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/domainextension/CustomExtensionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/domainextension/CustomExtensionTest.java index e85f4c81f68..51ad5d9f7ed 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/domainextension/CustomExtensionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/domainextension/CustomExtensionTest.java @@ -24,7 +24,6 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.ProfileAssume; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.client.resources.TestExampleCompanyResource; import org.keycloak.testsuite.util.RealmBuilder; @@ -32,12 +31,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; - /** * @author Marek Posolda */ -@AuthServerContainerExclude(value = {AuthServer.REMOTE}) // This is testing custom SPI which is, in case of remote server, deployed on container as part of testsuite providers. // It looks like the problem is, that in the time of loading spis during keycloak deployment, the deployment of Testsuite providers // is not processed yet, hence the spi is not present yet, which results in nullpointer exception because service provided by the spi diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/AdminEventStoreProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/AdminEventStoreProviderTest.java index 9c2a8295ba5..0c5ee8dbdac 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/AdminEventStoreProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/AdminEventStoreProviderTest.java @@ -27,14 +27,11 @@ import org.keycloak.models.jpa.entities.RealmAttributes; import org.keycloak.representations.idm.AdminEventRepresentation; import org.keycloak.representations.idm.AuthDetailsRepresentation; import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; - import java.util.List; import java.util.Map; @@ -55,7 +52,6 @@ public class AdminEventStoreProviderTest extends AbstractEventsTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) // This looks like some database issue, test should get events which are newer or equal to requested time, however it gets only newer events from remote server public void query() { long oldest = System.currentTimeMillis() - 30000; long newest = System.currentTimeMillis() + 30000; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/EventStoreProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/EventStoreProviderTest.java index a39756f5a7c..73220903667 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/EventStoreProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/EventStoreProviderTest.java @@ -26,7 +26,6 @@ import org.keycloak.events.EventStoreProvider; import org.keycloak.events.EventType; import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -35,11 +34,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; - -import static org.keycloak.testsuite.events.AbstractEventsTest.REALM_NAME_1; -import static org.keycloak.testsuite.events.AbstractEventsTest.REALM_NAME_2; - /** * @author Stian Thorgersen * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. @@ -71,7 +65,7 @@ public class EventStoreProviderTest extends AbstractEventsTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) // This looks like some database issue, test should get events which are newer or equal to requested time, however it gets only newer events from remote server + // This looks like some database issue, test should get events which are newer or equal to requested time, however it gets only newer events from remote server public void query() { long oldest = System.currentTimeMillis() - 30000; long newest = System.currentTimeMillis() + 30000; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java index 7b5cd070d6d..bbec812adb7 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java @@ -40,7 +40,6 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.ProfileAssume; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.client.resources.TestingExportImportResource; import org.keycloak.testsuite.runonserver.RunHelpers; import org.keycloak.testsuite.util.UserBuilder; @@ -62,7 +61,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.junit.BeforeClass; /** @@ -71,7 +69,6 @@ import org.junit.BeforeClass; * @author Marek Posolda * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class ExportImportTest extends AbstractKeycloakTest { @BeforeClass diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosTest.java index a78fc7e7ebe..8e129f7d2a6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosTest.java @@ -69,8 +69,6 @@ import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.pages.AccountPasswordPage; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.util.KerberosRule; @@ -82,7 +80,6 @@ import org.junit.BeforeClass; * * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServer.REMOTE) public abstract class AbstractKerberosTest extends AbstractAuthTest { protected KeycloakSPNegoSchemeFactory spnegoSchemeFactory; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/AbstractLDAPTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/AbstractLDAPTest.java index 7369e318179..6075d975a51 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/AbstractLDAPTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/AbstractLDAPTest.java @@ -29,8 +29,6 @@ import org.keycloak.storage.ldap.mappers.LDAPStorageMapper; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.ProfileAssume; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.pages.AccountPasswordPage; import org.keycloak.testsuite.pages.AccountUpdateProfilePage; import org.keycloak.testsuite.pages.AppPage; @@ -41,11 +39,9 @@ import org.keycloak.testsuite.pages.RegisterPage; import org.keycloak.testsuite.util.LDAPRule; import org.junit.BeforeClass; - /** * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServer.REMOTE) public abstract class AbstractLDAPTest extends AbstractTestRealmKeycloakTest { static final String TEST_REALM_NAME = "test"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserLoginTest.java index 34f0c0cf1e9..af1c9064b0d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserLoginTest.java @@ -36,7 +36,6 @@ import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.storage.ldap.idm.model.LDAPObject; import org.keycloak.testsuite.ProfileAssume; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.EnableVault; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; @@ -54,7 +53,6 @@ import java.util.List; import java.util.Objects; import org.junit.Assume; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; import org.keycloak.testsuite.util.OAuthClient; /** @@ -241,8 +239,6 @@ public class LDAPUserLoginTest extends AbstractLDAPTest { // Test variant: Bind credential set to vault @Test @LDAPConnectionParameters(bindCredential=LDAPConnectionParameters.BindCredential.VAULT, bindType=LDAPConnectionParameters.BindType.SIMPLE, encryption=LDAPConnectionParameters.Encryption.NONE) - @AuthServerContainerExclude(value = REMOTE, details = - "java.io.NotSerializableException: com.sun.jndi.ldap.LdapCtx") public void loginLDAPUserCredentialVaultAuthenticationSimpleEncryptionNone() { verifyConnectionUrlProtocolPrefix("ldap://"); runLDAPLoginTest(); @@ -261,8 +257,6 @@ public class LDAPUserLoginTest extends AbstractLDAPTest { // Test variant: Bind credential set to vault @Test @LDAPConnectionParameters(bindCredential=LDAPConnectionParameters.BindCredential.VAULT, bindType=LDAPConnectionParameters.BindType.SIMPLE, encryption=LDAPConnectionParameters.Encryption.SSL) - @AuthServerContainerExclude(value = REMOTE, details = - "java.io.NotSerializableException: com.sun.jndi.ldap.LdapCtx") public void loginLDAPUserCredentialVaultAuthenticationSimpleEncryptionSSL() { verifyConnectionUrlProtocolPrefix("ldaps://"); runLDAPLoginTest(); @@ -281,8 +275,6 @@ public class LDAPUserLoginTest extends AbstractLDAPTest { // Test variant: Bind credential set to vault @Test @LDAPConnectionParameters(bindCredential=LDAPConnectionParameters.BindCredential.VAULT, bindType=LDAPConnectionParameters.BindType.SIMPLE, encryption=LDAPConnectionParameters.Encryption.STARTTLS) - @AuthServerContainerExclude(value = REMOTE, details = - "java.io.NotSerializableException: com.sun.jndi.ldap.LdapCtx") public void loginLDAPUserCredentialVaultAuthenticationSimpleEncryptionStartTLS() { verifyConnectionUrlProtocolPrefix("ldap://"); runLDAPLoginTest(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPVaultCredentialsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPVaultCredentialsTest.java index 87b9c4be194..7f89e471e65 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPVaultCredentialsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPVaultCredentialsTest.java @@ -1,7 +1,6 @@ package org.keycloak.testsuite.federation.ldap; import org.junit.ClassRule; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.EnableVault; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestConfiguration; @@ -9,13 +8,11 @@ import org.keycloak.testsuite.util.LDAPTestConfiguration; import java.util.Map; import static org.keycloak.models.LDAPConstants.BIND_CREDENTIAL; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; /** * @author mhajas */ @EnableVault -@AuthServerContainerExclude(value = REMOTE, details = "java.io.NotSerializableException: com.sun.jndi.ldap.LdapCtx") public class LDAPVaultCredentialsTest extends LDAPSyncTest { private static final String VAULT_EXPRESSION = "${vault.ldap_bindCredential}"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BackwardsCompatibilityUserStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BackwardsCompatibilityUserStorageTest.java index 668f883e979..76598f67e2d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BackwardsCompatibilityUserStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BackwardsCompatibilityUserStorageTest.java @@ -46,7 +46,6 @@ import org.keycloak.testsuite.AbstractAuthTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.federation.BackwardsCompatibilityUserStorageFactory; import org.keycloak.testsuite.pages.AccountTotpPage; @@ -64,7 +63,6 @@ import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWith; * * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServerContainerExclude.AuthServer.REMOTE) @DisableFeature(value = Profile.Feature.ACCOUNT2, skipRestart = true) // TODO remove this (KEYCLOAK-16228) public class BackwardsCompatibilityUserStorageTest extends AbstractAuthTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BrokenUserStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BrokenUserStorageTest.java index 73189a95ca0..8fdf86ab812 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BrokenUserStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BrokenUserStorageTest.java @@ -32,21 +32,17 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.UserStorageProviderModel; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginPage; import java.util.List; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; - /** * KEYCLOAK-3903 and KEYCLOAK-3620 * * @author Bill Burke * @version $Revision: 1 $ */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class BrokenUserStorageTest extends AbstractTestRealmKeycloakTest { @ArquillianResource diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ClientStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ClientStorageTest.java index fe1d59f3d7b..300a95d3078 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ClientStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ClientStorageTest.java @@ -46,7 +46,6 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.federation.HardcodedClientStorageProviderFactory; import org.keycloak.testsuite.pages.AppPage; @@ -79,7 +78,6 @@ import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.AdminClientUtil; import org.junit.BeforeClass; @@ -88,7 +86,6 @@ import org.junit.BeforeClass; * * @author Bill Burke */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class ClientStorageTest extends AbstractTestRealmKeycloakTest { @Rule public AssertEvents events = new AssertEvents(this); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ComponentExportImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ComponentExportImportTest.java index 63288090e3e..13fd9eb8235 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ComponentExportImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ComponentExportImportTest.java @@ -15,8 +15,6 @@ import org.keycloak.storage.UserStorageProvider; import org.keycloak.testsuite.AbstractAuthTest; import org.keycloak.testsuite.admin.ApiUtil; - -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.testsuite.federation.UserMapStorageFactory; import org.keycloak.testsuite.util.RealmBuilder; @@ -29,13 +27,11 @@ import java.util.Set; import static org.junit.Assert.fail; import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * * @author tkyjovsk */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class ComponentExportImportTest extends AbstractAuthTest { private static final String REALM_NAME = "exported-component"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/FederatedStorageExportImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/FederatedStorageExportImportTest.java index 7ec595e0274..e4b54d74b9a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/FederatedStorageExportImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/FederatedStorageExportImportTest.java @@ -38,7 +38,6 @@ import org.keycloak.models.credential.PasswordCredentialModel; import org.keycloak.services.managers.RealmManager; import org.keycloak.storage.UserStorageUtil; import org.keycloak.testsuite.AbstractAuthTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import javax.ws.rs.NotFoundException; import java.io.File; @@ -46,13 +45,10 @@ import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; - /** * @author Bill Burke * @version $Revision: 1 $ */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class FederatedStorageExportImportTest extends AbstractAuthTest { private static final String REALM_NAME = "exported"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/GroupStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/GroupStorageTest.java index d3dc7107b36..dacf44fa332 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/GroupStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/GroupStorageTest.java @@ -31,8 +31,6 @@ import org.keycloak.storage.group.GroupStorageProvider; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.federation.HardcodedGroupStorageProviderFactory; @@ -48,7 +46,6 @@ import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; -@AuthServerContainerExclude(AuthServer.REMOTE) public class GroupStorageTest extends AbstractTestRealmKeycloakTest { private String providerId; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/RoleStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/RoleStorageTest.java index 70c6d8bcb4c..b0da8e65600 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/RoleStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/RoleStorageTest.java @@ -40,13 +40,10 @@ import org.keycloak.storage.role.RoleStorageProvider; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.federation.HardcodedRoleStorageProviderFactory; import org.junit.BeforeClass; -@AuthServerContainerExclude(AuthServer.REMOTE) public class RoleStorageTest extends AbstractTestRealmKeycloakTest { private String providerId; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageDirtyDeletionUnsyncedImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageDirtyDeletionUnsyncedImportTest.java index d999bf1e9c6..d77e7ee1625 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageDirtyDeletionUnsyncedImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageDirtyDeletionUnsyncedImportTest.java @@ -2,15 +2,11 @@ package org.keycloak.testsuite.federation.storage; import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.storage.UserStorageProvider.EditMode; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; - -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * * @author hmlnarik */ -@AuthServerContainerExclude(AuthServer.REMOTE) public final class UserStorageDirtyDeletionUnsyncedImportTest extends AbstractUserStorageDirtyDeletionTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageDirtyDeletionUnsyncedNoImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageDirtyDeletionUnsyncedNoImportTest.java index db9d32f9457..280fd2b0f87 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageDirtyDeletionUnsyncedNoImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageDirtyDeletionUnsyncedNoImportTest.java @@ -2,15 +2,11 @@ package org.keycloak.testsuite.federation.storage; import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.storage.UserStorageProvider.EditMode; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; - -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * * @author hmlnarik */ -@AuthServerContainerExclude(AuthServer.REMOTE) public final class UserStorageDirtyDeletionUnsyncedNoImportTest extends AbstractUserStorageDirtyDeletionTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageFailureTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageFailureTest.java index 837aab30365..401eb53ab0b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageFailureTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageFailureTest.java @@ -48,7 +48,6 @@ import org.keycloak.storage.UserStorageProviderModel; import org.keycloak.storage.UserStorageUtil; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.federation.FailableHardcodedStorageProvider; import org.keycloak.testsuite.federation.FailableHardcodedStorageProviderFactory; @@ -60,20 +59,12 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import java.util.Objects; import java.util.stream.Stream; -import org.junit.Assume; -import org.keycloak.models.RealmProvider; - -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; -import org.keycloak.testsuite.util.ContainerAssume; - /** * @author Bill Burke * @version $Revision: 1 $ */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class UserStorageFailureTest extends AbstractTestRealmKeycloakTest { private static boolean initialized = false; @@ -161,9 +152,6 @@ public class UserStorageFailureTest extends AbstractTestRealmKeycloakTest { */ @Test public void testKeycloak5350() throws Exception { - - ContainerAssume.assumeNotAuthServerRemote(); - Assume.assumeTrue("User cache disabled.", isUserCacheEnabled()); oauth.scope(OAuth2Constants.OFFLINE_ACCESS); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java index 11e201c9ce3..fa0e807ecd0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java @@ -39,7 +39,6 @@ import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.UserStorageUtil; import org.keycloak.testsuite.AbstractAuthTest; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import org.keycloak.testsuite.federation.UserMapStorage; @@ -88,7 +87,6 @@ import static org.keycloak.storage.UserStorageProviderModel.EVICTION_MINUTE; import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; import static org.keycloak.storage.UserStorageProviderModel.MAX_LIFESPAN; import static org.keycloak.testsuite.actions.RequiredActionEmailVerificationTest.getPasswordResetEmailLink; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlDoesntStartWith; import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWith; @@ -97,7 +95,6 @@ import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWith; * * @author tkyjovsk */ -@AuthServerContainerExclude(AuthServer.REMOTE) @DisableFeature(value = Profile.Feature.ACCOUNT2, skipRestart = true) // TODO remove this (KEYCLOAK-16228) public class UserStorageTest extends AbstractAuthTest { @@ -345,7 +342,6 @@ public class UserStorageTest extends AbstractAuthTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void testRegisterWithRequiredEmail() throws Exception { try (AutoCloseable c = new RealmAttributeUpdater(testRealmResource()) .updateWith(r -> { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/sync/SyncFederationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/sync/SyncFederationTest.java index 917ac735f0e..6b43357fb47 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/sync/SyncFederationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/sync/SyncFederationTest.java @@ -30,7 +30,6 @@ import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.UserStorageProviderModel; import org.keycloak.storage.user.SynchronizationResult; import org.keycloak.testsuite.AbstractAuthTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.federation.DummyUserFederationProviderFactory; import org.keycloak.timer.TimerProvider; @@ -42,15 +41,12 @@ import java.util.concurrent.TimeUnit; import org.junit.Assume; import org.junit.Before; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; - /** * Test with Dummy providers * * @author Marek Posolda */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) -@AuthServerContainerExclude(AuthServer.REMOTE) public class SyncFederationTest extends AbstractAuthTest { private static final Logger log = Logger.getLogger(SyncFederationTest.class); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AllowDenyAuthenticatorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AllowDenyAuthenticatorTest.java index 646f2db996e..706d7ce073c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AllowDenyAuthenticatorTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AllowDenyAuthenticatorTest.java @@ -14,7 +14,6 @@ import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.authentication.authenticators.conditional.ConditionalUserAttributeValueFactory; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginUsernameOnlyPage; @@ -26,13 +25,11 @@ import java.util.Map; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; import static org.keycloak.testsuite.forms.BrowserFlowTest.revertFlows; /** * @author Martin Bartos */ -@AuthServerContainerExclude(REMOTE) public class AllowDenyAuthenticatorTest extends AbstractTestRealmKeycloakTest { @Page diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AltSubflowForCredentialResetTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AltSubflowForCredentialResetTest.java index 33a7cfe0057..b2fd61aac09 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AltSubflowForCredentialResetTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AltSubflowForCredentialResetTest.java @@ -33,7 +33,6 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.LoginPasswordResetPage; @@ -46,14 +45,12 @@ import java.util.List; import static org.junit.Assert.assertEquals; import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; /** * Tests setting up alternative reset credentials sub flow to prevent signing in after clicking "forgot password" * * @author Denis Richtárik */ -@AuthServerContainerExclude(REMOTE) public class AltSubflowForCredentialResetTest extends AbstractTestRealmKeycloakTest { private String userID; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticationFlowCallbackProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticationFlowCallbackProviderTest.java index 14b32607d12..b6b67358565 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticationFlowCallbackProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticationFlowCallbackProviderTest.java @@ -28,7 +28,6 @@ import org.keycloak.authentication.authenticators.conditional.ConditionalLoaAuth import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.authentication.CustomAuthenticationFlowCallback; import org.keycloak.testsuite.authentication.CustomAuthenticationFlowCallbackFactory; import org.keycloak.testsuite.pages.ErrorPage; @@ -37,12 +36,10 @@ import org.keycloak.testsuite.util.FlowUtil; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; /** * @author Martin Bartos */ -@AuthServerContainerExclude(REMOTE) public class AuthenticationFlowCallbackProviderTest extends AbstractTestRealmKeycloakTest { protected static final String DEFAULT_FLOW = "newCallbackFlow"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticatorSubflowsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticatorSubflowsTest.java index d0af22278f8..f874fa9a408 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticatorSubflowsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticatorSubflowsTest.java @@ -31,8 +31,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.authentication.ExpectedParamAuthenticator; import org.keycloak.testsuite.authentication.ExpectedParamAuthenticatorFactory; import org.keycloak.testsuite.authentication.PushButtonAuthenticatorFactory; @@ -48,7 +46,6 @@ import java.util.Map; /** * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class AuthenticatorSubflowsTest extends AbstractTestRealmKeycloakTest { @Rule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticatorSubflowsTest2.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticatorSubflowsTest2.java index b1c1bf6fb81..005a216ba32 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticatorSubflowsTest2.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticatorSubflowsTest2.java @@ -31,7 +31,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.authentication.ExpectedParamAuthenticator; import org.keycloak.testsuite.authentication.ExpectedParamAuthenticatorFactory; import org.keycloak.testsuite.authentication.PushButtonAuthenticatorFactory; @@ -43,12 +42,9 @@ import org.openqa.selenium.By; import java.util.HashMap; import java.util.Map; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; - /** * @author Tomohiro Nagai */ -@AuthServerContainerExclude(REMOTE) public class AuthenticatorSubflowsTest2 extends AbstractTestRealmKeycloakTest { @Rule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserButtonsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserButtonsTest.java index f9e03315fb5..8f6169f26eb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserButtonsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserButtonsTest.java @@ -32,8 +32,6 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.InfoPage; @@ -315,7 +313,6 @@ public class BrowserButtonsTest extends AbstractTestRealmKeycloakTest { @Test - @AuthServerContainerExclude(AuthServer.REMOTE) // GreenMailRule is not working atm public void backButtonInResetPasswordFlow() throws Exception { // Click on "forgot password" and type username loginPage.open(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserFlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserFlowTest.java index 3078bb1eeec..76e00558204 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserFlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserFlowTest.java @@ -15,8 +15,8 @@ import org.keycloak.authentication.authenticators.browser.UsernameFormFactory; import org.keycloak.authentication.authenticators.browser.UsernamePasswordFormFactory; import org.keycloak.authentication.authenticators.browser.WebAuthnAuthenticatorFactory; import org.keycloak.authentication.authenticators.conditional.ConditionalRoleAuthenticatorFactory; -import org.keycloak.authentication.authenticators.conditional.ConditionalUserConfiguredAuthenticatorFactory; import org.keycloak.authentication.authenticators.conditional.ConditionalUserAttributeValueFactory; +import org.keycloak.authentication.authenticators.conditional.ConditionalUserConfiguredAuthenticatorFactory; import org.keycloak.authentication.requiredactions.WebAuthnRegisterFactory; import org.keycloak.common.Profile; import org.keycloak.events.Details; @@ -37,10 +37,9 @@ import org.keycloak.testsuite.ActionURIUtils; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.admin.authentication.AbstractAuthenticationTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; -import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.auth.page.login.OneTimeCode; +import org.keycloak.testsuite.authentication.SetUserAttributeAuthenticatorFactory; import org.keycloak.testsuite.broker.SocialLoginTest; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginPage; @@ -51,7 +50,6 @@ import org.keycloak.testsuite.util.FlowUtil; import org.keycloak.testsuite.util.OAuthClient; import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.testsuite.util.URLUtils; -import org.keycloak.testsuite.authentication.SetUserAttributeAuthenticatorFactory; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; @@ -64,7 +62,6 @@ import java.util.function.Consumer; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; import static org.keycloak.testsuite.broker.SocialLoginTest.Provider.GITHUB; import static org.keycloak.testsuite.broker.SocialLoginTest.Provider.GITLAB; import static org.keycloak.testsuite.broker.SocialLoginTest.Provider.GOOGLE; @@ -256,7 +253,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { // A conditional flow without conditional authenticator should automatically be disabled @Test - @AuthServerContainerExclude(REMOTE) + public void testFlowDisabledWhenConditionalAuthenticatorIsMissing() { try { configureBrowserFlowWithConditionalSubFlowHavingConditionalAuthenticator("browser - non missing conditional authenticator", true); @@ -292,7 +289,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { // A conditional flow with disabled conditional authenticator should automatically be disabled @Test - @AuthServerContainerExclude(REMOTE) + public void testFlowDisabledWhenConditionalAuthenticatorIsDisabled() { try { configureBrowserFlowWithConditionalSubFlowHavingDisabledConditionalAuthenticator("browser - disabled conditional authenticator"); @@ -325,7 +322,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { // Configure a conditional authenticator in a non-conditional sub-flow // In such case, the flow is evaluated and the conditional authenticator is considered as disabled @Test - @AuthServerContainerExclude(REMOTE) + public void testConditionalAuthenticatorInNonConditionalFlow() { try { configureBrowserFlowWithConditionalAuthenticatorInNonConditionalFlow(); @@ -368,7 +365,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { // user-with-two-configured-otp has the "user" role and should be asked for an OTP code // user-with-one-configured-otp does not have the role. He should not be asked for an OTP code @Test - @AuthServerContainerExclude(REMOTE) + public void testConditionalRoleAuthenticator() { String requiredRole = "user"; // A browser flow is configured with an OTPForm for users having the role "user" @@ -396,7 +393,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { // user-with-two-configured-otp has the "composite-realm-role-1" role and should be asked for an OTP code // user-with-one-configured-otp does not have the role. He should not be asked for an OTP code @Test - @AuthServerContainerExclude(REMOTE) + public void testConditionalRoleAuthenticatorWithRealmRoleIncludedInCompositeRealmRole() { // Create composite-realm-role-1 @@ -443,7 +440,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { // user-with-two-configured-otp has the "composite-client-role-1" role and should be asked for an OTP code // user-with-one-configured-otp does not have the role. He should not be asked for an OTP code @Test - @AuthServerContainerExclude(REMOTE) + public void testConditionalRoleAuthenticatorWithClientRoleIncludedInCompositeClientRole() { String clientName = "test-app"; @@ -525,7 +522,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { // Configure a conditional authenticator with a condition which change while the flow evaluation // In such case, all the required authenticator inside the subflow should be evaluated even if the condition has changed @Test - @AuthServerContainerExclude(REMOTE) + public void testConditionalAuthenticatorWithConditionalSubFlowWithChangingConditionWhileFlowEvaluation() { try { configureBrowserFlowWithConditionalSubFlowWithChangingConditionWhileFlowEvaluation(); @@ -546,7 +543,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { } @Test - @AuthServerContainerExclude(REMOTE) + @DisableFeature(value = Profile.Feature.ACCOUNT2, skipRestart = true) // TODO remove this (KEYCLOAK-16228) public void testAlternativeNonInteractiveExecutorInSubflow() { final String newFlowAlias = "browser - alternative non-interactive executor"; @@ -599,7 +596,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { } @Test - @AuthServerContainerExclude(REMOTE) + public void testSwitchExecutionNotAllowedWithRequiredPasswordAndAlternativeOTP() { String newFlowAlias = "browser - copy 1"; configureBrowserFlowWithRequiredPasswordFormAndAlternativeOTP(newFlowAlias); @@ -635,7 +632,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { @Test - @AuthServerContainerExclude(REMOTE) + public void testSocialProvidersPresentOnLoginUsernameOnlyPageIfConfigured() { String testRealm = "test"; // Test setup - Configure the testing Keycloak instance with UsernameForm & PasswordForm (both REQUIRED) and OTPFormAuthenticator (ALTERNATIVE) @@ -692,7 +689,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { } @Test - @AuthServerContainerExclude(REMOTE) + public void testConditionalFlowWithConditionalAuthenticatorEvaluatingToFalseActsAsDisabled(){ String newFlowAlias = "browser - copy 1"; configureBrowserFlowWithConditionalFlowWithOTP(newFlowAlias); @@ -711,7 +708,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { } @Test - @AuthServerContainerExclude(REMOTE) + public void testConditionalFlowWithConditionalAuthenticatorEvaluatingToTrueActsAsRequired(){ String newFlowAlias = "browser - copy 1"; configureBrowserFlowWithConditionalFlowWithOTP(newFlowAlias); @@ -773,7 +770,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { * In this test the user is expected to have to log in with OTP */ @Test - @AuthServerContainerExclude(REMOTE) + public void testConditionalFlowWithMultipleConditionalAuthenticatorsWithUserWithRoleAndOTP() { String newFlowAlias = "browser - copy 1"; configureBrowserFlowWithConditionalFlowWithMultipleConditionalAuthenticators(newFlowAlias); @@ -804,7 +801,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { * In this test, the user is expected to have to login with username and password only, as the conditional branch evaluates to false, and is therefore DISABLED */ @Test - @AuthServerContainerExclude(REMOTE) + public void testConditionalFlowWithMultipleConditionalAuthenticatorsWithUserWithRoleButNotOTP() { String newFlowAlias = "browser - copy 1"; configureBrowserFlowWithConditionalFlowWithMultipleConditionalAuthenticators(newFlowAlias); @@ -870,7 +867,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { * and will instead raise an credential setup required error. */ @Test - @AuthServerContainerExclude(REMOTE) + public void testLoginWithWithNoOTPCredentialAndNoRequiredActionProviderRegistered(){ String newFlowAlias = "browser - copy 1"; configureBrowserFlowWithRequiredOTP(newFlowAlias); @@ -897,7 +894,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { * and will instead raise an credential setup required error. */ @Test - @AuthServerContainerExclude(REMOTE) + public void testLoginWithWithNoOTPCredentialAndRequiredActionProviderDisabled(){ String newFlowAlias = "browser - copy 1"; configureBrowserFlowWithRequiredOTP(newFlowAlias); @@ -922,7 +919,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { * has its requiredActionProvider enabled, than it will login and show the otpSetup page. */ @Test - @AuthServerContainerExclude(REMOTE) + public void testLoginWithWithNoOTPCredential(){ String newFlowAlias = "browser - copy 1"; configureBrowserFlowWithRequiredOTP(newFlowAlias);; @@ -965,7 +962,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { * and will instead raise an credential setup required error. */ @Test - @AuthServerContainerExclude(REMOTE) + public void testLoginWithWithNoWebAuthnCredentialAndRequiredActionProviderDisabled(){ String newFlowAlias = "browser - copy 1"; configureBrowserFlowWithRequiredWebAuthn(newFlowAlias); @@ -988,7 +985,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { * has its requiredActionProvider enabled, then it will login and show the WebAuthn registration page. */ @Test - @AuthServerContainerExclude(REMOTE) + public void testLoginWithWithNoWebAuthnCredential(){ String newFlowAlias = "browser - copy 1"; configureBrowserFlowWithRequiredWebAuthn(newFlowAlias); @@ -1031,7 +1028,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { * then the selection mechanism will see that there's no viable alternative, and move on to the next execution (in this case the flow) */ @Test - @AuthServerContainerExclude(REMOTE) + public void testLoginWithWithNoOTPCredentialAndAlternativeActionProvider(){ String newFlowAlias = "browser - copy 1"; configureBrowserFlowWithAlternativeOTPAndPassword(newFlowAlias); @@ -1077,7 +1074,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { * This test checks the error messages, when the credentials are invalid and UsernameForm and PasswordForm are separated. */ @Test - @AuthServerContainerExclude(REMOTE) + public void testLoginMultiFactorWithWrongCredentialsMessage() { UserRepresentation user = testRealm().users().search("test-user@localhost").get(0); Assert.assertNotNull(user); @@ -1159,7 +1156,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { * then it will not try to create the required action, and will instead move to the next alternative */ @Test - @AuthServerContainerExclude(REMOTE) + public void testLoginWithWithNoWebAuthnCredentialAndAlternativeActionProvider(){ String newFlowAlias = "browser - copy 1"; configureBrowserFlowWithAlternativeWebAuthnAndPassword(newFlowAlias); @@ -1186,7 +1183,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest { * After login with password and fulfill the conditional subflow2, the subflow1 should be considered successful as well and the OTP authentication should not be needed */ @Test - @AuthServerContainerExclude(REMOTE) + public void testLoginWithAlternativeOTPAndConditionalPassword(){ String newFlowAlias = "browser - copy 2"; configureBrowserFlowWithAlternativeOTPAndConditionalPassword(newFlowAlias); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java index 29aa4b565b8..e6e9c4f6271 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java @@ -36,8 +36,6 @@ import org.keycloak.services.managers.BruteForceProtector; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.AssertEvents.ExpectedEvent; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.pages.LoginPage; @@ -62,13 +60,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; /** * @author Stian Thorgersen * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class BruteForceTest extends AbstractTestRealmKeycloakTest { private static String userId; @@ -568,7 +564,6 @@ public class BruteForceTest extends AbstractTestRealmKeycloakTest { } @Test - @AuthServerContainerExclude(REMOTE) // GreenMailRule is not working atm public void testResetPassword() throws Exception { String userId = adminClient.realm("test").users().search("user2", null, null, null, 0, 1).get(0).getId(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/FlowOverrideTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/FlowOverrideTest.java index 49f81a8300d..99856505e4b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/FlowOverrideTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/FlowOverrideTest.java @@ -41,7 +41,6 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; import org.keycloak.testsuite.authentication.PushButtonAuthenticatorFactory; @@ -61,7 +60,6 @@ import javax.ws.rs.core.Response; import java.util.List; import static org.junit.Assert.assertEquals; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.AdminClientUtil; /** @@ -69,7 +67,6 @@ import org.keycloak.testsuite.util.AdminClientUtil; * * @author Bill Burke */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class FlowOverrideTest extends AbstractTestRealmKeycloakTest { public static final String TEST_APP_DIRECT_OVERRIDE = "test-app-direct-override"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LevelOfAssuranceFlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LevelOfAssuranceFlowTest.java index 7e509b25c0b..3390363f75a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LevelOfAssuranceFlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LevelOfAssuranceFlowTest.java @@ -27,7 +27,6 @@ import javax.ws.rs.BadRequestException; import javax.ws.rs.core.UriBuilder; import org.jboss.arquillian.graphene.page.Page; import org.junit.After; -import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; @@ -55,7 +54,6 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.authentication.PushButtonAuthenticatorFactory; import org.keycloak.testsuite.client.KeycloakTestingClient; @@ -66,21 +64,17 @@ import org.keycloak.testsuite.pages.PushTheButtonPage; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; import org.keycloak.testsuite.util.FlowUtil; import org.keycloak.testsuite.util.OAuthClient; -import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.RealmRepUtil; import org.keycloak.testsuite.util.UserBuilder; -import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.util.JsonSerialization; import static org.hamcrest.CoreMatchers.is; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; /** * Tests for Level Of Assurance conditions in authentication flow. * * @author Sebastian Zoescher */ -@AuthServerContainerExclude(REMOTE) public class LevelOfAssuranceFlowTest extends AbstractTestRealmKeycloakTest { @Rule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTest.java index 59dd78ee22e..8fb5258f135 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTest.java @@ -46,7 +46,6 @@ import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.console.page.AdminConsole; @@ -219,7 +218,6 @@ public class LoginTest extends AbstractTestRealmKeycloakTest { client.close(); } - @AuthServerContainerExclude(value = {AuthServerContainerExclude.AuthServer.REMOTE}, details = "Remote testsuite: max-detail-length is set to zero in standalone.xml, proposed fix - KEYCLOAK-17659") @Test public void loginWithLongRedirectUri() throws Exception { try (AutoCloseable c = new RealmAttributeUpdater(adminClient.realm("test")) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/MultiFactorAuthenticationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/MultiFactorAuthenticationTest.java index d1450603e6b..2381f7d3349 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/MultiFactorAuthenticationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/MultiFactorAuthenticationTest.java @@ -20,7 +20,6 @@ package org.keycloak.testsuite.forms; import java.util.Arrays; import java.util.List; -import java.util.function.Consumer; import org.jboss.arquillian.drone.api.annotation.Drone; import org.jboss.arquillian.graphene.page.Page; @@ -33,15 +32,12 @@ import org.keycloak.authentication.authenticators.browser.OTPFormAuthenticatorFa import org.keycloak.authentication.authenticators.browser.PasswordFormFactory; import org.keycloak.authentication.authenticators.browser.UsernameFormFactory; import org.keycloak.authentication.authenticators.browser.WebAuthnAuthenticatorFactory; -import org.keycloak.common.Profile; import org.keycloak.events.Details; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.utils.TimeBasedOTP; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginPage; @@ -54,7 +50,6 @@ import org.keycloak.testsuite.util.OAuthClient; import org.openqa.selenium.WebDriver; import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; /** * Test various scenarios for multi-factor login. Test that "Try another way" link works as expected @@ -62,7 +57,6 @@ import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerEx * * @author Marek Posolda */ -@AuthServerContainerExclude(REMOTE) public class MultiFactorAuthenticationTest extends AbstractTestRealmKeycloakTest { @ArquillianResource diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/PasswordHashingTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/PasswordHashingTest.java index 37b035f82cb..312a9a5d7c8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/PasswordHashingTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/PasswordHashingTest.java @@ -34,7 +34,6 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.pages.AccountUpdateProfilePage; import org.keycloak.testsuite.pages.LoginPage; @@ -48,12 +47,10 @@ import java.security.spec.KeySpec; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @author Stian Thorgersen */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class PasswordHashingTest extends AbstractTestRealmKeycloakTest { @Page diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ReAuthenticationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ReAuthenticationTest.java index 6f2e0372502..0a62fecb629 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ReAuthenticationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ReAuthenticationTest.java @@ -21,32 +21,23 @@ package org.keycloak.testsuite.forms; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.function.Consumer; import org.hamcrest.Matcher; import org.hamcrest.Matchers; import org.jboss.arquillian.drone.api.annotation.Drone; import org.jboss.arquillian.graphene.page.Page; import org.jboss.arquillian.test.api.ArquillianResource; -import org.junit.Rule; import org.junit.Test; import org.keycloak.admin.client.resource.UserResource; -import org.keycloak.authentication.authenticators.browser.OTPFormAuthenticatorFactory; import org.keycloak.authentication.authenticators.browser.PasswordFormFactory; import org.keycloak.authentication.authenticators.browser.UsernameFormFactory; -import org.keycloak.authentication.authenticators.conditional.ConditionalUserConfiguredAuthenticatorFactory; -import org.keycloak.events.Details; import org.keycloak.models.AuthenticationExecutionModel; -import org.keycloak.representations.IDToken; -import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.representations.idm.FederatedIdentityRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.auth.page.login.OneTimeCode; import org.keycloak.testsuite.broker.SocialLoginTest; import org.keycloak.testsuite.pages.AppPage; @@ -59,15 +50,11 @@ import org.keycloak.testsuite.util.FederatedIdentityBuilder; import org.keycloak.testsuite.util.FlowUtil; import org.keycloak.testsuite.util.OAuthClient; import org.openqa.selenium.By; -import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; import static org.hamcrest.CoreMatchers.is; import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; import static org.keycloak.testsuite.broker.SocialLoginTest.Provider.GITHUB; -import static org.keycloak.testsuite.broker.SocialLoginTest.Provider.GITLAB; import static org.keycloak.testsuite.broker.SocialLoginTest.Provider.GOOGLE; /** @@ -225,7 +212,6 @@ public class ReAuthenticationTest extends AbstractTestRealmKeycloakTest { // Re-authentication with user form separate to the password form. The username form would be skipped @Test - @AuthServerContainerExclude(REMOTE) public void identityFirstFormReauthentication() { // Set identity-first as realm flow setupIdentityFirstFlow(); @@ -263,7 +249,6 @@ public class ReAuthenticationTest extends AbstractTestRealmKeycloakTest { // Re-authentication with user form separate to the password form. The username form is shown due the user linked with "github" @Test - @AuthServerContainerExclude(REMOTE) public void identityFirstFormReauthenticationWithGithubLink() { // Set identity-first as realm flow setupIdentityFirstFlow(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterTest.java index 4ec8b08d0d9..619e9b6df98 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterTest.java @@ -37,7 +37,6 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.pages.AccountUpdateProfilePage; import org.keycloak.testsuite.pages.AppPage; @@ -62,7 +61,6 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.jgroups.util.Util.assertTrue; import static org.junit.Assert.assertEquals; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @author Stian Thorgersen @@ -381,7 +379,7 @@ public class RegisterTest extends AbstractTestRealmKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) // GreenMailRule is not working atm + // GreenMailRule is not working atm public void registerUserSuccessWithEmailVerification() throws Exception { try (RealmAttributeUpdater rau = setVerifyEmail(true).update()) { loginPage.open(); @@ -423,7 +421,7 @@ public class RegisterTest extends AbstractTestRealmKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) // GreenMailRule is not working atm + // GreenMailRule is not working atm public void registerUserSuccessWithEmailVerificationWithResend() throws Exception { try (RealmAttributeUpdater rau = setVerifyEmail(true).update()) { loginPage.open(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterWithUserProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterWithUserProfileTest.java index db3db111fee..d107b0d8aa7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterWithUserProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterWithUserProfileTest.java @@ -40,7 +40,6 @@ import org.keycloak.common.Profile; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.util.ClientScopeBuilder; @@ -52,7 +51,6 @@ import org.openqa.selenium.WebDriver; * @author Vlastimil Elias */ @EnableFeature(value = Profile.Feature.DECLARATIVE_USER_PROFILE) -@AuthServerContainerExclude(AuthServerContainerExclude.AuthServer.REMOTE) public class RegisterWithUserProfileTest extends RegisterTest { private static final String SCOPE_LAST_NAME = "lastName"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetCredentialsAlternativeFlowsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetCredentialsAlternativeFlowsTest.java index 44631e73444..a1e0859c9ae 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetCredentialsAlternativeFlowsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetCredentialsAlternativeFlowsTest.java @@ -37,7 +37,6 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.admin.authentication.AbstractAuthenticationTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.pages.AccountTotpPage; import org.keycloak.testsuite.pages.AppPage; @@ -68,7 +67,6 @@ import java.util.stream.Collectors; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; /** * Test for the various alternatives of reset-credentials flow or browser flow (non-default setup of the flows) @@ -76,7 +74,6 @@ import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerEx * @author Marek Posolda * @author Jan Lieskovsky */ -@AuthServerContainerExclude(REMOTE) public class ResetCredentialsAlternativeFlowsTest extends AbstractTestRealmKeycloakTest { private String userId; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java index d573547da84..046dd99698a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java @@ -38,7 +38,6 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.auth.page.account.AccountManagement; import org.keycloak.testsuite.federation.kerberos.AbstractKerberosTest; @@ -86,13 +85,10 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.junit.Assert.*; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; - /** * @author Stian Thorgersen * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class ResetPasswordTest extends AbstractTestRealmKeycloakTest { private String userId; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RestartCookieTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RestartCookieTest.java index 9f243deb6dd..17f75d25f3c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RestartCookieTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RestartCookieTest.java @@ -31,8 +31,6 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.pages.LoginPage; import org.openqa.selenium.Cookie; @@ -42,7 +40,6 @@ import java.io.IOException; /** * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class RestartCookieTest extends AbstractTestRealmKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/TransientSessionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/TransientSessionTest.java index 71990788b77..3e024310471 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/TransientSessionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/TransientSessionTest.java @@ -29,7 +29,6 @@ import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.util.FlowUtil; import org.keycloak.testsuite.util.OAuthClient; @@ -42,7 +41,6 @@ import static org.keycloak.models.AuthenticationExecutionModel.Requirement.REQUI * * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServerContainerExclude.AuthServer.REMOTE) public class TransientSessionTest extends AbstractTestRealmKeycloakTest { @Rule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/VerifyProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/VerifyProfileTest.java index 6145fab69c3..26401474eea 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/VerifyProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/VerifyProfileTest.java @@ -49,7 +49,6 @@ import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; @@ -67,7 +66,6 @@ import org.openqa.selenium.By; * @author Vlastimil Elias */ @EnableFeature(value = Profile.Feature.DECLARATIVE_USER_PROFILE) -@AuthServerContainerExclude(AuthServerContainerExclude.AuthServer.REMOTE) public class VerifyProfileTest extends AbstractTestRealmKeycloakTest { public static final String SCOPE_DEPARTMENT = "department"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/EmailTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/EmailTest.java index b6875875370..51a32b7a265 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/EmailTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/EmailTest.java @@ -33,8 +33,6 @@ import org.keycloak.models.UserModel; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.pages.InfoPage; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.LoginPasswordResetPage; @@ -48,7 +46,6 @@ import org.keycloak.testsuite.util.WaitUtils; * @author Michael Gerber * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class EmailTest extends AbstractI18NTest { @Rule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/jaas/LoginModulesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/jaas/LoginModulesTest.java index 0a473320b81..7cc360e748e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/jaas/LoginModulesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/jaas/LoginModulesTest.java @@ -59,14 +59,11 @@ import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.admin.ApiUtil; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.utils.io.IOUtil; /** * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class LoginModulesTest extends AbstractKeycloakTest { public static final URI DIRECT_GRANT_CONFIG; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/javascript/JavascriptAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/javascript/JavascriptAdapterTest.java index 2be9199be5b..b0dd89d0e3a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/javascript/JavascriptAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/javascript/JavascriptAdapterTest.java @@ -23,8 +23,6 @@ import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.SuiteContext; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.auth.page.account.Applications; import org.keycloak.testsuite.auth.page.login.OAuthGrant; @@ -68,7 +66,6 @@ import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement; /** * @author mhajas */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class JavascriptAdapterTest extends AbstractJavascriptTest { private String testAppUrl; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/GeneratedHmacKeyProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/GeneratedHmacKeyProviderTest.java index 372b3adb142..a43a51a94d8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/GeneratedHmacKeyProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/GeneratedHmacKeyProviderTest.java @@ -33,7 +33,6 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.runonserver.RunHelpers; @@ -45,12 +44,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; - /** * @author Stian Thorgersen */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class GeneratedHmacKeyProviderTest extends AbstractKeycloakTest { @Rule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/JavaKeystoreKeyProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/JavaKeystoreKeyProviderTest.java index fb9d876c0bb..e912e87cf1a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/JavaKeystoreKeyProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/JavaKeystoreKeyProviderTest.java @@ -33,7 +33,6 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginPage; @@ -45,7 +44,6 @@ import java.util.List; import static org.junit.Assert.*; import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @author Stian Thorgersen @@ -86,7 +84,6 @@ public class JavaKeystoreKeyProviderTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void create() throws Exception { long priority = System.currentTimeMillis(); @@ -122,7 +119,6 @@ public class JavaKeystoreKeyProviderTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void invalidKeystorePassword() throws Exception { ComponentRepresentation rep = createRep("valid", System.currentTimeMillis()); rep.getConfig().putSingle("keystore", "invalid"); @@ -132,7 +128,6 @@ public class JavaKeystoreKeyProviderTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void invalidKeyAlias() throws Exception { ComponentRepresentation rep = createRep("valid", System.currentTimeMillis()); rep.getConfig().putSingle("keyAlias", "invalid"); @@ -142,7 +137,6 @@ public class JavaKeystoreKeyProviderTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void invalidKeyPassword() throws Exception { ComponentRepresentation rep = createRep("valid", System.currentTimeMillis()); rep.getConfig().putSingle("keyPassword", "invalid"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/login/LoginTimeoutValidationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/login/LoginTimeoutValidationTest.java index 555a9655b6d..789fcf3e97c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/login/LoginTimeoutValidationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/login/LoginTimeoutValidationTest.java @@ -31,12 +31,8 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.services.managers.ClientSessionCode; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.ModelTest; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; - -@AuthServerContainerExclude(REMOTE) public class LoginTimeoutValidationTest extends AbstractTestRealmKeycloakTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport1301MigrationClientPoliciesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport1301MigrationClientPoliciesTest.java index 3537622b8e4..6016fc2a7a2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport1301MigrationClientPoliciesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport1301MigrationClientPoliciesTest.java @@ -28,8 +28,6 @@ import org.keycloak.representations.idm.ClientPoliciesRepresentation; import org.keycloak.representations.idm.ClientProfilesRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.testsuite.utils.io.IOUtil; import org.keycloak.util.JsonSerialization; @@ -38,7 +36,6 @@ import org.keycloak.util.JsonSerialization; * * @author Marek Posolda */ -@AuthServerContainerExclude(value = {AuthServerContainerExclude.AuthServer.REMOTE}) public class JsonFileImport1301MigrationClientPoliciesTest extends AbstractJsonFileImportMigrationTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport198MigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport198MigrationTest.java index a23b3326f02..a7711b5d6f1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport198MigrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport198MigrationTest.java @@ -19,7 +19,6 @@ package org.keycloak.testsuite.migration; import org.junit.Test; import org.keycloak.exportimport.util.ImportUtils; import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.utils.io.IOUtil; import org.keycloak.util.JsonSerialization; @@ -27,15 +26,12 @@ import java.io.IOException; import java.util.List; import java.util.Map; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; - /** * Tests that we can import json file from previous version. MigrationTest only tests DB. * * @author Bill Burke * @version $Revision: 1 $ */ -@AuthServerContainerExclude(value = {AuthServer.REMOTE}) public class JsonFileImport198MigrationTest extends AbstractJsonFileImportMigrationTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport255MigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport255MigrationTest.java index 2f0602ed463..8b774884b61 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport255MigrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport255MigrationTest.java @@ -19,7 +19,6 @@ package org.keycloak.testsuite.migration; import org.junit.Test; import org.keycloak.exportimport.util.ImportUtils; import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.utils.io.IOUtil; import org.keycloak.util.JsonSerialization; @@ -29,15 +28,12 @@ import java.util.Map; import org.keycloak.common.Profile; import org.keycloak.testsuite.ProfileAssume; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; - /** * Tests that we can import json file from previous version. MigrationTest only tests DB. * * @author Bill Burke * @version $Revision: 1 $ */ -@AuthServerContainerExclude(value = {AuthServer.REMOTE}) public class JsonFileImport255MigrationTest extends AbstractJsonFileImportMigrationTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport343MigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport343MigrationTest.java index 344bc54e338..40728b3af31 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport343MigrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport343MigrationTest.java @@ -20,7 +20,6 @@ import org.junit.Test; import org.keycloak.common.Profile; import org.keycloak.exportimport.util.ImportUtils; import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.utils.io.IOUtil; import org.keycloak.util.JsonSerialization; @@ -29,15 +28,12 @@ import java.util.List; import java.util.Map; import org.keycloak.testsuite.ProfileAssume; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; - /** * Tests that we can import json file from previous version. MigrationTest only tests DB. * * @author Bill Burke * @version $Revision: 1 $ */ -@AuthServerContainerExclude(value = {AuthServer.REMOTE}) public class JsonFileImport343MigrationTest extends AbstractJsonFileImportMigrationTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport483MigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport483MigrationTest.java index a5b6cf88724..a00779923ec 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport483MigrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport483MigrationTest.java @@ -27,13 +27,10 @@ import java.io.IOException; import java.util.List; import java.util.Map; import org.keycloak.testsuite.ProfileAssume; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * Tests that we can import json file from previous version. MigrationTest only tests DB. */ -@AuthServerContainerExclude(value = {AuthServer.REMOTE}) public class JsonFileImport483MigrationTest extends AbstractJsonFileImportMigrationTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport903MigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport903MigrationTest.java index f7fbb16ac44..322e16bf073 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport903MigrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport903MigrationTest.java @@ -25,13 +25,10 @@ import org.keycloak.util.JsonSerialization; import java.io.IOException; import java.util.List; import java.util.Map; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * Tests that we can import json file from previous version. MigrationTest only tests DB. */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class JsonFileImport903MigrationTest extends AbstractJsonFileImportMigrationTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/MigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/MigrationTest.java index 93bb58e3e76..68f3a11a86d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/MigrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/MigrationTest.java @@ -34,7 +34,6 @@ import static org.keycloak.testsuite.auth.page.AuthRealm.MASTER; /** * @author Vlastislav Ramik */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class MigrationTest extends AbstractMigrationTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/AuthenticationSessionProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/AuthenticationSessionProviderTest.java index 38a1a461052..db2d09fdbe7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/AuthenticationSessionProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/AuthenticationSessionProviderTest.java @@ -36,7 +36,6 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.CommonClientSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import java.util.concurrent.atomic.AtomicReference; @@ -48,12 +47,9 @@ import static org.junit.Assert.assertThat; import org.keycloak.models.Constants; import org.keycloak.testsuite.util.InfinispanTestTimeServiceRule; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; - /** * @author Marek Posolda */ -@AuthServerContainerExclude(REMOTE) public class AuthenticationSessionProviderTest extends AbstractTestRealmKeycloakTest { private static String realmId; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CacheTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CacheTest.java index 3bcd33f1c3d..bfbb556bbc2 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CacheTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CacheTest.java @@ -26,7 +26,6 @@ import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; import org.keycloak.models.cache.infinispan.ClientAdapter; import org.keycloak.models.cache.infinispan.RealmAdapter; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import java.util.Set; import java.util.UUID; @@ -38,13 +37,11 @@ import static org.junit.Assert.assertTrue; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @author Bill Burke * @version $Revision: 1 $ */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class CacheTest extends AbstractTestRealmKeycloakTest { private ClientModel testApp = null; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ClientModelTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ClientModelTest.java index 3e4699edb17..fd21b69dca1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ClientModelTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ClientModelTest.java @@ -32,23 +32,20 @@ import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @author Stian Thorgersen * @author Martin Bartos */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class ClientModelTest extends AbstractKeycloakTest { private ClientModel client; private String roleId; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CompositeRolesModelTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CompositeRolesModelTest.java index 08884cd7ecb..5190c326ffd 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CompositeRolesModelTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CompositeRolesModelTest.java @@ -29,7 +29,6 @@ import org.keycloak.models.UserModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import java.util.HashSet; @@ -38,13 +37,10 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; - /** * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class CompositeRolesModelTest extends AbstractTestRealmKeycloakTest { @Rule public ExpectedException expectedException = ExpectedException.none(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ConcurrentTransactionsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ConcurrentTransactionsTest.java index 1cfc0c294aa..2b738cd7e9b 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ConcurrentTransactionsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ConcurrentTransactionsTest.java @@ -30,7 +30,6 @@ import org.keycloak.models.UserModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import java.util.Arrays; @@ -42,12 +41,9 @@ import static org.hamcrest.Matchers.nullValue; import org.keycloak.models.Constants; import org.keycloak.models.RoleModel; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; - /** * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class ConcurrentTransactionsTest extends AbstractTestRealmKeycloakTest { private static final int LATCH_TIMEOUT_MS = 30000; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CredentialModelTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CredentialModelTest.java index a47aee2571b..b60f047bf7e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CredentialModelTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CredentialModelTest.java @@ -10,19 +10,15 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import java.util.List; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; - /** * @author Marek Posolda */ -@AuthServerContainerExclude(REMOTE) public class CredentialModelTest extends AbstractTestRealmKeycloakTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ImportTest.java index 8b035936e5d..16ac3f198a0 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ImportTest.java @@ -35,8 +35,6 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.ProfileAssume; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.runonserver.RunOnServerException; import org.keycloak.userprofile.UserProfileProvider; @@ -56,13 +54,11 @@ import java.util.stream.Collectors; import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson; - /** * @author Bill Burke * @version $Revision: 1 $ */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) -@AuthServerContainerExclude(AuthServer.REMOTE) public class ImportTest extends AbstractTestRealmKeycloakTest { @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/MultipleRealmsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/MultipleRealmsTest.java index eb27c54b11d..ab9f66ea2ad 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/MultipleRealmsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/MultipleRealmsTest.java @@ -29,18 +29,14 @@ import org.keycloak.models.UserModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import java.util.concurrent.atomic.AtomicReference; import org.keycloak.models.Constants; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; - /** * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class MultipleRealmsTest extends AbstractTestRealmKeycloakTest { public static void createObjects(KeycloakSession session, RealmModel realm) { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/OwnerReplacementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/OwnerReplacementTest.java index d91bcd281ac..3778f811fdd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/OwnerReplacementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/OwnerReplacementTest.java @@ -44,7 +44,6 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; @@ -56,7 +55,6 @@ import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson; * * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServerContainerExclude.AuthServer.REMOTE) public class OwnerReplacementTest extends AbstractKeycloakTest { private static String testRealmId; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/SimpleModelTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/SimpleModelTest.java index 2dbe5f9458a..5269d3c3992 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/SimpleModelTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/SimpleModelTest.java @@ -30,13 +30,10 @@ import org.keycloak.testsuite.runonserver.RunOnServerException; import java.util.List; import org.keycloak.models.Constants; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class SimpleModelTest extends AbstractKeycloakTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserConsentModelTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserConsentModelTest.java index ebf29df521b..fb5e17a5be4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserConsentModelTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserConsentModelTest.java @@ -38,21 +38,16 @@ import org.keycloak.services.managers.RealmManager; import org.keycloak.storage.client.ClientStorageProviderModel; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.ProfileAssume; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import org.keycloak.testsuite.federation.HardcodedClientStorageProviderFactory; - import java.util.List; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; - -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.junit.BeforeClass; /** * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class UserConsentModelTest extends AbstractTestRealmKeycloakTest { private static ComponentModel clientStorageComponent; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserConsentWithUserStorageModelTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserConsentWithUserStorageModelTest.java index a8a5cb9af9c..e40dbd07abd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserConsentWithUserStorageModelTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserConsentWithUserStorageModelTest.java @@ -38,7 +38,6 @@ import org.keycloak.services.managers.RealmManager; import org.keycloak.storage.UserStorageProviderModel; import org.keycloak.storage.client.ClientStorageProviderModel; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import org.keycloak.testsuite.federation.HardcodedClientStorageProviderFactory; import org.keycloak.testsuite.federation.UserMapStorageFactory; @@ -48,12 +47,10 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class UserConsentWithUserStorageModelTest extends AbstractTestRealmKeycloakTest { private static ComponentModel clientStorageComponent; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserModelTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserModelTest.java index 487ae5ef220..a9ec12c5c27 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserModelTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserModelTest.java @@ -30,7 +30,6 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.services.managers.ClientManager; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import org.keycloak.testsuite.util.RealmBuilder; @@ -50,12 +49,10 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertNotNull; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @author Stian Thorgersen */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class UserModelTest extends AbstractTestRealmKeycloakTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserSessionProviderOfflineTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserSessionProviderOfflineTest.java index 09ae3b27044..64dfbf0ce95 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserSessionProviderOfflineTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserSessionProviderOfflineTest.java @@ -24,6 +24,7 @@ import org.junit.Test; import org.keycloak.common.util.Time; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; +import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserManager; @@ -36,7 +37,6 @@ import org.keycloak.services.managers.ClientManager; import org.keycloak.services.managers.RealmManager; import org.keycloak.services.managers.UserSessionManager; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import java.util.HashMap; @@ -49,13 +49,10 @@ import java.util.stream.Collectors; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.keycloak.models.Constants; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class UserSessionProviderOfflineTest extends AbstractTestRealmKeycloakTest { private static KeycloakSession currentSession; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java index bcb9527ddc8..67b06c553fd 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java @@ -37,7 +37,6 @@ import org.keycloak.models.utils.SessionTimeoutHelper; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import java.util.Arrays; @@ -55,13 +54,11 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.InfinispanTestTimeServiceRule; /** * @author Stian Thorgersen */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class UserSessionProviderTest extends AbstractTestRealmKeycloakTest { @Rule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSecretSignedJWTTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSecretSignedJWTTest.java index 31f10f876dd..574dc6fe272 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSecretSignedJWTTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSecretSignedJWTTest.java @@ -71,8 +71,6 @@ import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.AbstractAdminTest; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.util.ClientPoliciesUtil; import org.keycloak.testsuite.util.OAuthClient; @@ -86,7 +84,6 @@ import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -@AuthServerContainerExclude(AuthServer.REMOTE) @EnableFeature(value = Profile.Feature.CLIENT_SECRET_ROTATION) public class ClientAuthSecretSignedJWTTest extends AbstractKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSignedJWTTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSignedJWTTest.java index 0ffab2a4986..8a22142fa78 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSignedJWTTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSignedJWTTest.java @@ -78,8 +78,6 @@ import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; @@ -125,7 +123,6 @@ import static org.junit.Assert.assertNull; * @author Marek Posolda * @author Vaclav Muzikar */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class ClientAuthSignedJWTTest extends AbstractKeycloakTest { @Rule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeSAML2Test.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeSAML2Test.java index e245b08cbd2..4366928abb0 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeSAML2Test.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeSAML2Test.java @@ -53,8 +53,6 @@ import org.keycloak.services.resources.admin.permissions.AdminPermissions; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; import org.keycloak.testsuite.util.AdminClientUtil; @@ -84,7 +82,6 @@ import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; /** * @author Hiroyuki Wada */ -@AuthServerContainerExclude(AuthServer.REMOTE) @EnableFeature(value = Profile.Feature.TOKEN_EXCHANGE, skipRestart = true) @EnableFeature(value = Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, skipRestart = true) public class ClientTokenExchangeSAML2Test extends AbstractKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeTest.java index d0c11640db7..d600f433539 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeTest.java @@ -49,7 +49,6 @@ import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; @@ -72,7 +71,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.keycloak.models.ImpersonationSessionNote.IMPERSONATOR_ID; import static org.keycloak.models.ImpersonationSessionNote.IMPERSONATOR_USERNAME; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.util.JsonSerialization; @@ -83,7 +81,6 @@ import com.fasterxml.jackson.databind.JsonNode; /** * @author Stian Thorgersen */ -@AuthServerContainerExclude(AuthServer.REMOTE) @EnableFeature(value = Profile.Feature.TOKEN_EXCHANGE, skipRestart = true) @EnableFeature(value = Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, skipRestart = true) public class ClientTokenExchangeTest extends AbstractKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LoginStatusIframeEndpointTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LoginStatusIframeEndpointTest.java index 32a05d75c9b..0250c610a99 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LoginStatusIframeEndpointTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LoginStatusIframeEndpointTest.java @@ -38,7 +38,6 @@ import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.ActionURIUtils; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.oidc.PkceGenerator; import org.keycloak.testsuite.runonserver.ServerVersion; @@ -53,12 +52,10 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @author Stian Thorgersen */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class LoginStatusIframeEndpointTest extends AbstractKeycloakTest { @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthProofKeyForCodeExchangeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthProofKeyForCodeExchangeTest.java index c4130e34192..5ace83544b9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthProofKeyForCodeExchangeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthProofKeyForCodeExchangeTest.java @@ -21,7 +21,6 @@ import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.util.ClientManager; import org.keycloak.testsuite.util.OAuthClient; @@ -38,7 +37,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson; import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; //https://tools.ietf.org/html/rfc7636 @@ -85,7 +83,7 @@ public class OAuthProofKeyForCodeExchangeTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) + public void accessTokenRequestWithoutPKCE() throws Exception { // test case : success : A-1-1 oauth.doLogin("test-user@localhost", "password"); @@ -151,7 +149,7 @@ public class OAuthProofKeyForCodeExchangeTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) + public void accessTokenRequestInPKCEValidPlainCodeChallengeMethod() throws Exception { // test case : success : A-1-3 oauth.codeChallenge(".234567890-234567890~234567890_234567890123"); @@ -198,7 +196,7 @@ public class OAuthProofKeyForCodeExchangeTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) + public void accessTokenRequestInPKCEValidDefaultCodeChallengeMethod() throws Exception { // test case : success : A-1-4 oauth.codeChallenge("1234567890123456789012345678901234567890123"); @@ -539,7 +537,7 @@ public class OAuthProofKeyForCodeExchangeTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) // unstable + // unstable //accessTokenRequestValidPlainCodeChallengeMethodPkceEnforced:561->expectSuccessfulResponseFromTokenEndpoint:465 // Expected: (a value equal to or greater than <1799> and a value less than or equal to <1800>) // but: a value equal to or greater than <1799> <1798> was less than <1799> diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OIDCProtocolMappersTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OIDCProtocolMappersTest.java index e6682be25d3..ca4a0f852eb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OIDCProtocolMappersTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OIDCProtocolMappersTest.java @@ -49,8 +49,6 @@ import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.updaters.ProtocolMappersUpdater; @@ -170,7 +168,7 @@ public class OIDCProtocolMappersTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) + public void testTokenMapping() throws Exception { { UserResource userResource = findUserByUsernameId(adminClient.realm("test"), "test-user@localhost"); @@ -343,7 +341,7 @@ public class OIDCProtocolMappersTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) + public void testTokenPropertiesMapping() throws Exception { UserResource userResource = findUserByUsernameId(adminClient.realm("test"), "test-user@localhost"); UserRepresentation user = userResource.toRepresentation(); @@ -408,7 +406,7 @@ public class OIDCProtocolMappersTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) + public void testNullOrEmptyTokenMapping() throws Exception { { UserResource userResource = findUserByUsernameId(adminClient.realm("test"), "test-user@localhost"); @@ -466,7 +464,7 @@ public class OIDCProtocolMappersTest extends AbstractKeycloakTest { @Test - @AuthServerContainerExclude(AuthServer.REMOTE) + public void testUserRoleToAttributeMappers() throws Exception { // Add mapper for realm roles ProtocolMapperRepresentation realmMapper = ProtocolMapperUtil.createUserRealmRoleMappingMapper("pref.", "Realm roles mapper", "roles-custom.realm", true, true); @@ -499,7 +497,7 @@ public class OIDCProtocolMappersTest extends AbstractKeycloakTest { // Test to update protocolMappers to not have roles on the default position (realm_access and resource_access properties) @Test - @AuthServerContainerExclude(AuthServer.REMOTE) + public void testUserRolesMovedFromAccessTokenProperties() throws Exception { RealmResource realm = adminClient.realm("test"); ClientScopeResource rolesScope = ApiUtil.findClientScopeByName(realm, OIDCLoginProtocolFactory.ROLES_SCOPE); @@ -721,7 +719,7 @@ public class OIDCProtocolMappersTest extends AbstractKeycloakTest { @Test - @AuthServerContainerExclude(AuthServer.REMOTE) + public void testUserGroupRoleToAttributeMappers() throws Exception { // Add mapper for realm roles String clientId = "test-app"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java index 82f6942b996..2d0b87ea426 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java @@ -50,7 +50,6 @@ import org.keycloak.representations.idm.UserSessionRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; @@ -800,7 +799,6 @@ public class RefreshTokenTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServerContainerExclude.AuthServer.REMOTE) public void refreshTokenAfterUserAdminLogoutEndpointAndLoginAgain() { try { String refreshToken1 = loginAndForceNewLoginPage(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenEndpointCorsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenEndpointCorsTest.java index 75ee514bdeb..50347b560d2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenEndpointCorsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenEndpointCorsTest.java @@ -7,7 +7,6 @@ import org.keycloak.OAuth2Constants; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.OAuthClient; @@ -20,7 +19,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * @author Martin Kanis @@ -57,7 +55,6 @@ public class TokenEndpointCorsTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void accessTokenCorsRequest() throws Exception { oauth.realm("test"); oauth.clientId("test-app2"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AudienceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AudienceTest.java index 274c97d84a5..e2c665669a5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AudienceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AudienceTest.java @@ -33,8 +33,6 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.ProtocolMapperUtil; import org.keycloak.testsuite.util.UserBuilder; @@ -48,7 +46,6 @@ import java.util.Collections; * * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class AudienceTest extends AbstractOIDCScopeTest { private static final String userId = KeycloakModelUtils.generateId(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCAdvancedRequestParamsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCAdvancedRequestParamsTest.java index 65c8fd1a5b4..71ac59def00 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCAdvancedRequestParamsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCAdvancedRequestParamsTest.java @@ -75,7 +75,6 @@ import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.AbstractAdminTest; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; @@ -111,7 +110,6 @@ import static org.keycloak.jose.jwe.JWEConstants.RSA_OAEP; import static org.keycloak.jose.jwe.JWEConstants.RSA_OAEP_256; import static org.keycloak.testsuite.admin.ApiUtil.findClientResourceByClientId; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.AdminClientUtil; /** @@ -119,7 +117,6 @@ import org.keycloak.testsuite.util.AdminClientUtil; * * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServer.REMOTE) @DisableFeature(value = Profile.Feature.ACCOUNT2, skipRestart = true) // TODO remove this (KEYCLOAK-16228) public class OIDCAdvancedRequestParamsTest extends AbstractTestRealmKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCBackwardsCompatibilityTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCBackwardsCompatibilityTest.java index 23b26a2a256..4dfaddcc28d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCBackwardsCompatibilityTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCBackwardsCompatibilityTest.java @@ -31,8 +31,6 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.pages.AccountUpdateProfilePage; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.ErrorPage; @@ -45,7 +43,6 @@ import org.keycloak.testsuite.util.OAuthClient; /** * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class OIDCBackwardsCompatibilityTest extends AbstractTestRealmKeycloakTest { @Rule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCScopeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCScopeTest.java index 8d3f4d2854f..c273f0d7332 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCScopeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCScopeTest.java @@ -44,7 +44,6 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.pages.OAuthGrantPage; import org.keycloak.testsuite.util.ClientManager; @@ -59,14 +58,12 @@ import java.util.Collections; import java.util.List; import static org.junit.Assert.assertEquals; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; /** * Test for OAuth2 'scope' parameter and for some other aspects of client scopes * * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class OIDCScopeTest extends AbstractOIDCScopeTest { private static String userId = KeycloakModelUtils.generateId(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCWellKnownProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCWellKnownProviderTest.java index 1652024f808..f78da185b7d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCWellKnownProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCWellKnownProviderTest.java @@ -46,7 +46,6 @@ import org.keycloak.services.resources.RealmsResource; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.admin.AbstractAdminTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.forms.BrowserFlowTest; import org.keycloak.testsuite.forms.LevelOfAssuranceFlowTest; @@ -70,7 +69,6 @@ import java.util.Map; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; /** * @author Marek Posolda @@ -307,7 +305,7 @@ public class OIDCWellKnownProviderTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(REMOTE) + public void testAcrValuesSupported() throws IOException { Client client = AdminClientUtil.createResteasyClient(); try { @@ -358,7 +356,7 @@ public class OIDCWellKnownProviderTest extends AbstractKeycloakTest { } @Test - @AuthServerContainerExclude(REMOTE) + public void testDefaultProviderCustomizations() throws IOException { Client client = AdminClientUtil.createResteasyClient(); try { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/openshift/OpenShiftTokenReviewEndpointTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/openshift/OpenShiftTokenReviewEndpointTest.java index ec70a6fb0d4..cff63617950 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/openshift/OpenShiftTokenReviewEndpointTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/openshift/OpenShiftTokenReviewEndpointTest.java @@ -52,8 +52,6 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.util.OAuthClient; import org.keycloak.testsuite.util.UserBuilder; @@ -82,7 +80,6 @@ import static org.keycloak.common.Profile.Feature.OPENSHIFT_INTEGRATION; import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; import static org.keycloak.utils.MediaType.APPLICATION_JSON; -@AuthServerContainerExclude({AuthServer.REMOTE}) @EnableFeature(value = OPENSHIFT_INTEGRATION, skipRestart = true) public class OpenShiftTokenReviewEndpointTest extends AbstractTestRealmKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/openshift/OpenshiftClientStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/openshift/OpenshiftClientStorageTest.java index d521e1c36e3..537fb9bdc90 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/openshift/OpenshiftClientStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/openshift/OpenshiftClientStorageTest.java @@ -44,8 +44,6 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.ConsentPage; @@ -68,7 +66,6 @@ import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; * * @author Pedro Igor */ -@AuthServerContainerExclude({AuthServer.REMOTE}) @EnableFeature(value = OPENSHIFT_INTEGRATION, skipRestart = true) public final class OpenshiftClientStorageTest extends AbstractTestRealmKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordPolicyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordPolicyTest.java index 69df1630c79..ca75250eb9d 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordPolicyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordPolicyTest.java @@ -30,8 +30,6 @@ import org.keycloak.policy.PasswordPolicyProvider; import org.keycloak.provider.ProviderFactory; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.ContainerAssume; import org.keycloak.testsuite.util.RealmBuilder; @@ -50,7 +48,6 @@ import static org.junit.Assert.fail; /** * @author Stian Thorgersen */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class PasswordPolicyTest extends AbstractKeycloakTest { @Test @@ -174,9 +171,6 @@ public class PasswordPolicyTest extends AbstractKeycloakTest { */ @Test public void testBlacklistPasswordPolicyWithTestBlacklist() throws Exception { - - ContainerAssume.assumeNotAuthServerRemote(); - testingClient.server("passwordPolicy").run(session -> { RealmModel realmModel = session.getContext().getRealm(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/runonserver/RunOnServerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/runonserver/RunOnServerTest.java index 4da201cb40b..33603579731 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/runonserver/RunOnServerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/runonserver/RunOnServerTest.java @@ -24,11 +24,8 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; - import java.util.List; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -38,7 +35,6 @@ import static org.junit.Assert.fail; * * @author Stian Thorgersen */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class RunOnServerTest extends AbstractKeycloakTest { @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingCustomResolverTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingCustomResolverTest.java index b902f35df4f..5fa018e2c74 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingCustomResolverTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingCustomResolverTest.java @@ -3,7 +3,6 @@ package org.keycloak.testsuite.saml; import org.junit.Ignore; import org.junit.Test; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.SetDefaultProvider; import org.keycloak.testsuite.authentication.CustomTestingSamlArtifactResolver; import org.keycloak.testsuite.util.ContainerAssume; @@ -18,11 +17,9 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; import static org.keycloak.testsuite.util.SamlClient.Binding.POST; import static org.hamcrest.MatcherAssert.assertThat; -@AuthServerContainerExclude(value = {REMOTE}, details = "currently remote doesn't support the SetDefaultProvider annotation") @SetDefaultProvider(spi = "saml-artifact-resolver", providerId = "0005") public class ArtifactBindingCustomResolverTest extends ArtifactBindingTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingTest.java index 5943d6cb7d3..4f40fe21e8a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingTest.java @@ -31,7 +31,6 @@ import org.keycloak.saml.processing.core.parsers.saml.SAMLParser; import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; import org.keycloak.saml.processing.core.saml.v2.util.AssertionUtil; import org.keycloak.sessions.CommonClientSessionModel; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; import org.keycloak.testsuite.util.InfinispanTestTimeServiceRule; @@ -677,7 +676,7 @@ public class ArtifactBindingTest extends AbstractSamlTest { .execute(r -> assertThat(r, bodyHC(containsString(JBossSAMLURIConstants.STATUS_REQUEST_DENIED.get())))); } - @AuthServerContainerExclude(AuthServerContainerExclude.AuthServer.REMOTE) // Won't work with openshift, because openshift wouldn't see ArtifactResolutionService + // Won't work with openshift, because openshift wouldn't see ArtifactResolutionService @Test public void testSessionStateDuringArtifactBindingLogoutWithOneClient() { ClientRepresentation salesRep = adminClient.realm(REALM_NAME).clients().findByClientId(SAML_CLIENT_ID_SALES_POST).get(0); @@ -731,7 +730,7 @@ public class ArtifactBindingTest extends AbstractSamlTest { assertThat(samlResponse, isSamlStatusResponse(JBossSAMLURIConstants.STATUS_SUCCESS)); } - @AuthServerContainerExclude(AuthServerContainerExclude.AuthServer.REMOTE) // Won't work with openshift, because openshift wouldn't see ArtifactResolutionService + // Won't work with openshift, because openshift wouldn't see ArtifactResolutionService @Test public void testSessionStateDuringArtifactBindingLogoutWithMoreFrontChannelClients() { getCleanup() diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingWithResolutionServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingWithResolutionServiceTest.java index 7c38e012c95..0a71ebd274c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingWithResolutionServiceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingWithResolutionServiceTest.java @@ -15,7 +15,6 @@ import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.processing.api.saml.v2.request.SAML2Request; import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.util.ArtifactResolutionService; import org.keycloak.testsuite.util.SamlClient; @@ -36,7 +35,6 @@ import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; import static org.keycloak.testsuite.util.SamlClient.Binding.POST; import static org.keycloak.testsuite.util.SamlClient.Binding.REDIRECT; -@AuthServerContainerExclude(AuthServerContainerExclude.AuthServer.REMOTE) // Won't work with openshift, because openshift wouldn't see ArtifactResolutionService public class ArtifactBindingWithResolutionServiceTest extends AbstractSamlTest { @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/BasicSamlTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/BasicSamlTest.java index f2d5b9005f2..4b6ec269bfb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/BasicSamlTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/BasicSamlTest.java @@ -14,8 +14,6 @@ import org.keycloak.saml.processing.api.saml.v2.request.SAML2Request; import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; import org.keycloak.saml.processing.web.util.RedirectBindingUtil; import org.keycloak.services.resources.RealmsResource; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.util.KeyUtils; import org.keycloak.testsuite.util.Matchers; import org.keycloak.testsuite.util.SamlClient; @@ -167,7 +165,6 @@ public class BasicSamlTest extends AbstractSamlTest { } @Test - @AuthServerContainerExclude({AuthServer.REMOTE}) public void testNoPortInDestination() throws Exception { // note that this test relies on settings of the login-protocol.saml.knownProtocols configuration option testWithOverriddenPort(-1, Response.Status.OK, containsString("login")); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlReverseProxyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlReverseProxyTest.java index fb0a7257236..448c71e3bbc 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlReverseProxyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlReverseProxyTest.java @@ -16,12 +16,6 @@ */ package org.keycloak.testsuite.saml; -import java.net.URI; -import java.util.HashMap; - -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; - import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.impl.client.CloseableHttpClient; @@ -35,11 +29,15 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.saml.SAML2LogoutRequestBuilder; import org.keycloak.saml.processing.api.saml.v2.request.SAML2Request; import org.keycloak.services.resources.RealmsResource; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.util.ReverseProxy; import org.keycloak.testsuite.util.SamlClient; import org.w3c.dom.Document; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.UriBuilder; +import java.net.URI; +import java.util.HashMap; + import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertThat; import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; @@ -50,7 +48,7 @@ import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; * * @author Stefan Guilhen */ -@AuthServerContainerExclude(AuthServerContainerExclude.AuthServer.REMOTE) + public class SamlReverseProxyTest extends AbstractSamlTest { @ClassRule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SessionNotOnOrAfterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SessionNotOnOrAfterTest.java index a7eaf8e00e4..f481f115649 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SessionNotOnOrAfterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SessionNotOnOrAfterTest.java @@ -8,7 +8,6 @@ import org.keycloak.dom.saml.v2.assertion.StatementAbstractType; import org.keycloak.dom.saml.v2.protocol.ResponseType; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; import org.keycloak.testsuite.util.Matchers; import org.keycloak.testsuite.util.SamlClient; @@ -30,7 +29,6 @@ import org.keycloak.testsuite.updaters.ClientAttributeUpdater; /** * @author mhajas */ -@AuthServerContainerExclude(AuthServerContainerExclude.AuthServer.REMOTE) public class SessionNotOnOrAfterTest extends AbstractSamlTest { private static final int SSO_MAX_LIFESPAN = 3602; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/session/LastSessionRefreshUnitTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/session/LastSessionRefreshUnitTest.java index f5c698d8f63..36db8e7e519 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/session/LastSessionRefreshUnitTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/session/LastSessionRefreshUnitTest.java @@ -35,8 +35,6 @@ import org.keycloak.models.sessions.infinispan.entities.UserSessionEntity; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.ProfileAssume; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.runonserver.RunOnServer; import org.keycloak.timer.TimerProvider; @@ -47,7 +45,6 @@ import java.util.concurrent.atomic.AtomicInteger; /** * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class LastSessionRefreshUnitTest extends AbstractKeycloakTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/session/SessionTimeoutValidationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/session/SessionTimeoutValidationTest.java index c7118c26ffa..9f1989c0cfb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/session/SessionTimeoutValidationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/session/SessionTimeoutValidationTest.java @@ -29,11 +29,8 @@ import org.keycloak.models.UserSessionModel; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.ModelTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; -@AuthServerContainerExclude(AuthServer.REMOTE) public class SessionTimeoutValidationTest extends AbstractTestRealmKeycloakTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/KcOidcUserSessionLimitsBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/KcOidcUserSessionLimitsBrokerTest.java index 86a767536d8..dbd69d65650 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/KcOidcUserSessionLimitsBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/KcOidcUserSessionLimitsBrokerTest.java @@ -1,12 +1,8 @@ package org.keycloak.testsuite.sessionlimits; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.broker.BrokerConfiguration; import org.keycloak.testsuite.broker.KcOidcBrokerConfiguration; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; - -@AuthServerContainerExclude(REMOTE) public class KcOidcUserSessionLimitsBrokerTest extends AbstractUserSessionLimitsBrokerTest { @Override protected BrokerConfiguration getBrokerConfiguration() { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/KcSamlUserSessionLimitsBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/KcSamlUserSessionLimitsBrokerTest.java index adf97d08f56..0b0c6e9742c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/KcSamlUserSessionLimitsBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/KcSamlUserSessionLimitsBrokerTest.java @@ -1,12 +1,8 @@ package org.keycloak.testsuite.sessionlimits; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.broker.BrokerConfiguration; import org.keycloak.testsuite.broker.KcSamlBrokerConfiguration; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; - -@AuthServerContainerExclude(REMOTE) public class KcSamlUserSessionLimitsBrokerTest extends AbstractUserSessionLimitsBrokerTest { @Override protected BrokerConfiguration getBrokerConfiguration() { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/UserSessionLimitsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/UserSessionLimitsTest.java index 0aa3e705f69..93332410727 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/UserSessionLimitsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/UserSessionLimitsTest.java @@ -42,19 +42,14 @@ import org.keycloak.testsuite.pages.LoginPasswordUpdatePage; import org.keycloak.testsuite.util.GreenMailRule; import org.keycloak.testsuite.util.MailUtils; import org.keycloak.testsuite.util.OAuthClient; - import org.keycloak.testsuite.pages.ErrorPage; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; - import javax.mail.internet.MimeMessage; import static org.junit.Assert.assertEquals; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; import static org.keycloak.testsuite.sessionlimits.UserSessionLimitsUtil.assertSessionCount; import static org.keycloak.testsuite.sessionlimits.UserSessionLimitsUtil.configureSessionLimits; import static org.keycloak.testsuite.sessionlimits.UserSessionLimitsUtil.ERROR_TO_DISPLAY; -@AuthServerContainerExclude(REMOTE) public class UserSessionLimitsTest extends AbstractTestRealmKeycloakTest { private String realmName = "test"; private String username = "test-user@localhost"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/ssl/TrustStoreEmailTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/ssl/TrustStoreEmailTest.java index d21e8d156ef..9adb1610130 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/ssl/TrustStoreEmailTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/ssl/TrustStoreEmailTest.java @@ -31,7 +31,6 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.auth.page.account.AccountManagement; @@ -41,14 +40,9 @@ import org.keycloak.testsuite.util.MailServerConfiguration; import org.keycloak.testsuite.util.SslMailServer; import static org.junit.Assert.assertEquals; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; - -import java.util.Map; - import static org.keycloak.testsuite.util.MailAssert.assertEmailAndGetUrl; import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWith; - /** * * @author fkiss @@ -96,7 +90,6 @@ public class TrustStoreEmailTest extends AbstractTestRealmKeycloakTest { @Test - @AuthServerContainerExclude(AuthServer.REMOTE) public void verifyEmailWithSslEnabled() { UserRepresentation user = ApiUtil.findUserByUsername(testRealm(), "test-user@localhost"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/DefaultThemeManagerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/DefaultThemeManagerTest.java index c34682fa95a..b4f3dbcf6ae 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/DefaultThemeManagerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/DefaultThemeManagerTest.java @@ -5,18 +5,14 @@ import org.junit.Before; import org.junit.Test; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.theme.Theme; import java.io.IOException; import java.util.List; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; - /** * @author Vincent Letarouilly */ -@AuthServerContainerExclude({REMOTE}) public class DefaultThemeManagerTest extends AbstractKeycloakTest { private static final String THEME_NAME = "environment-agnostic"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/ThemeResourceProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/ThemeResourceProviderTest.java index 89cb8e2ab71..794c554f233 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/ThemeResourceProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/ThemeResourceProviderTest.java @@ -11,8 +11,6 @@ import org.keycloak.common.Version; import org.keycloak.platform.Platform; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.theme.Theme; import java.io.File; @@ -28,7 +26,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -@AuthServerContainerExclude(AuthServer.REMOTE) public class ThemeResourceProviderTest extends AbstractTestRealmKeycloakTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/transactions/TransactionsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/transactions/TransactionsTest.java index 646be944076..5a5ff0ccdc1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/transactions/TransactionsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/transactions/TransactionsTest.java @@ -21,16 +21,11 @@ import org.junit.Assert; import org.junit.Test; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; - import java.util.List; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; - /** * @author Marek Posolda */ -@AuthServerContainerExclude(AuthServer.REMOTE) public class TransactionsTest extends AbstractKeycloakTest { @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/url/DefaultHostnameTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/url/DefaultHostnameTest.java index 6afcf8eac77..43eb1352378 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/url/DefaultHostnameTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/url/DefaultHostnameTest.java @@ -43,13 +43,12 @@ import java.util.Map; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.QUARKUS; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; import static org.keycloak.testsuite.util.OAuthClient.AUTH_SERVER_ROOT; import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; import javax.ws.rs.core.UriBuilder; -@AuthServerContainerExclude({REMOTE, QUARKUS}) +@AuthServerContainerExclude({QUARKUS}) public class DefaultHostnameTest extends AbstractHostnameTest { @ArquillianResource diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/url/FixedHostnameTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/url/FixedHostnameTest.java index b19a9290d3c..8c27b0657f5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/url/FixedHostnameTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/url/FixedHostnameTest.java @@ -61,9 +61,8 @@ import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerEx import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_PORT; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SCHEME; import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; -@AuthServerContainerExclude(value = {REMOTE, QUARKUS}, +@AuthServerContainerExclude(value = {QUARKUS}, details = "Quarkus supports its own hostname provider implementation similar to the default hostname provider") public class FixedHostnameTest extends AbstractHostnameTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/AbstractUserProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/AbstractUserProfileTest.java index 0a31c1c3318..f6d528757ce 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/AbstractUserProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/AbstractUserProfileTest.java @@ -36,7 +36,6 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.userprofile.DeclarativeUserProfileProvider; import org.keycloak.userprofile.UserProfileProvider; @@ -48,7 +47,6 @@ import org.keycloak.util.JsonSerialization; * @author Pedro Igor */ @EnableFeature(value = Profile.Feature.DECLARATIVE_USER_PROFILE) -@AuthServerContainerExclude(AuthServerContainerExclude.AuthServer.REMOTE) public abstract class AbstractUserProfileTest extends AbstractTestRealmKeycloakTest { protected static void configureAuthenticationSession(KeycloakSession session) { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AuthenticatorUtilTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AuthenticatorUtilTest.java index de4906bc8d6..e02392e9cac 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AuthenticatorUtilTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AuthenticatorUtilTest.java @@ -26,19 +26,16 @@ import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import java.util.Set; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; /** * @author Martin Bartos */ -@AuthServerContainerExclude(REMOTE) public class AuthenticatorUtilTest extends AbstractTestRealmKeycloakTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/vault/KeycloakVaultTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/vault/KeycloakVaultTest.java index 46c0c9eb0d6..a0a877f3ead 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/vault/KeycloakVaultTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/vault/KeycloakVaultTest.java @@ -22,7 +22,6 @@ import org.junit.Test; import org.keycloak.models.KeycloakSession; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.EnableVault; import org.keycloak.testsuite.runonserver.RunOnServer; import org.keycloak.testsuite.utils.io.IOUtil; @@ -32,8 +31,6 @@ import org.keycloak.vault.VaultTranscriber; import java.util.List; import java.util.Optional; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; - /** * Tests the usage of the {@link VaultTranscriber} on the server side. The tests attempt to obtain the transcriber from * the session and then use it to obtain secrets from the configured provider. @@ -41,7 +38,6 @@ import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerEx * @author Stefan Guilhen */ @EnableVault -@AuthServerContainerExclude(REMOTE) public class KeycloakVaultTest extends AbstractKeycloakTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/welcomepage/WelcomePageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/welcomepage/WelcomePageTest.java index 5c760b05991..8b85457c288 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/welcomepage/WelcomePageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/welcomepage/WelcomePageTest.java @@ -24,21 +24,17 @@ import org.junit.After; import org.junit.Assert; import org.junit.Assume; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; -import org.keycloak.common.util.Retry; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.RestartContainer; import org.keycloak.testsuite.auth.page.WelcomePage; import org.keycloak.testsuite.auth.page.login.OIDCLogin; -import org.keycloak.testsuite.util.ContainerAssume; import org.keycloak.testsuite.util.DroneUtils; import org.keycloak.testsuite.util.PhantomJSBrowser; import org.openqa.selenium.WebDriver; -import org.openqa.selenium.logging.LogEntry; import java.net.InetAddress; import java.net.NetworkInterface; @@ -74,11 +70,6 @@ public class WelcomePageTest extends AbstractKeycloakTest { // no operation } - @BeforeClass - public static void enabled() { - ContainerAssume.assumeNotAuthServerRemote(); - } - /* * Leave out client initialization and creation of a user account. We * don't need those. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/AbstractX509AuthenticationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/AbstractX509AuthenticationTest.java index 8bde86521b1..66911a3b45a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/AbstractX509AuthenticationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/AbstractX509AuthenticationTest.java @@ -49,7 +49,6 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.AuthServerTestEnricher; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.pages.AbstractPage; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginPage; @@ -82,14 +81,12 @@ import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorC import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.MappingSourceType.SUBJECTDN_CN; import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.MappingSourceType.SUBJECTDN_EMAIL; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; /** * @author Peter Nalyvayko * @version $Revision: 1 $ * @since 10/28/2016 */ -@AuthServerContainerExclude(REMOTE) public abstract class AbstractX509AuthenticationTest extends AbstractTestRealmKeycloakTest { public static final String EMPTY_CRL_PATH = "empty.crl"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml index 0001dae64d2..15c034bfb66 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml +++ b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml @@ -641,18 +641,6 @@ - - - ${auth.server.remote} - org.jboss.as.arquillian.container.remote.RemoteDeployableContainer - - ${auth.server.management.host} - ${auth.server.management.port} - admin - admin - - - ${auth.server.quarkus} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/jboss/pom.xml index de0c7bd606b..ef5da5d8c2c 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/pom.xml +++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/pom.xml @@ -77,12 +77,6 @@ relative - - app-server-remote - - remote - - diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/README.md b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/README.md deleted file mode 100644 index 40926cb1e94..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/README.md +++ /dev/null @@ -1,65 +0,0 @@ -# Keycloak Adapter Tests - JBoss Remote - -## Performance Tests - -### Parameters - -* Warmup phase - - `warmup.load` Load during warmup phase (# of clients). - - `warmup.duration` Duration of warmup phase in seconds. -* Measuremet iterations - - `initial.load` Load for the initial measurement iteration (# of clients). - - `load.increase` How many clients to add after each iteration. - - `load.increase.rate` How many clients to add per second. - - `measurement.duration` Duration of measurement iteration (in seconds). -* Limits - - `max.iterations` - - `max.threads` -* Other - - `sleep.between.loops` Sleep period between scenario loops. - -### Generated Load - -Warmup phase and measurement iterations with load-increase phases in between. - - load - - ^ - │ - │ / - │ _________/ - │ /| | - │ / | | - │ _________/ | | - │ /| | | | - │ / | | | | - │ _________/ | | | | - │ /│ | | | | | - │ / | | | | | | - │ _________/ | | | | | | - │ /| | | | | | | | - │ ____________/ | | | | | | | | - │ /| | | | | | | | | | - │/ | | | | | | | | | | - └──|────────────|─|─────────|──|─────────|──|─────────|──|─────────|───────> time - - <--warmup--> <--it.1-> <--it.2-> <--it.3-> <--it.4-> - - -### Login-Logout Test Scenario - -#### Collected Statistics - - - ACCESS_REQUEST_TIME - - LOGIN_REQUEST_TIME - - LOGIN_VERIFY_REQUEST_TIME - - LOGOUT_REQUEST_TIME - - LOGOUT_VERIFY_REQUEST_TIME - -#### Parameters - -* Limits - - `max.login.time.average` Maximum accepted average value of LOGIN_REQUEST_TIME. - - `max.logout.time.average` Maximum accepted average value of LOGOUT_REQUEST_TIME. - - `max.timeout.percentage` Maximum accepted timeout percentage for all statistics. - diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/pom.xml deleted file mode 100644 index 3bbbd708f26..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/pom.xml +++ /dev/null @@ -1,222 +0,0 @@ - - - - - - 4.0.0 - - - org.keycloak.testsuite - integration-arquillian-tests-adapters-jboss - 999-SNAPSHOT - - - integration-arquillian-tests-adapters-remote - - Adapter Tests - JBoss - Remote - - - remote - remote - true - src/test/resources/xslt/arquillian.xsl - ${basedir}/../../../../../servers/auth-server/jboss/common - **/performance/htmlunit/**/*Test.java - **/performance/httpclient/**/*Test.java - - INFO - - - - - commons-io - commons-io - 2.4 - - - org.apache.commons - commons-csv - 1.2 - - - org.keycloak.testsuite - integration-arquillian-testsuite-providers - ${project.version} - - - - - - - maven-dependency-plugin - - - copy-app-profile-jee-quickstart - generate-test-resources - - copy - - - - - org.keycloak.testsuite - keycloak-test-app-profile-jee - ${project.version} - war - - - ${examples.home} - true - - - - - - maven-enforcer-plugin - - - - enforce - - - - - auth-server-remote - - - - - - - - - maven-surefire-plugin - - - ${exclude.htmlunit} - ${exclude.httpclient} - - - ${logging.loginlogout} - - - - - - - - - auth-server-remote - - - - maven-resources-plugin - - - copy-keystore - process-resources - - copy-resources - - - ${project.build.directory}/containers/auth-server-remote - - - ${common.resources}/keystore - - keycloak.jks - keycloak.truststore - client.jks - client-ca.jks - test-user-cert-intermediary-ca.jks - ca.crt - client.crt - client.key - *.crl - other_client.jks - test-user-obb.jks - - - - ${common.resources}/pki/root/ca - - certs/clients/test-user-san@localhost.cert.pem - certs/clients/test-user@localhost.key.pem - - - - - - - - - - - - no-offset - - 0 - 8080 - 8443 - 9990 - 9999 - - - - htmlunit - - - - - - - httpclient - - - - - - - debug - - TRACE - - - - - maven-surefire-plugin - - - 1 - 10 - 0 - 30 - - - - - - - - - diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/main/java/org/keycloak/testsuite/arquillian/remote/RemoteAppServerArquillianExtension.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/main/java/org/keycloak/testsuite/arquillian/remote/RemoteAppServerArquillianExtension.java deleted file mode 100644 index 57674d31f5c..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/main/java/org/keycloak/testsuite/arquillian/remote/RemoteAppServerArquillianExtension.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2019 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.remote; - -import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; -import org.jboss.arquillian.core.spi.LoadableExtension; -import org.keycloak.testsuite.arquillian.remote.container.RemoteDeploymentArchiveProcessor; - -public class RemoteAppServerArquillianExtension implements LoadableExtension { - - @Override - public void register(ExtensionBuilder builder) { - builder.service(ApplicationArchiveProcessor.class, RemoteDeploymentArchiveProcessor.class); - } - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/main/java/org/keycloak/testsuite/arquillian/remote/container/RemoteDeploymentArchiveProcessor.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/main/java/org/keycloak/testsuite/arquillian/remote/container/RemoteDeploymentArchiveProcessor.java deleted file mode 100644 index c0ee1ab24bd..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/main/java/org/keycloak/testsuite/arquillian/remote/container/RemoteDeploymentArchiveProcessor.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright 2019 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.remote.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; - -public class RemoteDeploymentArchiveProcessor implements ApplicationArchiveProcessor { - - private final Logger log = Logger.getLogger(RemoteDeploymentArchiveProcessor.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, DeploymentArchiveProcessorUtils.SAML_ADAPTER_CONFIG_PATH); - modifySAMLAdapterConfig(archive, DeploymentArchiveProcessorUtils.SAML_ADAPTER_CONFIG_PATH_TENANT1); - modifySAMLAdapterConfig(archive, DeploymentArchiveProcessorUtils.SAML_ADAPTER_CONFIG_PATH_TENANT2); - } - - 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, String adapterConfigPath) { - if (!archive.contains(adapterConfigPath)) return; - - log.debug("Modifying adapter config " + adapterConfigPath + " in " + archive.getName()); - DeploymentArchiveProcessorUtils.modifySAMLAdapterConfig(archive, adapterConfigPath); - } -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/main/java/org/keycloak/testsuite/performance/page/AppProfileJEE.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/main/java/org/keycloak/testsuite/performance/page/AppProfileJEE.java deleted file mode 100644 index 334731190f2..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/main/java/org/keycloak/testsuite/performance/page/AppProfileJEE.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.keycloak.testsuite.performance.page; - -import org.jboss.arquillian.container.test.api.OperateOnDeployment; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.keycloak.testsuite.page.AbstractPageWithInjectedUrl; - -import java.net.URL; - -/** - * - * @author tkyjovsk - */ -public class AppProfileJEE extends AbstractPageWithInjectedUrl { - - public static final String DEPLOYMENT_NAME = "app-profile-jee"; - - @ArquillianResource - @OperateOnDeployment(DEPLOYMENT_NAME) - private URL url; - - @Override - public URL getInjectedUrl() { - //EAP6 URL fix - URL fixedUrl = createInjectedURL(DEPLOYMENT_NAME); - return fixedUrl != null ? fixedUrl : url; - } - - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension deleted file mode 100644 index 994970e0d0c..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension +++ /dev/null @@ -1 +0,0 @@ -org.keycloak.testsuite.arquillian.remote.RemoteAppServerArquillianExtension diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteOIDCAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteOIDCAdapterTest.java deleted file mode 100644 index 18c53d30f76..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteOIDCAdapterTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.keycloak.testsuite.adapter; - -import org.junit.Ignore; -import org.junit.Test; -import org.keycloak.testsuite.adapter.servlet.DemoServletsAdapterTest; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * - * @author tkyjovsk - */ -@AppServerContainer("app-server-remote") -public class RemoteOIDCAdapterTest extends DemoServletsAdapterTest { - - @Test - @Ignore - @Override - public void testBasicAuth() { - } -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteOIDCSessionAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteOIDCSessionAdapterTest.java deleted file mode 100644 index 7723d301681..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteOIDCSessionAdapterTest.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-remote") -public class RemoteOIDCSessionAdapterTest extends SessionServletAdapterTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteSAMLAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteSAMLAdapterTest.java deleted file mode 100644 index 588ad397399..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteSAMLAdapterTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.SAMLServletAdapterTest; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; - -/** - * @author mhajas - */ -@AppServerContainer("app-server-remote") -public class RemoteSAMLAdapterTest extends SAMLServletAdapterTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteSAMLFilterAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteSAMLFilterAdapterTest.java deleted file mode 100644 index 69f4f444b10..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/adapter/RemoteSAMLFilterAdapterTest.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-remote") -public class RemoteSAMLFilterAdapterTest extends SAMLFilterServletAdapterTest { -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/LoginLogoutTestParameters.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/LoginLogoutTestParameters.java deleted file mode 100644 index 70dbaec8994..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/LoginLogoutTestParameters.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.keycloak.testsuite.performance; - -/** - * - * @author tkyjovsk - */ -public class LoginLogoutTestParameters { - - // Statistics - public static final String ACCESS_REQUEST_TIME = "ACCESS_REQUEST"; - public static final String LOGIN_REQUEST_TIME = "LOGIN_REQUEST"; - public static final String LOGIN_VERIFY_REQUEST_TIME = "LOGIN_VERIFY_REQUEST"; - public static final String LOGOUT_REQUEST_TIME = "LOGOUT_REQUEST"; - public static final String LOGOUT_VERIFY_REQUEST_TIME = "LOGOUT_VERIFY_REQUEST"; - - // Limits - public static final Integer MAX_LOGIN_TIME_AVERAGE = Integer.parseInt(System.getProperty("max.login.time.average", "500")); - public static final Integer MAX_LOGOUT_TIME_AVERAGE = Integer.parseInt(System.getProperty("max.logout.time.average", "500")); - public static final double MAX_TIMEOUT_PERCENTAGE = Double.parseDouble(System.getProperty("max.timeout.percentage", "0")); - - // Other - public static final Integer PASSWORD_HASH_ITERATIONS = Integer.parseInt(System.getProperty("password.hash.iterations", "1")); - - public static boolean isMeasurementWithinLimits(PerformanceMeasurement measurement) { - return isTimeoutPercentageWithinLimits(measurement) - && measurement.getStatistics().get(LOGIN_REQUEST_TIME).getAverage() < MAX_LOGIN_TIME_AVERAGE - && measurement.getStatistics().get(LOGOUT_REQUEST_TIME).getAverage() < MAX_LOGOUT_TIME_AVERAGE; - } - - public static boolean isTimeoutPercentageWithinLimits(PerformanceMeasurement measurement) { - boolean withinLimits = true; - for (String statistic : measurement.getStatistics().keySet()) { - withinLimits = withinLimits && measurement.getTimeoutPercentage(statistic) <= MAX_TIMEOUT_PERCENTAGE; - } - return withinLimits; - } - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/LoopingRunnable.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/LoopingRunnable.java deleted file mode 100644 index 9cfcccc27b2..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/LoopingRunnable.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.keycloak.testsuite.performance; - -import static org.keycloak.testsuite.util.WaitUtils.pause; - -/** - * - * @author tkyjovsk - */ -public abstract class LoopingRunnable implements Runnable { - - private long sleepBetweenLoopsMillis; - private long loopCounter; - - public LoopingRunnable() { - this(0); - this.loopCounter = 0; - } - - public LoopingRunnable(long sleepBetweenLoopsMillis) { - this.sleepBetweenLoopsMillis = sleepBetweenLoopsMillis; - } - - public void setSleepBetweenLoopsMillis(long sleepBetweenLoopsMillis) { - this.sleepBetweenLoopsMillis = sleepBetweenLoopsMillis; - } - - public long getLoopCounter() { - return loopCounter; - } - - @Override - public void run() { - while (!Thread.interrupted()) { - loop(); - loopCounter++; - pause(sleepBetweenLoopsMillis); - } - } - - public abstract void loop(); - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/OperationTimeoutException.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/OperationTimeoutException.java deleted file mode 100644 index c3647667d4b..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/OperationTimeoutException.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.keycloak.testsuite.performance; - -/** - * - * @author tkyjovsk - */ -public class OperationTimeoutException extends Exception { - - private final String statistic; - private final long value; - - public OperationTimeoutException(String statistic, Throwable cause) { - this(statistic, 0, cause); - } - - public OperationTimeoutException(String statistic, long value, Throwable cause) { - super(cause); - this.statistic = statistic; - this.value = value; - } - - public String getStatistic() { - return statistic; - } - - public long getValue() { - return value; - } - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/PerformanceMeasurement.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/PerformanceMeasurement.java deleted file mode 100644 index 0cc0eb09964..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/PerformanceMeasurement.java +++ /dev/null @@ -1,147 +0,0 @@ -package org.keycloak.testsuite.performance; - -import org.apache.commons.csv.CSVFormat; -import org.apache.commons.csv.CSVPrinter; -import org.keycloak.testsuite.performance.statistics.SimpleStatistics; - -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; - -import static org.keycloak.testsuite.performance.PerformanceTest.LOG; -import static org.keycloak.testsuite.utils.io.IOUtil.PROJECT_BUILD_DIRECTORY; - -/** - * - * @author tkyjovsk - */ -public class PerformanceMeasurement { - - private final Date started; - private final int load; - private long durationMillis; - private SimpleStatistics statistics; - private SimpleStatistics timeoutStatistics; - - public static final DateFormat ISO8601_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXX"); // should be compatible with `date --iso-8601=seconds` - public static final DateFormat RFC3339_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ssZ"); // should be compatible with `date --rfc-3339=seconds` - - public PerformanceMeasurement(int load) { - this.started = new Date(); - this.load = load; - } - - public SimpleStatistics getStatistics() { - return this.statistics; - } - - public SimpleStatistics getTimeoutStatistics() { - return this.timeoutStatistics; - } - - public void setStatistics(SimpleStatistics statistics, SimpleStatistics timeoutStatistics) { - this.durationMillis = new Date().getTime() - started.getTime(); - if (durationMillis < 0) { - throw new IllegalStateException("Cannot set a negative duration."); - } - this.statistics = statistics; - this.timeoutStatistics = timeoutStatistics; - } - - private void checkStatisticsNotNull() { - if (statistics == null || timeoutStatistics == null) { - throw new IllegalStateException("Iteration doesn't have any statistics set."); - } - } - - public double getThroughput(String statistic) { - checkStatisticsNotNull(); - return (double) statistics.get(statistic).getCount() / durationMillis * 1000; - } - - public double getTimeoutPercentage(String statistic) { - checkStatisticsNotNull(); - long timeouts = timeoutStatistics.containsKey(statistic) ? timeoutStatistics.get(statistic).getCount() : 0; - return (double) timeouts / statistics.get(statistic).getCount(); - } - - public static final Object[] HEADER = new String[]{ - "Timestamp", - "Load", - "Duration", - "Count", - "Min", - "Max", - "Average", - "Standard Deviation", - "Timeout Percentage", - "Throughput",}; - - public List toRecord(String statistic) { - checkStatisticsNotNull(); - List record = new ArrayList(); - record.add(ISO8601_DATE_FORMAT.format(started)); - record.add(load); - record.add(durationMillis); - record.add(statistics.get(statistic).getCount()); - record.add(statistics.get(statistic).getMin()); - record.add(statistics.get(statistic).getMax()); - record.add(statistics.get(statistic).getAverage()); - record.add(statistics.get(statistic).getStandardDeviation()); - record.add(getTimeoutPercentage(statistic)); - record.add(getThroughput(statistic)); - return record; - } - - public void printToCSV() { - printToCSV(null); - } - - public void printToCSV(String testName) { - checkStatisticsNotNull(); - for (String statistic : statistics.keySet()) { - - File csvFile = new File(PROJECT_BUILD_DIRECTORY + "/measurements" + (testName == null ? "" : "/" + testName), - statistic + ".csv"); - boolean csvFileCreated = false; - if (!csvFile.exists()) { - try { - csvFile.getParentFile().mkdirs(); - csvFileCreated = csvFile.createNewFile(); - } catch (IOException ex) { - throw new RuntimeException(ex); - } - } - - try (BufferedWriter writer = new BufferedWriter(new FileWriter(csvFile, true))) { - - CSVPrinter printer = new CSVPrinter(writer, CSVFormat.RFC4180); - - if (csvFileCreated) { - printer.printRecord(HEADER); - } - printer.printRecord(toRecord(statistic)); - - printer.flush(); - } catch (IOException ex) { - throw new RuntimeException(ex); - } - } - } - - public void printToLog() { - LOG.info("Measurement results:"); - LOG.info("Operation " + Arrays.toString(HEADER)); - for (String statistic : statistics.keySet()) { - LOG.info(statistic + " " + toRecord(statistic)); - } - } - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/PerformanceStatistics.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/PerformanceStatistics.java deleted file mode 100644 index af881c09888..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/PerformanceStatistics.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.keycloak.testsuite.performance; - -import org.keycloak.testsuite.performance.statistics.DataHoldingUpdatableStatistic; -import org.keycloak.testsuite.performance.statistics.MovingUpdatableStatistic; -import org.keycloak.testsuite.performance.statistics.SimpleStatistics; -import org.keycloak.testsuite.performance.statistics.UpdatableStatistic; -import org.keycloak.testsuite.performance.statistics.UpdatableStatistics; - -import java.util.concurrent.ConcurrentHashMap; - -/** - * PerformanceStatistics. Concurrent hash map of UpdatableStatistic objects, - * type of which can be selected by the "statistic.type" property. - * - * @author tkyjovsk - */ -public class PerformanceStatistics extends ConcurrentHashMap implements UpdatableStatistics { - - public static final String STATISTIC_TYPE = System.getProperty("statistic.type", MovingUpdatableStatistic.STATISTIC_TYPE_PROPERTY_VALUE); - - @Override - public void reset() { - clear(); - } - - private UpdatableStatistic createIfNullAndGet(String statistic) { - UpdatableStatistic updatableStatistic = get(statistic); - if (updatableStatistic == null) { - switch (STATISTIC_TYPE) { - case DataHoldingUpdatableStatistic.STATISTIC_TYPE_PROPERTY_VALUE: - updatableStatistic = new DataHoldingUpdatableStatistic(); - break; - case MovingUpdatableStatistic.STATISTIC_TYPE_PROPERTY_VALUE: - updatableStatistic = new DataHoldingUpdatableStatistic(); - break; - default: - throw new IllegalStateException(String.format( - "Unknown statistic type: '%s'. Supported values: %s | %s", - STATISTIC_TYPE, - DataHoldingUpdatableStatistic.STATISTIC_TYPE_PROPERTY_VALUE, - MovingUpdatableStatistic.STATISTIC_TYPE_PROPERTY_VALUE)); - } - put(statistic, updatableStatistic); - } - return updatableStatistic; - } - - @Override - public void addValue(String statistic, long value) { - createIfNullAndGet(statistic).addValue(value); - } - - public SimpleStatistics snapshot() { - return new SimpleStatistics(this); - } - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/PerformanceTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/PerformanceTest.java deleted file mode 100644 index caf3afe03d4..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/PerformanceTest.java +++ /dev/null @@ -1,225 +0,0 @@ -package org.keycloak.testsuite.performance; - -import org.jboss.logging.Logger; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.keycloak.testsuite.adapter.AbstractExampleAdapterTest; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; - -import static org.keycloak.testsuite.util.WaitUtils.pause; - -/** - * PerformanceTest. - * - * @author tkyjovsk - */ -public abstract class PerformanceTest extends AbstractExampleAdapterTest { - - public static final Logger LOG = Logger.getLogger(PerformanceTest.class); - - public static final Integer WARMUP_LOAD = Integer.parseInt(System.getProperty("warmup.load", "5")); - public static final Integer WARMUP_DURATION = Integer.parseInt(System.getProperty("warmup.duration", "30")); - - public static final Integer INITIAL_LOAD = Integer.parseInt(System.getProperty("initial.load", "10")); // load for the first iteration - public static final Integer LOAD_INCREASE = Integer.parseInt(System.getProperty("load.increase", "10")); // how many threads to add before each iteration - public static final Integer LOAD_INCREASE_RATE = Integer.parseInt(System.getProperty("load.increase.rate", "2")); // how fast to add the new threads per second - - public static final Integer MEASUREMENT_DURATION = Integer.parseInt(System.getProperty("measurement.duration", "20")); // duration of one measurement iteration - - public static final Integer MAX_ITERATIONS = Integer.parseInt(System.getProperty("max.iterations", "10")); - public static final Integer MAX_THREADS = Integer.parseInt(System.getProperty("max.threads", "1000")); - - public static final Integer SLEEP_BETWEEN_LOOPS = Integer.parseInt(System.getProperty("sleep.between.loops", "0")); - public static final Integer THREADPOOL_TERMINATION_TIMEOUT = Integer.parseInt(System.getProperty("threadpool.termination.timeout", "10")); - public static final Integer ADDITIONAL_SLEEP_AFTER = Integer.parseInt(System.getProperty("additional.sleep.after", "0")); - - public static final String SCENARIO_TIME = "SCENARIO"; - - private int currentLoad; - - private ExecutorService executorService; - - protected PerformanceStatistics statistics = new PerformanceStatistics(); - protected PerformanceStatistics timeoutStatistics = new PerformanceStatistics(); // for keeping track of # of conn. timeout exceptions - - protected List measurements = new ArrayList<>(); - - @Before - public void before() { - if (WARMUP_LOAD > INITIAL_LOAD) { - throw new IllegalArgumentException("'warmup.load' cannot be larger than 'initial.load'"); - } - - executorService = Executors.newFixedThreadPool(MAX_THREADS); - currentLoad = 0; - - statistics.clear(); - timeoutStatistics.clear(); - } - - @After - public void after() throws IOException, InterruptedException { - executorService.shutdown(); - - LOG.info("Waiting for threadpool termination."); - executorService.awaitTermination(THREADPOOL_TERMINATION_TIMEOUT, TimeUnit.SECONDS); - pause(ADDITIONAL_SLEEP_AFTER * 1000); - - LOG.info("Logging out all sessions."); - testRealmResource().logoutAll(); - } - - @Test - public void test() { - - increaseLoadBy(WARMUP_LOAD); // increase to warmup load - warmup(); - - for (int i = 0; i < MAX_ITERATIONS; i++) { - - int loadIncrease = (i == 0) - ? INITIAL_LOAD - WARMUP_LOAD // increase from warmup to initial load - : LOAD_INCREASE; // increase load between measurements - - increaseLoadBy(loadIncrease); - measurePerformance(); - - if (!isThereEnoughThreadsForNextIteration(LOAD_INCREASE)) { - LOG.warn("Threadpool capacity reached. Stopping the test."); - break; - } - if (!isLatestMeasurementWithinLimits()) { - LOG.warn("The latest measurement exceeded expected limit. Stopping the test."); - break; - } - } - - } - - private void warmup() { - LOG.info("Warming up for " + WARMUP_DURATION + " s"); - pauseWithErrorChecking(WARMUP_DURATION * 1000); - } - - private boolean isThereEnoughThreadsForNextIteration(int loadIncrease) { - return currentLoad + loadIncrease <= MAX_THREADS; - } - - private void increaseLoadBy(int loadIncrease) { - if (loadIncrease < 0) { - throw new IllegalArgumentException("Cannot increase load by a negative number (" + loadIncrease + ")."); - } - if (!isThereEnoughThreadsForNextIteration(loadIncrease)) { - throw new IllegalArgumentException("Cannot increase load beyond threadpool capacity (" + MAX_THREADS + ")."); - } - if (loadIncrease > 0) { - LOG.info(String.format("Increasing load from %s to %s at +%s clients/s.", currentLoad, currentLoad + loadIncrease, LOAD_INCREASE_RATE)); - for (int t = 0; t < loadIncrease; t++) { - executorService.submit(newRunnable()); - currentLoad++; - pauseWithErrorChecking(1000 / LOAD_INCREASE_RATE); - } - } - } - - private void measurePerformance() { - PerformanceMeasurement measurement = new PerformanceMeasurement(currentLoad); - statistics.reset(); - timeoutStatistics.reset(); - - LOG.info(String.format("Measuring performance. Iteration: %s, Load: %s, Duration: %s s", measurements.size() + 1, currentLoad, MEASUREMENT_DURATION)); - - pauseWithErrorChecking(MEASUREMENT_DURATION * 1000); - - measurement.setStatistics( - statistics.snapshot(), - timeoutStatistics.snapshot()); - measurements.add(measurement); - - measurement.printToCSV(getTestName()); - measurement.printToLog(); - } - - private Throwable error = null; - - public synchronized Throwable getError() { - return error; - } - - public synchronized void setError(Throwable error) { - this.error = error; - } - - protected void pauseWithErrorChecking(long millis) { - pauseWithErrorChecking(millis, 1000); - } - - protected void pauseWithErrorChecking(long millis, long checkDurationMillis) { - long checkDurationMillisMin = Math.min(millis, checkDurationMillis); - long checkCount = millis / checkDurationMillis; - long remainder = millis % checkDurationMillis; - LOG.debug(String.format("Pause %s ms, checking errors once per %s ms", millis, checkDurationMillisMin)); - for (int i = 0; i < checkCount + 1; i++) { // loop 'count' times + once for remainder - if (i < checkCount || remainder > 0) { // on last iteration check if any remainder - pause(checkDurationMillisMin); - if (getError() != null) { - throw new RuntimeException("PerformanceTestRunnable threw an exception. Stopping the test.", getError()); - } - } - } - } - - protected PerformanceMeasurement getLatestMeasurement() { - return measurements.isEmpty() ? null : measurements.get(measurements.size() - 1); - } - - protected boolean isLatestMeasurementWithinLimits() { - return isMeasurementWithinLimits(getLatestMeasurement()); - } - - protected abstract boolean isMeasurementWithinLimits(PerformanceMeasurement measurement); - - protected abstract Runnable newRunnable(); - - public abstract class Runnable extends LoopingRunnable { - - protected final Timer timer; // for timing individual operations/requests - private final Timer scenarioTimer; // for timing the whole scenario - - public Runnable() { - super(SLEEP_BETWEEN_LOOPS * 1000); - this.timer = new Timer(); - this.scenarioTimer = new Timer(); - } - - @Override - public void loop() { - try { - scenarioTimer.reset(); - performanceScenario(); - statistics.addValue(SCENARIO_TIME, scenarioTimer.getElapsedTime()); - } catch (OperationTimeoutException ex) { - timeoutStatistics.addValue(ex.getStatistic(), ex.getValue()); - LOG.debug(String.format("Operation %s timed out. Cause: %s.", ex.getStatistic(), ex.getCause())); - } catch (AssertionError | Exception ex) { - setError(ex); - throw new RuntimeException(ex); - } - } - - public abstract void performanceScenario() throws Exception; - - } - - public String getTestName() { - return this.getClass().getSimpleName(); - } - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/Timer.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/Timer.java deleted file mode 100644 index 8edb3267378..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/Timer.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.keycloak.testsuite.performance; - -import java.util.Date; - -/** - * - * @author tkyjovsk - */ -public final class Timer { - - private long time; - - public Timer() { - reset(); - } - - public long reset() { - time = new Date().getTime(); - return time; - } - - public long getElapsedTime() { - return new Date().getTime() - time; - } - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/htmlunit/HtmlUnitLoginLogoutPerfTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/htmlunit/HtmlUnitLoginLogoutPerfTest.java deleted file mode 100644 index b4ba6a36c42..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/htmlunit/HtmlUnitLoginLogoutPerfTest.java +++ /dev/null @@ -1,166 +0,0 @@ -package org.keycloak.testsuite.performance.htmlunit; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.graphene.page.Page; -import org.jboss.logging.Logger; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Before; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; -import org.keycloak.testsuite.performance.LoginLogoutTestParameters; -import org.keycloak.testsuite.performance.OperationTimeoutException; -import org.keycloak.testsuite.performance.PerformanceMeasurement; -import org.keycloak.testsuite.performance.PerformanceTest; -import org.keycloak.testsuite.performance.page.AppProfileJEE; -import org.openqa.selenium.By; -import org.openqa.selenium.TimeoutException; - -import java.io.File; -import java.io.IOException; -import java.util.List; - -import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.performance.LoginLogoutTestParameters.ACCESS_REQUEST_TIME; -import static org.keycloak.testsuite.performance.LoginLogoutTestParameters.LOGIN_REQUEST_TIME; -import static org.keycloak.testsuite.performance.LoginLogoutTestParameters.LOGIN_VERIFY_REQUEST_TIME; -import static org.keycloak.testsuite.performance.LoginLogoutTestParameters.LOGOUT_REQUEST_TIME; -import static org.keycloak.testsuite.performance.LoginLogoutTestParameters.LOGOUT_VERIFY_REQUEST_TIME; -import static org.keycloak.testsuite.performance.LoginLogoutTestParameters.PASSWORD_HASH_ITERATIONS; -import static org.keycloak.testsuite.utils.io.IOUtil.loadRealm; - -/** - * - * @author tkyjovsk - */ -@AppServerContainer("app-server-remote") -public class HtmlUnitLoginLogoutPerfTest extends HtmlUnitPerformanceTest { - - private static final Logger LOG = Logger.getLogger(HtmlUnitLoginLogoutPerfTest.class); - - private static final String EXAMPLES = "Examples"; - - private String unsecuredUrl; - private String securedUrl; - private String username; - private String password; - private String loginPageUrl; - - @Page - protected AppProfileJEE appProfileJEEPage; - - protected static WebArchive warDeployment(String filename) throws IOException { - return ShrinkWrap.createFromZipFile(WebArchive.class, - new File(EXAMPLES_HOME + "/" + filename + ".war")) - .addAsWebInfResource(jbossDeploymentStructure, JBOSS_DEPLOYMENT_STRUCTURE_XML); - } - - @Deployment(name = AppProfileJEE.DEPLOYMENT_NAME) - private static WebArchive appProfileJEE() throws IOException { - return warDeployment("keycloak-quickstart-app-profile-jee-0.5-SNAPSHOT"); - } - - @Override - public void setDefaultPageUriParameters() { - super.setDefaultPageUriParameters(); - testRealmPage.setAuthRealm(EXAMPLES); - } - - @Override - public void addAdapterTestRealms(List testRealms) { - RealmRepresentation examplesRealm = loadRealm("/examples-realm.json"); - examplesRealm.setPasswordPolicy("hashIterations(" + PASSWORD_HASH_ITERATIONS + ")"); - testRealms.add(examplesRealm); - } - - @Before - public void beforeLoginLogoutTest() { - unsecuredUrl = appProfileJEEPage + "/index.jsp"; - securedUrl = appProfileJEEPage + "/profile.jsp"; - username = "secure-user"; - password = "password"; - loginPageUrl = testRealmLoginPage.toString(); - } - - @Override - public PerformanceTest.Runnable newRunnable() { - return new Runnable(); - } - - @Override - protected boolean isMeasurementWithinLimits(PerformanceMeasurement measurement) { - return LoginLogoutTestParameters.isMeasurementWithinLimits(measurement); - } - - public class Runnable extends HtmlUnitPerformanceTest.Runnable { - - @Override - public void performanceScenario() throws Exception { - LOG.trace(String.format("Starting login-logout scenario #%s", getLoopCounter())); - driver.manage().deleteAllCookies(); - - // ACCESS - LOG.trace(String.format("Accessing secured URL: %s", securedUrl)); - try { - timer.reset(); - driver.get(securedUrl); - assertTrue(driver.getCurrentUrl().startsWith(loginPageUrl)); - } catch (TimeoutException ex) { - throw new OperationTimeoutException(ACCESS_REQUEST_TIME, ex); - } - statistics.addValue(ACCESS_REQUEST_TIME, timer.getElapsedTime()); - - // LOGIN - LOG.trace("Logging in"); - try { - driver.findElement(By.id("username")).clear(); - driver.findElement(By.id("username")).sendKeys(username); - driver.findElement(By.id("password")).clear(); - driver.findElement(By.id("password")).sendKeys(password); - timer.reset(); - driver.findElement(By.name("login")).click(); - assertTrue(driver.getCurrentUrl().equals(securedUrl)); - } catch (TimeoutException ex) { - throw new OperationTimeoutException(LOGIN_REQUEST_TIME, ex); - } - statistics.addValue(LOGIN_REQUEST_TIME, timer.getElapsedTime()); - - // VERIFY LOGIN - LOG.trace("Verifying login"); - try { - timer.reset(); - driver.get(securedUrl); - assertTrue(driver.getCurrentUrl().equals(securedUrl)); - } catch (TimeoutException ex) { - throw new OperationTimeoutException(LOGIN_VERIFY_REQUEST_TIME, ex); - } - statistics.addValue(LOGIN_VERIFY_REQUEST_TIME, timer.getElapsedTime()); - - // LOGOUT - LOG.trace("Logging out"); - try { - timer.reset(); - driver.findElement(By.xpath("//button[text()='Logout']")).click(); - assertTrue(driver.getCurrentUrl().startsWith(unsecuredUrl)); - } catch (TimeoutException ex) { - throw new OperationTimeoutException(LOGOUT_REQUEST_TIME, ex); - } - statistics.addValue(LOGOUT_REQUEST_TIME, timer.getElapsedTime()); - - // VERIFY LOGOUT - LOG.trace("Verifying logout"); - try { - timer.reset(); - driver.get(securedUrl); - assertTrue(driver.getCurrentUrl().startsWith(loginPageUrl)); - } catch (TimeoutException ex) { - throw new OperationTimeoutException(LOGOUT_VERIFY_REQUEST_TIME, ex); - } - statistics.addValue(LOGOUT_VERIFY_REQUEST_TIME, timer.getElapsedTime()); - - LOG.trace("Logged out"); - } - - } - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/htmlunit/HtmlUnitPerformanceTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/htmlunit/HtmlUnitPerformanceTest.java deleted file mode 100644 index ae9dd5070f1..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/htmlunit/HtmlUnitPerformanceTest.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.keycloak.testsuite.performance.htmlunit; - -import com.gargoylesoftware.htmlunit.WebClient; -import org.keycloak.testsuite.performance.PerformanceTest; - -/** - * - * @author tkyjovsk - */ -public abstract class HtmlUnitPerformanceTest extends PerformanceTest { - - public abstract class Runnable extends PerformanceTest.Runnable { - - protected HtmlUnitDriver driver; - - public Runnable() { - driver = new HtmlUnitDriver(true, false); - } - - public final class HtmlUnitDriver extends org.openqa.selenium.htmlunit.HtmlUnitDriver { - - public HtmlUnitDriver(boolean javaScriptEnabled, boolean cssEnabled) { - getWebClient().getOptions().setJavaScriptEnabled(javaScriptEnabled); - getWebClient().getOptions().setCssEnabled(cssEnabled); - } - - @Override - public WebClient getWebClient() { - return super.getWebClient(); - } - - } - - } - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/httpclient/HttpClientLoginLogoutPerfTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/httpclient/HttpClientLoginLogoutPerfTest.java deleted file mode 100644 index 40a188f40a2..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/httpclient/HttpClientLoginLogoutPerfTest.java +++ /dev/null @@ -1,239 +0,0 @@ -package org.keycloak.testsuite.performance.httpclient; - -import org.apache.http.Header; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.util.EntityUtils; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.graphene.page.Page; -import org.jboss.logging.Logger; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Before; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; -import org.keycloak.testsuite.performance.LoginLogoutTestParameters; -import org.keycloak.testsuite.performance.OperationTimeoutException; -import org.keycloak.testsuite.performance.PerformanceMeasurement; -import org.keycloak.testsuite.performance.PerformanceTest; -import org.keycloak.testsuite.performance.page.AppProfileJEE; - -import java.io.File; -import java.io.IOException; -import java.net.SocketException; -import java.net.SocketTimeoutException; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import static java.net.HttpURLConnection.HTTP_OK; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.performance.LoginLogoutTestParameters.ACCESS_REQUEST_TIME; -import static org.keycloak.testsuite.performance.LoginLogoutTestParameters.LOGIN_REQUEST_TIME; -import static org.keycloak.testsuite.performance.LoginLogoutTestParameters.LOGIN_VERIFY_REQUEST_TIME; -import static org.keycloak.testsuite.performance.LoginLogoutTestParameters.LOGOUT_REQUEST_TIME; -import static org.keycloak.testsuite.performance.LoginLogoutTestParameters.LOGOUT_VERIFY_REQUEST_TIME; -import static org.keycloak.testsuite.performance.LoginLogoutTestParameters.PASSWORD_HASH_ITERATIONS; -import static org.keycloak.testsuite.utils.io.IOUtil.loadRealm; - -/** - * - * @author tkyjovsk - */ -@AppServerContainer("app-server-remote") -public class HttpClientLoginLogoutPerfTest extends HttpClientPerformanceTest { - - private static final Logger LOG = Logger.getLogger(HttpClientLoginLogoutPerfTest.class); - - private static final String TEST_REALM = "Test"; - - private String securedUrl; - private String logoutUrl; - private String username; - private String password; - private String loginPageUrl; - - @Page - protected AppProfileJEE appProfileJEEPage; - - protected static WebArchive warDeployment(String filename) throws IOException { - return ShrinkWrap.createFromZipFile(WebArchive.class, - new File(EXAMPLES_HOME + "/" + filename + ".war")) - .addAsWebInfResource(jbossDeploymentStructure, JBOSS_DEPLOYMENT_STRUCTURE_XML); - } - - @Deployment(name = AppProfileJEE.DEPLOYMENT_NAME) - private static WebArchive appProfileJEE() throws IOException { - return exampleDeployment("keycloak-test-app-profile-jee"); - } - - @Override - public void setDefaultPageUriParameters() { - super.setDefaultPageUriParameters(); - testRealmPage.setAuthRealm(TEST_REALM); - } - - @Override - public void addAdapterTestRealms(List testRealms) { - RealmRepresentation examplesRealm = loadRealm("/test-realm.json"); - examplesRealm.setPasswordPolicy("hashIterations(" + PASSWORD_HASH_ITERATIONS + ")"); - testRealms.add(examplesRealm); - } - - @Before - public void beforeLoginLogoutTest() { - securedUrl = appProfileJEEPage + "/profile.jsp"; - logoutUrl = appProfileJEEPage + "/index.jsp?logout=true"; - username = "secure-user"; - password = "password"; - loginPageUrl = testRealmLoginPage.toString(); - } - - @Override - public PerformanceTest.Runnable newRunnable() { - return new Runnable(); - } - - @Override - protected boolean isMeasurementWithinLimits(PerformanceMeasurement measurement) { - return LoginLogoutTestParameters.isMeasurementWithinLimits(measurement); - } - - public class Runnable extends HttpClientPerformanceTest.Runnable { - - @Override - public void performanceScenario() throws IOException, OperationTimeoutException { - LOG.trace(String.format("Starting login-logout scenario #%s", getLoopCounter())); - context.getCookieStore().clear(); - - // ACCESS - String pageContent; - final HttpGet getSecuredPageRequest = new HttpGet(securedUrl); - LOG.trace(String.format("Accessing secured URL: %s", getSecuredPageRequest)); - LOG.trace(getSecuredPageRequest); - timer.reset(); - try (CloseableHttpResponse r = client.execute(getSecuredPageRequest, context)) { - assertEquals("ACCESS_REQUEST OK", HTTP_OK, r.getStatusLine().getStatusCode()); - logRedirects(); - assertEquals("ACCESS_REQUEST has 1 redirect", 1, context.getRedirectLocations().size()); - assertTrue("ACCESS_REQUEST redirects to login page", getLastRedirect().toASCIIString().startsWith(loginPageUrl)); - pageContent = EntityUtils.toString(r.getEntity()); - } catch (SocketException ex) { - throw new OperationTimeoutException(ACCESS_REQUEST_TIME, ex); - } catch (SocketTimeoutException ex) { - throw new OperationTimeoutException(ACCESS_REQUEST_TIME, ex.bytesTransferred, ex); - } - statistics.addValue(ACCESS_REQUEST_TIME, timer.getElapsedTime()); - - // LOGIN - final HttpPost loginRequest = new HttpPost(getLoginUrlFromPage(pageContent)); - List credentials = new ArrayList<>(); - credentials.add(new BasicNameValuePair("username", username)); - credentials.add(new BasicNameValuePair("password", password)); - loginRequest.setEntity(new UrlEncodedFormEntity(credentials)); - - LOG.trace("Logging in"); - LOG.trace(loginRequest); - timer.reset(); - try (CloseableHttpResponse r = client.execute(loginRequest, context)) { - assertEquals("LOGIN_REQUEST OK", HTTP_OK, r.getStatusLine().getStatusCode()); - logRedirects(); - assertEquals("LOGIN_REQUEST has 2 redirects", 2, context.getRedirectLocations().size()); - assertTrue("LOGIN_REQUEST redirects to secured page", getLastRedirect().toASCIIString().equals(securedUrl)); - } catch (SocketException ex) { - throw new OperationTimeoutException(LOGIN_REQUEST_TIME, ex); - } catch (SocketTimeoutException ex) { - throw new OperationTimeoutException(LOGIN_REQUEST_TIME, ex.bytesTransferred, ex); - } - statistics.addValue(LOGIN_REQUEST_TIME, timer.getElapsedTime()); - - // VERIFY LOGIN - LOG.trace("Verifying login"); - LOG.trace(getSecuredPageRequest); - timer.reset(); - try (CloseableHttpResponse r = client.execute(getSecuredPageRequest, context)) { - assertEquals("LOGIN_VERIFY_REQUEST OK", HTTP_OK, r.getStatusLine().getStatusCode()); - logRedirects(); - assertEquals("LOGIN_VERIFY_REQUEST has 0 redirects", 0, context.getRedirectLocations().size()); - } catch (SocketException ex) { - throw new OperationTimeoutException(LOGIN_VERIFY_REQUEST_TIME, ex); - } catch (SocketTimeoutException ex) { - throw new OperationTimeoutException(LOGIN_VERIFY_REQUEST_TIME, ex.bytesTransferred, ex); - } - statistics.addValue(LOGIN_VERIFY_REQUEST_TIME, timer.getElapsedTime()); - - // LOGOUT - final HttpGet logoutRequest = new HttpGet(logoutUrl); - LOG.trace("Logging out"); - LOG.trace(logoutRequest); - timer.reset(); - try (CloseableHttpResponse r = client.execute(logoutRequest, context)) { - assertEquals("LOGOUT_REQUEST OK", HTTP_OK, r.getStatusLine().getStatusCode()); - logRedirects(); - assertEquals("LOGOUT_REQUEST has 0 redirects", 0, context.getRedirectLocations().size()); - } catch (SocketException ex) { - throw new OperationTimeoutException(LOGOUT_REQUEST_TIME, ex); - } catch (SocketTimeoutException ex) { - throw new OperationTimeoutException(LOGOUT_REQUEST_TIME, ex.bytesTransferred, ex); - } - statistics.addValue(LOGOUT_REQUEST_TIME, timer.getElapsedTime()); - - // VERIFY LOGOUT - LOG.trace("Verifying logout"); - LOG.trace(getSecuredPageRequest); - timer.reset(); - try (CloseableHttpResponse r = client.execute(getSecuredPageRequest, context)) { - assertEquals("LOGOUT_VERIFY_REQUEST OK", HTTP_OK, r.getStatusLine().getStatusCode()); - logRedirects(); - assertEquals("LOGOUT_VERIFY_REQUEST has 1 redirect", 1, context.getRedirectLocations().size()); - assertTrue("LOGOUT_VERIFY_REQUEST redirects to login page", getLastRedirect().toASCIIString().startsWith(loginPageUrl)); - } catch (SocketException ex) { - throw new OperationTimeoutException(LOGOUT_VERIFY_REQUEST_TIME, ex); - } catch (SocketTimeoutException ex) { - throw new OperationTimeoutException(LOGOUT_VERIFY_REQUEST_TIME, ex.bytesTransferred, ex); - } - statistics.addValue(LOGOUT_VERIFY_REQUEST_TIME, timer.getElapsedTime()); - - LOG.trace("Logged out"); - - } - - private URI getLastRedirect() { - return context.getRedirectLocations().get(context.getRedirectLocations().size() - 1); - } - - private void logRedirects() { - int i = 0; - for (URI uri : context.getRedirectLocations()) { - LOG.trace(String.format("--> REDIRECT %s: %s", ++i, uri.toASCIIString())); - } - } - - public String getRedirectLocation(CloseableHttpResponse r) { - Header locationHeader = r.getFirstHeader("Location"); - assertNotNull(locationHeader); - return locationHeader.getValue(); - } - - private String getLoginUrlFromPage(String content) { - String formActionRegex = "]+action\\s*=\\s*['\"]([^'\"]+)['\"][^>]*>"; - Pattern p = Pattern.compile(formActionRegex); - Matcher m = p.matcher(content); - if (m.find()) { - return m.group(1); - } else { - throw new IllegalStateException("Login url counldn't be parsed form page."); - } - } - - } - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/httpclient/HttpClientPerformanceTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/httpclient/HttpClientPerformanceTest.java deleted file mode 100644 index 6e159e477f8..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/httpclient/HttpClientPerformanceTest.java +++ /dev/null @@ -1,116 +0,0 @@ -package org.keycloak.testsuite.performance.httpclient; - -import org.apache.http.client.config.CookieSpecs; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpHead; -import org.apache.http.client.methods.HttpOptions; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.protocol.HttpClientContext; -import org.apache.http.config.SocketConfig; -import org.apache.http.impl.client.BasicCookieStore; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.DefaultHttpRequestRetryHandler; -import org.apache.http.impl.client.DefaultRedirectStrategy; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; -import org.junit.After; -import org.junit.Before; -import org.keycloak.testsuite.performance.PerformanceTest; - -import java.io.IOException; - -import static org.keycloak.testsuite.performance.PerformanceTest.MAX_THREADS; - -/** - * - * @author tkyjovsk - */ -public abstract class HttpClientPerformanceTest extends PerformanceTest { - - protected CloseableHttpClient client; - - public static final Integer HTTP_CLIENT_SOCKET_TIMEOUT = Integer.parseInt(System.getProperty("httpclient.socket.timeout", "10000")); - public static final Integer HTTP_CLIENT_CONNECT_TIMEOUT = Integer.parseInt(System.getProperty("httpclient.connect.timeout", "10000")); - public static final Integer HTTP_CLIENT_CONNECTION_REQUEST_TIMEOUT = Integer.parseInt(System.getProperty("httpclient.connection-request.timeout", "10000")); - - @Before - public void initializeClient() { - PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(); - connectionManager.setMaxTotal(Math.max(1, MAX_THREADS / 10)); - connectionManager.setDefaultMaxPerRoute(connectionManager.getMaxTotal()); - connectionManager.setValidateAfterInactivity(10000); - connectionManager.setDefaultSocketConfig(getDefaultSocketConfig()); - - client = HttpClients.custom() - .setConnectionManager(connectionManager) - .setDefaultCookieStore(new BasicCookieStore()) - .setDefaultRequestConfig(getDefaultRequestConfig()) - .setRedirectStrategy(new CustomRedirectStrategy()) - .setRetryHandler(new DefaultHttpRequestRetryHandler(0, false)) - .build(); - } - - protected SocketConfig getDefaultSocketConfig() { - return SocketConfig.copy(SocketConfig.DEFAULT) - .setSoTimeout(HTTP_CLIENT_SOCKET_TIMEOUT).build(); - } - - protected RequestConfig getDefaultRequestConfig() { - return RequestConfig.custom() - .setSocketTimeout(HTTP_CLIENT_SOCKET_TIMEOUT) - .setConnectTimeout(HTTP_CLIENT_CONNECT_TIMEOUT) - .setConnectionRequestTimeout(HTTP_CLIENT_CONNECTION_REQUEST_TIMEOUT) - .setCookieSpec(CookieSpecs.DEFAULT) - .setRedirectsEnabled(true) - .setRelativeRedirectsAllowed(true) - .setCircularRedirectsAllowed(false) - .setMaxRedirects(2) - .build(); - } - - public class CustomRedirectStrategy extends DefaultRedirectStrategy { - - private final String[] REDIRECT_METHODS; - - public CustomRedirectStrategy() { - this.REDIRECT_METHODS = new String[]{ - HttpGet.METHOD_NAME, - HttpPost.METHOD_NAME, - HttpHead.METHOD_NAME, - HttpDelete.METHOD_NAME, - HttpOptions.METHOD_NAME - }; - } - - @Override - protected boolean isRedirectable(String method) { - for (final String m : REDIRECT_METHODS) { - if (m.equalsIgnoreCase(method)) { - return true; - } - } - return false; - } - - } - - @After - public void closeClient() throws IOException { - client.close(); - } - - - public abstract class Runnable extends PerformanceTest.Runnable { - - protected HttpClientContext context; - - public Runnable() { - this.context = HttpClientContext.create(); - this.context.setCookieStore(new BasicCookieStore()); - } - - } - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/DataHoldingUpdatableStatistic.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/DataHoldingUpdatableStatistic.java deleted file mode 100644 index 91227492b2e..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/DataHoldingUpdatableStatistic.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.keycloak.testsuite.performance.statistics; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -/** - * - * @author tkyjovsk - */ -public class DataHoldingUpdatableStatistic implements UpdatableStatistic { - - public static final String STATISTIC_TYPE_PROPERTY_VALUE = "data"; - - private final List data = Collections.synchronizedList(new ArrayList()); - - @Override - public synchronized void reset() { - data.clear(); - } - - @Override - public synchronized void addValue(long value) { - data.add(value); - } - - @Override - public synchronized long getCount() { - return data.size(); - } - - @Override - public synchronized long getMin() { - return Collections.min(data); - } - - @Override - public synchronized long getMax() { - return Collections.max(data); - } - - @Override - public synchronized double getAverage() { - long sum = 0; - for (long l : data) { - sum += l; - } - return data.isEmpty() ? 0 : sum / data.size(); - } - - @Override - public synchronized double getStandardDeviation() { - double average = getAverage(); - long sumSquare = 0; - for (long l : data) { - sumSquare += l * l; - } - return data.isEmpty() ? 0 - : Math.sqrt(sumSquare / data.size() - (average * average)); - } - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/MovingUpdatableStatistic.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/MovingUpdatableStatistic.java deleted file mode 100644 index 553a80cfb89..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/MovingUpdatableStatistic.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.keycloak.testsuite.performance.statistics; - -import java.math.BigDecimal; - -/** - * Allows to compute statistical values without holding the actual measurements. - * - * @author tkyjovsk - */ -public final class MovingUpdatableStatistic implements UpdatableStatistic { - - public static final String STATISTIC_TYPE_PROPERTY_VALUE = "moving"; - - private BigDecimal sum; - private BigDecimal sumSquare; - private long count; - private long min; - private long max; - - public MovingUpdatableStatistic() { - reset(); - } - - @Override - public synchronized void reset() { - this.sum = new BigDecimal(0); - this.sumSquare = new BigDecimal(0); - count = 0; - min = Long.MAX_VALUE; - max = 0; - } - - @Override - public synchronized void addValue(long value) { - sum = sum.add(new BigDecimal(value)); - sumSquare = sumSquare.add(new BigDecimal(value * value)); - min = Math.min(min, value); - max = Math.max(max, value); - count++; - } - - @Override - public synchronized long getCount() { - return count; - } - - @Override - public synchronized long getMin() { - return min; - } - - @Override - public synchronized long getMax() { - return max; - } - - @Override - public synchronized double getAverage() { - return count == 0 ? 0 - : sum.longValue() / count; - } - - @Override - public synchronized double getStandardDeviation() { - double average = getAverage(); - return count == 0 ? 0 - : Math.sqrt(sumSquare.longValue() / count - (average * average)); - } - - @Override - public String toString() { - return Double.toString(getAverage()); - } - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/SimpleStatistic.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/SimpleStatistic.java deleted file mode 100644 index a142882ba1f..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/SimpleStatistic.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.keycloak.testsuite.performance.statistics; - -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; - -/** - * SimpleStatistic just holds data. - * - * @author tkyjovsk - */ -public class SimpleStatistic implements Statistic { - - private final long count; - private final long min; - private final long max; - private final double average; - private final double standardDeviation; - - public SimpleStatistic(long count, long min, long max, double average, double standardDeviation) { - this.count = count; - this.min = min; - this.max = max; - this.average = average; - this.standardDeviation = standardDeviation; - } - - public SimpleStatistic(Statistic statistic) { - this( - statistic.getCount(), - statistic.getMin(), - statistic.getMax(), - statistic.getAverage(), - statistic.getStandardDeviation()); - } - - @Override - public long getCount() { - return count; - } - - @Override - public long getMin() { - return min; - } - - @Override - public long getMax() { - return max; - } - - @Override - public double getAverage() { - return average; - } - - @Override - public double getStandardDeviation() { - return standardDeviation; - } - - @Override - public String toString() { - return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE); - } - - public String toLogString() { - return count + " " + min + " " + max + " " + average + " " + standardDeviation; - } - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/SimpleStatistics.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/SimpleStatistics.java deleted file mode 100644 index 185e0c615ce..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/SimpleStatistics.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.keycloak.testsuite.performance.statistics; - -import java.util.TreeMap; - -/** - * - * @author tkyjovsk - */ -public class SimpleStatistics extends TreeMap implements Statistics { - - public SimpleStatistics(Statistics statistics) { - for (Object statistic : statistics.keySet()) { - put(statistic.toString(), new SimpleStatistic((Statistic) statistics.get(statistic))); - } - } - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/Statistic.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/Statistic.java deleted file mode 100644 index 44e526243c1..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/Statistic.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.keycloak.testsuite.performance.statistics; - -/** - * Statistic provides statistical information about a data set. - * Number of measurements, minimum/maximum/average value and standard deviation. - * - * @author tkyjovsk - */ -public interface Statistic { - - public long getCount(); - public long getMin(); - public long getMax(); - public double getAverage(); - public double getStandardDeviation(); - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/Statistics.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/Statistics.java deleted file mode 100644 index e17bf38dac2..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/Statistics.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.keycloak.testsuite.performance.statistics; - -import java.util.Map; - -/** - * A Map of named statistics. - * - * @author tkyjovsk - * @param - */ -public interface Statistics extends Map { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/UpdatableStatistic.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/UpdatableStatistic.java deleted file mode 100644 index 28d88a1e016..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/UpdatableStatistic.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.keycloak.testsuite.performance.statistics; - -/** - * UpdatableStatistic. A Statistic that can be updated, e.g. from PerformanceTest.Runnable. - * Implementations should be thread-safe. - * - * @author tkyjovsk - */ -public interface UpdatableStatistic extends Statistic { - - public void reset(); - - public void addValue(long value); - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/UpdatableStatistics.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/UpdatableStatistics.java deleted file mode 100644 index 1577adb36ba..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/java/org/keycloak/testsuite/performance/statistics/UpdatableStatistics.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.keycloak.testsuite.performance.statistics; - -/** - * - * @author tkyjovsk - */ -public interface UpdatableStatistics extends Statistics { - - public void reset(); - - public void addValue(String statistic, long value); - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/resources/log4j.properties b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/resources/log4j.properties deleted file mode 100644 index b931f7373da..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/resources/log4j.properties +++ /dev/null @@ -1,20 +0,0 @@ -log4j.rootLogger=INFO, DEFAULT - -# TEST RUN - -log4j.appender.DEFAULT=org.apache.log4j.ConsoleAppender -log4j.appender.DEFAULT.layout=org.apache.log4j.PatternLayout -log4j.appender.DEFAULT.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p [%c] [%t] %m%n - -log4j.logger.org.keycloak=OFF -log4j.logger.org.keycloak.testsuite=INFO -log4j.logger.org.keycloak.testsuite.performance.PerformanceTest=INFO - -# HtmlUnit -log4j.logger.org.keycloak.testsuite.performance.htmlunit.HtmlUnitLoginLogoutPerfTest=${logging.loginlogout} -log4j.logger.com.gargoylesoftware.htmlunit=OFF - -# HttpClient -log4j.logger.org.keycloak.testsuite.performance.httpclient.HttpClientLoginLogoutPerfTest=${logging.loginlogout} -log4j.logger.org.keycloak.testsuite.performance.httpclient.HttpClientPerformanceTest$CustomRedirectStrategy=OFF - diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/resources/test-realm.json b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/resources/test-realm.json deleted file mode 100644 index 2ae0417836b..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/resources/test-realm.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "id": "Test", - "realm": "Test", - "enabled": true, - "accessTokenLifespan": 600, - "accessCodeLifespan": 10, - "accessCodeLifespanUserAction": 6000, - "sslRequired": "external", - "registrationAllowed": false, - "privateKey": "MIICXAIBAAKBgQCrVrCuTtArbgaZzL1hvh0xtL5mc7o0NqPVnYXkLvgcwiC3BjLGw1tGEGoJaXDuSaRllobm53JBhjx33UNv+5z/UMG4kytBWxheNVKnL6GgqlNabMaFfPLPCF8kAgKnsi79NMo+n6KnSY8YeUmec/p2vjO2NjsSAVcWEQMVhJ31LwIDAQABAoGAfmO8gVhyBxdqlxmIuglbz8bcjQbhXJLR2EoS8ngTXmN1bo2L90M0mUKSdc7qF10LgETBzqL8jYlQIbt+e6TH8fcEpKCjUlyq0Mf/vVbfZSNaVycY13nTzo27iPyWQHK5NLuJzn1xvxxrUeXI6A2WFpGEBLbHjwpx5WQG9A+2scECQQDvdn9NE75HPTVPxBqsEd2z10TKkl9CZxu10Qby3iQQmWLEJ9LNmy3acvKrE3gMiYNWb6xHPKiIqOR1as7L24aTAkEAtyvQOlCvr5kAjVqrEKXalj0Tzewjweuxc0pskvArTI2Oo070h65GpoIKLc9jf+UA69cRtquwP93aZKtW06U8dQJAF2Y44ks/mK5+eyDqik3koCI08qaC8HYq2wVl7G2QkJ6sbAaILtcvD92ToOvyGyeE0flvmDZxMYlvaZnaQ0lcSQJBAKZU6umJi3/xeEbkJqMfeLclD27XGEFoPeNrmdx0q10Azp4NfJAY+Z8KRyQCR2BEG+oNitBOZ+YXF9KCpH3cdmECQHEigJhYg+ykOvr1aiZUMFT72HU0jnmQe2FVekuG+LJUt2Tm7GtMjTFoGpf0JwrVuZN39fOYAlo+nTixgeW7X8Y=", - "publicKey": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrVrCuTtArbgaZzL1hvh0xtL5mc7o0NqPVnYXkLvgcwiC3BjLGw1tGEGoJaXDuSaRllobm53JBhjx33UNv+5z/UMG4kytBWxheNVKnL6GgqlNabMaFfPLPCF8kAgKnsi79NMo+n6KnSY8YeUmec/p2vjO2NjsSAVcWEQMVhJ31LwIDAQAB", - "requiredCredentials": ["password"], - "users": [{ - "username": "admin-user", - "enabled": true, - "firstName": "Admin", - "lastName": "User", - "email": "admin@user.com", - "credentials": [{ - "type": "password", - "value": "password" - }], - "realmRoles": ["offline_access", "user", "admin"], - "clientRoles": { - "account": ["view-profile", "manage-account"] - } - }, { - "username": "secure-user", - "enabled": true, - "firstName": "Secure", - "lastName": "User", - "email": "secure@user.com", - "credentials": [{ - "type": "password", - "value": "password" - }], - "realmRoles": ["offline_access", "user"], - "clientRoles": { - "account": ["view-profile", "manage-account"] - } - }], - "clients": [ - { - "clientId": "app-profile-jee", - "enabled": true, - "adminUrl": "/app-profile-jee/", - "baseUrl": "/app-profile-jee/", - "redirectUris": ["/app-profile-jee/*"], - "secret": "4f36f31a-be9d-4f92-b982-425301bac5df" - } - ] -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/resources/xslt/arquillian.xsl b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/resources/xslt/arquillian.xsl deleted file mode 100644 index c18ecc1c64c..00000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/resources/xslt/arquillian.xsl +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - org.jboss.as.arquillian.container.remote.RemoteDeployableContainer - - ${app.server.management.protocol} - ${app.server.host} - ${app.server.management.port} - admin - admin - - - - - - - - - - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/webauthn/src/test/java/org/keycloak/testsuite/webauthn/AbstractWebAuthnVirtualTest.java b/testsuite/integration-arquillian/tests/other/webauthn/src/test/java/org/keycloak/testsuite/webauthn/AbstractWebAuthnVirtualTest.java index d6faebd1d75..698d9e1ce27 100644 --- a/testsuite/integration-arquillian/tests/other/webauthn/src/test/java/org/keycloak/testsuite/webauthn/AbstractWebAuthnVirtualTest.java +++ b/testsuite/integration-arquillian/tests/other/webauthn/src/test/java/org/keycloak/testsuite/webauthn/AbstractWebAuthnVirtualTest.java @@ -26,7 +26,6 @@ import org.keycloak.authentication.authenticators.browser.WebAuthnAuthenticatorF import org.keycloak.authentication.authenticators.browser.WebAuthnPasswordlessAuthenticatorFactory; import org.keycloak.authentication.requiredactions.WebAuthnPasswordlessRegisterFactory; import org.keycloak.authentication.requiredactions.WebAuthnRegisterFactory; -import org.keycloak.common.Profile; import org.keycloak.common.util.SecretGenerator; import org.keycloak.models.credential.WebAuthnCredentialModel; import org.keycloak.representations.idm.AuthenticationExecutionExportRepresentation; @@ -38,8 +37,6 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.AbstractAdminTest; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.InfoPage; import org.keycloak.testsuite.pages.LoginPage; @@ -74,7 +71,6 @@ import java.util.Optional; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; import static org.keycloak.testsuite.util.BrowserDriverUtil.isDriverFirefox; import static org.keycloak.testsuite.util.BrowserDriverUtil.isDriverInstanceOf; import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; @@ -84,7 +80,6 @@ import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; * * @author Martin Bartos */ -@AuthServerContainerExclude(REMOTE) public abstract class AbstractWebAuthnVirtualTest extends AbstractTestRealmKeycloakTest implements UseVirtualAuthenticators { @Rule diff --git a/testsuite/integration-arquillian/tests/other/webauthn/src/test/java/org/keycloak/testsuite/webauthn/AppInitiatedActionWebAuthnTest.java b/testsuite/integration-arquillian/tests/other/webauthn/src/test/java/org/keycloak/testsuite/webauthn/AppInitiatedActionWebAuthnTest.java index adf63abcaca..e6a5857ad83 100644 --- a/testsuite/integration-arquillian/tests/other/webauthn/src/test/java/org/keycloak/testsuite/webauthn/AppInitiatedActionWebAuthnTest.java +++ b/testsuite/integration-arquillian/tests/other/webauthn/src/test/java/org/keycloak/testsuite/webauthn/AppInitiatedActionWebAuthnTest.java @@ -32,8 +32,6 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.testsuite.actions.AbstractAppInitiatedActionTest; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; -import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.pages.LoginUsernameOnlyPage; import org.keycloak.testsuite.pages.PasswordPage; import org.keycloak.testsuite.util.FlowUtil; @@ -51,14 +49,12 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.models.AuthenticationExecutionModel.Requirement.ALTERNATIVE; import static org.keycloak.models.AuthenticationExecutionModel.Requirement.REQUIRED; -import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; import static org.keycloak.testsuite.util.BrowserDriverUtil.isDriverFirefox; import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; /** * @author Martin Bartos */ -@AuthServerContainerExclude(REMOTE) public class AppInitiatedActionWebAuthnTest extends AbstractAppInitiatedActionTest implements UseVirtualAuthenticators { private VirtualAuthenticatorManager virtualManager; diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml index d897c8e7d0a..22563d32592 100755 --- a/testsuite/integration-arquillian/tests/pom.xml +++ b/testsuite/integration-arquillian/tests/pom.xml @@ -760,29 +760,6 @@ - - - auth-server-remote - - remote - true - false - true - - - - org.wildfly.arquillian - wildfly-arquillian-container-remote - - - org.wildfly.core - wildfly-cli - test - ${wildfly.core.version} - - - - auth-server-quarkus