8000 Refactor legacy test suite's ExportImportResource by vaceksimon · Pull Request #48967 · keycloak/keycloak · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.keycloak.testframework.remote.providers.runonserver;

import java.io.IOException;
import java.io.Serializable;

import org.keycloak.models.KeycloakSession;
Expand All @@ -26,6 +27,6 @@
*/
public interface FetchOnServer extends Serializable {

Object run(KeycloakSession session);
Object run(KeycloakSession session) throws IOException;

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
package org.keycloak.testsuite.util.runonserver;

import java.nio.file.Files;

import org.keycloak.exportimport.ExportImportManager;
import org.keycloak.exportimport.Strategy;
import org.keycloak.testframework.remote.providers.runonserver.FetchOnServer;
import org.keycloak.testframework.remote.providers.runonserver.RunOnServer;

import static org.keycloak.exportimport.ExportImportConfig.ACTION;
import static org.keycloak.exportimport.ExportImportConfig.DIR;
import static org.keycloak.exportimport.ExportImportConfig.FILE;
import static org.keycloak.exportimport.ExportImportConfig.PROVIDER;
import static org.keycloak.exportimport.ExportImportConfig.REALM_NAME;
import static org.keycloak.exportimport.ExportImportConfig.STRATEGY;
import static org.keycloak.exportimport.ExportImportConfig.USERS_PER_FILE;

public final class ExportImportHelper {

private static String tempDir;

public static RunOnServer runImport() {
return session -> new ExportImportManager(session).runImport();
}

public static RunOnServer runExport() {
return session -> new ExportImportManager(session).runExport();
}

public static RunOnServer setUsersPerFile(int usersPerFile) {
return session -> System.setProperty(USERS_PER_FILE, String.valueOf(usersPerFile));
}

public static RunOnServer setDir(String dir) {
return session -> System.setProperty(DIR, dir);
}

public static RunOnServer setStrategy(Strategy strategy) {
return session -> System.setProperty(STRATEGY, strategy.name());
}

public static RunOnServer setProvider(String exportImportProvider) {
return session -> System.setProperty(PROVIDER, exportImportProvider);
}

public static RunOnServer setFile(String file) {
return session -> System.setProperty(FILE, file);
}

public static RunOnServer setAction(String exportImportAction) {
return session -> System.setProperty(ACTION, exportImportAction);
}

public static RunOnServer setRealmName(String realmName) {
return session -> {
if (realmName != null && !realmName.isEmpty()) {
System.setProperty(REALM_NAME, realmName);
} else {
System.getProperties().remove(REALM_NAME);
}
};
}

public static FetchOnServer getExportImportTestDirectory() {
return session -> {
if (tempDir == null) {
tempDir = Files.createTempDirectory("kc-tests").toAbsolutePath().toString();
}
return tempDir;
};
}

public static RunOnServer clear() {
return session -> {
System.clearProperty(REALM_NAME);
System.clearProperty(PROVIDER);
System.clearProperty(ACTION);
System.clearProperty(FILE);
};
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@
import org.keycloak.testsuite.rest.representation.AuthenticatorState;
import org.keycloak.testsuite.rest.resource.TestCacheResource;
import org.keycloak.testsuite.rest.resource.TestLDAPResource;
import org.keycloak.testsuite.rest.resource.TestingExportImportResource;
import org.keycloak.testsuite.util.FeatureDeployerUtil;
import org.keycloak.timer.TimerProvider;
import org.keycloak.truststore.FileTruststoreProvider;
Expand Down Expand Up @@ -277,11 +276,6 @@ public UserRepresentation getUserByServiceAccountClient(@QueryParam("realmName")
return ModelToRepresentation.toRepresentation(session, realm, user);
}

@Path("/export-import")
public TestingExportImportResource getExportImportResource() {
return new TestingExportImportResource(session);
}

@GET
@Path("/test-amphibian-component")
@Produces(MediaType.APPLICATION_JSON)
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,6 @@ public UserRepresentation getUserByUsernameFromFedProviderFactory(@QueryParam("r
@Produces(MediaType.APPLICATION_JSON)
public UserRepresentation getUserByServiceAccountClient(@QueryParam("realmName") String realmName, @QueryParam("clientId") String clientId);

@Path("export-import")
TestingExportImportResource exportImport();

@GET
@Path("/test-amphibian-component")
@Produces(MediaType.APPLICATION_JSON)
Expand Down
Loading
Loading
0