From 7b5656485b0166fb3a2f3ffaf1cfc05eb8097272 Mon Sep 17 00:00:00 2001 From: Mauro Mugnaini Date: Mon, 25 Mar 2024 12:14:37 +0100 Subject: [PATCH] Added missing mocks for new version --- .../oidc/mapper/D4ScienceContextMapperTest.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/protocol-mapper/src/test/java/org/gcube/keycloak/protocol/oidc/mapper/D4ScienceContextMapperTest.java b/protocol-mapper/src/test/java/org/gcube/keycloak/protocol/oidc/mapper/D4ScienceContextMapperTest.java index 3759022..9e9f1ab 100644 --- a/protocol-mapper/src/test/java/org/gcube/keycloak/protocol/oidc/mapper/D4ScienceContextMapperTest.java +++ b/protocol-mapper/src/test/java/org/gcube/keycloak/protocol/oidc/mapper/D4ScienceContextMapperTest.java @@ -60,7 +60,8 @@ public class D4ScienceContextMapperTest { .map(ProviderConfigProperty::getName) .collect(Collectors.toList()); - assertThat(configPropertyNames).containsExactly(OIDCAttributeMapperHelper.TOKEN_CLAIM_NAME, + assertThat(configPropertyNames).containsExactlyInAnyOrder(OIDCAttributeMapperHelper.TOKEN_CLAIM_NAME, + OIDCAttributeMapperHelper.INCLUDE_IN_LIGHTWEIGHT_ACCESS_TOKEN, OIDCAttributeMapperHelper.INCLUDE_IN_ACCESS_TOKEN, D4ScienceContextMapper.HTTP_REQUEST_HEADER_NAME, D4ScienceContextMapper.NARROW_RESOURCE_ACCESS); } @@ -109,8 +110,11 @@ public class D4ScienceContextMapperTest { } private KeycloakSession givenKeycloakSession(boolean withHeader) { - KeycloakSession keycloakSession = Mockito.mock(KeycloakSession.class); + ClientModel clientModel = Mockito.mock(ClientModel.class); + when(clientModel.getName()).thenReturn("test-client-id"); KeycloakContext context = Mockito.mock(KeycloakContext.class); + when(context.getClient()).thenReturn(clientModel); + KeycloakSession keycloakSession = Mockito.mock(KeycloakSession.class); when(keycloakSession.getContext()).thenReturn(context); HttpHeaders headers = Mockito.mock(HttpHeaders.class); when(context.getRequestHeaders()).thenReturn(headers); @@ -135,13 +139,12 @@ public class D4ScienceContextMapperTest { } return new D4ScienceContextMapper().transformAccessToken(at, mappingModel, keycloakSession, - userSessionModel, givenClientSessionContext()); + userSessionModel, givenClientSessionContext(keycloakSession)); } - private ClientSessionContext givenClientSessionContext() { - ClientModel clientModel = Mockito.mock(ClientModel.class); - when(clientModel.getName()).thenReturn("test-client-id"); + private ClientSessionContext givenClientSessionContext(KeycloakSession keycloakSession) { AuthenticatedClientSessionModel acsm = Mockito.mock(AuthenticatedClientSessionModel.class); + ClientModel clientModel = keycloakSession.getContext().getClient(); when(acsm.getClient()).thenReturn(clientModel); ClientSessionContext csc = Mockito.mock(ClientSessionContext.class); when(csc.getClientSession()).thenReturn(acsm);