浏览代码

refactor applicationVO

Galleythrey 8 年之前
父节点
当前提交
fa052119d3

+ 7 - 1
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/fromKibug/ApplicationVO.java

@@ -22,10 +22,16 @@ public class ApplicationVO extends ValidateVO {
     private String extra;
     private int fromCloud;
 
+    private Boolean visible;
+    private Long subsiteId;
+    private String url;
+    private String managerName;
+    private String caseUrl;
+    private Long createTime;
+
     @Override
     public void validate() throws IllegalArgumentException {
         notNull("managerId", managerId);
-        notNull("uploadedCaseId", uploadedCaseId);
         notEmpty("name", name);
         notEmpty("platform", platform);
         notEmpty("category", category);

+ 8 - 3
mooctest-site-server/src/test/java/ApplicationControllerTest.java → mooctest-site-server/src/test/java/cn/iselab/mooctest/site/web/ctrl/ApplicationControllerTest.java

@@ -1,3 +1,5 @@
+package cn.iselab.mooctest.site.web.ctrl;
+
 import cn.iselab.mooctest.site.common.constant.UrlConstants;
 import cn.iselab.mooctest.site.common.enums.AppPlatform;
 import cn.iselab.mooctest.site.common.event.EventUtil;
@@ -83,7 +85,10 @@ public class ApplicationControllerTest {
                                                             .param("page","2")
                                                             .param("count","10")
         ).andDo(print()).andExpect(status().isOk()).andReturn();
-        Assert.assertEquals(result2.getResponse().getContentAsString(),"{\"list\":[{\"id\":123,\"managerId\":0,\"uploadedCaseId\":0,\"name\":\"test\",\"platform\":\"iOS\",\"category\":\"游戏\",\"appSize\":0,\"iconLocation\":null,\"appLocation\":null,\"requireLocation\":null,\"launchData\":null,\"createTimeMillis\":0,\"endTimeMillis\":0,\"testType\":0,\"status\":0,\"extra\":null,\"fromCloud\":0}],\"status\":2000}");
+        Assert.assertEquals(result2.getResponse().getContentAsString(),"{\"list\":[{\"id\":123,\"managerId\":0,\"uploadedCaseId\":0,\"name\":\"test\"," +
+                "\"platform\":\"iOS\",\"category\":\"游戏\",\"appSize\":0,\"iconLocation\":null,\"appLocation\":null,\"requireLocation\":null," +
+                "\"launchData\":null,\"createTimeMillis\":0,\"endTimeMillis\":0,\"testType\":0,\"status\":0,\"extra\":null,\"fromCloud\":0," +
+                "\"visible\":null,\"subsiteId\":null,\"url\":null,\"managerName\":null,\"caseUrl\":null,\"createTime\":null}],\"status\":2000}");
     }
 
     @Test
@@ -134,8 +139,8 @@ public class ApplicationControllerTest {
         ).andDo(print()).andExpect(status().isOk()).andReturn();
         Assert.assertEquals(result1.getResponse().getContentAsString(),"{\"data\":{\"id\":123,\"managerId\":0,\"uploadedCaseId\":0,\"name\":null," +
                 "\"platform\":\"iOS\",\"category\":null,\"appSize\":0,\"iconLocation\":null,\"appLocation\":null,\"requireLocation\":null," +
-                "\"launchData\":null,\"createTimeMillis\":0,\"endTimeMillis\":0,\"testType\":0,\"status\":0,\"extra\":null,\"fromCloud\":0}," +
-                "\"status\":2000}");
+                "\"launchData\":null,\"createTimeMillis\":0,\"endTimeMillis\":0,\"testType\":0,\"status\":0,\"extra\":null,\"fromCloud\":0," +
+                "\"visible\":null,\"subsiteId\":null,\"url\":null,\"managerName\":null,\"caseUrl\":null,\"createTime\":null},\"status\":2000}");
     }
 
     @Test