libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

[KEYCLOAK-8185] add clear method to exportimport resource

Browse source
This commit is contained in:
wyvie 2018-09-12 08:35:39 +02:00 committed by Pavel Drozd
parent c4a651bcac
commit 01051016f5
3 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestingExportImportResource.java
View file

@ -147,4 +147,16 @@ public class TestingExportImportResource {
String absolutePath = new File(System.getProperty("project.build.directory", "target")).getAbsolutePath(); String absolutePath = new File(System.getProperty("project.build.directory", "target")).getAbsolutePath();
return absolutePath; return absolutePath;
} }
@GET
@Path("/clear")
@Produces(MediaType.APPLICATION_JSON)
public Response clear() {
System.clearProperty(REALM_NAME);
System.clearProperty(PROVIDER);
System.clearProperty(ACTION);
System.clearProperty(FILE);
return Response.ok().build();
}
} }

5
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingExportImportResource.java
View file

@ -96,4 +96,9 @@ public interface TestingExportImportResource {
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
public String getExportImportTestDirectory(); public String getExportImportTestDirectory();
@GET
@Path("/clear")
@Produces(MediaType.APPLICATION_JSON)
public Response clear();
} }

9
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/BrokerLinkAndTokenExchangeTest.java
View file

@ -492,7 +492,6 @@ public class BrokerLinkAndTokenExchangeTest extends AbstractServletsAdapterTest
testExternalExchange(); testExternalExchange();
testingClient.testing().exportImport().setProvider(SingleFileExportProviderFactory.PROVIDER_ID); testingClient.testing().exportImport().setProvider(SingleFileExportProviderFactory.PROVIDER_ID);
String targetFilePath = testingClient.testing().exportImport().getExportImportTestDirectory() + File.separator + "singleFile-full.json"; String targetFilePath = testingClient.testing().exportImport().getExportImportTestDirectory() + File.separator + "singleFile-full.json";
//System.out.println("TARGET PATH: " + targetFilePath);
testingClient.testing().exportImport().setFile(targetFilePath); testingClient.testing().exportImport().setFile(targetFilePath);
testingClient.testing().exportImport().setAction(ExportImportConfig.ACTION_EXPORT); testingClient.testing().exportImport().setAction(ExportImportConfig.ACTION_EXPORT);
testingClient.testing().exportImport().setRealmName(CHILD_IDP); testingClient.testing().exportImport().setRealmName(CHILD_IDP);
@ -502,12 +501,10 @@ public class BrokerLinkAndTokenExchangeTest extends AbstractServletsAdapterTest
testingClient.testing().exportImport().setAction(ExportImportConfig.ACTION_IMPORT); testingClient.testing().exportImport().setAction(ExportImportConfig.ACTION_IMPORT);
testingClient.testing().exportImport().runImport(); testingClient.testing().exportImport().runImport();
//System.out.println("************* AFTER IMPORT");
testingClient.testing().exportImport().clear();
testExternalExchange(); testExternalExchange();
//Thread.sleep(1000000000l);
} }