libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Make imports in ServerInfoAdminResource explicitly point to the new

Browse source 
packages.
This commit is contained in:
Stan Silvert 2016-03-04 11:17:12 -05:00 committed by Bill Burke
parent cf10a09008
commit 23175bf925
4 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java
View file

@ -51,8 +51,14 @@ import org.keycloak.provider.Spi;
import org.keycloak.representations.idm.ConfigPropertyRepresentation; import org.keycloak.representations.idm.ConfigPropertyRepresentation;
import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.representations.idm.ProtocolMapperRepresentation;
import org.keycloak.representations.idm.ProtocolMapperTypeRepresentation; import org.keycloak.representations.idm.ProtocolMapperTypeRepresentation;
import org.keycloak.representations.info.*;
import org.keycloak.broker.social.SocialIdentityProvider; import org.keycloak.broker.social.SocialIdentityProvider;
import org.keycloak.representations.info.ClientInstallationRepresentation;
import org.keycloak.representations.info.MemoryInfoRepresentation;
import org.keycloak.representations.info.ProviderRepresentation;
import org.keycloak.representations.info.ServerInfoRepresentation;
import org.keycloak.representations.info.SpiInfoRepresentation;
import org.keycloak.representations.info.SystemInfoRepresentation;
import org.keycloak.representations.info.ThemeInfoRepresentation;
/** /**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a> * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>

9
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientProtocolMapperTest.java
View file

@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import javax.ws.rs.NotFoundException; import javax.ws.rs.NotFoundException;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientResource;
@ -47,7 +48,7 @@ public class ClientProtocolMapperTest extends AbstractClientTest {
private ClientResource samlClientRsc; private ClientResource samlClientRsc;
private ProtocolMappersResource samlMappersRsc; private ProtocolMappersResource samlMappersRsc;
private Map<String, List<ProtocolMapperRepresentation>> builtinMappers; private Map<String, List<ProtocolMapperRepresentation>> builtinMappers = null;
@Before @Before
public void init() { public void init() {
@ -62,6 +63,12 @@ public class ClientProtocolMapperTest extends AbstractClientTest {
builtinMappers = adminClient.serverInfo().getInfo().getBuiltinProtocolMappers(); builtinMappers = adminClient.serverInfo().getInfo().getBuiltinProtocolMappers();
} }
@After
public void tearDown() {
oidcClientRsc.remove();
samlClientRsc.remove();
}
private ProtocolMapperRepresentation makeMapper(String protocol, String name, String mapperType, Map<String, String> config) { private ProtocolMapperRepresentation makeMapper(String protocol, String name, String mapperType, Map<String, String> config) {
ProtocolMapperRepresentation rep = new ProtocolMapperRepresentation(); ProtocolMapperRepresentation rep = new ProtocolMapperRepresentation();
rep.setProtocol(protocol); rep.setProtocol(protocol);

6
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientRolesTest.java
View file

@ -17,6 +17,7 @@
package org.keycloak.testsuite.admin.client; package org.keycloak.testsuite.admin.client;
import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientResource;
@ -42,6 +43,11 @@ public class ClientRolesTest extends AbstractClientTest {
rolesRsc = clientRsc.roles(); rolesRsc = clientRsc.roles();
} }
@After
public void tearDown() {
clientRsc.remove();
}
private RoleRepresentation makeRole(String name) { private RoleRepresentation makeRole(String name) {
RoleRepresentation role = new RoleRepresentation(); RoleRepresentation role = new RoleRepresentation();
role.setName(name); role.setName(name);

7
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/InstallationTest.java
View file

@ -17,6 +17,7 @@
package org.keycloak.testsuite.admin.client; package org.keycloak.testsuite.admin.client;
import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientResource;
@ -47,6 +48,12 @@ public class InstallationTest extends AbstractClientTest {
samlClient = findClientResource(SAML_NAME); samlClient = findClientResource(SAML_NAME);
} }
@After
public void tearDown() {
oidcClient.remove();
samlClient.remove();
}
private String authServerUrl() { private String authServerUrl() {
return AuthServerTestEnricher.getAuthServerContextRoot() + "/auth"; return AuthServerTestEnricher.getAuthServerContextRoot() + "/auth";
} }