代码重构

svr/svr-demo/pom.xml

@@ -26,10 +26,6 @@
            <groupId>com.yihu.base</groupId>
            <artifactId>common-data-mysql</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.base</groupId>
            <artifactId>common-quartz</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-test</artifactId>

svr/svr-demo/src/main/java/com/yihu/jw/controller/DemoController.java

@@ -1,10 +1,5 @@
package com.yihu.jw.controller;
import com.yihu.base.config.quartz.QuartzHelper;
import com.yihu.jw.restmodel.common.Envelop;
import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.quartz.SchedulerFactoryBean;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -18,14 +13,9 @@ import java.util.Map;
 */
@RestController
public class DemoController {
    @Autowired
    SchedulerFactoryBean schedulerFactoryBean;
    @Autowired
    private QuartzHelper quartzHelper;
    @GetMapping("demo")
    public String demo() throws Exception {
        System.out.println(schedulerFactoryBean.getScheduler().getSchedulerName());
        return "123";
    }

svr/svr-demo/src/test/java/com/yihu/jw/common/BaseTest.java

@@ -1,17 +0,0 @@
package com.yihu.jw.common;
import org.junit.runner.RunWith;
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
/**
 * Created by chenweida on 2017/11/27.
 */
@RunWith(SpringRunner.class)
@SpringBootTest
@SpringBootConfiguration
public class BaseTest {
}

svr/svr-demo/src/test/java/com/yihu/jw/controller/DemoControllerTest.java

@@ -1,12 +1,14 @@
package com.yihu.jw.controller;  //目录要和web的目录一致
import com.yihu.jw.common.BaseTest;
import org.junit.Before;
import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.http.MediaType;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
@@ -23,7 +25,10 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 */
@RunWith(SpringRunner.class)
@SpringBootTest
public class DemoControllerTest extends BaseTest {
@ComponentScan(basePackages={"com"})
//@FixMethodOrder(MethodSorters.DEFAULT)   //默认顺序由方法名hashcode值来决定，如果hash值大小一致，则按名字的字典顺序确定 由于hashcode的生成和操作系统相关(以native修饰），所以对于不同操作系统，可能会出现不一样的执行顺序，在某一操作系统上，多次执行的顺序不变
@FixMethodOrder(MethodSorters.NAME_ASCENDING)   //按照方法名字排序升序
public class DemoControllerTest  {
	@Autowired
	protected WebApplicationContext wac;
@@ -37,12 +42,18 @@ public class DemoControllerTest extends BaseTest {
		mockMvc = MockMvcBuilders.webAppContextSetup(wac).build();
	}
	@Test
	public void testAll() throws Exception {
		whenQuerySuccess1();
		whenQuerySuccess2();
	}
	/**
	 * 测试查询
	 * @throws Exception
     */
	@Test
	public void whenQuerySuccess() throws Exception {
	//@Ignore指定忽略此测试方法
	public void whenQuerySuccess2() throws Exception {
		String result = mockMvc.perform(
				get("/demo")
						// .param("size", "15")
@@ -53,6 +64,25 @@ public class DemoControllerTest extends BaseTest {
				.andReturn().getResponse().getContentAsString();
		
		System.out.println(result);
		System.out.println("2222222222222222222222222222");
	}
	/**
	 * 测试查询
	 * @throws Exception
	 */
	//@Test
	//@Ignore指定忽略此测试方法
	public void whenQuerySuccess1() throws Exception {
		String result = mockMvc.perform(
				get("/demo")
						// .param("size", "15")
						// .param("page", "3")
						// .param("sort", "age,desc")
						.contentType(MediaType.APPLICATION_JSON_UTF8))
				.andExpect(status().isOk())
				.andReturn().getResponse().getContentAsString();
		System.out.println(result);
		System.out.println("111111111111111111111111111");
	}
}

svr/svr-demo/src/test/java/com/yihu/jw/controller/UserControllerTest.java

@@ -1,150 +1,150 @@
package com.yihu.jw.controller;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.fileUpload;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Date;
import com.yihu.jw.common.BaseTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.MediaType;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.context.WebApplicationContext;
/**
 * @author chenweida
 *
 */
@RunWith(SpringRunner.class)
@SpringBootTest
public class UserControllerTest extends BaseTest {
	@Autowired
	protected WebApplicationContext wac;
	protected MockMvc mockMvc;
	/**
	 * 初始化模拟mvc环境
	 */
	@Before
	public void setup() {
		mockMvc = MockMvcBuilders.webAppContextSetup(wac).build();
	}
	/**
	 * 文件上传
	 * @throws Exception
     */
	@Test
	public void whenUploadSuccess() throws Exception {
		String result = mockMvc.perform(fileUpload("/file") //文件上传路径
				.file(new MockMultipartFile("file", "test.txt", "multipart/form-data", "hello upload".getBytes("UTF-8"))))
				.andExpect(status().isOk()) //期望值OK 也就是200
				.andReturn().getResponse().getContentAsString();//得到返回的值
		System.out.println(result);
	}
	/**
	 * 测试查询
	 * @throws Exception
     */
	@Test
	public void whenQuerySuccess() throws Exception {
		String result = mockMvc.perform(
				get("/user").param("username", "jojo").param("age", "18").param("ageTo", "60").param("xxx", "yyy")
						// .param("size", "15")
						// .param("page", "3")
						// .param("sort", "age,desc")
						.contentType(MediaType.APPLICATION_JSON_UTF8))
				.andExpect(status().isOk()).andExpect(jsonPath("$.length()").value(3))
				.andReturn().getResponse().getContentAsString();
		
		System.out.println(result);
	}
	@Test
	public void whenGetInfoSuccess() throws Exception {
		String result = mockMvc.perform(get("/user/1")
				.contentType(MediaType.APPLICATION_JSON_UTF8))
				.andExpect(status().isOk())
				.andExpect(jsonPath("$.username").value("tom"))
				.andReturn().getResponse().getContentAsString();
		
		System.out.println(result);
	}
	
	@Test
	public void whenGetInfoFail() throws Exception {
		mockMvc.perform(get("/user/a")
				.contentType(MediaType.APPLICATION_JSON_UTF8))
				.andExpect(status().is4xxClientError());
	}
	
	@Test
	public void whenCreateSuccess() throws Exception {
		
		Date date = new Date();
		System.out.println(date.getTime());
		String content = "{\"username\":\"tom\",\"password\":null,\"birthday\":"+date.getTime()+"}";
		String reuslt = mockMvc.perform(post("/user").contentType(MediaType.APPLICATION_JSON_UTF8)
				.content(content))
				.andExpect(status().isOk())
				.andExpect(jsonPath("$.id").value("1"))
				.andReturn().getResponse().getContentAsString();
		
		System.out.println(reuslt);
	}
	
	@Test
	public void whenCreateFail() throws Exception {
		
		Date date = new Date();
		System.out.println(date.getTime());
		String content = "{\"username\":\"tom\",\"password\":null,\"birthday\":"+date.getTime()+"}";
		String reuslt = mockMvc.perform(post("/user").contentType(MediaType.APPLICATION_JSON_UTF8)
				.content(content))
//package com.yihu.jw.controller;
//
//import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
//import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.fileUpload;
//import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
//import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
//import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
//import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
//import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
//
//import java.time.LocalDateTime;
//import java.time.ZoneId;
//import java.util.Date;
//
//import com.yihu.jw.common.BaseTest;
//import org.junit.Before;
//import org.junit.Test;
//import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.boot.test.context.SpringBootTest;
//import org.springframework.http.MediaType;
//import org.springframework.mock.web.MockMultipartFile;
//import org.springframework.test.context.junit4.SpringRunner;
//import org.springframework.test.web.servlet.MockMvc;
//import org.springframework.test.web.servlet.setup.MockMvcBuilders;
//import org.springframework.web.context.WebApplicationContext;
//
///**
// * @author chenweida
// *
// */
//@RunWith(SpringRunner.class)
//@SpringBootTest
//public class UserControllerTest extends BaseTest {
//
//	@Autowired
//	protected WebApplicationContext wac;
//
//	protected MockMvc mockMvc;
//
//	/**
//	 * 初始化模拟mvc环境
//	 */
//	@Before
//	public void setup() {
//		mockMvc = MockMvcBuilders.webAppContextSetup(wac).build();
//	}
//
//	/**
//	 * 文件上传
//	 * @throws Exception
//     */
//	@Test
//	public void whenUploadSuccess() throws Exception {
//		String result = mockMvc.perform(fileUpload("/file") //文件上传路径
//				.file(new MockMultipartFile("file", "test.txt", "multipart/form-data", "hello upload".getBytes("UTF-8"))))
//				.andExpect(status().isOk()) //期望值OK 也就是200
//				.andReturn().getResponse().getContentAsString();//得到返回的值
//		System.out.println(result);
//	}
//
//	/**
//	 * 测试查询
//	 * @throws Exception
//     */
//	@Test
//	public void whenQuerySuccess() throws Exception {
//		String result = mockMvc.perform(
//				get("/user").param("username", "jojo").param("age", "18").param("ageTo", "60").param("xxx", "yyy")
//						// .param("size", "15")
//						// .param("page", "3")
//						// .param("sort", "age,desc")
//						.contentType(MediaType.APPLICATION_JSON_UTF8))
//				.andExpect(status().isOk()).andExpect(jsonPath("$.length()").value(3))
//				.andReturn().getResponse().getContentAsString();
//
//		System.out.println(result);
//	}
//
//	@Test
//	public void whenGetInfoSuccess() throws Exception {
//		String result = mockMvc.perform(get("/user/1")
//				.contentType(MediaType.APPLICATION_JSON_UTF8))
//				.andExpect(status().isOk())
//				.andExpect(jsonPath("$.username").value("tom"))
//				.andReturn().getResponse().getContentAsString();
//
//		System.out.println(result);
//	}
//
//	@Test
//	public void whenGetInfoFail() throws Exception {
//		mockMvc.perform(get("/user/a")
//				.contentType(MediaType.APPLICATION_JSON_UTF8))
//				.andExpect(status().is4xxClientError());
//	}
//
//	@Test
//	public void whenCreateSuccess() throws Exception {
//
//		Date date = new Date();
//		System.out.println(date.getTime());
//		String content = "{\"username\":\"tom\",\"password\":null,\"birthday\":"+date.getTime()+"}";
//		String reuslt = mockMvc.perform(post("/user").contentType(MediaType.APPLICATION_JSON_UTF8)
//				.content(content))
//				.andExpect(status().isOk())
//				.andExpect(jsonPath("$.id").value("1"))
//				.andReturn().getResponse().getContentAsString();
//
//		System.out.println(reuslt);
//	}
//
//	@Test
//	public void whenCreateFail() throws Exception {
//
//		Date date = new Date();
//		System.out.println(date.getTime());
//		String content = "{\"username\":\"tom\",\"password\":null,\"birthday\":"+date.getTime()+"}";
//		String reuslt = mockMvc.perform(post("/user").contentType(MediaType.APPLICATION_JSON_UTF8)
//				.content(content))
////				.andExpect(status().isOk())
////				.andExpect(jsonPath("$.id").value("1"))
//				.andReturn().getResponse().getContentAsString();
//
//		System.out.println(reuslt);
//	}
//
//	@Test
//	public void whenUpdateSuccess() throws Exception {
//
//		Date date = new Date(LocalDateTime.now().plusYears(1).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
//		System.out.println(date.getTime());
//		String content = "{\"id\":\"1\", \"username\":\"tom\",\"password\":null,\"birthday\":"+date.getTime()+"}";
//		String reuslt = mockMvc.perform(put("/user/1").contentType(MediaType.APPLICATION_JSON_UTF8)
//				.content(content))
//				.andExpect(status().isOk())
//				.andExpect(jsonPath("$.id").value("1"))
				.andReturn().getResponse().getContentAsString();
		
		System.out.println(reuslt);
	}
	
	@Test
	public void whenUpdateSuccess() throws Exception {
		
		Date date = new Date(LocalDateTime.now().plusYears(1).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
		System.out.println(date.getTime());
		String content = "{\"id\":\"1\", \"username\":\"tom\",\"password\":null,\"birthday\":"+date.getTime()+"}";
		String reuslt = mockMvc.perform(put("/user/1").contentType(MediaType.APPLICATION_JSON_UTF8)
				.content(content))
				.andExpect(status().isOk())
				.andExpect(jsonPath("$.id").value("1"))
				.andReturn().getResponse().getContentAsString();
		
		System.out.println(reuslt);
	}
	
	@Test
	public void whenDeleteSuccess() throws Exception {
		mockMvc.perform(delete("/user/1")
				.contentType(MediaType.APPLICATION_JSON_UTF8))
				.andExpect(status().isOk());
	}
}
//				.andReturn().getResponse().getContentAsString();
//
//		System.out.println(reuslt);
//	}
//
//	@Test
//	public void whenDeleteSuccess() throws Exception {
//		mockMvc.perform(delete("/user/1")
//				.contentType(MediaType.APPLICATION_JSON_UTF8))
//				.andExpect(status().isOk());
//	}
//
//}