fix tests

Signed-off-by: Stefan Wiedemann <[email protected]>
wistefan · Jan 24, 2024 · 3b4396c · 3b4396c
1 parent 8375fbe
commit 3b4396c
Show file tree

Hide file tree

Showing 11 changed files with 77 additions and 74 deletions.
diff --git a/common/src/test/java/org/keycloak/common/ProfileTest.java b/common/src/test/java/org/keycloak/common/ProfileTest.java
@@ -95,7 +95,7 @@ public void checkDefaults() {
             disabledFeatures.add(Profile.Feature.KERBEROS);
         }
         assertEquals(profile.getDisabledFeatures(), disabledFeatures);
-        assertEquals(profile.getPreviewFeatures(), Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, Profile.Feature.MULTI_SITE, Profile.Feature.RECOVERY_CODES, Profile.Feature.SCRIPTS, Profile.Feature.TOKEN_EXCHANGE, Profile.Feature.CLIENT_SECRET_ROTATION, Profile.Feature.UPDATE_EMAIL, Profile.Feature.DPOP, Profile.Feature.OID4VC_VCI);
+        assertEquals(profile.getPreviewFeatures(), Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, Profile.Feature.MULTI_SITE, Profile.Feature.RECOVERY_CODES, Profile.Feature.SCRIPTS, Profile.Feature.TOKEN_EXCHANGE, Profile.Feature.CLIENT_SECRET_ROTATION, Profile.Feature.UPDATE_EMAIL, Profile.Feature.DPOP);
     }
 
     @Test

diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/FeaturesDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/FeaturesDistTest.java
@@ -26,7 +26,7 @@
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class FeaturesDistTest {
 
-    private static final String PREVIEW_FEATURES_EXPECTED_LOG = "Preview features enabled: admin-fine-grained-authz:v1, client-secret-rotation:v1, dpop:v1, multi-site:v1, oid4vc-vci:v1 recovery-codes:v1, scripts:v1, token-exchange:v1, update-email:v1";
+    private static final String PREVIEW_FEATURES_EXPECTED_LOG = "Preview features enabled: admin-fine-grained-authz:v1, client-secret-rotation:v1, dpop:v1, multi-site:v1, recovery-codes:v1, scripts:v1, token-exchange:v1, update-email:v1";
 
     @Test
     public void testEnableOnBuild(KeycloakDistribution dist) {

diff --git a/...ycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.unix.approved.txt b/...ycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.unix.approved.txt
@@ -64,21 +64,22 @@ Feature:
 --features <feature> Enables a set of one or more features. Possible values are: account-api[:v1],
                        account2[:v1], account3[:v1], admin-api[:v1], admin-fine-grained-authz[:v1],
                        admin2[:v1], authorization[:v1], ciba[:v1], client-policies[:v1],
-                       client-secret-rotation[:v1], declarative-ui[:v1], device-flow[:v1], docker[:
-                       v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1], hostname[:v1], impersonation
-                       [:v1], js-adapter[:v1], kerberos[:v1], linkedin-oauth[:v1], multi-site[:v1],
-                       offline-session-preloading[:v1], par[:v1], preview, recovery-codes[:v1],
-                       scripts[:v1], step-up-authentication[:v1], token-exchange[:v1],
-                       transient-users[:v1], update-email[:v1], web-authn[:v1].
+                       client-secret-rotation[:v1], client-types[:v1], declarative-ui[:v1],
+                       device-flow[:v1], docker[:v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1],
+                       hostname[:v1], impersonation[:v1], js-adapter[:v1], kerberos[:v1],
+                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1],
+                       oid4vc-vci[:v1], par[:v1], preview, recovery-codes[:v1], scripts[:v1],
+                       step-up-authentication[:v1], token-exchange[:v1], transient-users[:v1],
+                       update-email[:v1], web-authn[:v1].
 --features-disabled <feature>
                      Disables a set of one or more features. Possible values are: account-api,
                        account2, account3, admin-api, admin-fine-grained-authz, admin2,
-                       authorization, ciba, client-policies, client-secret-rotation,
+                       authorization, ciba, client-policies, client-secret-rotation, client-types,
                        declarative-ui, device-flow, docker, dpop, dynamic-scopes, fips,
                        impersonation, js-adapter, kerberos, linkedin-oauth, multi-site,
-                       offline-session-preloading, oid4vc-vci, par, preview, recovery-codes, scripts,
-                       step-up-authentication, token-exchange, transient-users, update-email,
-                       web-authn.
+                       offline-session-preloading, oid4vc-vci, par, preview, recovery-codes,
+                       scripts, step-up-authentication, token-exchange, transient-users,
+                       update-email, web-authn.
 
 HTTP(S):
 

diff --git a/...cloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testExportHelp.unix.approved.txt b/...cloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testExportHelp.unix.approved.txt
@@ -59,21 +59,22 @@ Feature:
 --features <feature> Enables a set of one or more features. Possible values are: account-api[:v1],
                        account2[:v1], account3[:v1], admin-api[:v1], admin-fine-grained-authz[:v1],
                        admin2[:v1], authorization[:v1], ciba[:v1], client-policies[:v1],
-                       client-secret-rotation[:v1], declarative-ui[:v1], device-flow[:v1], docker[:
-                       v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1], hostname[:v1], impersonation
-                       [:v1], js-adapter[:v1], kerberos[:v1], linkedin-oauth[:v1], multi-site[:v1],
-                       offline-session-preloading[:v1], par[:v1], preview, recovery-codes[:v1],
-                       scripts[:v1], step-up-authentication[:v1], token-exchange[:v1],
-                       transient-users[:v1], update-email[:v1], web-authn[:v1].
+                       client-secret-rotation[:v1], client-types[:v1], declarative-ui[:v1],
+                       device-flow[:v1], docker[:v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1],
+                       hostname[:v1], impersonation[:v1], js-adapter[:v1], kerberos[:v1],
+                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1],
+                       oid4vc-vci[:v1], par[:v1], preview, recovery-codes[:v1], scripts[:v1],
+                       step-up-authentication[:v1], token-exchange[:v1], transient-users[:v1],
+                       update-email[:v1], web-authn[:v1].
 --features-disabled <feature>
                      Disables a set of one or more features. Possible values are: account-api,
                        account2, account3, admin-api, admin-fine-grained-authz, admin2,
