切换到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 c9f91bf2c1 - Show all commits

View File

@@ -32,7 +32,7 @@ public class LinksControllerTest extends BaseTest {
LinkReq linkReq = new LinkReq(); LinkReq linkReq = new LinkReq();
linkReq.setName(randomStr(4)); linkReq.setName(randomStr(4));
linkReq.setOpen(false); linkReq.setOpen(false);
linkReq.setUrl("https://example.com"); linkReq.setUrl("https://" + randomStr(4) + "example.com");
getMockData(post("/admin/links/create"), adminLogin(), linkReq).andDo(result -> { getMockData(post("/admin/links/create"), adminLogin(), linkReq).andDo(result -> {
Response<PartnerSite> response = getResponse(result, LINK_MODEL_TYPE); Response<PartnerSite> response = getResponse(result, LINK_MODEL_TYPE);
assertEquals(SUCCESS.getCode(), response.getCode()); assertEquals(SUCCESS.getCode(), response.getCode());
@@ -46,12 +46,12 @@ public class LinksControllerTest extends BaseTest {
// https/http // https/http
linkReq.setName(randomStr(4)); linkReq.setName(randomStr(4));
linkReq.setOpen(false); linkReq.setOpen(false);
linkReq.setUrl("example.com"); linkReq.setUrl(randomStr(4) + ".example.com");
getMockData(post("/admin/links/create"), adminLogin(), linkReq).andDo(result -> { getMockData(post("/admin/links/create"), adminLogin(), linkReq).andDo(result -> {
Response<PartnerSite> response = getResponse(result, LINK_MODEL_TYPE); Response<PartnerSite> response = getResponse(result, LINK_MODEL_TYPE);
assertEquals(SUCCESS.getCode(), response.getCode()); assertEquals(SUCCESS.getCode(), response.getCode());
PartnerSite site = response.getResult(); PartnerSite site = response.getResult();
assertEquals("http://example.com", site.getUrl()); assertEquals("http://" + linkReq.getUrl(), site.getUrl());
}); });
// 测试已存在的数据 // 测试已存在的数据
@@ -95,7 +95,7 @@ public class LinksControllerTest extends BaseTest {
partnerSite.setDesc(""); partnerSite.setDesc("");
partnerSite.setIconPath(""); partnerSite.setIconPath("");
partnerSite.setDelete(false); partnerSite.setDelete(false);
partnerSite.setUrl("https://www.celess.cn"); partnerSite.setUrl("https://" + randomStr(5) + ".celess.cn");
mapper.insert(partnerSite); mapper.insert(partnerSite);
// 查数据 // 查数据
PartnerSite latest = mapper.getLastest(); PartnerSite latest = mapper.getLastest();