...
This commit is contained in:
@@ -78,11 +78,14 @@ public class ArticleControllerTest extends BaseTest {
|
|||||||
assertFalse(article.isDeleted());
|
assertFalse(article.isDeleted());
|
||||||
MockHttpServletRequestBuilder delete = MockMvcRequestBuilders.delete("/admin/article/del?articleID=" + article.getId());
|
MockHttpServletRequestBuilder delete = MockMvcRequestBuilders.delete("/admin/article/del?articleID=" + article.getId());
|
||||||
try {
|
try {
|
||||||
|
Article finalArticle = article;
|
||||||
getMockData(delete, adminLogin()).andDo(result -> {
|
getMockData(delete, adminLogin()).andDo(result -> {
|
||||||
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString());
|
Response<Boolean> response = mapper.readValue(result.getResponse().getContentAsString(), new TypeReference<Response<Boolean>>() {
|
||||||
assertEquals(SUCCESS.getCode(), object.getInt(Code));
|
});
|
||||||
|
assertEquals(SUCCESS.getCode(), response.getCode());
|
||||||
// 断言删除成功
|
// 断言删除成功
|
||||||
assertTrue(object.getBoolean(Result));
|
assertTrue(response.getResult());
|
||||||
|
assertTrue(articleMapper.isDeletedById(finalArticle.getId()));
|
||||||
});
|
});
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
@@ -105,27 +108,22 @@ public class ArticleControllerTest extends BaseTest {
|
|||||||
articleReq.setTags(tagList);
|
articleReq.setTags(tagList);
|
||||||
articleReq.setTitle("test-" + article.getTitle());
|
articleReq.setTitle("test-" + article.getTitle());
|
||||||
try {
|
try {
|
||||||
// Admin 权限
|
getMockData(put("/admin/article/update"), adminLogin(),articleReq).andDo(result -> {
|
||||||
mockMvc.perform(put("/admin/article/update")
|
Response<ArticleModel> response = mapper.readValue(result.getResponse().getContentAsString(), new TypeReference<Response<ArticleModel>>() {
|
||||||
.content(JSONObject.fromObject(articleReq).toString())
|
});
|
||||||
.contentType("application/json")
|
assertEquals(SUCCESS.getCode(), response.getCode());
|
||||||
.header("Authorization", adminLogin()))
|
ArticleModel a = response.getResult();
|
||||||
.andExpect(status().isOk())
|
assertEquals(articleReq.getCategory(), a.getCategory());
|
||||||
.andDo(result -> {
|
assertEquals(articleReq.getUrl(), a.getUrl());
|
||||||
JSONObject jsonObject = JSONObject.fromObject(result.getResponse().getContentAsString());
|
assertEquals(articleReq.getMdContent(), a.getMdContent());
|
||||||
assertEquals(SUCCESS.getCode(), jsonObject.getInt(Code));
|
assertEquals(articleReq.getTitle(), a.getTitle());
|
||||||
ArticleModel a = (ArticleModel) JSONObject.toBean(jsonObject.getJSONObject(Result), ArticleModel.class);
|
assertEquals(articleReq.getType(), a.getOriginal());
|
||||||
assertEquals(articleReq.getCategory(), a.getCategory());
|
// Tag
|
||||||
assertEquals(articleReq.getUrl(), a.getUrl());
|
List<Tag> asList = a.getTags();
|
||||||
assertEquals(articleReq.getMdContent(), a.getMdContent());
|
assertEquals(3, asList.size());
|
||||||
assertEquals(articleReq.getTitle(), a.getTitle());
|
assertEquals(articleReq.getOpen(), a.getOpen());
|
||||||
assertEquals(articleReq.getType(), a.getOriginal());
|
assertEquals(articleReq.getId(), a.getId());
|
||||||
// Tag
|
});
|
||||||
List<Tag> asList = a.getTags();
|
|
||||||
assertEquals(3, asList.size());
|
|
||||||
assertEquals(articleReq.getOpen(), a.getOpen());
|
|
||||||
assertEquals(articleReq.getId(), a.getId());
|
|
||||||
});
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user