From de50a15a2fbe7d52aeb3d04a06721c60b38f4221 Mon Sep 17 00:00:00 2001
From: Lukas Hanusovsky <61745358+lhanusov@users.noreply.github.com>
Date: Mon, 8 Sep 2025 11:23:46 +0200
Subject: [PATCH] Test framework - Fix for wrongly placed custom
 KeycloakServerConfig (#42422)

Signed-off-by: Lukas Hanusovsky <lhanusov@redhat.com>
---
 .../DefaultServerConfigWithOid4Vci.java       | 31 -------------------
 .../admin/client/ClientScopeTestOid4Vci.java  | 14 +++++++--
 2 files changed, 12 insertions(+), 33 deletions(-)
 delete mode 100644 test-framework/core/src/main/java/org/keycloak/testframework/server/DefaultServerConfigWithOid4Vci.java

diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/server/DefaultServerConfigWithOid4Vci.java b/test-framework/core/src/main/java/org/keycloak/testframework/server/DefaultServerConfigWithOid4Vci.java
deleted file mode 100644
index a883657b59e..00000000000
--- a/test-framework/core/src/main/java/org/keycloak/testframework/server/DefaultServerConfigWithOid4Vci.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.keycloak.testframework.server;
-
-import org.keycloak.common.Profile;
-
-/**
- * @author Pascal Knüppel
- */
-public class DefaultServerConfigWithOid4Vci extends DefaultKeycloakServerConfig {
-    @Override
-    public KeycloakServerConfigBuilder configure(KeycloakServerConfigBuilder config) {
-        return super.configure(config).features(Profile.Feature.OID4VC_VCI);
-    }
-}
diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeTestOid4Vci.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeTestOid4Vci.java
index fd5bccb9d37..41345820238 100644
--- a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeTestOid4Vci.java
+++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeTestOid4Vci.java
@@ -23,11 +23,13 @@ import jakarta.ws.rs.core.Response;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.keycloak.common.Profile;
 import org.keycloak.constants.Oid4VciConstants;
 import org.keycloak.models.oid4vci.CredentialScopeModel;
 import org.keycloak.representations.idm.ClientScopeRepresentation;
 import org.keycloak.testframework.annotations.KeycloakIntegrationTest;
-import org.keycloak.testframework.server.DefaultServerConfigWithOid4Vci;
+import org.keycloak.testframework.server.KeycloakServerConfig;
+import org.keycloak.testframework.server.KeycloakServerConfigBuilder;
 
 import java.util.Map;
 import java.util.Optional;
@@ -35,7 +37,7 @@ import java.util.Optional;
 /**
  * @author Pascal Knüppel
  */
-@KeycloakIntegrationTest(config = DefaultServerConfigWithOid4Vci.class)
+@KeycloakIntegrationTest(config = ClientScopeTestOid4Vci.DefaultServerConfigWithOid4Vci.class)
 public class ClientScopeTestOid4Vci extends AbstractClientScopeTest {
 
     @DisplayName("Verify default values are correctly set")
@@ -91,4 +93,12 @@ public class ClientScopeTestOid4Vci extends AbstractClientScopeTest {
             clientScopes().get(clientScopeId).remove();
         }
     }
+
+    public static class DefaultServerConfigWithOid4Vci implements KeycloakServerConfig {
+
+        @Override
+        public KeycloakServerConfigBuilder configure(KeycloakServerConfigBuilder config) {
+            return config.features(Profile.Feature.OID4VC_VCI);
+        }
+    }
 }