Update tests in InMemoryOAuth2AuthorizationServiceTest to conform to standards

Fixes spring-projectsgh-43

Author: krisztian-toth

core/src/test/java/org/springframework/security/oauth2/server/authorization/InMemoryOAuth2AuthorizationServiceTest.java

@@ -24,7 +24,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 /**
  * Unit tests for {@link InMemoryOAuth2AuthorizationService}.
@@ -43,31 +44,32 @@ public class InMemoryOAuth2AuthorizationServiceTest {
 	private InMemoryOAuth2AuthorizationService authorizationService;
 
 	@Before
-	public void setUp() throws Exception {
+	public void setUp() {
 		store = new ArrayList<>();
 		authorizationService = new InMemoryOAuth2AuthorizationService(store);
 	}
 
 	@Test
-	public void testSave() {
+	public void saveWhenAuthorizationProvidedThenSavedInList() {
 		OAuth2Authorization authorization = OAuth2Authorization.builder()
 				.registeredClientId("clientId")
 				.principalName("principalName")
 				.attributes(Collections.singletonMap(AUTHORIZATION_CODE.getValue(), TOKEN))
 				.build();
 		authorizationService.save(authorization);
 
-		assertEquals(1, store.size());
-		assertEquals(authorization, store.get(0));
+		assertThat(store.size()).isEqualTo(1);
+		assertThat(authorization).isEqualTo(store.get(0));
 	}
 
 	@Test
-	public void testSaveWithNullParam() {
-		assertThrows(IllegalArgumentException.class, () -> authorizationService.save(null));
+	public void saveWhenAuthorizationNotProvidedThenThrowIllegalArgumentException() {
+		assertThatThrownBy(() -> authorizationService.save(null))
+				.isInstanceOf(IllegalArgumentException.class);
 	}
 
 	@Test
-	public void testFindByTokenAndTokenTypeWhenTokenTypeIsAuthorizationCode() {
+	public void findByTokenAndTokenTypeWhenTokenTypeIsAuthorizationCodeThenFound() {
 		OAuth2Authorization authorization = OAuth2Authorization.builder()
 				.registeredClientId("clientId")
 				.principalName("principalName")
@@ -76,11 +78,11 @@ public void testFindByTokenAndTokenTypeWhenTokenTypeIsAuthorizationCode() {
 		store.add(authorization);
 
 		OAuth2Authorization result = authorizationService.findByTokenAndTokenType(TOKEN, TokenType.AUTHORIZATION_CODE);
-		assertEquals(authorization, result);
+		assertThat(authorization).isEqualTo(result);
 	}
 
 	@Test
-	public void testFindByTokenAndTokenTypeWhenTokenTypeIsAccessToken() {
+	public void findByTokenAndTokenTypeWhenTokenTypeIsAccessTokenThenFound() {
 		OAuth2AccessToken accessToken = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER, TOKEN, ISSUED_AT,
 				EXPIRES_AT);
 		OAuth2Authorization authorization = OAuth2Authorization.builder()
@@ -91,11 +93,11 @@ public void testFindByTokenAndTokenTypeWhenTokenTypeIsAccessToken() {
 		store.add(authorization);
 
 		OAuth2Authorization result = authorizationService.findByTokenAndTokenType(TOKEN, ACCESS_TOKEN);
-		assertEquals(authorization, result);
+		assertThat(authorization).isEqualTo(result);
 	}
 
 	@Test
-	public void testFindByTokenAndTokenTypeWhenTokenNotFound() {
+	public void findByTokenAndTokenTypeWhenTokenWithTokenTypeDoesNotExistThenNull() {
 		OAuth2Authorization authorization = OAuth2Authorization.builder()
 				.registeredClientId("clientId")
 				.principalName("principalName")
@@ -104,18 +106,18 @@ public void testFindByTokenAndTokenTypeWhenTokenNotFound() {
 		store.add(authorization);
 
 		OAuth2Authorization result = authorizationService.findByTokenAndTokenType(TOKEN, ACCESS_TOKEN);
-		assertNull(result);
+		assertThat(result).isNull();
 	}
 
 	@Test
-	public void testFindByTokenAndTokenTypeWithNullToken() {
-		assertThrows(IllegalArgumentException.class,
-				() -> authorizationService.findByTokenAndTokenType(null, TokenType.AUTHORIZATION_CODE));
+	public void findByTokenAndTokenTypeWhenTokenNullThenThrowIllegalArgumentException() {
+		assertThatThrownBy(() -> authorizationService.findByTokenAndTokenType(null, TokenType.AUTHORIZATION_CODE))
+				.isInstanceOf(IllegalArgumentException.class);
 	}
 
 	@Test
-	public void testFindByTokenAndTokenTypeWithNullTokenType() {
-		assertThrows(IllegalArgumentException.class,
-				() -> authorizationService.findByTokenAndTokenType(TOKEN, null));
+	public void findByTokenAndTokenTypeWhenTokenTypeNullThenThrowIllegalArgumentException() {
+		assertThatThrownBy(() -> authorizationService.findByTokenAndTokenType(TOKEN, null))
+				.isInstanceOf(IllegalArgumentException.class);
 	}
 }