-                       authorization, ciba, client-policies, client-secret-rotation,
+                       authorization, ciba, client-policies, client-secret-rotation, client-types,
                        declarative-ui, device-flow, docker, dpop, dynamic-scopes, fips,
                        impersonation, js-adapter, kerberos, linkedin-oauth, multi-site,
-                       offline-session-preloading, oid4vc-vci, par, preview, recovery-codes, scripts,
-                       step-up-authentication, token-exchange, transient-users, update-email,
-                       web-authn.
+                       offline-session-preloading, oid4vc-vci, par, preview, recovery-codes,
+                       scripts, step-up-authentication, token-exchange, transient-users,
+                       update-email, web-authn.
 
 Config:
 

diff --git a/...ak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testExportHelpAll.unix.approved.txt b/...ak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testExportHelpAll.unix.approved.txt
@@ -59,21 +59,22 @@ Feature:
 --features <feature> Enables a set of one or more features. Possible values are: account-api[:v1],
                        account2[:v1], account3[:v1], admin-api[:v1], admin-fine-grained-authz[:v1],
                        admin2[:v1], authorization[:v1], ciba[:v1], client-policies[:v1],
-                       client-secret-rotation[:v1], declarative-ui[:v1], device-flow[:v1], docker[:
-                       v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1], hostname[:v1], impersonation
-                       [:v1], js-adapter[:v1], kerberos[:v1], linkedin-oauth[:v1], multi-site[:v1],
-                       offline-session-preloading[:v1], par[:v1], preview, recovery-codes[:v1],
-                       scripts[:v1], step-up-authentication[:v1], token-exchange[:v1],
-                       transient-users[:v1], update-email[:v1], web-authn[:v1].
+                       client-secret-rotation[:v1], client-types[:v1], declarative-ui[:v1],
+                       device-flow[:v1], docker[:v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1],
+                       hostname[:v1], impersonation[:v1], js-adapter[:v1], kerberos[:v1],
+                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1],
+                       oid4vc-vci[:v1], par[:v1], preview, recovery-codes[:v1], scripts[:v1],
+                       step-up-authentication[:v1], token-exchange[:v1], transient-users[:v1],
+                       update-email[:v1], web-authn[:v1].
 --features-disabled <feature>
                      Disables a set of one or more features. Possible values are: account-api,
                        account2, account3, admin-api, admin-fine-grained-authz, admin2,
-                       authorization, ciba, client-policies, client-secret-rotation,
+                       authorization, ciba, client-policies, client-secret-rotation, client-types,
                        declarative-ui, device-flow, docker, dpop, dynamic-scopes, fips,
                        impersonation, js-adapter, kerberos, linkedin-oauth, multi-site,
