From 1d04e3f5dfa4603faadca08ed266d260b6b3722f Mon Sep 17 00:00:00 2001 From: "shengzhaoli.shengz" Date: Sat, 23 Oct 2021 22:33:22 +0800 Subject: [PATCH] Update spring-boot 2.4.2 , update config test --- ...CredentialsInlineAccessTokenInvokerTest.java | 15 +++++++++------ .../PasswordInlineAccessTokenInvokerTest.java | 12 ++++++------ ...efreshTokenInlineAccessTokenInvokerTest.java | 17 ++++++++++------- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/test/java/com/monkeyk/sos/service/business/ClientCredentialsInlineAccessTokenInvokerTest.java b/src/test/java/com/monkeyk/sos/service/business/ClientCredentialsInlineAccessTokenInvokerTest.java index 41cae5f..69d7645 100644 --- a/src/test/java/com/monkeyk/sos/service/business/ClientCredentialsInlineAccessTokenInvokerTest.java +++ b/src/test/java/com/monkeyk/sos/service/business/ClientCredentialsInlineAccessTokenInvokerTest.java @@ -2,6 +2,7 @@ package com.monkeyk.sos.service.business; import com.monkeyk.sos.service.dto.AccessTokenDto; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.function.Executable; import org.springframework.security.oauth2.provider.NoSuchClientException; import java.util.HashMap; @@ -40,9 +41,9 @@ public class ClientCredentialsInlineAccessTokenInvokerTest extends AbstractInlin } -// @Test(expected = NoSuchClientException.class) + // @Test(expected = NoSuchClientException.class) @Test() - void invalidClientId() { + void invalidClientId() { createClientDetails(); @@ -54,17 +55,19 @@ public class ClientCredentialsInlineAccessTokenInvokerTest extends AbstractInlin ClientCredentialsInlineAccessTokenInvoker accessTokenInvoker = new ClientCredentialsInlineAccessTokenInvoker(); - final AccessTokenDto accessTokenDto = accessTokenInvoker.invoke(params); + assertThrows(NoSuchClientException.class, () -> { + final AccessTokenDto accessTokenDto = accessTokenInvoker.invoke(params); - assertNotNull(accessTokenDto); - assertNotNull(accessTokenDto.getAccessToken()); + assertNotNull(accessTokenDto); + assertNotNull(accessTokenDto.getAccessToken()); + }); // System.out.println(accessTokenDto); } @Test() - void invalidClientSecret() { + void invalidClientSecret() { createClientDetails(); diff --git a/src/test/java/com/monkeyk/sos/service/business/PasswordInlineAccessTokenInvokerTest.java b/src/test/java/com/monkeyk/sos/service/business/PasswordInlineAccessTokenInvokerTest.java index 5a059b9..f5043ea 100644 --- a/src/test/java/com/monkeyk/sos/service/business/PasswordInlineAccessTokenInvokerTest.java +++ b/src/test/java/com/monkeyk/sos/service/business/PasswordInlineAccessTokenInvokerTest.java @@ -2,15 +2,12 @@ package com.monkeyk.sos.service.business; import com.monkeyk.sos.service.dto.AccessTokenDto; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.function.Executable; import org.springframework.security.oauth2.common.exceptions.InvalidGrantException; import java.util.HashMap; import java.util.Map; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.*; /** @@ -94,9 +91,12 @@ class PasswordInlineAccessTokenInvokerTest extends AbstractInlineAccessTokenInvo params.put("password", password); PasswordInlineAccessTokenInvoker accessTokenInvoker = new PasswordInlineAccessTokenInvoker(); - final AccessTokenDto tokenDto = accessTokenInvoker.invoke(params); + assertThrows(IllegalStateException.class, () -> { + final AccessTokenDto tokenDto = accessTokenInvoker.invoke(params); + + assertNull(tokenDto); + }); - assertNull(tokenDto); // System.out.println(accessTokenDto); diff --git a/src/test/java/com/monkeyk/sos/service/business/RefreshTokenInlineAccessTokenInvokerTest.java b/src/test/java/com/monkeyk/sos/service/business/RefreshTokenInlineAccessTokenInvokerTest.java index 6679680..a5ec8db 100644 --- a/src/test/java/com/monkeyk/sos/service/business/RefreshTokenInlineAccessTokenInvokerTest.java +++ b/src/test/java/com/monkeyk/sos/service/business/RefreshTokenInlineAccessTokenInvokerTest.java @@ -2,7 +2,7 @@ package com.monkeyk.sos.service.business; import com.monkeyk.sos.service.dto.AccessTokenDto; import org.junit.jupiter.api.Test; -import org.springframework.security.oauth2.common.exceptions.InvalidGrantException; +import org.springframework.security.oauth2.common.exceptions.InvalidTokenException; import java.util.HashMap; import java.util.Map; @@ -58,7 +58,7 @@ class RefreshTokenInlineAccessTokenInvokerTest extends AbstractInlineAccessToken assertNotNull(accessTokenDto.getAccessToken()); assertNotEquals(accessTokenDto.getAccessToken(), tokenDto.getAccessToken()); - assertEquals(accessTokenDto.getRefreshToken(), tokenDto.getRefreshToken()); + assertNotEquals(accessTokenDto.getRefreshToken(), tokenDto.getRefreshToken()); } @@ -97,14 +97,17 @@ class RefreshTokenInlineAccessTokenInvokerTest extends AbstractInlineAccessToken RefreshTokenInlineAccessTokenInvoker refreshTokenInlineAccessTokenInvoker = new RefreshTokenInlineAccessTokenInvoker(); - final AccessTokenDto accessTokenDto = refreshTokenInlineAccessTokenInvoker.invoke(params2); + assertThrows(InvalidTokenException.class, () -> { + final AccessTokenDto accessTokenDto = refreshTokenInlineAccessTokenInvoker.invoke(params2); - assertNotNull(accessTokenDto); - assertNotNull(accessTokenDto.getAccessToken()); + assertNotNull(accessTokenDto); + assertNotNull(accessTokenDto.getAccessToken()); - assertNotEquals(accessTokenDto.getAccessToken(), tokenDto.getAccessToken()); - assertEquals(accessTokenDto.getRefreshToken(), tokenDto.getRefreshToken()); + assertNotEquals(accessTokenDto.getAccessToken(), tokenDto.getAccessToken()); + assertNotEquals(accessTokenDto.getRefreshToken(), tokenDto.getRefreshToken()); + + }); }