From 03fcddb9713845d3bf57c2bb31d563a34458e549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= Date: Sat, 15 Aug 2020 15:12:07 +0800 Subject: [PATCH] =?UTF-8?q?fix(test):=E5=A4=96=E9=94=AE=E7=BA=A6=E6=9D=9F?= =?UTF-8?q?=E5=BC=95=E5=8F=91=E7=9A=84=E5=BC=82=E5=B8=B8=EF=BC=8C=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E9=9A=8F=E6=9C=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=9A=84?= =?UTF-8?q?=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CommentControllerTest.java | 19 ++++++++++--------- .../blog/controller/LinksControllerTest.java | 5 ++--- .../blog/controller/UserControllerTest.java | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/test/java/cn/celess/blog/controller/CommentControllerTest.java b/src/test/java/cn/celess/blog/controller/CommentControllerTest.java index 2c49e06..dcafc2c 100644 --- a/src/test/java/cn/celess/blog/controller/CommentControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/CommentControllerTest.java @@ -14,7 +14,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import java.util.UUID; +import java.util.List; import static cn.celess.blog.enmu.ResponseEnum.DATA_IS_DELETED; import static cn.celess.blog.enmu.ResponseEnum.SUCCESS; @@ -36,25 +36,26 @@ public class CommentControllerTest extends BaseTest { Article article = articleMapper.getLastestArticle(); CommentReq commentReq = new CommentReq(); commentReq.setPagePath("/article/" + article.getId()); - commentReq.setContent(UUID.randomUUID().toString()); - commentReq.setPid(-1L); - commentReq.setToUserId(-1L); + commentReq.setContent(randomStr()); + List all = userMapper.findAll(); + commentReq.setPid(1L); + commentReq.setToUserId(2l); getMockData(post("/user/comment/create"), userLogin(), commentReq).andDo(result -> { Response response = getResponse(result, COMMENT_MODEL_TYPE); assertEquals(SUCCESS.getCode(), response.getCode()); CommentModel model = response.getResult(); assertNotEquals(0, model.getId()); assertEquals(commentReq.getPid(), model.getPid().longValue()); - assertEquals(-1, model.getPid().longValue()); + assertEquals(1, model.getPid().longValue()); assertEquals(commentReq.getContent(), model.getContent()); assertNotNull(model.getDate()); assertNotNull(model.getFromUser()); - assertNull(model.getToUser()); + assertNotNull(model.getToUser()); }); commentReq.setPagePath("/article/" + article.getId()); - commentReq.setContent(UUID.randomUUID().toString()); + commentReq.setContent(randomStr()); commentReq.setPid(-1L); commentReq.setToUserId(2); getMockData(post("/user/comment/create"), userLogin(), commentReq).andDo(result -> { @@ -75,7 +76,7 @@ public class CommentControllerTest extends BaseTest { // 测试二级回复 Comment latestComment = commentMapper.getLastestComment(); commentReq.setPagePath("/article/" + article.getId()); - commentReq.setContent(UUID.randomUUID().toString()); + commentReq.setContent(randomStr()); commentReq.setPid(latestComment.getId()); getMockData(post("/user/comment/create"), userLogin(), commentReq).andDo(result -> { Response response = getResponse(result, COMMENT_MODEL_TYPE); @@ -120,7 +121,7 @@ public class CommentControllerTest extends BaseTest { Comment comment = commentMapper.getLastestComment(); CommentReq commentReq = new CommentReq(); commentReq.setId(comment.getId()); - commentReq.setContent(UUID.randomUUID().toString()); + commentReq.setContent(randomStr()); // 不合法数据 setResponseId getMockData(put("/user/comment/update"), userLogin(), commentReq).andDo(result -> { Response response = getResponse(result, COMMENT_MODEL_TYPE); diff --git a/src/test/java/cn/celess/blog/controller/LinksControllerTest.java b/src/test/java/cn/celess/blog/controller/LinksControllerTest.java index 8abd274..561ea08 100644 --- a/src/test/java/cn/celess/blog/controller/LinksControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/LinksControllerTest.java @@ -11,7 +11,6 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; -import java.util.UUID; import static cn.celess.blog.enmu.ResponseEnum.*; import static org.junit.Assert.*; @@ -45,7 +44,7 @@ public class LinksControllerTest extends BaseTest { }); // https/http - linkReq.setName(UUID.randomUUID().toString().substring(0, 4)); + linkReq.setName(randomStr(4)); linkReq.setOpen(false); linkReq.setUrl("example.com"); getMockData(post("/admin/links/create"), adminLogin(), linkReq).andDo(result -> { @@ -105,7 +104,7 @@ public class LinksControllerTest extends BaseTest { LinkReq linkReq = new LinkReq(); linkReq.setUrl(latest.getUrl()); linkReq.setOpen(!latest.getOpen()); - linkReq.setName(UUID.randomUUID().toString().substring(0, 4)); + linkReq.setName(randomStr(4)); linkReq.setId(latest.getId()); getMockData(put("/admin/links/update"), adminLogin(), linkReq).andDo(result -> { diff --git a/src/test/java/cn/celess/blog/controller/UserControllerTest.java b/src/test/java/cn/celess/blog/controller/UserControllerTest.java index 0d5fed7..6e8872e 100644 --- a/src/test/java/cn/celess/blog/controller/UserControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/UserControllerTest.java @@ -68,8 +68,8 @@ public class UserControllerTest extends BaseTest { @Test public void updateInfo() throws Exception { - String desc = UUID.randomUUID().toString().substring(0, 4); - String disPlayName = UUID.randomUUID().toString().substring(0, 4); + String desc = randomStr(4); + String disPlayName = randomStr(4); getMockData(put("/user/userInfo/update?desc=" + desc + "&displayName=" + disPlayName), userLogin()).andDo(result -> { Response response = getResponse(result, USER_MODEL_TYPE); assertEquals(SUCCESS.getCode(), response.getCode()); @@ -157,7 +157,7 @@ public class UserControllerTest extends BaseTest { public void multipleDelete() throws Exception { List userList = new ArrayList<>(); for (int i = 0; i < 10; i++) { - String s = UUID.randomUUID().toString(); + String s = randomStr(); String email = s.substring(s.length() - 4) + "@celess.cn"; String pwd = MD5Util.getMD5("123456789"); User user = new User(email, pwd); @@ -202,7 +202,7 @@ public class UserControllerTest extends BaseTest { userReq.setEmailStatus(new Random().nextBoolean()); userReq.setRole("admin"); userReq.setDisplayName(randomStr(4)); - userReq.setEmail(randomStr().substring(0, 5) + "@celess.cn"); + userReq.setEmail(randomStr(5) + "@celess.cn"); getMockData(put("/admin/user"), adminLogin(), userReq).andDo(result -> { Response response = getResponse(result, USER_MODEL_TYPE); assertEquals(SUCCESS.getCode(), response.getCode());