From 1667ada111cf8fdfaa468d8a9c9616f4436fa568 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Wed, 20 Apr 2016 14:55:25 +0200 Subject: [PATCH] Moved admin tests from endpoint package back to admin package --- .../authentication/AbstractAuthenticationTest.java | 2 +- .../{endpoint => admin}/authentication/ExecutionTest.java | 2 +- .../{endpoint => admin}/authentication/FlowTest.java | 3 +-- .../authentication/InitialFlowsTest.java | 2 +- .../{endpoint => admin}/authentication/ProvidersTest.java | 2 +- .../authentication/RequiredActionsTest.java | 2 +- .../authentication/ShiftExecutionTest.java | 2 +- .../{endpoint => admin}/client/AbstractClientTest.java | 2 +- .../client/AbstractProtocolMapperTest.java | 2 +- .../client/ClientProtocolMapperTest.java | 2 +- .../{endpoint => admin}/client/ClientRolesTest.java | 2 +- .../client/ClientTemplateProtocolMapperTest.java | 2 +- .../{endpoint => admin}/client/ClientTemplateTest.java | 3 +-- .../testsuite/{endpoint => admin}/client/ClientTest.java | 2 +- .../{endpoint => admin}/client/CredentialsTest.java | 2 +- .../{endpoint => admin}/client/InstallationTest.java | 2 +- .../testsuite/{endpoint => admin}/client/SessionTest.java | 2 +- .../{endpoint => admin}/event/AbstractEventTest.java | 2 +- .../testsuite/{endpoint => admin}/event/AdminEventTest.java | 2 +- .../{endpoint => admin}/event/EventConfigTest.java | 2 +- .../{endpoint => admin}/event/LoginEventsTest.java | 2 +- .../{endpoint => admin}/group/AbstractGroupTest.java | 2 +- .../{endpoint => admin}/group/GroupMappersTest.java | 2 +- .../testsuite/{endpoint => admin}/group/GroupTest.java | 6 +----- .../partialimport/PartialImportTest.java | 3 +-- 25 files changed, 25 insertions(+), 32 deletions(-) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/authentication/AbstractAuthenticationTest.java (99%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/authentication/ExecutionTest.java (99%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/authentication/FlowTest.java (98%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/authentication/InitialFlowsTest.java (99%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/authentication/ProvidersTest.java (99%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/authentication/RequiredActionsTest.java (99%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/authentication/ShiftExecutionTest.java (98%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/client/AbstractClientTest.java (98%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/client/AbstractProtocolMapperTest.java (98%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/client/ClientProtocolMapperTest.java (99%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/client/ClientRolesTest.java (97%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/client/ClientTemplateProtocolMapperTest.java (99%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/client/ClientTemplateTest.java (99%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/client/ClientTest.java (98%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/client/CredentialsTest.java (98%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/client/InstallationTest.java (98%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/client/SessionTest.java (98%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/event/AbstractEventTest.java (97%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/event/AdminEventTest.java (98%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/event/EventConfigTest.java (98%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/event/LoginEventsTest.java (99%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/group/AbstractGroupTest.java (98%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/group/GroupMappersTest.java (99%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/group/GroupTest.java (98%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{endpoint => admin}/partialimport/PartialImportTest.java (99%) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/authentication/AbstractAuthenticationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/AbstractAuthenticationTest.java similarity index 99% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/authentication/AbstractAuthenticationTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/AbstractAuthenticationTest.java index cbb37cfc91..fb7e966156 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/authentication/AbstractAuthenticationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/AbstractAuthenticationTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.endpoint.authentication; +package org.keycloak.testsuite.admin.authentication; import org.junit.Assert; import org.junit.Before; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/authentication/ExecutionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ExecutionTest.java similarity index 99% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/authentication/ExecutionTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ExecutionTest.java index 02afffaf47..afe702f033 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/authentication/ExecutionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ExecutionTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.endpoint.authentication; +package org.keycloak.testsuite.admin.authentication; import org.junit.Assert; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/authentication/FlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/FlowTest.java similarity index 98% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/authentication/FlowTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/FlowTest.java index cd7d00631c..301da3fe3e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/authentication/FlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/FlowTest.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package org.keycloak.testsuite.endpoint.authentication; +package org.keycloak.testsuite.admin.authentication; import org.junit.Assert; import org.junit.Test; import org.keycloak.representations.idm.AuthenticationExecutionExportRepresentation; import org.keycloak.representations.idm.AuthenticationFlowRepresentation; -import org.keycloak.testsuite.admin.ApiUtil; import javax.ws.rs.BadRequestException; import javax.ws.rs.core.Response; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/authentication/InitialFlowsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/InitialFlowsTest.java similarity index 99% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/authentication/InitialFlowsTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/InitialFlowsTest.java index d66cb29683..45f538fbd3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/authentication/InitialFlowsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/InitialFlowsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.endpoint.authentication; +package org.keycloak.testsuite.admin.authentication; import org.junit.Assert; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/authentication/ProvidersTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ProvidersTest.java similarity index 99% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/authentication/ProvidersTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ProvidersTest.java index 0abb5c8cbe..9f679e35c2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/authentication/ProvidersTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ProvidersTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.endpoint.authentication; +package org.keycloak.testsuite.admin.authentication; import org.junit.Assert; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/authentication/RequiredActionsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/RequiredActionsTest.java similarity index 99% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/authentication/RequiredActionsTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/RequiredActionsTest.java index a73501c633..0ac68649e4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/authentication/RequiredActionsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/RequiredActionsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.endpoint.authentication; +package org.keycloak.testsuite.admin.authentication; import org.junit.Assert; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/authentication/ShiftExecutionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ShiftExecutionTest.java similarity index 98% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/authentication/ShiftExecutionTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ShiftExecutionTest.java index 107e7c320d..b7c3c15c61 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/authentication/ShiftExecutionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ShiftExecutionTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.endpoint.authentication; +package org.keycloak.testsuite.admin.authentication; import org.junit.Assert; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/AbstractClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/AbstractClientTest.java similarity index 98% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/AbstractClientTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/AbstractClientTest.java index ba0901e546..9913c1764c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/AbstractClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/AbstractClientTest.java @@ -15,7 +15,7 @@ * the License. */ -package org.keycloak.testsuite.endpoint.client; +package org.keycloak.testsuite.admin.client; import java.util.List; import javax.ws.rs.core.Response; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/AbstractProtocolMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/AbstractProtocolMapperTest.java similarity index 98% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/AbstractProtocolMapperTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/AbstractProtocolMapperTest.java index 6fc8f4f9da..108467c8c0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/AbstractProtocolMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/AbstractProtocolMapperTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.endpoint.client; +package org.keycloak.testsuite.admin.client; import java.util.ArrayList; import java.util.HashMap; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/ClientProtocolMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientProtocolMapperTest.java similarity index 99% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/ClientProtocolMapperTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientProtocolMapperTest.java index 441ef4fea1..e167a03f8e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/ClientProtocolMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientProtocolMapperTest.java @@ -15,7 +15,7 @@ * the License. */ -package org.keycloak.testsuite.endpoint.client; +package org.keycloak.testsuite.admin.client; import javax.ws.rs.NotFoundException; import javax.ws.rs.core.Response; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/ClientRolesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientRolesTest.java similarity index 97% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/ClientRolesTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientRolesTest.java index fec32a2a73..5fb7c7dd0b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/ClientRolesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientRolesTest.java @@ -15,7 +15,7 @@ * the License. */ -package org.keycloak.testsuite.endpoint.client; +package org.keycloak.testsuite.admin.client; import org.junit.After; import org.junit.Before; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/ClientTemplateProtocolMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientTemplateProtocolMapperTest.java similarity index 99% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/ClientTemplateProtocolMapperTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientTemplateProtocolMapperTest.java index 6a2a660b97..9106f715ce 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/ClientTemplateProtocolMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientTemplateProtocolMapperTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.endpoint.client; +package org.keycloak.testsuite.admin.client; import javax.ws.rs.NotFoundException; import javax.ws.rs.core.Response; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/ClientTemplateTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientTemplateTest.java similarity index 99% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/ClientTemplateTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientTemplateTest.java index 85f05e2e91..2c282ff272 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/ClientTemplateTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientTemplateTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.endpoint.client; +package org.keycloak.testsuite.admin.client; import java.util.Arrays; import java.util.Collections; @@ -30,7 +30,6 @@ import javax.ws.rs.core.Response; import org.junit.Assert; import org.junit.Test; import org.keycloak.admin.client.resource.ClientTemplatesResource; -import org.keycloak.admin.client.resource.ProtocolMappersResource; import org.keycloak.admin.client.resource.RoleMappingResource; import org.keycloak.models.AccountRoles; import org.keycloak.models.Constants; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/ClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientTest.java similarity index 98% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/ClientTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientTest.java index a1aec62b23..1670a6b80b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/ClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientTest.java @@ -15,7 +15,7 @@ * the License. */ -package org.keycloak.testsuite.endpoint.client; +package org.keycloak.testsuite.admin.client; import java.util.List; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/CredentialsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/CredentialsTest.java similarity index 98% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/CredentialsTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/CredentialsTest.java index 3262d44649..2b79e50af9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/CredentialsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/CredentialsTest.java @@ -15,7 +15,7 @@ * the License. */ -package org.keycloak.testsuite.endpoint.client; +package org.keycloak.testsuite.admin.client; import org.junit.Before; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/InstallationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/InstallationTest.java similarity index 98% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/InstallationTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/InstallationTest.java index fcc78dc19c..71371988aa 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/InstallationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/InstallationTest.java @@ -15,7 +15,7 @@ * the License. */ -package org.keycloak.testsuite.endpoint.client; +package org.keycloak.testsuite.admin.client; import org.junit.After; import org.junit.Before; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/SessionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/SessionTest.java similarity index 98% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/SessionTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/SessionTest.java index 406ff68bcc..cf15f960a9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/client/SessionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/SessionTest.java @@ -15,7 +15,7 @@ * the License. */ -package org.keycloak.testsuite.endpoint.client; +package org.keycloak.testsuite.admin.client; import java.util.List; import org.jboss.arquillian.graphene.page.Page; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/event/AbstractEventTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/event/AbstractEventTest.java similarity index 97% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/event/AbstractEventTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/event/AbstractEventTest.java index 9b47c15b1a..597556cea5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/event/AbstractEventTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/event/AbstractEventTest.java @@ -15,7 +15,7 @@ * the License. */ -package org.keycloak.testsuite.endpoint.event; +package org.keycloak.testsuite.admin.event; import java.util.Collections; import org.junit.Before; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/event/AdminEventTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/event/AdminEventTest.java similarity index 98% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/event/AdminEventTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/event/AdminEventTest.java index e011925559..d7c0845626 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/event/AdminEventTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/event/AdminEventTest.java @@ -15,7 +15,7 @@ * the License. */ -package org.keycloak.testsuite.endpoint.event; +package org.keycloak.testsuite.admin.event; import java.util.Arrays; import java.util.Collections; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/event/EventConfigTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/event/EventConfigTest.java similarity index 98% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/event/EventConfigTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/event/EventConfigTest.java index c908f1d59b..53a07ccf34 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/event/EventConfigTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/event/EventConfigTest.java @@ -15,7 +15,7 @@ * the License. */ -package org.keycloak.testsuite.endpoint.event; +package org.keycloak.testsuite.admin.event; import java.util.Arrays; import java.util.Collections; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/event/LoginEventsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/event/LoginEventsTest.java similarity index 99% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/event/LoginEventsTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/event/LoginEventsTest.java index f3f3dd61a4..fa44674e3c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/event/LoginEventsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/event/LoginEventsTest.java @@ -15,7 +15,7 @@ * the License. */ -package org.keycloak.testsuite.endpoint.event; +package org.keycloak.testsuite.admin.event; import java.util.Arrays; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/group/AbstractGroupTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/AbstractGroupTest.java similarity index 98% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/group/AbstractGroupTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/AbstractGroupTest.java index 03dce574ec..a9520e05d9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/group/AbstractGroupTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/AbstractGroupTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.endpoint.group; +package org.keycloak.testsuite.admin.group; import org.junit.Before; import org.keycloak.OAuth2Constants; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/group/GroupMappersTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/GroupMappersTest.java similarity index 99% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/group/GroupMappersTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/GroupMappersTest.java index 78ef8451c4..d61a517ce6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/group/GroupMappersTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/GroupMappersTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.endpoint.group; +package org.keycloak.testsuite.admin.group; import org.junit.Assert; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/group/GroupTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/GroupTest.java similarity index 98% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/group/GroupTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/GroupTest.java index 573cd86e1c..6d2fd08d4c 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/group/GroupTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/GroupTest.java @@ -15,14 +15,12 @@ * limitations under the License. */ -package org.keycloak.testsuite.endpoint.group; +package org.keycloak.testsuite.admin.group; import org.junit.Assert; import org.junit.Test; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.representations.AccessToken; -import org.keycloak.representations.RefreshToken; -import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.GroupRepresentation; @@ -40,8 +38,6 @@ import java.net.URI; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import java.util.Set; - /** * @author Marko Strukelj diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/partialimport/PartialImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/partialimport/PartialImportTest.java similarity index 99% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/partialimport/PartialImportTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/partialimport/PartialImportTest.java index 7815cb4daf..d9acf656da 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/endpoint/partialimport/PartialImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/partialimport/PartialImportTest.java @@ -14,14 +14,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.keycloak.testsuite.endpoint.partialimport; +package org.keycloak.testsuite.admin.partialimport; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ws.rs.ProcessingException; import javax.ws.rs.core.Response; import org.junit.Before; import org.junit.Test;