完善 OAuth2ClientServiceImpl、OAuth2GrantServiceImpl 单元测试

yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImplTest.java

@@ -27,10 +27,10 @@ import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.verify;
 
 /**
- * {@link OAuth2ClientServiceImpl} 的单元测试类
- *
- * @author 芋道源码
- */
+* {@link OAuth2ClientServiceImpl} 的单元测试类
+*
+* @author 芋道源码
+*/
 @Import(OAuth2ClientServiceImpl.class)
 public class OAuth2ClientServiceImplTest extends BaseDbUnitTest {
 
@@ -154,28 +154,41 @@ public class OAuth2ClientServiceImplTest extends BaseDbUnitTest {
     }
 
     @Test
-    public void testGetOAuth2ClientPage() {
+    public void testGetOAuth2Client() {
         // mock 数据
-        OAuth2ClientDO dbOAuth2Client = randomPojo(OAuth2ClientDO.class, o -> { // 等会查询到
-            o.setName("潜龙");
-            o.setStatus(CommonStatusEnum.ENABLE.getStatus());
-        });
-        oauth2ClientMapper.insert(dbOAuth2Client);
-        // 测试 name 不匹配
-        oauth2ClientMapper.insert(cloneIgnoreId(dbOAuth2Client, o -> o.setName("凤凰")));
-        // 测试 status 不匹配
-        oauth2ClientMapper.insert(cloneIgnoreId(dbOAuth2Client, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
+        OAuth2ClientDO clientDO = randomPojo(OAuth2ClientDO.class);
+        oauth2ClientMapper.insert(clientDO);
         // 准备参数
-        OAuth2ClientPageReqVO reqVO = new OAuth2ClientPageReqVO();
-        reqVO.setName("龙");
-        reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
+        Long id = clientDO.getId();
 
-        // 调用
-        PageResult<OAuth2ClientDO> pageResult = oauth2ClientService.getOAuth2ClientPage(reqVO);
-        // 断言
-        assertEquals(1, pageResult.getTotal());
-        assertEquals(1, pageResult.getList().size());
-        assertPojoEquals(dbOAuth2Client, pageResult.getList().get(0));
+        // 调用，并断言
+        OAuth2ClientDO dbClientDO = oauth2ClientService.getOAuth2Client(id);
+        assertPojoEquals(clientDO, dbClientDO);
+    }
+
+    @Test
+    public void testGetOAuth2ClientPage() {
+       // mock 数据
+       OAuth2ClientDO dbOAuth2Client = randomPojo(OAuth2ClientDO.class, o -> { // 等会查询到
+           o.setName("潜龙");
+           o.setStatus(CommonStatusEnum.ENABLE.getStatus());
+       });
+       oauth2ClientMapper.insert(dbOAuth2Client);
+       // 测试 name 不匹配
+       oauth2ClientMapper.insert(cloneIgnoreId(dbOAuth2Client, o -> o.setName("凤凰")));
+       // 测试 status 不匹配
+       oauth2ClientMapper.insert(cloneIgnoreId(dbOAuth2Client, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
+       // 准备参数
+       OAuth2ClientPageReqVO reqVO = new OAuth2ClientPageReqVO();
+       reqVO.setName("龙");
+       reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
+
+       // 调用
+       PageResult<OAuth2ClientDO> pageResult = oauth2ClientService.getOAuth2ClientPage(reqVO);
+       // 断言
+       assertEquals(1, pageResult.getTotal());
+       assertEquals(1, pageResult.getList().size());
+       assertPojoEquals(dbOAuth2Client, pageResult.getList().get(0));
     }
 
     @Test
@@ -203,10 +216,13 @@ public class OAuth2ClientServiceImplTest extends BaseDbUnitTest {
                 null, null, Collections.singleton(randomString()), null), OAUTH2_CLIENT_SCOPE_OVER);
         assertServiceException(() -> oauth2ClientService.validOAuthClientFromCache("default",
                 null, null, null, "test"), OAUTH2_CLIENT_REDIRECT_URI_NOT_MATCH, "test");
-        // 成功调用
+        // 成功调用（1：参数完整）
         OAuth2ClientDO result = oauth2ClientService.validOAuthClientFromCache(client.getClientId(), client.getSecret(),
                 client.getAuthorizedGrantTypes().get(0), client.getScopes(), client.getRedirectUris().get(0));
         assertPojoEquals(client, result);
+        // 成功调用（2：只有 clientId 参数）
+        result = oauth2ClientService.validOAuthClientFromCache(client.getClientId());
+        assertPojoEquals(client, result);
     }
 
 }

yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2GrantServiceImplTest.java

@@ -16,6 +16,7 @@ import java.util.List;
 import static cn.hutool.core.util.RandomUtil.randomEle;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
+import static java.util.Collections.emptyList;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
@@ -134,6 +135,13 @@ public class OAuth2GrantServiceImplTest extends BaseMockitoUnitTest {
                 refreshToken, clientId));
     }
 
+    @Test
+    public void testGrantClientCredentials() {
+        assertThrows(UnsupportedOperationException.class,
+                () -> oauth2GrantService.grantClientCredentials(randomString(), emptyList()),
+                "暂时不支持 client_credentials 授权模式");
+    }
+
     @Test
     public void testRevokeToken_clientIdError() {
         // 准备参数