From 9f913244a035ad202d5085be0acd765bfe858601 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Wed, 18 Mar 2015 08:00:18 -0400 Subject: [PATCH] fixed unit tests for introspection results --- .../impl/TestDefaultIntrospectionResultAssembler.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultIntrospectionResultAssembler.java b/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultIntrospectionResultAssembler.java index 288e699a4..1968c8021 100644 --- a/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultIntrospectionResultAssembler.java +++ b/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultIntrospectionResultAssembler.java @@ -29,6 +29,7 @@ import org.mitre.oauth2.model.OAuth2AccessTokenEntity; import org.mitre.oauth2.model.OAuth2RefreshTokenEntity; import org.mitre.oauth2.service.IntrospectionResultAssembler; import org.mitre.openid.connect.model.UserInfo; +import org.mitre.uma.model.Permission; import org.springframework.security.oauth2.provider.OAuth2Authentication; import org.springframework.security.oauth2.provider.OAuth2Request; @@ -56,7 +57,7 @@ public class TestDefaultIntrospectionResultAssembler { public void shouldAssembleExpectedResultForAccessToken() throws ParseException { // given - OAuth2AccessTokenEntity accessToken = accessToken(new Date(123 * 1000L), scopes("foo", "bar"), "Bearer", + OAuth2AccessTokenEntity accessToken = accessToken(new Date(123 * 1000L), scopes("foo", "bar"), null, "Bearer", authentication("name", request("clientId"))); UserInfo userInfo = userInfo("sub"); @@ -85,7 +86,7 @@ public class TestDefaultIntrospectionResultAssembler { public void shouldAssembleExpectedResultForAccessTokenWithoutUserInfo() throws ParseException { // given - OAuth2AccessTokenEntity accessToken = accessToken(new Date(123 * 1000L), scopes("foo", "bar"), "Bearer", + OAuth2AccessTokenEntity accessToken = accessToken(new Date(123 * 1000L), scopes("foo", "bar"), null, "Bearer", authentication("name", request("clientId"))); Set authScopes = scopes("foo", "bar", "baz"); @@ -112,7 +113,7 @@ public class TestDefaultIntrospectionResultAssembler { public void shouldAssembleExpectedResultForAccessTokenWithoutExpiry() { // given - OAuth2AccessTokenEntity accessToken = accessToken(null, scopes("foo", "bar"), "Bearer", + OAuth2AccessTokenEntity accessToken = accessToken(null, scopes("foo", "bar"), null, "Bearer", authentication("name", request("clientId"))); UserInfo userInfo = userInfo("sub"); @@ -221,10 +222,11 @@ public class TestDefaultIntrospectionResultAssembler { return userInfo; } - private OAuth2AccessTokenEntity accessToken(Date exp, Set scopes, String tokenType, OAuth2Authentication authentication) { + private OAuth2AccessTokenEntity accessToken(Date exp, Set scopes, Set permissions, String tokenType, OAuth2Authentication authentication) { OAuth2AccessTokenEntity accessToken = mock(OAuth2AccessTokenEntity.class, RETURNS_DEEP_STUBS); given(accessToken.getExpiration()).willReturn(exp); given(accessToken.getScope()).willReturn(scopes); + given(accessToken.getPermissions()).willReturn(permissions); given(accessToken.getTokenType()).willReturn(tokenType); given(accessToken.getAuthenticationHolder().getAuthentication()).willReturn(authentication); return accessToken;