From 9f814c6cf1a7c7835f12d6ee6de533fa133ede0c Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Thu, 29 Jun 2017 06:46:21 +0200 Subject: [PATCH] KEYCLOAK-5107 Fix FineGrainAdminUnitTest and IllegalAdminUpgradeTest on auth-server-wildfly --- .../keycloak/testsuite/admin/FineGrainAdminUnitTest.java | 9 +++++++++ .../testsuite/admin/IllegalAdminUpgradeTest.java | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/FineGrainAdminUnitTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/FineGrainAdminUnitTest.java index 8386aa612c..d4fe55e779 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/FineGrainAdminUnitTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/FineGrainAdminUnitTest.java @@ -16,9 +16,12 @@ */ package org.keycloak.testsuite.admin; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Assert; import org.junit.Test; import org.keycloak.admin.client.Keycloak; +import org.keycloak.admin.client.resource.UserResource; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.AuthorizationProviderFactory; import org.keycloak.authorization.model.Resource; @@ -48,6 +51,7 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.idm.authorization.DecisionStrategy; import org.keycloak.testsuite.AbstractKeycloakTest; +import org.keycloak.testsuite.runonserver.RunOnServerDeployment; import org.keycloak.testsuite.util.AdminClientUtil; import javax.ws.rs.ClientErrorException; @@ -65,6 +69,11 @@ public class FineGrainAdminUnitTest extends AbstractKeycloakTest { public static final String CLIENT_NAME = "application"; + @Deployment + public static WebArchive deploy() { + return RunOnServerDeployment.create(FineGrainAdminUnitTest.class); + } + @Override public void addTestRealms(List testRealms) { RealmRepresentation testRealmRep = new RealmRepresentation(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IllegalAdminUpgradeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IllegalAdminUpgradeTest.java index 7c6ced5e29..3318a6db01 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IllegalAdminUpgradeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IllegalAdminUpgradeTest.java @@ -16,6 +16,8 @@ */ package org.keycloak.testsuite.admin; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Assert; import org.junit.Test; import org.keycloak.admin.client.Keycloak; @@ -40,6 +42,7 @@ import org.keycloak.representations.idm.authorization.UserPolicyRepresentation; import org.keycloak.services.resources.admin.permissions.AdminPermissionManagement; import org.keycloak.services.resources.admin.permissions.AdminPermissions; import org.keycloak.testsuite.AbstractKeycloakTest; +import org.keycloak.testsuite.runonserver.RunOnServerDeployment; import org.keycloak.testsuite.util.AdminClientUtil; import javax.ws.rs.ClientErrorException; @@ -58,6 +61,11 @@ public class IllegalAdminUpgradeTest extends AbstractKeycloakTest { public static final String CLIENT_NAME = "application"; + @Deployment + public static WebArchive deploy() { + return RunOnServerDeployment.create(FineGrainAdminUnitTest.class); + } + @Override public void addTestRealms(List testRealms) { RealmRepresentation testRealmRep = new RealmRepresentation();