Skip to content

Commit d6d6606

Browse files
author
zhangrongfan
committed
Improve testing entity
1 parent 35129ab commit d6d6606

File tree

5 files changed

+23
-30
lines changed

5 files changed

+23
-30
lines changed

‎mybatis-boost-core/src/main/java/cn/mybatisboost/support/Property.java‎

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

3-
import java.util.NoSuchElementException;
43
import java.util.Objects;
54
import java.util.function.Consumer;
65
import java.util.function.Supplier;
@@ -32,9 +31,6 @@ public static <T> Property<T> ofNullable(T value) {
3231
}
3332

3433
public T get() {
35-
if (value == null) {
36-
throw new NoSuchElementException("No value present");
37-
}
3834
return value;
3935
}
4036

‎mybatis-boost-test/src/main/java/cn/mybatisboost/test/Project.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ public class Project {
1515
public Project() {
1616
}
1717

18-
public Project(String groupId, String artifactId, String license, String scm, String developer, Property<Website> website) {
18+
public Project(String groupId, String artifactId, String license, String scm, String developer, Website website) {
1919
this.groupId = groupId;
2020
this.artifactId = artifactId;
2121
this.license = license;
2222
this.scm = scm;
2323
this.developer = developer;
24-
this.website = website;
24+
this.website = Property.ofNullable(website);
2525
}
2626

2727
public Integer getId() {
@@ -79,12 +79,12 @@ public Project setDeveloper(String developer) {
7979
}
8080

8181

82-
public Property<Website> getWebsite() {
83-
return website;
82+
public Website getWebsite() {
83+
return website.get();
8484
}
8585

86-
public void setWebsite(Property<Website> website) {
87-
this.website = website;
86+
public void setWebsite(Website website) {
87+
this.website = Property.ofNullable(website);
8888
}
8989

9090
@Override
@@ -96,7 +96,7 @@ public String toString() {
9696
", license='" + license + '\'' +
9797
", scm='" + scm + '\'' +
9898
", developer='" + developer + '\'' +
99-
", website=" + website +
99+
", website=" + website.get() +
100100
'}';
101101
}
102102
}

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

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

3-
import cn.mybatisboost.support.Property;
43
import cn.mybatisboost.util.SafeProperty;
54
import org.apache.ibatis.session.RowBounds;
65
import org.junit.After;
@@ -126,7 +125,7 @@ public void selectNullable() {
126125
public void insert() {
127126
try {
128127
assertEquals(1, mapper.insert(new Project(null, "mybatis-boost",
129-
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", Property.empty())));
128+
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", null)));
130129
fail();
131130
} catch (Exception ignored) {
132131
// normally, exception would happen because "group_id" column is declared NOT NULL
@@ -138,7 +137,7 @@ public void batchInsert() {
138137
try {
139138
assertEquals(1, mapper.batchInsert(Collections.singletonList(
140139
new Project(null, "mybatis-boost",
141-
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", Property.empty()))));
140+
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", null))));
142141
fail();
143142
} catch (Exception ignored) {
144143
// normally, exception would happen because "group_id" column is declared NOT NULL
@@ -148,7 +147,7 @@ public void batchInsert() {
148147
@Test
149148
public void insertSelective() {
150149
assertEquals(1, mapper.insertSelective(new Project("cn.mybatisboost", "mybatis-boost",
151-
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", Property.empty())));
150+
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", null)));
152151
jdbcTemplate.query("select * from project", resultSet -> {
153152
assertEquals(1, resultSet.getRow());
154153
});
@@ -158,7 +157,7 @@ public void insertSelective() {
158157
public void batchInsertSelective() {
159158
assertEquals(1, mapper.batchInsertSelective(Collections.singletonList(
160159
new Project("cn.mybatisboost", "mybatis-boost",
161-
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", Property.empty()))));
160+
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", null))));
162161
jdbcTemplate.query("select * from project", resultSet -> {
163162
assertEquals(1, resultSet.getRow());
164163
});

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

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

3-
import cn.mybatisboost.support.Property;
43
import org.junit.After;
54
import org.junit.Test;
65
import org.junit.runner.RunWith;
@@ -61,7 +60,7 @@ public void selectOneFromT() {
6160
public void insertSome() {
6261
assertEquals(1, mapper.insertSome(Collections.singletonList(new Project(
6362
"cn.mybatisboost", "mybatis-boost",
64-
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", Property.empty()))));
63+
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", null))));
6564
jdbcTemplate.query("select * from project", resultSet -> {
6665
assertEquals(1, resultSet.getRow());
6766
assertEquals("cn.mybatisboost", resultSet.getString("group_id"));
@@ -72,7 +71,7 @@ public void insertSome() {
7271
@Test
7372
public void insertOne1() {
7473
assertEquals(1, mapper.insertOne1(new Project("cn.mybatisboost", "mybatis-boost",
75-
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", Property.empty())));
74+
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", null)));
7675
jdbcTemplate.query("select * from project", resultSet -> {
7776
assertEquals(1, resultSet.getRow());
7877
assertEquals("cn.mybatisboost", resultSet.getString("group_id"));
@@ -83,7 +82,7 @@ public void insertOne1() {
8382
@Test
8483
public void insertOne2() {
8584
assertEquals(1, mapper.insertOne2(new Project("cn.mybatisboost", "mybatis-boost",
86-
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", Property.empty())));
85+
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", null)));
8786
jdbcTemplate.query("select * from project", resultSet -> {
8887
assertEquals(1, resultSet.getRow());
8988
assertEquals("cn.mybatisboost", resultSet.getString("group_id"));
@@ -106,7 +105,7 @@ public void updateGroupId() {
106105
public void updateNotGroupId() {
107106
jdbcTemplate.execute("insert into project (group_id) values ('cn.mybatisboost1')");
108107
assertEquals(1, mapper.updateNotGroupId(new Project("cn.mybatisboost", "mybatis-boost",
109-
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", Property.empty())));
108+
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", null)));
110109
jdbcTemplate.query("select * from project", resultSet -> {
111110
assertEquals(1, resultSet.getRow());
112111
assertEquals("cn.mybatisboost1", resultSet.getString("group_id"));
@@ -121,7 +120,7 @@ public void updateNotGroupId() {
121120
public void updateAll() {
122121
jdbcTemplate.execute("insert into project (group_id) values ('cn.mybatisboost1')");
123122
assertEquals(1, mapper.updateAll(new Project("cn.mybatisboost", "mybatis-boost",
124-
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", Property.empty())));
123+
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan", null)));
125124
jdbcTemplate.query("select * from project", resultSet -> {
126125
assertEquals(1, resultSet.getRow());
127126
assertEquals("cn.mybatisboost", resultSet.getString("group_id"));

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

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

3-
import cn.mybatisboost.support.Property;
43
import com.fasterxml.jackson.core.JsonProcessingException;
54
import com.fasterxml.jackson.databind.ObjectMapper;
65
import org.junit.After;
@@ -34,11 +33,11 @@ public void tearDown() {
3433
public void testSave() {
3534
Project project = new Project("cn.mybatisboost", "mybatis-boost",
3635
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan",
37-
Property.of(new Website("HTTPS", "mybatisboost.cn", (short) 80)));
36+
new Website("HTTPS", "mybatisboost.cn", (short) 80));
3837
mapper.insert(project);
3938
jdbcTemplate.query("select * from project", resultSet -> {
4039
try {
41-
assertEquals(objectMapper.writeValueAsString(project.getWebsite().get()), resultSet.getString("website"));
40+
assertEquals(objectMapper.writeValueAsString(project.getWebsite()), resultSet.getString("website"));
4241
} catch (JsonProcessingException e) {
4342
fail();
4443
}
@@ -49,12 +48,12 @@ public void testSave() {
4948
public void testQuery() throws Exception {
5049
Project project = new Project("cn.mybatisboost", "mybatis-boost",
5150
"MIT", "https://github.com/zhang-rf/mybatis-boost", "zhangrongfan",
52-
Property.of(new Website("HTTPS", "mybatisboost.cn", (short) 80)));
53-
jdbcTemplate.execute("insert into project (id, group_id, website) values (999, 'cn.mybatisboost', '" + objectMapper.writeValueAsString(project.getWebsite().get()) + "')");
51+
new Website("HTTPS", "mybatisboost.cn", (short) 80));
52+
jdbcTemplate.execute("insert into project (id, group_id, website) values (999, 'cn.mybatisboost', '" + objectMapper.writeValueAsString(project.getWebsite()) + "')");
5453
project = mapper.selectById(999);
5554
assertNotNull(project);
56-
assertEquals("HTTPS", project.getWebsite().get().getProtocol());
57-
assertEquals("mybatisboost.cn", project.getWebsite().get().getHost());
58-
assertEquals(80, project.getWebsite().get().getPort());
55+
assertEquals("HTTPS", project.getWebsite().getProtocol());
56+
assertEquals("mybatisboost.cn", project.getWebsite().getHost());
57+
assertEquals(80, project.getWebsite().getPort());
5958
}
6059
}

0 commit comments

Comments
 (0)