Skip to content

Commit 302abeb

Browse files
author
zhangrongfan
committed
Fix NPE
1 parent a9b68a4 commit 302abeb

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

‎mybatis-boost-test/src/test/java/cn/mybatisboost/test/CrudMapperTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package cn.mybatisboost.test;
22

3+
import cn.mybatisboost.support.Property;
34
import cn.mybatisboost.util.SafeProperty;
45
import org.apache.ibatis.session.RowBounds;
56
import org.junit.After;
@@ -125,7 +126,7 @@ public void selectNullable() {
125126
public void insert() {
126127
try {
127128
assertEquals(1, mapper.insert(new Project(null, "mybatis-boost",
128-
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", null)));
129+
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", Property.empty())));
129130
fail();
130131
} catch (Exception ignored) {
131132
// normally, exception would happen because "group_id" column is declared NOT NULL
@@ -137,7 +138,7 @@ public void batchInsert() {
137138
try {
138139
assertEquals(1, mapper.batchInsert(Collections.singletonList(
139140
new Project(null, "mybatis-boost",
140-
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", null))));
141+
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", Property.empty()))));
141142
fail();
142143
} catch (Exception ignored) {
143144
// normally, exception would happen because "group_id" column is declared NOT NULL
@@ -147,7 +148,7 @@ public void batchInsert() {
147148
@Test
148149
public void insertSelective() {
149150
assertEquals(1, mapper.insertSelective(new Project("cn.mybatisboost", "mybatis-boost",
150-
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", null)));
151+
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", Property.empty())));
151152
jdbcTemplate.query("select * from project", resultSet -> {
152153
assertEquals(1, resultSet.getRow());
153154
});
@@ -157,7 +158,7 @@ public void insertSelective() {
157158
public void batchInsertSelective() {
158159
assertEquals(1, mapper.batchInsertSelective(Collections.singletonList(
159160
new Project("cn.mybatisboost", "mybatis-boost",
160-
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", null))));
161+
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", Property.empty()))));
161162
jdbcTemplate.query("select * from project", resultSet -> {
162163
assertEquals(1, resultSet.getRow());
163164
});

‎mybatis-boost-test/src/test/java/cn/mybatisboost/test/EnhancementTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package cn.mybatisboost.test;
22

3+
import cn.mybatisboost.support.Property;
34
import org.junit.After;
45
import org.junit.Test;
56
import org.junit.runner.RunWith;
@@ -60,7 +61,7 @@ public void selectOneFromT() {
6061
public void insertSome() {
6162
assertEquals(1, mapper.insertSome(Collections.singletonList(new Project(
6263
"cn.mybatisboost", "mybatis-boost",
63-
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", null))));
64+
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", Property.empty()))));
6465
jdbcTemplate.query("select * from project", resultSet -> {
6566
assertEquals(1, resultSet.getRow());
6667
assertEquals("cn.mybatisboost", resultSet.getString("group_id"));
@@ -71,7 +72,7 @@ public void insertSome() {
7172
@Test
7273
public void insertOne1() {
7374
assertEquals(1, mapper.insertOne1(new Project("cn.mybatisboost", "mybatis-boost",
74-
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", null)));
75+
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", Property.empty())));
7576
jdbcTemplate.query("select * from project", resultSet -> {
7677
assertEquals(1, resultSet.getRow());
7778
assertEquals("cn.mybatisboost", resultSet.getString("group_id"));
@@ -82,7 +83,7 @@ public void insertOne1() {
8283
@Test
8384
public void insertOne2() {
8485
assertEquals(1, mapper.insertOne2(new Project("cn.mybatisboost", "mybatis-boost",
85-
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", null)));
86+
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", Property.empty())));
8687
jdbcTemplate.query("select * from project", resultSet -> {
8788
assertEquals(1, resultSet.getRow());
8889
assertEquals("cn.mybatisboost", resultSet.getString("group_id"));
@@ -105,7 +106,7 @@ public void updateGroupId() {
105106
public void updateNotGroupId() {
106107
jdbcTemplate.execute("insert into project (group_id) values ('cn.mybatisboost1')");
107108
assertEquals(1, mapper.updateNotGroupId(new Project("cn.mybatisboost", "mybatis-boost",
108-
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", null)));
109+
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", Property.empty())));
109110
jdbcTemplate.query("select * from project", resultSet -> {
110111
assertEquals(1, resultSet.getRow());
111112
assertEquals("cn.mybatisboost1", resultSet.getString("group_id"));
@@ -120,7 +121,7 @@ public void updateNotGroupId() {
120121
public void updateAll() {
121122
jdbcTemplate.execute("insert into project (group_id) values ('cn.mybatisboost1')");
122123
assertEquals(1, mapper.updateAll(new Project("cn.mybatisboost", "mybatis-boost",
123-
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", null)));
124+
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", Property.empty())));
124125
jdbcTemplate.query("select * from project", resultSet -> {
125126
assertEquals(1, resultSet.getRow());
126127
assertEquals("cn.mybatisboost", resultSet.getString("group_id"));

0 commit comments

Comments
 (0)