#14 开始整理Modules的单元测试,提高测试覆盖率,并顺手改进代码。
This commit is contained in:
@@ -254,6 +254,7 @@
|
||||
<excludes>
|
||||
<exclude>**/entity/**/*.class</exclude>
|
||||
<exclude>**/dto/**/*.class</exclude>
|
||||
<exclude>**/response/**/*.class</exclude>
|
||||
</excludes>
|
||||
</instrumentation>
|
||||
</configuration>
|
||||
|
||||
+6
-6
@@ -5,9 +5,9 @@ import javax.jws.WebService;
|
||||
|
||||
import org.springside.examples.miniservice.webservice.WsConstants;
|
||||
import org.springside.examples.miniservice.webservice.dto.UserDTO;
|
||||
import org.springside.examples.miniservice.webservice.ws.result.DepartmentResult;
|
||||
import org.springside.examples.miniservice.webservice.ws.result.UserListResult;
|
||||
import org.springside.examples.miniservice.webservice.ws.result.base.IdResult;
|
||||
import org.springside.examples.miniservice.webservice.ws.response.DepartmentResponse;
|
||||
import org.springside.examples.miniservice.webservice.ws.response.UserListResponse;
|
||||
import org.springside.examples.miniservice.webservice.ws.response.base.IdResponse;
|
||||
|
||||
/**
|
||||
* JAX-WS2.0的WebService接口定义类.
|
||||
@@ -23,16 +23,16 @@ public interface AccountWebService {
|
||||
/**
|
||||
* 获取部门的详细信息.
|
||||
*/
|
||||
DepartmentResult getDepartmentDetail(@WebParam(name = "id") Long id);
|
||||
DepartmentResponse getDepartmentDetail(@WebParam(name = "id") Long id);
|
||||
|
||||
/**
|
||||
* 搜索用户信息.
|
||||
*/
|
||||
UserListResult searchUser(@WebParam(name = "loginName") String loginName, @WebParam(name = "name") String name);
|
||||
UserListResponse searchUser(@WebParam(name = "loginName") String loginName, @WebParam(name = "name") String name);
|
||||
|
||||
/**
|
||||
* 新建用户.
|
||||
*/
|
||||
IdResult createUser(@WebParam(name = "user") UserDTO user);
|
||||
IdResponse createUser(@WebParam(name = "user") UserDTO user);
|
||||
|
||||
}
|
||||
|
||||
+16
-16
@@ -18,10 +18,10 @@ import org.springside.examples.miniservice.webservice.WsConstants;
|
||||
import org.springside.examples.miniservice.webservice.dto.DepartmentDTO;
|
||||
import org.springside.examples.miniservice.webservice.dto.UserDTO;
|
||||
import org.springside.examples.miniservice.webservice.ws.AccountWebService;
|
||||
import org.springside.examples.miniservice.webservice.ws.result.DepartmentResult;
|
||||
import org.springside.examples.miniservice.webservice.ws.result.UserListResult;
|
||||
import org.springside.examples.miniservice.webservice.ws.result.base.IdResult;
|
||||
import org.springside.examples.miniservice.webservice.ws.result.base.WSResult;
|
||||
import org.springside.examples.miniservice.webservice.ws.response.DepartmentResponse;
|
||||
import org.springside.examples.miniservice.webservice.ws.response.UserListResponse;
|
||||
import org.springside.examples.miniservice.webservice.ws.response.base.IdResponse;
|
||||
import org.springside.examples.miniservice.webservice.ws.response.base.WSResponse;
|
||||
import org.springside.modules.beanvalidator.BeanValidators;
|
||||
import org.springside.modules.mapper.BeanMapper;
|
||||
|
||||
@@ -44,7 +44,7 @@ public class AccountWebServiceImpl implements AccountWebService {
|
||||
* @see AccountWebService#getDepartmentDetail()
|
||||
*/
|
||||
@Override
|
||||
public DepartmentResult getDepartmentDetail(Long id) {
|
||||
public DepartmentResponse getDepartmentDetail(Long id) {
|
||||
try {
|
||||
Department entity = accountManager.getDepartmentDetail(id);
|
||||
|
||||
@@ -52,13 +52,13 @@ public class AccountWebServiceImpl implements AccountWebService {
|
||||
|
||||
DepartmentDTO dto = BeanMapper.map(entity, DepartmentDTO.class);
|
||||
|
||||
return new DepartmentResult(dto);
|
||||
return new DepartmentResponse(dto);
|
||||
} catch (IllegalArgumentException e) {
|
||||
logger.error(e.getMessage());
|
||||
return new DepartmentResult().setError(WSResult.PARAMETER_ERROR, e.getMessage());
|
||||
return new DepartmentResponse().setError(WSResponse.PARAMETER_ERROR, e.getMessage());
|
||||
} catch (RuntimeException e) {
|
||||
logger.error(e.getMessage(), e);
|
||||
return new DepartmentResult().setDefaultError();
|
||||
return new DepartmentResponse().setDefaultError();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -66,16 +66,16 @@ public class AccountWebServiceImpl implements AccountWebService {
|
||||
* @see AccountWebService#searchUser()
|
||||
*/
|
||||
@Override
|
||||
public UserListResult searchUser(String loginName, String name) {
|
||||
public UserListResponse searchUser(String loginName, String name) {
|
||||
try {
|
||||
List<User> entityList = accountManager.searchUser(loginName, name);
|
||||
|
||||
List<UserDTO> dtoList = BeanMapper.mapList(entityList, UserDTO.class);
|
||||
|
||||
return new UserListResult(dtoList);
|
||||
return new UserListResponse(dtoList);
|
||||
} catch (RuntimeException e) {
|
||||
logger.error(e.getMessage(), e);
|
||||
return new UserListResult().setDefaultError();
|
||||
return new UserListResponse().setDefaultError();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -83,23 +83,23 @@ public class AccountWebServiceImpl implements AccountWebService {
|
||||
* @see AccountWebService#createUser()
|
||||
*/
|
||||
@Override
|
||||
public IdResult createUser(UserDTO user) {
|
||||
public IdResponse createUser(UserDTO user) {
|
||||
try {
|
||||
User userEntity = BeanMapper.map(user, User.class);
|
||||
|
||||
Long userId = accountManager.saveUser(userEntity);
|
||||
|
||||
return new IdResult(userId);
|
||||
return new IdResponse(userId);
|
||||
} catch (ConstraintViolationException e) {
|
||||
String message = StringUtils.join(BeanValidators.extractPropertyAndMessage(e), "\n");
|
||||
return new IdResult().setError(WSResult.PARAMETER_ERROR, message);
|
||||
return new IdResponse().setError(WSResponse.PARAMETER_ERROR, message);
|
||||
} catch (DataIntegrityViolationException e) {
|
||||
String message = "新建用户参数存在唯一性冲突(用户:" + user + ")";
|
||||
logger.error(message, e);
|
||||
return new IdResult().setError(WSResult.PARAMETER_ERROR, message);
|
||||
return new IdResponse().setError(WSResponse.PARAMETER_ERROR, message);
|
||||
} catch (RuntimeException e) {
|
||||
logger.error(e.getMessage(), e);
|
||||
return new IdResult().setDefaultError();
|
||||
return new IdResponse().setDefaultError();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+7
-7
@@ -1,26 +1,26 @@
|
||||
package org.springside.examples.miniservice.webservice.ws.result;
|
||||
package org.springside.examples.miniservice.webservice.ws.response;
|
||||
|
||||
import javax.xml.bind.annotation.XmlType;
|
||||
|
||||
import org.springside.examples.miniservice.webservice.WsConstants;
|
||||
import org.springside.examples.miniservice.webservice.dto.DepartmentDTO;
|
||||
import org.springside.examples.miniservice.webservice.ws.result.base.WSResult;
|
||||
import org.springside.examples.miniservice.webservice.ws.response.base.WSResponse;
|
||||
|
||||
/**
|
||||
* GetDepartment方法的返回结果.
|
||||
* 包含Department的返回结果.
|
||||
*
|
||||
* @author calvin
|
||||
* @author badqiu
|
||||
*/
|
||||
@XmlType(name = "DepartmentResult", namespace = WsConstants.NS)
|
||||
public class DepartmentResult extends WSResult {
|
||||
@XmlType(name = "DepartmentResponse", namespace = WsConstants.NS)
|
||||
public class DepartmentResponse extends WSResponse {
|
||||
|
||||
private DepartmentDTO department;
|
||||
|
||||
public DepartmentResult() {
|
||||
public DepartmentResponse() {
|
||||
}
|
||||
|
||||
public DepartmentResult(DepartmentDTO department) {
|
||||
public DepartmentResponse(DepartmentDTO department) {
|
||||
this.department = department;
|
||||
}
|
||||
|
||||
+7
-7
@@ -1,4 +1,4 @@
|
||||
package org.springside.examples.miniservice.webservice.ws.result;
|
||||
package org.springside.examples.miniservice.webservice.ws.response;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -8,23 +8,23 @@ import javax.xml.bind.annotation.XmlType;
|
||||
|
||||
import org.springside.examples.miniservice.webservice.WsConstants;
|
||||
import org.springside.examples.miniservice.webservice.dto.UserDTO;
|
||||
import org.springside.examples.miniservice.webservice.ws.result.base.WSResult;
|
||||
import org.springside.examples.miniservice.webservice.ws.response.base.WSResponse;
|
||||
|
||||
/**
|
||||
* 包含User
|
||||
* 包含UserList的返回结果.
|
||||
*
|
||||
* @author calvin
|
||||
* @author badqiu
|
||||
*/
|
||||
@XmlType(name = "UserPageResult", namespace = WsConstants.NS)
|
||||
public class UserListResult extends WSResult {
|
||||
@XmlType(name = "UserListResponse", namespace = WsConstants.NS)
|
||||
public class UserListResponse extends WSResponse {
|
||||
|
||||
private List<UserDTO> userList;
|
||||
|
||||
public UserListResult() {
|
||||
public UserListResponse() {
|
||||
}
|
||||
|
||||
public UserListResult(List<UserDTO> userList) {
|
||||
public UserListResponse(List<UserDTO> userList) {
|
||||
this.userList = userList;
|
||||
}
|
||||
|
||||
+5
-5
@@ -1,4 +1,4 @@
|
||||
package org.springside.examples.miniservice.webservice.ws.result.base;
|
||||
package org.springside.examples.miniservice.webservice.ws.response.base;
|
||||
|
||||
import javax.xml.bind.annotation.XmlType;
|
||||
|
||||
@@ -10,14 +10,14 @@ import org.springside.examples.miniservice.webservice.WsConstants;
|
||||
* @author badqiu
|
||||
*
|
||||
*/
|
||||
@XmlType(name = "IdResult", namespace = WsConstants.NS)
|
||||
public class IdResult extends WSResult {
|
||||
@XmlType(name = "IdResponse", namespace = WsConstants.NS)
|
||||
public class IdResponse extends WSResponse {
|
||||
private Long id;
|
||||
|
||||
public IdResult() {
|
||||
public IdResponse() {
|
||||
}
|
||||
|
||||
public IdResult(Long id) {
|
||||
public IdResponse(Long id) {
|
||||
super();
|
||||
this.id = id;
|
||||
}
|
||||
+5
-5
@@ -1,4 +1,4 @@
|
||||
package org.springside.examples.miniservice.webservice.ws.result.base;
|
||||
package org.springside.examples.miniservice.webservice.ws.response.base;
|
||||
|
||||
import javax.xml.bind.annotation.XmlType;
|
||||
|
||||
@@ -9,8 +9,8 @@ import org.springside.examples.miniservice.webservice.WsConstants;
|
||||
*
|
||||
* @author calvin
|
||||
*/
|
||||
@XmlType(name = "WSResult", namespace = WsConstants.NS)
|
||||
public class WSResult {
|
||||
@XmlType(name = "WSResponse", namespace = WsConstants.NS)
|
||||
public class WSResponse {
|
||||
|
||||
//-- 返回代码定义 --//
|
||||
// 按项目的规则进行定义, 比如4xx代表客户端参数错误,5xx代表服务端业务错误等.
|
||||
@@ -27,7 +27,7 @@ public class WSResult {
|
||||
/**
|
||||
* 创建结果.
|
||||
*/
|
||||
public <T extends WSResult> T setError(String resultCode, String resultMessage) {
|
||||
public <T extends WSResponse> T setError(String resultCode, String resultMessage) {
|
||||
code = resultCode;
|
||||
message = resultMessage;
|
||||
return (T) this;
|
||||
@@ -36,7 +36,7 @@ public class WSResult {
|
||||
/**
|
||||
* 创建默认异常结果.
|
||||
*/
|
||||
public <T extends WSResult> T setDefaultError() {
|
||||
public <T extends WSResponse> T setDefaultError() {
|
||||
return (T) setError(SYSTEM_ERROR, SYSTEM_ERROR_MESSAGE);
|
||||
}
|
||||
|
||||
+2
-2
@@ -13,7 +13,7 @@ import org.junit.Test;
|
||||
import org.junit.experimental.categories.Category;
|
||||
import org.springside.examples.miniservice.functional.BaseFunctionalTestCase;
|
||||
import org.springside.examples.miniservice.webservice.ws.AccountWebService;
|
||||
import org.springside.examples.miniservice.webservice.ws.result.UserListResult;
|
||||
import org.springside.examples.miniservice.webservice.ws.response.UserListResponse;
|
||||
import org.springside.modules.test.category.Smoke;
|
||||
|
||||
/**
|
||||
@@ -54,7 +54,7 @@ public class AccountWebServiceWithDynamicCreateClientIT extends BaseFunctionalTe
|
||||
public void searchUser() {
|
||||
AccountWebService accountWebService = creatClient();
|
||||
|
||||
UserListResult result = accountWebService.searchUser(null, null);
|
||||
UserListResponse result = accountWebService.searchUser(null, null);
|
||||
|
||||
assertTrue(result.getUserList().size() >= 4);
|
||||
assertEquals("Jack", result.getUserList().get(0).getName());
|
||||
|
||||
+6
-6
@@ -15,8 +15,8 @@ import org.springside.examples.miniservice.entity.User;
|
||||
import org.springside.examples.miniservice.functional.BaseFunctionalTestCase;
|
||||
import org.springside.examples.miniservice.webservice.dto.UserDTO;
|
||||
import org.springside.examples.miniservice.webservice.ws.AccountWebService;
|
||||
import org.springside.examples.miniservice.webservice.ws.result.base.IdResult;
|
||||
import org.springside.examples.miniservice.webservice.ws.result.base.WSResult;
|
||||
import org.springside.examples.miniservice.webservice.ws.response.base.IdResponse;
|
||||
import org.springside.examples.miniservice.webservice.ws.response.base.WSResponse;
|
||||
|
||||
/**
|
||||
* UserService Web服务的功能测试, 测试主要的接口调用.
|
||||
@@ -45,7 +45,7 @@ public class AccountWebServiceWithPredefineClientIT extends BaseFunctionalTestCa
|
||||
userDTO.setName(user.getName());
|
||||
userDTO.setEmail(user.getEmail());
|
||||
|
||||
IdResult result = accountWebServiceClient.createUser(userDTO);
|
||||
IdResponse result = accountWebServiceClient.createUser(userDTO);
|
||||
assertNotNull(result.getId());
|
||||
}
|
||||
|
||||
@@ -59,12 +59,12 @@ public class AccountWebServiceWithPredefineClientIT extends BaseFunctionalTestCa
|
||||
|
||||
//登录名为空
|
||||
userDTO.setLoginName(null);
|
||||
IdResult result = accountWebServiceClient.createUser(userDTO);
|
||||
assertEquals(result.getCode(), WSResult.PARAMETER_ERROR);
|
||||
IdResponse result = accountWebServiceClient.createUser(userDTO);
|
||||
assertEquals(result.getCode(), WSResponse.PARAMETER_ERROR);
|
||||
|
||||
//登录名重复
|
||||
userDTO.setLoginName("user1");
|
||||
result = accountWebServiceClient.createUser(userDTO);
|
||||
assertEquals(result.getCode(), WSResult.PARAMETER_ERROR);
|
||||
assertEquals(result.getCode(), WSResponse.PARAMETER_ERROR);
|
||||
}
|
||||
}
|
||||
|
||||
+7
-7
@@ -12,8 +12,8 @@ import org.springside.examples.miniservice.entity.Department;
|
||||
import org.springside.examples.miniservice.service.AccountManager;
|
||||
import org.springside.examples.miniservice.webservice.dto.DepartmentDTO;
|
||||
import org.springside.examples.miniservice.webservice.ws.impl.AccountWebServiceImpl;
|
||||
import org.springside.examples.miniservice.webservice.ws.result.DepartmentResult;
|
||||
import org.springside.examples.miniservice.webservice.ws.result.base.WSResult;
|
||||
import org.springside.examples.miniservice.webservice.ws.response.DepartmentResponse;
|
||||
import org.springside.examples.miniservice.webservice.ws.response.base.WSResponse;
|
||||
|
||||
/**
|
||||
* Account WebService的单元测试用例.
|
||||
@@ -45,9 +45,9 @@ public class AccountWebServiceTest {
|
||||
Department department = AccountData.getRandomDepartment();
|
||||
Mockito.when(mockAccountManager.getDepartmentDetail(1L)).thenReturn(department);
|
||||
|
||||
DepartmentResult result = accountWebService.getDepartmentDetail(1L);
|
||||
DepartmentResponse result = accountWebService.getDepartmentDetail(1L);
|
||||
|
||||
assertEquals(WSResult.SUCCESS, result.getCode());
|
||||
assertEquals(WSResponse.SUCCESS, result.getCode());
|
||||
|
||||
DepartmentDTO dto = result.getDepartment();
|
||||
|
||||
@@ -62,9 +62,9 @@ public class AccountWebServiceTest {
|
||||
public void handleException() {
|
||||
Mockito.when(mockAccountManager.getDepartmentDetail(1L)).thenThrow(new RuntimeException("Expected exception."));
|
||||
|
||||
DepartmentResult result = accountWebService.getDepartmentDetail(1L);
|
||||
DepartmentResponse result = accountWebService.getDepartmentDetail(1L);
|
||||
|
||||
assertEquals(WSResult.SYSTEM_ERROR, result.getCode());
|
||||
assertEquals(WSResult.SYSTEM_ERROR_MESSAGE, result.getMessage());
|
||||
assertEquals(WSResponse.SYSTEM_ERROR, result.getCode());
|
||||
assertEquals(WSResponse.SYSTEM_ERROR_MESSAGE, result.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
+3
-3
@@ -9,7 +9,7 @@ import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.springside.examples.miniweb.dao.account.UserDao;
|
||||
import org.springside.examples.miniweb.service.ServiceException;
|
||||
import org.springside.modules.test.security.shiro.ShiroTestHelper;
|
||||
import org.springside.modules.test.security.shiro.ShiroTestUtils;
|
||||
|
||||
/**
|
||||
* SecurityEntityManager的测试用例, 测试Service层的业务逻辑.
|
||||
@@ -25,7 +25,7 @@ public class AccountManagerTest {
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
ShiroTestHelper.mockSubject("foo");
|
||||
ShiroTestUtils.mockSubject("foo");
|
||||
|
||||
accountManager = new AccountManager();
|
||||
accountManager.setUserDao(mockUserDao);
|
||||
@@ -33,7 +33,7 @@ public class AccountManagerTest {
|
||||
|
||||
@After
|
||||
public void tearDown() {
|
||||
ShiroTestHelper.clearSubject();
|
||||
ShiroTestUtils.clearSubject();
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
+3
-3
@@ -11,7 +11,7 @@ import org.springside.examples.showcase.common.dao.UserJpaDao;
|
||||
import org.springside.examples.showcase.common.entity.User;
|
||||
import org.springside.examples.showcase.common.service.AccountManager;
|
||||
import org.springside.examples.showcase.common.service.ServiceException;
|
||||
import org.springside.modules.test.security.shiro.ShiroTestHelper;
|
||||
import org.springside.modules.test.security.shiro.ShiroTestUtils;
|
||||
|
||||
public class AccountManagerTest {
|
||||
|
||||
@@ -22,7 +22,7 @@ public class AccountManagerTest {
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
ShiroTestHelper.mockSubject("foo");
|
||||
ShiroTestUtils.mockSubject("foo");
|
||||
|
||||
accountManager = new AccountManager();
|
||||
accountManager.setUserJpaDao(mockUserDao);
|
||||
@@ -30,7 +30,7 @@ public class AccountManagerTest {
|
||||
|
||||
@After
|
||||
public void tearDown() {
|
||||
ShiroTestHelper.clearSubject();
|
||||
ShiroTestUtils.clearSubject();
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user