Skip to content

Commit 05e8efe

Browse files
qmdxqmdx
committed
测试 3.4.3.2
1 parent 26e5e31 commit 05e8efe

File tree

47 files changed

+333
-944
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+333
-944
lines changed

‎mybatis-plus-sample-active-record/src/test/java/com/baomidou/mybatisplus/samples/ar/SampleTest.java

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
package com.baomidou.mybatisplus.samples.ar;
22

3-
import org.junit.Assert;
4-
import org.junit.Test;
5-
import org.junit.runner.RunWith;
6-
import org.springframework.boot.test.context.SpringBootTest;
7-
import org.springframework.test.context.junit4.SpringRunner;
8-
93
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
104
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
115
import com.baomidou.mybatisplus.samples.ar.entity.User;
6+
import org.junit.jupiter.api.Assertions;
7+
import org.junit.jupiter.api.Test;
8+
import org.springframework.boot.test.context.SpringBootTest;
129

1310
/**
1411
* <p>
@@ -18,7 +15,6 @@
1815
* @author hubin
1916
* @since 2018-08-11
2017
*/
21-
@RunWith(SpringRunner.class)
2218
@SpringBootTest
2319
public class SampleTest {
2420

@@ -28,33 +24,33 @@ public void aInsert() {
2824
user.setName("咩咩");
2925
user.setAge(5);
3026
user.setEmail("[email protected]");
31-
Assert.assertTrue(user.insert());
27+
Assertions.assertTrue(user.insert());
3228
// 成功可以直接获取 ID
3329
System.err.println("\n插入成功 ID 为：" + user.getId());
3430
}
3531

3632

3733
@Test
3834
public void bDelete() {
39-
Assert.assertTrue(new User().setId(3L).deleteById());
40-
Assert.assertTrue(new User().delete(new QueryWrapper<User>()
35+
Assertions.assertTrue(new User().setId(3L).deleteById());
36+
Assertions.assertTrue(new User().delete(new QueryWrapper<User>()
4137
.lambda().eq(User::getName, "Sandy")));
4238
}
4339

4440

4541
@Test
4642
public void cUpdate() {
47-
Assert.assertTrue(new User().setId(1L).setEmail("[email protected]").updateById());
48-
Assert.assertTrue(new User().update(new UpdateWrapper<User>().lambda()
43+
Assertions.assertTrue(new User().setId(1L).setEmail("[email protected]").updateById());
44+
Assertions.assertTrue(new User().update(new UpdateWrapper<User>().lambda()
4945
.set(User::getAge, 3).eq(User::getId, 2)));
5046
}
5147

5248

5349
@Test
5450
public void dSelect() {
55-
Assert.assertEquals("[email protected]", new User().setId(1L).selectById().getEmail());
51+
Assertions.assertEquals("[email protected]", new User().setId(1L).selectById().getEmail());
5652
User user = new User().selectOne(new QueryWrapper<User>().lambda().eq(User::getId, 2));
57-
Assert.assertEquals("Jack", user.getName());
58-
Assert.assertTrue(3 == user.getAge());
53+
Assertions.assertEquals("Jack", user.getName());
54+
Assertions.assertTrue(3 == user.getAge());
5955
}
6056
}

‎mybatis-plus-sample-association/src/main/java/com/baomidou/mybatisplus/samples/association/entity/Company.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
import com.baomidou.mybatisplus.annotation.TableName;
44
import lombok.Data;
55

6+
import java.util.List;
7+
68
@Data
79
@TableName("company")
810
public class Company {
911
private Long id;
1012
private String name;
13+
List<User> userList;
14+
1115
}

‎mybatis-plus-sample-association/src/main/java/com/baomidou/mybatisplus/samples/association/mapper/CompanyMapper.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.baomidou.mybatisplus.samples.association.mapper;
2+
3+
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4+
import com.baomidou.mybatisplus.samples.association.entity.Company;
5+
import org.apache.ibatis.annotations.Mapper;
6+
7+
@Mapper
8+
public interface CompanyMapper extends BaseMapper<Company> {
9+
10+
Company testResultMapCollection();
11+
}

‎mybatis-plus-sample-association/src/main/resources/mapper/CompanyMapper.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3+
<mapper namespace="com.baomidou.mybatisplus.samples.association.mapper.CompanyMapper">
4+
5+
<resultMap id="companyUser" type="com.baomidou.mybatisplus.samples.association.entity.Company">
6+
<result property="id" column="id"/>
7+
<result property="name" column="name"/>
8+
<collection property="userList" ofType="com.baomidou.mybatisplus.samples.association.entity.User">
9+
<result property="id" column="id"/>
10+
<result property="name" column="name"/>
11+
<result property="age" column="age"/>
12+
<result property="email" column="email"/>
13+
</collection>
14+
</resultMap>
15+
16+
<select id="testResultMapCollection" resultMap="companyUser">
17+
SELECT c.id, c.name, u.id AS uid, u.name AS uname, u.age, u.email
18+
FROM company c JOIN user u ON c.id = u.company_id WHERE c.id=1
19+
</select>
20+
</mapper>

‎mybatis-plus-sample-association/src/test/java/com/baomidou/mybatisplus/samples/association/SampleTest.java

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,23 @@
66
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
77
import com.baomidou.mybatisplus.samples.association.entity.Company;
88
import com.baomidou.mybatisplus.samples.association.entity.User;
9+
import com.baomidou.mybatisplus.samples.association.mapper.CompanyMapper;
910
import com.baomidou.mybatisplus.samples.association.service.IUserService;
10-
import org.junit.Test;
11-
import org.junit.runner.RunWith;
11+
import org.junit.jupiter.api.Assertions;
12+
import org.junit.jupiter.api.Test;
1213
import org.springframework.beans.factory.annotation.Autowired;
1314
import org.springframework.boot.test.context.SpringBootTest;
14-
import org.springframework.test.context.junit4.SpringRunner;
1515

1616
import java.util.ArrayList;
1717
import java.util.Date;
1818
import java.util.List;
1919

20-
@RunWith(SpringRunner.class)
2120
@SpringBootTest
2221
public class SampleTest {
2322
@Autowired
24-
IUserService userService;
23+
private CompanyMapper companyMapper;
24+
@Autowired
25+
private IUserService userService;
2526

2627
@Test
2728
public void testSelectList() {
@@ -72,4 +73,10 @@ private void testUpdate() {
7273
userService.update(user, wrapper);
7374
testSelect();
7475
}
76+
77+
@Test
78+
public void testResultMapCollection() {
79+
Company company = companyMapper.testResultMapCollection();
80+
Assertions.assertTrue(3 == company.getUserList().size());
81+
}
7582
}

‎mybatis-plus-sample-auto-fill-metainfo/src/test/java/com/baomidou/samples/metainfo/AutoFillTest.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
11
package com.baomidou.samples.metainfo;
22

3-
import javax.annotation.Resource;
4-
5-
import org.junit.Test;
6-
import org.junit.runner.RunWith;
7-
import org.springframework.boot.test.context.SpringBootTest;
8-
import org.springframework.test.context.junit4.SpringRunner;
9-
103
import com.baomidou.samples.metainfo.entity.User;
114
import com.baomidou.samples.metainfo.mapper.UserMapper;
12-
135
import lombok.extern.slf4j.Slf4j;
6+
import org.junit.jupiter.api.Test;
7+
import org.springframework.boot.test.context.SpringBootTest;
8+
9+
import javax.annotation.Resource;
1410

1511
/**
1612
* 自动填充测试
1713
*
1814
* @author nieqiurong 2018-08-10 23:47:02.
1915
*/
2016
@Slf4j
21-
@RunWith(SpringRunner.class)
2217
@SpringBootTest
2318
public class AutoFillTest {
2419

‎mybatis-plus-sample-crud/src/main/java/com/baomidou/mybatisplus/samples/crud/entity/User2.java

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package com.baomidou.mybatisplus.samples.crud.entity;
2+
3+
import com.baomidou.mybatisplus.annotation.SqlCondition;
4+
import com.baomidou.mybatisplus.annotation.TableField;
5+
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
6+
import lombok.Data;
7+
import lombok.experimental.Accessors;
8+
import org.apache.ibatis.type.JdbcType;
9+
10+
import java.util.List;
11+
12+
/**
13+
* <p>
14+
* 用户实体对应表 user2 测试注解条件
15+
* </p>
16+
*
17+
* @author hubin
18+
* @since 2021-08-19
19+
*/
20+
@Data
21+
@Accessors(chain = true)
22+
public class User2 {
23+
private Long id;
24+
@TableField(condition = SqlCondition.LIKE, jdbcType = JdbcType.VARCHAR)
25+
private String name;
26+
private Integer age;
27+
28+
}

‎mybatis-plus-sample-crud/src/main/java/com/baomidou/mybatisplus/samples/crud/mapper/User2Mapper.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.baomidou.mybatisplus.samples.crud.mapper;
2+
3+
4+
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5+
import com.baomidou.mybatisplus.samples.crud.entity.User;
6+
import com.baomidou.mybatisplus.samples.crud.entity.User2;
7+
8+
/**
9+
* <p>
10+
* MP 支持不需要 UserMapper.xml 测试注解条件
11+
* </p>
12+
*
13+
* @author hubin
14+
* @since 2021-08-19
15+
*/
16+
public interface User2Mapper extends BaseMapper<User2> {
17+
18+
}

‎mybatis-plus-sample-crud/src/main/resources/db/data-h2.sql

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,11 @@ INSERT INTO user (id, name, age, email) VALUES
55
(2, 'Jack', 20, '[email protected]'),
66
(3, 'Tom', 28, '[email protected]'),
77
(4, 'Sandy', 21, '[email protected]'),
8-
(5, 'Billie', 24, '[email protected]');
8+
(5, 'Billie', 24, '[email protected]');
9+
10+
INSERT INTO user2 (id, name, age) VALUES
11+
(1, 'Jone', 18),
12+
(2, 'Jack', 20),
13+
(3, 'Tom', 28),
14+
(4, 'Sandy', 21),
15+
(5, 'Billie', 24);

‎mybatis-plus-sample-crud/src/main/resources/db/schema-h2.sql

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,12 @@ CREATE TABLE user
77
age INT(11) NULL DEFAULT NULL COMMENT '年龄',
88
email VARCHAR(50) NULL DEFAULT NULL COMMENT '邮箱',
99
PRIMARY KEY (id)
10+
);
11+
12+
CREATE TABLE user2
13+
(
14+
id BIGINT(20) NOT NULL COMMENT '主键ID',
15+
name VARCHAR(30) NULL DEFAULT NULL COMMENT '姓名',
16+
age INT(11) NULL DEFAULT NULL COMMENT '年龄',
17+
PRIMARY KEY (id)
1018
);

‎mybatis-plus-sample-crud/src/test/java/com/baomidou/mybatisplus/samples/crud/SampleTest.java

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
77
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
88
import com.baomidou.mybatisplus.samples.crud.entity.User;
9+
import com.baomidou.mybatisplus.samples.crud.entity.User2;
10+
import com.baomidou.mybatisplus.samples.crud.mapper.User2Mapper;
911
import com.baomidou.mybatisplus.samples.crud.mapper.UserMapper;
10-
import org.junit.Assert;
11-
import org.junit.Test;
12-
import org.junit.runner.RunWith;
12+
import org.junit.jupiter.api.Assertions;
13+
import org.junit.jupiter.api.Test;
1314
import org.springframework.boot.test.context.SpringBootTest;
14-
import org.springframework.test.context.junit4.SpringRunner;
1515

1616
import javax.annotation.Resource;
1717
import java.util.List;
@@ -27,12 +27,12 @@
2727
* @author hubin
2828
* @since 2018-08-11
2929
*/
30-
@RunWith(SpringRunner.class)
3130
@SpringBootTest
3231
public class SampleTest {
33-
3432
@Resource
3533
private UserMapper mapper;
34+
@Resource
35+
private User2Mapper user2Mapper;
3636

3737
@Test
3838
public void aInsert() {
@@ -131,7 +131,7 @@ public void orderBy() {
131131
List<User> users = mapper.selectList(Wrappers.<User>query().orderByAsc("age"));
132132
assertThat(users).isNotEmpty();
133133
//多字段排序
134-
List<User> users2 = mapper.selectList(Wrappers.<User>query().orderByAsc("age","name"));
134+
List<User> users2 = mapper.selectList(Wrappers.<User>query().orderByAsc("age", "name"));
135135
assertThat(users2).isNotEmpty();
136136
//先按age升序排列，age相同再按name降序排列
137137
List<User> users3 = mapper.selectList(Wrappers.<User>query().orderByAsc("age").orderByDesc("name"));
@@ -160,7 +160,7 @@ public void orderByLambda() {
160160
List<User> users = mapper.selectList(Wrappers.<User>lambdaQuery().orderByAsc(User::getAge));
161161
assertThat(users).isNotEmpty();
162162
//多字段排序
163-
List<User> users2 = mapper.selectList(Wrappers.<User>lambdaQuery().orderByAsc(User::getAge,User::getName));
163+
List<User> users2 = mapper.selectList(Wrappers.<User>lambdaQuery().orderByAsc(User::getAge, User::getName));
164164
assertThat(users2).isNotEmpty();
165165
//先按age升序排列，age相同再按name降序排列
166166
List<User> users3 = mapper.selectList(Wrappers.<User>lambdaQuery().orderByAsc(User::getAge).orderByDesc(User::getName));
@@ -174,7 +174,7 @@ public void testSelectMaxId() {
174174
User user = mapper.selectOne(wrapper);
175175
System.out.println("maxId=" + user.getId());
176176
List<User> users = mapper.selectList(Wrappers.<User>lambdaQuery().orderByDesc(User::getId));
177-
Assert.assertEquals(user.getId().longValue(), users.get(0).getId().longValue());
177+
Assertions.assertEquals(user.getId().longValue(), users.get(0).getId().longValue());
178178
}
179179

180180
@Test
@@ -206,18 +206,26 @@ public void testTableFieldExistFalse() {
206206
List<User> list = mapper.selectList(wrapper);
207207
list.forEach(System.out::println);
208208
list.forEach(x -> {
209-
Assert.assertNull(x.getId());
210-
Assert.assertNotNull(x.getAge());
211-
Assert.assertNotNull(x.getCount());
209+
Assertions.assertNull(x.getId());
210+
Assertions.assertNotNull(x.getAge());
211+
Assertions.assertNotNull(x.getCount());
212212
});
213213
mapper.insert(
214214
new User().setId(10088L)
215215
.setName("miemie")
216216
.setEmail("[email protected]")
217217
.setAge(3));
218218
User miemie = mapper.selectById(10088L);
219-
Assert.assertNotNull(miemie);
219+
Assertions.assertNotNull(miemie);
220220

221221
}
222222

223+
@Test
224+
public void testSqlCondition() {
225+
Assertions.assertEquals(user2Mapper.selectList(Wrappers.<User2>query()
226+
.setEntity(new User2().setName("n"))).size(), 2);
227+
Assertions.assertEquals(user2Mapper.selectList(Wrappers.<User2>query().like("name", "J")).size(), 2);
228+
Assertions.assertEquals(user2Mapper.selectList(Wrappers.<User2>query().gt("age", 18)
229+
.setEntity(new User2().setName("J"))).size(), 1);
230+
}
223231
}

‎mybatis-plus-sample-deluxe/src/main/java/com/baomidou/mybatisplus/samples/deluxe/MyLogicSqlInjector.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.baomidou.mybatisplus.core.injector.AbstractMethod;
66
import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
77
import com.baomidou.mybatisplus.core.injector.methods.SelectById;
8+
import com.baomidou.mybatisplus.core.metadata.TableInfo;
89
import com.baomidou.mybatisplus.samples.deluxe.methods.DeleteAll;
910
import com.baomidou.mybatisplus.samples.deluxe.methods.MyInsertAll;
1011
import com.baomidou.mybatisplus.samples.deluxe.methods.MysqlInsertAllBatch;
@@ -23,8 +24,8 @@ public class MyLogicSqlInjector extends DefaultSqlInjector {
2324
* @return
2425
*/
2526
@Override
26-
public List<AbstractMethod> getMethodList(Class<?> mapperClass) {
27-
List<AbstractMethod> methodList = super.getMethodList(mapperClass);
27+
public List<AbstractMethod> getMethodList(Class<?> mapperClass, TableInfo tableInfo) {
28+
List<AbstractMethod> methodList = super.getMethodList(mapperClass, tableInfo);
2829
methodList.add(new DeleteAll());
2930
methodList.add(new MyInsertAll());
3031
methodList.add(new MysqlInsertAllBatch());

0 commit comments

Comments
 (0)