修复测试用例

mooctest-site-server/src/test/java/cn/iselab/mooctest/site/web/ctrl/CaseControllerTest.java

@@ -13,6 +13,7 @@ import cn.iselab.mooctest.site.web.data.forMongo.graph.Category;
 import cn.iselab.mooctest.site.web.data.forMongo.graph.Edge;
 import cn.iselab.mooctest.site.web.data.forMongo.graph.Node;
 import cn.iselab.mooctest.site.web.logic.CaseLogic;
+import cn.iselab.mooctest.site.web.logic.GeneralCalculateScoreLogic;
 import org.apache.shiro.session.Session;
 import org.apache.shiro.subject.Subject;
 import org.json.JSONArray;
@@ -58,6 +59,8 @@ public class CaseControllerTest extends AbstractShiroTest{
     private CaseLogic caseLogic;
     @Mock
     private ExamService examService;
+    @Mock
+    private GeneralCalculateScoreLogic generalCalculateScoreLogic;
 
     private Page<CaseExtendsVO> expectPage;
     private List<CaseExtendsVO> cases = new ArrayList<>();

mooctest-site-server/src/test/java/cn/iselab/mooctest/site/web/logic/impl/GeneralCalculateScoreComponentTest.java

@@ -3,6 +3,7 @@ package cn.iselab.mooctest.site.web.logic.impl;
 
 import cn.iselab.mooctest.site.data.GeneralGradeDTO;
 import cn.iselab.mooctest.site.service.*;
+import cn.iselab.mooctest.site.util.data.CacheUtil;
 import cn.iselab.mooctest.site.web.data.forMongo.CaseGraphDTO;
 import cn.iselab.mooctest.site.web.data.forMongo.NodeCatch.CatchDTO;
 import cn.iselab.mooctest.site.web.data.forMongo.NodeCatch.UserCatchDTO;
@@ -50,6 +51,8 @@ public class GeneralCalculateScoreComponentTest {
     private LatestStrategy latestStrategy;
     @Mock
     private HighestStrategy highestStrategy;
+    @Mock
+    private CacheUtil cacheUtil;
 
 
 
@@ -70,9 +73,9 @@ public class GeneralCalculateScoreComponentTest {
 
         //初始化反射类及其成员变量
         instance = generalCalculateScoreComponentClass.newInstance();
-        Field caseGraphServiceField = generalCalculateScoreComponentClass.getDeclaredField
-                ("caseGraphService");
-        caseGraphServiceField.set(instance, caseGraphService);
+//        Field caseGraphServiceField = generalCalculateScoreComponentClass.getDeclaredField
+//                ("caseGraphService");
+//        caseGraphServiceField.set(instance, caseGraphService);
 
         Field catchServiceField= generalCalculateScoreComponentClass.getDeclaredField("catchService");
         catchServiceField.set(instance, catchService);
@@ -84,6 +87,10 @@ public class GeneralCalculateScoreComponentTest {
                 ("highestStrategy");
         field2.set(instance, highestStrategy);
 
+        Field field3 = generalCalculateScoreComponentClass.getDeclaredField
+                ("cacheUtil");
+        field3.set(instance, cacheUtil);
+
         basicNode.setCaseId(1L);
         Category c1 = new Category("c1", 1);
         Category c2 = new Category("c2", 1);
@@ -153,7 +160,7 @@ public class GeneralCalculateScoreComponentTest {
 
     @Test
     public void should_calculateTypeScore_when_givenData() throws Exception {
-        when(caseGraphService.getCaseGraph(1L)).thenReturn(basicNode);
+        when(cacheUtil.getMetaNode(1L)).thenReturn(basicNode);
         when(catchService.findById("5b2fdac0d7fa0b6acb628193")).thenReturn(catchDTOList);
 
         Method method = generalCalculateScoreComponentClass.getDeclaredMethod("calculateTypeScore",