Skip to content

C
customer-service
Commit e1efd106 authored by huangcb's avatar huangcb
Browse files
Options

承运商接口：解绑司机与车辆

parent 63000c7d
Hide whitespace changes
Inline Side-by-side
Showing with 309 additions and 387 deletions
src/main/java/com/esv/freight/customer/common/component/ErrorMessageComponent.java
View file @ e1efd106
...@@ -235,4 +235,13 @@ public class ErrorMessageComponent { ...@@ -235,4 +235,13 @@ public class ErrorMessageComponent {
private String carrierDriverVehicleBind1020; private String carrierDriverVehicleBind1020;
@Value("${error-message.carrier.driver.vehicle-bind.1021}") @Value("${error-message.carrier.driver.vehicle-bind.1021}")
private String carrierDriverVehicleBind1021; private String carrierDriverVehicleBind1021;
@Value("${error-message.carrier.driver.vehicle-unbind.1001}")
private String carrierDriverVehicleUnbind1001;
@Value("${error-message.carrier.driver.vehicle-unbind.1010}")
private String carrierDriverVehicleUnbind1010;
@Value("${error-message.carrier.driver.vehicle-unbind.1020}")
private String carrierDriverVehicleUnbind1020;
@Value("${error-message.carrier.driver.vehicle-unbind.1021}")
private String carrierDriverVehicleUnbind1021;
} }
src/main/java/com/esv/freight/customer/module/driver/controller/DriverVehicleController.java
View file @ e1efd106
...@@ -7,6 +7,7 @@ import com.esv.freight.customer.module.driver.form.DriverQueryForm; ...@@ -7,6 +7,7 @@ import com.esv.freight.customer.module.driver.form.DriverQueryForm;
import com.esv.freight.customer.module.driver.form.DriverVehicleForm; import com.esv.freight.customer.module.driver.form.DriverVehicleForm;
import com.esv.freight.customer.module.driver.service.DriverVehicleService; import com.esv.freight.customer.module.driver.service.DriverVehicleService;
import com.esv.freight.customer.module.driver.validator.groups.ValidatorBind; import com.esv.freight.customer.module.driver.validator.groups.ValidatorBind;
import com.esv.freight.customer.module.driver.validator.groups.ValidatorUnbind;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -50,7 +51,7 @@ public class DriverVehicleController { ...@@ -50,7 +51,7 @@ public class DriverVehicleController {
} }
/** /**
* description 司机绑定车辆 * description 绑定司机与车辆
* param [form] * param [form]
* return com.esv.freight.customer.common.response.EResponse * return com.esv.freight.customer.common.response.EResponse
* author Administrator * author Administrator
...@@ -62,4 +63,18 @@ public class DriverVehicleController { ...@@ -62,4 +63,18 @@ public class DriverVehicleController {
return EResponse.ok(); return EResponse.ok();
} }
/**
* description 解绑司机与车辆
* param [form]
* return com.esv.freight.customer.common.response.EResponse
* author Administrator
* createTime 2020/04/30 9:53
**/
@PostMapping("/unbind")
public EResponse unbind(@RequestBody @Validated(ValidatorUnbind.class) DriverVehicleForm form) throws EException {
driverVehicleService.driverUnbindVehicle(form);
return EResponse.ok();
}
} }
src/main/java/com/esv/freight/customer/module/driver/service/DriverVehicleService.java
View file @ e1efd106
...@@ -26,7 +26,7 @@ public interface DriverVehicleService { ...@@ -26,7 +26,7 @@ public interface DriverVehicleService {
List<DriverVehicleListVO> getDriverBindVehicleList(Long id); List<DriverVehicleListVO> getDriverBindVehicleList(Long id);
/** /**
* description 司机绑定车辆 * description 绑定司机与车辆
* param [form] * param [form]
* return java.lang.Integer * return java.lang.Integer
* author Administrator * author Administrator
...@@ -34,4 +34,13 @@ public interface DriverVehicleService { ...@@ -34,4 +34,13 @@ public interface DriverVehicleService {
**/ **/
Integer driverBindVehicle(DriverVehicleForm form); Integer driverBindVehicle(DriverVehicleForm form);
/**
* description 解绑司机与车辆
* param [form]
* return java.lang.Integer
* author Administrator
* createTime 2020/04/30 9:38
**/
Integer driverUnbindVehicle(DriverVehicleForm form);
} }
src/main/java/com/esv/freight/customer/module/driver/service/impl/DriverVehicleServiceImpl.java
View file @ e1efd106
...@@ -115,4 +115,37 @@ public class DriverVehicleServiceImpl implements DriverVehicleService { ...@@ -115,4 +115,37 @@ public class DriverVehicleServiceImpl implements DriverVehicleService {
vehicleDriverEntity.setOperateUser(ReqUtils.getRequestUserAccount()); vehicleDriverEntity.setOperateUser(ReqUtils.getRequestUserAccount());
return this.vehicleDriverService.getBaseMapper().insert(vehicleDriverEntity); return this.vehicleDriverService.getBaseMapper().insert(vehicleDriverEntity);
} }
@Override
public Integer driverUnbindVehicle(DriverVehicleForm form) {
// 1:校验
// 1.1:校验司机ID是否有效
DriverAccountEntity driverAccountEntity = this.driverAccountService.getById(form.getDriverId());
if (null == driverAccountEntity) {
throw new EException(1001, errorMessageComponent.getCarrierDriverVehicleUnbind1001());
}
String driverAccount = driverAccountEntity.getAccount();
// 1.2:校验车辆ID是否有效
VehicleEntity vehicleEntity = this.vehicleService.getById(form.getVehicleId());
if (null == vehicleEntity) {
throw new EException(1010, errorMessageComponent.getCarrierDriverVehicleUnbind1010());
}
// 1.3:校验车辆与司机是否绑定
VehicleDriverEntity vehicleDriverEntity = this.vehicleDriverService.getBaseMapper().selectOne(new QueryWrapper<VehicleDriverEntity>().lambda()
.eq(VehicleDriverEntity::getVehicleId, form.getVehicleId())
.eq(VehicleDriverEntity::getDriverId, form.getDriverId()));
if (null == vehicleDriverEntity) {
throw new EException(1020, errorMessageComponent.getCarrierDriverVehicleUnbind1020());
}
// 1.4:校验司机自主绑定的车辆，平台不可解绑
if (VehicleConstants.VEHICLE_SOURCE_TYPE_REGISTER.equals(vehicleEntity.getSourceType())
&& driverAccount.equals(vehicleEntity.getCreateUser())) {
throw new EException(1021, errorMessageComponent.getCarrierDriverVehicleUnbind1021());
}
// 1:解绑司机与车辆
return this.vehicleDriverService.getBaseMapper().delete(new QueryWrapper<VehicleDriverEntity>().lambda()
.eq(VehicleDriverEntity::getVehicleId, form.getVehicleId())
.eq(VehicleDriverEntity::getDriverId, form.getDriverId()));
}
} }
src/main/resources/application-dev.yml
View file @ e1efd106
...@@ -183,4 +183,9 @@ error-message: ...@@ -183,4 +183,9 @@ error-message:
1011: 车辆已停用 1011: 车辆已停用
1012: 车辆未审核通过 1012: 车辆未审核通过
1020: 司机与车辆所属承运商不一致 1020: 司机与车辆所属承运商不一致
1021: 重复绑定 1021: 重复绑定
\ No newline at end of file vehicle-unbind:
1001: 无效的司机ID
1010: 无效的车辆ID
1020: 车辆与司机未绑定
1021: 司机自主绑定的车辆，平台不可解绑
\ No newline at end of file
src/test/java/com/esv/freight/customer/module/carrier/controller/CarrierAccountControllerTest.java
View file @ e1efd106
...@@ -55,12 +55,11 @@ public class CarrierAccountControllerTest extends BaseTestController { ...@@ -55,12 +55,11 @@ public class CarrierAccountControllerTest extends BaseTestController {
form.setContactor("庞俊辉"); form.setContactor("庞俊辉");
form.setAccount("13512340001"); form.setAccount("13512340001");
form.setPassword("e10adc3949ba59abbe56e057f20f883e"); form.setPassword("e10adc3949ba59abbe56e057f20f883e");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -105,12 +104,10 @@ public class CarrierAccountControllerTest extends BaseTestController { ...@@ -105,12 +104,10 @@ public class CarrierAccountControllerTest extends BaseTestController {
form.setCreditScore(60); form.setCreditScore(60);
form.setRemark("这是一条测试数据"); form.setRemark("这是一条测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -156,12 +153,10 @@ public class CarrierAccountControllerTest extends BaseTestController { ...@@ -156,12 +153,10 @@ public class CarrierAccountControllerTest extends BaseTestController {
form.setCreditScore(60); form.setCreditScore(60);
form.setRemark("这是一条测试数据"); form.setRemark("这是一条测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -206,12 +201,10 @@ public class CarrierAccountControllerTest extends BaseTestController { ...@@ -206,12 +201,10 @@ public class CarrierAccountControllerTest extends BaseTestController {
form.setCreditScore(60); form.setCreditScore(60);
form.setRemark("这是一条测试数据"); form.setRemark("这是一条测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -256,12 +249,10 @@ public class CarrierAccountControllerTest extends BaseTestController { ...@@ -256,12 +249,10 @@ public class CarrierAccountControllerTest extends BaseTestController {
form.setCreditScore(60); form.setCreditScore(60);
form.setRemark("这是一条测试数据"); form.setRemark("这是一条测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -306,12 +297,10 @@ public class CarrierAccountControllerTest extends BaseTestController { ...@@ -306,12 +297,10 @@ public class CarrierAccountControllerTest extends BaseTestController {
form.setCreditScore(60); form.setCreditScore(60);
form.setRemark("这是一条测试数据"); form.setRemark("这是一条测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -357,12 +346,10 @@ public class CarrierAccountControllerTest extends BaseTestController { ...@@ -357,12 +346,10 @@ public class CarrierAccountControllerTest extends BaseTestController {
form.setCreditScore(60); form.setCreditScore(60);
form.setRemark("这是一条测试数据"); form.setRemark("这是一条测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -408,12 +395,10 @@ public class CarrierAccountControllerTest extends BaseTestController { ...@@ -408,12 +395,10 @@ public class CarrierAccountControllerTest extends BaseTestController {
form.setCreditScore(60); form.setCreditScore(60);
form.setRemark("这是一条测试数据"); form.setRemark("这是一条测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -459,12 +444,10 @@ public class CarrierAccountControllerTest extends BaseTestController { ...@@ -459,12 +444,10 @@ public class CarrierAccountControllerTest extends BaseTestController {
form.setCreditScore(60); form.setCreditScore(60);
form.setRemark("这是一条测试数据"); form.setRemark("这是一条测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -510,12 +493,10 @@ public class CarrierAccountControllerTest extends BaseTestController { ...@@ -510,12 +493,10 @@ public class CarrierAccountControllerTest extends BaseTestController {
form.setCreditScore(60); form.setCreditScore(60);
form.setRemark("这是一条测试数据"); form.setRemark("这是一条测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -561,12 +542,10 @@ public class CarrierAccountControllerTest extends BaseTestController { ...@@ -561,12 +542,10 @@ public class CarrierAccountControllerTest extends BaseTestController {
form.setCreditScore(60); form.setCreditScore(60);
form.setRemark("这是一条测试数据"); form.setRemark("这是一条测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -590,12 +569,10 @@ public class CarrierAccountControllerTest extends BaseTestController { ...@@ -590,12 +569,10 @@ public class CarrierAccountControllerTest extends BaseTestController {
CarrierQueryForm form = new CarrierQueryForm(); CarrierQueryForm form = new CarrierQueryForm();
form.setId(2L); form.setId(2L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -620,12 +597,10 @@ public class CarrierAccountControllerTest extends BaseTestController { ...@@ -620,12 +597,10 @@ public class CarrierAccountControllerTest extends BaseTestController {
CarrierQueryForm form = new CarrierQueryForm(); CarrierQueryForm form = new CarrierQueryForm();
form.setId(99999L); form.setId(99999L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -674,12 +649,10 @@ public class CarrierAccountControllerTest extends BaseTestController { ...@@ -674,12 +649,10 @@ public class CarrierAccountControllerTest extends BaseTestController {
form.setPageNum(1); form.setPageNum(1);
form.setPageSize(10); form.setPageSize(10);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -707,12 +680,10 @@ public class CarrierAccountControllerTest extends BaseTestController { ...@@ -707,12 +680,10 @@ public class CarrierAccountControllerTest extends BaseTestController {
form.setAccount("1"); form.setAccount("1");
form.setCarrierName("沈阳"); form.setCarrierName("沈阳");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
......
src/test/java/com/esv/freight/customer/module/driver/controller/DriverAccountAddTest.java
View file @ e1efd106
...@@ -74,12 +74,10 @@ public class DriverAccountAddTest extends BaseTestController { ...@@ -74,12 +74,10 @@ public class DriverAccountAddTest extends BaseTestController {
form.setCertificateVehicle(DriverConstants.ACCOUNT_DRIVING_VEHICLE_TYPE_1); // 道路运输从业资格证-所驾驶车辆(字典表)：1-4.5吨及以下、2-4.5吨以上 form.setCertificateVehicle(DriverConstants.ACCOUNT_DRIVING_VEHICLE_TYPE_1); // 道路运输从业资格证-所驾驶车辆(字典表)：1-4.5吨及以下、2-4.5吨以上
form.setRemark("测试数据"); form.setRemark("测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -131,12 +129,10 @@ public class DriverAccountAddTest extends BaseTestController { ...@@ -131,12 +129,10 @@ public class DriverAccountAddTest extends BaseTestController {
form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg"); form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg");
form.setRemark("测试数据"); form.setRemark("测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -189,12 +185,10 @@ public class DriverAccountAddTest extends BaseTestController { ...@@ -189,12 +185,10 @@ public class DriverAccountAddTest extends BaseTestController {
form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg"); form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg");
form.setRemark("测试数据"); form.setRemark("测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -246,12 +240,10 @@ public class DriverAccountAddTest extends BaseTestController { ...@@ -246,12 +240,10 @@ public class DriverAccountAddTest extends BaseTestController {
form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg"); form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg");
form.setRemark("测试数据"); form.setRemark("测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -303,12 +295,10 @@ public class DriverAccountAddTest extends BaseTestController { ...@@ -303,12 +295,10 @@ public class DriverAccountAddTest extends BaseTestController {
form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg"); form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg");
form.setRemark("测试数据"); form.setRemark("测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -360,12 +350,10 @@ public class DriverAccountAddTest extends BaseTestController { ...@@ -360,12 +350,10 @@ public class DriverAccountAddTest extends BaseTestController {
form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg"); form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg");
form.setRemark("测试数据"); form.setRemark("测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -414,12 +402,10 @@ public class DriverAccountAddTest extends BaseTestController { ...@@ -414,12 +402,10 @@ public class DriverAccountAddTest extends BaseTestController {
form.setCertificateVehicle(DriverConstants.ACCOUNT_DRIVING_VEHICLE_TYPE_2); // 道路运输从业资格证-所驾驶车辆(字典表)：1-4.5吨及以下、2-4.5吨以上 form.setCertificateVehicle(DriverConstants.ACCOUNT_DRIVING_VEHICLE_TYPE_2); // 道路运输从业资格证-所驾驶车辆(字典表)：1-4.5吨及以下、2-4.5吨以上
form.setRemark("测试数据"); form.setRemark("测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -468,12 +454,10 @@ public class DriverAccountAddTest extends BaseTestController { ...@@ -468,12 +454,10 @@ public class DriverAccountAddTest extends BaseTestController {
form.setCertificateVehicle(DriverConstants.ACCOUNT_DRIVING_VEHICLE_TYPE_1); // 道路运输从业资格证-所驾驶车辆(字典表)：1-4.5吨及以下、2-4.5吨以上 form.setCertificateVehicle(DriverConstants.ACCOUNT_DRIVING_VEHICLE_TYPE_1); // 道路运输从业资格证-所驾驶车辆(字典表)：1-4.5吨及以下、2-4.5吨以上
form.setRemark("测试数据"); form.setRemark("测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
......
src/test/java/com/esv/freight/customer/module/driver/controller/DriverAccountEditTest.java
View file @ e1efd106
...@@ -74,12 +74,10 @@ public class DriverAccountEditTest extends BaseTestController { ...@@ -74,12 +74,10 @@ public class DriverAccountEditTest extends BaseTestController {
form.setCertificateVehicle(DriverConstants.ACCOUNT_DRIVING_VEHICLE_TYPE_1); // 道路运输从业资格证-所驾驶车辆(字典表)：1-4.5吨及以下、2-4.5吨以上 form.setCertificateVehicle(DriverConstants.ACCOUNT_DRIVING_VEHICLE_TYPE_1); // 道路运输从业资格证-所驾驶车辆(字典表)：1-4.5吨及以下、2-4.5吨以上
form.setRemark("测试数据"); form.setRemark("测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -130,12 +128,10 @@ public class DriverAccountEditTest extends BaseTestController { ...@@ -130,12 +128,10 @@ public class DriverAccountEditTest extends BaseTestController {
form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg"); form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg");
form.setRemark("测试数据"); form.setRemark("测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -186,12 +182,10 @@ public class DriverAccountEditTest extends BaseTestController { ...@@ -186,12 +182,10 @@ public class DriverAccountEditTest extends BaseTestController {
form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg"); form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg");
form.setRemark("测试数据"); form.setRemark("测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -242,12 +236,10 @@ public class DriverAccountEditTest extends BaseTestController { ...@@ -242,12 +236,10 @@ public class DriverAccountEditTest extends BaseTestController {
form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg"); form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg");
form.setRemark("测试数据"); form.setRemark("测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -298,12 +290,10 @@ public class DriverAccountEditTest extends BaseTestController { ...@@ -298,12 +290,10 @@ public class DriverAccountEditTest extends BaseTestController {
form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg"); form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg");
form.setRemark("测试数据"); form.setRemark("测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -354,12 +344,10 @@ public class DriverAccountEditTest extends BaseTestController { ...@@ -354,12 +344,10 @@ public class DriverAccountEditTest extends BaseTestController {
form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg"); form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg");
form.setRemark("测试数据"); form.setRemark("测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -408,12 +396,10 @@ public class DriverAccountEditTest extends BaseTestController { ...@@ -408,12 +396,10 @@ public class DriverAccountEditTest extends BaseTestController {
form.setCertificateVehicle(DriverConstants.ACCOUNT_DRIVING_VEHICLE_TYPE_2); // 道路运输从业资格证-所驾驶车辆(字典表)：1-4.5吨及以下、2-4.5吨以上 form.setCertificateVehicle(DriverConstants.ACCOUNT_DRIVING_VEHICLE_TYPE_2); // 道路运输从业资格证-所驾驶车辆(字典表)：1-4.5吨及以下、2-4.5吨以上
form.setRemark("测试数据"); form.setRemark("测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
......
src/test/java/com/esv/freight/customer/module/driver/controller/DriverAccountTest.java
View file @ e1efd106
...@@ -51,12 +51,10 @@ public class DriverAccountTest extends BaseTestController { ...@@ -51,12 +51,10 @@ public class DriverAccountTest extends BaseTestController {
DriverQueryForm form = new DriverQueryForm(); DriverQueryForm form = new DriverQueryForm();
form.setId(2L); form.setId(2L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -80,12 +78,10 @@ public class DriverAccountTest extends BaseTestController { ...@@ -80,12 +78,10 @@ public class DriverAccountTest extends BaseTestController {
DriverQueryForm form = new DriverQueryForm(); DriverQueryForm form = new DriverQueryForm();
form.setId(99999L); form.setId(99999L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -110,12 +106,10 @@ public class DriverAccountTest extends BaseTestController { ...@@ -110,12 +106,10 @@ public class DriverAccountTest extends BaseTestController {
form.setAuditStatus(DriverConstants.ACCOUNT_AUDIT_STATUS_FAILURE); form.setAuditStatus(DriverConstants.ACCOUNT_AUDIT_STATUS_FAILURE);
form.setRemark("行驶证正面图片模糊"); form.setRemark("行驶证正面图片模糊");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -139,12 +133,10 @@ public class DriverAccountTest extends BaseTestController { ...@@ -139,12 +133,10 @@ public class DriverAccountTest extends BaseTestController {
form.setId(1L); form.setId(1L);
form.setAuditStatus(DriverConstants.ACCOUNT_AUDIT_STATUS_SUCCESS); form.setAuditStatus(DriverConstants.ACCOUNT_AUDIT_STATUS_SUCCESS);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -169,12 +161,10 @@ public class DriverAccountTest extends BaseTestController { ...@@ -169,12 +161,10 @@ public class DriverAccountTest extends BaseTestController {
form.setId(99999L); form.setId(99999L);
form.setAuditStatus(DriverConstants.ACCOUNT_AUDIT_STATUS_SUCCESS); form.setAuditStatus(DriverConstants.ACCOUNT_AUDIT_STATUS_SUCCESS);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -199,12 +189,10 @@ public class DriverAccountTest extends BaseTestController { ...@@ -199,12 +189,10 @@ public class DriverAccountTest extends BaseTestController {
form.setId(1L); form.setId(1L);
form.setAuditStatus(DriverConstants.ACCOUNT_AUDIT_STATUS_SUCCESS); form.setAuditStatus(DriverConstants.ACCOUNT_AUDIT_STATUS_SUCCESS);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -228,12 +216,10 @@ public class DriverAccountTest extends BaseTestController { ...@@ -228,12 +216,10 @@ public class DriverAccountTest extends BaseTestController {
DriverQueryForm form = new DriverQueryForm(); DriverQueryForm form = new DriverQueryForm();
form.setId(1L); form.setId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -257,12 +243,10 @@ public class DriverAccountTest extends BaseTestController { ...@@ -257,12 +243,10 @@ public class DriverAccountTest extends BaseTestController {
DriverQueryForm form = new DriverQueryForm(); DriverQueryForm form = new DriverQueryForm();
form.setId(99999L); form.setId(99999L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -286,12 +270,10 @@ public class DriverAccountTest extends BaseTestController { ...@@ -286,12 +270,10 @@ public class DriverAccountTest extends BaseTestController {
DriverQueryForm form = new DriverQueryForm(); DriverQueryForm form = new DriverQueryForm();
form.setId(1L); form.setId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -315,12 +297,10 @@ public class DriverAccountTest extends BaseTestController { ...@@ -315,12 +297,10 @@ public class DriverAccountTest extends BaseTestController {
DriverQueryForm form = new DriverQueryForm(); DriverQueryForm form = new DriverQueryForm();
form.setId(1L); form.setId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -344,12 +324,10 @@ public class DriverAccountTest extends BaseTestController { ...@@ -344,12 +324,10 @@ public class DriverAccountTest extends BaseTestController {
DriverQueryForm form = new DriverQueryForm(); DriverQueryForm form = new DriverQueryForm();
form.setId(99999L); form.setId(99999L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -373,12 +351,10 @@ public class DriverAccountTest extends BaseTestController { ...@@ -373,12 +351,10 @@ public class DriverAccountTest extends BaseTestController {
DriverQueryForm form = new DriverQueryForm(); DriverQueryForm form = new DriverQueryForm();
form.setId(1L); form.setId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -403,12 +379,10 @@ public class DriverAccountTest extends BaseTestController { ...@@ -403,12 +379,10 @@ public class DriverAccountTest extends BaseTestController {
form.setAccount("18512341001"); form.setAccount("18512341001");
form.setCarrierId(1L); form.setCarrierId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -434,12 +408,10 @@ public class DriverAccountTest extends BaseTestController { ...@@ -434,12 +408,10 @@ public class DriverAccountTest extends BaseTestController {
form.setAccount("18512341001"); form.setAccount("18512341001");
form.setCarrierId(1L); form.setCarrierId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -464,12 +436,10 @@ public class DriverAccountTest extends BaseTestController { ...@@ -464,12 +436,10 @@ public class DriverAccountTest extends BaseTestController {
form.setAccount("18512341002"); form.setAccount("18512341002");
form.setCarrierId(99999L); form.setCarrierId(99999L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -492,12 +462,10 @@ public class DriverAccountTest extends BaseTestController { ...@@ -492,12 +462,10 @@ public class DriverAccountTest extends BaseTestController {
DriverQueryForm form = new DriverQueryForm(); DriverQueryForm form = new DriverQueryForm();
form.setId(1L); form.setId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -521,12 +489,10 @@ public class DriverAccountTest extends BaseTestController { ...@@ -521,12 +489,10 @@ public class DriverAccountTest extends BaseTestController {
DriverQueryForm form = new DriverQueryForm(); DriverQueryForm form = new DriverQueryForm();
form.setId(99999L); form.setId(99999L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -550,12 +516,10 @@ public class DriverAccountTest extends BaseTestController { ...@@ -550,12 +516,10 @@ public class DriverAccountTest extends BaseTestController {
form.setPageNum(1); form.setPageNum(1);
form.setPageSize(10); form.setPageSize(10);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -582,12 +546,10 @@ public class DriverAccountTest extends BaseTestController { ...@@ -582,12 +546,10 @@ public class DriverAccountTest extends BaseTestController {
form.setPageNum(1); form.setPageNum(1);
form.setPageSize(10); form.setPageSize(10);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
......
src/test/java/com/esv/freight/customer/module/driver/controller/DriverVehicleControllerTest.java
View file @ e1efd106
...@@ -49,12 +49,10 @@ public class DriverVehicleControllerTest extends BaseTestController { ...@@ -49,12 +49,10 @@ public class DriverVehicleControllerTest extends BaseTestController {
DriverQueryForm form = new DriverQueryForm(); DriverQueryForm form = new DriverQueryForm();
form.setId(1L); form.setId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -78,12 +76,10 @@ public class DriverVehicleControllerTest extends BaseTestController { ...@@ -78,12 +76,10 @@ public class DriverVehicleControllerTest extends BaseTestController {
DriverQueryForm form = new DriverQueryForm(); DriverQueryForm form = new DriverQueryForm();
form.setId(99999L); form.setId(99999L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -106,12 +102,10 @@ public class DriverVehicleControllerTest extends BaseTestController { ...@@ -106,12 +102,10 @@ public class DriverVehicleControllerTest extends BaseTestController {
DriverQueryForm form = new DriverQueryForm(); DriverQueryForm form = new DriverQueryForm();
form.setId(2L); form.setId(2L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -124,7 +118,7 @@ public class DriverVehicleControllerTest extends BaseTestController { ...@@ -124,7 +118,7 @@ public class DriverVehicleControllerTest extends BaseTestController {
} }
/** /**
* 司机绑定车辆 * 绑定司机与车辆
**/ **/
@Test @Test
@Rollback @Rollback
...@@ -136,12 +130,38 @@ public class DriverVehicleControllerTest extends BaseTestController { ...@@ -136,12 +130,38 @@ public class DriverVehicleControllerTest extends BaseTestController {
form.setDriverId(3L); form.setDriverId(3L);
form.setVehicleId(4L); form.setVehicleId(4L);
JSONObject reqJson = JSONObject.parseObject(form.toString()); MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders())
.content(form.toString()))
.andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk())
.andReturn();
String responseStr = mvcResult.getResponse().getContentAsString();
log.info(responseStr);
JSONObject result = JSONObject.parseObject(responseStr);
Assert.assertEquals(ECode.SUCCESS.code(), result.getIntValue("code"));
}
/**
* 解绑司机与车辆
**/
@Test
@Rollback
public void c1_unbind_success_test() throws Exception {
String url = "/carrier/driver/vehicle/unbind";
// 构造数据
DriverVehicleForm form = new DriverVehicleForm();
form.setDriverId(3L);
form.setVehicleId(4L);
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -152,4 +172,60 @@ public class DriverVehicleControllerTest extends BaseTestController { ...@@ -152,4 +172,60 @@ public class DriverVehicleControllerTest extends BaseTestController {
JSONObject result = JSONObject.parseObject(responseStr); JSONObject result = JSONObject.parseObject(responseStr);
Assert.assertEquals(ECode.SUCCESS.code(), result.getIntValue("code")); Assert.assertEquals(ECode.SUCCESS.code(), result.getIntValue("code"));
} }
/**
* 解绑司机与车辆：司机自主绑定的车辆，平台不可解绑
**/
@Test
@Rollback
public void c2_unbind_driver_add_vehicle_failure_test() throws Exception {
String url = "/carrier/driver/vehicle/unbind";
// 构造数据
DriverVehicleForm form = new DriverVehicleForm();
form.setDriverId(3L);
form.setVehicleId(4L);
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders())
.content(form.toString()))
.andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk())
.andReturn();
String responseStr = mvcResult.getResponse().getContentAsString();
log.info(responseStr);
JSONObject result = JSONObject.parseObject(responseStr);
Assert.assertEquals(1021, result.getIntValue("code"));
}
/**
* 解绑司机与车辆：车辆与司机未绑定​
**/
@Test
@Rollback
public void c3_unbind_not_bind_failure_test() throws Exception {
String url = "/carrier/driver/vehicle/unbind";
// 构造数据
DriverVehicleForm form = new DriverVehicleForm();
form.setDriverId(3L);
form.setVehicleId(3L);
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders())
.content(form.toString()))
.andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk())
.andReturn();
String responseStr = mvcResult.getResponse().getContentAsString();
log.info(responseStr);
JSONObject result = JSONObject.parseObject(responseStr);
Assert.assertEquals(1020, result.getIntValue("code"));
}
} }
src/test/java/com/esv/freight/customer/module/goodsowner/controller/AccountAndAddressControllerTest.java
View file @ e1efd106
...@@ -49,12 +49,11 @@ public class AccountAndAddressControllerTest extends BaseTestController { ...@@ -49,12 +49,11 @@ public class AccountAndAddressControllerTest extends BaseTestController {
form.setOwnerId(1L); form.setOwnerId(1L);
form.setDeliveryAddressId(7L); form.setDeliveryAddressId(7L);
form.setReceiveAddressId(5L); form.setReceiveAddressId(5L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -81,12 +80,11 @@ public class AccountAndAddressControllerTest extends BaseTestController { ...@@ -81,12 +80,11 @@ public class AccountAndAddressControllerTest extends BaseTestController {
form.setOwnerId(99999L); form.setOwnerId(99999L);
form.setDeliveryAddressId(7L); form.setDeliveryAddressId(7L);
form.setReceiveAddressId(5L); form.setReceiveAddressId(5L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -110,12 +108,11 @@ public class AccountAndAddressControllerTest extends BaseTestController { ...@@ -110,12 +108,11 @@ public class AccountAndAddressControllerTest extends BaseTestController {
form.setOwnerId(1L); form.setOwnerId(1L);
form.setDeliveryAddressId(99999L); form.setDeliveryAddressId(99999L);
form.setReceiveAddressId(5L); form.setReceiveAddressId(5L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -139,12 +136,11 @@ public class AccountAndAddressControllerTest extends BaseTestController { ...@@ -139,12 +136,11 @@ public class AccountAndAddressControllerTest extends BaseTestController {
form.setOwnerId(1L); form.setOwnerId(1L);
form.setDeliveryAddressId(7L); form.setDeliveryAddressId(7L);
form.setReceiveAddressId(99999L); form.setReceiveAddressId(99999L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
......
src/test/java/com/esv/freight/customer/module/goodsowner/controller/DeliveryAddressControllerTest.java
View file @ e1efd106
...@@ -58,12 +58,11 @@ public class DeliveryAddressControllerTest extends BaseTestController { ...@@ -58,12 +58,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
form.setDelivererTelephone("(024)24850576"); form.setDelivererTelephone("(024)24850576");
form.setLon("123.464052"); form.setLon("123.464052");
form.setLat("41.800415"); form.setLat("41.800415");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -97,12 +96,11 @@ public class DeliveryAddressControllerTest extends BaseTestController { ...@@ -97,12 +96,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
form.setLon("123.464052"); form.setLon("123.464052");
form.setLat("41.800415"); form.setLat("41.800415");
form.setAddressCopy("1"); form.setAddressCopy("1");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -136,12 +134,11 @@ public class DeliveryAddressControllerTest extends BaseTestController { ...@@ -136,12 +134,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
form.setDelivererTelephone("(024)24850576"); form.setDelivererTelephone("(024)24850576");
form.setLon("123.464052"); form.setLon("123.464052");
form.setLat("41.800415"); form.setLat("41.800415");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -174,12 +171,11 @@ public class DeliveryAddressControllerTest extends BaseTestController { ...@@ -174,12 +171,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
form.setDelivererTelephone("(024)24850576"); form.setDelivererTelephone("(024)24850576");
form.setLon("123.464052"); form.setLon("123.464052");
form.setLat("41.800415"); form.setLat("41.800415");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -213,12 +209,11 @@ public class DeliveryAddressControllerTest extends BaseTestController { ...@@ -213,12 +209,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
form.setDelivererTelephone("(024)24850576"); form.setDelivererTelephone("(024)24850576");
form.setLon("123.464053"); form.setLon("123.464053");
form.setLat("41.800416"); form.setLat("41.800416");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -252,12 +247,11 @@ public class DeliveryAddressControllerTest extends BaseTestController { ...@@ -252,12 +247,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
form.setDelivererTelephone("(024)24850576"); form.setDelivererTelephone("(024)24850576");
form.setLon("123.464053"); form.setLon("123.464053");
form.setLat("41.800416"); form.setLat("41.800416");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -291,12 +285,11 @@ public class DeliveryAddressControllerTest extends BaseTestController { ...@@ -291,12 +285,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
form.setDelivererTelephone("(024)24850576"); form.setDelivererTelephone("(024)24850576");
form.setLon("123.464053"); form.setLon("123.464053");
form.setLat("41.800416"); form.setLat("41.800416");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -319,12 +312,11 @@ public class DeliveryAddressControllerTest extends BaseTestController { ...@@ -319,12 +312,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
// 构造数据 // 构造数据
DeleteAddressForm form = new DeleteAddressForm(); DeleteAddressForm form = new DeleteAddressForm();
form.setId("1,2,3,4,5"); form.setId("1,2,3,4,5");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -348,12 +340,11 @@ public class DeliveryAddressControllerTest extends BaseTestController { ...@@ -348,12 +340,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
// 构造数据 // 构造数据
DeliveryAddressForm form = new DeliveryAddressForm(); DeliveryAddressForm form = new DeliveryAddressForm();
form.setId(5L); form.setId(5L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -377,12 +368,11 @@ public class DeliveryAddressControllerTest extends BaseTestController { ...@@ -377,12 +368,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
// 构造数据 // 构造数据
DeliveryAddressForm form = new DeliveryAddressForm(); DeliveryAddressForm form = new DeliveryAddressForm();
form.setId(9999L); form.setId(9999L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -405,12 +395,11 @@ public class DeliveryAddressControllerTest extends BaseTestController { ...@@ -405,12 +395,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
// 构造数据 // 构造数据
DeliveryAddressForm form = new DeliveryAddressForm(); DeliveryAddressForm form = new DeliveryAddressForm();
form.setOwnerId(1L); form.setOwnerId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -434,12 +423,11 @@ public class DeliveryAddressControllerTest extends BaseTestController { ...@@ -434,12 +423,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
DeliveryAddressForm form = new DeliveryAddressForm(); DeliveryAddressForm form = new DeliveryAddressForm();
form.setPageNum(1); form.setPageNum(1);
form.setPageSize(10); form.setPageSize(10);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
......
src/test/java/com/esv/freight/customer/module/goodsowner/controller/GoodsOwnerControllerTest.java
View file @ e1efd106
...@@ -59,12 +59,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -59,12 +59,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
form.setDetailAddress("双园路"); form.setDetailAddress("双园路");
form.setIdCardFrontUrl("http://127.0.0.1/001.jpg"); form.setIdCardFrontUrl("http://127.0.0.1/001.jpg");
form.setIdCardBackUrl("http://127.0.0.1/002.jpg"); form.setIdCardBackUrl("http://127.0.0.1/002.jpg");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -98,12 +97,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -98,12 +97,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
form.setUniCreditCode("123456789"); form.setUniCreditCode("123456789");
form.setCreditCopyUrl("http://127.0.0.1/003.jpg"); form.setCreditCopyUrl("http://127.0.0.1/003.jpg");
form.setLegalPerson("黄卓越"); form.setLegalPerson("黄卓越");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -137,12 +135,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -137,12 +135,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
form.setUniCreditCode("123456789"); form.setUniCreditCode("123456789");
form.setCreditCopyUrl("http://127.0.0.1/003.jpg"); form.setCreditCopyUrl("http://127.0.0.1/003.jpg");
form.setLegalPerson("黄卓越"); form.setLegalPerson("黄卓越");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -177,12 +174,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -177,12 +174,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
form.setUniCreditCode("1234567890"); form.setUniCreditCode("1234567890");
form.setCreditCopyUrl("http://127.0.0.1/003.jpg"); form.setCreditCopyUrl("http://127.0.0.1/003.jpg");
form.setLegalPerson("黄卓越"); form.setLegalPerson("黄卓越");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -201,12 +197,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -201,12 +197,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
// 构造数据 // 构造数据
AccountForm form = new AccountForm(); AccountForm form = new AccountForm();
form.setId(1L); form.setId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -225,12 +220,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -225,12 +220,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
// 构造数据 // 构造数据
AccountForm form = new AccountForm(); AccountForm form = new AccountForm();
form.setId(1L); form.setId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -249,12 +243,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -249,12 +243,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
// 构造数据 // 构造数据
AccountForm form = new AccountForm(); AccountForm form = new AccountForm();
form.setId(1L); form.setId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -273,12 +266,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -273,12 +266,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
// 构造数据 // 构造数据
AccountForm form = new AccountForm(); AccountForm form = new AccountForm();
form.setId(1L); form.setId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -302,12 +294,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -302,12 +294,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
form.setId(1L); form.setId(1L);
form.setAuditStatus(GoodsOwnerConstants.OWNER_AUDIT_STATUS_FAILURE); form.setAuditStatus(GoodsOwnerConstants.OWNER_AUDIT_STATUS_FAILURE);
form.setRemark(null); form.setRemark(null);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -331,12 +322,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -331,12 +322,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
form.setId(1L); form.setId(1L);
form.setAuditStatus(GoodsOwnerConstants.OWNER_AUDIT_STATUS_FAILURE); form.setAuditStatus(GoodsOwnerConstants.OWNER_AUDIT_STATUS_FAILURE);
form.setRemark("测试"); form.setRemark("测试");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -359,12 +349,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -359,12 +349,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
AccountForm form = new AccountForm(); AccountForm form = new AccountForm();
form.setId(1L); form.setId(1L);
form.setAuditStatus(GoodsOwnerConstants.OWNER_AUDIT_STATUS_SUCCESS); form.setAuditStatus(GoodsOwnerConstants.OWNER_AUDIT_STATUS_SUCCESS);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -386,12 +375,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -386,12 +375,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
// 构造数据 // 构造数据
AccountForm form = new AccountForm(); AccountForm form = new AccountForm();
form.setId(1L); form.setId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -413,12 +401,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -413,12 +401,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
// 构造数据 // 构造数据
AccountForm form = new AccountForm(); AccountForm form = new AccountForm();
form.setId(1L); form.setId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -440,12 +427,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -440,12 +427,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
// 构造数据 // 构造数据
AccountForm form = new AccountForm(); AccountForm form = new AccountForm();
form.setAccount("18524431581"); form.setAccount("18524431581");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -466,12 +452,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -466,12 +452,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
// 构造数据 // 构造数据
AccountForm form = new AccountForm(); AccountForm form = new AccountForm();
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -493,12 +478,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -493,12 +478,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
// 构造数据 // 构造数据
AccountForm form = new AccountForm(); AccountForm form = new AccountForm();
form.setId(99999L); form.setId(99999L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -520,12 +504,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -520,12 +504,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
// 构造数据 // 构造数据
AccountForm form = new AccountForm(); AccountForm form = new AccountForm();
form.setAccount("12012345678"); form.setAccount("12012345678");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -548,12 +531,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -548,12 +531,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
AccountForm form = new AccountForm(); AccountForm form = new AccountForm();
form.setAccount("18524431581"); form.setAccount("18524431581");
form.setPassword("e10adc3949ba59abbe56e057f20f883e"); form.setPassword("e10adc3949ba59abbe56e057f20f883e");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -576,12 +558,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -576,12 +558,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
AccountForm form = new AccountForm(); AccountForm form = new AccountForm();
form.setAccount("12012345678"); form.setAccount("12012345678");
form.setPassword("e10adc3949ba59abbe56e057f20f883e"); form.setPassword("e10adc3949ba59abbe56e057f20f883e");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -604,12 +585,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -604,12 +585,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
AccountForm form = new AccountForm(); AccountForm form = new AccountForm();
form.setAccount("18524431581"); form.setAccount("18524431581");
form.setPassword("e10adc3949ba59abbe56e057f20f8abc"); form.setPassword("e10adc3949ba59abbe56e057f20f8abc");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -632,12 +612,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -632,12 +612,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
// 构造数据 // 构造数据
AccountForm form = new AccountForm(); AccountForm form = new AccountForm();
form.setAccount("18524431583"); form.setAccount("18524431583");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -661,12 +640,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -661,12 +640,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
// 构造数据 // 构造数据
AccountForm form = new AccountForm(); AccountForm form = new AccountForm();
form.setAccount("123456789"); form.setAccount("123456789");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -689,12 +667,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -689,12 +667,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
// 构造数据 // 构造数据
AccountForm form = new AccountForm(); AccountForm form = new AccountForm();
form.setAccount("18524431581"); form.setAccount("18524431581");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -718,12 +695,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -718,12 +695,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
AccountQueryForm form = new AccountQueryForm(); AccountQueryForm form = new AccountQueryForm();
form.setPageNum(1); form.setPageNum(1);
form.setPageSize(10); form.setPageSize(10);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -749,12 +725,11 @@ public class GoodsOwnerControllerTest extends BaseTestController { ...@@ -749,12 +725,11 @@ public class GoodsOwnerControllerTest extends BaseTestController {
form.setName("黄"); form.setName("黄");
form.setPageNum(1); form.setPageNum(1);
form.setPageSize(10); form.setPageSize(10);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
......
src/test/java/com/esv/freight/customer/module/goodsowner/controller/ReceiveAddressControllerTest.java
View file @ e1efd106
...@@ -59,12 +59,11 @@ public class ReceiveAddressControllerTest extends BaseTestController { ...@@ -59,12 +59,11 @@ public class ReceiveAddressControllerTest extends BaseTestController {
form.setReceiverTelephone("(024)24850576"); form.setReceiverTelephone("(024)24850576");
form.setLon("123.464052"); form.setLon("123.464052");
form.setLat("41.800415"); form.setLat("41.800415");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -98,12 +97,11 @@ public class ReceiveAddressControllerTest extends BaseTestController { ...@@ -98,12 +97,11 @@ public class ReceiveAddressControllerTest extends BaseTestController {
form.setReceiverTelephone("(024)24850576"); form.setReceiverTelephone("(024)24850576");
form.setLon("123.464052"); form.setLon("123.464052");
form.setLat("41.800415"); form.setLat("41.800415");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -136,12 +134,11 @@ public class ReceiveAddressControllerTest extends BaseTestController { ...@@ -136,12 +134,11 @@ public class ReceiveAddressControllerTest extends BaseTestController {
form.setReceiverTelephone("(024)24850576"); form.setReceiverTelephone("(024)24850576");
form.setLon("123.464052"); form.setLon("123.464052");
form.setLat("41.800415"); form.setLat("41.800415");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -174,12 +171,11 @@ public class ReceiveAddressControllerTest extends BaseTestController { ...@@ -174,12 +171,11 @@ public class ReceiveAddressControllerTest extends BaseTestController {
form.setReceiverTelephone("(024)24850576"); form.setReceiverTelephone("(024)24850576");
form.setLon("123.464053"); form.setLon("123.464053");
form.setLat("41.800416"); form.setLat("41.800416");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -213,12 +209,11 @@ public class ReceiveAddressControllerTest extends BaseTestController { ...@@ -213,12 +209,11 @@ public class ReceiveAddressControllerTest extends BaseTestController {
form.setReceiverTelephone("(024)24850576"); form.setReceiverTelephone("(024)24850576");
form.setLon("123.464053"); form.setLon("123.464053");
form.setLat("41.800416"); form.setLat("41.800416");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -252,12 +247,11 @@ public class ReceiveAddressControllerTest extends BaseTestController { ...@@ -252,12 +247,11 @@ public class ReceiveAddressControllerTest extends BaseTestController {
form.setReceiverTelephone("(024)24850576"); form.setReceiverTelephone("(024)24850576");
form.setLon("123.464053"); form.setLon("123.464053");
form.setLat("41.800416"); form.setLat("41.800416");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -280,12 +274,11 @@ public class ReceiveAddressControllerTest extends BaseTestController { ...@@ -280,12 +274,11 @@ public class ReceiveAddressControllerTest extends BaseTestController {
// 构造数据 // 构造数据
DeleteAddressForm form = new DeleteAddressForm(); DeleteAddressForm form = new DeleteAddressForm();
form.setId("1,2,3,4,5"); form.setId("1,2,3,4,5");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -309,12 +302,11 @@ public class ReceiveAddressControllerTest extends BaseTestController { ...@@ -309,12 +302,11 @@ public class ReceiveAddressControllerTest extends BaseTestController {
// 构造数据 // 构造数据
ReceiveAddressForm form = new ReceiveAddressForm(); ReceiveAddressForm form = new ReceiveAddressForm();
form.setId(3L); form.setId(3L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -338,12 +330,11 @@ public class ReceiveAddressControllerTest extends BaseTestController { ...@@ -338,12 +330,11 @@ public class ReceiveAddressControllerTest extends BaseTestController {
// 构造数据 // 构造数据
ReceiveAddressForm form = new ReceiveAddressForm(); ReceiveAddressForm form = new ReceiveAddressForm();
form.setId(9999L); form.setId(9999L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -366,12 +357,11 @@ public class ReceiveAddressControllerTest extends BaseTestController { ...@@ -366,12 +357,11 @@ public class ReceiveAddressControllerTest extends BaseTestController {
// 构造数据 // 构造数据
ReceiveAddressForm form = new ReceiveAddressForm(); ReceiveAddressForm form = new ReceiveAddressForm();
form.setOwnerId(1L); form.setOwnerId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -395,12 +385,11 @@ public class ReceiveAddressControllerTest extends BaseTestController { ...@@ -395,12 +385,11 @@ public class ReceiveAddressControllerTest extends BaseTestController {
ReceiveAddressForm form = new ReceiveAddressForm(); ReceiveAddressForm form = new ReceiveAddressForm();
form.setPageNum(1); form.setPageNum(1);
form.setPageSize(10); form.setPageSize(10);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
......
src/test/java/com/esv/freight/customer/module/goodsowner/controller/RegularlyRouteControllerTest.java
View file @ e1efd106
...@@ -52,12 +52,11 @@ public class RegularlyRouteControllerTest extends BaseTestController { ...@@ -52,12 +52,11 @@ public class RegularlyRouteControllerTest extends BaseTestController {
form.setRouteName("沈阳-大连英歌石植物园线路"); form.setRouteName("沈阳-大连英歌石植物园线路");
form.setDeliveryId(7L); form.setDeliveryId(7L);
form.setReceiveId(5L); form.setReceiveId(5L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -84,12 +83,11 @@ public class RegularlyRouteControllerTest extends BaseTestController { ...@@ -84,12 +83,11 @@ public class RegularlyRouteControllerTest extends BaseTestController {
form.setRouteName("沈阳-大连线路"); form.setRouteName("沈阳-大连线路");
form.setDeliveryId(7L); form.setDeliveryId(7L);
form.setReceiveId(5L); form.setReceiveId(5L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -115,12 +113,11 @@ public class RegularlyRouteControllerTest extends BaseTestController { ...@@ -115,12 +113,11 @@ public class RegularlyRouteControllerTest extends BaseTestController {
form.setRouteName("沈阳-大连线路111"); form.setRouteName("沈阳-大连线路111");
form.setDeliveryId(7L); form.setDeliveryId(7L);
form.setReceiveId(5L); form.setReceiveId(5L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -146,12 +143,11 @@ public class RegularlyRouteControllerTest extends BaseTestController { ...@@ -146,12 +143,11 @@ public class RegularlyRouteControllerTest extends BaseTestController {
form.setRouteName("沈阳-大连线路111"); form.setRouteName("沈阳-大连线路111");
form.setDeliveryId(99999L); form.setDeliveryId(99999L);
form.setReceiveId(5L); form.setReceiveId(5L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -177,12 +173,11 @@ public class RegularlyRouteControllerTest extends BaseTestController { ...@@ -177,12 +173,11 @@ public class RegularlyRouteControllerTest extends BaseTestController {
form.setRouteName("沈阳-大连线路111"); form.setRouteName("沈阳-大连线路111");
form.setDeliveryId(7L); form.setDeliveryId(7L);
form.setReceiveId(99999L); form.setReceiveId(99999L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -208,12 +203,11 @@ public class RegularlyRouteControllerTest extends BaseTestController { ...@@ -208,12 +203,11 @@ public class RegularlyRouteControllerTest extends BaseTestController {
form.setRouteName("沈阳-大连华宇大厦线路"); form.setRouteName("沈阳-大连华宇大厦线路");
form.setDeliveryId(7L); form.setDeliveryId(7L);
form.setReceiveId(6L); form.setReceiveId(6L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -240,12 +234,11 @@ public class RegularlyRouteControllerTest extends BaseTestController { ...@@ -240,12 +234,11 @@ public class RegularlyRouteControllerTest extends BaseTestController {
form.setRouteName("沈阳-大连华宇大厦线路"); form.setRouteName("沈阳-大连华宇大厦线路");
form.setDeliveryId(7L); form.setDeliveryId(7L);
form.setReceiveId(6L); form.setReceiveId(6L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -272,12 +265,11 @@ public class RegularlyRouteControllerTest extends BaseTestController { ...@@ -272,12 +265,11 @@ public class RegularlyRouteControllerTest extends BaseTestController {
form.setRouteName("沈阳-大连英歌石植物园线路"); form.setRouteName("沈阳-大连英歌石植物园线路");
form.setDeliveryId(7L); form.setDeliveryId(7L);
form.setReceiveId(6L); form.setReceiveId(6L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -304,12 +296,11 @@ public class RegularlyRouteControllerTest extends BaseTestController { ...@@ -304,12 +296,11 @@ public class RegularlyRouteControllerTest extends BaseTestController {
form.setRouteName("沈阳-大连英歌石植物园线路111"); form.setRouteName("沈阳-大连英歌石植物园线路111");
form.setDeliveryId(7L); form.setDeliveryId(7L);
form.setReceiveId(6L); form.setReceiveId(6L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -336,12 +327,11 @@ public class RegularlyRouteControllerTest extends BaseTestController { ...@@ -336,12 +327,11 @@ public class RegularlyRouteControllerTest extends BaseTestController {
form.setRouteName("沈阳-大连英歌石植物园线路111"); form.setRouteName("沈阳-大连英歌石植物园线路111");
form.setDeliveryId(99999L); form.setDeliveryId(99999L);
form.setReceiveId(6L); form.setReceiveId(6L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -368,12 +358,11 @@ public class RegularlyRouteControllerTest extends BaseTestController { ...@@ -368,12 +358,11 @@ public class RegularlyRouteControllerTest extends BaseTestController {
form.setRouteName("沈阳-大连英歌石植物园线路111"); form.setRouteName("沈阳-大连英歌石植物园线路111");
form.setDeliveryId(7L); form.setDeliveryId(7L);
form.setReceiveId(99999L); form.setReceiveId(99999L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -396,12 +385,11 @@ public class RegularlyRouteControllerTest extends BaseTestController { ...@@ -396,12 +385,11 @@ public class RegularlyRouteControllerTest extends BaseTestController {
// 构造数据 // 构造数据
DeleteAddressForm form = new DeleteAddressForm(); DeleteAddressForm form = new DeleteAddressForm();
form.setId("1,2,3,4,5,6,7"); form.setId("1,2,3,4,5,6,7");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -424,12 +412,11 @@ public class RegularlyRouteControllerTest extends BaseTestController { ...@@ -424,12 +412,11 @@ public class RegularlyRouteControllerTest extends BaseTestController {
// 构造数据 // 构造数据
RegularlyRouteForm form = new RegularlyRouteForm(); RegularlyRouteForm form = new RegularlyRouteForm();
form.setId(1L); form.setId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -452,12 +439,11 @@ public class RegularlyRouteControllerTest extends BaseTestController { ...@@ -452,12 +439,11 @@ public class RegularlyRouteControllerTest extends BaseTestController {
// 构造数据 // 构造数据
RegularlyRouteForm form = new RegularlyRouteForm(); RegularlyRouteForm form = new RegularlyRouteForm();
form.setId(99999L); form.setId(99999L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -479,12 +465,11 @@ public class RegularlyRouteControllerTest extends BaseTestController { ...@@ -479,12 +465,11 @@ public class RegularlyRouteControllerTest extends BaseTestController {
// 构造数据 // 构造数据
RegularlyRouteForm form = new RegularlyRouteForm(); RegularlyRouteForm form = new RegularlyRouteForm();
form.setOwnerId(1L); form.setOwnerId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -510,12 +495,11 @@ public class RegularlyRouteControllerTest extends BaseTestController { ...@@ -510,12 +495,11 @@ public class RegularlyRouteControllerTest extends BaseTestController {
form.setReceiveAddressName("植物园"); form.setReceiveAddressName("植物园");
form.setPageNum(1); form.setPageNum(1);
form.setPageSize(10); form.setPageSize(10);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
......
src/test/java/com/esv/freight/customer/module/vehicle/controller/VehicleControllerAddTest.java
View file @ e1efd106
...@@ -83,12 +83,10 @@ public class VehicleControllerAddTest extends BaseTestController { ...@@ -83,12 +83,10 @@ public class VehicleControllerAddTest extends BaseTestController {
form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_001.jpg"); form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_001.jpg");
form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_001.jpg"); form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_001.jpg");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -146,12 +144,10 @@ public class VehicleControllerAddTest extends BaseTestController { ...@@ -146,12 +144,10 @@ public class VehicleControllerAddTest extends BaseTestController {
form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_011.jpg"); form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_011.jpg");
form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_011.jpg"); form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_011.jpg");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -210,12 +206,10 @@ public class VehicleControllerAddTest extends BaseTestController { ...@@ -210,12 +206,10 @@ public class VehicleControllerAddTest extends BaseTestController {
form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_011.jpg"); form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_011.jpg");
form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_011.jpg"); form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_011.jpg");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -273,12 +267,10 @@ public class VehicleControllerAddTest extends BaseTestController { ...@@ -273,12 +267,10 @@ public class VehicleControllerAddTest extends BaseTestController {
form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_011.jpg"); form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_011.jpg");
form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_011.jpg"); form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_011.jpg");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -336,12 +328,10 @@ public class VehicleControllerAddTest extends BaseTestController { ...@@ -336,12 +328,10 @@ public class VehicleControllerAddTest extends BaseTestController {
form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_011.jpg"); form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_011.jpg");
form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_011.jpg"); form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_011.jpg");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -399,12 +389,10 @@ public class VehicleControllerAddTest extends BaseTestController { ...@@ -399,12 +389,10 @@ public class VehicleControllerAddTest extends BaseTestController {
form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_011.jpg"); form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_011.jpg");
form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_011.jpg"); form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_011.jpg");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -462,12 +450,10 @@ public class VehicleControllerAddTest extends BaseTestController { ...@@ -462,12 +450,10 @@ public class VehicleControllerAddTest extends BaseTestController {
form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_011.jpg"); form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_011.jpg");
form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_011.jpg"); form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_011.jpg");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -525,12 +511,10 @@ public class VehicleControllerAddTest extends BaseTestController { ...@@ -525,12 +511,10 @@ public class VehicleControllerAddTest extends BaseTestController {
form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_011.jpg"); form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_011.jpg");
form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_011.jpg"); form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_011.jpg");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
......
src/test/java/com/esv/freight/customer/module/vehicle/controller/VehicleControllerEditTest.java
View file @ e1efd106
...@@ -84,12 +84,10 @@ public class VehicleControllerEditTest extends BaseTestController { ...@@ -84,12 +84,10 @@ public class VehicleControllerEditTest extends BaseTestController {
form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_001.jpg"); form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_001.jpg");
form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_001.jpg"); form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_001.jpg");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -127,12 +125,10 @@ public class VehicleControllerEditTest extends BaseTestController { ...@@ -127,12 +125,10 @@ public class VehicleControllerEditTest extends BaseTestController {
form.setLoadCapacity(new BigDecimal("4.0")); form.setLoadCapacity(new BigDecimal("4.0"));
form.setTotalMass(new BigDecimal("5.1")); form.setTotalMass(new BigDecimal("5.1"));
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -156,12 +152,10 @@ public class VehicleControllerEditTest extends BaseTestController { ...@@ -156,12 +152,10 @@ public class VehicleControllerEditTest extends BaseTestController {
form.setId(1L); form.setId(1L);
form.setLicenseNumber("辽A12302"); form.setLicenseNumber("辽A12302");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -185,12 +179,10 @@ public class VehicleControllerEditTest extends BaseTestController { ...@@ -185,12 +179,10 @@ public class VehicleControllerEditTest extends BaseTestController {
form.setId(1L); form.setId(1L);
form.setVehicleLicenseNumber("210101123457"); form.setVehicleLicenseNumber("210101123457");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -214,12 +206,10 @@ public class VehicleControllerEditTest extends BaseTestController { ...@@ -214,12 +206,10 @@ public class VehicleControllerEditTest extends BaseTestController {
form.setId(1L); form.setId(1L);
form.setRoadCertificateNumber("510184010714"); form.setRoadCertificateNumber("510184010714");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -243,12 +233,10 @@ public class VehicleControllerEditTest extends BaseTestController { ...@@ -243,12 +233,10 @@ public class VehicleControllerEditTest extends BaseTestController {
form.setId(1L); form.setId(1L);
form.setLoadCapacity(new BigDecimal("5.0")); form.setLoadCapacity(new BigDecimal("5.0"));
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
......
src/test/java/com/esv/freight/customer/module/vehicle/controller/VehicleControllerTest.java
View file @ e1efd106
...@@ -50,12 +50,10 @@ public class VehicleControllerTest extends BaseTestController { ...@@ -50,12 +50,10 @@ public class VehicleControllerTest extends BaseTestController {
VehicleQueryForm form = new VehicleQueryForm(); VehicleQueryForm form = new VehicleQueryForm();
form.setId(1L); form.setId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -79,12 +77,10 @@ public class VehicleControllerTest extends BaseTestController { ...@@ -79,12 +77,10 @@ public class VehicleControllerTest extends BaseTestController {
VehicleQueryForm form = new VehicleQueryForm(); VehicleQueryForm form = new VehicleQueryForm();
form.setId(99999L); form.setId(99999L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -110,12 +106,10 @@ public class VehicleControllerTest extends BaseTestController { ...@@ -110,12 +106,10 @@ public class VehicleControllerTest extends BaseTestController {
form.setAuditState(VehicleConstants.VEHICLE_AUDIT_STATUS_FAILURE); form.setAuditState(VehicleConstants.VEHICLE_AUDIT_STATUS_FAILURE);
form.setRemark("审核不通过test"); form.setRemark("审核不通过test");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -141,12 +135,10 @@ public class VehicleControllerTest extends BaseTestController { ...@@ -141,12 +135,10 @@ public class VehicleControllerTest extends BaseTestController {
form.setAuditState(VehicleConstants.VEHICLE_AUDIT_STATUS_FAILURE); form.setAuditState(VehicleConstants.VEHICLE_AUDIT_STATUS_FAILURE);
form.setRemark("审核不通过test"); form.setRemark("审核不通过test");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -172,12 +164,10 @@ public class VehicleControllerTest extends BaseTestController { ...@@ -172,12 +164,10 @@ public class VehicleControllerTest extends BaseTestController {
form.setAuditState(VehicleConstants.VEHICLE_AUDIT_STATUS_SUCCESS); form.setAuditState(VehicleConstants.VEHICLE_AUDIT_STATUS_SUCCESS);
form.setRemark("审核通过test"); form.setRemark("审核通过test");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -202,12 +192,10 @@ public class VehicleControllerTest extends BaseTestController { ...@@ -202,12 +192,10 @@ public class VehicleControllerTest extends BaseTestController {
form.setId(1L); form.setId(1L);
form.setAuditState(VehicleConstants.VEHICLE_AUDIT_STATUS_FAILURE); form.setAuditState(VehicleConstants.VEHICLE_AUDIT_STATUS_FAILURE);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -230,12 +218,10 @@ public class VehicleControllerTest extends BaseTestController { ...@@ -230,12 +218,10 @@ public class VehicleControllerTest extends BaseTestController {
VehicleQueryForm form = new VehicleQueryForm(); VehicleQueryForm form = new VehicleQueryForm();
form.setId(1L); form.setId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -259,12 +245,10 @@ public class VehicleControllerTest extends BaseTestController { ...@@ -259,12 +245,10 @@ public class VehicleControllerTest extends BaseTestController {
VehicleQueryForm form = new VehicleQueryForm(); VehicleQueryForm form = new VehicleQueryForm();
form.setId(99999L); form.setId(99999L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -288,12 +272,10 @@ public class VehicleControllerTest extends BaseTestController { ...@@ -288,12 +272,10 @@ public class VehicleControllerTest extends BaseTestController {
VehicleQueryForm form = new VehicleQueryForm(); VehicleQueryForm form = new VehicleQueryForm();
form.setId(1L); form.setId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -317,12 +299,10 @@ public class VehicleControllerTest extends BaseTestController { ...@@ -317,12 +299,10 @@ public class VehicleControllerTest extends BaseTestController {
VehicleQueryForm form = new VehicleQueryForm(); VehicleQueryForm form = new VehicleQueryForm();
form.setId(99999L); form.setId(99999L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -346,12 +326,10 @@ public class VehicleControllerTest extends BaseTestController { ...@@ -346,12 +326,10 @@ public class VehicleControllerTest extends BaseTestController {
VehicleQueryForm form = new VehicleQueryForm(); VehicleQueryForm form = new VehicleQueryForm();
form.setId(1L); form.setId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -375,12 +353,10 @@ public class VehicleControllerTest extends BaseTestController { ...@@ -375,12 +353,10 @@ public class VehicleControllerTest extends BaseTestController {
VehicleQueryForm form = new VehicleQueryForm(); VehicleQueryForm form = new VehicleQueryForm();
form.setId(1L); form.setId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -404,12 +380,10 @@ public class VehicleControllerTest extends BaseTestController { ...@@ -404,12 +380,10 @@ public class VehicleControllerTest extends BaseTestController {
VehicleQueryForm form = new VehicleQueryForm(); VehicleQueryForm form = new VehicleQueryForm();
form.setId(99999L); form.setId(99999L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -433,12 +407,10 @@ public class VehicleControllerTest extends BaseTestController { ...@@ -433,12 +407,10 @@ public class VehicleControllerTest extends BaseTestController {
VehicleQueryForm form = new VehicleQueryForm(); VehicleQueryForm form = new VehicleQueryForm();
form.setId(1L); form.setId(1L);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -463,12 +435,10 @@ public class VehicleControllerTest extends BaseTestController { ...@@ -463,12 +435,10 @@ public class VehicleControllerTest extends BaseTestController {
form.setPageNum(1); form.setPageNum(1);
form.setPageSize(10); form.setPageSize(10);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
...@@ -495,12 +465,10 @@ public class VehicleControllerTest extends BaseTestController { ...@@ -495,12 +465,10 @@ public class VehicleControllerTest extends BaseTestController {
form.setPageNum(1); form.setPageNum(1);
form.setPageSize(10); form.setPageSize(10);
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url) MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE) .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders()) .headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString())) .content(form.toString()))
.andDo(MockMvcResultHandlers.print()) .andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())
.andReturn(); .andReturn();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment