chenxz 8 jaren geleden
bovenliggende
commit
576b415f5e

+ 2 - 2
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/impl/ExamSchedulerServiceImpl.java

@@ -42,7 +42,7 @@ public class ExamSchedulerServiceImpl implements ExamSchedulerService {
             return true;
         }
         return false;
-    };
+    }
 
     @Override
     public boolean cancelExamScheduler(Task task) {
@@ -53,7 +53,7 @@ public class ExamSchedulerServiceImpl implements ExamSchedulerService {
             return true;
         }
         return false;
-    };
+    }
 
     public String generateNextCronExp(Task task) {
         String cronExp = null;

+ 13 - 1
mooctest-site-server/src/test/java/cn/iselab/mooctest/site/service/fromKibug/impl/ReportServiceImplTest.java

@@ -3,9 +3,12 @@ package cn.iselab.mooctest.site.service.fromKibug.impl;
 import cn.iselab.mooctest.site.dao.fromKibug.CaseTakeDao;
 import cn.iselab.mooctest.site.dao.fromKibug.IncrementIdDao;
 import cn.iselab.mooctest.site.dao.fromKibug.ReportDao;
+import cn.iselab.mooctest.site.models.Task;
 import cn.iselab.mooctest.site.models.fromKibug.CaseTake;
 import cn.iselab.mooctest.site.models.fromKibug.IncrementId;
 import cn.iselab.mooctest.site.models.fromKibug.Report;
+import cn.iselab.mooctest.site.service.TaskService;
+import cn.iselab.mooctest.site.service.instancePermission.ReportPermissionService;
 import cn.iselab.mooctest.site.web.data.fromKibug.ReportVO;
 import cn.iselab.mooctest.site.web.exception.IllegalOperationException;
 import org.junit.Assert;
@@ -25,6 +28,7 @@ import java.util.Collections;
 import java.util.List;
 
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyLong;
 import static org.mockito.Mockito.when;
 
 /**
@@ -39,14 +43,20 @@ public class ReportServiceImplTest {
     private ReportDao reportDao;
     @Mock
     private IncrementIdDao incrementIdDao;
+    @Mock
+    private ReportPermissionService reportPermissionService;
+    @Mock
+    private TaskService taskService;
     @Rule
     public ExpectedException thrown= ExpectedException.none();
+    private Task task=new Task();
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-    }
 
+        task.setOwnerId(1L);
+    }
 
     @Test
     public void should_changeReportStatus_when_givenReportId() throws Exception {
@@ -67,6 +77,7 @@ public class ReportServiceImplTest {
         incrementId.setId(111111);
         when(caseTakeDao.findByTaskIdAndCaseIdAndWorkerId(72,123,27)).thenReturn(caseTakes);
         when(incrementIdDao.save(any(IncrementId.class))).thenReturn(incrementId);
+        when(taskService.getTask(anyLong())).thenReturn(task);
 
         ReportVO vo = new ReportVO();
         vo.setCaseId(123L);
@@ -88,6 +99,7 @@ public class ReportServiceImplTest {
         when(caseTakeDao.findByTaskIdAndCaseIdAndWorkerId(72,123,27)).thenReturn(Collections.emptyList());
         when(incrementIdDao.save(any(IncrementId.class))).thenReturn(incrementId);
         when(caseTakeDao.save(any(CaseTake.class))).thenReturn(caseTake);
+        when(taskService.getTask(anyLong())).thenReturn(task);
 
         ReportVO vo = new ReportVO();
         vo.setCaseId(123L);