lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-05 17:37:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

单元测试由Junit4变更为Junit5

Browse Source
This commit is contained in:
Looly 2024-08-09 14:53:02 +08:00
parent 994ac87ae6
commit 85fc13be04
14 changed files with 87 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hutool-db/pom.xml
View File

@ -160,10 +160,11 @@
<version>1.7.36</version>
<scope>test</scope>
</dependency>
<!-- H2数据库，版本固定2.2.x ，支持到JDK8 -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>2.3.230</version>
<version>2.2.224</version>
<scope>test</scope>
</dependency>
<dependency>

4
hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java
View File

@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Console;
import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.db.handler.EntityListHandler;
import org.junit.Before;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@ -22,7 +22,7 @@ public class ConcurentTest {
private Db db;
@Before
@BeforeEach
public void init() {
db = Db.use("test");
}

7
hutool-db/src/test/java/cn/hutool/db/DerbyTest.java
View File

@ -1,13 +1,14 @@
package cn.hutool.db;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.BeforeClass;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import java.sql.SQLException;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Derby数据库单元测试
*
@ -18,7 +19,7 @@ public class DerbyTest {
private static final String DS_GROUP_NAME = "derby";
@BeforeClass
@BeforeAll
public static void init() throws SQLException {
Db db = Db.use(DS_GROUP_NAME);
try{

6
hutool-db/src/test/java/cn/hutool/db/DmTest.java
View File

@ -1,12 +1,12 @@
package cn.hutool.db;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.BeforeClass;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import java.sql.SQLException;
import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* 达梦数据库单元测试
*
@ -16,7 +16,7 @@ public class DmTest {
private static final String DS_GROUP_NAME = "dm";
@BeforeClass
//@BeforeAll
public static void init() throws SQLException {
Db db = Db.use(DS_GROUP_NAME);
db.execute("CREATE TABLE test(a INTEGER, b INTEGER)");

7
hutool-db/src/test/java/cn/hutool/db/FindBeanTest.java
View File

@ -1,13 +1,14 @@
package cn.hutool.db;
import cn.hutool.db.pojo.User;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.Before;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.sql.SQLException;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Entity测试
*
@ -18,7 +19,7 @@ public class FindBeanTest {
Db db;
@Before
@BeforeEach
public void init() {
db = Db.use("test");
}

7
hutool-db/src/test/java/cn/hutool/db/H2Test.java
View File

@ -2,14 +2,15 @@ package cn.hutool.db;
import cn.hutool.core.map.CaseInsensitiveMap;
import cn.hutool.core.map.MapUtil;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.BeforeClass;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import java.sql.SQLException;
import java.util.List;
import java.util.Map;
import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* H2数据库单元测试
*
@ -20,7 +21,7 @@ public class H2Test {
private static final String DS_GROUP_NAME = "h2";
@BeforeClass
@BeforeAll
public static void init() throws SQLException {
Db db = Db.use(DS_GROUP_NAME);
db.execute("CREATE TABLE test(a INTEGER, b BIGINT)");

7
hutool-db/src/test/java/cn/hutool/db/HsqldbTest.java
View File

@ -1,12 +1,13 @@
package cn.hutool.db;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.BeforeClass;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import java.sql.SQLException;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* HSQLDB数据库单元测试
*
@ -17,7 +18,7 @@ public class HsqldbTest {
private static final String DS_GROUP_NAME = "hsqldb";
@BeforeClass
@BeforeAll
public static void init() throws SQLException {
Db db = Db.use(DS_GROUP_NAME);
db.execute("CREATE TABLE test(a INTEGER, b BIGINT)");

34
hutool-db/src/test/java/cn/hutool/db/MySQLTest.java
View File

@ -1,22 +1,22 @@
package cn.hutool.db;
import cn.hutool.core.lang.Console;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.BeforeClass;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import java.sql.SQLException;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* MySQL操作单元测试
*
* @author looly
*/
public class MySQLTest {
@BeforeClass
@Disabled
//@BeforeAll
public static void createTable() throws SQLException {
Db db = Db.use("mysql");
db.executeBatch("drop table if exists testuser", "CREATE TABLE if not exists `testuser` ( `id` int(11) NOT NULL, `account` varchar(255) DEFAULT NULL, `pass` varchar(255) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8");
@ -38,20 +38,20 @@ public class MySQLTest {
/**
* 事务测试<br>
* 更新三条信息，低2条后抛出异常，正常情况下三条都应该不变
*
* @throws SQLException SQL异常
*/
@Test(expected = SQLException.class)
@Test
@Disabled
public void txTest() throws SQLException {
Db.use("mysql").tx(db -> {
int update = db.update(Entity.create("user").set("text", "描述100"), Entity.create().set("id", 100));
db.update(Entity.create("user").set("text", "描述101"), Entity.create().set("id", 101));
if (1 == update) {
// 手动指定异常，然后测试回滚触发
throw new RuntimeException("Error");
}
db.update(Entity.create("user").set("text", "描述102"), Entity.create().set("id", 102));
public void txTest() {
assertThrows(SQLException.class, () -> {
Db.use("mysql").tx(db -> {
int update = db.update(Entity.create("user").set("text", "描述100"), Entity.create().set("id", 100));
db.update(Entity.create("user").set("text", "描述101"), Entity.create().set("id", 101));
if (1 == update) {
// 手动指定异常，然后测试回滚触发
throw new RuntimeException("Error");
}
db.update(Entity.create("user").set("text", "描述102"), Entity.create().set("id", 102));
});
});
}
@ -79,6 +79,6 @@ public class MySQLTest {
db.upsert(Entity.create("testuser").set("id", 1).set("account", "icefairy").set("pass", "a123456"));
Entity user = db.get(Entity.create("testuser").set("id", 1));
System.out.println("user======="+user.getStr("account")+"___"+user.getStr("pass"));
assertEquals(user.getStr("account"), new String("icefairy"));
assertEquals(user.getStr("account"), "icefairy");
}
}

8
hutool-db/src/test/java/cn/hutool/db/UpdateTest.java
View File

@ -1,17 +1,19 @@
package cn.hutool.db;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.Before;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import java.sql.SQLException;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class UpdateTest {
Db db;
@Before
@BeforeEach
public void init() {
db = Db.use("test");
}

11
hutool-db/src/test/java/cn/hutool/db/meta/MetaUtilTest.java
View File

@ -4,12 +4,13 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.db.DbRuntimeException;
import cn.hutool.db.ds.DSFactory;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
import javax.sql.DataSource;
import java.util.List;
import static org.junit.jupiter.api.Assertions.*;
/**
* 元数据信息单元测试
*
@ -46,9 +47,11 @@ public class MetaUtilTest {
/**
* 表不存在抛出异常。
*/
@Test(expected = DbRuntimeException.class)
@Test
public void getTableNotExistTest() {
final Table table = MetaUtil.getTableMeta(ds, "user_not_exist");
assertEquals(table.getIndexInfoList().size(), 2);
assertThrows(DbRuntimeException.class, () -> {
final Table table = MetaUtil.getTableMeta(ds, "user_not_exist");
assertEquals(table.getIndexInfoList().size(), 2);
});
}
}

9
hutool-extra/src/test/java/cn/hutool/extra/spring/EnableSpringUtilTest.java
View File

@ -1,17 +1,18 @@
package cn.hutool.extra.spring;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* @author sidian
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = EnableSpringUtilTest.class)
@EnableSpringUtil
@ExtendWith(SpringExtension.class)
public class EnableSpringUtilTest {
@Test

15
hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java
View File

@ -3,22 +3,27 @@ package cn.hutool.extra.spring;
import cn.hutool.core.lang.TypeReference;
import cn.hutool.core.map.MapUtil;
import lombok.Data;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
@RunWith(SpringJUnit4ClassRunner.class)
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = {SpringUtil.class, SpringUtilTest.Demo2.class})
//@Import(cn.hutool.extra.spring.SpringUtil.class)
// @ActiveProfiles("dev") // SpringUtil.getActiveProfile()效果与下面方式一致
@TestPropertySource(properties = {"spring.profiles.active=dev"})
//@Import(spring.org.dromara.hutool.extra.SpringUtil.class)
public class SpringUtilTest {
/**

11
hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilWithAutoConfigTest.java
View File

@ -3,20 +3,21 @@ package cn.hutool.extra.spring;
import cn.hutool.core.lang.TypeReference;
import cn.hutool.core.map.MapUtil;
import lombok.Data;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.util.HashMap;
import java.util.Map;
@RunWith(SpringJUnit4ClassRunner.class)
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = {SpringUtilWithAutoConfigTest.Demo2.class})
//@Import(cn.hutool.extra.spring.SpringUtil.class)
@EnableAutoConfiguration
public class SpringUtilWithAutoConfigTest {

19
pom.xml
View File

@ -95,7 +95,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.13.0</version>
<configuration>
<source>${compile.version}</source>
<target>${compile.version}</target>
@ -105,7 +105,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.2</version>
<configuration>
<archive>
<index>true</index>
@ -126,7 +126,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version>
<version>3.8.0</version>
<executions>
<execution>
<phase>package</phase>
@ -136,6 +136,15 @@
</execution>
</executions>
</plugin>
<!-- 统一更新pom版本 -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.17.1</version>
<configuration>
<generateBackupPoms>false</generateBackupPoms>
</configuration>
</plugin>
</plugins>
</build>
@ -158,7 +167,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.1</version>
<executions>
<execution>
<id>oss</id>
@ -200,7 +209,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<version>1.7.0</version>
<extensions>true</extensions>
<configuration>
<serverId>oss</serverId>