Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/controller/PackingControllerTests.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/controller/PackingControllerTests.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/controller/PackingControllerTests.java (revision 24349) @@ -0,0 +1,104 @@ +package test.forgon.disinfectsystem.packing.controller; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; + +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.setup.DefaultMockMvcBuilder; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +import test.forgon.disinfectsystem.AbstractCSSDTest; + +import com.forgon.tools.json.JSONUtil; + +/** + * @author Terry Kwan 2018年9月23日 下午11:20:12 + * + * + */ +public class PackingControllerTests extends AbstractCSSDTest { + + + private MockMvc mockMvc; + + /** + * 读取spring3 MVC配置文件 + */ + @BeforeClass + public void setUp() { + + DefaultMockMvcBuilder builder = MockMvcBuilders.webAppContextSetup(this.wac); + mockMvc = builder.build(); + + } + + /** + * Test method for {@link com.forgon.disinfectsystem.packing.controller.PackingController#getErrorAndDamageCount()}. + */ + @Test + public void testGetErrorAndDamageCount() { + + try { + + ResultActions resultActions = mockMvc + .perform( + get("/disinfectSystem/packingController/getErrorAndDamageCount")) + .andDo(print()).andExpect(status().isOk()); + + MvcResult result = resultActions.andReturn(); + String contentAsString = result.getResponse().getContentAsString(); + + JSONObject jsonObj = JSONUtil.fromJson(contentAsString, + JSONObject.class); + + assertEquals(true, jsonObj.getBoolean("success")); + + assertEquals(0, jsonObj.getInt("errorCount")); + assertEquals(0, jsonObj.getInt("damageCount")); + + } catch (Exception e) { + e.printStackTrace(); + } + + } + + /** + * Test method for {@link com.forgon.disinfectsystem.packing.controller.PackingController#getPackingTaskList()}. + */ + @Test + public void testGetPackingTaskList() { + try { + + ResultActions resultActions = mockMvc + .perform( + get( + "/disinfectSystem/packingController/getPackingTaskList") + .param("taskGroup", "术科组").param("basketBarcode", "0100001001")).andDo(print()) + .andExpect(status().isOk()); + + MvcResult result = resultActions.andReturn(); + String contentAsString = result.getResponse().getContentAsString(); + + JSONObject jsonObj = JSONUtil.fromJson(contentAsString, + JSONObject.class); + + assertEquals(true, jsonObj.getBoolean("success")); + + JSONArray data = jsonObj.getJSONArray("data"); + assertNotNull(data); + + } catch (Exception e) { + e.printStackTrace(); + } + } + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java =================================================================== diff -u -r24268 -r24349 --- ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 24268) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 24349) @@ -21,6 +21,7 @@ import org.hibernate.exception.GenericJDBCException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.CannotAcquireLockException; +import org.springframework.mock.web.MockServletContext; import org.springframework.orm.hibernate4.HibernateJdbcException; import org.springframework.orm.hibernate4.HibernateSystemException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -32,6 +33,8 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.testng.AbstractTransactionalTestNGSpringContextTests; +import org.springframework.test.context.web.WebAppConfiguration; +import org.springframework.web.context.WebApplicationContext; import test.forgon.constant.Constants; import test.forgon.disinfectsystem.invoicemanager.service.DataGenerater; @@ -120,13 +123,20 @@ * Terry Kwan,2018-08-11 * */ +@WebAppConfiguration @ContextConfiguration(locations={"classpath:beanRefContext-test.xml"}) @TestPropertySource("classpath:jdbc.properties") public class AbstractCSSDTest extends AbstractTransactionalTestNGSpringContextTests{ protected Map map = new HashMap(); + @Autowired + protected WebApplicationContext wac; + + @Autowired + protected MockServletContext servletContext; + @Autowired protected DirectoryHelper directoryHelper; @Autowired Index: build.gradle =================================================================== diff -u -r24343 -r24349 --- build.gradle (.../build.gradle) (revision 24343) +++ build.gradle (.../build.gradle) (revision 24349) @@ -440,6 +440,8 @@ compile 'org.testng:testng:6.11' compile 'com.beust:jcommander:1.48' + compile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3' + compile 'net.jodah:concurrentunit:0.4.2' compile 'org.mybatis:mybatis:3.2.8'