2222import java .util .Map ;
2323import java .util .Set ;
2424
25- import org .junit .jupiter .api .Assertions ;
2625import org .junit .jupiter .api .BeforeEach ;
2726import org .junit .jupiter .api .Test ;
2827
2928import org .springframework .core .convert .converter .Converter ;
3029import org .springframework .security .oauth2 .core .OAuth2AccessToken ;
3130import org .springframework .security .oauth2 .core .OAuth2RefreshToken ;
3231
32+ import static org .assertj .core .api .Assertions .assertThat ;
33+
3334/**
3435 * Tests for {@link DefaultMapOAuth2AccessTokenResponseConverter}.
3536 *
@@ -56,24 +57,24 @@ public void shouldConvertFull() {
5657 map .put ("custom_parameter_2" , "custom-value-2" );
5758 OAuth2AccessTokenResponse converted = this .messageConverter .convert (map );
5859 OAuth2AccessToken accessToken = converted .getAccessToken ();
59- Assertions . assertNotNull (accessToken );
60- Assertions . assertEquals ( "access-token-1234" , accessToken . getTokenValue () );
61- Assertions . assertEquals ( OAuth2AccessToken .TokenType .BEARER , accessToken . getTokenType () );
60+ assertThat (accessToken ). isNotNull ( );
61+ assertThat ( accessToken . getTokenValue ()). isEqualTo ( "access-token-1234" );
62+ assertThat ( accessToken . getTokenType ()). isEqualTo ( OAuth2AccessToken .TokenType .BEARER );
6263 Set <String > scopes = accessToken .getScopes ();
63- Assertions . assertNotNull (scopes );
64- Assertions . assertEquals ( 2 , scopes .size ());
65- Assertions . assertTrue (scopes .contains ("read" ));
66- Assertions . assertTrue (scopes .contains ("write" ));
67- Assertions . assertEquals ( 3600 ,
68- Duration . between ( accessToken . getIssuedAt (), accessToken . getExpiresAt ()). getSeconds () );
64+ assertThat (scopes ). isNotNull ( );
65+ assertThat ( scopes .size ()). isEqualTo ( 2 );
66+ assertThat (scopes .contains ("read" )). isTrue ( );
67+ assertThat (scopes .contains ("write" )). isTrue ( );
68+ assertThat ( Duration . between ( accessToken . getIssuedAt (), accessToken . getExpiresAt ()). getSeconds ())
69+ . isEqualTo ( 3600 );
6970 OAuth2RefreshToken refreshToken = converted .getRefreshToken ();
70- Assertions . assertNotNull (refreshToken );
71- Assertions . assertEquals ( "refresh-token-1234" , refreshToken . getTokenValue () );
71+ assertThat (refreshToken ). isNotNull ( );
72+ assertThat ( refreshToken . getTokenValue ()). isEqualTo ( "refresh-token-1234" );
7273 Map <String , Object > additionalParameters = converted .getAdditionalParameters ();
73- Assertions . assertNotNull (additionalParameters );
74- Assertions . assertEquals ( 2 , additionalParameters .size ());
75- Assertions . assertEquals ( "custom-value-1" , additionalParameters .get ("custom_parameter_1" ));
76- Assertions . assertEquals ( "custom-value-2" , additionalParameters .get ("custom_parameter_2" ));
74+ assertThat (additionalParameters ). isNotNull ( );
75+ assertThat ( additionalParameters .size ()). isEqualTo ( 2 );
76+ assertThat ( additionalParameters .get ("custom_parameter_1" )). isEqualTo ( "custom-value-1" );
77+ assertThat ( additionalParameters .get ("custom_parameter_2" )). isEqualTo ( "custom-value-2" );
7778 }
7879
7980 @ Test
@@ -83,19 +84,18 @@ public void shouldConvertMinimal() {
8384 map .put ("token_type" , "bearer" );
8485 OAuth2AccessTokenResponse converted = this .messageConverter .convert (map );
8586 OAuth2AccessToken accessToken = converted .getAccessToken ();
86- Assertions . assertNotNull (accessToken );
87- Assertions . assertEquals ( "access-token-1234" , accessToken . getTokenValue () );
88- Assertions . assertEquals ( OAuth2AccessToken .TokenType .BEARER , accessToken . getTokenType () );
87+ assertThat (accessToken ). isNotNull ( );
88+ assertThat ( accessToken . getTokenValue ()). isEqualTo ( "access-token-1234" );
89+ assertThat ( accessToken . getTokenType ()). isEqualTo ( OAuth2AccessToken .TokenType .BEARER );
8990 Set <String > scopes = accessToken .getScopes ();
90- Assertions .assertNotNull (scopes );
91- Assertions .assertEquals (0 , scopes .size ());
92- Assertions .assertEquals (1 ,
93- Duration .between (accessToken .getIssuedAt (), accessToken .getExpiresAt ()).getSeconds ());
91+ assertThat (scopes ).isNotNull ();
92+ assertThat (scopes .size ()).isEqualTo (0 );
93+ assertThat (Duration .between (accessToken .getIssuedAt (), accessToken .getExpiresAt ()).getSeconds ()).isEqualTo (1 );
9494 OAuth2RefreshToken refreshToken = converted .getRefreshToken ();
95- Assertions . assertNull (refreshToken );
95+ assertThat (refreshToken ). isNull ( );
9696 Map <String , Object > additionalParameters = converted .getAdditionalParameters ();
97- Assertions . assertNotNull (additionalParameters );
98- Assertions . assertEquals ( 0 , additionalParameters .size ());
97+ assertThat (additionalParameters ). isNotNull ( );
98+ assertThat ( additionalParameters .size ()). isEqualTo ( 0 );
9999 }
100100
101101 @ Test
@@ -106,19 +106,18 @@ public void shouldConvertWithUnsupportedExpiresIn() {
106106 map .put ("expires_in" , "2100-01-01-abc" );
107107 OAuth2AccessTokenResponse converted = this .messageConverter .convert (map );
108108 OAuth2AccessToken accessToken = converted .getAccessToken ();
109- Assertions . assertNotNull (accessToken );
110- Assertions . assertEquals ( "access-token-1234" , accessToken . getTokenValue () );
111- Assertions . assertEquals ( OAuth2AccessToken .TokenType .BEARER , accessToken . getTokenType () );
109+ assertThat (accessToken ). isNotNull ( );
110+ assertThat ( accessToken . getTokenValue ()). isEqualTo ( "access-token-1234" );
111+ assertThat ( accessToken . getTokenType ()). isEqualTo ( OAuth2AccessToken .TokenType .BEARER );
112112 Set <String > scopes = accessToken .getScopes ();
113- Assertions .assertNotNull (scopes );
114- Assertions .assertEquals (0 , scopes .size ());
115- Assertions .assertEquals (1 ,
116- Duration .between (accessToken .getIssuedAt (), accessToken .getExpiresAt ()).getSeconds ());
113+ assertThat (scopes ).isNotNull ();
114+ assertThat (scopes .size ()).isEqualTo (0 );
115+ assertThat (Duration .between (accessToken .getIssuedAt (), accessToken .getExpiresAt ()).getSeconds ()).isEqualTo (1 );
117116 OAuth2RefreshToken refreshToken = converted .getRefreshToken ();
118- Assertions . assertNull (refreshToken );
117+ assertThat (refreshToken ). isNull ( );
119118 Map <String , Object > additionalParameters = converted .getAdditionalParameters ();
120- Assertions . assertNotNull (additionalParameters );
121- Assertions . assertEquals ( 0 , additionalParameters .size ());
119+ assertThat (additionalParameters ). isNotNull ( );
120+ assertThat ( additionalParameters .size ()). isEqualTo ( 0 );
122121 }
123122
124123 // gh-9685
@@ -130,11 +129,11 @@ public void shouldConvertWithNumericExpiresIn() {
130129 map .put ("expires_in" , 3600 );
131130 OAuth2AccessTokenResponse converted = this .messageConverter .convert (map );
132131 OAuth2AccessToken accessToken = converted .getAccessToken ();
133- Assertions . assertNotNull (accessToken );
134- Assertions . assertEquals ( "access-token-1234" , accessToken . getTokenValue () );
135- Assertions . assertEquals ( OAuth2AccessToken .TokenType .BEARER , accessToken . getTokenType () );
136- Assertions . assertEquals ( 3600 ,
137- Duration . between ( accessToken . getIssuedAt (), accessToken . getExpiresAt ()). getSeconds () );
132+ assertThat (accessToken ). isNotNull ( );
133+ assertThat ( accessToken . getTokenValue ()). isEqualTo ( "access-token-1234" );
134+ assertThat ( accessToken . getTokenType ()). isEqualTo ( OAuth2AccessToken .TokenType .BEARER );
135+ assertThat ( Duration . between ( accessToken . getIssuedAt (), accessToken . getExpiresAt ()). getSeconds ())
136+ . isEqualTo ( 3600 );
138137 }
139138
140139 // gh-9685
@@ -153,24 +152,24 @@ public void shouldConvertWithObjectAdditionalParameter() {
153152 map .put ("custom_parameter_2" , "custom-value-2" );
154153 OAuth2AccessTokenResponse converted = this .messageConverter .convert (map );
155154 OAuth2AccessToken accessToken = converted .getAccessToken ();
156- Assertions . assertNotNull (accessToken );
157- Assertions . assertEquals ( "access-token-1234" , accessToken . getTokenValue () );
158- Assertions . assertEquals ( OAuth2AccessToken .TokenType .BEARER , accessToken . getTokenType () );
155+ assertThat (accessToken ). isNotNull ( );
156+ assertThat ( accessToken . getTokenValue ()). isEqualTo ( "access-token-1234" );
157+ assertThat ( accessToken . getTokenType ()). isEqualTo ( OAuth2AccessToken .TokenType .BEARER );
159158 Set <String > scopes = accessToken .getScopes ();
160- Assertions . assertNotNull (scopes );
161- Assertions . assertEquals ( 2 , scopes .size ());
162- Assertions . assertTrue (scopes .contains ("read" ));
163- Assertions . assertTrue (scopes .contains ("write" ));
164- Assertions . assertEquals ( 3600 ,
165- Duration . between ( accessToken . getIssuedAt (), accessToken . getExpiresAt ()). getSeconds () );
159+ assertThat (scopes ). isNotNull ( );
160+ assertThat ( scopes .size ()). isEqualTo ( 2 );
161+ assertThat (scopes .contains ("read" )). isTrue ( );
162+ assertThat (scopes .contains ("write" )). isTrue ( );
163+ assertThat ( Duration . between ( accessToken . getIssuedAt (), accessToken . getExpiresAt ()). getSeconds ())
164+ . isEqualTo ( 3600 );
166165 OAuth2RefreshToken refreshToken = converted .getRefreshToken ();
167- Assertions . assertNotNull (refreshToken );
168- Assertions . assertEquals ( "refresh-token-1234" , refreshToken . getTokenValue () );
166+ assertThat (refreshToken ). isNotNull ( );
167+ assertThat ( refreshToken . getTokenValue ()). isEqualTo ( "refresh-token-1234" );
169168 Map <String , Object > additionalParameters = converted .getAdditionalParameters ();
170- Assertions . assertNotNull (additionalParameters );
171- Assertions . assertEquals ( 2 , additionalParameters .size ());
172- Assertions . assertEquals ( nestedObject , additionalParameters .get ("custom_parameter_1" ));
173- Assertions . assertEquals ( "custom-value-2" , additionalParameters .get ("custom_parameter_2" ));
169+ assertThat (additionalParameters ). isNotNull ( );
170+ assertThat ( additionalParameters .size ()). isEqualTo ( 2 );
171+ assertThat ( additionalParameters .get ("custom_parameter_1" )). isEqualTo ( nestedObject );
172+ assertThat ( additionalParameters .get ("custom_parameter_2" )). isEqualTo ( "custom-value-2" );
174173 }
175174
176175}
0 commit comments