-
diff --git a/web/src/main/webapp/WEB-INF/jsp/table.jsp b/web/src/main/webapp/WEB-INF/jsp/table.jsp
new file mode 100644
index 0000000..5281124
--- /dev/null
+++ b/web/src/main/webapp/WEB-INF/jsp/table.jsp
@@ -0,0 +1,11 @@
+
+
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ page pageEncoding="utf-8"%>
+
+
+
+
+table
+
+
diff --git a/web/src/main/webapp/WEB-INF/jsp/test.jsp b/web/src/main/webapp/WEB-INF/jsp/test.jsp
index ffb5cbe..b6c1117 100644
--- a/web/src/main/webapp/WEB-INF/jsp/test.jsp
+++ b/web/src/main/webapp/WEB-INF/jsp/test.jsp
@@ -7,33 +7,27 @@
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<%@ page pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ page pageEncoding="utf-8" %>
+
+
+
-
-
-
- test
-
-
- test
-
-
- test
-
-
- test
-
-
- test
-
-
- test
-
-
+
+
+
diff --git a/web/src/test/java/SpringTest.java b/web/src/test/java/SpringTest.java
index e354925..efb49f7 100644
--- a/web/src/test/java/SpringTest.java
+++ b/web/src/test/java/SpringTest.java
@@ -14,6 +14,7 @@ import org.hibernate.criterion.Projections;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.tool.hbm2ddl.SchemaExport;
import org.hibernate.tool.schema.TargetType;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -26,6 +27,8 @@ import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.MvcResult;
import org.springframework.test.web.servlet.ResultActions;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.context.WebApplicationContext;
import web.config.AppConfig;
@@ -64,11 +67,7 @@ public class SpringTest {
@Test
public void test() throws Exception {
ResultActions resultActions = this.mockMvc.perform(MockMvcRequestBuilders.get("/menu").param("firstResult","0").param("maxResults","0"));
- MvcResult mvcResult = resultActions.andReturn();
- MockHttpServletResponse response=mvcResult.getResponse();
- log.info(response.getErrorMessage());
- String result = response.getContentAsString();
- log.info("客户端获得反馈数据:\n" + result);
+ resultActions.andDo(MockMvcResultHandlers.print()).andReturn();
}
// @Test
diff --git a/web/src/test/java/web/controller/TestController.java b/web/src/test/java/web/controller/TestController.java
index 9d7f1a8..706c419 100644
--- a/web/src/test/java/web/controller/TestController.java
+++ b/web/src/test/java/web/controller/TestController.java
@@ -2,14 +2,15 @@ package web.controller;
import db.DBAction;
import db.model.TaskModel;
+import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
@Controller
@RequestMapping("/test")
public class TestController extends BaseController
{
-
@Override
public boolean checkAction(DBAction action) {
return true;