修改测评机构资源的字段以及对资源的保存和修改操作

core/src/main/java/com/mooctest/crowd/domain/dao/EvaluationAgencyResourceDao.java

@@ -13,12 +13,15 @@ public interface EvaluationAgencyResourceDao extends PagingAndSortingRepository<
 
     Optional<EvaluationAgencyResourcePO> findById(Long Id);
 
-    EvaluationAgencyResourcePO findByEvaluationAgencyId(Long evaluationAgencyId);
+    List<EvaluationAgencyResourcePO> findByEvaluationAgencyId(Long evaluationAgencyId);
 
-    List<EvaluationAgencyResourcePO> findByProfessionalsFreeCountGreaterThanEqual(int professionalsFreeCount);
+    List<EvaluationAgencyResourcePO> findByCountGreaterThanEqual(int professionalsFreeCount);
 
     List<EvaluationAgencyResourcePO> findAll();
 
     EvaluationAgencyResourcePO save(EvaluationAgencyResourcePO evaluationAgencyPO);
 
+    @Override
+    void deleteAll(Iterable<? extends EvaluationAgencyResourcePO> iterable);
+
 }

core/src/main/java/com/mooctest/crowd/domain/domainobject/EvaluationAgency.java

@@ -17,7 +17,7 @@ public class EvaluationAgency {
     private String bankAccount;
     private String address;
     private List<EvaluationAgencyAbility> evaluationAgencyAbilityList;
-    private EvaluationAgencyResource evaluationAgencyResource;
+    private List<EvaluationAgencyResource> evaluationAgencyResourceList;
     private String agencyPhoto;
     private int isAuthentication;
     private int isDeleted;
@@ -34,7 +34,7 @@ public class EvaluationAgency {
                 ", bankAccount='" + bankAccount + '\'' +
                 ", address='" + address + '\'' +
                 ", evaluationAgencyAbilityList='" + evaluationAgencyAbilityList + '\'' +
-                ", evaluationAgencyResource='" + evaluationAgencyResource + '\'' +
+                ", evaluationAgencyResourceList='" + evaluationAgencyResourceList + '\'' +
                 ", agencyPhoto='" + agencyPhoto + '\'' +
                 ", isAuthentication=" + isAuthentication +
                 ", isDeleted=" + isDeleted +

core/src/main/java/com/mooctest/crowd/domain/domainobject/EvaluationAgencyResource.java

@@ -11,34 +11,28 @@ public class EvaluationAgencyResource {
 
     private Long id;
     private Long evaluationAgencyId;
-    private int professionalsCount;
-    private int professionalsFreeCount;
-    private int serversCount;
-    private int serversFreeCount;
-    private int devicesCount;
-    private int devicesFreeCount;
+    private String type;
+    private int count;
+    private int freeCount;
+    private String description;
 
     @Override
     public String toString() {
         return "EvaluationAgencyResource{" +
                 "id=" + id +
-                "evaluationAgencyId=" + evaluationAgencyId +
-                ", professionalsCount=" + professionalsCount +
-                ", professionalsFreeCount=" + professionalsFreeCount +
-                ", serversCount=" + serversCount +
-                ", serversFreeCount=" + serversFreeCount +
-                ", devicesCount=" + devicesCount +
-                ", devicesFreeCount=" + devicesFreeCount +
+                ", evaluationAgencyId=" + evaluationAgencyId +
+                ", type='" + type + '\'' +
+                ", count=" + count +
+                ", freeCount=" + freeCount +
+                ", description='" + description + '\'' +
                 '}';
     }
 
-    public EvaluationAgencyResource updateEvaluationAgencyResource(int professionalsCount, int professionalsFreeCount, int serversCount, int serversFreeCount, int devicesCount, int devicesFreeCount){
-        this.professionalsCount = professionalsCount;
-        this.professionalsFreeCount = professionalsFreeCount;
-        this.serversCount = serversCount;
-        this.serversFreeCount = serversFreeCount;
-        this.devicesCount = devicesCount;
-        this.devicesFreeCount = devicesFreeCount;
+    public EvaluationAgencyResource updateEvaluationAgencyResource(String[] resource){
+        this.type = resource[0];
+        this.count = Integer.valueOf(resource[1]);
+        this.freeCount = Integer.valueOf(resource[2]);
+        this.description = resource[3];
         return this;
     }
 }

core/src/main/java/com/mooctest/crowd/domain/domainservice/RegisterDService.java

@@ -17,10 +17,6 @@ import java.util.List;
 @Service
 public class RegisterDService {
 
-//    private DefaultFeatureConfiguration defaultFeatureConfiguration = new DefaultFeatureConfiguration();
-//
-//    private Logger LOG = LoggerFactory.getLogger(getClass());
-
     public User register(String mobile, String password) {
         User user = UserFactory.createUser();
         user.setMobile(mobile);
@@ -36,10 +32,4 @@ public class RegisterDService {
         return user;
     }
 
-//    private void createLogForRegister(String mobileNum, String reason) {
-//        Date date = new Date();
-//        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//        LOG.error("用户{}注册失败,失败时间：{},失败原因：{}",new Object[]{mobileNum,df.format(date), reason});
-//    }
-
 }

core/src/main/java/com/mooctest/crowd/domain/exception/EvaluationAgencyResourceNotExist.java

@@ -0,0 +1,12 @@
+package com.mooctest.crowd.domain.exception;
+
+/**
+ * @author guochao
+ * @date 2019-08-14 20:54
+ */
+public class EvaluationAgencyResourceNotExist  extends BaseException {
+
+    public EvaluationAgencyResourceNotExist(String msg){
+        super(msg);
+    }
+}

core/src/main/java/com/mooctest/crowd/domain/model/EvaluationAgencyPO.java

@@ -27,8 +27,8 @@ public class EvaluationAgencyPO{
     @Column(name = "EA_BANK_ACCOUNT")
     private String bankAccount;
 
-    @Column(name = "EA_RESOURCES")
-    private String resources;
+    @Column(name = "EA_ADDRESS")
+    private String address;
 
     @Column(name = "EA_PHOTO")
     private String agencyPhoto;
@@ -55,7 +55,7 @@ public class EvaluationAgencyPO{
                 ", userId=" + userId +
                 ", evaluationAgencyName='" + evaluationAgencyName + '\'' +
                 ", bankAccount='" + bankAccount + '\'' +
-                ", resources='" + resources + '\'' +
+                ", address='" + address + '\'' +
                 ", agencyPhoto='" + agencyPhoto + '\'' +
                 ", isAuthentication=" + isAuthentication +
                 ", isDeleted=" + isDeleted +

core/src/main/java/com/mooctest/crowd/domain/model/EvaluationAgencyResourcePO.java

@@ -20,35 +20,27 @@ public class EvaluationAgencyResourcePO {
     @Column(name = "EAR_EA_ID")
     private Long evaluationAgencyId;
 
-    @Column(name = "EAR_PROFESSIONALS_COUNT")
-    private int professionalsCount;
+    @Column(name = "EAR_TYPE")
+    private String type;
 
-    @Column(name = "EAR_PROFESSIONALS_FREE_COUNT")
-    private int professionalsFreeCount;
+    @Column(name = "EAR_COUNT")
+    private int count;
 
-    @Column(name = "EAR_SERVERS_COUNT")
-    private int serversCount;
+    @Column(name = "EAR_FREE_COUNT")
+    private int freeCount;
 
-    @Column(name = "EAR_SERVERS_FREE_COUNT")
-    private int serversFreeCount;
-
-    @Column(name = "EAR_DEVICES_COUNT")
-    private int devicesCount;
-
-    @Column(name = "EAR_DEVICES_FREE_COUNT")
-    private int devicesFreeCount;
+    @Column(name = "EAR_DESCRIPTION")
+    private String description;
 
     @Override
     public String toString() {
-        return "EvaluationAgencyResource{" +
+        return "EvaluationAgencyResourcePO{" +
                 "id=" + id +
-                "evaluationAgencyId=" + evaluationAgencyId +
-                ", professionalsCount=" + professionalsCount +
-                ", professionalsFreeCount=" + professionalsFreeCount +
-                ", serversCount=" + serversCount +
-                ", serversFreeCount=" + serversFreeCount +
-                ", devicesCount=" + devicesCount +
-                ", devicesFreeCount=" + devicesFreeCount +
+                ", evaluationAgencyId=" + evaluationAgencyId +
+                ", type='" + type + '\'' +
+                ", count=" + count +
+                ", freeCount=" + freeCount +
+                ", description='" + description + '\'' +
                 '}';
     }
 }

core/src/main/java/com/mooctest/crowd/domain/repository/EvaluationAgencyResourceRepo.java

@@ -4,6 +4,7 @@ import com.mooctest.crowd.domain.dao.EvaluationAgencyAbilityDao;
 import com.mooctest.crowd.domain.dao.EvaluationAgencyResourceDao;
 import com.mooctest.crowd.domain.domainobject.EvaluationAgencyAbility;
 import com.mooctest.crowd.domain.domainobject.EvaluationAgencyResource;
+import com.mooctest.crowd.domain.exception.EvaluationAgencyResourceNotExist;
 import com.mooctest.crowd.domain.model.EvaluationAgencyAbilityPO;
 import com.mooctest.crowd.domain.model.EvaluationAgencyResourcePO;
 import com.mooctest.crowd.domain.util.Converter;
@@ -11,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -26,11 +28,39 @@ public class EvaluationAgencyResourceRepo implements IEvaluationAgencyResourceRe
     private EvaluationAgencyAbilityDao evaluationAgencyAbilityDao;
 
     @Override
+    public EvaluationAgencyResource findById(Long id){
+        Optional<EvaluationAgencyResourcePO> evaluationAgencyResourcePOOptional = evaluationAgencyResourceDao.findById(id);
+        if(!evaluationAgencyResourcePOOptional.isPresent()){
+            throw new EvaluationAgencyResourceNotExist("测评机构资源不存在");
+        }else{
+            return Converter.convert(EvaluationAgencyResource.class, evaluationAgencyResourcePOOptional.get());
+        }
+    }
+
+    @Override
+    public List<EvaluationAgencyResource> findByEvaluationAgencyId(Long evaluationAgencyId){
+        List<EvaluationAgencyResourcePO> evaluationAgencyResourcePOList = evaluationAgencyResourceDao.findByEvaluationAgencyId(evaluationAgencyId);
+        return evaluationAgencyResourcePOList.stream().map(evaluationAgencyResourcePO -> Converter.convert(EvaluationAgencyResource.class, evaluationAgencyResourcePO)).collect(Collectors.toList());
+
+    }
+
+
+    public void moveEvaluationAgencyResource(List<EvaluationAgencyResource> evaluationAgencyResourceList) {
+        List<EvaluationAgencyResourcePO> evaluationAgencyResourcePOList = evaluationAgencyResourceList.stream()
+                .map(evaluationAgencyResource -> Converter.convert(EvaluationAgencyResourcePO.class, evaluationAgencyResource))
+                .collect(Collectors.toList());
+        evaluationAgencyResourceDao.deleteAll(evaluationAgencyResourcePOList);
+    }
+
+    @Override
     public EvaluationAgencyResource saveEvaluationAgencyResource(EvaluationAgencyResource evaluationAgencyResource){
         EvaluationAgencyResourcePO evaluationAgencyResourceResult = evaluationAgencyResourceDao.save(Converter.convert(EvaluationAgencyResourcePO.class, evaluationAgencyResource));
         return Converter.convert(EvaluationAgencyResource.class, evaluationAgencyResourceResult);
     }
 
+
+
+    //能力
     @Override
     public EvaluationAgencyAbility saveEvaluationAgencyAbility(EvaluationAgencyAbility EvaluationAgencyAbility){
         EvaluationAgencyAbilityPO evaluationAgencyAbilityPO = evaluationAgencyAbilityDao.save(Converter.convert(EvaluationAgencyAbilityPO.class, EvaluationAgencyAbility));
@@ -44,4 +74,5 @@ public class EvaluationAgencyResourceRepo implements IEvaluationAgencyResourceRe
                 .collect(Collectors.toList());
         evaluationAgencyAbilityDao.deleteAll(evaluationAgencyAbilityPOList);
     }
+
 }

core/src/main/java/com/mooctest/crowd/domain/repository/IEvaluationAgencyResourceRepo.java

@@ -11,6 +11,10 @@ import java.util.List;
  */
 public interface IEvaluationAgencyResourceRepo {
 
+    EvaluationAgencyResource findById(Long id);
+
+    List<EvaluationAgencyResource> findByEvaluationAgencyId(Long evaluationAgencyId);
+
     EvaluationAgencyResource saveEvaluationAgencyResource(EvaluationAgencyResource evaluationAgencyResource);
 
     EvaluationAgencyAbility saveEvaluationAgencyAbility(EvaluationAgencyAbility EvaluationAgencyAbility);

core/src/main/java/com/mooctest/crowd/domain/repository/UserRepo.java

@@ -208,14 +208,17 @@ public class UserRepo implements IUserRepo {
             userToRoleDao.save(u2r);
         }
         List<UserToRolePO> userToRolePOList = userToRoleDao.findByUserId(userPO.getId());
-        for(Role role : roleList){
-            if (!userToRolePOList.stream().filter(userToRolePO -> userToRolePO.getRoleId() == role.getId()).findFirst().isPresent()) {
-                UserToRolePO userToRolePO = new UserToRolePO();
-                userToRolePO.setRoleId(role.getId());
-                userToRolePO.setUserId(userPO.getId());
-                userToRoleDao.save(userToRolePO);
+        if(roleList != null){
+            for(Role role : roleList){
+                if (!userToRolePOList.stream().filter(userToRolePO -> userToRolePO.getRoleId() == role.getId()).findFirst().isPresent()) {
+                    UserToRolePO userToRolePO = new UserToRolePO();
+                    userToRolePO.setRoleId(role.getId());
+                    userToRolePO.setUserId(userPO.getId());
+                    userToRoleDao.save(userToRolePO);
+                }
             }
         }
+
         EvaluationAgency evaluationAgency = user.getEvaluationAgency();
         if(evaluationAgency != null){
             EvaluationAgencyPO evaluationAgencyPO = Converter.convert(EvaluationAgencyPO.class, evaluationAgency);
@@ -301,18 +304,23 @@ public class UserRepo implements IUserRepo {
             /*获取测评机构能力*/
             List<EvaluationAgencyAbilityPO> evaluationAgencyAbilityPOList = evaluationAgencyAbilityDao.findByEvaluationAgencyId(evaluationAgencyResult.getId());
             List<EvaluationAgencyAbility> evaluationAgencyAbilityList = new ArrayList<>();
-            for(EvaluationAgencyAbilityPO evaluationAgencyAbilityPO : evaluationAgencyAbilityPOList){
-                EvaluationAgencyAbility evaluationAgencyAbility = Converter.convert(EvaluationAgencyAbility.class, evaluationAgencyAbilityPO);
-                evaluationAgencyAbilityList.add(evaluationAgencyAbility);
-            }
-            if(evaluationAgencyAbilityList.size() != 0){
+            if(evaluationAgencyAbilityPOList.size() != 0){
+                for(EvaluationAgencyAbilityPO evaluationAgencyAbilityPO : evaluationAgencyAbilityPOList){
+                    EvaluationAgencyAbility evaluationAgencyAbility = Converter.convert(EvaluationAgencyAbility.class, evaluationAgencyAbilityPO);
+                    evaluationAgencyAbilityList.add(evaluationAgencyAbility);
+                }
                 evaluationAgencyResult.setEvaluationAgencyAbilityList(evaluationAgencyAbilityList);
             }
 
             /*获取测评机构资源*/
-            EvaluationAgencyResourcePO evaluationAgencyResourcePO = evaluationAgencyResourceDao.findByEvaluationAgencyId(evaluationAgencyResult.getId());
-            if(evaluationAgencyResourcePO != null){
-                evaluationAgencyResult.setEvaluationAgencyResource(Converter.convert(EvaluationAgencyResource.class, evaluationAgencyResourcePO));
+            List<EvaluationAgencyResourcePO> evaluationAgencyResourcePOList = evaluationAgencyResourceDao.findByEvaluationAgencyId(evaluationAgencyResult.getId());
+            List<EvaluationAgencyResource> evaluationAgencyResourceList = new ArrayList<>();
+            if(evaluationAgencyResourcePOList.size() != 0){
+                for(EvaluationAgencyResourcePO evaluationAgencyResourcePO : evaluationAgencyResourcePOList){
+                    EvaluationAgencyResource evaluationAgencyResource = Converter.convert(EvaluationAgencyResource.class, evaluationAgencyResourcePO);
+                    evaluationAgencyResourceList.add(evaluationAgencyResource);
+                }
+                evaluationAgencyResult.setEvaluationAgencyResourceList(evaluationAgencyResourceList);
             }
 
             userResult.setEvaluationAgency(evaluationAgencyResult);

core/src/test/java/com/mooctest/crowd/domain/domainobject/AccountTest.java

@@ -1,219 +0,0 @@
-//package com.mooctest.crowd.domain.domainobject;
-//
-//import com.mooctest.crowd.domain.command.AccountCommand;
-//import com.mooctest.crowd.domain.command.LoginCommand;
-//import com.mooctest.crowd.domain.command.ModifyPasswordCommand;
-//import com.mooctest.crowd.domain.exception.AccountNotExistException;
-//import com.mooctest.crowd.domain.exception.PasswordErrorException;
-//import com.mooctest.crowd.domain.repository.AccountUTRepo;
-//import com.mooctest.crowd.domain.repository.IAccountRepo;
-//import org.junit.Test;
-//
-//import java.util.List;
-//
-//import static org.junit.Assert.assertEquals;
-//import static org.junit.Assert.assertTrue;
-//
-///**
-// * @Author: xuexb
-// * @Date: 2019.7.5 14:25
-// */
-//public class AccountTest {
-//
-//    private AccountUTRepo accountUTRepo = new AccountUTRepo();
-//
-//    @Test
-//    public void should_return_true_when_login_success() throws AccountNotExistException, PasswordErrorException {
-//        // arrange
-//        LoginCommand loginCommand = this.getSuccessLoginCommand();
-//        Account account = this.getSuccessAccount();
-//        // action
-//        boolean success = account.login(loginCommand);
-//        // assert
-//        assertTrue(success);
-//    }
-//
-//    @Test(expected = AccountNotExistException.class)
-//    public void should_throw_when_account_not_exist() throws AccountNotExistException {
-//        // arrange
-//        LoginCommand loginCommand = new LoginCommand();
-//        loginCommand.setMobileNum("NOT_EXIST");
-//        IAccountRepo IAccountRepo = new AccountUTRepo();
-//        Account account = IAccountRepo.getByMobileNum(loginCommand.getMobileNum());
-//    }
-//
-//    @Test(expected = PasswordErrorException.class)
-//    public void should_throw_exception_when_password_error() throws PasswordErrorException, AccountNotExistException {
-//        // arrange
-//        LoginCommand loginCommand = new LoginCommand();
-//        loginCommand.setMobileNum("EXIST_ACCOUNT");
-//        loginCommand.setPassword("ERROR_PASSWORD");
-//        IAccountRepo IAccountRepo = new AccountUTRepo();
-//        Account account = IAccountRepo.getByMobileNum(loginCommand.getMobileNum());
-//        // assert
-//        account.login(loginCommand);
-//    }
-//
-//    @Test
-//    public void should_update_password_when_modify_password() throws AccountNotExistException, PasswordErrorException {
-//        // arrange
-//        ModifyPasswordCommand modifyPasswordCommand = new ModifyPasswordCommand();
-//        modifyPasswordCommand.setMobileNum("EXIST_ACCOUNT");
-//        modifyPasswordCommand.setOldPassword("PASSWORD");
-//        modifyPasswordCommand.setNewPassword("654321");
-//
-//        Account account = accountUTRepo.getByMobileNum(modifyPasswordCommand.getMobileNum());
-//        // action
-//        boolean result = account.modifyPassword(modifyPasswordCommand);
-//        // assert
-//        assertTrue(result);
-//    }
-//
-//    @Test
-//    public void should_return_permissions_when_account_login_success() throws AccountNotExistException {
-//        // arrange
-//        Account account = this.getSuccessAccount();
-//        // action
-//        List<Permission> permissions = account.distributePermission();
-//        // assert
-//        assertEquals(permissions.get(0).getId(), new Long(1));
-//    }
-//
-//    @Test
-//    public void should_return_roles_when_account_login_success() throws AccountNotExistException {
-//        // arrange
-//        Account account = this.getSuccessAccount();
-//        // action
-//        List<Role> roles = account.distributeRole();
-//        // assert
-//        assertEquals(roles.get(0).getId(), new Long(1));
-//    }
-//
-//    @Test
-//    public void should_return_account_when_view_by_account_id() throws AccountNotExistException {
-//        // arrange
-//        AccountCommand accountCommand = new AccountCommand();
-//        accountCommand.setId(123L);
-//
-//        // action
-//        Account accountUTRepoByID = accountUTRepo.getByID(accountCommand.getId());
-//        // assert
-//        assertEquals(accountUTRepoByID.getId(), accountCommand.getId());
-//    }
-//
-//    @Test(expected = AccountNotExistException.class)
-//    public void should_throw_when_view_account_not_exist_by_account_id() throws AccountNotExistException {
-//        // arrange
-//        AccountCommand accountCommand = new AccountCommand();
-//        accountCommand.setId(111L);
-//        // action
-//        accountUTRepo.getByID(accountCommand.getId());
-//    }
-//
-//    @Test
-//    public void should_return_account_list_when_view_by_account_ids() throws AccountNotExistException {
-//        // arrange
-//        Long[] ids = {123L};
-//        // action
-//        List<Account> accountList = accountUTRepo.getByIDList(ids);
-//        // assert
-//        assertEquals(accountList.get(0).getId(), ids[0]);
-//    }
-//
-//    @Test(expected = AccountNotExistException.class)
-//    public void should_throw_when_view_not_exist_account_by_account_ids() throws AccountNotExistException {
-//        // arrange
-//        Long[] ids = {123L,111L};
-//
-//        // action
-//        accountUTRepo.getByIDList(ids);
-//    }
-//
-//    @Test
-//    public void should_return_false_when_add_exist_account(){
-//        // arrange
-//        Account account = this.createCorrectAccount();
-//        // action
-//        Account resultAccount = accountUTRepo.addAccount(account);
-//        // assert
-//        assertEquals(resultAccount.getMobileNum(),account.getMobileNum());
-//    }
-//
-////    @Test(expected = AccountNotExistException.class)
-////    public void should_throw_when_add_account_success() throws AccountNotExistException {
-////        // arrange
-////        Account account = this.createDiscorrectAccount();
-////        // action
-////        accountUTRepo.addAccount(account);
-////    }
-//    @Test
-//    public void should_return_true_when_remove_account_success() throws AccountNotExistException {
-//        // arrange
-//        Account account = this.createCorrectAccount();
-//        // action
-//        boolean result = accountUTRepo.removeAccount(account);
-//        // assert
-//        assertTrue(result);
-//    }
-//
-//    @Test(expected = AccountNotExistException.class)
-//    public void should_throw_when_remove_not_exist_account() throws AccountNotExistException {
-//        // arrange
-//        Account account = this.createDiscorrectAccount();
-//        // action
-//        accountUTRepo.removeAccount(account);
-//    }
-//
-//    @Test
-//    public void should_return_true_when_update_account_success() throws AccountNotExistException {
-//        // arrange
-//        Account account = this.createCorrectAccount();
-//        account.setPassword("UPDATE_PASSWORD");
-//        // action
-//        Account updateAccount = accountUTRepo.updateAccount(account);
-//        // assert
-//        assertEquals(updateAccount.getPassword(),account.getPassword());
-//    }
-//
-//    @Test(expected = AccountNotExistException.class)
-//    public void should_throw_when_update_not_exist_account() throws AccountNotExistException {
-//        // arrange
-//        Account account = this.createDiscorrectAccount();
-//        // action
-//        accountUTRepo.updateAccount(account);
-//    }
-//
-//    private LoginCommand getSuccessLoginCommand() {
-//        LoginCommand loginCommand = new LoginCommand();
-//        loginCommand.setMobileNum("EXIST_ACCOUNT");
-//        loginCommand.setPassword("PASSWORD");
-//        loginCommand.setCheckCode("123456");
-//        return loginCommand;
-//    }
-//
-//    private Account getSuccessAccount() throws AccountNotExistException {
-//        LoginCommand loginCommand = getSuccessLoginCommand();
-//        IAccountRepo IAccountRepo = new AccountUTRepo();
-//        return IAccountRepo.getByMobileNum(loginCommand.getMobileNum());
-//    }
-//
-//    private Account createCorrectAccount(){
-//        AccountCommand accountCommand = new AccountCommand();
-//        accountCommand.setMobileNum("EXIST_ACCOUNT");
-//        accountCommand.setPassword("PASSWORD");
-//        Account account = new Account();
-//        account.setMobileNum(accountCommand.getMobileNum());
-//        account.setPassword(accountCommand.getPassword());
-//        return account;
-//    }
-//
-//    private Account createDiscorrectAccount(){
-//        AccountCommand accountCommand = new AccountCommand();
-//        accountCommand.setMobileNum("NOT_EXIST_ACCOUNT");
-//        accountCommand.setPassword("PASSWORD");
-//        Account account = new Account();
-//        account.setMobileNum(accountCommand.getMobileNum());
-//        account.setPassword(accountCommand.getPassword());
-//        return account;
-//    }
-//}

core/src/test/java/com/mooctest/crowd/domain/domainobject/EvaluationAgencyTest.java

@@ -1,154 +0,0 @@
-//package com.mooctest.crowd.domain.domainobject;
-//
-//import com.mooctest.crowd.domain.command.CrowdTestReportCommand;
-//import com.mooctest.crowd.domain.command.CrowdTestTaskCommand;
-//import com.mooctest.crowd.domain.exception.CrowdTestProjectNotExistException;
-//import com.mooctest.crowd.domain.exception.CrowdTestReportNotExistException;
-//import com.mooctest.crowd.domain.exception.CrowdTestTaskNoPriceException;
-//import com.mooctest.crowd.domain.exception.CrowdTestTaskNotExistException;
-//import com.mooctest.crowd.domain.repository.CrowdTestProjectRepo;
-//import org.junit.Test;
-//
-//import java.util.List;
-//
-//import static org.junit.Assert.*;
-//
-///**
-// * @author guochao
-// * @date 2019/7/16 10:18
-// */
-//public class EvaluationAgencyTest {
-//    private CrowdTestProject crowdTestProject = new CrowdTestProject();
-//    private CrowdTestProjectRepo crowdTestProjectRepo = new CrowdTestProjectRepo();
-//    private CrowdTestTaskCommand crowdTestTaskCommand = new CrowdTestTaskCommand();
-//    private CrowdTestReportCommand crowdTestReportCommand = new CrowdTestReportCommand();
-//    private EvaluationAgency evaluationAgency = new EvaluationAgency();
-//    @Test
-//    public void should_modify_crowd_test_task_status_when_evaluation_agency_receive_task() throws CrowdTestTaskNotExistException, CrowdTestProjectNotExistException, CrowdTestTaskNoPriceException {
-//        // arrange
-//        evaluationAgency.setId(4444L);
-//        crowdTestTaskCommand.setId(101L);
-//        crowdTestTaskCommand.setCrowdTestProjectId(1L);
-//        Long projectId = crowdTestTaskCommand.getCrowdTestProjectId();
-//        Long taskId = crowdTestTaskCommand.getId();
-//        Long evaluationAgencyId = evaluationAgency.getId();
-//        // action
-//        boolean result = evaluationAgency.updateCrowdTestTaskStatusByEvaluationAgency(projectId, taskId, evaluationAgencyId, CrowdTestTaskStatus.RELEASED);
-//        // assert
-//        assertTrue(result);
-//    }
-//
-//    @Test
-//    public void should_return_true_when_view_crowd_test_task_success() throws CrowdTestProjectNotExistException, CrowdTestTaskNotExistException {
-//        // arrange
-//        crowdTestTaskCommand.setId(101L);
-//        crowdTestTaskCommand.setCrowdTestProjectId(1L);
-//        Long projectId = crowdTestTaskCommand.getCrowdTestProjectId();
-//        Long taskId = crowdTestTaskCommand.getId();
-//        CrowdTestProject crowdTestProject = crowdTestProjectRepo.getByID(projectId);
-//        // action
-//        CrowdTestTask crowdTestTask = crowdTestProject.getCrowdTestTaskByTaskId(crowdTestProject, taskId);
-//        // assert
-//        assertEquals(crowdTestTask.getId(), taskId);
-//    }
-//
-//    @Test(expected = CrowdTestTaskNotExistException.class)
-//    public void should_throw_when_view_crowd_test_task_not_exist() throws CrowdTestProjectNotExistException, CrowdTestTaskNotExistException {
-//        // arrange
-//        crowdTestTaskCommand.setId(102L);
-//        crowdTestTaskCommand.setCrowdTestProjectId(1L);
-//        Long projectId = crowdTestTaskCommand.getCrowdTestProjectId();
-//        Long taskId = crowdTestTaskCommand.getId();
-//        CrowdTestProject crowdTestProject = crowdTestProjectRepo.getByID(projectId);
-//        // action
-//        crowdTestProject.getCrowdTestTaskByTaskId(crowdTestProject, taskId);
-//    }
-//
-//    @Test
-//    public void should_modify_status_when_commit_crowd_test_report_success() throws CrowdTestTaskNoPriceException, CrowdTestReportNotExistException, CrowdTestProjectNotExistException, CrowdTestTaskNotExistException {
-//        // arrange
-//        crowdTestReportCommand.setId(1001L);
-//        crowdTestReportCommand.setCrowdTestTaskId(101L);
-//        crowdTestTaskCommand.setCrowdTestProjectId(1L);
-//        Long projectId = crowdTestTaskCommand.getCrowdTestProjectId();
-//        Long taskId = crowdTestReportCommand.getCrowdTestTaskId();
-//        Long reportId = crowdTestReportCommand.getId();
-//        // action
-//        CrowdTestProject newCrowdTestProject = crowdTestProject.updateCrowdTestReportStatus(projectId, taskId, reportId, CrowdTestReportStatus.COMMITED);
-//        // assert
-//        CrowdTestTask crowdTestTask = newCrowdTestProject.getCrowdTestTaskByTaskId(newCrowdTestProject, taskId);
-//        CrowdTestReport crowdTestReport = crowdTestTask.getCrowdTestReportByReportId(crowdTestTask, reportId);
-//        assertEquals(crowdTestReport.getStatus(), CrowdTestReportStatus.COMMITED);
-//    }
-//
-//    @Test(expected = CrowdTestReportNotExistException.class)
-//    public void should_throw_when_commit_crowd_test_report_not_exist() throws CrowdTestTaskNoPriceException, CrowdTestReportNotExistException, CrowdTestProjectNotExistException, CrowdTestTaskNotExistException {
-//        // arrange
-//        crowdTestReportCommand.setId(1002L);
-//        crowdTestReportCommand.setCrowdTestTaskId(101L);
-//        crowdTestTaskCommand.setCrowdTestProjectId(1L);
-//        Long projectId = crowdTestTaskCommand.getCrowdTestProjectId();
-//        Long taskId = crowdTestReportCommand.getCrowdTestTaskId();
-//        Long reportId = crowdTestReportCommand.getId();
-//        // action
-//        crowdTestProject.updateCrowdTestReportStatus(projectId, taskId, reportId, CrowdTestReportStatus.COMMITED);
-//    }
-//
-//    @Test
-//    public void should_modify_crowd_test_task_status_commited_when_commit_crowd_test_task() throws CrowdTestProjectNotExistException, CrowdTestTaskNotExistException, CrowdTestTaskNoPriceException, CrowdTestReportNotExistException {
-//        // arrange
-//        crowdTestTaskCommand.setCrowdTestProjectId(1L);
-//        crowdTestTaskCommand.setId(101L);
-//        Long projectId = crowdTestTaskCommand.getCrowdTestProjectId();
-//        Long taskId = crowdTestTaskCommand.getId();
-//        CrowdTestProject newCrowdTestProject = crowdTestProject.updateCrowdTestReportStatus(projectId, taskId, 1001L, CrowdTestReportStatus.COMMITED);
-//        // action
-//        boolean result = newCrowdTestProject.modifyCrowdTestTaskStatusToCommit(taskId, CrowdTestTaskStatus.COMMITED);
-//        // assert
-//        assertTrue(result);
-//    }
-//
-//    @Test
-//    public void should_throw_when_commit_crowd_test_task_has_no_commit_crowd_test_report() throws CrowdTestProjectNotExistException, CrowdTestTaskNotExistException, CrowdTestTaskNoPriceException, CrowdTestReportNotExistException {
-//        // arrange
-//        crowdTestTaskCommand.setCrowdTestProjectId(1L);
-//        crowdTestTaskCommand.setId(101L);
-//        Long projectId = crowdTestTaskCommand.getCrowdTestProjectId();
-//        Long taskId = crowdTestTaskCommand.getId();
-//        CrowdTestProjectRepo crowdTestProjectRepo = new CrowdTestProjectRepo();
-//        CrowdTestProject crowdTestProject = crowdTestProjectRepo.getByID(projectId);
-//        // action
-//        boolean result = crowdTestProject.modifyCrowdTestTaskStatusToCommit(taskId, CrowdTestTaskStatus.COMMITED);
-//        // assert
-//        assertFalse(result);
-//    }
-//
-//    @Test
-//    public void should_return_true_when_view_crowd_test_project_success() throws CrowdTestProjectNotExistException, CrowdTestTaskNotExistException, CrowdTestTaskNoPriceException, CrowdTestReportNotExistException {
-//        // arrange
-//        crowdTestReportCommand.setId(1001L);
-//        crowdTestReportCommand.setCrowdTestTaskId(101L);
-//        crowdTestReportCommand.setCrowdTestProjectId(1L);
-//        Long projectId = crowdTestReportCommand.getCrowdTestProjectId();
-//        Long taskId = crowdTestReportCommand.getCrowdTestTaskId();
-//        Long reportId = crowdTestReportCommand.getId();
-//        // action
-//        CrowdTestReport crowdTestReport = crowdTestProject.getCrowdTestReportByProjectId(projectId, taskId, reportId);
-//        // assert
-//        assertEquals(crowdTestReport.getId(), reportId);
-//    }
-//
-//    @Test
-//    public void should_return_true_when_view_crowd_test_project_list_success() throws CrowdTestProjectNotExistException, CrowdTestTaskNotExistException, CrowdTestTaskNoPriceException, CrowdTestReportNotExistException {
-//        // arrange
-//        crowdTestReportCommand.setCrowdTestProjectId(1L);
-//        crowdTestReportCommand.setCrowdTestTaskId(101L);
-//        Long projectId = crowdTestReportCommand.getCrowdTestProjectId();
-//        Long taskId = crowdTestReportCommand.getCrowdTestTaskId();
-//        // action
-//        List<CrowdTestReport> crowdTestReportList = crowdTestProject.getCrowdTestReportListByProjectId(projectId, taskId);
-//        // assert
-//
-//        assertEquals(crowdTestReportList.get(0).getCrowdTestTaskId(), taskId);
-//    }
-//}

core/src/test/java/com/mooctest/crowd/domain/domainobject/GeneralUserTest.java

@@ -1,218 +0,0 @@
-package com.mooctest.crowd.domain.domainobject;
-
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
-
-/**
- * @author guochao
- * @date 2019/7/6 18:17
- */
-@RunWith(MockitoJUnitRunner.class)
-public class GeneralUserTest {
-//    @InjectMocks
-//    private  GeneralUser generalUser = new GeneralUser();
-//
-//    @Mock
-//    private CrowdTestProjectRepo testProjectRepo = new CrowdTestProjectRepo();
-//
-////    @Mock
-//    private CrowdTestProject testProject = new CrowdTestProject();
-//
-//    @Before
-//    public void setUp() throws CrowdTestProjectNotExistException {
-//        MockitoAnnotations.initMocks(this);
-//
-//        testProject.setId(1L);
-//        testProject.setName("PROJECT_ONE");
-//        testProject.setDescription("DESCRIPTION");
-//        testProject.setProjectFile(new File("PROJECTFILE.TXT"));
-//        testProject.setRequirement(new File("REQUIREMENT.TXT"));
-//        testProject.setQuotedPrice(200.00);
-//        testProject.setCreatTime(new Date());
-//
-//        when(testProjectRepo.getByID(1L)).thenReturn(testProject);
-//    }
-
-//
-//    @Test
-//    public void should_return_true_when_create_crowd_test_project_success() throws CrowdTestProjectNotExistException {
-//        // arrange
-//        CrowdTestProjectCommand crowdTestProjectCommand = new CrowdTestProjectCommand();
-//        crowdTestProjectCommand.setName("PROJECT_TWO");
-//        crowdTestProjectCommand.setDescription("DESCRIPTION");
-//        crowdTestProjectCommand.setDistributeId(123L);
-//        crowdTestProjectCommand.setStatus(CrowdTestProjectStatus.CREATED);
-//        crowdTestProjectCommand.setProjectFile("PROJECTFILE.TXT");
-//        crowdTestProjectCommand.setRequirementFile("REQUIREMENT.TXT");
-//        crowdTestProjectCommand.setQuotedPrice(200.00);
-//
-//        CrowdTestProject crowdTestProject2 = new CrowdTestProject();
-//        crowdTestProject2.setName(crowdTestProjectCommand.getName());
-//        ProjectDistributeType projectDistributeType = new ProjectDistributeType();
-//        projectDistributeType.setId(crowdTestProjectCommand.getDistributeId());
-//        crowdTestProject2.setProjectDistributeType(projectDistributeType);
-//        crowdTestProject2.setDescription(crowdTestProjectCommand.getDescription());
-//        crowdTestProject2.setProjectFile(crowdTestProjectCommand.getProjectFile());
-//        crowdTestProject2.setRequirementFile(crowdTestProjectCommand.getRequirementFile());
-//        crowdTestProject2.setQuotedPrice(crowdTestProjectCommand.getQuotedPrice());
-//        crowdTestProject2.setStatus(crowdTestProjectCommand.getStatus());
-//        CrowdTestProjectRepo testProjectRepo = new CrowdTestProjectRepo();
-//
-//        // action
-//        CrowdTestProject crowdTestProject = testProjectRepo.addCrowdTestProject(crowdTestProject2);
-//
-//        // assert
-//        assertEquals(crowdTestProject, crowdTestProject2);
-//    }
-//
-//    @Test
-//    public void should_return_crowd_test_project_when_view_exist_crowd_test_project() throws CrowdTestProjectNotExistException {
-//        // arrange
-//        CrowdTestProjectCommand crowdTestProjectCommand = new CrowdTestProjectCommand();
-//        crowdTestProjectCommand.setId(1L);
-//        crowdTestProjectCommand.setName("PROJECT_ONE");
-////        CrowdTestProject testProject = this.createCrowdTestProject();
-//        CrowdTestProjectRepo testProjectRepo = new CrowdTestProjectRepo();
-//        // action
-//        CrowdTestProject crowdTestProject = testProjectRepo.getByID(crowdTestProjectCommand.getId());
-//
-//        // assert
-//        assertEquals(crowdTestProject.getName(), crowdTestProjectCommand.getName());
-//    }
-//
-//    @Test(expected = CrowdTestProjectNotExistException.class)
-//    public void should_throw_when_view__not_exist_crowd_test_project() throws CrowdTestProjectNotExistException {
-//        // arrange
-//        CrowdTestProjectCommand crowdTestProjectCommand = new CrowdTestProjectCommand();
-//        crowdTestProjectCommand.setId(2L);
-//        CrowdTestProjectRepo testProjectRepo = new CrowdTestProjectRepo();
-//        // action
-//        CrowdTestProject crowdTestProject = testProjectRepo.getByID(crowdTestProjectCommand.getId());
-//    }
-//
-//    @Test
-//    public void should_return_true_when_remove_crowd_test_project_success() throws CrowdTestProjectNotExistException {
-//        // arrange
-//        CrowdTestProject crowdTestProject = createCrowdTestProject();
-//        CrowdTestProjectRepo testProjectRepo = new CrowdTestProjectRepo();
-//
-//        // action
-//        boolean result = testProjectRepo.removeCrowdTestProject(crowdTestProject);
-//
-//        // assert
-//        assertTrue(result);
-//    }
-//
-//    @Test(expected = CrowdTestProjectNotExistException.class)
-//    public void should_throw_when_remove_not_exist_crowd_test_project() throws CrowdTestProjectNotExistException {
-//        // arrange
-////        CrowdTestProject crowdTestProject = new CrowdTestProject();
-//        CrowdTestProject crowdTestProject = new CrowdTestProject();
-//        crowdTestProject.setId(2L);
-//
-//        CrowdTestProjectRepo testProjectRepo = new CrowdTestProjectRepo();
-//
-//        // action
-//        boolean result = testProjectRepo.removeCrowdTestProject(crowdTestProject);
-//    }
-//
-//    @Test
-//    public void should_return_true_when_update_crowd_test_project_success() throws CrowdTestProjectNotExistException {
-//        // arrange
-//        CrowdTestProject crowdTestProject = createCrowdTestProject();
-//        CrowdTestProjectRepo testProjectRepo = new CrowdTestProjectRepo();
-//
-//        // action
-//        CrowdTestProject updateCrowdTestProject = testProjectRepo.updateCrowdTestProject(crowdTestProject);
-//
-//        // assert
-//        assertEquals(updateCrowdTestProject.getName(), crowdTestProject.getName());
-//    }
-//
-//    @Test(expected = CrowdTestProjectNotExistException.class)
-//    public void should_throw_when_update_crowd_test_project_not_exist() throws CrowdTestProjectNotExistException {
-//        // arrange
-////        CrowdTestProject crowdTestProject = new CrowdTestProject();
-//        CrowdTestProject crowdTestProject = new CrowdTestProject();
-//
-//        crowdTestProject.setId(2L);
-//        CrowdTestProjectRepo testProjectRepo = new CrowdTestProjectRepo();
-//
-//        // action
-//        testProjectRepo.updateCrowdTestProject(crowdTestProject);
-//    }
-//
-//    @Test
-//    public void should_return_ture_when_update_crowd_test_project_list_success() throws CrowdTestProjectNotExistException {
-//        // arrange
-//        List<CrowdTestProject> crowdTestProjects = new ArrayList<CrowdTestProject>();
-//        CrowdTestProject crowdTestProject1 = createCrowdTestProject();
-//        crowdTestProjects.add(crowdTestProject1);
-////        CrowdTestProject crowdTestProject = new CrowdTestProject();
-//        CrowdTestProject crowdTestProject = new CrowdTestProject();
-//        crowdTestProject.setId(2L);
-//        crowdTestProject.setName("PROJECT_TWO");
-//        crowdTestProject.setDescription("DESCRIPTION");
-//        ProjectDistributeType projectDistributeType = new ProjectDistributeType();
-//        projectDistributeType.setId(123L);
-//        crowdTestProject.setProjectDistributeType(projectDistributeType);
-//        crowdTestProject.setProjectFile("PROJECTFILE.TXT");
-//        crowdTestProject.setRequirementFile("REQUIREMENT.TXT");
-//        crowdTestProject.setQuotedPrice(200.00);
-//        crowdTestProject.setStatus(CrowdTestProjectStatus.CREATED);
-//        crowdTestProjects.add(crowdTestProject);
-//        CrowdTestProjectRepo testProjectRepo = new CrowdTestProjectRepo();
-//
-//        // action
-//        boolean result = testProjectRepo.updateCrowdTestProjectList(crowdTestProjects);
-//
-//        // assert
-//        assertTrue(result);
-//    }
-//
-//    @Test(expected = CrowdTestProjectNotExistException.class)
-//    public void should_throw_when_update_crowd_test_project_list_not_exist() throws CrowdTestProjectNotExistException {
-//        // arrange
-//        List<CrowdTestProject> crowdTestProjects = new ArrayList<CrowdTestProject>();
-//        CrowdTestProject crowdTestProject1 = createCrowdTestProject();
-//        crowdTestProjects.add(crowdTestProject1);
-//        CrowdTestProject crowdTestProject = new CrowdTestProject();
-//        crowdTestProject.setId(3L);
-//        crowdTestProject.setName("PROJECT_TWO");
-//        crowdTestProject.setDescription("DESCRIPTION");
-//        crowdTestProject.setProjectFile("PROJECTFILE.TXT");
-//        crowdTestProject.setRequirementFile("REQUIREMENT.TXT");
-//        crowdTestProject.setQuotedPrice(200.00);
-//        crowdTestProjects.add(crowdTestProject);
-//        CrowdTestProjectRepo testProjectRepo = new CrowdTestProjectRepo();
-//
-//        // action
-//        boolean result = testProjectRepo.updateCrowdTestProjectList(crowdTestProjects);
-//    }
-//
-//    // 2.4
-//    @Test
-//    public void should_modify_status_released_when_release_crowd_test_project() {
-//        // arrange
-//        CrowdTestProject crowdTestProject = this.createCrowdTestProject();
-//        // action
-//        crowdTestProject.setStatus(CrowdTestProjectStatus.RELEASED);
-//        // assert
-//        assertEquals(crowdTestProject.getStatus(),"HAS_RELEASED");
-//    }
-//
-//    private CrowdTestProject createCrowdTestProject() {
-//        CrowdTestProject crowdTestProject = new CrowdTestProject();
-//        crowdTestProject.setId(1L);
-//        crowdTestProject.setName("PROJECT_ONE");
-//        crowdTestProject.setDescription("DESCRIPTION");
-//        ProjectDistributeType projectDistributeType = new ProjectDistributeType();
-//        projectDistributeType.setId(123L);
-//        crowdTestProject.setProjectDistributeType(projectDistributeType);
-//        crowdTestProject.setProjectFile("PROJECTFILE.TXT");
-//        crowdTestProject.setRequirementFile("REQUIREMENT.TXT");
-//        crowdTestProject.setQuotedPrice(200.00);
-//        crowdTestProject.setStatus(CrowdTestProjectStatus.CREATED);
-//        return crowdTestProject;
-//    }
-}

core/src/test/java/com/mooctest/crowd/domain/domainobject/RegionalManagerTest.java

@@ -1,217 +0,0 @@
-//package com.mooctest.crowd.domain.domainobject;
-//
-//import com.mooctest.crowd.domain.command.CrowdTestProjectCommand;
-//import com.mooctest.crowd.domain.command.CrowdTestTaskCommand;
-//import com.mooctest.crowd.domain.exception.CrowdTestProjectNotExistException;
-//import com.mooctest.crowd.domain.exception.CrowdTestTaskNoPriceException;
-//import com.mooctest.crowd.domain.exception.CrowdTestTaskNotExistException;
-//import com.mooctest.crowd.domain.repository.CrowdTestProjectRepo;
-//import org.junit.Test;
-//
-//import java.util.List;
-//
-//import static org.junit.Assert.*;
-//
-///**
-// * @author guochao
-// * @date 2019/7/9 14:20
-// */
-//public class RegionalManagerTest {
-//
-//    private CrowdTestProject crowdTestProject = new CrowdTestProject();
-//    private CrowdTestProjectRepo crowdTestProjectRepo = new CrowdTestProjectRepo();
-//    private CrowdTestProjectCommand crowdTestProjectCommand = new CrowdTestProjectCommand();
-//    private CrowdTestTaskCommand crowdTestTaskCommand = new CrowdTestTaskCommand();
-//    private GeneralUserTest generalUserTest = new GeneralUserTest();
-//    private RegionalManager regionalManager = new RegionalManager();
-//
-//    @Test
-//    public void should_modify_status_received_when_receive_crowd_test_project() throws CrowdTestProjectNotExistException {
-//        // arrange
-//        crowdTestProjectCommand.setId(1L);
-//        crowdTestProjectCommand.setStatus(CrowdTestProjectStatus.RECEIVED);
-//        // action
-//        CrowdTestProject crowdTestProject = crowdTestProjectRepo.updateCrowdTestProjectStatus(crowdTestProjectCommand.getId(), crowdTestProjectCommand.getStatus());
-//        // assert
-//        assertEquals(crowdTestProject.getStatus(), crowdTestProjectCommand.getStatus());
-//    }
-//
-//    @Test(expected = CrowdTestProjectNotExistException.class)
-//    public void should_throw_when_receive_crowd_test_project_not_exist() throws CrowdTestProjectNotExistException {
-//        // arrange
-//        crowdTestProjectCommand.setId(2L);
-//        crowdTestProjectCommand.setStatus(CrowdTestProjectStatus.RECEIVED);
-//        // action
-//        crowdTestProjectRepo.updateCrowdTestProjectStatus(crowdTestProjectCommand.getId(), crowdTestProjectCommand.getStatus());
-//    }
-//
-//    @Test
-//    public void should_return_crowd_test_project_when_general_user_view_exist_crowd_test_project() throws CrowdTestProjectNotExistException {
-//        generalUserTest.should_return_crowd_test_project_when_view_exist_crowd_test_project();
-//    }
-//
-//    @Test(expected = CrowdTestProjectNotExistException.class)
-//    public void should_throw_when_general_user_view__not_exist_crowd_test_project() throws CrowdTestProjectNotExistException {
-//        generalUserTest.should_throw_when_view__not_exist_crowd_test_project();
-//    }
-//
-//    @Test
-//    public void should_return_crowd_test_task_list_when_split_crowd_test_project_success() throws CrowdTestProjectNotExistException {
-//        // arrange
-//        crowdTestProjectCommand.setId(1L);
-//        // action
-//        List<CrowdTestTask> crowdTestTasks = regionalManager.splitCrowdTestProjectToCrowdTestTaskList(crowdTestProjectCommand.getId());
-//        // assert
-//        assertNotNull(crowdTestTasks);
-//    }
-//
-//    @Test(expected = CrowdTestProjectNotExistException.class)
-//    public void should_throw_when_split_crowd_test_project_not_exist() throws CrowdTestProjectNotExistException {
-//        // arrange
-//        crowdTestProjectCommand.setId(2L);
-//
-//        // action
-//        regionalManager.splitCrowdTestProjectToCrowdTestTaskList(crowdTestProjectCommand.getId());
-//    }
-//
-//    @Test
-//    public void should_return_true_when_make_a_price_for_crowd_test_project_success() throws CrowdTestProjectNotExistException, CrowdTestTaskNotExistException {
-//        // arrange
-//        crowdTestTaskCommand.setId(101L);
-//        crowdTestTaskCommand.setCrowdTestProjectId(1L);
-//        crowdTestTaskCommand.setPrice(100.00);
-//        Long projectId = crowdTestTaskCommand.getCrowdTestProjectId();
-//        Long id = crowdTestTaskCommand.getId();
-//        Double price = crowdTestTaskCommand.getPrice();
-//        // action
-//        CrowdTestProject crowdTestProject = regionalManager.fixedPriceForCrowdTestTask(projectId, id, price);
-//        List<CrowdTestTask> crowdTestTaskList = crowdTestProjectRepo.getByID(crowdTestProject.getId()).getCrowdTestTaskList();
-//        for (CrowdTestTask crowdTestTask : crowdTestTaskList
-//        ) {
-//            if (crowdTestTask.getId().equals(id)) {
-//                // assert
-//                assertEquals(price, crowdTestTask.getPrice());
-//            }
-//        }
-//    }
-//
-//    @Test(expected = CrowdTestProjectNotExistException.class)
-//    public void should_throw_when_make_a_price_for_crowd_test_project_not_exist() throws CrowdTestProjectNotExistException, CrowdTestTaskNotExistException {
-//        // arrange
-//        crowdTestTaskCommand.setId(101L);
-//        crowdTestTaskCommand.setCrowdTestProjectId(2L);
-//        crowdTestTaskCommand.setPrice(100.00);
-//        Long projectId = crowdTestTaskCommand.getCrowdTestProjectId();
-//        Long id = crowdTestTaskCommand.getId();
-//        Double price = crowdTestTaskCommand.getPrice();
-//        // action
-//        regionalManager.fixedPriceForCrowdTestTask(projectId, id, price);
-//    }
-//
-//    @Test(expected = CrowdTestTaskNotExistException.class)
-//    public void should_throw_when_make_a_price_for_crowd_test_task_not_exist() throws CrowdTestProjectNotExistException, CrowdTestTaskNotExistException {
-//        // arrange
-//        crowdTestTaskCommand.setId(103L);
-//        crowdTestTaskCommand.setCrowdTestProjectId(1L);
-//        crowdTestTaskCommand.setPrice(100.00);
-//        Long projectId = crowdTestTaskCommand.getCrowdTestProjectId();
-//        Long id = crowdTestTaskCommand.getId();
-//        Double price = crowdTestTaskCommand.getPrice();
-//        // action
-//        regionalManager.fixedPriceForCrowdTestTask(projectId, id, price);
-//    }
-//
-//    @Test
-//    public void should_return_true_when_distribute_crowd_test_task_to_evaluation_agency_success() throws CrowdTestProjectNotExistException, CrowdTestTaskNotExistException, CrowdTestTaskNoPriceException {
-//        // arrange
-//        crowdTestTaskCommand.setId(101L);
-//        crowdTestTaskCommand.setCrowdTestProjectId(1L);
-//        crowdTestTaskCommand.setStatus(CrowdTestTaskStatus.RELEASED);
-//        Long projectId = crowdTestTaskCommand.getCrowdTestProjectId();
-//        Long taskId = crowdTestTaskCommand.getId();
-//        String status = crowdTestProjectCommand.getStatus();
-//        // action
-//        boolean result = crowdTestProject.updateCrowdTestTaskStatus(projectId, taskId, status);
-//
-//        // assert
-//        assertTrue(result);
-//    }
-//
-//    @Test(expected = CrowdTestProjectNotExistException.class)
-//    public void should_throw_when_distribute_crowd_test_task_crowd_test_project_not_exist() throws CrowdTestProjectNotExistException, CrowdTestTaskNotExistException, CrowdTestTaskNoPriceException {
-//        // arrange
-//        crowdTestTaskCommand.setId(101L);
-//        crowdTestTaskCommand.setCrowdTestProjectId(2L);
-//        crowdTestTaskCommand.setStatus(CrowdTestTaskStatus.RELEASED);
-//        Long projectId = crowdTestTaskCommand.getCrowdTestProjectId();
-//        Long taskId = crowdTestTaskCommand.getId();
-//        String status = crowdTestProjectCommand.getStatus();
-//        // action
-//        crowdTestProject.updateCrowdTestTaskStatus(projectId, taskId, status);
-//    }
-//
-//    @Test(expected = CrowdTestTaskNotExistException.class)
-//    public void should_throw_when_distribute_crowd_test_task_crowd_test_task_not_exist() throws CrowdTestProjectNotExistException, CrowdTestTaskNotExistException, CrowdTestTaskNoPriceException {
-//        // arrange
-//        crowdTestTaskCommand.setId(103L);
-//        crowdTestTaskCommand.setCrowdTestProjectId(1L);
-//        crowdTestTaskCommand.setStatus(CrowdTestTaskStatus.RELEASED);
-//        Long projectId = crowdTestTaskCommand.getCrowdTestProjectId();
-//        Long taskId = crowdTestTaskCommand.getId();
-//        String status = crowdTestProjectCommand.getStatus();
-//        // action
-//        crowdTestProject.updateCrowdTestTaskStatus(projectId, taskId, status);
-//    }
-//
-//    @Test(expected = CrowdTestTaskNoPriceException.class)
-//    public void should_throw_when_distribute_crowd_test_task_price_not_exist() throws CrowdTestProjectNotExistException, CrowdTestTaskNotExistException, CrowdTestTaskNoPriceException {
-//        // arrange
-//        crowdTestTaskCommand.setId(101L);
-//        crowdTestTaskCommand.setCrowdTestProjectId(1L);
-//        crowdTestTaskCommand.setStatus(CrowdTestTaskStatus.RELEASED);
-//        Long projectId = crowdTestTaskCommand.getCrowdTestProjectId();
-//        Long taskId = crowdTestTaskCommand.getId();
-//        String status = crowdTestProjectCommand.getStatus();
-//        // action
-//        crowdTestProject.updateCrowdTestTaskStatusNoPrice(projectId, taskId, status);
-//    }
-//
-//    @Test
-//    public void should_modify_all_task_status_finished_when_aggregation_task() throws CrowdTestProjectNotExistException {
-//        // arrange
-//        crowdTestProjectCommand.setId(1L);
-//        Long projectId = crowdTestProjectCommand.getId();
-//        // action
-//        List<CrowdTestTask> crowdTestTaskList = crowdTestProject.updateCrowdTestTaskListStatus(projectId, CrowdTestTaskStatus.FINISHED);
-//        // assert
-//        boolean result = true;
-//        for (CrowdTestTask crowdTestTask : crowdTestTaskList) {
-//            if (crowdTestTask.getStatus().equals("HAS_FINISHED")){
-//                continue;
-//            }else{
-//                result = false;
-//            }
-//        }
-//        assertTrue(result);
-//    }
-//
-//    @Test
-//    public void should_modify_project_status_finished_when_submit_crowd_test_project_success() throws CrowdTestProjectNotExistException {
-//        // arrange
-//        crowdTestProjectCommand.setId(1L);
-//        crowdTestProjectCommand.setStatus(CrowdTestProjectStatus.FINISHED);
-//        // action
-//        CrowdTestProject crowdTestProject = crowdTestProjectRepo.updateCrowdTestProjectStatus(crowdTestProjectCommand.getId(), crowdTestProjectCommand.getStatus());
-//        // assert
-//        assertEquals(crowdTestProject.getStatus(), crowdTestProjectCommand.getStatus());
-//    }
-//
-//    @Test(expected = CrowdTestProjectNotExistException.class)
-//    public void should_throw_when_submit_crowd_test_project_not_exist() throws CrowdTestProjectNotExistException {
-//        // arrange
-//        crowdTestProjectCommand.setId(2L);
-//        crowdTestProjectCommand.setStatus(CrowdTestProjectStatus.FINISHED);
-//        // action
-//        crowdTestProjectRepo.updateCrowdTestProjectStatus(crowdTestProjectCommand.getId(), crowdTestProjectCommand.getStatus());
-//    }
-//}

core/src/test/java/com/mooctest/crowd/domain/domainobject/SystemAdministratorTest.java

@@ -1,27 +0,0 @@
-//package com.mooctest.crowd.domain.domainobject;
-//
-//import com.mooctest.crowd.domain.command.CrowdTestProjectCommand;
-//import com.mooctest.crowd.domain.exception.CrowdTestProjectNotExistException;
-//import com.mooctest.crowd.domain.repository.CrowdTestProjectRepo;
-//import org.junit.Test;
-//
-//import static org.junit.Assert.assertEquals;
-//
-///**
-// * @author guochao
-// * @date 2019/7/16 16:12
-// */
-//public class SystemAdministratorTest {
-//    private CrowdTestProjectRepo crowdTestProjectRepo = new CrowdTestProjectRepo();
-//    private CrowdTestProject crowdTestProject = new CrowdTestProject();
-//    private CrowdTestProjectCommand crowdTestProjectCommand = new CrowdTestProjectCommand();
-//    @Test
-//    public void should_modify_crowd_test_project_status_when_finished_crowd_test_project() throws CrowdTestProjectNotExistException {
-//        // arrange
-//        crowdTestProjectCommand.setId(1L);
-//        // action
-//        CrowdTestProject crowdTestProject = this.crowdTestProject.updateCrowdTestProjectStatusToFinish(crowdTestProjectCommand.getId(), CrowdTestProjectStatus.FINISHED);
-//        // assert
-//        assertEquals(crowdTestProject.getStatus(), CrowdTestProjectStatus.FINISHED);
-//    }
-//}

core/src/test/java/com/mooctest/crowd/domain/domainobject/UserTest.java

@@ -1,233 +0,0 @@
-//package com.mooctest.crowd.domain.domainobject;
-//
-//import com.mooctest.crowd.domain.command.LoginCommand;
-//import com.mooctest.crowd.domain.repository.UserRepo;
-//import org.junit.Before;
-//import org.junit.Rule;
-//import org.junit.rules.ExpectedException;
-//import org.junit.runner.RunWith;
-//import org.mockito.InjectMocks;
-//import org.mockito.Mock;
-//import org.mockito.MockitoAnnotations;
-//import org.mockito.runners.MockitoJUnitRunner;
-//
-//@RunWith(MockitoJUnitRunner.class)
-//public class UserTest {
-//    @InjectMocks
-//    private User user = new User();
-//
-//    @Mock
-//    private UserRepo userRepo;
-//
-//    private LoginCommand loginCommand = new LoginCommand();
-//
-//    @Rule
-//    public ExpectedException thrown = ExpectedException.none();
-//
-//    @Before
-//    public void setUp(){
-//        MockitoAnnotations.initMocks(this);
-//
-//        loginCommand.setMobileNum("13657094936");
-//        loginCommand.setPassword("123456");
-//
-//        user.setMobile("13657094936");
-//        user.setPassword("4QrcOUm6Wau+VuBX8g+IPg==");
-//
-//    }
-//
-//    @Test
-//    public void should_return_true_when_login_success() throws PasswordErrorException, UserNotExistException {
-//        // arrange
-//        when(userRepo.getByMobileNum("13657094936")).thenReturn(user);
-//        // action
-//        boolean success = user.login(loginCommand.getMobileNum(),loginCommand.getPassword());
-//        // assert
-//        assertTrue(success);
-//    }
-//
-//    @Test(expected = UserNotExistException.class)
-//    public void should_throw_when_user_not_exist() throws UserNotExistException, PasswordErrorException {
-//        // arrange
-//        loginCommand.setMobileNum("NOT_EXIST");
-//        when(userRepo.getByMobileNum("NOT_EXIST")).thenReturn(null);
-//        user.login(loginCommand.getMobileNum(),loginCommand.getPassword());
-//    }
-
-//
-//    @Test(expected = PasswordErrorException.class)
-//    public void should_throw_exception_when_password_error() throws PasswordErrorException, AccountNotExistException {
-//        // arrange
-//        LoginCommand loginCommand = new LoginCommand();
-//        loginCommand.setMobileNum("EXIST_ACCOUNT");
-//        loginCommand.setPassword("ERROR_PASSWORD");
-//        IAccountRepo IAccountRepo = new AccountUTRepo();
-//        Account account = IAccountRepo.getByMobileNum(loginCommand.getMobileNum());
-//        // assert
-//        account.login(loginCommand);
-//    }
-//
-//    @Test
-//    public void should_update_password_when_modify_password() throws AccountNotExistException, PasswordErrorException {
-//        // arrange
-//        ModifyPasswordCommand modifyPasswordCommand = new ModifyPasswordCommand();
-//        modifyPasswordCommand.setMobileNum("EXIST_ACCOUNT");
-//        modifyPasswordCommand.setOldPassword("PASSWORD");
-//        modifyPasswordCommand.setNewPassword("654321");
-//
-//        Account account = accountUTRepo.getByMobileNum(modifyPasswordCommand.getMobileNum());
-//        // action
-//        boolean result = account.modifyPassword(modifyPasswordCommand);
-//        // assert
-//        assertTrue(result);
-//    }
-//
-//    @Test
-//    public void should_return_permissions_when_account_login_success() throws AccountNotExistException {
-//        // arrange
-//        Account account = this.getSuccessAccount();
-//        // action
-//        List<Permission> permissions = account.distributePermission();
-//        // assert
-//        assertEquals(permissions.get(0).getId(), new Long(1));
-//    }
-//
-//    @Test
-//    public void should_return_roles_when_account_login_success() throws AccountNotExistException {
-//        // arrange
-//        Account account = this.getSuccessAccount();
-//        // action
-//        List<Role> roles = account.distributeRole();
-//        // assert
-//        assertEquals(roles.get(0).getId(), new Long(1));
-//    }
-//
-//    @Test
-//    public void should_return_account_when_view_by_account_id() throws AccountNotExistException {
-//        // arrange
-//        AccountCommand accountCommand = new AccountCommand();
-//        accountCommand.setId(123L);
-//
-//        // action
-//        Account accountUTRepoByID = accountUTRepo.getByID(accountCommand.getId());
-//        // assert
-//        assertEquals(accountUTRepoByID.getId(), accountCommand.getId());
-//    }
-//
-//    @Test(expected = AccountNotExistException.class)
-//    public void should_throw_when_view_account_not_exist_by_account_id() throws AccountNotExistException {
-//        // arrange
-//        AccountCommand accountCommand = new AccountCommand();
-//        accountCommand.setId(111L);
-//        // action
-//        accountUTRepo.getByID(accountCommand.getId());
-//    }
-//
-//    @Test
-//    public void should_return_account_list_when_view_by_account_ids() throws AccountNotExistException {
-//        // arrange
-//        Long[] ids = {123L};
-//        // action
-//        List<Account> accountList = accountUTRepo.getByIDList(ids);
-//        // assert
-//        assertEquals(accountList.get(0).getId(), ids[0]);
-//    }
-//
-//    @Test(expected = AccountNotExistException.class)
-//    public void should_throw_when_view_not_exist_account_by_account_ids() throws AccountNotExistException {
-//        // arrange
-//        Long[] ids = {123L,111L};
-//
-//        // action
-//        accountUTRepo.getByIDList(ids);
-//    }
-//
-//    @Test
-//    public void should_return_false_when_add_exist_account(){
-//        // arrange
-//        Account account = this.createCorrectAccount();
-//        // action
-//        Account resultAccount = accountUTRepo.addAccount(account);
-//        // assert
-//        assertEquals(resultAccount.getMobileNum(),account.getMobileNum());
-//    }
-//
-//    //    @Test(expected = AccountNotExistException.class)
-////    public void should_throw_when_add_account_success() throws AccountNotExistException {
-////        // arrange
-////        Account account = this.createDiscorrectAccount();
-////        // action
-////        accountUTRepo.addAccount(account);
-////    }
-//    @Test
-//    public void should_return_true_when_remove_account_success() throws AccountNotExistException {
-//        // arrange
-//        Account account = this.createCorrectAccount();
-//        // action
-//        boolean result = accountUTRepo.removeAccount(account);
-//        // assert
-//        assertTrue(result);
-//    }
-//
-//    @Test(expected = AccountNotExistException.class)
-//    public void should_throw_when_remove_not_exist_account() throws AccountNotExistException {
-//        // arrange
-//        Account account = this.createDiscorrectAccount();
-//        // action
-//        accountUTRepo.removeAccount(account);
-//    }
-//
-//    @Test
-//    public void should_return_true_when_update_account_success() throws AccountNotExistException {
-//        // arrange
-//        Account account = this.createCorrectAccount();
-//        account.setPassword("UPDATE_PASSWORD");
-//        // action
-//        Account updateAccount = accountUTRepo.updateAccount(account);
-//        // assert
-//        assertEquals(updateAccount.getPassword(),account.getPassword());
-//    }
-//
-//    @Test(expected = AccountNotExistException.class)
-//    public void should_throw_when_update_not_exist_account() throws AccountNotExistException {
-//        // arrange
-//        Account account = this.createDiscorrectAccount();
-//        // action
-//        accountUTRepo.updateAccount(account);
-//    }
-//
-//    private LoginCommand getSuccessLoginCommand() {
-//        LoginCommand loginCommand = new LoginCommand();
-//        loginCommand.setMobileNum("EXIST_ACCOUNT");
-//        loginCommand.setPassword("PASSWORD");
-//        loginCommand.setCheckCode("123456");
-//        return loginCommand;
-//    }
-//
-//    private Account getSuccessAccount() throws AccountNotExistException {
-//        LoginCommand loginCommand = getSuccessLoginCommand();
-//        IAccountRepo IAccountRepo = new AccountUTRepo();
-//        return IAccountRepo.getByMobileNum(loginCommand.getMobileNum());
-//    }
-//
-//    private Account createCorrectAccount(){
-//        AccountCommand accountCommand = new AccountCommand();
-//        accountCommand.setMobileNum("EXIST_ACCOUNT");
-//        accountCommand.setPassword("PASSWORD");
-//        Account account = new Account();
-//        account.setMobileNum(accountCommand.getMobileNum());
-//        account.setPassword(accountCommand.getPassword());
-//        return account;
-//    }
-//
-//    private Account createDiscorrectAccount(){
-//        AccountCommand accountCommand = new AccountCommand();
-//        accountCommand.setMobileNum("NOT_EXIST_ACCOUNT");
-//        accountCommand.setPassword("PASSWORD");
-//        Account account = new Account();
-//        account.setMobileNum(accountCommand.getMobileNum());
-//        account.setPassword(accountCommand.getPassword());
-//        return account;
-//    }
-//
-//}

core/src/test/java/com/mooctest/crowd/domain/repository/AccountUTRepoTest.java

@@ -1,74 +0,0 @@
-//package com.mooctest.crowd.domain.repository;
-//
-//import com.mooctest.crowd.domain.dao.UserDao;
-//import com.mooctest.crowd.domain.domainobject.User;
-//import com.mooctest.crowd.domain.exception.AccountNotExistException;
-//import com.mooctest.crowd.domain.model.UserPO;
-//import org.junit.Before;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.mockito.InjectMocks;
-//import org.mockito.Mock;
-//import org.mockito.MockitoAnnotations;
-//import org.mockito.runners.MockitoJUnitRunner;
-//
-//import static org.junit.Assert.assertEquals;
-//import static org.mockito.Mockito.when;
-//
-//@RunWith(MockitoJUnitRunner.class)
-//public class AccountUTRepoTest {
-//
-//    @InjectMocks
-//    private AccountUTRepo accountUTRepo = new AccountUTRepo();
-//
-//    @Mock
-//    private UserDao userDao;
-//
-//    private UserPO userPO =  new UserPO();
-//
-//    private User user =  new User();
-//
-//    @Before
-//    public void setUp() {
-//        MockitoAnnotations.initMocks(this);
-//
-//        user.setMobile("13657094936");
-//        user.setPassword("123456");
-//
-//        userPO.setMobile("13657094936");
-//        userPO.setPassword("123456");
-//    }
-//
-//    @Test
-//    public void show_return_user_when_getbymobilenum_mobile_num_exist() throws AccountNotExistException {
-//
-//        when(userDao.findByMobile("13657094936")).thenReturn(userPO);
-//        User user = accountUTRepo.getByMobileNum("13657094936");
-////        assertEquals(user.getPassword(), EncryptionUtil.encryptMD5(userPO.getPassword()));
-//        assertEquals(user.getPassword(), "123456");
-//    }
-//
-//    @Test
-//    public void getByID() {
-//    }
-//
-//    @Test
-//    public void getByIDList() {
-//    }
-//
-//    @Test
-//    public void addAccount() {
-//    }
-//
-//    @Test
-//    public void removeAccount() {
-//    }
-//
-//    @Test
-//    public void updateAccount() {
-//    }
-//
-//    @Test
-//    public void save() {
-//    }
-//}

core/src/test/java/com/mooctest/crowd/domain/repository/CrowdTestProjectRepoTest.java

@@ -0,0 +1,248 @@
+package com.mooctest.crowd.domain.repository;
+
+import com.mooctest.crowd.domain.dao.CrowdTestProjectDao;
+import com.mooctest.crowd.domain.dao.CrowdTestReportDao;
+import com.mooctest.crowd.domain.dao.CrowdTestTaskDao;
+import com.mooctest.crowd.domain.domainobject.*;
+import com.mooctest.crowd.domain.exception.CrowdTestProjectNotExistException;
+import com.mooctest.crowd.domain.model.CrowdTestProjectPO;
+import com.mooctest.crowd.domain.model.CrowdTestReportPO;
+import com.mooctest.crowd.domain.model.CrowdTestTaskPO;
+import com.mooctest.crowd.domain.util.Converter;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class CrowdTestProjectRepoTest {
+
+    @InjectMocks
+    private CrowdTestProjectRepo crowdTestProjectRepo = new CrowdTestProjectRepo();
+
+    @Mock
+    private CrowdTestProjectDao crowdTestProjectDao;
+
+    @Mock
+    private CrowdTestTaskDao crowdTestTaskDao;
+
+    @Mock
+    private CrowdTestReportDao crowdTestReportDao;
+
+    private CrowdTestProjectPO crowdTestProjectPO = new CrowdTestProjectPO();
+    private List<CrowdTestProjectPO> crowdTestProjectPOList = new ArrayList<>();
+    private CrowdTestTaskPO crowdTestTaskPO = new CrowdTestTaskPO();
+    private List<CrowdTestTaskPO> crowdTestTaskPOList = new ArrayList<>();
+    private CrowdTestReportPO crowdTestReportPO = new CrowdTestReportPO();
+    private List<CrowdTestReportPO> crowdTestReportPOList = new ArrayList<>();
+    private CrowdTestReportPO crowdTestProjectReportPO = new CrowdTestReportPO();
+    private List<CrowdTestReportPO> crowdTestProjectReportPOList = new ArrayList<>();
+
+    private User user = new User();
+    private EvaluationAgency evaluationAgency = new EvaluationAgency();
+    private RegionalManager regionalManager = new RegionalManager();
+    private CrowdTestProject crowdTestProject = new CrowdTestProject();
+    private CrowdTestTask crowdTestTask = new CrowdTestTask();
+    private List<CrowdTestTask> crowdTestTaskList = new ArrayList<>();
+    private List<CrowdTestProject> crowdTestProjectList = new ArrayList<>();
+
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        user.setId(1L);
+        user.setName("guochao");
+
+        evaluationAgency.setId(1L);
+        evaluationAgency.setEvaluationAgencyName("慕测科技");
+        evaluationAgency.setUserId(user.getId());
+
+        regionalManager.setId(1L);
+        regionalManager.setUserId(user.getId());
+        user.setEvaluationAgency(evaluationAgency);
+        user.setRegionalManager(regionalManager);
+
+        //测试项目
+        crowdTestProjectPO.setId(1L);
+        crowdTestProjectPO.setCode("PROR-IOS");
+        crowdTestProjectPO.setUserId(user.getId());
+        crowdTestProjectPO.setType("性能测试");
+        crowdTestProjectPO.setPlatform("IOS");
+        crowdTestProjectPO.setLinkMan("郭超");
+        crowdTestProjectPO.setLinkManMobile("1233343443");
+        crowdTestProjectPO.setDescription("测试IOS应用");
+        crowdTestProjectPO.setStatus(0);
+        crowdTestProjectPO.setIsDeleted(0);
+        crowdTestProjectPO.setDistributionProvince("江苏");
+        crowdTestProjectPO.setDistributionCity("南京");
+
+        //测试任务
+        crowdTestTaskPO.setCode("PROR-IOS-TASK-ONE");
+        crowdTestTaskPO.setId(1L);
+        crowdTestTaskPO.setCrowdTestProjectCode(crowdTestProjectPO.getCode());
+        crowdTestTaskPO.setDistributionProvince(crowdTestProjectPO.getDistributionProvince());
+        crowdTestTaskPO.setDistributionCity(crowdTestProjectPO.getDistributionCity());
+        crowdTestTaskPO.setDescription("测试任务一");
+        crowdTestTaskPO.setStatus(0);
+        crowdTestTaskPO.setIsDeleted(0);
+
+        crowdTestTaskPOList.add(crowdTestTaskPO);
+
+
+        //测试报告
+        crowdTestReportPO.setCode("PROR-IOS-TASK-ONE-REPO-ONE");
+        crowdTestReportPO.setId(1L);
+        crowdTestReportPO.setContent("测试报告正确");
+        crowdTestReportPO.setConclusion("测试完美");
+        crowdTestReportPO.setScope(1);
+        crowdTestReportPO.setIsDeleted(0);
+        crowdTestReportPOList.add(crowdTestReportPO);
+
+        //项目报告
+        crowdTestProjectReportPO.setCode("PROR-IOS");
+        crowdTestProjectReportPO.setId(2L);
+        crowdTestProjectReportPO.setContent("项目报告正确");
+        crowdTestProjectReportPO.setConclusion("项目完美");
+        crowdTestProjectReportPO.setScope(0);
+        crowdTestProjectReportPO.setIsDeleted(0);
+        crowdTestProjectReportPOList.add(crowdTestProjectReportPO);
+        crowdTestProjectPOList.add(crowdTestProjectPO);
+
+        //项目DO
+        crowdTestTask.setCrowdTestReportList(crowdTestReportPOList.stream().map(crowdTestReportPO -> Converter.convert(CrowdTestReport.class, crowdTestReportPO)).collect(Collectors.toList()));
+        crowdTestTaskList.add(crowdTestTask);
+        crowdTestProject.setCrowdTestTaskList(crowdTestTaskList);
+        crowdTestProject.setCrowdTestReportForProject(Converter.convert(CrowdTestReport.class, crowdTestProjectReportPO));
+
+        crowdTestProjectList.add(crowdTestProject);
+
+    }
+
+    @Test
+    public void should_return_project_when_get_by_project_id(){
+
+        //arrange
+        when(crowdTestProjectDao.findByIdAndIsDeleted(1L,0)).thenReturn(crowdTestProjectPO);
+        when(crowdTestTaskDao.findByCrowdTestProjectCodeAndIsDeleted("PROR-IOS",0)).thenReturn(crowdTestTaskPOList);
+        when(crowdTestReportDao.findByDependencyCodeAndIsDeleted("PROR-IOS-TASK-ONE",0)).thenReturn(crowdTestReportPOList);
+        when(crowdTestReportDao.findByDependencyCodeAndIsDeleted("PROR-IOS",0)).thenReturn(crowdTestProjectReportPOList);
+        //action
+        CrowdTestProject crowdTestProject = crowdTestProjectRepo.getByID(crowdTestProjectPO.getId());
+
+        //assert
+        Assert.assertEquals(crowdTestProject.getCrowdTestTaskList().get(0).getCrowdTestReportList().get(0).getDescription(),crowdTestReportPO.getDescription());
+    }
+
+    @Test(expected = CrowdTestProjectNotExistException.class)
+    public void should_throw_when_get_by_project_id_not_exist(){
+        //arrange
+        when(crowdTestProjectDao.findByIdAndIsDeleted(1L,0)).thenReturn(null);
+        //action
+        crowdTestProjectRepo.getByID(crowdTestProjectPO.getId());
+    }
+
+    @Test
+    public void should_return_project_when_get_by_project_code(){
+
+        //arrange
+        when(crowdTestProjectDao.findByCodeAndIsDeleted("PROR-IOS",0)).thenReturn(crowdTestProjectPO);
+        when(crowdTestTaskDao.findByCrowdTestProjectCodeAndIsDeleted("PROR-IOS",0)).thenReturn(crowdTestTaskPOList);
+        when(crowdTestReportDao.findByDependencyCodeAndIsDeleted("PROR-IOS-TASK-ONE",0)).thenReturn(crowdTestReportPOList);
+        when(crowdTestReportDao.findByDependencyCodeAndIsDeleted("PROR-IOS",0)).thenReturn(crowdTestProjectReportPOList);
+        //action
+        CrowdTestProject crowdTestProject = crowdTestProjectRepo.getByProjectCode(crowdTestProjectPO.getCode());
+
+        //assert
+        Assert.assertEquals(crowdTestProject.getCrowdTestTaskList().get(0).getCrowdTestReportList().get(0).getDescription(),crowdTestReportPO.getDescription());
+    }
+
+    @Test(expected = CrowdTestProjectNotExistException.class)
+    public void should_throw_when_get_by_project_code_not_exist(){
+
+        //arrange
+        when(crowdTestProjectDao.findByCodeAndIsDeleted("PROR-IOS",0)).thenReturn(null);
+        //action
+        crowdTestProjectRepo.getByProjectCode(crowdTestProjectPO.getCode());
+    }
+
+    @Test
+    public void should_return_project_list_when_get_by_user_id(){
+
+        //arrange
+        when(crowdTestProjectDao.findByUserIdAndIsDeleted(1L,0)).thenReturn(crowdTestProjectPOList);
+        //action
+        List<CrowdTestProject> crowdTestProjectList = crowdTestProjectRepo.getCrowdListByUserId(user.getId());
+
+        //assert
+        Assert.assertEquals(crowdTestProjectList.get(0).getCode(), crowdTestProjectPOList.get(0).getCode());
+    }
+
+    @Test
+    public void should_return_project_list_when_get_by_regional_manmger_id(){
+
+        //arrange
+        when(crowdTestProjectDao.findByRegionalManagerIdAndIsDeleted(1L,0)).thenReturn(crowdTestProjectPOList);
+        //action
+        List<CrowdTestProject> crowdTestProjectList = crowdTestProjectRepo.getCrowdListByRegionalManagerId(regionalManager.getId());
+
+        //assert
+        Assert.assertEquals(crowdTestProjectList.get(0).getCode(), crowdTestProjectPOList.get(0).getCode());
+    }
+
+    @Test
+    public void should_return_project_list_when_get_all_project(){
+
+        //arrange
+        when(crowdTestProjectDao.findAllByIsDeleted(0)).thenReturn(crowdTestProjectPOList);
+        //action
+        List<CrowdTestProject> crowdTestProjectList = crowdTestProjectRepo.getAllCrowdTestProject();
+
+        //assert
+        Assert.assertEquals(crowdTestProjectList.get(0).getCode(), crowdTestProjectPOList.get(0).getCode());
+    }
+
+    @Test
+    public void should_return_void_when_save_project(){
+
+        //arrange
+        when(crowdTestProjectDao.save(crowdTestProjectPO)).thenReturn(crowdTestProjectPO);
+        when(crowdTestTaskDao.save(crowdTestTaskPO)).thenReturn(crowdTestTaskPO);
+        when(crowdTestReportDao.save(crowdTestReportPO)).thenReturn(crowdTestReportPO);
+        //action
+        crowdTestProjectRepo.saveCrowdTestProject(crowdTestProject);
+    }
+
+    @Test
+    public void should_return_void_when_remove_project_list(){
+        //action
+        crowdTestProjectRepo.removeCrowdTestProjectList(crowdTestProjectList);
+    }
+
+    @Test
+    public void should_return_void_when_remove_project_by_id(){
+        //arrange
+        when(crowdTestProjectDao.findById(1L)).thenReturn(Optional.of(crowdTestProjectPO));
+        //action
+        crowdTestProjectRepo.deleteByProjectId(crowdTestProjectPO.getId());
+    }
+
+    @Test(expected = CrowdTestProjectNotExistException.class)
+    public void should_throw_when_remove_project_by_id_not_exist(){
+        //arrange
+        when(crowdTestProjectDao.findById(1L)).thenReturn(Optional.empty());
+        //action
+        crowdTestProjectRepo.deleteByProjectId(crowdTestProjectPO.getId());
+    }
+}

core/src/test/java/com/mooctest/crowd/domain/repository/UserRepoTest.java

@@ -1,7 +1,12 @@
 package com.mooctest.crowd.domain.repository;
 
 import com.mooctest.crowd.domain.dao.*;
-import com.mooctest.crowd.domain.domainobject.*;
+import com.mooctest.crowd.domain.domainobject.EvaluationAgency;
+import com.mooctest.crowd.domain.domainobject.Permission;
+import com.mooctest.crowd.domain.domainobject.Role;
+import com.mooctest.crowd.domain.domainobject.User;
+import com.mooctest.crowd.domain.exception.PermissionNotFoundException;
+import com.mooctest.crowd.domain.exception.RoleNotFoundException;
 import com.mooctest.crowd.domain.exception.UserNotExistException;
 import com.mooctest.crowd.domain.model.*;
 import org.junit.Assert;
@@ -13,6 +18,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.mockito.runners.MockitoJUnitRunner;
 
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
@@ -41,6 +47,10 @@ public class UserRepoTest {
     private RegionalManagerDao regionalManagerDao;
     @Mock
     private RegionalDao regionalDao;
+    @Mock
+    private EvaluationAgencyAbilityDao evaluationAgencyAbilityDao;
+    @Mock
+    private EvaluationAgencyResourceDao evaluationAgencyResourceDao;
 
     private UserPO expectUserPO;
     private RolePO expectRolePO;
@@ -48,43 +58,101 @@ public class UserRepoTest {
     private List<UserToRolePO> expectUserToRolePOList;
     private List<RoleToPermissionPO> expectRoleToPermissionPOList;
     private UserToRolePO expectUserToRolePO;
+    private RoleToPermissionPO expectRoleToPermissionPO;
+    private RegionalManagerPO expectRegionalPOManagerPO;
+    private EvaluationAgencyPO expectEvaluationAgencyPO;
+    private RegionalPO expectRegionalPO;
+    private EvaluationAgencyAbilityPO evaluationAgencyAbilityPO;
+    private EvaluationAgencyResourcePO evaluationAgencyResourcePO;
+    private List<RegionalManagerPO> expectRegionalPOManagerList = new ArrayList<>();
+    private List<EvaluationAgencyPO> evaluationAgencyPOList = new ArrayList<>();
+    private List<EvaluationAgencyAbilityPO> evaluationAgencyAbilityPOList = new ArrayList<>();
+    private List<EvaluationAgencyResourcePO> evaluationAgencyResourcePOList = new ArrayList<>();
+
+
+
 
     @Before
     public void before() {
         MockitoAnnotations.initMocks(this);
 
         expectUserPO = new UserPO();
+        expectUserPO.setId(1L);
+        expectUserPO.setName("郭超");
+        expectUserPO.setEmail("1021172957@qq.com");
+        expectUserPO.setPassword("123456");
+        expectUserPO.setMobile("13657094936");
+
         expectRolePO = new RolePO();
+        expectRolePO.setId(1L);
+        expectRolePO.setName("generalUser");
+
         expectUserToRolePO = new UserToRolePO();
-        RoleToPermissionPO expectRoleToPermissionPO = new RoleToPermissionPO();
+        expectUserToRolePO.setId(1L);
+        expectUserToRolePO.setRoleId(1L);
+        expectUserToRolePO.setUserId(1L);
+
         expectPermission = new PermissionPO();
+        expectPermission.setId(1L);
+        expectPermission.setName("查看项目");
+
+        expectRoleToPermissionPO = new RoleToPermissionPO();
+        expectRoleToPermissionPO.setId(1L);
+        expectRoleToPermissionPO.setPermissionId(1L);
+
         expectUserToRolePOList = new LinkedList<>();
+        expectUserToRolePOList.add(expectUserToRolePO);
+
         expectRoleToPermissionPOList = new LinkedList<>();
         expectRoleToPermissionPOList.add(expectRoleToPermissionPO);
-        expectUserToRolePOList.add(expectUserToRolePO);
+
+        expectEvaluationAgencyPO = new EvaluationAgencyPO();
+        expectEvaluationAgencyPO.setId(1L);
+        expectEvaluationAgencyPO.setIsAuthentication(-1);
+        expectEvaluationAgencyPO.setBankAccount("123445666");
+        expectEvaluationAgencyPO.setAgencyPhoto("http://mooctest.png");
+        expectEvaluationAgencyPO.setUserId(1L);
+        evaluationAgencyPOList.add(expectEvaluationAgencyPO);
+
+        expectRegionalPO = new RegionalPO();
+        expectRegionalPO.setId(1L);
+
+        expectRegionalPOManagerPO = new RegionalManagerPO();
+        expectRegionalPOManagerPO.setId(1L);
+        expectRegionalPOManagerPO.setUserId(1L);
+        expectRegionalPOManagerPO.setRegionalId(1L);
+        expectRegionalPOManagerList.add(expectRegionalPOManagerPO);
+
+        evaluationAgencyAbilityPO = new EvaluationAgencyAbilityPO();
+        evaluationAgencyAbilityPO.setId(1L);
+        evaluationAgencyAbilityPO.setEvaluationAgencyId(1L);
+        evaluationAgencyAbilityPO.setAbilityName("web测试");
+        evaluationAgencyAbilityPOList.add(evaluationAgencyAbilityPO);
+
+        evaluationAgencyResourcePO = new EvaluationAgencyResourcePO();
+        evaluationAgencyResourcePO.setId(1L);
+        evaluationAgencyResourcePO.setEvaluationAgencyId(1L);
+        evaluationAgencyResourcePO.setCount(10);
+        evaluationAgencyResourcePOList.add(evaluationAgencyResourcePO);
     }
 
     @Test
     public void should_return_user_optional_when_get_by_id_success() {
         //arrange
-        EvaluationAgencyPO expectEvaluationAgency = new EvaluationAgencyPO();
-        List<RegionalManagerPO> expectRegionalManagerList = new LinkedList<>();
-        RegionalManagerPO regionalManagerPO = new RegionalManagerPO();
-        expectRegionalManagerList.add(regionalManagerPO);
-        RegionalPO expectRegional = new RegionalPO();
-
         when(userDao.findById(anyLong())).thenReturn(Optional.of(expectUserPO));
         when(userToRoleDao.findByUserId(anyLong())).thenReturn(expectUserToRolePOList);
         when(roleDao.findById(anyLong())).thenReturn(Optional.of(expectRolePO));
         when(roleToPermissionDao.findAllByRoleId(anyLong())).thenReturn(expectRoleToPermissionPOList);
         when(permissionDao.findById(anyLong())).thenReturn(Optional.of(expectPermission));
-        when(evaluationAgencyDao.findByUserId(anyLong())).thenReturn(expectEvaluationAgency);
-        when(regionalManagerDao.findByUserId(anyLong())).thenReturn(expectRegionalManagerList);
-        when(regionalDao.findById(anyLong())).thenReturn(Optional.of(expectRegional));
+        when(evaluationAgencyDao.findByUserId(anyLong())).thenReturn(expectEvaluationAgencyPO);
+        when(evaluationAgencyAbilityDao.findByEvaluationAgencyId(anyLong())).thenReturn(evaluationAgencyAbilityPOList);
+        when(evaluationAgencyResourceDao.findByEvaluationAgencyId(anyLong())).thenReturn(evaluationAgencyResourcePOList);
+        when(regionalManagerDao.findByUserId(anyLong())).thenReturn(expectRegionalPOManagerList);
+        when(regionalDao.findById(anyLong())).thenReturn(Optional.of(expectRegionalPO));
         //action
-        User user = userRepo.getByID(0L);
+        User user = userRepo.getByID(1L);
         //assert
-        Assert.assertNotNull(user);
+        Assert.assertEquals(user.getId(),expectUserPO.getId());
     }
 
     @Test(expected = UserNotExistException.class)
@@ -92,22 +160,38 @@ public class UserRepoTest {
         //arrange
         when(userDao.findById(anyLong())).thenReturn(Optional.empty());
         //action
-        userRepo.getByID(0L);
-        //assert
+        userRepo.getByID(1L);
+    }
+
+    @Test(expected = RoleNotFoundException.class)
+    public void should_throw_when_get_by_id_role_not_exist(){
+        //arrange
+        //arrange
+        when(userDao.findById(anyLong())).thenReturn(Optional.of(expectUserPO));
+        when(userToRoleDao.findByUserId(anyLong())).thenReturn(expectUserToRolePOList);
+        when(roleToPermissionDao.findAllByRoleId(anyLong())).thenReturn(expectRoleToPermissionPOList);
+        when(permissionDao.findById(anyLong())).thenReturn(Optional.of(expectPermission));
+        when(evaluationAgencyDao.findByUserId(anyLong())).thenReturn(expectEvaluationAgencyPO);
+        when(evaluationAgencyAbilityDao.findByEvaluationAgencyId(anyLong())).thenReturn(evaluationAgencyAbilityPOList);
+        when(regionalManagerDao.findByUserId(anyLong())).thenReturn(expectRegionalPOManagerList);
+        when(regionalDao.findById(anyLong())).thenReturn(Optional.of(expectRegionalPO));
+        when(roleDao.findById(anyLong())).thenReturn(Optional.empty());
+        //action
+        userRepo.getByID(1L);
     }
 
     @Test
     public void should_return_user_optional_when_get_by_mobile_number_success() {
         //arrange
-        when(userDao.findByMobile(anyString())).thenReturn(expectUserPO);
+        when(userDao.findByMobile("13657094936")).thenReturn(expectUserPO);
         when(userToRoleDao.findByUserId(anyLong())).thenReturn(expectUserToRolePOList);
         when(roleDao.findById(anyLong())).thenReturn(Optional.of(expectRolePO));
         when(roleToPermissionDao.findAllByRoleId(anyLong())).thenReturn(expectRoleToPermissionPOList);
         when(permissionDao.findById(anyLong())).thenReturn(Optional.of(expectPermission));
         //action
-        User user = userRepo.getByMobileNum("123");
+        User user = userRepo.getByMobileNum(expectUserPO.getMobile());
         //assert
-        Assert.assertNotNull(user);
+        Assert.assertEquals(user.getId(),expectUserPO.getId());
     }
 
     @Test(expected = UserNotExistException.class)
@@ -116,7 +200,6 @@ public class UserRepoTest {
         when(userDao.findByMobile(anyString())).thenReturn(null);
         //action
         userRepo.getByMobileNum("123");
-        //assert
     }
 
     @Test
@@ -130,10 +213,29 @@ public class UserRepoTest {
         when(userDao.save(any(UserPO.class))).thenReturn(expectUserPO);
         when(roleDao.findByName(anyString())).thenReturn(expectRolePO);
         when(userToRoleDao.save(any(UserToRolePO.class))).thenReturn(expectUserToRolePO);
+        when(roleToPermissionDao.findAllByRoleId(anyLong())).thenReturn(expectRoleToPermissionPOList);
+        when(permissionDao.findById(anyLong())).thenReturn(Optional.of(expectPermission));
         //action
         User resultUser = userRepo.saveUserAndRole(user);
         //assert
-        Assert.assertNotNull(resultUser);
+        Assert.assertEquals(resultUser.getId(), expectUserPO.getId());
+    }
+
+    @Test(expected = PermissionNotFoundException.class)
+    public void should_return_expert_when_save_user_and_role_permission_not_found() {
+        //arrange
+        Role expectRole = new Role();
+        List<Role> roleList = new LinkedList<>();
+        roleList.add(expectRole);
+        User user = new User();
+        user.setRoleList(roleList);
+        when(userDao.save(any(UserPO.class))).thenReturn(expectUserPO);
+        when(roleDao.findByName(anyString())).thenReturn(expectRolePO);
+        when(userToRoleDao.save(any(UserToRolePO.class))).thenReturn(expectUserToRolePO);
+        when(roleToPermissionDao.findAllByRoleId(1L)).thenReturn(expectRoleToPermissionPOList);
+        when(permissionDao.findById(anyLong())).thenReturn(Optional.empty());
+        //action
+        userRepo.saveUserAndRole(user);
     }
 
     @Test
@@ -144,6 +246,7 @@ public class UserRepoTest {
         permissionList.add(permission);
         List<Role> roleList = new LinkedList<>();
         Role role = new Role();
+        role.setId(1L);
         role.setPermissionList(permissionList);
         roleList.add(role);
         EvaluationAgency evaluationAgency = new EvaluationAgency();
@@ -158,7 +261,31 @@ public class UserRepoTest {
         //action
         User resultUser = userRepo.saveUser(user);
         //assert
-        Assert.assertNotNull(resultUser);
+        Assert.assertEquals(resultUser.getId(),expectUserPO.getId());
+    }
+
+    @Test
+    public void should_return_user_when_save_user_role_is_null() {
+        //arrange
+        List<Permission> permissionList = new LinkedList<>();
+        Permission permission = new Permission();
+        permissionList.add(permission);
+        List<Role> roleList = new LinkedList<>();
+        Role role = new Role();
+        role.setPermissionList(permissionList);
+        roleList.add(role);
+        EvaluationAgency evaluationAgency = new EvaluationAgency();
+        User user = new User();
+        user.setEvaluationAgency(evaluationAgency);
+        user.setRoleList(null);
+        expectUserPO.setId(0L);
+
+        when(userDao.save(any(UserPO.class))).thenReturn(expectUserPO);
+        when(userDao.findById(any(Long.class))).thenReturn(Optional.of(expectUserPO));
+        //action
+        User resultUser = userRepo.saveUser(user);
+        //assert
+        Assert.assertEquals(resultUser.getId(),expectUserPO.getId());
     }
 
     @Test
@@ -208,5 +335,25 @@ public class UserRepoTest {
         Assert.assertNull(null);
     }
 
+    @Test
+    public void should_return_user_list_when_get_apply_agency() {
+        //arrange
+        when(evaluationAgencyDao.findByIsAuthentication(-1)).thenReturn(evaluationAgencyPOList);
+        when(userDao.findById(any(Long.class))).thenReturn(Optional.of(expectUserPO));
+        //action
+        List<User> applyAgencyList = userRepo.getApplyEvaluationAgencyByIsAuthenticated();
+        //assert
+        Assert.assertNotNull(applyAgencyList);
+    }
+
+    @Test
+    public void should_return_role_when_get_role(){
+        //arrange
+        when(roleDao.findByName(anyString())).thenReturn(expectRolePO);
+        //action
+        Role role = userRepo.getRole(expectRolePO.getName());
+        Assert.assertEquals(role.getName(),expectRolePO.getName());
+
+    }
 
 }