Merge branch 'dev-dubbo-refactor' into 'DEV'

fix ut







See merge request !170

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/TargetVO.java

@@ -8,20 +8,20 @@ import java.sql.Timestamp;
  */
 public class TargetVO {
 
-    private long id;
-    private long managerId;
+    private Long id;
+    private Long managerId;
     private Long subsiteId;
     private String name;
     private Timestamp createTimeMillis;
     private Timestamp endTimeMillis;
     private boolean visible;
-    private int status;
-    private int fromCloud;
+    private Integer status;
+    private Integer fromCloud;
     private String url;
     private short complete;
-    private long ownerId;
+    private Long ownerId;
 
-    public long getId() {
+    public Long getId() {
         return id;
     }
 
@@ -29,7 +29,7 @@ public class TargetVO {
         this.id = id;
     }
 
-    public long getManagerId() {
+    public Long getManagerId() {
         return managerId;
     }
 
@@ -77,7 +77,7 @@ public class TargetVO {
         this.visible = visible;
     }
 
-    public int getStatus() {
+    public Integer getStatus() {
         return status;
     }
 
@@ -85,7 +85,7 @@ public class TargetVO {
         this.status = status;
     }
 
-    public int getFromCloud() {
+    public Integer getFromCloud() {
         return fromCloud;
     }
 
@@ -109,7 +109,7 @@ public class TargetVO {
         this.complete = complete;
     }
 
-    public long getOwnerId() {
+    public Long getOwnerId() {
         return ownerId;
     }
 

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

@@ -163,7 +163,7 @@ public class TargetControllerTest {
         ).andDo(print()).andExpect(status().isOk()).andReturn();
 
         JSONObject object=new JSONObject(result.getResponse().getContentAsString());
-        Assert.assertEquals(targetKibugVO.getId(),object.getJSONObject("data").getLong("id"));
+        Assert.assertEquals(targetKibugVO.getName(),object.getJSONObject("data").getString("name"));
     }
 
     @Test

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

@@ -1,9 +1,14 @@
 package cn.iselab.mooctest.site.web.ctrl.fromDev;
 
 import cn.iselab.mooctest.site.Application;
+import cn.iselab.mooctest.site.models.Weight;
 import cn.iselab.mooctest.site.rpc.dev.DevService;
 import cn.iselab.mooctest.site.rpc.dev.data.*;
+import cn.iselab.mooctest.site.service.fromDev.AnalysisService;
+import cn.iselab.mooctest.site.service.worker.WeightService;
 import cn.iselab.mooctest.site.web.data.fromDev.StResponse;
+import net.sf.json.test.JSONAssert;
+import org.json.JSONArray;
 import org.json.JSONObject;
 import org.junit.Assert;
 import org.junit.Before;
@@ -43,14 +48,23 @@ public class AnalysisControllerTest {
     @InjectMocks
     AnalysisController analysisController=new AnalysisController();
 
-
     @Mock
     DevService devService;
+    @Mock
+    WeightService weightService;
+    @Mock
+    AnalysisService analysisService;
+
+    private List<MutationDTO> mutationDTOS=new ArrayList<>();
+    private MutationDTO mutationDTO=new MutationDTO();
 
     @Before
     public void setupMockMvc() throws Exception {
         initMocks(this);
         mockMvc= MockMvcBuilders.standaloneSetup(analysisController).build();
+
+        mutationDTO.setTotal(100);
+        mutationDTOS.add(mutationDTO);
     }
 
     @Test
@@ -126,13 +140,16 @@ public class AnalysisControllerTest {
         jsonObject.put("endTime","1");
         jsonObject.put("workerID",list);
 
-        when(devService.mutationAllAnalyze(anyLong(),anyLong(),anyList(),anyLong())).thenReturn(true);
+        Weight weight=new Weight();
+        weight.setMutation(1);
+        when(weightService.getWeightByTidAndCid(anyLong(),anyLong())).thenReturn(weight);
+        when(analysisService.mutationAllAnalyze(anyLong(),anyList(),anyLong())).thenReturn(mutationDTOS);
 
         MvcResult result=mockMvc.perform(
                 post("/api/dev/mutation/all").contentType(MediaType.APPLICATION_JSON).content(jsonObject.toString())
         ).andDo(print()).andExpect(status().isOk()).andReturn();
 
-        Assert.assertEquals(true,new JSONObject(result.getResponse().getContentAsString()).getBoolean("data"));
+        Assert.assertEquals(mutationDTO.getTotal(),new JSONObject(result.getResponse().getContentAsString()).getJSONArray("data").getJSONObject(0).getLong("total"));
     }
 
     @Test