-                       offline-session-preloading, oid4vc-vci, par, preview, recovery-codes, scripts,
-                       step-up-authentication, token-exchange, transient-users, update-email,
-                       web-authn.
+                       offline-session-preloading, oid4vc-vci, par, preview, recovery-codes,
+                       scripts, step-up-authentication, token-exchange, transient-users,
+                       update-email, web-authn.
 
 Config:
 

diff --git a/...cloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testImportHelp.unix.approved.txt b/...cloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testImportHelp.unix.approved.txt
@@ -62,19 +62,19 @@ Feature:
                        client-secret-rotation[:v1], client-types[:v1], declarative-ui[:v1],
                        device-flow[:v1], docker[:v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1],
                        hostname[:v1], impersonation[:v1], js-adapter[:v1], kerberos[:v1],
-                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1], par[:
-                       v1], preview, recovery-codes[:v1], scripts[:v1], step-up-authentication[:
-                       v1], token-exchange[:v1], transient-users[:v1], update-email[:v1], web-authn
-                       [:v1].
+                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1],
+                       oid4vc-vci[:v1], par[:v1], preview, recovery-codes[:v1], scripts[:v1],
+                       step-up-authentication[:v1], token-exchange[:v1], transient-users[:v1],
+                       update-email[:v1], web-authn[:v1].
 --features-disabled <feature>
                      Disables a set of one or more features. Possible values are: account-api,
                        account2, account3, admin-api, admin-fine-grained-authz, admin2,
                        authorization, ciba, client-policies, client-secret-rotation, client-types,
                        declarative-ui, device-flow, docker, dpop, dynamic-scopes, fips,
                        impersonation, js-adapter, kerberos, linkedin-oauth, multi-site,
-                       offline-session-preloading, oid4vc-vci, par, preview, recovery-codes, scripts,
-                       step-up-authentication, token-exchange, transient-users, update-email,
-                       web-authn.
+                       offline-session-preloading, oid4vc-vci, par, preview, recovery-codes,
+                       scripts, step-up-authentication, token-exchange, transient-users,
+                       update-email, web-authn.
 
 Config:
 

diff --git a/...ak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testImportHelpAll.unix.approved.txt b/...ak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testImportHelpAll.unix.approved.txt
@@ -62,19 +62,19 @@ Feature:
                        client-secret-rotation[:v1], client-types[:v1], declarative-ui[:v1],
                        device-flow[:v1], docker[:v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1],
                        hostname[:v1], impersonation[:v1], js-adapter[:v1], kerberos[:v1],
-                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1], par[:
-                       v1], preview, recovery-codes[:v1], scripts[:v1], step-up-authentication[:
-                       v1], token-exchange[:v1], transient-users[:v1], update-email[:v1], web-authn
-                       [:v1].
+                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1],
+                       oid4vc-vci[:v1], par[:v1], preview, recovery-codes[:v1], scripts[:v1],
+                       step-up-authentication[:v1], token-exchange[:v1], transient-users[:v1],
+                       update-email[:v1], web-authn[:v1].
 --features-disabled <feature>
                      Disables a set of one or more features. Possible values are: account-api,
                        account2, account3, admin-api, admin-fine-grained-authz, admin2,
                        authorization, ciba, client-policies, client-secret-rotation, client-types,
                        declarative-ui, device-flow, docker, dpop, dynamic-scopes, fips,
                        impersonation, js-adapter, kerberos, linkedin-oauth, multi-site,
-                       offline-session-preloading, oid4vc-vci, par, preview, recovery-codes, scripts,
-                       step-up-authentication, token-exchange, transient-users, update-email,
-                       web-authn.
+                       offline-session-preloading, oid4vc-vci, par, preview, recovery-codes,
+                       scripts, step-up-authentication, token-exchange, transient-users,
+                       update-email, web-authn.
 
 Config:
 

diff --git a/...oak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.unix.approved.txt b/...oak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.unix.approved.txt
@@ -92,19 +92,19 @@ Feature:
                        client-secret-rotation[:v1], client-types[:v1], declarative-ui[:v1],
                        device-flow[:v1], docker[:v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1],
                        hostname[:v1], impersonation[:v1], js-adapter[:v1], kerberos[:v1],
