From 2b2107f39787c7fa70a2b9390c7b92462e22add1 Mon Sep 17 00:00:00 2001
From: Lukas Hanusovsky <61745358+lhanusov@users.noreply.github.com>
Date: Wed, 28 Aug 2024 14:14:08 +0200
Subject: [PATCH] Move Test Framework (#32407)

* Move Test Framework

Signed-off-by: Lukas Hanusovsky <lhanusov@redhat.com>

* Update .github/workflows/ci.yml

Signed-off-by: Stian Thorgersen <stian@redhat.com>

---------

Signed-off-by: Lukas Hanusovsky <lhanusov@redhat.com>
Signed-off-by: Stian Thorgersen <stian@redhat.com>
Co-authored-by: Stian Thorgersen <stian@redhat.com>
---
 .github/workflows/ci.yml                      | 19 +++++++++++++++++--
 pom.xml                                       |  1 +
 .../framework => test-framework}/README.md    |  0
 .../framework => test-framework}/pom.xml      | 10 +++++-----
 .../main/java/org/junit/rules/TestRule.java   |  0
 .../org/junit/runners/model/Statement.java    |  0
 .../KeycloakIntegrationTestExtension.java     |  0
 .../admin/KeycloakAdminClientSupplier.java    |  0
 .../annotations/InjectAdminClient.java        |  0
 .../framework/annotations/InjectClient.java   |  0
 .../framework/annotations/InjectEvents.java   |  0
 .../annotations/InjectOAuthClient.java        |  0
 .../framework/annotations/InjectPage.java     |  0
 .../framework/annotations/InjectRealm.java    |  0
 .../annotations/InjectSysLogServer.java       |  0
 .../annotations/InjectTestDatabase.java       |  0
 .../framework/annotations/InjectUser.java     |  0
 .../annotations/InjectWebDriver.java          |  0
 .../annotations/KeycloakIntegrationTest.java  |  0
 .../test/framework/config/Config.java         |  0
 .../database/AbstractDatabaseSupplier.java    |  0
 .../framework/database/DatabaseConfig.java    |  0
 .../database/DevFileDatabaseSupplier.java     |  0
 .../database/DevMemDatabaseSupplier.java      |  0
 .../database/MSSQLServerDatabaseSupplier.java |  0
 .../database/MariaDBDatabaseSupplier.java     |  0
 .../database/MySQLDatabaseSupplier.java       |  0
 .../database/OracleDatabaseSupplier.java      |  0
 .../database/PostgresDatabaseSupplier.java    |  0
 .../test/framework/database/TestDatabase.java |  0
 .../test/framework/events/EventParser.java    |  0
 .../test/framework/events/Events.java         |  0
 .../test/framework/events/EventsSupplier.java |  0
 .../test/framework/events/SysLog.java         |  0
 .../test/framework/events/SysLogListener.java |  0
 .../test/framework/events/SysLogServer.java   |  0
 .../events/SysLogServerSupplier.java          |  0
 .../framework/injection/AnnotationFields.java |  0
 .../injection/DefaultAnnotationProxy.java     |  0
 .../framework/injection/InstanceContext.java  |  0
 .../test/framework/injection/LifeCycle.java   |  0
 .../test/framework/injection/Registry.java    |  0
 .../injection/RequestedInstance.java          |  0
 .../test/framework/injection/StringUtil.java  |  0
 .../test/framework/injection/Supplier.java    |  0
 .../framework/injection/SupplierHelpers.java  |  0
 .../framework/injection/ValueTypeAlias.java   |  0
 .../DefaultOAuthClientConfiguration.java      |  0
 .../framework/oauth/OAuthCallbackServer.java  |  0
 .../test/framework/oauth/OAuthClient.java     |  2 +-
 .../framework/oauth/OAuthClientSupplier.java  |  0
 .../test/framework/page/AbstractPage.java     |  0
 .../test/framework/page/LoginPage.java        |  0
 .../test/framework/page/PageSupplier.java     |  0
 .../test/framework/page/WelcomePage.java      |  0
 .../test/framework/realm/ClientConfig.java    |  0
 .../framework/realm/ClientConfigBuilder.java  |  0
 .../test/framework/realm/ClientSupplier.java  |  0
 .../test/framework/realm/Collections.java     |  0
 .../framework/realm/DefaultClientConfig.java  |  0
 .../framework/realm/DefaultRealmConfig.java   |  0
 .../framework/realm/DefaultUserConfig.java    |  0
 .../test/framework/realm/ManagedClient.java   |  0
 .../test/framework/realm/ManagedRealm.java    |  0
 .../test/framework/realm/ManagedUser.java     |  0
 .../test/framework/realm/RealmConfig.java     |  0
 .../framework/realm/RealmConfigBuilder.java   |  0
 .../test/framework/realm/RealmSupplier.java   |  0
 .../test/framework/realm/Representations.java |  0
 .../test/framework/realm/UserConfig.java      |  0
 .../framework/realm/UserConfigBuilder.java    |  0
 .../test/framework/realm/UserSupplier.java    |  0
 .../AbstractKeycloakTestServerSupplier.java   |  0
 .../DefaultKeycloakTestServerConfig.java      |  0
 .../DistributionKeycloakTestServer.java       |  0
 ...istributionKeycloakTestServerSupplier.java |  0
 .../server/EmbeddedKeycloakTestServer.java    |  0
 .../EmbeddedKeycloakTestServerSupplier.java   |  0
 .../framework/server/KeycloakTestServer.java  |  0
 .../server/KeycloakTestServerConfig.java      |  0
 .../server/RemoteKeycloakTestServer.java      |  0
 .../RemoteKeycloakTestServerSupplier.java     |  0
 .../keycloak/test/framework/util/ApiUtil.java |  0
 .../webdriver/AbstractWebDriverSupplier.java  |  0
 .../ChromeHeadlessWebDriverSupplier.java      |  0
 .../webdriver/ChromeWebDriverSupplier.java    |  0
 .../FirefoxHeadlessWebDriverSupplier.java     |  0
 .../webdriver/FirefoxWebDriverSupplier.java   |  0
 .../webdriver/HtmlUnitWebDriverSupplier.java  |  0
 .../org.junit.jupiter.api.extension.Extension |  0
 ...keycloak.test.framework.injection.Supplier |  0
 .../framework/events/EventParserTest.java     |  0
 .../test/framework/events/SysLogTest.java     |  0
 .../injection/DefaultAnnotationProxyTest.java |  0
 .../framework/injection/RegistryTest.java     |  0
 .../injection/ValueTypeAliasTest.java         |  0
 .../injection/mocks/MockChildAnnotation.java  |  0
 .../injection/mocks/MockChildSupplier.java    |  0
 .../injection/mocks/MockChildValue.java       |  0
 .../injection/mocks/MockInstances.java        |  0
 .../injection/mocks/MockParent2Supplier.java  |  0
 .../injection/mocks/MockParentAnnotation.java |  0
 .../injection/mocks/MockParentSupplier.java   |  0
 .../injection/mocks/MockParentValue.java      |  0
 ...keycloak.test.framework.injection.Supplier |  0
 .../src/test/resources/logging.properties     |  0
 test-poc/examples/pom.xml                     | 10 +++++-----
 test-poc/pom.xml                              |  1 -
 test-poc/showcase/pom.xml                     |  8 ++++----
 109 files changed, 33 insertions(+), 18 deletions(-)
 rename {test-poc/framework => test-framework}/README.md (100%)
 rename {test-poc/framework => test-framework}/pom.xml (93%)
 rename {test-poc/framework => test-framework}/src/main/java/org/junit/rules/TestRule.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/junit/runners/model/Statement.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/KeycloakIntegrationTestExtension.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/admin/KeycloakAdminClientSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/annotations/InjectAdminClient.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/annotations/InjectClient.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/annotations/InjectEvents.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/annotations/InjectOAuthClient.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/annotations/InjectPage.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/annotations/InjectRealm.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/annotations/InjectSysLogServer.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/annotations/InjectTestDatabase.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/annotations/InjectUser.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/annotations/InjectWebDriver.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/annotations/KeycloakIntegrationTest.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/config/Config.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/database/AbstractDatabaseSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/database/DatabaseConfig.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/database/DevFileDatabaseSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/database/DevMemDatabaseSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/database/MSSQLServerDatabaseSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/database/MariaDBDatabaseSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/database/MySQLDatabaseSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/database/OracleDatabaseSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/database/PostgresDatabaseSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/database/TestDatabase.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/events/EventParser.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/events/Events.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/events/EventsSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/events/SysLog.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/events/SysLogListener.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/events/SysLogServer.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/events/SysLogServerSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/injection/AnnotationFields.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/injection/DefaultAnnotationProxy.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/injection/InstanceContext.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/injection/LifeCycle.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/injection/Registry.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/injection/RequestedInstance.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/injection/StringUtil.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/injection/Supplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/injection/SupplierHelpers.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/injection/ValueTypeAlias.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/oauth/DefaultOAuthClientConfiguration.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/oauth/OAuthCallbackServer.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/oauth/OAuthClient.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/oauth/OAuthClientSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/page/AbstractPage.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/page/LoginPage.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/page/PageSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/page/WelcomePage.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/realm/ClientConfig.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/realm/ClientConfigBuilder.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/realm/ClientSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/realm/Collections.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/realm/DefaultClientConfig.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/realm/DefaultRealmConfig.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/realm/DefaultUserConfig.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/realm/ManagedClient.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/realm/ManagedRealm.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/realm/ManagedUser.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/realm/RealmConfig.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/realm/RealmConfigBuilder.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/realm/RealmSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/realm/Representations.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/realm/UserConfig.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/realm/UserConfigBuilder.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/realm/UserSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/server/AbstractKeycloakTestServerSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/server/DefaultKeycloakTestServerConfig.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/server/DistributionKeycloakTestServer.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/server/DistributionKeycloakTestServerSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/server/EmbeddedKeycloakTestServer.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/server/EmbeddedKeycloakTestServerSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/server/KeycloakTestServer.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/server/KeycloakTestServerConfig.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/server/RemoteKeycloakTestServer.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/server/RemoteKeycloakTestServerSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/util/ApiUtil.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/webdriver/AbstractWebDriverSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/webdriver/ChromeHeadlessWebDriverSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/webdriver/ChromeWebDriverSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/webdriver/FirefoxHeadlessWebDriverSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/webdriver/FirefoxWebDriverSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/java/org/keycloak/test/framework/webdriver/HtmlUnitWebDriverSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension (100%)
 rename {test-poc/framework => test-framework}/src/main/resources/META-INF/services/org.keycloak.test.framework.injection.Supplier (100%)
 rename {test-poc/framework => test-framework}/src/test/java/org/keycloak/test/framework/events/EventParserTest.java (100%)
 rename {test-poc/framework => test-framework}/src/test/java/org/keycloak/test/framework/events/SysLogTest.java (100%)
 rename {test-poc/framework => test-framework}/src/test/java/org/keycloak/test/framework/injection/DefaultAnnotationProxyTest.java (100%)
 rename {test-poc/framework => test-framework}/src/test/java/org/keycloak/test/framework/injection/RegistryTest.java (100%)
 rename {test-poc/framework => test-framework}/src/test/java/org/keycloak/test/framework/injection/ValueTypeAliasTest.java (100%)
 rename {test-poc/framework => test-framework}/src/test/java/org/keycloak/test/framework/injection/mocks/MockChildAnnotation.java (100%)
 rename {test-poc/framework => test-framework}/src/test/java/org/keycloak/test/framework/injection/mocks/MockChildSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/test/java/org/keycloak/test/framework/injection/mocks/MockChildValue.java (100%)
 rename {test-poc/framework => test-framework}/src/test/java/org/keycloak/test/framework/injection/mocks/MockInstances.java (100%)
 rename {test-poc/framework => test-framework}/src/test/java/org/keycloak/test/framework/injection/mocks/MockParent2Supplier.java (100%)
 rename {test-poc/framework => test-framework}/src/test/java/org/keycloak/test/framework/injection/mocks/MockParentAnnotation.java (100%)
 rename {test-poc/framework => test-framework}/src/test/java/org/keycloak/test/framework/injection/mocks/MockParentSupplier.java (100%)
 rename {test-poc/framework => test-framework}/src/test/java/org/keycloak/test/framework/injection/mocks/MockParentValue.java (100%)
 rename {test-poc/framework => test-framework}/src/test/resources/META-INF/services/org.keycloak.test.framework.injection.Supplier (100%)
 rename {test-poc/framework => test-framework}/src/test/resources/logging.properties (100%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5388935857..f190e0aa7f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -80,7 +80,7 @@ jobs:
         run: |
           SEP=""
           PROJECTS=""
-          for i in `find -name '*Test.java' -type f | egrep -v './(testsuite|quarkus|docs|test-poc)/' | sed 's|/src/test/java/.*||' | sort | uniq | sed 's|./||'`; do
+          for i in `find -name '*Test.java' -type f | egrep -v './(testsuite|quarkus|docs|test-poc|test-framework)/' | sed 's|/src/test/java/.*||' | sort | uniq | sed 's|./||'`; do
             PROJECTS="$PROJECTS$SEP$i"
             SEP=","
           done
@@ -923,6 +923,21 @@ jobs:
         with:
           job-id: migration-tests-${{ matrix.old-version }}-${{ matrix.database }}
 
+  test-framework:
+    name: Keycloak Test Framework
+    runs-on: ubuntu-latest
+    needs: build
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+
+      - id: integration-test-setup
+        name: Integration test setup
+        uses: ./.github/actions/integration-test-setup
+
+      - name: Run tests
+        run: ./mvnw test -f test-framework/pom.xml
+
   test-poc:
     name: Test PoC
     runs-on: ubuntu-latest
@@ -941,7 +956,7 @@ jobs:
       - name: Run tests
         env:
           KC_TEST_BROWSER: chrome-headless
-        run: mvn clean install -f test-poc
+        run: ./mvnw clean install -f test-poc/pom.xml
 
   check:
     name: Status Check - Keycloak CI
diff --git a/pom.xml b/pom.xml
index 5d2d2199fc..7ca4bb43b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -301,6 +301,7 @@
         <module>authz</module>
         <module>misc</module>
         <module>js</module>
+        <module>test-framework</module>
         <module>quarkus</module>
     </modules>
 
diff --git a/test-poc/framework/README.md b/test-framework/README.md
similarity index 100%
rename from test-poc/framework/README.md
rename to test-framework/README.md
diff --git a/test-poc/framework/pom.xml b/test-framework/pom.xml
similarity index 93%
rename from test-poc/framework/pom.xml
rename to test-framework/pom.xml
index f382fb6d63..80a5b894c7 100755
--- a/test-poc/framework/pom.xml
+++ b/test-framework/pom.xml
@@ -19,17 +19,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <artifactId>keycloak-test-parent</artifactId>
-        <groupId>org.keycloak.test</groupId>
+        <artifactId>keycloak-parent</artifactId>
+        <groupId>org.keycloak</groupId>
         <version>999.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>keycloak-test-junit5-framework</artifactId>
-    <name>Keycloak JUnit 5 testing framework</name>
+    <artifactId>keycloak-test-framework</artifactId>
+    <name>Keycloak Test Framework</name>
     <packaging>jar</packaging>
-    <description>PoC JUnit 5 testing framework for Keycloak</description>
+    <description>Preview Keycloak testing framework based on JUnit 5</description>
 
     <properties>
         <selenium.version>4.23.1</selenium.version>
diff --git a/test-poc/framework/src/main/java/org/junit/rules/TestRule.java b/test-framework/src/main/java/org/junit/rules/TestRule.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/junit/rules/TestRule.java
rename to test-framework/src/main/java/org/junit/rules/TestRule.java
diff --git a/test-poc/framework/src/main/java/org/junit/runners/model/Statement.java b/test-framework/src/main/java/org/junit/runners/model/Statement.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/junit/runners/model/Statement.java
rename to test-framework/src/main/java/org/junit/runners/model/Statement.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/KeycloakIntegrationTestExtension.java b/test-framework/src/main/java/org/keycloak/test/framework/KeycloakIntegrationTestExtension.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/KeycloakIntegrationTestExtension.java
rename to test-framework/src/main/java/org/keycloak/test/framework/KeycloakIntegrationTestExtension.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/admin/KeycloakAdminClientSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/admin/KeycloakAdminClientSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/admin/KeycloakAdminClientSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/admin/KeycloakAdminClientSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/annotations/InjectAdminClient.java b/test-framework/src/main/java/org/keycloak/test/framework/annotations/InjectAdminClient.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/annotations/InjectAdminClient.java
rename to test-framework/src/main/java/org/keycloak/test/framework/annotations/InjectAdminClient.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/annotations/InjectClient.java b/test-framework/src/main/java/org/keycloak/test/framework/annotations/InjectClient.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/annotations/InjectClient.java
rename to test-framework/src/main/java/org/keycloak/test/framework/annotations/InjectClient.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/annotations/InjectEvents.java b/test-framework/src/main/java/org/keycloak/test/framework/annotations/InjectEvents.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/annotations/InjectEvents.java
rename to test-framework/src/main/java/org/keycloak/test/framework/annotations/InjectEvents.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/annotations/InjectOAuthClient.java b/test-framework/src/main/java/org/keycloak/test/framework/annotations/InjectOAuthClient.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/annotations/InjectOAuthClient.java
rename to test-framework/src/main/java/org/keycloak/test/framework/annotations/InjectOAuthClient.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/annotations/InjectPage.java b/test-framework/src/main/java/org/keycloak/test/framework/annotations/InjectPage.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/annotations/InjectPage.java
rename to test-framework/src/main/java/org/keycloak/test/framework/annotations/InjectPage.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/annotations/InjectRealm.java b/test-framework/src/main/java/org/keycloak/test/framework/annotations/InjectRealm.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/annotations/InjectRealm.java
rename to test-framework/src/main/java/org/keycloak/test/framework/annotations/InjectRealm.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/annotations/InjectSysLogServer.java b/test-framework/src/main/java/org/keycloak/test/framework/annotations/InjectSysLogServer.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/annotations/InjectSysLogServer.java
rename to test-framework/src/main/java/org/keycloak/test/framework/annotations/InjectSysLogServer.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/annotations/InjectTestDatabase.java b/test-framework/src/main/java/org/keycloak/test/framework/annotations/InjectTestDatabase.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/annotations/InjectTestDatabase.java
rename to test-framework/src/main/java/org/keycloak/test/framework/annotations/InjectTestDatabase.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/annotations/InjectUser.java b/test-framework/src/main/java/org/keycloak/test/framework/annotations/InjectUser.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/annotations/InjectUser.java
rename to test-framework/src/main/java/org/keycloak/test/framework/annotations/InjectUser.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/annotations/InjectWebDriver.java b/test-framework/src/main/java/org/keycloak/test/framework/annotations/InjectWebDriver.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/annotations/InjectWebDriver.java
rename to test-framework/src/main/java/org/keycloak/test/framework/annotations/InjectWebDriver.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/annotations/KeycloakIntegrationTest.java b/test-framework/src/main/java/org/keycloak/test/framework/annotations/KeycloakIntegrationTest.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/annotations/KeycloakIntegrationTest.java
rename to test-framework/src/main/java/org/keycloak/test/framework/annotations/KeycloakIntegrationTest.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/config/Config.java b/test-framework/src/main/java/org/keycloak/test/framework/config/Config.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/config/Config.java
rename to test-framework/src/main/java/org/keycloak/test/framework/config/Config.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/database/AbstractDatabaseSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/database/AbstractDatabaseSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/database/AbstractDatabaseSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/database/AbstractDatabaseSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/database/DatabaseConfig.java b/test-framework/src/main/java/org/keycloak/test/framework/database/DatabaseConfig.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/database/DatabaseConfig.java
rename to test-framework/src/main/java/org/keycloak/test/framework/database/DatabaseConfig.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/database/DevFileDatabaseSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/database/DevFileDatabaseSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/database/DevFileDatabaseSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/database/DevFileDatabaseSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/database/DevMemDatabaseSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/database/DevMemDatabaseSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/database/DevMemDatabaseSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/database/DevMemDatabaseSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/database/MSSQLServerDatabaseSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/database/MSSQLServerDatabaseSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/database/MSSQLServerDatabaseSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/database/MSSQLServerDatabaseSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/database/MariaDBDatabaseSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/database/MariaDBDatabaseSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/database/MariaDBDatabaseSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/database/MariaDBDatabaseSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/database/MySQLDatabaseSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/database/MySQLDatabaseSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/database/MySQLDatabaseSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/database/MySQLDatabaseSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/database/OracleDatabaseSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/database/OracleDatabaseSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/database/OracleDatabaseSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/database/OracleDatabaseSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/database/PostgresDatabaseSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/database/PostgresDatabaseSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/database/PostgresDatabaseSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/database/PostgresDatabaseSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/database/TestDatabase.java b/test-framework/src/main/java/org/keycloak/test/framework/database/TestDatabase.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/database/TestDatabase.java
rename to test-framework/src/main/java/org/keycloak/test/framework/database/TestDatabase.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/events/EventParser.java b/test-framework/src/main/java/org/keycloak/test/framework/events/EventParser.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/events/EventParser.java
rename to test-framework/src/main/java/org/keycloak/test/framework/events/EventParser.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/events/Events.java b/test-framework/src/main/java/org/keycloak/test/framework/events/Events.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/events/Events.java
rename to test-framework/src/main/java/org/keycloak/test/framework/events/Events.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/events/EventsSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/events/EventsSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/events/EventsSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/events/EventsSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/events/SysLog.java b/test-framework/src/main/java/org/keycloak/test/framework/events/SysLog.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/events/SysLog.java
rename to test-framework/src/main/java/org/keycloak/test/framework/events/SysLog.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/events/SysLogListener.java b/test-framework/src/main/java/org/keycloak/test/framework/events/SysLogListener.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/events/SysLogListener.java
rename to test-framework/src/main/java/org/keycloak/test/framework/events/SysLogListener.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/events/SysLogServer.java b/test-framework/src/main/java/org/keycloak/test/framework/events/SysLogServer.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/events/SysLogServer.java
rename to test-framework/src/main/java/org/keycloak/test/framework/events/SysLogServer.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/events/SysLogServerSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/events/SysLogServerSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/events/SysLogServerSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/events/SysLogServerSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/injection/AnnotationFields.java b/test-framework/src/main/java/org/keycloak/test/framework/injection/AnnotationFields.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/injection/AnnotationFields.java
rename to test-framework/src/main/java/org/keycloak/test/framework/injection/AnnotationFields.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/injection/DefaultAnnotationProxy.java b/test-framework/src/main/java/org/keycloak/test/framework/injection/DefaultAnnotationProxy.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/injection/DefaultAnnotationProxy.java
rename to test-framework/src/main/java/org/keycloak/test/framework/injection/DefaultAnnotationProxy.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/injection/InstanceContext.java b/test-framework/src/main/java/org/keycloak/test/framework/injection/InstanceContext.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/injection/InstanceContext.java
rename to test-framework/src/main/java/org/keycloak/test/framework/injection/InstanceContext.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/injection/LifeCycle.java b/test-framework/src/main/java/org/keycloak/test/framework/injection/LifeCycle.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/injection/LifeCycle.java
rename to test-framework/src/main/java/org/keycloak/test/framework/injection/LifeCycle.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/injection/Registry.java b/test-framework/src/main/java/org/keycloak/test/framework/injection/Registry.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/injection/Registry.java
rename to test-framework/src/main/java/org/keycloak/test/framework/injection/Registry.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/injection/RequestedInstance.java b/test-framework/src/main/java/org/keycloak/test/framework/injection/RequestedInstance.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/injection/RequestedInstance.java
rename to test-framework/src/main/java/org/keycloak/test/framework/injection/RequestedInstance.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/injection/StringUtil.java b/test-framework/src/main/java/org/keycloak/test/framework/injection/StringUtil.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/injection/StringUtil.java
rename to test-framework/src/main/java/org/keycloak/test/framework/injection/StringUtil.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/injection/Supplier.java b/test-framework/src/main/java/org/keycloak/test/framework/injection/Supplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/injection/Supplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/injection/Supplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/injection/SupplierHelpers.java b/test-framework/src/main/java/org/keycloak/test/framework/injection/SupplierHelpers.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/injection/SupplierHelpers.java
rename to test-framework/src/main/java/org/keycloak/test/framework/injection/SupplierHelpers.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/injection/ValueTypeAlias.java b/test-framework/src/main/java/org/keycloak/test/framework/injection/ValueTypeAlias.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/injection/ValueTypeAlias.java
rename to test-framework/src/main/java/org/keycloak/test/framework/injection/ValueTypeAlias.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/oauth/DefaultOAuthClientConfiguration.java b/test-framework/src/main/java/org/keycloak/test/framework/oauth/DefaultOAuthClientConfiguration.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/oauth/DefaultOAuthClientConfiguration.java
rename to test-framework/src/main/java/org/keycloak/test/framework/oauth/DefaultOAuthClientConfiguration.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/oauth/OAuthCallbackServer.java b/test-framework/src/main/java/org/keycloak/test/framework/oauth/OAuthCallbackServer.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/oauth/OAuthCallbackServer.java
rename to test-framework/src/main/java/org/keycloak/test/framework/oauth/OAuthCallbackServer.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/oauth/OAuthClient.java b/test-framework/src/main/java/org/keycloak/test/framework/oauth/OAuthClient.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/oauth/OAuthClient.java
rename to test-framework/src/main/java/org/keycloak/test/framework/oauth/OAuthClient.java
index 1f37426aa8..c6ffed8c02 100644
--- a/test-poc/framework/src/main/java/org/keycloak/test/framework/oauth/OAuthClient.java
+++ b/test-framework/src/main/java/org/keycloak/test/framework/oauth/OAuthClient.java
@@ -23,10 +23,10 @@ import com.nimbusds.oauth2.sdk.token.AccessToken;
 import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
 import jakarta.ws.rs.core.Response;
 import org.keycloak.representations.idm.ClientRepresentation;
-import org.keycloak.test.framework.util.ApiUtil;
 import org.keycloak.test.framework.realm.ClientConfig;
 import org.keycloak.test.framework.realm.ManagedClient;
 import org.keycloak.test.framework.realm.ManagedRealm;
+import org.keycloak.test.framework.util.ApiUtil;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/oauth/OAuthClientSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/oauth/OAuthClientSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/oauth/OAuthClientSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/oauth/OAuthClientSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/page/AbstractPage.java b/test-framework/src/main/java/org/keycloak/test/framework/page/AbstractPage.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/page/AbstractPage.java
rename to test-framework/src/main/java/org/keycloak/test/framework/page/AbstractPage.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/page/LoginPage.java b/test-framework/src/main/java/org/keycloak/test/framework/page/LoginPage.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/page/LoginPage.java
rename to test-framework/src/main/java/org/keycloak/test/framework/page/LoginPage.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/page/PageSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/page/PageSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/page/PageSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/page/PageSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/page/WelcomePage.java b/test-framework/src/main/java/org/keycloak/test/framework/page/WelcomePage.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/page/WelcomePage.java
rename to test-framework/src/main/java/org/keycloak/test/framework/page/WelcomePage.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/realm/ClientConfig.java b/test-framework/src/main/java/org/keycloak/test/framework/realm/ClientConfig.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/realm/ClientConfig.java
rename to test-framework/src/main/java/org/keycloak/test/framework/realm/ClientConfig.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/realm/ClientConfigBuilder.java b/test-framework/src/main/java/org/keycloak/test/framework/realm/ClientConfigBuilder.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/realm/ClientConfigBuilder.java
rename to test-framework/src/main/java/org/keycloak/test/framework/realm/ClientConfigBuilder.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/realm/ClientSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/realm/ClientSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/realm/ClientSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/realm/ClientSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/realm/Collections.java b/test-framework/src/main/java/org/keycloak/test/framework/realm/Collections.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/realm/Collections.java
rename to test-framework/src/main/java/org/keycloak/test/framework/realm/Collections.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/realm/DefaultClientConfig.java b/test-framework/src/main/java/org/keycloak/test/framework/realm/DefaultClientConfig.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/realm/DefaultClientConfig.java
rename to test-framework/src/main/java/org/keycloak/test/framework/realm/DefaultClientConfig.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/realm/DefaultRealmConfig.java b/test-framework/src/main/java/org/keycloak/test/framework/realm/DefaultRealmConfig.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/realm/DefaultRealmConfig.java
rename to test-framework/src/main/java/org/keycloak/test/framework/realm/DefaultRealmConfig.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/realm/DefaultUserConfig.java b/test-framework/src/main/java/org/keycloak/test/framework/realm/DefaultUserConfig.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/realm/DefaultUserConfig.java
rename to test-framework/src/main/java/org/keycloak/test/framework/realm/DefaultUserConfig.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/realm/ManagedClient.java b/test-framework/src/main/java/org/keycloak/test/framework/realm/ManagedClient.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/realm/ManagedClient.java
rename to test-framework/src/main/java/org/keycloak/test/framework/realm/ManagedClient.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/realm/ManagedRealm.java b/test-framework/src/main/java/org/keycloak/test/framework/realm/ManagedRealm.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/realm/ManagedRealm.java
rename to test-framework/src/main/java/org/keycloak/test/framework/realm/ManagedRealm.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/realm/ManagedUser.java b/test-framework/src/main/java/org/keycloak/test/framework/realm/ManagedUser.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/realm/ManagedUser.java
rename to test-framework/src/main/java/org/keycloak/test/framework/realm/ManagedUser.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/realm/RealmConfig.java b/test-framework/src/main/java/org/keycloak/test/framework/realm/RealmConfig.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/realm/RealmConfig.java
rename to test-framework/src/main/java/org/keycloak/test/framework/realm/RealmConfig.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/realm/RealmConfigBuilder.java b/test-framework/src/main/java/org/keycloak/test/framework/realm/RealmConfigBuilder.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/realm/RealmConfigBuilder.java
rename to test-framework/src/main/java/org/keycloak/test/framework/realm/RealmConfigBuilder.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/realm/RealmSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/realm/RealmSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/realm/RealmSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/realm/RealmSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/realm/Representations.java b/test-framework/src/main/java/org/keycloak/test/framework/realm/Representations.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/realm/Representations.java
rename to test-framework/src/main/java/org/keycloak/test/framework/realm/Representations.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/realm/UserConfig.java b/test-framework/src/main/java/org/keycloak/test/framework/realm/UserConfig.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/realm/UserConfig.java
rename to test-framework/src/main/java/org/keycloak/test/framework/realm/UserConfig.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/realm/UserConfigBuilder.java b/test-framework/src/main/java/org/keycloak/test/framework/realm/UserConfigBuilder.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/realm/UserConfigBuilder.java
rename to test-framework/src/main/java/org/keycloak/test/framework/realm/UserConfigBuilder.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/realm/UserSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/realm/UserSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/realm/UserSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/realm/UserSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/server/AbstractKeycloakTestServerSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/server/AbstractKeycloakTestServerSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/server/AbstractKeycloakTestServerSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/server/AbstractKeycloakTestServerSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/server/DefaultKeycloakTestServerConfig.java b/test-framework/src/main/java/org/keycloak/test/framework/server/DefaultKeycloakTestServerConfig.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/server/DefaultKeycloakTestServerConfig.java
rename to test-framework/src/main/java/org/keycloak/test/framework/server/DefaultKeycloakTestServerConfig.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/server/DistributionKeycloakTestServer.java b/test-framework/src/main/java/org/keycloak/test/framework/server/DistributionKeycloakTestServer.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/server/DistributionKeycloakTestServer.java
rename to test-framework/src/main/java/org/keycloak/test/framework/server/DistributionKeycloakTestServer.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/server/DistributionKeycloakTestServerSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/server/DistributionKeycloakTestServerSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/server/DistributionKeycloakTestServerSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/server/DistributionKeycloakTestServerSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/server/EmbeddedKeycloakTestServer.java b/test-framework/src/main/java/org/keycloak/test/framework/server/EmbeddedKeycloakTestServer.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/server/EmbeddedKeycloakTestServer.java
rename to test-framework/src/main/java/org/keycloak/test/framework/server/EmbeddedKeycloakTestServer.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/server/EmbeddedKeycloakTestServerSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/server/EmbeddedKeycloakTestServerSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/server/EmbeddedKeycloakTestServerSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/server/EmbeddedKeycloakTestServerSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/server/KeycloakTestServer.java b/test-framework/src/main/java/org/keycloak/test/framework/server/KeycloakTestServer.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/server/KeycloakTestServer.java
rename to test-framework/src/main/java/org/keycloak/test/framework/server/KeycloakTestServer.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/server/KeycloakTestServerConfig.java b/test-framework/src/main/java/org/keycloak/test/framework/server/KeycloakTestServerConfig.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/server/KeycloakTestServerConfig.java
rename to test-framework/src/main/java/org/keycloak/test/framework/server/KeycloakTestServerConfig.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/server/RemoteKeycloakTestServer.java b/test-framework/src/main/java/org/keycloak/test/framework/server/RemoteKeycloakTestServer.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/server/RemoteKeycloakTestServer.java
rename to test-framework/src/main/java/org/keycloak/test/framework/server/RemoteKeycloakTestServer.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/server/RemoteKeycloakTestServerSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/server/RemoteKeycloakTestServerSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/server/RemoteKeycloakTestServerSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/server/RemoteKeycloakTestServerSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/util/ApiUtil.java b/test-framework/src/main/java/org/keycloak/test/framework/util/ApiUtil.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/util/ApiUtil.java
rename to test-framework/src/main/java/org/keycloak/test/framework/util/ApiUtil.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/webdriver/AbstractWebDriverSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/webdriver/AbstractWebDriverSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/webdriver/AbstractWebDriverSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/webdriver/AbstractWebDriverSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/webdriver/ChromeHeadlessWebDriverSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/webdriver/ChromeHeadlessWebDriverSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/webdriver/ChromeHeadlessWebDriverSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/webdriver/ChromeHeadlessWebDriverSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/webdriver/ChromeWebDriverSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/webdriver/ChromeWebDriverSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/webdriver/ChromeWebDriverSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/webdriver/ChromeWebDriverSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/webdriver/FirefoxHeadlessWebDriverSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/webdriver/FirefoxHeadlessWebDriverSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/webdriver/FirefoxHeadlessWebDriverSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/webdriver/FirefoxHeadlessWebDriverSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/webdriver/FirefoxWebDriverSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/webdriver/FirefoxWebDriverSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/webdriver/FirefoxWebDriverSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/webdriver/FirefoxWebDriverSupplier.java
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/webdriver/HtmlUnitWebDriverSupplier.java b/test-framework/src/main/java/org/keycloak/test/framework/webdriver/HtmlUnitWebDriverSupplier.java
similarity index 100%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/webdriver/HtmlUnitWebDriverSupplier.java
rename to test-framework/src/main/java/org/keycloak/test/framework/webdriver/HtmlUnitWebDriverSupplier.java
diff --git a/test-poc/framework/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/test-framework/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
similarity index 100%
rename from test-poc/framework/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
rename to test-framework/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
diff --git a/test-poc/framework/src/main/resources/META-INF/services/org.keycloak.test.framework.injection.Supplier b/test-framework/src/main/resources/META-INF/services/org.keycloak.test.framework.injection.Supplier
similarity index 100%
rename from test-poc/framework/src/main/resources/META-INF/services/org.keycloak.test.framework.injection.Supplier
rename to test-framework/src/main/resources/META-INF/services/org.keycloak.test.framework.injection.Supplier
diff --git a/test-poc/framework/src/test/java/org/keycloak/test/framework/events/EventParserTest.java b/test-framework/src/test/java/org/keycloak/test/framework/events/EventParserTest.java
similarity index 100%
rename from test-poc/framework/src/test/java/org/keycloak/test/framework/events/EventParserTest.java
rename to test-framework/src/test/java/org/keycloak/test/framework/events/EventParserTest.java
diff --git a/test-poc/framework/src/test/java/org/keycloak/test/framework/events/SysLogTest.java b/test-framework/src/test/java/org/keycloak/test/framework/events/SysLogTest.java
similarity index 100%
rename from test-poc/framework/src/test/java/org/keycloak/test/framework/events/SysLogTest.java
rename to test-framework/src/test/java/org/keycloak/test/framework/events/SysLogTest.java
diff --git a/test-poc/framework/src/test/java/org/keycloak/test/framework/injection/DefaultAnnotationProxyTest.java b/test-framework/src/test/java/org/keycloak/test/framework/injection/DefaultAnnotationProxyTest.java
similarity index 100%
rename from test-poc/framework/src/test/java/org/keycloak/test/framework/injection/DefaultAnnotationProxyTest.java
rename to test-framework/src/test/java/org/keycloak/test/framework/injection/DefaultAnnotationProxyTest.java
diff --git a/test-poc/framework/src/test/java/org/keycloak/test/framework/injection/RegistryTest.java b/test-framework/src/test/java/org/keycloak/test/framework/injection/RegistryTest.java
similarity index 100%
rename from test-poc/framework/src/test/java/org/keycloak/test/framework/injection/RegistryTest.java
rename to test-framework/src/test/java/org/keycloak/test/framework/injection/RegistryTest.java
diff --git a/test-poc/framework/src/test/java/org/keycloak/test/framework/injection/ValueTypeAliasTest.java b/test-framework/src/test/java/org/keycloak/test/framework/injection/ValueTypeAliasTest.java
similarity index 100%
rename from test-poc/framework/src/test/java/org/keycloak/test/framework/injection/ValueTypeAliasTest.java
rename to test-framework/src/test/java/org/keycloak/test/framework/injection/ValueTypeAliasTest.java
diff --git a/test-poc/framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockChildAnnotation.java b/test-framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockChildAnnotation.java
similarity index 100%
rename from test-poc/framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockChildAnnotation.java
rename to test-framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockChildAnnotation.java
diff --git a/test-poc/framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockChildSupplier.java b/test-framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockChildSupplier.java
similarity index 100%
rename from test-poc/framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockChildSupplier.java
rename to test-framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockChildSupplier.java
diff --git a/test-poc/framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockChildValue.java b/test-framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockChildValue.java
similarity index 100%
rename from test-poc/framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockChildValue.java
rename to test-framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockChildValue.java
diff --git a/test-poc/framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockInstances.java b/test-framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockInstances.java
similarity index 100%
rename from test-poc/framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockInstances.java
rename to test-framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockInstances.java
diff --git a/test-poc/framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockParent2Supplier.java b/test-framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockParent2Supplier.java
similarity index 100%
rename from test-poc/framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockParent2Supplier.java
rename to test-framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockParent2Supplier.java
diff --git a/test-poc/framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockParentAnnotation.java b/test-framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockParentAnnotation.java
similarity index 100%
rename from test-poc/framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockParentAnnotation.java
rename to test-framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockParentAnnotation.java
diff --git a/test-poc/framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockParentSupplier.java b/test-framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockParentSupplier.java
similarity index 100%
rename from test-poc/framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockParentSupplier.java
rename to test-framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockParentSupplier.java
diff --git a/test-poc/framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockParentValue.java b/test-framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockParentValue.java
similarity index 100%
rename from test-poc/framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockParentValue.java
rename to test-framework/src/test/java/org/keycloak/test/framework/injection/mocks/MockParentValue.java
diff --git a/test-poc/framework/src/test/resources/META-INF/services/org.keycloak.test.framework.injection.Supplier b/test-framework/src/test/resources/META-INF/services/org.keycloak.test.framework.injection.Supplier
similarity index 100%
rename from test-poc/framework/src/test/resources/META-INF/services/org.keycloak.test.framework.injection.Supplier
rename to test-framework/src/test/resources/META-INF/services/org.keycloak.test.framework.injection.Supplier
diff --git a/test-poc/framework/src/test/resources/logging.properties b/test-framework/src/test/resources/logging.properties
similarity index 100%
rename from test-poc/framework/src/test/resources/logging.properties
rename to test-framework/src/test/resources/logging.properties
diff --git a/test-poc/examples/pom.xml b/test-poc/examples/pom.xml
index 13a7b00d08..83939ba869 100755
--- a/test-poc/examples/pom.xml
+++ b/test-poc/examples/pom.xml
@@ -26,15 +26,15 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>keycloak-test-junit5-framework-examples</artifactId>
-    <name>Keycloak JUnit5 Framework Examples</name>
+    <artifactId>keycloak-test-framework-examples</artifactId>
+    <name>Keycloak Test Framework Examples</name>
     <packaging>jar</packaging>
-    <description>Example tests to demonstrate new testing framework</description>
+    <description>Example tests to demonstrate the new testing framework</description>
 
     <dependencies>
         <dependency>
-            <groupId>org.keycloak.test</groupId>
-            <artifactId>keycloak-test-junit5-framework</artifactId>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-test-framework</artifactId>
             <version>999.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
diff --git a/test-poc/pom.xml b/test-poc/pom.xml
index cfb659308a..e303890c31 100755
--- a/test-poc/pom.xml
+++ b/test-poc/pom.xml
@@ -33,7 +33,6 @@
     <description>Keycloak Test Parent</description>
 
     <modules>
-        <module>framework</module>
         <module>examples</module>
         <module>showcase</module>
     </modules>
diff --git a/test-poc/showcase/pom.xml b/test-poc/showcase/pom.xml
index 527217ad23..3d8be32e00 100755
--- a/test-poc/showcase/pom.xml
+++ b/test-poc/showcase/pom.xml
@@ -26,15 +26,15 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>keycloak-test-junit5-framework-showcase</artifactId>
-    <name>Keycloak JUnit5 Framework Showcase</name>
+    <artifactId>keycloak-test-framework-showcase</artifactId>
+    <name>Keycloak Test Framework Showcase</name>
     <packaging>jar</packaging>
     <description>Showcase of new tests demonstrating the new testing framework usability</description>
 
     <dependencies>
         <dependency>
-            <groupId>org.keycloak.test</groupId>
-            <artifactId>keycloak-test-junit5-framework</artifactId>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-test-framework</artifactId>
             <version>999.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>