From ffed0d5cd04a7eb450f98c82d47c8613f86ccb81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= Date: Fri, 24 Jul 2020 21:08:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4LinkController=E7=9A=84?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../blog/controller/LinksControllerTest.java | 128 ++++++++---------- 1 file changed, 54 insertions(+), 74 deletions(-) diff --git a/src/test/java/cn/celess/blog/controller/LinksControllerTest.java b/src/test/java/cn/celess/blog/controller/LinksControllerTest.java index b96c49b..e75759c 100644 --- a/src/test/java/cn/celess/blog/controller/LinksControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/LinksControllerTest.java @@ -2,15 +2,15 @@ package cn.celess.blog.controller; import cn.celess.blog.BaseTest; import cn.celess.blog.entity.PartnerSite; +import cn.celess.blog.entity.Response; import cn.celess.blog.entity.model.PageData; import cn.celess.blog.entity.request.LinkReq; import cn.celess.blog.mapper.PartnerMapper; -import com.github.pagehelper.PageInfo; -import net.sf.json.JSONObject; +import com.fasterxml.jackson.core.type.TypeReference; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; +import java.util.List; import java.util.UUID; import static cn.celess.blog.enmu.ResponseEnum.*; @@ -21,23 +21,23 @@ public class LinksControllerTest extends BaseTest { @Autowired PartnerMapper mapper; + private static final TypeReference LINK_MODEL_TYPE = new TypeReference>() { + }; + private static final TypeReference LINK_MODEL_LIST_TYPE = new TypeReference>>() { + }; + private static final TypeReference LINK_MODEL_PAGE_TYPE = new TypeReference>>() { + }; @Test public void create() throws Exception { LinkReq linkReq = new LinkReq(); - linkReq.setName(UUID.randomUUID().toString().substring(0, 4)); + linkReq.setName(randomStr(4)); linkReq.setOpen(false); linkReq.setUrl("https://example.com"); - String token = adminLogin(); - mockMvc.perform( - post("/admin/links/create") - .content(JSONObject.fromObject(linkReq).toString()) - .header("Authorization", token) - .contentType(MediaType.APPLICATION_JSON) - ).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - PartnerSite site = (PartnerSite) JSONObject.toBean(object.getJSONObject(Result), PartnerSite.class); + getMockData(post("/admin/links/create"), adminLogin(), linkReq).andDo(result -> { + Response response = getResponse(result, LINK_MODEL_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + PartnerSite site = response.getResult(); assertNotNull(site.getId()); assertEquals(linkReq.getName(), site.getName()); assertEquals(linkReq.getUrl(), site.getUrl()); @@ -48,51 +48,42 @@ public class LinksControllerTest extends BaseTest { linkReq.setName(UUID.randomUUID().toString().substring(0, 4)); linkReq.setOpen(false); linkReq.setUrl("example.com"); - mockMvc.perform( - post("/admin/links/create") - .content(JSONObject.fromObject(linkReq).toString()) - .header("Authorization", token) - .contentType("application/json") - ).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - PartnerSite site = (PartnerSite) JSONObject.toBean(object.getJSONObject(Result), PartnerSite.class); + getMockData(post("/admin/links/create"), adminLogin(), linkReq).andDo(result -> { + Response response = getResponse(result, LINK_MODEL_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + PartnerSite site = response.getResult(); assertEquals("http://example.com", site.getUrl()); }); // 测试已存在的数据 - mockMvc.perform( - post("/admin/links/create") - .content(JSONObject.fromObject(linkReq).toString()) - .header("Authorization", token) - .contentType("application/json") - ).andDo(result -> assertEquals(DATA_HAS_EXIST.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))); + getMockData(post("/admin/links/create"), adminLogin(), linkReq).andDo(result -> + assertEquals(DATA_HAS_EXIST.getCode(), getResponse(result, STRING_TYPE).getCode()) + ); } @Test public void del() throws Exception { PartnerSite partnerSite = new PartnerSite(); - partnerSite.setName(UUID.randomUUID().toString().substring(0, 4)); + partnerSite.setName(randomStr(4)); partnerSite.setOpen(true); partnerSite.setDesc(""); partnerSite.setIconPath(""); partnerSite.setUrl("https://www.celess.cn"); mapper.insert(partnerSite); - PartnerSite lastest = mapper.getLastest(); - assertNotNull(lastest.getId()); - String token = adminLogin(); - mockMvc.perform(delete("/admin/links/del/" + lastest.getId()).header("Authorization", token)).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - assertTrue(object.getBoolean(Result)); + PartnerSite latest = mapper.getLastest(); + assertNotNull(latest.getId()); + getMockData(delete("/admin/links/del/" + latest.getId()), adminLogin()).andDo(result -> { + Response response = getResponse(result, BOOLEAN_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + assertTrue(response.getResult()); }); - long id = lastest.getId(); + long id = latest.getId(); do { id += 1; } while (mapper.existsById(id)); System.out.println("删除ID=" + id + "的数据"); - mockMvc.perform(delete("/admin/links/del/" + id).header("Authorization", token)).andDo(result -> - assertEquals(DATA_NOT_EXIST.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)) + getMockData(delete("/admin/links/del/" + id), adminLogin()).andDo(result -> + assertEquals(DATA_NOT_EXIST.getCode(), getResponse(result, STRING_TYPE).getCode()) ); } @@ -100,7 +91,7 @@ public class LinksControllerTest extends BaseTest { public void update() throws Exception { // 增数据 PartnerSite partnerSite = new PartnerSite(); - partnerSite.setName(UUID.randomUUID().toString().substring(0, 4)); + partnerSite.setName(randomStr(4)); partnerSite.setOpen(true); partnerSite.setDesc(""); partnerSite.setIconPath(""); @@ -108,24 +99,19 @@ public class LinksControllerTest extends BaseTest { partnerSite.setUrl("https://www.celess.cn"); mapper.insert(partnerSite); // 查数据 - PartnerSite lastest = mapper.getLastest(); - assertNotNull(lastest.getId()); - String token = adminLogin(); + PartnerSite latest = mapper.getLastest(); + assertNotNull(latest.getId()); // 构建请求 LinkReq linkReq = new LinkReq(); - linkReq.setUrl(lastest.getUrl()); - linkReq.setOpen(!lastest.getOpen()); + linkReq.setUrl(latest.getUrl()); + linkReq.setOpen(!latest.getOpen()); linkReq.setName(UUID.randomUUID().toString().substring(0, 4)); - linkReq.setId(lastest.getId()); - mockMvc.perform( - put("/admin/links/update") - .content(JSONObject.fromObject(linkReq).toString()) - .contentType(MediaType.APPLICATION_JSON) - .header("Authorization", token) - ).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - PartnerSite site = (PartnerSite) JSONObject.toBean(object.getJSONObject(Result), PartnerSite.class); + linkReq.setId(latest.getId()); + + getMockData(put("/admin/links/update"), adminLogin(), linkReq).andDo(result -> { + Response response = getResponse(result, LINK_MODEL_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + PartnerSite site = response.getResult(); assertNotNull(site.getId()); assertEquals(linkReq.getId(), site.getId().longValue()); assertEquals(linkReq.getUrl(), site.getUrl()); @@ -136,11 +122,10 @@ public class LinksControllerTest extends BaseTest { @Test public void allForOpen() throws Exception { - mockMvc.perform(get("/links")).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - object.getJSONArray(Result).forEach(o -> { - PartnerSite site = (PartnerSite) JSONObject.toBean(JSONObject.fromObject(o), PartnerSite.class); + getMockData(get("/links")).andDo(result -> { + Response> response = getResponse(result, LINK_MODEL_LIST_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + response.getResult().forEach(site -> { assertNotNull(site.getUrl()); assertNull(site.getOpen()); assertNotNull(site.getName()); @@ -150,14 +135,13 @@ public class LinksControllerTest extends BaseTest { @Test public void all() throws Exception { - mockMvc.perform(get("/admin/links?page=1&count=10").header("Authorization", adminLogin())).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - PageData pageData = (PageData) JSONObject.toBean(object.getJSONObject(Result), PageData.class); + getMockData(get("/admin/links?page=1&count=10"), adminLogin()).andDo(result -> { + Response> response = getResponse(result, LINK_MODEL_PAGE_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + PageData pageData = response.getResult(); assertEquals(1, pageData.getPageNum()); assertEquals(10, pageData.getPageSize()); - for (Object o : pageData.getList()) { - PartnerSite site = (PartnerSite) JSONObject.toBean(JSONObject.fromObject(o), PartnerSite.class); + for (PartnerSite site : pageData.getList()) { assertNotNull(site.getUrl()); assertNotNull(site.getName()); assertNotNull(site.getOpen()); @@ -170,14 +154,10 @@ public class LinksControllerTest extends BaseTest { public void apply() throws Exception { long l = System.currentTimeMillis(); String url = "https://www.example.com"; - mockMvc.perform(post("/apply?name=小海博客Api测试，请忽略&url=" + url)).andDo(result -> { - assertEquals(SUCCESS.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)); - }); + getMockData(post("/apply?name=小海博客Api测试，请忽略&url=" + url)).andDo(result -> assertEquals(SUCCESS.getCode(), getResponse(result, OBJECT_TYPE).getCode())); System.out.println("耗时：" + (System.currentTimeMillis() - l) / 1000 + "s"); - url = "xxxxxxxxxm"; - mockMvc.perform(post("/apply?name=小海博客Api测试，请忽略&url=" + url)).andDo(result -> { - assertEquals(PARAMETERS_URL_ERROR.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)); - }); + url = "xxx"; + getMockData(post("/apply?name=小海博客Api测试，请忽略&url=" + url)).andDo(result -> assertEquals(PARAMETERS_URL_ERROR.getCode(), getResponse(result, OBJECT_TYPE).getCode())); } } \ No newline at end of file