From ca7e04c71aca85ac3398caa4c44cd49547ad7183 Mon Sep 17 00:00:00 2001 From: YuriyZ Date: Wed, 3 Jul 2024 13:35:18 +0300 Subject: [PATCH] feat(jans-linux-setup): status list must be enabled during tests #8838 (#8839) https://github.com/JanssenProject/jans/issues/8838 Signed-off-by: YuriyZ --- .../src/test/java/io/jans/as/client/BaseTest.java | 13 +++++++++---- .../as/client/ws/rs/token/StatusListHttpTest.java | 6 +++--- .../jans_setup/setup_app/test_data_loader.py | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/BaseTest.java b/jans-auth-server/client/src/test/java/io/jans/as/client/BaseTest.java index d624af96d5a..e6031ece2ef 100644 --- a/jans-auth-server/client/src/test/java/io/jans/as/client/BaseTest.java +++ b/jans-auth-server/client/src/test/java/io/jans/as/client/BaseTest.java @@ -621,10 +621,15 @@ private WebElement waitForRequredElementLoad(WebDriver currentDriver, String id) .pollingEvery(Duration.ofMillis(1000)) .ignoring(NoSuchElementException.class); - WebElement loginButton = wait.until(d -> { - return d.findElement(By.id(id)); - }); - return loginButton; + try { + WebElement loginButton = wait.until(d -> d.findElement(By.id(id))); + return loginButton; + } catch (TimeoutException e) { + System.out.println("PAGE URL: " + currentDriver.getCurrentUrl()); + System.out.println("PAGE SOURCE: "); + System.out.println(currentDriver.getPageSource()); + throw e; + } } protected String acceptAuthorization(WebDriver currentDriver, String redirectUri) { diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/token/StatusListHttpTest.java b/jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/token/StatusListHttpTest.java index 9c3834d1680..0272ad36b02 100644 --- a/jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/token/StatusListHttpTest.java +++ b/jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/token/StatusListHttpTest.java @@ -62,17 +62,17 @@ public void statusList( TokenResponse tokenResponse = tokenClient.exec(); showClient(tokenClient); - System.out.println("ACCESS_TOKEN"); + System.out.println("statusList - ACCESS_TOKEN"); System.out.println(tokenResponse.getAccessToken()); Jwt accessTokenJwt = Jwt.parseOrThrow(tokenResponse.getAccessToken()); final int accessTokenIndex = accessTokenJwt.getClaims().getClaimAsJSON("status").getJSONObject("status_list").getInt("idx"); - System.out.println("ACCESS_TOKEN idx: " + accessTokenIndex); + System.out.println("statusList - ACCESS_TOKEN idx: " + accessTokenIndex); assertEquals(TokenStatus.VALID, loadStatus(accessTokenIndex)); revokeAccessToken(clientIdAndSecret, tokenResponse.getAccessToken()); - System.out.println("ACCESS_TOKEN idx: " + accessTokenIndex); // re-print for convenience + System.out.println("statusList - ACCESS_TOKEN idx: " + accessTokenIndex); // re-print for convenience // give time to let status went to list Thread.sleep(2000); assertEquals(TokenStatus.INVALID, loadStatus(accessTokenIndex)); diff --git a/jans-linux-setup/jans_setup/setup_app/test_data_loader.py b/jans-linux-setup/jans_setup/setup_app/test_data_loader.py index 6df2ab307a2..36497bfd6e7 100644 --- a/jans-linux-setup/jans_setup/setup_app/test_data_loader.py +++ b/jans-linux-setup/jans_setup/setup_app/test_data_loader.py @@ -298,7 +298,7 @@ def load_test_data(self): 'tokenEndpointAuthMethodsSupported': [ 'client_secret_basic', 'client_secret_post', 'client_secret_jwt', 'private_key_jwt', 'tls_client_auth', 'self_signed_tls_client_auth', 'none' ], 'sessionIdRequestParameterEnabled': True, 'skipRefreshTokenDuringRefreshing': False, - 'featureFlags': ['unknown', 'health_check', 'userinfo', 'clientinfo', 'id_generation', 'registration', 'introspection', 'revoke_token', 'revoke_session', 'global_token_revocation', 'end_session', 'status_session', 'jans_configuration', 'ciba', 'uma', 'u2f', 'device_authz', 'stat', 'par', 'ssa'], + 'featureFlags': ['unknown', 'health_check', 'userinfo', 'clientinfo', 'id_generation', 'registration', 'introspection', 'revoke_token', 'revoke_session', 'global_token_revocation', 'end_session', 'status_session', 'jans_configuration', 'ciba', 'uma', 'u2f', 'device_authz', 'stat', 'par', 'ssa', 'status_list'], 'cleanServiceInterval':7200, 'loggingLevel': 'TRACE', }