From 84dfd96f4dc959ddc5153825f0ee8c37bac39f48 Mon Sep 17 00:00:00 2001 From: Lukas Hanusovsky Date: Wed, 1 Apr 2026 15:35:09 +0200 Subject: [PATCH] Migration Tool - Removing AbstractKeycloak extends. Signed-off-by: Lukas Hanusovsky --- .../AbstractKeycloakExtendsRewrite.java | 30 +++++++++++++++++++ .../keycloak/test/migration/MigrateTest.java | 5 +--- 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 tests/migration-util/src/main/java/org/keycloak/test/migration/AbstractKeycloakExtendsRewrite.java diff --git a/tests/migration-util/src/main/java/org/keycloak/test/migration/AbstractKeycloakExtendsRewrite.java b/tests/migration-util/src/main/java/org/keycloak/test/migration/AbstractKeycloakExtendsRewrite.java new file mode 100644 index 000000000000..bfc73a3e9be8 --- /dev/null +++ b/tests/migration-util/src/main/java/org/keycloak/test/migration/AbstractKeycloakExtendsRewrite.java @@ -0,0 +1,30 @@ +package org.keycloak.test.migration; + +public class AbstractKeycloakExtendsRewrite extends TestRewrite { + + @Override + public void rewrite() { + int abstractImport = findLine("import[ ]org\\.keycloak\\.testsuite\\.AbstractKeycloakTest;"); + int abstractTestRealmImport = findLine("import[ ]org\\.keycloak\\.testsuite\\.AbstractTestRealmKeycloakTest;"); + + if (abstractImport >= 0 || abstractTestRealmImport >= 0) { + for (int i = 0; i < content.size(); i++) { + String l = content.get(i); + if (l.contains(" extends AbstractKeycloakTest")) { + replaceLine(i, l.replace(" extends AbstractKeycloakTest", "")); + content.remove(abstractImport); + info(i, "Statement removed: 'AbstractKeycloakTest'"); + break; + } + + if (l.contains(" extends AbstractTestRealmKeycloakTest")) { + replaceLine(i, l.replace(" extends AbstractTestRealmKeycloakTest", "")); + content.remove(abstractTestRealmImport); + info(i, "Statement removed: 'AbstractTestRealmKeycloakTest'"); + break; + } + } + } + } + +} diff --git a/tests/migration-util/src/main/java/org/keycloak/test/migration/MigrateTest.java b/tests/migration-util/src/main/java/org/keycloak/test/migration/MigrateTest.java index e535855a8214..149b0c3e24e8 100644 --- a/tests/migration-util/src/main/java/org/keycloak/test/migration/MigrateTest.java +++ b/tests/migration-util/src/main/java/org/keycloak/test/migration/MigrateTest.java @@ -5,18 +5,14 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; -import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.stream.Stream; -import static java.lang.Thread.sleep; - public class MigrateTest { private static final String DIFF_COMMAND = System.getenv("DIFFTOOL"); @@ -25,6 +21,7 @@ public class MigrateTest { AddKeycloakIntegrationTestRewrite.class, ChangePackageRewrite.class, RenameImportsRewrite.class, + AbstractKeycloakExtendsRewrite.class, UpdateAssertsRewrite.class, AddManagedResourcesRewrite.class, AdminEventAssertRewrite.class,