zheng/blog-backEnd
1
0
Fork 0
Code Issues 5 Pull Requests 12 Actions Packages Projects Releases Wiki Activity

切换到jackson #10

Merged
xiaohai2271 merged 33 commits from feature-trans2jackson into dev 2020-08-15 16:05:40 +08:00
Conversation 0 Commits 33 Files Changed 34 +5 -10
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bdcfaef5f8 - Show all commits

15
src/test/java/cn/celess/blog/filter/MultipleSubmitFilter.java
View File

@@ -2,16 +2,11 @@ package cn.celess.blog.filter;
import cn.celess.blog.BaseTest; import cn.celess.blog.BaseTest;
import cn.celess.blog.enmu.ResponseEnum; import cn.celess.blog.enmu.ResponseEnum;
import net.sf.json.JSONObject; import cn.celess.blog.entity.Response;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockHttpSession; import org.springframework.mock.web.MockHttpSession;
import org.springframework.test.web.servlet.MvcResult;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
import javax.servlet.http.Cookie;
/** /**
* @Author: 小海 * @Author: 小海
@@ -31,11 +26,11 @@ public class MultipleSubmitFilter extends BaseTest {
private void sendRequest(ResponseEnum expectResponse, String... msg) throws Exception { private void sendRequest(ResponseEnum expectResponse, String... msg) throws Exception {
mockMvc.perform(MockMvcRequestBuilders.get("/counts").session(session)).andDo(result -> { getMockData(MockMvcRequestBuilders.get("/counts").session(session)).andDo(result -> {
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); Response<Object> response = getResponse(result);
Assert.assertEquals(expectResponse.getCode(), object.getInt(Code)); Assert.assertEquals(expectResponse.getCode(), response.getCode());
if (msg.length != 0) { if (msg.length != 0) {
Assert.assertEquals(msg[0], object.getString("msg")); Assert.assertEquals(msg[0], response.getMsg());
} }
}); });
} }