diff --git a/pom.xml b/pom.xml index f5e1ab96a4..375d767146 100755 --- a/pom.xml +++ b/pom.xml @@ -1317,6 +1317,11 @@ ${project.version} test-jar + + org.keycloak + keycloak-testsuite-utils + ${project.version} + org.keycloak keycloak-testsuite-tools diff --git a/testsuite/integration-deprecated/pom.xml b/testsuite/integration-deprecated/pom.xml index 4cb51e324f..83ea636238 100755 --- a/testsuite/integration-deprecated/pom.xml +++ b/testsuite/integration-deprecated/pom.xml @@ -162,6 +162,10 @@ org.keycloak user-storage-properties-example + + org.keycloak + keycloak-testsuite-utils + @@ -330,51 +334,6 @@ - - keycloak-server - - - - org.codehaus.mojo - exec-maven-plugin - - org.keycloak.testsuite.KeycloakServer - test - - - - - - - mail-server - - - - org.codehaus.mojo - exec-maven-plugin - - org.keycloak.testsuite.MailServer - test - - - - - - - totp - - - - org.codehaus.mojo - exec-maven-plugin - - org.keycloak.testsuite.TotpGenerator - test - - - - - ldap diff --git a/testsuite/utils/pom.xml b/testsuite/utils/pom.xml index 332394a11e..3fd3f5936c 100755 --- a/testsuite/utils/pom.xml +++ b/testsuite/utils/pom.xml @@ -33,4 +33,292 @@ 1.8 1.8 + + + + + org.bouncycastle + bcprov-jdk15on + + + org.bouncycastle + bcpkix-jdk15on + + + org.keycloak + keycloak-dependencies-server-all + pom + + + org.keycloak + keycloak-admin-client + + + org.keycloak + keycloak-wildfly-adduser + + + log4j + log4j + compile + + + org.slf4j + slf4j-log4j12 + compile + + + dom4j + dom4j + compile + + + org.jboss.spec.javax.servlet + jboss-servlet-api_3.0_spec + + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.0_spec + + + org.jboss.spec.javax.transaction + jboss-transaction-api_1.2_spec + + + org.jboss.resteasy + resteasy-jaxrs + + + log4j + log4j + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-simple + + + + + org.jboss.resteasy + resteasy-client + + + org.jboss.resteasy + resteasy-undertow + + + org.jboss.resteasy + resteasy-multipart-provider + + + org.jboss.resteasy + resteasy-jackson2-provider + + + com.google.zxing + javase + + + org.apache.httpcomponents + httpclient + + + org.keycloak + keycloak-server-spi-private + + + org.keycloak + keycloak-ldap-federation + + + org.keycloak + keycloak-kerberos-federation + + + org.keycloak + keycloak-undertow-adapter + + + org.keycloak + keycloak-saml-adapter-api-public + + + org.keycloak + keycloak-saml-adapter-core + + + org.keycloak + keycloak-authz-client + + + org.keycloak + keycloak-saml-servlet-filter-adapter + + + org.keycloak + keycloak-servlet-filter-adapter + + + org.keycloak + keycloak-saml-undertow-adapter + + + org.keycloak + keycloak-jaxrs-oauth-client + + + org.keycloak + user-storage-properties-example + + + + + org.keycloak.testsuite + integration-arquillian-testsuite-providers + ${project.version} + + + + org.jboss.logging + jboss-logging + + + io.undertow + undertow-servlet + + + io.undertow + undertow-core + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + + + org.hibernate.javax.persistence + hibernate-jpa-2.1-api + + + com.h2database + h2 + compile + + + org.hibernate + hibernate-entitymanager + + + com.icegreen + greenmail + compile + + + org.slf4j + slf4j-api + + + + + org.infinispan + infinispan-core + + + org.infinispan + infinispan-cachestore-remote + + + xml-apis + xml-apis + compile + + + + + org.keycloak + keycloak-util-embedded-ldap + + + + org.wildfly + wildfly-undertow + compile + + + + mysql + mysql-connector-java + compile + + + org.postgresql + postgresql + ${postgresql.version} + + + org.mariadb.jdbc + mariadb-java-client + ${mariadb.version} + + + + + + + keycloak-server + + + + org.codehaus.mojo + exec-maven-plugin + + org.keycloak.testsuite.KeycloakServer + test + + + + + + + mail-server + + + + org.codehaus.mojo + exec-maven-plugin + + org.keycloak.testsuite.MailServer + test + + + + + + + totp + + + + org.codehaus.mojo + exec-maven-plugin + + org.keycloak.testsuite.TotpGenerator + test + + + + + + diff --git a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/KeycloakServer.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/KeycloakServer.java similarity index 99% rename from testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/KeycloakServer.java rename to testsuite/utils/src/main/java/org/keycloak/testsuite/KeycloakServer.java index 95ecd7ea3b..0ebc0d8f8c 100755 --- a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/KeycloakServer.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/KeycloakServer.java @@ -165,11 +165,11 @@ public class KeycloakServer { String resources = System.getProperty("resources"); if (resources == null || resources.equals("") || resources.equals("true")) { if (System.getProperties().containsKey("maven.home")) { - resources = System.getProperty("user.dir").replaceFirst("testsuite.integration-deprecated.*", ""); + resources = System.getProperty("user.dir").replaceFirst("testsuite.utils.*", ""); } else { for (String c : System.getProperty("java.class.path").split(File.pathSeparator)) { - if (c.contains(File.separator + "testsuite" + File.separator + "integration-deprecated")) { - resources = c.replaceFirst("testsuite.integration-deprecated.*", ""); + if (c.contains(File.separator + "testsuite" + File.separator + "utils")) { + resources = c.replaceFirst("testsuite.utils.*", ""); } } } diff --git a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/MailServer.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/MailServer.java similarity index 100% rename from testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/MailServer.java rename to testsuite/utils/src/main/java/org/keycloak/testsuite/MailServer.java diff --git a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/TotpGenerator.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/TotpGenerator.java similarity index 100% rename from testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/TotpGenerator.java rename to testsuite/utils/src/main/java/org/keycloak/testsuite/TotpGenerator.java diff --git a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/AbstractCommand.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/AbstractCommand.java similarity index 100% rename from testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/AbstractCommand.java rename to testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/AbstractCommand.java diff --git a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/AbstractSessionCacheCommand.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/AbstractSessionCacheCommand.java similarity index 100% rename from testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/AbstractSessionCacheCommand.java rename to testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/AbstractSessionCacheCommand.java diff --git a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/BatchTaskRunner.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/BatchTaskRunner.java similarity index 100% rename from testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/BatchTaskRunner.java rename to testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/BatchTaskRunner.java diff --git a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/CacheCommands.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/CacheCommands.java similarity index 100% rename from testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/CacheCommands.java rename to testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/CacheCommands.java diff --git a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/ClusterProviderTaskCommand.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/ClusterProviderTaskCommand.java similarity index 92% rename from testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/ClusterProviderTaskCommand.java rename to testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/ClusterProviderTaskCommand.java index f1e09677cf..1b29be6140 100644 --- a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/ClusterProviderTaskCommand.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/ClusterProviderTaskCommand.java @@ -17,14 +17,13 @@ package org.keycloak.testsuite.util.cli; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; - import org.keycloak.cluster.ClusterProvider; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.models.KeycloakSession; -import org.keycloak.testsuite.federation.sync.SyncDummyUserFederationProviderFactory; + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; /** * @author Marek Posolda @@ -60,7 +59,7 @@ public class ClusterProviderTaskCommand extends AbstractCommand { } private void updateConfig(MultivaluedHashMap cfg, int waitTime) { - cfg.putSingle(SyncDummyUserFederationProviderFactory.WAIT_TIME, String.valueOf(waitTime)); + cfg.putSingle("wait-time", String.valueOf(waitTime)); } diff --git a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/LoadPersistentSessionsCommand.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/LoadPersistentSessionsCommand.java similarity index 100% rename from testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/LoadPersistentSessionsCommand.java rename to testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/LoadPersistentSessionsCommand.java diff --git a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/PersistSessionsCommand.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/PersistSessionsCommand.java similarity index 100% rename from testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/PersistSessionsCommand.java rename to testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/PersistSessionsCommand.java diff --git a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/RoleCommands.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/RoleCommands.java similarity index 100% rename from testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/RoleCommands.java rename to testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/RoleCommands.java diff --git a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/SyncDummyFederationProviderCommand.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/SyncDummyFederationProviderCommand.java similarity index 91% rename from testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/SyncDummyFederationProviderCommand.java rename to testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/SyncDummyFederationProviderCommand.java index fe53b82c69..f894916720 100644 --- a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/SyncDummyFederationProviderCommand.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/SyncDummyFederationProviderCommand.java @@ -23,7 +23,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.services.managers.UserStorageSyncManager; import org.keycloak.storage.UserStorageProviderModel; -import org.keycloak.testsuite.federation.sync.SyncDummyUserFederationProviderFactory; /** * @author Marek Posolda @@ -42,7 +41,7 @@ public class SyncDummyFederationProviderCommand extends AbstractCommand { updateConfig(cfg, waitTime); UserStorageProviderModel model = new UserStorageProviderModel(); - model.setProviderId(SyncDummyUserFederationProviderFactory.SYNC_PROVIDER_ID); + model.setProviderId("sync-dummy"); model.setPriority(1); model.setName("cluster-dummy"); model.setFullSyncPeriod(-1); @@ -62,7 +61,7 @@ public class SyncDummyFederationProviderCommand extends AbstractCommand { } private void updateConfig(MultivaluedHashMap cfg, int waitTime) { - cfg.putSingle(SyncDummyUserFederationProviderFactory.WAIT_TIME, String.valueOf(waitTime)); + cfg.putSingle("wait-time", String.valueOf(waitTime)); } diff --git a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/TestCacheUtils.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/TestCacheUtils.java similarity index 100% rename from testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/TestCacheUtils.java rename to testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/TestCacheUtils.java diff --git a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/TestsuiteCLI.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/TestsuiteCLI.java similarity index 100% rename from testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/TestsuiteCLI.java rename to testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/TestsuiteCLI.java diff --git a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/UserCommands.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/UserCommands.java similarity index 100% rename from testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/util/cli/UserCommands.java rename to testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/UserCommands.java diff --git a/testsuite/integration-deprecated/src/test/resources/META-INF/keycloak-server.json b/testsuite/utils/src/main/resources/META-INF/keycloak-server.json similarity index 100% rename from testsuite/integration-deprecated/src/test/resources/META-INF/keycloak-server.json rename to testsuite/utils/src/main/resources/META-INF/keycloak-server.json diff --git a/testsuite/integration-deprecated/src/test/resources/log4j.properties b/testsuite/utils/src/main/resources/log4j.properties similarity index 100% rename from testsuite/integration-deprecated/src/test/resources/log4j.properties rename to testsuite/utils/src/main/resources/log4j.properties