From 2a2e281b86cc8d93d0a2c8744a674a0d68fe740f Mon Sep 17 00:00:00 2001 From: annippolito Date: Fri, 26 May 2023 12:36:43 +0200 Subject: [PATCH] increase codecov coverage by using junit instead of junit.jupiter --- .../state/AbstractThreadPoolRuntimeTest.java | 18 +++++++++--------- .../filter/JWTAuthenticationFilterTest.java | 6 +++--- .../auth/service/impl/UserServiceImplTest.java | 6 +++--- .../hippo4j/auth/toolkit/JwtTokenUtilTest.java | 6 +++--- .../server/common/base/ResultsTest.java | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/executor/state/AbstractThreadPoolRuntimeTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/state/AbstractThreadPoolRuntimeTest.java index d08fb953..7ff7db6e 100644 --- a/threadpool/core/src/test/java/cn/hippo4j/core/executor/state/AbstractThreadPoolRuntimeTest.java +++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/state/AbstractThreadPoolRuntimeTest.java @@ -17,24 +17,24 @@ package cn.hippo4j.core.executor.state; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; + import cn.hippo4j.common.model.ThreadPoolRunStateInfo; import cn.hippo4j.core.executor.DynamicThreadPoolExecutor; import cn.hippo4j.core.executor.DynamicThreadPoolWrapper; import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage; +import org.junit.Test; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.junit.jupiter.MockitoExtension; - -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; +import org.junit.runner.RunWith; +import org.mockito.junit.MockitoJUnitRunner; -@ExtendWith(MockitoExtension.class) +@RunWith(MockitoJUnitRunner.class) public class AbstractThreadPoolRuntimeTest { @Test - void testPoolRunState() { + public void testPoolRunState() { AbstractThreadPoolRuntime threadPoolRuntime = new AbstractThreadPoolRuntime() { @Override diff --git a/threadpool/server/auth/src/test/java/cn/hippo4j/auth/filter/JWTAuthenticationFilterTest.java b/threadpool/server/auth/src/test/java/cn/hippo4j/auth/filter/JWTAuthenticationFilterTest.java index 8d3b412c..debc76a1 100644 --- a/threadpool/server/auth/src/test/java/cn/hippo4j/auth/filter/JWTAuthenticationFilterTest.java +++ b/threadpool/server/auth/src/test/java/cn/hippo4j/auth/filter/JWTAuthenticationFilterTest.java @@ -18,15 +18,15 @@ package cn.hippo4j.auth.filter; import cn.hippo4j.common.toolkit.ReflectUtil; +import org.junit.Test; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.core.userdetails.UsernameNotFoundException; -class JWTAuthenticationFilterTest { +public class JWTAuthenticationFilterTest { @Test - void getMessageTest() { + public void getMessageTest() { JWTAuthenticationFilter filter = new JWTAuthenticationFilter(null); Assertions.assertEquals("用户不存在", ReflectUtil.invoke(filter, "getMessage", new UsernameNotFoundException(""))); diff --git a/threadpool/server/auth/src/test/java/cn/hippo4j/auth/service/impl/UserServiceImplTest.java b/threadpool/server/auth/src/test/java/cn/hippo4j/auth/service/impl/UserServiceImplTest.java index 8f92e423..42c9cd91 100644 --- a/threadpool/server/auth/src/test/java/cn/hippo4j/auth/service/impl/UserServiceImplTest.java +++ b/threadpool/server/auth/src/test/java/cn/hippo4j/auth/service/impl/UserServiceImplTest.java @@ -18,12 +18,12 @@ package cn.hippo4j.auth.service.impl; import org.junit.Assert; -import org.junit.jupiter.api.Test; +import org.junit.Test; -class UserServiceImplTest { +public class UserServiceImplTest { @Test - void checkPasswordLength() { + public void testCheckPasswordLength() { // 密码为null、空串、过短、过长都会抛出异常 UserServiceImpl userService = new UserServiceImpl(null, null, null); Assert.assertThrows(RuntimeException.class, () -> userService.checkPasswordLength(null)); diff --git a/threadpool/server/auth/src/test/java/cn/hippo4j/auth/toolkit/JwtTokenUtilTest.java b/threadpool/server/auth/src/test/java/cn/hippo4j/auth/toolkit/JwtTokenUtilTest.java index 77b5f0c1..8066d859 100644 --- a/threadpool/server/auth/src/test/java/cn/hippo4j/auth/toolkit/JwtTokenUtilTest.java +++ b/threadpool/server/auth/src/test/java/cn/hippo4j/auth/toolkit/JwtTokenUtilTest.java @@ -18,8 +18,8 @@ package cn.hippo4j.auth.toolkit; import cn.hippo4j.common.toolkit.Assert; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import org.junit.Before; +import org.junit.Test; public final class JwtTokenUtilTest { @@ -33,7 +33,7 @@ public final class JwtTokenUtilTest { private String token; - @BeforeEach + @Before public void setUp() { token = JwtTokenUtil.createToken(userId, username, role, isRememberMe); } diff --git a/threadpool/server/common/src/test/java/cn/hippo4j/server/common/base/ResultsTest.java b/threadpool/server/common/src/test/java/cn/hippo4j/server/common/base/ResultsTest.java index e76d94b6..9837439d 100644 --- a/threadpool/server/common/src/test/java/cn/hippo4j/server/common/base/ResultsTest.java +++ b/threadpool/server/common/src/test/java/cn/hippo4j/server/common/base/ResultsTest.java @@ -21,7 +21,7 @@ import cn.hippo4j.common.model.Result; import cn.hippo4j.common.toolkit.Assert; import cn.hippo4j.server.common.base.exception.AbstractException; import cn.hippo4j.server.common.base.exception.ErrorCode; -import org.junit.jupiter.api.Test; +import org.junit.Test; import static cn.hippo4j.server.common.base.exception.ErrorCodeEnum.SERVICE_ERROR;