From 5ff1b56fe278b00097bba968ee58cdaf3754da2e Mon Sep 17 00:00:00 2001 From: EightMonth Date: Thu, 27 Mar 2025 16:58:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4junit4=EF=BC=8C=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E9=BB=98=E8=AE=A4junit5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/test/sqlinjection/TestInjectWithSqlParser.java | 6 +++--- .../jeecg/test/sqlinjection/TestSqlInjectForDict.java | 6 +++--- .../test/sqlinjection/TestSqlInjectForOnlineReport.java | 6 +++--- .../org/jeecg/test/sqlinjection/TestSqlInjection.java | 2 +- .../org/jeecg/test/sqlparse/JSqlParserUtilsTest.java | 2 +- .../test/java/org/jeecg/test/sqlparse/TestIpUtil.java | 7 +------ .../org/jeecg/modules/message/test/SendMessageTest.java | 5 +---- .../org/jeecg/modules/system/test/InsertDemoTest.java | 5 +---- .../java/org/jeecg/modules/system/test/SampleTest.java | 9 +++------ .../modules/system/test/SysTableWhiteCheckTest.java | 8 +++----- .../java/org/jeecg/modules/system/test/SysUserTest.java | 4 +--- .../test/java/org/jeecg/smallTools/TestSqlHandle.java | 2 +- .../src/test/java/org/jeecg/smallTools/TestStr.java | 2 +- .../jeecg-cloud-gateway/src/test/java/TestRoutes.java | 2 +- jeecg-boot/pom.xml | 5 ----- 15 files changed, 24 insertions(+), 47 deletions(-) diff --git a/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlinjection/TestInjectWithSqlParser.java b/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlinjection/TestInjectWithSqlParser.java index d3d5cf92..e02311bf 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlinjection/TestInjectWithSqlParser.java +++ b/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlinjection/TestInjectWithSqlParser.java @@ -3,10 +3,10 @@ package org.jeecg.test.sqlinjection; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.JSQLParserException; import org.jeecg.common.util.SqlInjectionUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** diff --git a/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlinjection/TestSqlInjectForDict.java b/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlinjection/TestSqlInjectForDict.java index d7b99dfd..75719ef2 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlinjection/TestSqlInjectForDict.java +++ b/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlinjection/TestSqlInjectForDict.java @@ -3,10 +3,10 @@ package org.jeecg.test.sqlinjection; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.JSQLParserException; import org.jeecg.common.util.SqlInjectionUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** diff --git a/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlinjection/TestSqlInjectForOnlineReport.java b/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlinjection/TestSqlInjectForOnlineReport.java index 0e6ce3ef..537bd12a 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlinjection/TestSqlInjectForOnlineReport.java +++ b/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlinjection/TestSqlInjectForOnlineReport.java @@ -3,10 +3,10 @@ package org.jeecg.test.sqlinjection; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.JSQLParserException; import org.jeecg.common.util.SqlInjectionUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** diff --git a/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlinjection/TestSqlInjection.java b/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlinjection/TestSqlInjection.java index 16b3be73..f86ed04e 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlinjection/TestSqlInjection.java +++ b/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlinjection/TestSqlInjection.java @@ -2,7 +2,7 @@ package org.jeecg.test.sqlinjection; import com.baomidou.mybatisplus.core.toolkit.sql.SqlInjectionUtils; import org.jeecg.common.util.SqlInjectionUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlparse/JSqlParserUtilsTest.java b/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlparse/JSqlParserUtilsTest.java index 33d8d6df..1efc9ee3 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlparse/JSqlParserUtilsTest.java +++ b/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlparse/JSqlParserUtilsTest.java @@ -4,7 +4,7 @@ import net.sf.jsqlparser.JSQLParserException; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.sqlparse.JSqlParserUtils; import org.jeecg.common.util.sqlparse.vo.SelectSqlInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; diff --git a/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlparse/TestIpUtil.java b/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlparse/TestIpUtil.java index 8617c48c..f17728ff 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlparse/TestIpUtil.java +++ b/jeecg-boot/jeecg-boot-base-core/src/test/java/org/jeecg/test/sqlparse/TestIpUtil.java @@ -1,17 +1,12 @@ package org.jeecg.test.sqlparse; -import net.sf.jsqlparser.JSQLParserException; import org.jeecg.common.util.IpUtils; import org.jeecg.common.util.oConvertUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - /** * @author: scott * @date: 2024年04月29日 16:48 diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/message/test/SendMessageTest.java b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/message/test/SendMessageTest.java index 3ec68c96..313e5794 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/message/test/SendMessageTest.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/message/test/SendMessageTest.java @@ -14,11 +14,9 @@ import org.jeecg.common.constant.enums.MessageTypeEnum; import org.jeecg.common.constant.enums.SysAnnmentTypeEnum; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.util.DySmsHelper; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; import java.util.HashMap; import java.util.Map; @@ -27,7 +25,6 @@ import java.util.Map; * @Description: 消息推送测试 * @Author: lsq */ -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = JeecgSystemApplication.class) public class SendMessageTest { diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/InsertDemoTest.java b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/InsertDemoTest.java index f458ecd5..0c2e756f 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/InsertDemoTest.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/InsertDemoTest.java @@ -6,20 +6,17 @@ import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.RestUtil; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.test.context.junit4.SpringRunner; /** * 系统用户单元测试 */ -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class) public class InsertDemoTest { /** diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SampleTest.java b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SampleTest.java index 32f5aafc..3b617f71 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SampleTest.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SampleTest.java @@ -6,16 +6,13 @@ import org.jeecg.modules.demo.test.entity.JeecgDemo; import org.jeecg.modules.demo.test.mapper.JeecgDemoMapper; import org.jeecg.modules.demo.test.service.IJeecgDemoService; import org.jeecg.modules.system.service.ISysDataLogService; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; import javax.annotation.Resource; import java.util.List; -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class) public class SampleTest { @@ -32,7 +29,7 @@ public class SampleTest { public void testSelect() { System.out.println(("----- selectAll method test ------")); List userList = jeecgDemoMapper.selectList(null); - Assert.assertEquals(5, userList.size()); + Assertions.assertEquals(5, userList.size()); userList.forEach(System.out::println); } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SysTableWhiteCheckTest.java b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SysTableWhiteCheckTest.java index 9865d84e..74df4fd0 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SysTableWhiteCheckTest.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SysTableWhiteCheckTest.java @@ -4,9 +4,8 @@ import org.jeecg.JeecgSystemApplication; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.config.JeecgBaseConfig; import org.jeecg.config.firewall.SqlInjection.IDictTableWhiteListHandler; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; @@ -15,7 +14,6 @@ import org.springframework.test.context.junit4.SpringRunner; * @Description: 系统表白名单测试 * @Author: sunjianlei */ -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = JeecgSystemApplication.class) public class SysTableWhiteCheckTest { @@ -27,7 +25,7 @@ public class SysTableWhiteCheckTest { @Autowired JeecgBaseConfig jeecgBaseConfig; - @Before + @BeforeEach public void before() { String lowCodeMode = this.jeecgBaseConfig.getFirewall().getLowCodeMode(); System.out.println("当前 LowCode 模式为: " + lowCodeMode); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SysUserTest.java b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SysUserTest.java index 0d53115c..5de57902 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SysUserTest.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SysUserTest.java @@ -6,8 +6,7 @@ import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.RestUtil; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpHeaders; @@ -19,7 +18,6 @@ import org.springframework.test.context.junit4.SpringRunner; /** * 系统用户单元测试 */ -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class) public class SysUserTest { /** diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/smallTools/TestSqlHandle.java b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/smallTools/TestSqlHandle.java index 0e10a7c0..d8933df0 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/smallTools/TestSqlHandle.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/smallTools/TestSqlHandle.java @@ -1,6 +1,6 @@ package org.jeecg.smallTools; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * 测试sql分割、替换等操作 diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/smallTools/TestStr.java b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/smallTools/TestStr.java index aaac051e..3cdb6950 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/smallTools/TestStr.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/smallTools/TestStr.java @@ -2,7 +2,7 @@ package org.jeecg.smallTools; import com.alibaba.fastjson.JSONArray; import org.apache.commons.lang3.StringUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.text.MessageFormat; import java.util.Arrays; diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/test/java/TestRoutes.java b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/test/java/TestRoutes.java index cb7ed45d..16771b9d 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/test/java/TestRoutes.java +++ b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/test/java/TestRoutes.java @@ -1,5 +1,5 @@ import org.jeecg.loader.vo.PredicatesVo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.*; diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml index 31655875..53011408 100644 --- a/jeecg-boot/pom.xml +++ b/jeecg-boot/pom.xml @@ -123,11 +123,6 @@ spring-boot-starter-test test - - junit - junit - test - org.projectlombok