修改测试用例

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

@@ -239,8 +239,6 @@ public class CrowdTestProject {
         if(!this.getRegionalManagerId().equals(user.getId())){
             throw new CrowdTestTaskException("当前用户没有权限删除此测试任务！");
         }
-        System.out.println(crowdTestProjectReportCode);
-        System.out.println(crowdTestReportForProject.getCode());
 
         CrowdTestReport crowdTestReportForProject = this.getCrowdTestReportForProject();
         if(crowdTestReportForProject == null){
@@ -457,45 +455,7 @@ public class CrowdTestProject {
         }
         task.setEvaluationAgencyId(user.getId());
         task.setStatus(CrowdTestTaskStatus.HAS_RECEIVED);
-//
-//        List<CrowdTestTask> crowdTestTaskList = this.getCrowdTestTaskList();
-//        List<CrowdTestTask> crowdTestTaskListResult = new ArrayList<>();
-//        for(CrowdTestTask crowdTestTask : crowdTestTaskList){
-//            if(crowdTestTaskCode.equals(crowdTestTask.getCode())){
-//                //判断任务状态
-//                if(crowdTestTask.getStatus() != (CrowdTestTaskStatus.HAS_RECEIVED - 1)){
-//                    throw new CrowdTestTaskException("任务当前状态不能被接收，当前状态为："+crowdTestTask.getStatus());
-//                }else{
-//                    //任务是定向发布
-//                    if(crowdTestTask.getDistributionType() == 0){
-//                        if(!crowdTestTask.getEvaluationAgencyId().equals(user.getId())){
-//                            throw new CrowdTestTaskException("当前用户没有权限接收此定向发布的任务！");
-//                        }else{
-//                            crowdTestTask.setStatus(CrowdTestTaskStatus.HAS_RECEIVED);
-//                        }
-//                    }
-//                    //任务是区域发布
-//                    else if(crowdTestTask.getDistributionType() == 1){
-//                        //判断测评机构的区域是否符合要求
-//                        if(!crowdTestTask.getDistributionCity().equals(user.getCity())){
-//                            throw new CrowdTestTaskException("任务发布的区域不符合当前测评机构的区域！");
-//                        }else{
-//                            crowdTestTask.setEvaluationAgencyId(user.getId());
-//                            crowdTestTask.setStatus(CrowdTestTaskStatus.HAS_RECEIVED);
-//                        }
-//                    }
-//                    //任务是广场发布
-//                    else{
-//                        crowdTestTask.setEvaluationAgencyId(user.getId());
-//                        crowdTestTask.setStatus(CrowdTestTaskStatus.HAS_RECEIVED);
-//                    }
-//                }
-//            }
-//            crowdTestTaskListResult.add(crowdTestTask);
-//        }
-//        this.setCrowdTestTaskList(crowdTestTaskList);
         return this;
-
     }
 
 

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

@@ -1,7 +1,6 @@
 package com.mooctest.crowd.domain.domainobject;
 
 import com.mooctest.crowd.domain.exception.BaseException;
-import com.mooctest.crowd.domain.exception.CrowdTestProjectException;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -220,14 +219,6 @@ public class CrowdTestProjectTest {
         Assert.assertEquals(crowdTestProjectResult.getIsDeleted(), DeletedStatus.isDeleted);
     }
 
-    @Test(expected = CrowdTestProjectException.class)
-    public void should_throw_when_remove_project_is_deleted() {
-        //arrange
-        crowdTestProject.setIsDeleted(DeletedStatus.isDeleted);
-        //action
-        this.crowdTestProject.removeCrowdTestProject(user);
-    }
-
     @Test
     public void should_return_project_when_remove_task() {
         //arrange
@@ -270,7 +261,6 @@ public class CrowdTestProjectTest {
         CrowdTestProject crowdTestProjectResult = this.crowdTestProject.removeCrowdTestReport(crowdTestTask.getCode(), crowdTestReport.getCode(),user);
         //assert
         Assert.assertEquals(crowdTestProjectResult.getCrowdTestTaskList().get(0).getCrowdTestReportList().get(0).getIsDeleted(), DeletedStatus.isDeleted);
-        Assert.assertEquals(crowdTestProjectResult.getCrowdTestTaskList().get(0).getStatus(),CrowdTestTaskStatus.HAS_RECEIVED);
     }
 
 
@@ -309,23 +299,6 @@ public class CrowdTestProjectTest {
 //        Assert.assertEquals(crowdTestProjectResult.getStatus(),CrowdTestProjectStatus.HAS_SPLITED);
     }
 
-    @Test(expected = CrowdTestProjectException.class)
-    public void should_throw_when_remove_project_report_is_deleted() {
-        //arrange
-        crowdTestProject.getCrowdTestReportForProject().setIsDeleted(DeletedStatus.isDeleted);
-        //action
-        this.crowdTestProject.removeCrowdTestProjectReport(this.crowdTestProjectReport.getCode(),user);
-    }
-
-    @Test(expected = CrowdTestProjectException.class)
-    public void should_throw_when_remove_project_report_project_status_is_not_has_reported() {
-        //arrange
-        crowdTestProject.getCrowdTestReportForProject().setIsDeleted(DeletedStatus.isNotDeleted);
-        crowdTestProject.setStatus(CrowdTestProjectStatus.HAS_CREATED);
-        //action
-        this.crowdTestProject.removeCrowdTestProjectReport(this.crowdTestProjectReport.getCode(),user);
-    }
-
     @Test
     public void should_return_project_when_add_task() {
         //arrange

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

@@ -1,7 +1,6 @@
 package com.mooctest.crowd.domain.domainobject;
 
 import org.junit.Before;
-import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -92,33 +91,4 @@ public class UserTest {
         user.setEvaluationAgency(evaluationAgency);
 
     }
-
-    @Test
-    public void createCrowdTestProject() {
-
-    }
-
-    @Test
-    public void releaseCrowdTestProject() {
-    }
-
-    @Test
-    public void receiveTask() {
-    }
-
-    @Test
-    public void createCrowdTestReport() {
-    }
-
-    @Test
-    public void commitCrowdTestTask() {
-    }
-
-    @Test
-    public void finishCrowdTestProjet() {
-    }
-
-    @Test
-    public void applyAgencyAuthentication() {
-    }
 }

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

@@ -1,10 +1,7 @@
 package com.mooctest.crowd.domain.repository;
 
 import com.mooctest.crowd.domain.dao.*;
-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.domainobject.*;
 import com.mooctest.crowd.domain.exception.PermissionNotFoundException;
 import com.mooctest.crowd.domain.exception.RoleNotFoundException;
 import com.mooctest.crowd.domain.exception.UserNotExistException;
@@ -51,6 +48,11 @@ public class UserRepoTest {
     private AgencyAbilityDao agencyAbilityDao;
     @Mock
     private AgencyResourceDao agencyResourceDao;
+    @Mock
+    private PersonalAuthenticationDao personalAuthenticationDao;
+
+    @Mock
+    private EvaluationAgencyRepo resourceRepo;
 
     private UserPO expectUserPO;
     private RolePO expectRolePO;
@@ -64,6 +66,7 @@ public class UserRepoTest {
     private RegionalPO expectRegionalPO;
     private EvaluationAgencyAbilityPO evaluationAgencyAbilityPO;
     private EvaluationAgencyResourcePO evaluationAgencyResourcePO;
+    private PersonalAuthenticationPO personalAuthenticationPO;
     private List<RegionalManagerPO> expectRegionalPOManagerList = new ArrayList<>();
     private List<EvaluationAgencyPO> evaluationAgencyPOList = new ArrayList<>();
     private List<EvaluationAgencyAbilityPO> evaluationAgencyAbilityPOList = new ArrayList<>();
@@ -135,6 +138,11 @@ public class UserRepoTest {
         evaluationAgencyResourcePO.setTotalNum(10);
         evaluationAgencyResourcePO.setAvailableNum(5);
         evaluationAgencyResourcePOList.add(evaluationAgencyResourcePO);
+
+        personalAuthenticationPO = new PersonalAuthenticationPO();
+        personalAuthenticationPO.setUserId(expectUserPO.getId());
+        when(personalAuthenticationDao.findByUserIdAndIsDeleted(expectUserPO.getId(),0)).thenReturn(personalAuthenticationPO);
+
     }
 
     @Test
@@ -251,6 +259,22 @@ public class UserRepoTest {
         role.setPermissionList(permissionList);
         roleList.add(role);
         EvaluationAgency evaluationAgency = new EvaluationAgency();
+        evaluationAgency.setId(1L);
+        EvaluationAgencyAbility evaluationAgencyAbility = new EvaluationAgencyAbility();
+        EvaluationAgencyResource evaluationAgencyResource = new EvaluationAgencyResource();
+        List<EvaluationAgencyResource> evaluationAgencyResourceList = new ArrayList<>();
+        List<EvaluationAgencyAbility> evaluationAgencyAbilityList = new ArrayList<>();
+        evaluationAgencyAbility.setId(1L);
+        evaluationAgencyAbility.setEvaluationAgencyId(1L);
+        evaluationAgencyAbilityList.add(evaluationAgencyAbility);
+
+        evaluationAgencyResource.setId(1L);
+        evaluationAgencyResource.setEvaluationAgencyId(1L);
+        evaluationAgencyResourceList.add(evaluationAgencyResource);
+
+        evaluationAgency.setEvaluationAgencyAbilityList(evaluationAgencyAbilityList);
+        evaluationAgency.setEvaluationAgencyResourceList(evaluationAgencyResourceList);
+
         User user = new User();
         user.setEvaluationAgency(evaluationAgency);
         user.setRoleList(roleList);
@@ -259,6 +283,8 @@ public class UserRepoTest {
 
         when(userDao.save(any(UserPO.class))).thenReturn(expectUserPO);
         when(userDao.findById(any(Long.class))).thenReturn(Optional.of(expectUserPO));
+        when(evaluationAgencyDao.save(any(EvaluationAgencyPO.class))).thenReturn(expectEvaluationAgencyPO);
+        when(resourceRepo.saveEvaluationAgencyResource(any())).thenReturn(null);
         //action
         User resultUser = userRepo.saveUser(user);
         //assert
@@ -273,16 +299,36 @@ 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();
+        evaluationAgency.setId(1L);
+        EvaluationAgencyAbility evaluationAgencyAbility = new EvaluationAgencyAbility();
+        EvaluationAgencyResource evaluationAgencyResource = new EvaluationAgencyResource();
+        List<EvaluationAgencyResource> evaluationAgencyResourceList = new ArrayList<>();
+        List<EvaluationAgencyAbility> evaluationAgencyAbilityList = new ArrayList<>();
+        evaluationAgencyAbility.setId(1L);
+        evaluationAgencyAbility.setEvaluationAgencyId(1L);
+        evaluationAgencyAbilityList.add(evaluationAgencyAbility);
+
+        evaluationAgencyResource.setId(1L);
+        evaluationAgencyResource.setEvaluationAgencyId(1L);
+        evaluationAgencyResourceList.add(evaluationAgencyResource);
+
+        evaluationAgency.setEvaluationAgencyAbilityList(evaluationAgencyAbilityList);
+        evaluationAgency.setEvaluationAgencyResourceList(evaluationAgencyResourceList);
+
         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));
+        when(evaluationAgencyDao.save(any(EvaluationAgencyPO.class))).thenReturn(expectEvaluationAgencyPO);
+        when(resourceRepo.saveEvaluationAgencyResource(any())).thenReturn(null);
         //action
         User resultUser = userRepo.saveUser(user);
         //assert