Skip to content

Commit b92a196

Browse files
houkohouko
committed
junit User
1 parent e2d9b61 commit b92a196

13 files changed

Lines changed: 93 additions & 16 deletions

File tree

admin/src/test/java/info/xiaomo/admin/test/base/BaseTest.java renamed to admin/src/test/java/info/xiaomo/admin/base/BaseTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package info.xiaomo.admin.test.base;
1+
package info.xiaomo.admin.base;
22

33
import info.xiaomo.admin.AdminMain;
44
import org.junit.runner.RunWith;

‎admin/src/test/java/info/xiaomo/admin/test/AdminControllerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package info.xiaomo.admin.test;
22

3-
import info.xiaomo.admin.test.base.BaseTest;
3+
import info.xiaomo.admin.base.BaseTest;
44
import info.xiaomo.core.model.AdminModel;
55
import info.xiaomo.core.service.AdminUserService;
66
import info.xiaomo.core.untils.MD5;

‎admin/src/test/java/info/xiaomo/admin/test/UserControllerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package info.xiaomo.admin.test;
22

3-
import info.xiaomo.admin.test.base.BaseTest;
3+
import info.xiaomo.admin.base.BaseTest;
44
import info.xiaomo.core.model.UserModel;
55
import info.xiaomo.core.service.UserService;
66
import org.junit.Test;

‎core/src/main/java/info/xiaomo/core/model/AdminModel.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import javax.persistence.Entity;
66
import javax.persistence.Table;
7+
import java.io.Serializable;
78

89
/**
910
* │＼＿＿╭╭╭╭╭＿＿／│
@@ -29,7 +30,7 @@
2930
*/
3031
@Entity
3132
@Table(name = "admin")
32-
public class AdminModel extends BaseModel {
33+
public class AdminModel extends BaseModel implements Serializable {
3334

3435
private String userName;
3536

‎core/src/main/java/info/xiaomo/core/model/BlogModel.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import javax.persistence.Entity;
66
import javax.persistence.Table;
7+
import java.io.Serializable;
78

89
/**
910
* 把今天最好的表现当作明天最新的起点．．～
@@ -21,7 +22,7 @@
2122
**/
2223
@Entity
2324
@Table(name = "blog")
24-
public class BlogModel extends BaseModel {
25+
public class BlogModel extends BaseModel implements Serializable {
2526

2627
private String title;
2728

‎core/src/main/java/info/xiaomo/core/model/TagModel.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import javax.persistence.Entity;
66
import javax.persistence.Table;
7+
import java.io.Serializable;
78

89
/**
910
* 把今天最好的表现当作明天最新的起点．．～
@@ -21,7 +22,7 @@
2122
**/
2223
@Entity
2324
@Table(name = "tag")
24-
public class TagModel extends BaseModel {
25+
public class TagModel extends BaseModel implements Serializable {
2526

2627
private String name;
2728

‎core/src/main/java/info/xiaomo/core/model/UserModel.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import javax.persistence.Entity;
66
import javax.persistence.Table;
7+
import java.io.Serializable;
78

89
/**
910
* 把今天最好的表现当作明天最新的起点．．～
@@ -21,7 +22,7 @@
2122
**/
2223
@Entity
2324
@Table(name = "user")
24-
public class UserModel extends BaseModel {
25+
public class UserModel extends BaseModel implements Serializable{
2526

2627
/**
2728
* 登录用户

‎core/src/main/java/info/xiaomo/core/service/impl/UserServiceImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public UserModel addUser(UserModel model) {
5555

5656
@Override
5757
public UserModel updateUser(UserModel model) throws UserNotFoundException {
58-
UserModel userUpdate = dao.findOne(model.getId());
58+
UserModel userUpdate = dao.findUserByEmail(model.getEmail());
5959
if (userUpdate == null) {
6060
throw new UserNotFoundException();
6161
}
@@ -113,7 +113,7 @@ private String appendEmailContent(UserModel model) {
113113
sb.append("&validateCode=");
114114
sb.append(model.getValidateCode());
115115
sb.append("</a><br/>");
116-
sb.append("<span style='float:right;padding-right:6%'>小莫</span></br>");
116+
sb.append("<span style='float:right;padding-right:4%'>小莫</span></br>");
117117
sb.append("<span style='float:right'>");
118118
sb.append(TimeUtil.getFormatDate());
119119
sb.append("</span></br>");

web/src/test/java/info/xiaomo/admin/test/UserControllerTest.java renamed to web/src/test/java/info/xiaomo/admin/test/BlogTest/BlogControllerTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package info.xiaomo.admin.test;
1+
package info.xiaomo.admin.test.blogTest;
22

33
import info.xiaomo.admin.test.base.BaseTest;
4-
import info.xiaomo.core.model.UserModel;
5-
import info.xiaomo.core.service.UserService;
4+
import info.xiaomo.core.model.BlogModel;
5+
import info.xiaomo.core.service.BlogService;
66
import org.junit.Test;
77
import org.springframework.beans.factory.annotation.Autowired;
88

@@ -28,15 +28,15 @@
2828
* @Description: admin测试
2929
* @Copyright(©) 2015 by xiaomo.
3030
*/
31-
public class UserControllerTest extends BaseTest {
31+
public class BlogControllerTest extends BaseTest {
3232

3333
@Autowired
34-
private UserService service;
34+
private BlogService service;
3535

3636
@Test
3737
public void testFindAll() {
38-
UserModel userModel = service.findUserById(19L);
39-
System.out.println(userModel.getNickName());
38+
BlogModel blogModel = service.findBlogById(19L);
39+
System.out.println(blogModel.getTitle());
4040
}
4141

4242
}

‎web/src/test/java/info/xiaomo/admin/test/UserTest/data/testFindAll.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
[
2+
{
3+
"address": "万轮科技园",
4+
"gender": 1,
5+
"validateStatus": 0,
6+
"validateCode": "da53e6a09e68fa95eb8426e94725adaa",
7+
"updateTime": 1459910791000,
8+
"version": 0,
9+
"imgUrl": "https://ss0.bdstatic.com/5aV1bjqh_Q23odCf/static/superman/img/logo/bd_logo1_31bdc765.png",
10+
"createTime": 1459910791000,
11+
"phone": 15172299114,
12+
"id": 26,
13+
"email": "hupengbest@163.com"
14+
},
15+
{
16+
"address": "迎春小区",
17+
"gender": 1,
18+
"nickName": "xiaomo",
19+
"validateStatus": 1,
20+
"validateCode": "a534fa5b69201825e70fa3ad5e466203",
21+
"updateTime": 1459903138000,
22+
"version": 1,
23+
"imgUrl": "https://ss0.bdstatic.com/5aV1bjqh_Q23odCf/static/superman/img/logo/bd_logo1_31bdc765.png",
24+
"password": "6ee5f87473a31f7a0965d582e152ef88",
25+
"createTime": 1459903005000,
26+
"phone": 18267148206,
27+
"id": 25,
28+
"email": "83387856@qq.com"
29+
}
30+
]

0 commit comments

Comments
 (0)