切换到jackson #10

Merged
xiaohai2271 merged 33 commits from feature-trans2jackson into dev 2020-08-15 16:05:40 +08:00
Showing only changes of commit ffed0d5cd0 - Show all commits

View File

@@ -2,15 +2,15 @@ package cn.celess.blog.controller;
import cn.celess.blog.BaseTest; import cn.celess.blog.BaseTest;
import cn.celess.blog.entity.PartnerSite; import cn.celess.blog.entity.PartnerSite;
import cn.celess.blog.entity.Response;
import cn.celess.blog.entity.model.PageData; import cn.celess.blog.entity.model.PageData;
import cn.celess.blog.entity.request.LinkReq; import cn.celess.blog.entity.request.LinkReq;
import cn.celess.blog.mapper.PartnerMapper; import cn.celess.blog.mapper.PartnerMapper;
import com.github.pagehelper.PageInfo; import com.fasterxml.jackson.core.type.TypeReference;
import net.sf.json.JSONObject;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import java.util.List;
import java.util.UUID; import java.util.UUID;
import static cn.celess.blog.enmu.ResponseEnum.*; import static cn.celess.blog.enmu.ResponseEnum.*;
@@ -21,23 +21,23 @@ public class LinksControllerTest extends BaseTest {
@Autowired @Autowired
PartnerMapper mapper; PartnerMapper mapper;
private static final TypeReference<?> LINK_MODEL_TYPE = new TypeReference<Response<PartnerSite>>() {
};
private static final TypeReference<?> LINK_MODEL_LIST_TYPE = new TypeReference<Response<List<PartnerSite>>>() {
};
private static final TypeReference<?> LINK_MODEL_PAGE_TYPE = new TypeReference<Response<PageData<PartnerSite>>>() {
};
@Test @Test
public void create() throws Exception { public void create() throws Exception {
LinkReq linkReq = new LinkReq(); LinkReq linkReq = new LinkReq();
linkReq.setName(UUID.randomUUID().toString().substring(0, 4)); linkReq.setName(randomStr(4));
linkReq.setOpen(false); linkReq.setOpen(false);
linkReq.setUrl("https://example.com"); linkReq.setUrl("https://example.com");
String token = adminLogin(); getMockData(post("/admin/links/create"), adminLogin(), linkReq).andDo(result -> {
mockMvc.perform( Response<PartnerSite> response = getResponse(result, LINK_MODEL_TYPE);
post("/admin/links/create") assertEquals(SUCCESS.getCode(), response.getCode());
.content(JSONObject.fromObject(linkReq).toString()) PartnerSite site = response.getResult();
.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);
assertNotNull(site.getId()); assertNotNull(site.getId());
assertEquals(linkReq.getName(), site.getName()); assertEquals(linkReq.getName(), site.getName());
assertEquals(linkReq.getUrl(), site.getUrl()); assertEquals(linkReq.getUrl(), site.getUrl());
@@ -48,51 +48,42 @@ public class LinksControllerTest extends BaseTest {
linkReq.setName(UUID.randomUUID().toString().substring(0, 4)); linkReq.setName(UUID.randomUUID().toString().substring(0, 4));
linkReq.setOpen(false); linkReq.setOpen(false);
linkReq.setUrl("example.com"); linkReq.setUrl("example.com");
mockMvc.perform( getMockData(post("/admin/links/create"), adminLogin(), linkReq).andDo(result -> {
post("/admin/links/create") Response<PartnerSite> response = getResponse(result, LINK_MODEL_TYPE);
.content(JSONObject.fromObject(linkReq).toString()) assertEquals(SUCCESS.getCode(), response.getCode());
.header("Authorization", token) PartnerSite site = response.getResult();
.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);
assertEquals("http://example.com", site.getUrl()); assertEquals("http://example.com", site.getUrl());
}); });
// 测试已存在的数据 // 测试已存在的数据
mockMvc.perform( getMockData(post("/admin/links/create"), adminLogin(), linkReq).andDo(result ->
post("/admin/links/create") assertEquals(DATA_HAS_EXIST.getCode(), getResponse(result, STRING_TYPE).getCode())
.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)));
} }
@Test @Test
public void del() throws Exception { public void del() throws Exception {
PartnerSite partnerSite = new PartnerSite(); PartnerSite partnerSite = new PartnerSite();
partnerSite.setName(UUID.randomUUID().toString().substring(0, 4)); partnerSite.setName(randomStr(4));
partnerSite.setOpen(true); partnerSite.setOpen(true);
partnerSite.setDesc(""); partnerSite.setDesc("");
partnerSite.setIconPath(""); partnerSite.setIconPath("");
partnerSite.setUrl("https://www.celess.cn"); partnerSite.setUrl("https://www.celess.cn");
mapper.insert(partnerSite); mapper.insert(partnerSite);
PartnerSite lastest = mapper.getLastest(); PartnerSite latest = mapper.getLastest();
assertNotNull(lastest.getId()); assertNotNull(latest.getId());
String token = adminLogin(); getMockData(delete("/admin/links/del/" + latest.getId()), adminLogin()).andDo(result -> {
mockMvc.perform(delete("/admin/links/del/" + lastest.getId()).header("Authorization", token)).andDo(result -> { Response<Boolean> response = getResponse(result, BOOLEAN_TYPE);
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); assertEquals(SUCCESS.getCode(), response.getCode());
assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertTrue(response.getResult());
assertTrue(object.getBoolean(Result));
}); });
long id = lastest.getId(); long id = latest.getId();
do { do {
id += 1; id += 1;
} while (mapper.existsById(id)); } while (mapper.existsById(id));
System.out.println("删除ID=" + id + "的数据"); System.out.println("删除ID=" + id + "的数据");
mockMvc.perform(delete("/admin/links/del/" + id).header("Authorization", token)).andDo(result -> getMockData(delete("/admin/links/del/" + id), adminLogin()).andDo(result ->
assertEquals(DATA_NOT_EXIST.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)) assertEquals(DATA_NOT_EXIST.getCode(), getResponse(result, STRING_TYPE).getCode())
); );
} }
@@ -100,7 +91,7 @@ public class LinksControllerTest extends BaseTest {
public void update() throws Exception { public void update() throws Exception {
// 增数据 // 增数据
PartnerSite partnerSite = new PartnerSite(); PartnerSite partnerSite = new PartnerSite();
partnerSite.setName(UUID.randomUUID().toString().substring(0, 4)); partnerSite.setName(randomStr(4));
partnerSite.setOpen(true); partnerSite.setOpen(true);
partnerSite.setDesc(""); partnerSite.setDesc("");
partnerSite.setIconPath(""); partnerSite.setIconPath("");
@@ -108,24 +99,19 @@ public class LinksControllerTest extends BaseTest {
partnerSite.setUrl("https://www.celess.cn"); partnerSite.setUrl("https://www.celess.cn");
mapper.insert(partnerSite); mapper.insert(partnerSite);
// 查数据 // 查数据
PartnerSite lastest = mapper.getLastest(); PartnerSite latest = mapper.getLastest();
assertNotNull(lastest.getId()); assertNotNull(latest.getId());
String token = adminLogin();
// 构建请求 // 构建请求
LinkReq linkReq = new LinkReq(); LinkReq linkReq = new LinkReq();
linkReq.setUrl(lastest.getUrl()); linkReq.setUrl(latest.getUrl());
linkReq.setOpen(!lastest.getOpen()); linkReq.setOpen(!latest.getOpen());
linkReq.setName(UUID.randomUUID().toString().substring(0, 4)); linkReq.setName(UUID.randomUUID().toString().substring(0, 4));
linkReq.setId(lastest.getId()); linkReq.setId(latest.getId());
mockMvc.perform(
put("/admin/links/update") getMockData(put("/admin/links/update"), adminLogin(), linkReq).andDo(result -> {
.content(JSONObject.fromObject(linkReq).toString()) Response<PartnerSite> response = getResponse(result, LINK_MODEL_TYPE);
.contentType(MediaType.APPLICATION_JSON) assertEquals(SUCCESS.getCode(), response.getCode());
.header("Authorization", token) PartnerSite site = response.getResult();
).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);
assertNotNull(site.getId()); assertNotNull(site.getId());
assertEquals(linkReq.getId(), site.getId().longValue()); assertEquals(linkReq.getId(), site.getId().longValue());
assertEquals(linkReq.getUrl(), site.getUrl()); assertEquals(linkReq.getUrl(), site.getUrl());
@@ -136,11 +122,10 @@ public class LinksControllerTest extends BaseTest {
@Test @Test
public void allForOpen() throws Exception { public void allForOpen() throws Exception {
mockMvc.perform(get("/links")).andDo(result -> { getMockData(get("/links")).andDo(result -> {
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); Response<List<PartnerSite>> response = getResponse(result, LINK_MODEL_LIST_TYPE);
assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertEquals(SUCCESS.getCode(), response.getCode());
object.getJSONArray(Result).forEach(o -> { response.getResult().forEach(site -> {
PartnerSite site = (PartnerSite) JSONObject.toBean(JSONObject.fromObject(o), PartnerSite.class);
assertNotNull(site.getUrl()); assertNotNull(site.getUrl());
assertNull(site.getOpen()); assertNull(site.getOpen());
assertNotNull(site.getName()); assertNotNull(site.getName());
@@ -150,14 +135,13 @@ public class LinksControllerTest extends BaseTest {
@Test @Test
public void all() throws Exception { public void all() throws Exception {
mockMvc.perform(get("/admin/links?page=1&count=10").header("Authorization", adminLogin())).andDo(result -> { getMockData(get("/admin/links?page=1&count=10"), adminLogin()).andDo(result -> {
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); Response<PageData<PartnerSite>> response = getResponse(result, LINK_MODEL_PAGE_TYPE);
assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertEquals(SUCCESS.getCode(), response.getCode());
PageData<PartnerSite> pageData = (PageData<PartnerSite>) JSONObject.toBean(object.getJSONObject(Result), PageData.class); PageData<PartnerSite> pageData = response.getResult();
assertEquals(1, pageData.getPageNum()); assertEquals(1, pageData.getPageNum());
assertEquals(10, pageData.getPageSize()); assertEquals(10, pageData.getPageSize());
for (Object o : pageData.getList()) { for (PartnerSite site : pageData.getList()) {
PartnerSite site = (PartnerSite) JSONObject.toBean(JSONObject.fromObject(o), PartnerSite.class);
assertNotNull(site.getUrl()); assertNotNull(site.getUrl());
assertNotNull(site.getName()); assertNotNull(site.getName());
assertNotNull(site.getOpen()); assertNotNull(site.getOpen());
@@ -170,14 +154,10 @@ public class LinksControllerTest extends BaseTest {
public void apply() throws Exception { public void apply() throws Exception {
long l = System.currentTimeMillis(); long l = System.currentTimeMillis();
String url = "https://www.example.com"; String url = "https://www.example.com";
mockMvc.perform(post("/apply?name=小海博客Api测试请忽略&url=" + url)).andDo(result -> { getMockData(post("/apply?name=小海博客Api测试请忽略&url=" + url)).andDo(result -> assertEquals(SUCCESS.getCode(), getResponse(result, OBJECT_TYPE).getCode()));
assertEquals(SUCCESS.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code));
});
System.out.println("耗时:" + (System.currentTimeMillis() - l) / 1000 + "s"); System.out.println("耗时:" + (System.currentTimeMillis() - l) / 1000 + "s");
url = "xxxxxxxxxm"; url = "xxx";
mockMvc.perform(post("/apply?name=小海博客Api测试请忽略&url=" + url)).andDo(result -> { getMockData(post("/apply?name=小海博客Api测试请忽略&url=" + url)).andDo(result -> assertEquals(PARAMETERS_URL_ERROR.getCode(), getResponse(result, OBJECT_TYPE).getCode()));
assertEquals(PARAMETERS_URL_ERROR.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code));
});
} }
} }