diff --git a/.travis.yml b/.travis.yml index faf7b4708c..cb32d21785 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,12 +12,12 @@ env: - MAVEN_SKIP_RC=true - MAVEN_OPTS="-Xms512m -Xmx2048m" matrix: - - TESTS=old - TESTS=group1 - TESTS=group2 - TESTS=group3 - TESTS=group4 - TESTS=adapter + - TESTS=old jdk: - oraclejdk8 diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/TestRealmKeycloakTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractTestRealmKeycloakTest.java similarity index 97% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/TestRealmKeycloakTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractTestRealmKeycloakTest.java index 869ea1ddf6..a2d23f75b3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/TestRealmKeycloakTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractTestRealmKeycloakTest.java @@ -38,7 +38,7 @@ import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson; * * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. */ -public abstract class TestRealmKeycloakTest extends AbstractKeycloakTest { +public abstract class AbstractTestRealmKeycloakTest extends AbstractKeycloakTest { protected RealmResource testRealm() { return adminClient.realm("test"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/TempSetTimeOffsetTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/TempSetTimeOffsetTest.java deleted file mode 100644 index 3ed29931c0..0000000000 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/TempSetTimeOffsetTest.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2016 Red Hat, Inc. and/or its affiliates - * and other contributors as indicated by the @author tags. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.keycloak.testsuite; - -import org.junit.Test; -import org.keycloak.representations.idm.RealmRepresentation; - -import java.util.List; - -/** - * @author Stian Thorgersen - */ -public class TempSetTimeOffsetTest extends AbstractKeycloakTest { - - @Override - public void addTestRealms(List testRealms) { - } - - @Test - public void test() { - setTimeOffset(60); - } - -} diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountTest.java index b1c9e279b2..97e3c84bdb 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountTest.java @@ -36,7 +36,7 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.services.resources.AccountService; import org.keycloak.services.resources.RealmsResource; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.drone.Different; import org.keycloak.testsuite.pages.AccountApplicationsPage; @@ -69,7 +69,7 @@ import static org.hamcrest.Matchers.*; * @author Stian Thorgersen * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. */ -public class AccountTest extends TestRealmKeycloakTest { +public class AccountTest extends AbstractTestRealmKeycloakTest { @Override public void configureTestRealm(RealmRepresentation testRealm) { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/ProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/ProfileTest.java index 7e2614b212..7fcd1fff99 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/ProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/ProfileTest.java @@ -35,7 +35,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.services.resources.RealmsResource; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.pages.AccountApplicationsPage; import org.keycloak.testsuite.pages.AccountUpdateProfilePage; @@ -54,9 +54,7 @@ import javax.ws.rs.core.UriBuilder; import java.io.IOException; import java.net.URI; import java.util.Collections; -import java.util.HashMap; import java.util.List; -import java.util.Map; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -65,7 +63,7 @@ import static org.junit.Assert.fail; * @author Stian Thorgersen * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. */ -public class ProfileTest extends TestRealmKeycloakTest { +public class ProfileTest extends AbstractTestRealmKeycloakTest { @Override public void configureTestRealm(RealmRepresentation testRealm) { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/TrustStoreEmailTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/TrustStoreEmailTest.java index 987982e14c..9b03ccc3bd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/TrustStoreEmailTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/TrustStoreEmailTest.java @@ -21,7 +21,7 @@ import org.junit.After; import org.junit.Test; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.auth.page.account.AccountManagement; import org.keycloak.testsuite.auth.page.login.OIDCLogin; @@ -39,7 +39,7 @@ import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWith; * * @author fkiss */ -public class TrustStoreEmailTest extends TestRealmKeycloakTest { +public class TrustStoreEmailTest extends AbstractTestRealmKeycloakTest { @Page protected OIDCLogin testRealmLoginPage; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomThemeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomThemeTest.java index 810d9c2084..81942fee97 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomThemeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomThemeTest.java @@ -26,7 +26,7 @@ import org.keycloak.events.EventType; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.account.AccountTest; import org.keycloak.testsuite.pages.AccountUpdateProfilePage; import org.keycloak.testsuite.pages.LoginPage; @@ -36,7 +36,7 @@ import org.keycloak.testsuite.util.UserBuilder; /** * @author Marek Posolda */ -public class CustomThemeTest extends TestRealmKeycloakTest { +public class CustomThemeTest extends AbstractTestRealmKeycloakTest { @Override public void configureTestRealm(RealmRepresentation testRealm) { 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 7aa31607c2..16223e76ee 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 @@ -28,7 +28,7 @@ import org.keycloak.events.EventType; import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.pages.ErrorPage; @@ -50,7 +50,7 @@ import static org.junit.Assert.assertTrue; /** * @author Stian Thorgersen */ -public class RequiredActionEmailVerificationTest extends TestRealmKeycloakTest { +public class RequiredActionEmailVerificationTest extends AbstractTestRealmKeycloakTest { @Rule public AssertEvents events = new AssertEvents(this); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionMultipleActionsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionMultipleActionsTest.java index 00fb383efb..433b0b124d 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionMultipleActionsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionMultipleActionsTest.java @@ -25,7 +25,7 @@ import org.keycloak.events.EventType; import org.keycloak.models.UserModel.RequiredAction; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.pages.LoginPage; @@ -35,7 +35,7 @@ import org.keycloak.testsuite.pages.LoginUpdateProfileEditUsernameAllowedPage; /** * @author Stian Thorgersen */ -public class RequiredActionMultipleActionsTest extends TestRealmKeycloakTest { +public class RequiredActionMultipleActionsTest extends AbstractTestRealmKeycloakTest { @Override public void configureTestRealm(RealmRepresentation testRealm) { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionResetPasswordTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionResetPasswordTest.java index 92f89fa636..d457b0bcad 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionResetPasswordTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionResetPasswordTest.java @@ -26,7 +26,7 @@ import org.keycloak.models.UserModel.RequiredAction; import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.pages.LoginPage; @@ -36,7 +36,7 @@ import org.keycloak.testsuite.util.GreenMailRule; /** * @author Stian Thorgersen */ -public class RequiredActionResetPasswordTest extends TestRealmKeycloakTest { +public class RequiredActionResetPasswordTest extends AbstractTestRealmKeycloakTest { @Override public void configureTestRealm(RealmRepresentation testRealm) { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionTotpSetupTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionTotpSetupTest.java index 2a1778b5c0..f3d09040d7 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionTotpSetupTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionTotpSetupTest.java @@ -33,7 +33,7 @@ import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.pages.AccountTotpPage; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; @@ -49,7 +49,7 @@ import java.util.List; /** * @author Stian Thorgersen */ -public class RequiredActionTotpSetupTest extends TestRealmKeycloakTest { +public class RequiredActionTotpSetupTest extends AbstractTestRealmKeycloakTest { @Override public void configureTestRealm(RealmRepresentation testRealm) { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileTest.java index df4d387012..7113ce39e6 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileTest.java @@ -26,7 +26,7 @@ import org.keycloak.models.UserModel; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.pages.LoginPage; @@ -35,7 +35,7 @@ import org.keycloak.testsuite.pages.LoginUpdateProfileEditUsernameAllowedPage; /** * @author Stian Thorgersen */ -public class RequiredActionUpdateProfileTest extends TestRealmKeycloakTest { +public class RequiredActionUpdateProfileTest extends AbstractTestRealmKeycloakTest { @Rule public AssertEvents events = new AssertEvents(this); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/TermsAndConditionsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/TermsAndConditionsTest.java index c7da3a9735..ab5229482b 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/TermsAndConditionsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/TermsAndConditionsTest.java @@ -29,7 +29,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.pages.LoginPage; @@ -47,7 +47,7 @@ import static org.junit.Assert.fail; /** * @author Stian Thorgersen */ -public class TermsAndConditionsTest extends TestRealmKeycloakTest { +public class TermsAndConditionsTest extends AbstractTestRealmKeycloakTest { @Rule public AssertEvents events = new AssertEvents(this); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AbstractAdminTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AbstractAdminTest.java index bf98b98154..01456d4151 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AbstractAdminTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AbstractAdminTest.java @@ -23,7 +23,7 @@ import org.junit.Rule; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.events.log.JBossLoggingEventListenerProviderFactory; import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.events.EventsListenerProviderFactory; import org.keycloak.testsuite.util.AssertAdminEvents; import org.keycloak.util.JsonSerialization; @@ -41,7 +41,7 @@ import java.util.Map; * * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. */ -public abstract class AbstractAdminTest extends TestRealmKeycloakTest { +public abstract class AbstractAdminTest extends AbstractTestRealmKeycloakTest { protected static final String REALM_NAME = "admin-client-test"; protected RealmResource realm; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTotpTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTotpTest.java index 5ebe415c59..1e349d9e55 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTotpTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTotpTest.java @@ -30,7 +30,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.services.resources.AccountService; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.pages.AccountTotpPage; import org.keycloak.testsuite.pages.AccountUpdateProfilePage; import org.keycloak.testsuite.pages.LoginPage; @@ -42,7 +42,7 @@ import java.util.List; /** * @author Marko Strukelj */ -public class UserTotpTest extends TestRealmKeycloakTest { +public class UserTotpTest extends AbstractTestRealmKeycloakTest { private static final UriBuilder BASE = UriBuilder.fromUri("http://localhost:8180/auth"); public static String ACCOUNT_REDIRECT = AccountService.loginRedirectUrl(BASE.clone()).build("test").toString(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRedirectTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRedirectTest.java index 50a0c28ca4..1c80d51924 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRedirectTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRedirectTest.java @@ -20,7 +20,7 @@ package org.keycloak.testsuite.client; import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.RealmBuilder; @@ -33,7 +33,7 @@ import static org.junit.Assert.assertEquals; /** * @author Thomas Darimont */ -public class ClientRedirectTest extends TestRealmKeycloakTest { +public class ClientRedirectTest extends AbstractTestRealmKeycloakTest { @Override public void configureTestRealm(RealmRepresentation testRealm) { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AbstractFlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AbstractFlowTest.java index f83104cd05..a2fc6f8c25 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AbstractFlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AbstractFlowTest.java @@ -19,12 +19,12 @@ package org.keycloak.testsuite.forms; import org.keycloak.representations.idm.AuthenticationFlowRepresentation; import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; /** * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. */ -public abstract class AbstractFlowTest extends TestRealmKeycloakTest { +public abstract class AbstractFlowTest extends AbstractTestRealmKeycloakTest { protected AuthenticationFlowRepresentation findFlowByAlias(String alias) { for (AuthenticationFlowRepresentation rep : testRealm().flows().getFlows()) { 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 c6d0a8c384..d87896e84d 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 @@ -31,7 +31,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.AssertEvents.ExpectedEvent; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.pages.LoginPage; @@ -48,7 +48,7 @@ import java.net.MalformedURLException; * @author Stian Thorgersen * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. */ -public class BruteForceTest extends TestRealmKeycloakTest { +public class BruteForceTest extends AbstractTestRealmKeycloakTest { @Override public void configureTestRealm(RealmRepresentation testRealm) { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginHotpTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginHotpTest.java index eb444f4685..424920da36 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginHotpTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginHotpTest.java @@ -28,7 +28,7 @@ import org.keycloak.models.utils.HmacOTP; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.pages.LoginPage; @@ -43,7 +43,7 @@ import java.net.MalformedURLException; * @author Stian Thorgersen * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. */ -public class LoginHotpTest extends TestRealmKeycloakTest { +public class LoginHotpTest extends AbstractTestRealmKeycloakTest { public static OTPPolicy policy; 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 adb67345fd..27c2d91a69 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 @@ -29,7 +29,7 @@ import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.pages.ErrorPage; @@ -51,7 +51,7 @@ import static org.junit.Assert.assertTrue; /** * @author Stian Thorgersen */ -public class LoginTest extends TestRealmKeycloakTest { +public class LoginTest extends AbstractTestRealmKeycloakTest { @Override public void configureTestRealm(RealmRepresentation testRealm) { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java index 15a8b6b9b4..2702f7693d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java @@ -26,7 +26,7 @@ import org.keycloak.models.utils.TimeBasedOTP; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.pages.LoginPage; @@ -41,7 +41,7 @@ import java.net.MalformedURLException; * @author Stian Thorgersen * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. */ -public class LoginTotpTest extends TestRealmKeycloakTest { +public class LoginTotpTest extends AbstractTestRealmKeycloakTest { @Override public void configureTestRealm(RealmRepresentation testRealm) { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LogoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LogoutTest.java index 0810029358..d0ea630c4d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LogoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LogoutTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.keycloak.events.Details; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginPage; @@ -38,7 +38,7 @@ import org.keycloak.testsuite.auth.page.account.AccountManagement; * @author Stian Thorgersen * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. */ -public class LogoutTest extends TestRealmKeycloakTest { +public class LogoutTest extends AbstractTestRealmKeycloakTest { @Rule public AssertEvents events = new AssertEvents(this); 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 1a2149d775..51922965f2 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 @@ -24,7 +24,7 @@ import org.keycloak.events.Details; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.pages.AccountUpdateProfilePage; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; @@ -40,7 +40,7 @@ import static org.junit.Assert.assertEquals; * @author Stian Thorgersen * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. */ -public class RegisterTest extends TestRealmKeycloakTest { +public class RegisterTest extends AbstractTestRealmKeycloakTest { @Rule public AssertEvents events = new AssertEvents(this); 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 e28c2352fe..e23d51e1c0 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 @@ -27,7 +27,7 @@ import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.pages.ErrorPage; @@ -58,7 +58,7 @@ import static org.junit.Assert.assertTrue; * @author Stian Thorgersen * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. */ -public class ResetPasswordTest extends TestRealmKeycloakTest { +public class ResetPasswordTest extends AbstractTestRealmKeycloakTest { static int lifespan = 0; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/SSOTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/SSOTest.java index 17cd7177d5..22f75da2dd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/SSOTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/SSOTest.java @@ -27,7 +27,7 @@ import org.keycloak.representations.IDToken; import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.drone.Different; import org.keycloak.testsuite.pages.AccountUpdateProfilePage; import org.keycloak.testsuite.pages.AppPage; @@ -44,7 +44,7 @@ import static org.junit.Assert.assertTrue; * @author Stian Thorgersen * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. */ -public class SSOTest extends TestRealmKeycloakTest { +public class SSOTest extends AbstractTestRealmKeycloakTest { @Drone @Different diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/AbstractI18NTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/AbstractI18NTest.java index d29d3accdd..c29dc50214 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/AbstractI18NTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/AbstractI18NTest.java @@ -19,14 +19,14 @@ package org.keycloak.testsuite.i18n; import org.junit.After; import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; /** * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. */ -public abstract class AbstractI18NTest extends TestRealmKeycloakTest { +public abstract class AbstractI18NTest extends AbstractTestRealmKeycloakTest { @Override public void configureTestRealm(RealmRepresentation testRealm) { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenIntrospectionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenIntrospectionTest.java index cae907e7cc..ee700dc2a2 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenIntrospectionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenIntrospectionTest.java @@ -31,7 +31,7 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.oidc.TokenMetadataRepresentation; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.util.KeycloakModelUtils; import org.keycloak.testsuite.util.OAuthClient.AccessTokenResponse; import org.keycloak.util.JsonSerialization; @@ -48,7 +48,7 @@ import static org.junit.Assert.assertTrue; * @author Pedro Igor * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. */ -public class TokenIntrospectionTest extends TestRealmKeycloakTest { +public class TokenIntrospectionTest extends AbstractTestRealmKeycloakTest { @Rule public AssertEvents events = new AssertEvents(this); 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 d551667bca..57a2102351 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 @@ -38,7 +38,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.services.util.CertificateInfoHelper; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.admin.AbstractAdminTest; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; @@ -63,7 +63,7 @@ import static org.junit.Assert.assertTrue; * * @author Marek Posolda */ -public class OIDCAdvancedRequestParamsTest extends TestRealmKeycloakTest { +public class OIDCAdvancedRequestParamsTest extends AbstractTestRealmKeycloakTest { @Rule public AssertEvents events = new AssertEvents(this); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/AbstractOIDCResponseTypeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/AbstractOIDCResponseTypeTest.java index 6c2189c0f5..103f8c9402 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/AbstractOIDCResponseTypeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/AbstractOIDCResponseTypeTest.java @@ -29,7 +29,7 @@ import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.TestRealmKeycloakTest; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.admin.AbstractAdminTest; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginPage; @@ -48,7 +48,7 @@ import static org.junit.Assert.assertTrue; * * @author Marek Posolda */ -public abstract class AbstractOIDCResponseTypeTest extends TestRealmKeycloakTest { +public abstract class AbstractOIDCResponseTypeTest extends AbstractTestRealmKeycloakTest { // Harcoded for now Algorithm jwsAlgorithm = Algorithm.RS256; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/AbstractUserTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/AbstractUserTest.java deleted file mode 100644 index 87a93a1ed7..0000000000 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/AbstractUserTest.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.keycloak.testsuite.user; - -import org.keycloak.admin.client.resource.UserResource; -import org.keycloak.admin.client.resource.UsersResource; -import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.AbstractAuthTest; - -import javax.ws.rs.core.Response; - -import static javax.ws.rs.core.Response.Status.CREATED; -import static org.junit.Assert.assertEquals; -import static org.keycloak.testsuite.admin.ApiUtil.getCreatedId; - -/** - * - * @author tkyjovsk - */ -public abstract class AbstractUserTest extends AbstractAuthTest { - - protected UsersResource users() { - return testRealmResource().users(); - } - - protected UserResource user(UserRepresentation user) { - if (user.getId()==null) { - throw new IllegalStateException("User id cannot be null."); - } - return user(user.getId()); - } - - protected UserResource user(String id) { - return users().get(id); - } - - public static UserRepresentation createUserRep(String username) { - UserRepresentation user = new UserRepresentation(); - user.setUsername(username); - user.setEmail(username + "@email.test"); - return user; - } - - public UserRepresentation createUser(UserRepresentation user) { - return createUser(users(), user); - } - - public UserRepresentation createUser(UsersResource users, UserRepresentation user) { - Response response = users.create(user); - assertEquals(CREATED.getStatusCode(), response.getStatus()); - user.setId(getCreatedId(response)); - response.close(); - return user; - } - -} diff --git a/travis-run-tests.sh b/travis-run-tests.sh index aa1de643a3..e6d6bdda87 100755 --- a/travis-run-tests.sh +++ b/travis-run-tests.sh @@ -2,38 +2,39 @@ if [ $1 == "old" ]; then mvn test -B -f testsuite/integration -fi - -if [ $1 == "group1" ]; then - mvn test -B -f testsuite/integration-arquillian/tests/base -Dtest=org.keycloak.testsuite.ad*.**.*Test -fi - -if [ $1 == "group2" ]; then - mvn test -B -f testsuite/integration-arquillian/tests/base -Dtest=org.keycloak.testsuite.ac*.**.*Test - mvn test -B -f testsuite/integration-arquillian/tests/base -Dtest=org.keycloak.testsuite.b*.**.*Test - mvn test -B -f testsuite/integration-arquillian/tests/base -Dtest=org.keycloak.testsuite.cli*.**.*Test - mvn test -B -f testsuite/integration-arquillian/tests/base -Dtest=org.keycloak.testsuite.com*.**.*Test -fi - -if [ $1 == "group3" ]; then - mvn test -B -f testsuite/integration-arquillian/tests/base -Dtest=org.keycloak.testsuite.d*.**.*Test - mvn test -B -f testsuite/integration-arquillian/tests/base -Dtest=org.keycloak.testsuite.e*.**.*Test - mvn test -B -f testsuite/integration-arquillian/tests/base -Dtest=org.keycloak.testsuite.f*.**.*Test - mvn test -B -f testsuite/integration-arquillian/tests/base -Dtest=org.keycloak.testsuite.i*.**.*Test -fi - -if [ $1 == "group4" ]; then - mvn test -B -f testsuite/integration-arquillian/tests/base -Dtest=org.keycloak.testsuite.k*.**.*Test - mvn test -B -f testsuite/integration-arquillian/tests/base -Dtest=org.keycloak.testsuite.m*.**.*Test - mvn test -B -f testsuite/integration-arquillian/tests/base -Dtest=org.keycloak.testsuite.o*.**.*Test - mvn test -B -f testsuite/integration-arquillian/tests/base -Dtest=org.keycloak.*Test -fi - -if [ $1 == "adapter" ]; then - mvn test -B -f testsuite/integration-arquillian/tests/other/adapters mvn test -B -f testsuite/jetty mvn test -B -f testsuite/tomcat6 mvn test -B -f testsuite/tomcat7 mvn test -B -f testsuite/tomcat8 fi +if [ $1 == "group1" ]; then + cd testsuite/integration-arquillian/tests/base + mvn test -B -Dtest=org.keycloak.testsuite.ad*.**.*Test +fi + +if [ $1 == "group2" ]; then + cd testsuite/integration-arquillian/tests/base + mvn test -B -Dtest=org.keycloak.testsuite.ac*.**.*Test,org.keycloak.testsuite.b*.**.*Test,org.keycloak.testsuite.cli*.**.*Test,org.keycloak.testsuite.co*.**.*Test +fi + +if [ $1 == "group3" ]; then + cd testsuite/integration-arquillian/tests/base + mvn test -B -Dtest=org.keycloak.testsuite.d*.**.*Test,org.keycloak.testsuite.e*.**.*Test,org.keycloak.testsuite.f*.**.*Test,org.keycloak.testsuite.i*.**.*Test +fi + +if [ $1 == "group4" ]; then + cd testsuite/integration-arquillian/tests/base + mvn test -B -Dtest=org.keycloak.testsuite.k*.**.*Test,org.keycloak.testsuite.m*.**.*Test,org.keycloak.testsuite.o*.**.*Test +fi + +if [ $1 == "adapter" ]; then + cd testsuite/integration-arquillian/tests/other/adapters + mvn test -B +fi + +if [ $1 == "console" ]; then + cd testsuite/integration-arquillian/tests/other/console + mvn test -B +fi +