-                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1], par[:
-                       v1], preview, recovery-codes[:v1], scripts[:v1], step-up-authentication[:
-                       v1], token-exchange[:v1], transient-users[:v1], update-email[:v1], web-authn
-                       [:v1].
+                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1],
+                       oid4vc-vci[:v1], par[:v1], preview, recovery-codes[:v1], scripts[:v1],
+                       step-up-authentication[:v1], token-exchange[:v1], transient-users[:v1],
+                       update-email[:v1], web-authn[:v1].
 --features-disabled <feature>
                      Disables a set of one or more features. Possible values are: account-api,
                        account2, account3, admin-api, admin-fine-grained-authz, admin2,
                        authorization, ciba, client-policies, client-secret-rotation, client-types,
                        declarative-ui, device-flow, docker, dpop, dynamic-scopes, fips,
                        impersonation, js-adapter, kerberos, linkedin-oauth, multi-site,
-                       offline-session-preloading, oid4vc-vci, par, preview, recovery-codes, scripts,
-                       step-up-authentication, token-exchange, transient-users, update-email,
-                       web-authn.
+                       offline-session-preloading, oid4vc-vci, par, preview, recovery-codes,
+                       scripts, step-up-authentication, token-exchange, transient-users,
+                       update-email, web-authn.
 
 Hostname:
 

diff --git a/.../it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.unix.approved.txt b/.../it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.unix.approved.txt
@@ -92,19 +92,19 @@ Feature:
                        client-secret-rotation[:v1], client-types[:v1], declarative-ui[:v1],
                        device-flow[:v1], docker[:v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1],
                        hostname[:v1], impersonation[:v1], js-adapter[:v1], kerberos[:v1],
-                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1], par[:
-                       v1], preview, recovery-codes[:v1], scripts[:v1], step-up-authentication[:
-                       v1], token-exchange[:v1], transient-users[:v1], update-email[:v1], web-authn
-                       [:v1].
+                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1],
+                       oid4vc-vci[:v1], par[:v1], preview, recovery-codes[:v1], scripts[:v1],
+                       step-up-authentication[:v1], token-exchange[:v1], transient-users[:v1],
+                       update-email[:v1], web-authn[:v1].
 --features-disabled <feature>
                      Disables a set of one or more features. Possible values are: account-api,
                        account2, account3, admin-api, admin-fine-grained-authz, admin2,
                        authorization, ciba, client-policies, client-secret-rotation, client-types,
                        declarative-ui, device-flow, docker, dpop, dynamic-scopes, fips,
                        impersonation, js-adapter, kerberos, linkedin-oauth, multi-site,
-                       offline-session-preloading, oid4vc-vci, par, preview, recovery-codes, scripts,
-                       step-up-authentication, token-exchange, transient-users, update-email,
-                       web-authn.
+                       offline-session-preloading, oid4vc-vci, par, preview, recovery-codes,
+                       scripts, step-up-authentication, token-exchange, transient-users,
+                       update-email, web-authn.
 
 Hostname:
 

diff --git a/...ycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.unix.approved.txt b/...ycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.unix.approved.txt
@@ -93,19 +93,19 @@ Feature:
                        client-secret-rotation[:v1], client-types[:v1], declarative-ui[:v1],
                        device-flow[:v1], docker[:v1], dpop[:v1], dynamic-scopes[:v1], fips[:v1],
                        hostname[:v1], impersonation[:v1], js-adapter[:v1], kerberos[:v1],
-                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1], par[:
-                       v1], preview, recovery-codes[:v1], scripts[:v1], step-up-authentication[:
-                       v1], token-exchange[:v1], transient-users[:v1], update-email[:v1], web-authn
-                       [:v1].
+                       linkedin-oauth[:v1], multi-site[:v1], offline-session-preloading[:v1],
+                       oid4vc-vci[:v1], par[:v1], preview, recovery-codes[:v1], scripts[:v1],
+                       step-up-authentication[:v1], token-exchange[:v1], transient-users[:v1],
+                       update-email[:v1], web-authn[:v1].
 --features-disabled <feature>
                      Disables a set of one or more features. Possible values are: account-api,
                        account2, account3, admin-api, admin-fine-grained-authz, admin2,
                        authorization, ciba, client-policies, client-secret-rotation, client-types,
                        declarative-ui, device-flow, docker, dpop, dynamic-scopes, fips,
                        impersonation, js-adapter, kerberos, linkedin-oauth, multi-site,
-                       offline-session-preloading, oid4vc-vci, par, preview, recovery-codes, scripts,
-                       step-up-authentication, token-exchange, transient-users, update-email,
-                       web-authn.
+                       offline-session-preloading, oid4vc-vci, par, preview, recovery-codes,
+                       scripts, step-up-authentication, token-exchange, transient-users,
+                       update-email, web-authn.
 
 Hostname: