From bdcfaef5f8e62a640ae92c7f234e2a2617be0e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= Date: Sat, 15 Aug 2020 12:13:08 +0800 Subject: [PATCH] =?UTF-8?q?refactor(Test):=20=E9=87=8D=E6=9E=84=20Multiple?= =?UTF-8?q?SubmitFilter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../celess/blog/filter/MultipleSubmitFilter.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/test/java/cn/celess/blog/filter/MultipleSubmitFilter.java b/src/test/java/cn/celess/blog/filter/MultipleSubmitFilter.java index 5eca79b..108550a 100644 --- a/src/test/java/cn/celess/blog/filter/MultipleSubmitFilter.java +++ b/src/test/java/cn/celess/blog/filter/MultipleSubmitFilter.java @@ -2,16 +2,11 @@ package cn.celess.blog.filter; import cn.celess.blog.BaseTest; import cn.celess.blog.enmu.ResponseEnum; -import net.sf.json.JSONObject; +import cn.celess.blog.entity.Response; import org.junit.Assert; import org.junit.Test; -import org.springframework.mock.web.MockHttpServletResponse; 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.result.MockMvcResultHandlers; - -import javax.servlet.http.Cookie; /** * @Author: 小海 @@ -31,11 +26,11 @@ public class MultipleSubmitFilter extends BaseTest { private void sendRequest(ResponseEnum expectResponse, String... msg) throws Exception { - mockMvc.perform(MockMvcRequestBuilders.get("/counts").session(session)).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - Assert.assertEquals(expectResponse.getCode(), object.getInt(Code)); + getMockData(MockMvcRequestBuilders.get("/counts").session(session)).andDo(result -> { + Response response = getResponse(result); + Assert.assertEquals(expectResponse.getCode(), response.getCode()); if (msg.length != 0) { - Assert.assertEquals(msg[0], object.getString("msg")); + Assert.assertEquals(msg[0], response.getMsg()); } }); }