From 9d5cd2091e992d79fa9ba7a40754c915ee2a7ac6 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Thu, 23 Apr 2015 13:23:22 +0200 Subject: [PATCH] Updates to deps --- misc/Testsuite.md | 6 +- pom.xml | 22 +++ testsuite/integration/pom.xml | 23 +-- ...cloak.models.UserFederationProviderFactory | 1 - .../DummyUserFederationProvider.java | 2 +- .../DummyUserFederationProviderFactory.java | 2 +- .../keycloak/testsuite}/KeycloakServer.java | 2 +- .../org/keycloak/testsuite}/MailServer.java | 2 +- .../keycloak/testsuite}/TotpGenerator.java | 2 +- .../adapter/AdapterTestStrategy.java | 2 +- .../adapter/CookieTokenStoreAdapterTest.java | 2 +- .../testsuite/adapter/MultiTenancyTest.java | 2 +- .../adapter/RelativeUriAdapterTest.java | 2 +- .../testsuite/admin/AdminAPITest.java | 2 +- .../broker/IdentityProviderHintTest.java | 2 +- .../OIDCKeyCloakServerBrokerBasicTest.java | 3 +- .../SAMLKeyCloakServerBrokerBasicTest.java | 2 +- ...KeyCloakServerBrokerWithSignatureTest.java | 2 +- .../composites/CompositeImportRoleTest.java | 2 +- .../federation/KerberosLdapTest.java | 1 - .../federation/KerberosStandaloneTest.java | 5 - .../federation/SyncProvidersTest.java | 2 +- .../ldap/EmbeddedServersFactory.java | 5 +- .../ldap/InMemoryDirectoryServiceFactory.java | 2 +- .../ldap/InMemorySchemaPartition.java | 2 +- .../ldap/KerberosEmbeddedServer.java | 2 +- .../ldap/KerberosKeytabCreator.java | 4 +- .../testsuite}/ldap/LDAPConfiguration.java | 2 +- .../testsuite}/ldap/LDAPEmbeddedServer.java | 2 +- .../testsuite/rule/AbstractKeycloakRule.java | 2 +- .../keycloak/testsuite/rule/KerberosRule.java | 6 +- .../org/keycloak/testsuite/rule/LDAPRule.java | 6 +- .../resources/META-INF/keycloak-server.json | 0 ...cloak.models.UserFederationProviderFactory | 1 + .../resources/kerberos/http.keytab | Bin .../kerberos-ldap-connection.properties | 0 .../kerberos-standalone-connection.properties | 0 .../resources/kerberos/test-krb5.conf | 0 .../resources/kerberos/users-kerberos.ldif | 0 .../resources/ldap/ldap-connection.properties | 0 .../{main => test}/resources/ldap/users.ldif | 0 .../{main => test}/resources/log4j.properties | 0 testsuite/jetty/jetty81/pom.xml | 6 +- testsuite/jetty/jetty91/pom.xml | 6 +- testsuite/jetty/jetty92/pom.xml | 6 +- testsuite/pom.xml | 2 - testsuite/proxy/pom.xml | 6 +- .../org/keycloak/testsuite/ProxyTest.java | 1 - testsuite/tomcat6/pom.xml | 173 +++++++++++++++++- testsuite/tomcat7/pom.xml | 6 +- testsuite/tomcat8/pom.xml | 6 +- .../keycloak/test/tools/DestroyListener.java | 0 .../test/tools/KeycloakTestApplication.java | 0 .../java/org/keycloak/test/tools/Mail.java | 0 .../org/keycloak/test/tools/PerfTools.java | 0 .../test/tools/jobs/CreateUsersJob.java | 0 .../test/tools/jobs/DeleteUsersJob.java | 0 .../test/tools/jobs/UpdateUsersJob.java | 0 .../keycloak/test/tools/jobs/UsersJob.java | 0 .../test/tools/jobs/UsersJobInitializer.java | 0 .../resources/META-INF/keycloak-server.json | 0 .../WEB-INF/jboss-deployment-structure.xml | 0 .../src/{main => test}/webapp/WEB-INF/web.xml | 0 .../src/{main => test}/webapp/index.html | 0 .../tools/src/{main => test}/webapp/js/app.js | 0 .../src/{main => test}/webapp/pages/home.html | 0 .../src/{main => test}/webapp/pages/mail.html | 0 .../src/{main => test}/webapp/pages/perf.html | 0 68 files changed, 251 insertions(+), 86 deletions(-) delete mode 100755 testsuite/integration/src/main/resources/META-INF/services/org.keycloak.models.UserFederationProviderFactory rename testsuite/integration/src/{main/java/org/keycloak/testutils => test/java/org/keycloak/testsuite}/DummyUserFederationProvider.java (94%) rename testsuite/integration/src/{main/java/org/keycloak/testutils => test/java/org/keycloak/testsuite}/DummyUserFederationProviderFactory.java (95%) rename testsuite/integration/src/{main/java/org/keycloak/testutils => test/java/org/keycloak/testsuite}/KeycloakServer.java (99%) rename testsuite/integration/src/{main/java/org/keycloak/testutils => test/java/org/keycloak/testsuite}/MailServer.java (97%) rename testsuite/integration/src/{main/java/org/keycloak/testutils => test/java/org/keycloak/testsuite}/TotpGenerator.java (97%) rename testsuite/integration/src/{main/java/org/keycloak/testutils => test/java/org/keycloak/testsuite}/ldap/EmbeddedServersFactory.java (97%) rename testsuite/integration/src/{main/java/org/keycloak/testutils => test/java/org/keycloak/testsuite}/ldap/InMemoryDirectoryServiceFactory.java (99%) rename testsuite/integration/src/{main/java/org/keycloak/testutils => test/java/org/keycloak/testsuite}/ldap/InMemorySchemaPartition.java (98%) rename testsuite/integration/src/{main/java/org/keycloak/testutils => test/java/org/keycloak/testsuite}/ldap/KerberosEmbeddedServer.java (99%) rename testsuite/integration/src/{main/java/org/keycloak/testutils => test/java/org/keycloak/testsuite}/ldap/KerberosKeytabCreator.java (96%) rename testsuite/integration/src/{main/java/org/keycloak/testutils => test/java/org/keycloak/testsuite}/ldap/LDAPConfiguration.java (99%) rename testsuite/integration/src/{main/java/org/keycloak/testutils => test/java/org/keycloak/testsuite}/ldap/LDAPEmbeddedServer.java (99%) rename testsuite/integration/src/{main => test}/resources/META-INF/keycloak-server.json (100%) create mode 100755 testsuite/integration/src/test/resources/META-INF/services/org.keycloak.models.UserFederationProviderFactory rename testsuite/integration/src/{main => test}/resources/kerberos/http.keytab (100%) rename testsuite/integration/src/{main => test}/resources/kerberos/kerberos-ldap-connection.properties (100%) rename testsuite/integration/src/{main => test}/resources/kerberos/kerberos-standalone-connection.properties (100%) rename testsuite/integration/src/{main => test}/resources/kerberos/test-krb5.conf (100%) rename testsuite/integration/src/{main => test}/resources/kerberos/users-kerberos.ldif (100%) rename testsuite/integration/src/{main => test}/resources/ldap/ldap-connection.properties (100%) rename testsuite/integration/src/{main => test}/resources/ldap/users.ldif (100%) rename testsuite/integration/src/{main => test}/resources/log4j.properties (100%) rename testsuite/tools/src/{main => test}/java/org/keycloak/test/tools/DestroyListener.java (100%) rename testsuite/tools/src/{main => test}/java/org/keycloak/test/tools/KeycloakTestApplication.java (100%) rename testsuite/tools/src/{main => test}/java/org/keycloak/test/tools/Mail.java (100%) rename testsuite/tools/src/{main => test}/java/org/keycloak/test/tools/PerfTools.java (100%) rename testsuite/tools/src/{main => test}/java/org/keycloak/test/tools/jobs/CreateUsersJob.java (100%) rename testsuite/tools/src/{main => test}/java/org/keycloak/test/tools/jobs/DeleteUsersJob.java (100%) rename testsuite/tools/src/{main => test}/java/org/keycloak/test/tools/jobs/UpdateUsersJob.java (100%) rename testsuite/tools/src/{main => test}/java/org/keycloak/test/tools/jobs/UsersJob.java (100%) rename testsuite/tools/src/{main => test}/java/org/keycloak/test/tools/jobs/UsersJobInitializer.java (100%) rename testsuite/tools/src/{main => test}/resources/META-INF/keycloak-server.json (100%) rename testsuite/tools/src/{main => test}/webapp/WEB-INF/jboss-deployment-structure.xml (100%) rename testsuite/tools/src/{main => test}/webapp/WEB-INF/web.xml (100%) rename testsuite/tools/src/{main => test}/webapp/index.html (100%) rename testsuite/tools/src/{main => test}/webapp/js/app.js (100%) rename testsuite/tools/src/{main => test}/webapp/pages/home.html (100%) rename testsuite/tools/src/{main => test}/webapp/pages/mail.html (100%) rename testsuite/tools/src/{main => test}/webapp/pages/perf.html (100%) diff --git a/misc/Testsuite.md b/misc/Testsuite.md index 658a0427cb..ebaee4bfce 100644 --- a/misc/Testsuite.md +++ b/misc/Testsuite.md @@ -23,7 +23,7 @@ To start a basic Keycloak server for testing run: mvn exec:java -Pkeycloak-server -or run org.keycloak.testutils.KeycloakServer from your favourite IDE! +or run org.keycloak.testsuite.KeycloakServer from your favourite IDE! When starting the server it can also import a realm from a json file: @@ -64,7 +64,7 @@ To generate totp codes without Google authenticator run: mvn exec:java -Ptotp -or run org.keycloak.testutils.TotpGenerator from your favourite IDE! +or run org.keycloak.testsuite.TotpGenerator from your favourite IDE! Once started copy/paste the totp secret and press enter. To use a new secret just copy/paste and press enter again. @@ -75,7 +75,7 @@ To start a test mail server for testing email sending run: mvn exec:java -Pmail-server -or run org.keycloak.testutils.MailServer from your favourite IDE! +or run org.keycloak.testsuite.MailServer from your favourite IDE! To configure Keycloak to use the above server add the following system properties: diff --git a/pom.xml b/pom.xml index 237f13d720..8bf033d326 100755 --- a/pom.xml +++ b/pom.xml @@ -188,11 +188,13 @@ org.jboss.resteasy resteasy-undertow ${resteasy.version} + test org.jboss.resteasy async-http-servlet-3.0 ${resteasy.version} + test io.undertow @@ -233,6 +235,7 @@ org.picketlink picketlink-wildfly-common ${picketlink.version} + test org.jboss.logging @@ -270,6 +273,7 @@ com.h2database h2 ${h2.version} + test org.hibernate @@ -323,6 +327,7 @@ com.icegreen greenmail ${greenmail.version} + test @@ -337,21 +342,25 @@ org.apache.directory.server apacheds-core-annotations ${apacheds.version} + test org.apache.directory.server apacheds-interceptor-kerberos ${apacheds.version} + test org.apache.directory.server apacheds-server-annotations ${apacheds.version} + test org.apache.directory.api api-ldap-codec-standalone ${apacheds.codec.version} + test @@ -359,6 +368,7 @@ org.seleniumhq.selenium selenium-java ${selenium.version} + test org.seleniumhq.selenium @@ -375,16 +385,19 @@ org.apache.jmeter ApacheJMeter_java ${jmeter.version} + test dom4j dom4j ${dom4j.version} + test xml-apis xml-apis ${xml-apis.version} + test @@ -396,12 +409,20 @@ org.slf4j slf4j-simple ${slf4j.version} + test + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + test mysql mysql-connector-java ${mysql.version} + test org.apache.httpcomponents @@ -456,6 +477,7 @@ org.jboss.logging jboss-logging-processor ${jboss-logging-tools.version} + compile org.infinispan diff --git a/testsuite/integration/pom.xml b/testsuite/integration/pom.xml index e6d674a409..d763ca1155 100755 --- a/testsuite/integration/pom.xml +++ b/testsuite/integration/pom.xml @@ -42,7 +42,6 @@ org.slf4j slf4j-log4j12 - ${slf4j.version} org.jboss.spec.javax.servlet @@ -86,10 +85,6 @@ org.jboss.resteasy resteasy-multipart-provider - - org.jboss.resteasy - async-http-servlet-3.0 - org.jboss.resteasy resteasy-jackson-provider @@ -101,7 +96,6 @@ org.apache.httpcomponents httpclient - ${keycloak.apache.httpcomponents.version} org.keycloak @@ -240,7 +234,6 @@ org.wildfly wildfly-undertow - ${wildfly.version} test @@ -306,7 +299,8 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.KeycloakServer + org.keycloak.testsuite.KeycloakServer + test @@ -320,7 +314,8 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.MailServer + org.keycloak.testsuite.MailServer + test @@ -334,7 +329,8 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.TotpGenerator + org.keycloak.testsuite.TotpGenerator + test @@ -348,7 +344,8 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.ldap.LDAPEmbeddedServer + org.keycloak.testsuite.ldap.LDAPEmbeddedServer + test @@ -362,7 +359,8 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.ldap.KerberosEmbeddedServer + org.keycloak.testsuite.ldap.KerberosEmbeddedServer + test @@ -529,7 +527,6 @@ mysql mysql-connector-java - ${mysql.version} diff --git a/testsuite/integration/src/main/resources/META-INF/services/org.keycloak.models.UserFederationProviderFactory b/testsuite/integration/src/main/resources/META-INF/services/org.keycloak.models.UserFederationProviderFactory deleted file mode 100755 index 82b852c8e0..0000000000 --- a/testsuite/integration/src/main/resources/META-INF/services/org.keycloak.models.UserFederationProviderFactory +++ /dev/null @@ -1 +0,0 @@ -org.keycloak.testutils.DummyUserFederationProviderFactory \ No newline at end of file diff --git a/testsuite/integration/src/main/java/org/keycloak/testutils/DummyUserFederationProvider.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/DummyUserFederationProvider.java similarity index 94% rename from testsuite/integration/src/main/java/org/keycloak/testutils/DummyUserFederationProvider.java rename to testsuite/integration/src/test/java/org/keycloak/testsuite/DummyUserFederationProvider.java index 99644214bc..4e85972a0b 100755 --- a/testsuite/integration/src/main/java/org/keycloak/testutils/DummyUserFederationProvider.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/DummyUserFederationProvider.java @@ -1,4 +1,4 @@ -package org.keycloak.testutils; +package org.keycloak.testsuite; import org.keycloak.models.CredentialValidationOutput; import org.keycloak.models.RealmModel; diff --git a/testsuite/integration/src/main/java/org/keycloak/testutils/DummyUserFederationProviderFactory.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/DummyUserFederationProviderFactory.java similarity index 95% rename from testsuite/integration/src/main/java/org/keycloak/testutils/DummyUserFederationProviderFactory.java rename to testsuite/integration/src/test/java/org/keycloak/testsuite/DummyUserFederationProviderFactory.java index fba6c56d7c..536a5b7595 100755 --- a/testsuite/integration/src/main/java/org/keycloak/testutils/DummyUserFederationProviderFactory.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/DummyUserFederationProviderFactory.java @@ -1,4 +1,4 @@ -package org.keycloak.testutils; +package org.keycloak.testsuite; import org.jboss.logging.Logger; import org.keycloak.Config; diff --git a/testsuite/integration/src/main/java/org/keycloak/testutils/KeycloakServer.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/KeycloakServer.java similarity index 99% rename from testsuite/integration/src/main/java/org/keycloak/testutils/KeycloakServer.java rename to testsuite/integration/src/test/java/org/keycloak/testsuite/KeycloakServer.java index a57f317963..2d630e92c4 100755 --- a/testsuite/integration/src/main/java/org/keycloak/testutils/KeycloakServer.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/KeycloakServer.java @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.keycloak.testutils; +package org.keycloak.testsuite; import io.undertow.Undertow; import io.undertow.Undertow.Builder; diff --git a/testsuite/integration/src/main/java/org/keycloak/testutils/MailServer.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/MailServer.java similarity index 97% rename from testsuite/integration/src/main/java/org/keycloak/testutils/MailServer.java rename to testsuite/integration/src/test/java/org/keycloak/testsuite/MailServer.java index fd9ad225e0..1acaafb2a9 100755 --- a/testsuite/integration/src/main/java/org/keycloak/testutils/MailServer.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/MailServer.java @@ -1,4 +1,4 @@ -package org.keycloak.testutils; +package org.keycloak.testsuite; import com.icegreen.greenmail.util.GreenMail; import com.icegreen.greenmail.util.ServerSetup; diff --git a/testsuite/integration/src/main/java/org/keycloak/testutils/TotpGenerator.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/TotpGenerator.java similarity index 97% rename from testsuite/integration/src/main/java/org/keycloak/testutils/TotpGenerator.java rename to testsuite/integration/src/test/java/org/keycloak/testsuite/TotpGenerator.java index 455c190da4..1e2449b842 100755 --- a/testsuite/integration/src/main/java/org/keycloak/testutils/TotpGenerator.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/TotpGenerator.java @@ -1,4 +1,4 @@ -package org.keycloak.testutils; +package org.keycloak.testsuite; import org.keycloak.models.utils.Base32; import org.keycloak.models.utils.TimeBasedOTP; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTestStrategy.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTestStrategy.java index 550de17315..f9f82dcaf4 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTestStrategy.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTestStrategy.java @@ -49,7 +49,7 @@ import org.keycloak.testsuite.rule.AbstractKeycloakRule; import org.keycloak.testsuite.rule.KeycloakRule; import org.keycloak.testsuite.rule.WebResource; import org.keycloak.testsuite.rule.WebRule; -import org.keycloak.testutils.KeycloakServer; +import org.keycloak.testsuite.KeycloakServer; import org.keycloak.util.BasicAuthHelper; import org.keycloak.util.Time; import org.openqa.selenium.WebDriver; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/CookieTokenStoreAdapterTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/CookieTokenStoreAdapterTest.java index 632202d542..405609cf24 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/CookieTokenStoreAdapterTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/CookieTokenStoreAdapterTest.java @@ -19,7 +19,7 @@ import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.rule.AbstractKeycloakRule; import org.keycloak.testsuite.rule.WebResource; import org.keycloak.testsuite.rule.WebRule; -import org.keycloak.testutils.KeycloakServer; +import org.keycloak.testsuite.KeycloakServer; import org.keycloak.util.Time; import org.openqa.selenium.Cookie; import org.openqa.selenium.WebDriver; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/MultiTenancyTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/MultiTenancyTest.java index 235d5f54c4..83f3ff6289 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/MultiTenancyTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/MultiTenancyTest.java @@ -30,7 +30,7 @@ import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.rule.AbstractKeycloakRule; import org.keycloak.testsuite.rule.WebResource; import org.keycloak.testsuite.rule.WebRule; -import org.keycloak.testutils.KeycloakServer; +import org.keycloak.testsuite.KeycloakServer; import org.openqa.selenium.WebDriver; /** diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/RelativeUriAdapterTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/RelativeUriAdapterTest.java index 4c22533aba..4ec20a87db 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/RelativeUriAdapterTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/RelativeUriAdapterTest.java @@ -45,7 +45,7 @@ import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.rule.AbstractKeycloakRule; import org.keycloak.testsuite.rule.WebResource; import org.keycloak.testsuite.rule.WebRule; -import org.keycloak.testutils.KeycloakServer; +import org.keycloak.testsuite.KeycloakServer; import org.openqa.selenium.WebDriver; import javax.ws.rs.client.Client; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/AdminAPITest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/AdminAPITest.java index b3a7ca614e..03124461e3 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/AdminAPITest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/AdminAPITest.java @@ -41,7 +41,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.services.managers.RealmManager; import org.keycloak.services.resources.admin.AdminRoot; import org.keycloak.testsuite.rule.AbstractKeycloakRule; -import org.keycloak.testutils.KeycloakServer; +import org.keycloak.testsuite.KeycloakServer; import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/IdentityProviderHintTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/IdentityProviderHintTest.java index 96818736b7..18f3cc549a 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/IdentityProviderHintTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/IdentityProviderHintTest.java @@ -11,7 +11,7 @@ import org.keycloak.testsuite.pages.OAuthGrantPage; import org.keycloak.testsuite.rule.AbstractKeycloakRule; import org.keycloak.testsuite.rule.WebResource; import org.keycloak.testsuite.rule.WebRule; -import org.keycloak.testutils.KeycloakServer; +import org.keycloak.testsuite.KeycloakServer; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/OIDCKeyCloakServerBrokerBasicTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/OIDCKeyCloakServerBrokerBasicTest.java index 87c1b3be2b..44cd749f2f 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/OIDCKeyCloakServerBrokerBasicTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/OIDCKeyCloakServerBrokerBasicTest.java @@ -1,6 +1,5 @@ package org.keycloak.testsuite.broker; -import org.junit.After; import org.junit.ClassRule; import org.junit.Test; import org.keycloak.models.KeycloakSession; @@ -13,7 +12,7 @@ import org.keycloak.testsuite.pages.AccountAccessPage; import org.keycloak.testsuite.pages.OAuthGrantPage; import org.keycloak.testsuite.rule.AbstractKeycloakRule; import org.keycloak.testsuite.rule.WebResource; -import org.keycloak.testutils.KeycloakServer; +import org.keycloak.testsuite.KeycloakServer; import org.keycloak.util.JsonSerialization; import org.openqa.selenium.NoSuchElementException; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerBasicTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerBasicTest.java index c7589ac18e..9796d3a285 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerBasicTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerBasicTest.java @@ -8,7 +8,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.rule.AbstractKeycloakRule; -import org.keycloak.testutils.KeycloakServer; +import org.keycloak.testsuite.KeycloakServer; import org.keycloak.saml.processing.api.saml.v2.request.SAML2Request; import org.keycloak.dom.saml.v2.protocol.ResponseType; import org.keycloak.saml.processing.web.util.PostBindingUtil; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerWithSignatureTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerWithSignatureTest.java index cc553d7ba7..8d7fb7163c 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerWithSignatureTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/broker/SAMLKeyCloakServerBrokerWithSignatureTest.java @@ -8,7 +8,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.rule.AbstractKeycloakRule; -import org.keycloak.testutils.KeycloakServer; +import org.keycloak.testsuite.KeycloakServer; import org.keycloak.saml.processing.api.saml.v2.request.SAML2Request; import org.keycloak.dom.saml.v2.protocol.ResponseType; import org.keycloak.saml.processing.web.util.PostBindingUtil; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/composites/CompositeImportRoleTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/composites/CompositeImportRoleTest.java index 47d1ff5204..ad61241031 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/composites/CompositeImportRoleTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/composites/CompositeImportRoleTest.java @@ -38,7 +38,7 @@ import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.rule.AbstractKeycloakRule; import org.keycloak.testsuite.rule.WebResource; import org.keycloak.testsuite.rule.WebRule; -import org.keycloak.testutils.KeycloakServer; +import org.keycloak.testsuite.KeycloakServer; import org.openqa.selenium.WebDriver; import java.security.PublicKey; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/KerberosLdapTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/KerberosLdapTest.java index 1d94c68e2e..8086500cde 100644 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/KerberosLdapTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/KerberosLdapTest.java @@ -16,7 +16,6 @@ import org.keycloak.federation.kerberos.CommonKerberosConfig; import org.keycloak.federation.ldap.LDAPFederationProviderFactory; import org.keycloak.federation.ldap.kerberos.LDAPProviderKerberosConfig; import org.keycloak.models.RealmModel; -import org.keycloak.models.UserCredentialModel; import org.keycloak.models.UserFederationProvider; import org.keycloak.models.UserFederationProviderModel; import org.keycloak.services.managers.RealmManager; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/KerberosStandaloneTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/KerberosStandaloneTest.java index c665f44c3c..699d85be87 100644 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/KerberosStandaloneTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/KerberosStandaloneTest.java @@ -17,17 +17,12 @@ import org.keycloak.federation.kerberos.KerberosFederationProviderFactory; import org.keycloak.constants.KerberosConstants; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; -import org.keycloak.models.UserCredentialModel; import org.keycloak.models.UserFederationProviderModel; -import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.adapter.CustomerServlet; -import org.keycloak.testsuite.rule.AbstractKeycloakRule; import org.keycloak.testsuite.rule.KerberosRule; import org.keycloak.testsuite.rule.KeycloakRule; import org.keycloak.testsuite.rule.WebRule; -import org.keycloak.testutils.KeycloakServer; /** * Test of KerberosFederationProvider (Kerberos not backed by LDAP) diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/SyncProvidersTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/SyncProvidersTest.java index f628519af7..3aa1954ac8 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/SyncProvidersTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/SyncProvidersTest.java @@ -23,7 +23,7 @@ import org.keycloak.services.managers.RealmManager; import org.keycloak.services.managers.UsersSyncManager; import org.keycloak.testsuite.rule.KeycloakRule; import org.keycloak.testsuite.rule.LDAPRule; -import org.keycloak.testutils.DummyUserFederationProviderFactory; +import org.keycloak.testsuite.DummyUserFederationProviderFactory; import org.keycloak.timer.TimerProvider; import org.keycloak.util.Time; diff --git a/testsuite/integration/src/main/java/org/keycloak/testutils/ldap/EmbeddedServersFactory.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/EmbeddedServersFactory.java similarity index 97% rename from testsuite/integration/src/main/java/org/keycloak/testutils/ldap/EmbeddedServersFactory.java rename to testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/EmbeddedServersFactory.java index 3cfb36c20d..40106b5df7 100644 --- a/testsuite/integration/src/main/java/org/keycloak/testutils/ldap/EmbeddedServersFactory.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/EmbeddedServersFactory.java @@ -1,7 +1,4 @@ -package org.keycloak.testutils.ldap; - -import java.net.InetAddress; -import java.net.UnknownHostException; +package org.keycloak.testsuite.ldap; import org.ietf.jgss.GSSException; import org.ietf.jgss.GSSManager; diff --git a/testsuite/integration/src/main/java/org/keycloak/testutils/ldap/InMemoryDirectoryServiceFactory.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/InMemoryDirectoryServiceFactory.java similarity index 99% rename from testsuite/integration/src/main/java/org/keycloak/testutils/ldap/InMemoryDirectoryServiceFactory.java rename to testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/InMemoryDirectoryServiceFactory.java index bba4954a3f..a5eb2aad11 100644 --- a/testsuite/integration/src/main/java/org/keycloak/testutils/ldap/InMemoryDirectoryServiceFactory.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/InMemoryDirectoryServiceFactory.java @@ -1,4 +1,4 @@ -package org.keycloak.testutils.ldap; +package org.keycloak.testsuite.ldap; import java.io.File; import java.io.IOException; diff --git a/testsuite/integration/src/main/java/org/keycloak/testutils/ldap/InMemorySchemaPartition.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/InMemorySchemaPartition.java similarity index 98% rename from testsuite/integration/src/main/java/org/keycloak/testutils/ldap/InMemorySchemaPartition.java rename to testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/InMemorySchemaPartition.java index a5fed44ec7..227d257abd 100644 --- a/testsuite/integration/src/main/java/org/keycloak/testutils/ldap/InMemorySchemaPartition.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/InMemorySchemaPartition.java @@ -1,4 +1,4 @@ -package org.keycloak.testutils.ldap; +package org.keycloak.testsuite.ldap; import java.net.URL; import java.util.Map; diff --git a/testsuite/integration/src/main/java/org/keycloak/testutils/ldap/KerberosEmbeddedServer.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/KerberosEmbeddedServer.java similarity index 99% rename from testsuite/integration/src/main/java/org/keycloak/testutils/ldap/KerberosEmbeddedServer.java rename to testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/KerberosEmbeddedServer.java index 63cc027f7f..325f19b4ec 100644 --- a/testsuite/integration/src/main/java/org/keycloak/testutils/ldap/KerberosEmbeddedServer.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/KerberosEmbeddedServer.java @@ -1,4 +1,4 @@ -package org.keycloak.testutils.ldap; +package org.keycloak.testsuite.ldap; import java.io.IOException; import java.lang.reflect.Field; diff --git a/testsuite/integration/src/main/java/org/keycloak/testutils/ldap/KerberosKeytabCreator.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/KerberosKeytabCreator.java similarity index 96% rename from testsuite/integration/src/main/java/org/keycloak/testutils/ldap/KerberosKeytabCreator.java rename to testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/KerberosKeytabCreator.java index aa26153fb1..7631019d63 100644 --- a/testsuite/integration/src/main/java/org/keycloak/testutils/ldap/KerberosKeytabCreator.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/KerberosKeytabCreator.java @@ -1,4 +1,4 @@ -package org.keycloak.testutils.ldap; +package org.keycloak.testsuite.ldap; import java.io.File; import java.io.IOException; @@ -34,7 +34,7 @@ public class KerberosKeytabCreator { System.out.println("-------------------------"); System.out.println("Arguments missing or invalid. Required arguments are: "); System.out.println("Example of usage:"); - System.out.println("mvn exec:java -Dexec.mainClass=\"org.keycloak.testutils.ldap.KerberosKeytabCreator\" -Dexec.args=\"HTTP/localhost@KEYCLOAK.ORG httppwd src/main/resources/kerberos/http.keytab\""); + System.out.println("mvn exec:java -Dexec.mainClass=\"org.keycloak.testsuite.ldap.KerberosKeytabCreator\" -Dexec.args=\"HTTP/localhost@KEYCLOAK.ORG httppwd src/main/resources/kerberos/http.keytab\""); } else { final File keytabFile = new File(args[2]); createKeytab(args[0], args[1], keytabFile); diff --git a/testsuite/integration/src/main/java/org/keycloak/testutils/ldap/LDAPConfiguration.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/LDAPConfiguration.java similarity index 99% rename from testsuite/integration/src/main/java/org/keycloak/testutils/ldap/LDAPConfiguration.java rename to testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/LDAPConfiguration.java index 94b767233d..226c993335 100644 --- a/testsuite/integration/src/main/java/org/keycloak/testutils/ldap/LDAPConfiguration.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/LDAPConfiguration.java @@ -1,4 +1,4 @@ -package org.keycloak.testutils.ldap; +package org.keycloak.testsuite.ldap; import java.io.File; import java.io.InputStream; diff --git a/testsuite/integration/src/main/java/org/keycloak/testutils/ldap/LDAPEmbeddedServer.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/LDAPEmbeddedServer.java similarity index 99% rename from testsuite/integration/src/main/java/org/keycloak/testutils/ldap/LDAPEmbeddedServer.java rename to testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/LDAPEmbeddedServer.java index ce7b56b413..4f89d11976 100644 --- a/testsuite/integration/src/main/java/org/keycloak/testutils/ldap/LDAPEmbeddedServer.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/LDAPEmbeddedServer.java @@ -1,4 +1,4 @@ -package org.keycloak.testutils.ldap; +package org.keycloak.testsuite.ldap; import java.io.File; import java.io.InputStream; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/AbstractKeycloakRule.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/AbstractKeycloakRule.java index fbd47bc383..7641d6fbd2 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/AbstractKeycloakRule.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/AbstractKeycloakRule.java @@ -20,7 +20,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.Retry; -import org.keycloak.testutils.KeycloakServer; +import org.keycloak.testsuite.KeycloakServer; import org.keycloak.util.JsonSerialization; import org.keycloak.util.Time; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/KerberosRule.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/KerberosRule.java index 61d7f322cb..d2f0ed7ecd 100644 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/KerberosRule.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/KerberosRule.java @@ -4,9 +4,9 @@ import java.io.File; import java.net.URL; import org.jboss.logging.Logger; -import org.keycloak.testutils.ldap.EmbeddedServersFactory; -import org.keycloak.testutils.ldap.LDAPConfiguration; -import org.keycloak.testutils.ldap.LDAPEmbeddedServer; +import org.keycloak.testsuite.ldap.EmbeddedServersFactory; +import org.keycloak.testsuite.ldap.LDAPConfiguration; +import org.keycloak.testsuite.ldap.LDAPEmbeddedServer; /** * @author Marek Posolda diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/LDAPRule.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/LDAPRule.java index 2fa5f01faf..290341cb4b 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/LDAPRule.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/LDAPRule.java @@ -3,9 +3,9 @@ package org.keycloak.testsuite.rule; import java.util.Map; import org.junit.rules.ExternalResource; -import org.keycloak.testutils.ldap.EmbeddedServersFactory; -import org.keycloak.testutils.ldap.LDAPConfiguration; -import org.keycloak.testutils.ldap.LDAPEmbeddedServer; +import org.keycloak.testsuite.ldap.EmbeddedServersFactory; +import org.keycloak.testsuite.ldap.LDAPConfiguration; +import org.keycloak.testsuite.ldap.LDAPEmbeddedServer; /** * @author Marek Posolda diff --git a/testsuite/integration/src/main/resources/META-INF/keycloak-server.json b/testsuite/integration/src/test/resources/META-INF/keycloak-server.json similarity index 100% rename from testsuite/integration/src/main/resources/META-INF/keycloak-server.json rename to testsuite/integration/src/test/resources/META-INF/keycloak-server.json diff --git a/testsuite/integration/src/test/resources/META-INF/services/org.keycloak.models.UserFederationProviderFactory b/testsuite/integration/src/test/resources/META-INF/services/org.keycloak.models.UserFederationProviderFactory new file mode 100755 index 0000000000..d79421f7d6 --- /dev/null +++ b/testsuite/integration/src/test/resources/META-INF/services/org.keycloak.models.UserFederationProviderFactory @@ -0,0 +1 @@ +org.keycloak.testsuite.DummyUserFederationProviderFactory \ No newline at end of file diff --git a/testsuite/integration/src/main/resources/kerberos/http.keytab b/testsuite/integration/src/test/resources/kerberos/http.keytab similarity index 100% rename from testsuite/integration/src/main/resources/kerberos/http.keytab rename to testsuite/integration/src/test/resources/kerberos/http.keytab diff --git a/testsuite/integration/src/main/resources/kerberos/kerberos-ldap-connection.properties b/testsuite/integration/src/test/resources/kerberos/kerberos-ldap-connection.properties similarity index 100% rename from testsuite/integration/src/main/resources/kerberos/kerberos-ldap-connection.properties rename to testsuite/integration/src/test/resources/kerberos/kerberos-ldap-connection.properties diff --git a/testsuite/integration/src/main/resources/kerberos/kerberos-standalone-connection.properties b/testsuite/integration/src/test/resources/kerberos/kerberos-standalone-connection.properties similarity index 100% rename from testsuite/integration/src/main/resources/kerberos/kerberos-standalone-connection.properties rename to testsuite/integration/src/test/resources/kerberos/kerberos-standalone-connection.properties diff --git a/testsuite/integration/src/main/resources/kerberos/test-krb5.conf b/testsuite/integration/src/test/resources/kerberos/test-krb5.conf similarity index 100% rename from testsuite/integration/src/main/resources/kerberos/test-krb5.conf rename to testsuite/integration/src/test/resources/kerberos/test-krb5.conf diff --git a/testsuite/integration/src/main/resources/kerberos/users-kerberos.ldif b/testsuite/integration/src/test/resources/kerberos/users-kerberos.ldif similarity index 100% rename from testsuite/integration/src/main/resources/kerberos/users-kerberos.ldif rename to testsuite/integration/src/test/resources/kerberos/users-kerberos.ldif diff --git a/testsuite/integration/src/main/resources/ldap/ldap-connection.properties b/testsuite/integration/src/test/resources/ldap/ldap-connection.properties similarity index 100% rename from testsuite/integration/src/main/resources/ldap/ldap-connection.properties rename to testsuite/integration/src/test/resources/ldap/ldap-connection.properties diff --git a/testsuite/integration/src/main/resources/ldap/users.ldif b/testsuite/integration/src/test/resources/ldap/users.ldif similarity index 100% rename from testsuite/integration/src/main/resources/ldap/users.ldif rename to testsuite/integration/src/test/resources/ldap/users.ldif diff --git a/testsuite/integration/src/main/resources/log4j.properties b/testsuite/integration/src/test/resources/log4j.properties similarity index 100% rename from testsuite/integration/src/main/resources/log4j.properties rename to testsuite/integration/src/test/resources/log4j.properties diff --git a/testsuite/jetty/jetty81/pom.xml b/testsuite/jetty/jetty81/pom.xml index e81796900c..16bb906fc2 100755 --- a/testsuite/jetty/jetty81/pom.xml +++ b/testsuite/jetty/jetty81/pom.xml @@ -275,7 +275,7 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.KeycloakServer + org.keycloak.testsuite.KeycloakServer @@ -289,7 +289,7 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.MailServer + org.keycloak.testsuite.MailServer @@ -303,7 +303,7 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.TotpGenerator + org.keycloak.testsuite.TotpGenerator diff --git a/testsuite/jetty/jetty91/pom.xml b/testsuite/jetty/jetty91/pom.xml index 9afec4acd1..c7f4395b46 100755 --- a/testsuite/jetty/jetty91/pom.xml +++ b/testsuite/jetty/jetty91/pom.xml @@ -275,7 +275,7 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.KeycloakServer + org.keycloak.testsuite.KeycloakServer @@ -289,7 +289,7 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.MailServer + org.keycloak.testsuite.MailServer @@ -303,7 +303,7 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.TotpGenerator + org.keycloak.testsuite.TotpGenerator diff --git a/testsuite/jetty/jetty92/pom.xml b/testsuite/jetty/jetty92/pom.xml index 12458c6608..899cdb1927 100755 --- a/testsuite/jetty/jetty92/pom.xml +++ b/testsuite/jetty/jetty92/pom.xml @@ -282,7 +282,7 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.KeycloakServer + org.keycloak.testsuite.KeycloakServer @@ -296,7 +296,7 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.MailServer + org.keycloak.testsuite.MailServer @@ -310,7 +310,7 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.TotpGenerator + org.keycloak.testsuite.TotpGenerator diff --git a/testsuite/pom.xml b/testsuite/pom.xml index d42ec7533a..8ad09a9e2d 100755 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -41,8 +41,6 @@ jetty/jetty92 jetty/jetty91 performance - tools - performance-web diff --git a/testsuite/proxy/pom.xml b/testsuite/proxy/pom.xml index 44f88942cc..0e6d04b0d3 100755 --- a/testsuite/proxy/pom.xml +++ b/testsuite/proxy/pom.xml @@ -268,7 +268,7 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.KeycloakServer + org.keycloak.testsuite.KeycloakServer @@ -282,7 +282,7 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.MailServer + org.keycloak.testsuite.MailServer @@ -296,7 +296,7 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.TotpGenerator + org.keycloak.testsuite.TotpGenerator diff --git a/testsuite/proxy/src/test/java/org/keycloak/testsuite/ProxyTest.java b/testsuite/proxy/src/test/java/org/keycloak/testsuite/ProxyTest.java index a93d416793..f3dd46f5ca 100755 --- a/testsuite/proxy/src/test/java/org/keycloak/testsuite/ProxyTest.java +++ b/testsuite/proxy/src/test/java/org/keycloak/testsuite/ProxyTest.java @@ -41,7 +41,6 @@ import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.rule.AbstractKeycloakRule; import org.keycloak.testsuite.rule.WebResource; import org.keycloak.testsuite.rule.WebRule; -import org.keycloak.testutils.KeycloakServer; import org.openqa.selenium.WebDriver; import javax.servlet.ServletException; diff --git a/testsuite/tomcat6/pom.xml b/testsuite/tomcat6/pom.xml index 8408cc2d8d..08033d275d 100755 --- a/testsuite/tomcat6/pom.xml +++ b/testsuite/tomcat6/pom.xml @@ -22,18 +22,173 @@ keycloak-dependencies-server-all pom + + org.keycloak + keycloak-admin-client + + + log4j + log4j + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + + + org.jboss.spec.javax.servlet + jboss-servlet-api_3.0_spec + + + org.jboss.resteasy + jaxrs-api + + + org.jboss.resteasy + resteasy-jaxrs + + + log4j + log4j + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-simple + + + + + org.jboss.resteasy + resteasy-client + + + org.jboss.resteasy + resteasy-multipart-provider + + + org.jboss.resteasy + resteasy-jackson-provider + + + org.jboss.resteasy + resteasy-undertow + + + com.google.zxing + javase + + + org.bouncycastle + bcprov-jdk15on + + + org.apache.httpcomponents + httpclient + + + org.keycloak + keycloak-ldap-federation + + + org.keycloak + keycloak-kerberos-federation + + + org.keycloak + keycloak-undertow-adapter + + + org.keycloak + keycloak-tomcat6-adapter + + + org.jboss.logging + jboss-logging + + + io.undertow + undertow-servlet + + + io.undertow + undertow-core + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-xc + + + org.hamcrest + hamcrest-all + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + + + com.h2database + h2 + + + org.hibernate + hibernate-entitymanager + + + com.icegreen + greenmail + + + org.slf4j + slf4j-api + + + + + org.infinispan + infinispan-core + + + org.seleniumhq.selenium + selenium-java + + + xml-apis + xml-apis + + + org.seleniumhq.selenium + selenium-chrome-driver + + + org.wildfly + wildfly-undertow + test + org.keycloak keycloak-testsuite-integration + test org.keycloak keycloak-testsuite-integration test-jar - - - org.keycloak - keycloak-tomcat6-adapter + test org.apache.tomcat @@ -50,6 +205,10 @@ jasper ${tomcat.version} + + junit + junit + @@ -100,7 +259,7 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.KeycloakServer + org.keycloak.testsuite.KeycloakServer @@ -114,7 +273,7 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.MailServer + org.keycloak.testsuite.MailServer @@ -128,7 +287,7 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.TotpGenerator + org.keycloak.testsuite.TotpGenerator diff --git a/testsuite/tomcat7/pom.xml b/testsuite/tomcat7/pom.xml index fd2f842420..8f79b6228c 100755 --- a/testsuite/tomcat7/pom.xml +++ b/testsuite/tomcat7/pom.xml @@ -264,7 +264,7 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.KeycloakServer + org.keycloak.testsuite.KeycloakServer @@ -278,7 +278,7 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.MailServer + org.keycloak.testsuite.MailServer @@ -292,7 +292,7 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.TotpGenerator + org.keycloak.testsuite.TotpGenerator diff --git a/testsuite/tomcat8/pom.xml b/testsuite/tomcat8/pom.xml index 598921e418..35d9667b67 100755 --- a/testsuite/tomcat8/pom.xml +++ b/testsuite/tomcat8/pom.xml @@ -263,7 +263,7 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.KeycloakServer + org.keycloak.testsuite.KeycloakServer @@ -277,7 +277,7 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.MailServer + org.keycloak.testsuite.MailServer @@ -291,7 +291,7 @@ org.codehaus.mojo exec-maven-plugin - org.keycloak.testutils.TotpGenerator + org.keycloak.testsuite.TotpGenerator diff --git a/testsuite/tools/src/main/java/org/keycloak/test/tools/DestroyListener.java b/testsuite/tools/src/test/java/org/keycloak/test/tools/DestroyListener.java similarity index 100% rename from testsuite/tools/src/main/java/org/keycloak/test/tools/DestroyListener.java rename to testsuite/tools/src/test/java/org/keycloak/test/tools/DestroyListener.java diff --git a/testsuite/tools/src/main/java/org/keycloak/test/tools/KeycloakTestApplication.java b/testsuite/tools/src/test/java/org/keycloak/test/tools/KeycloakTestApplication.java similarity index 100% rename from testsuite/tools/src/main/java/org/keycloak/test/tools/KeycloakTestApplication.java rename to testsuite/tools/src/test/java/org/keycloak/test/tools/KeycloakTestApplication.java diff --git a/testsuite/tools/src/main/java/org/keycloak/test/tools/Mail.java b/testsuite/tools/src/test/java/org/keycloak/test/tools/Mail.java similarity index 100% rename from testsuite/tools/src/main/java/org/keycloak/test/tools/Mail.java rename to testsuite/tools/src/test/java/org/keycloak/test/tools/Mail.java diff --git a/testsuite/tools/src/main/java/org/keycloak/test/tools/PerfTools.java b/testsuite/tools/src/test/java/org/keycloak/test/tools/PerfTools.java similarity index 100% rename from testsuite/tools/src/main/java/org/keycloak/test/tools/PerfTools.java rename to testsuite/tools/src/test/java/org/keycloak/test/tools/PerfTools.java diff --git a/testsuite/tools/src/main/java/org/keycloak/test/tools/jobs/CreateUsersJob.java b/testsuite/tools/src/test/java/org/keycloak/test/tools/jobs/CreateUsersJob.java similarity index 100% rename from testsuite/tools/src/main/java/org/keycloak/test/tools/jobs/CreateUsersJob.java rename to testsuite/tools/src/test/java/org/keycloak/test/tools/jobs/CreateUsersJob.java diff --git a/testsuite/tools/src/main/java/org/keycloak/test/tools/jobs/DeleteUsersJob.java b/testsuite/tools/src/test/java/org/keycloak/test/tools/jobs/DeleteUsersJob.java similarity index 100% rename from testsuite/tools/src/main/java/org/keycloak/test/tools/jobs/DeleteUsersJob.java rename to testsuite/tools/src/test/java/org/keycloak/test/tools/jobs/DeleteUsersJob.java diff --git a/testsuite/tools/src/main/java/org/keycloak/test/tools/jobs/UpdateUsersJob.java b/testsuite/tools/src/test/java/org/keycloak/test/tools/jobs/UpdateUsersJob.java similarity index 100% rename from testsuite/tools/src/main/java/org/keycloak/test/tools/jobs/UpdateUsersJob.java rename to testsuite/tools/src/test/java/org/keycloak/test/tools/jobs/UpdateUsersJob.java diff --git a/testsuite/tools/src/main/java/org/keycloak/test/tools/jobs/UsersJob.java b/testsuite/tools/src/test/java/org/keycloak/test/tools/jobs/UsersJob.java similarity index 100% rename from testsuite/tools/src/main/java/org/keycloak/test/tools/jobs/UsersJob.java rename to testsuite/tools/src/test/java/org/keycloak/test/tools/jobs/UsersJob.java diff --git a/testsuite/tools/src/main/java/org/keycloak/test/tools/jobs/UsersJobInitializer.java b/testsuite/tools/src/test/java/org/keycloak/test/tools/jobs/UsersJobInitializer.java similarity index 100% rename from testsuite/tools/src/main/java/org/keycloak/test/tools/jobs/UsersJobInitializer.java rename to testsuite/tools/src/test/java/org/keycloak/test/tools/jobs/UsersJobInitializer.java diff --git a/testsuite/tools/src/main/resources/META-INF/keycloak-server.json b/testsuite/tools/src/test/resources/META-INF/keycloak-server.json similarity index 100% rename from testsuite/tools/src/main/resources/META-INF/keycloak-server.json rename to testsuite/tools/src/test/resources/META-INF/keycloak-server.json diff --git a/testsuite/tools/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/testsuite/tools/src/test/webapp/WEB-INF/jboss-deployment-structure.xml similarity index 100% rename from testsuite/tools/src/main/webapp/WEB-INF/jboss-deployment-structure.xml rename to testsuite/tools/src/test/webapp/WEB-INF/jboss-deployment-structure.xml diff --git a/testsuite/tools/src/main/webapp/WEB-INF/web.xml b/testsuite/tools/src/test/webapp/WEB-INF/web.xml similarity index 100% rename from testsuite/tools/src/main/webapp/WEB-INF/web.xml rename to testsuite/tools/src/test/webapp/WEB-INF/web.xml diff --git a/testsuite/tools/src/main/webapp/index.html b/testsuite/tools/src/test/webapp/index.html similarity index 100% rename from testsuite/tools/src/main/webapp/index.html rename to testsuite/tools/src/test/webapp/index.html diff --git a/testsuite/tools/src/main/webapp/js/app.js b/testsuite/tools/src/test/webapp/js/app.js similarity index 100% rename from testsuite/tools/src/main/webapp/js/app.js rename to testsuite/tools/src/test/webapp/js/app.js diff --git a/testsuite/tools/src/main/webapp/pages/home.html b/testsuite/tools/src/test/webapp/pages/home.html similarity index 100% rename from testsuite/tools/src/main/webapp/pages/home.html rename to testsuite/tools/src/test/webapp/pages/home.html diff --git a/testsuite/tools/src/main/webapp/pages/mail.html b/testsuite/tools/src/test/webapp/pages/mail.html similarity index 100% rename from testsuite/tools/src/main/webapp/pages/mail.html rename to testsuite/tools/src/test/webapp/pages/mail.html diff --git a/testsuite/tools/src/main/webapp/pages/perf.html b/testsuite/tools/src/test/webapp/pages/perf.html similarity index 100% rename from testsuite/tools/src/main/webapp/pages/perf.html rename to testsuite/tools/src/test/webapp/pages/perf.html