review

0d487006 · zhangying · 12bde995 · 0d487006 · 0d487006 · 0d487006
Commit 0d487006 authored Feb 04, 2021 by zhangying
9 changed files
--- a/src/main/java/com/live/cases/apollo/TestGetCourseDocList.java
+++ b/src/main/java/com/live/cases/apollo/TestGetCourseDocList.java
-package com.live.cases.apollo;
+//package com.live.cases.apollo;
+//
-import com.alibaba.fastjson.JSONObject;
+//import com.alibaba.fastjson.JSONObject;
-import com.live.enums.ApiModele;
+//import com.live.enums.ApiModele;
-import com.live.enums.RequestType;
+//import com.live.enums.RequestType;
-import com.live.enums.Terminal;
+//import com.live.enums.Terminal;
-import com.live.xmutils.GetLiveCourseId;
+//import com.live.xmutils.GetLiveCourseId;
-import com.live.utils.XMBaseTest;
+//import com.live.utils.XMBaseTest;
-import org.testng.Assert;
+//import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
+//import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+//import org.testng.annotations.Test;
+//
+//
-/**
+///**
- * title 客户端获取直播课下转码后的文档列表
+// * title 客户端获取直播课下转码后的文档列表
- * by 张雨朦
+// * by 张雨朦
- */
+// */
+//
-public class TestGetCourseDocList extends XMBaseTest {
+//public class TestGetCourseDocList extends XMBaseTest {
+//
+//
-    @BeforeMethod
+//    @BeforeMethod
-    public void beforeTest() {
+//    public void beforeTest() {
-        xmAppApi.setApiModule(ApiModele.CloudClass_apollo)
+//        xmAppApi.setApiModule(ApiModele.CloudClass_apollo)
-                .setApiName("API_getCourseDocList")
+//                .setApiName("API_getCourseDocList")
-                .setLoginUser("zhangYuM_b")
+//                .setLoginUser("zhangYuM_b")
-                .setTerminal(Terminal.B);
+//                .setTerminal(Terminal.B);
-        super.beforeTest();
+//        super.beforeTest();
-    }
+//    }
+//
-    @Test
+//    @Test
-    public void getCourseDocList() {
+//    public void getCourseDocList() {
-        GetLiveCourseId tools = new GetLiveCourseId();
+//        GetLiveCourseId tools = new GetLiveCourseId();
-        String id = tools.createCourse();
+//        String id = tools.createCourse();
+//
-        JSONObject jsonObject = new JSONObject();
+//        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("liveCourseId", id);
+//        jsonObject.put("liveCourseId", id);
+//
-        xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers);
+//        xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers);
-        JSONObject responseRes = xmAppApi.getBodyInJSON();
+//        JSONObject responseRes = xmAppApi.getBodyInJSON();
-        Assert.assertNotNull(responseRes);
+//        Assert.assertNotNull(responseRes);
-    }
+//    }
-}
+//}
--- a/src/main/java/com/live/cases/largeClassLive/TestGetLiveCourseRecordInfos.java
+++ b/src/main/java/com/live/cases/largeClassLive/TestGetLiveCourseRecordInfos.java
 package com.live.cases.largeClassLive;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.live.enums.ApiModele;
 import com.live.enums.RequestType;
 import com.live.enums.Terminal;
-import com.live.utils.TimeSetting;
 import com.live.utils.XMBaseTest;
-import org.springframework.transaction.TransactionUsageException;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
-import sun.font.TrueTypeFont;
-import java.util.ArrayList;
 /**
 * Created by zhangying on  2020/02/01

--- a/src/main/java/com/live/cases/largeClassLive/TestQueryTeacherVisitData.java
+++ b/src/main/java/com/live/cases/largeClassLive/TestQueryTeacherVisitData.java
@@ -9,9 +9,6 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
-import java.util.ArrayList;
-import java.util.List;
 /**
 * Created by zhangying on  2020/02/02
 */

--- a/src/main/java/com/live/cases/liveAssets/TestLiveAssetsQuery.java
+++ b/src/main/java/com/live/cases/liveAssets/TestLiveAssetsQuery.java
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.live.enums.ApiModele;
 import com.live.enums.RequestType;
 import com.live.enums.Terminal;
-import com.live.utils.AssertforJson;
 import com.live.utils.XMBaseTest;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;

--- a/src/main/java/com/live/cases/liveAssets/TestOrderPage.java
+++ b/src/main/java/com/live/cases/liveAssets/TestOrderPage.java
@@ -5,7 +5,6 @@ import com.live.enums.ApiModele;
 import com.live.enums.RequestType;
 import com.live.enums.Terminal;
 import com.live.utils.XMBaseTest;
-import com.live.xmutils.GetLiveCourseData;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

--- a/src/main/java/com/live/cases/musicPlay/TestCreateOnlyOneClassLive.java
+++ b/src/main/java/com/live/cases/musicPlay/TestCreateOnlyOneClassLive.java
@@ -31,7 +31,7 @@ public class TestCreateOnlyOneClassLive extends XMBaseTest {
     * 测试创建乐器陪练课
     */
    @Test
-    public void testGetOnlyOneClassLiveList() {
+    public void testCreateOnlyOneClassLive() {
        JSONObject onlyOneClassLive = new JSONObject();
        String courseName = RandomStringUtil.randomNumber(14, "live_course_");

--- a/src/main/java/com/live/cases/musicPlay/TestGetOnlyOneClassLiveList.java
+++ b/src/main/java/com/live/cases/musicPlay/TestGetOnlyOneClassLiveList.java
@@ -5,7 +5,6 @@ import com.live.enums.ApiModele;
 import com.live.enums.RequestType;
 import com.live.enums.Terminal;
 import com.live.utils.XMBaseTest;
-import com.live.xmutils.GetLiveCourseData;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

--- a/src/main/resources/apicase/apollo.json
+++ b/src/main/resources/apicase/apollo.json
 {
-  "api_getLastedVersion":
+  "api_getLastedVersion": {
-  {
    "apiPath": "/apollo/public/version/getLastedVersion",
    "apiContentType": "application/json;charset=utf-8",
    "apiName": "获取最新版本号",
    "desc": "获取最新版本号"
  },
-  "api_addRelation":
+  "api_addRelation": {
-  {
    "apiPath": "/apollo/public/apollo/addRelation",
    "apiContentType": "application/json;charset=utf-8",
    "apiName": "添加关联文件",
    "desc": "添加关联文件"
  },
-  "api_getCourseList":
+  "api_getCourseList": {
-  {
    "apiPath": "/apollo/public/businessLive/getCourseList",
    "apiContentType": "application/json;charset=utf-8",
    "apiName": "获取直播课列表",
    "desc": "获取直播课列表"
  },
-  "api_queryLiveAccount":
+  "api_queryLiveAccount": {
-  {
    "apiPath": "/apollo/public/businessLive/queryLiveAccount",
    "apiContentType": "application/json;charset=utf-8",
    "apiName": "查询直播账号",
    "desc": "查询直播账号"
  },
-  "api_initXmLive":
+  "api_initXmLive": {
-  {
    "apiPath": "/apollo/public/businessLive/initXmLive",
    "apiContentType": "application/json;charset=utf-8",
    "apiName": "初始化直播间数据",
    "desc": "初始化直播间数据"
  },
-  "api_queryStudentByCourseId":
+  "api_queryStudentByCourseId": {
-  {
    "apiPath": "/apollo/public/businessLive/queryStudentByCourseId",
    "apiContentType": "application/json;charset=utf-8",
    "apiName": "通过课次查询直播学员",
    "desc": "通过课次查询直播学员"
  },
-  "api_changeCourseState":
+  "api_changeCourseState": {
-  {
    "apiPath": "/apollo/public/businessLive/changeCourseState",
    "apiContentType": "application/json;charset=utf-8",
    "apiName": "改变课程状态",
    "desc": "改变课程状态"
  },
-  "api_clientLaunch":
+  "api_clientLaunch": {
-  {
    "apiPath": "/apollo/public/businessLive/clientLaunch",
    "apiContentType": "application/json;charset=utf-8",
    "apiName": "启动直播客户端",
    "desc": "启动直播客户端"
  },
-  "api_judgeLessonPermission":
+  "api_judgeLessonPermission": {
-  {
    "apiPath": "/public/apollo/judgeLessonPermission",
    "apiContentType": "application/json;charset=utf-8",
    "apiName": "判断是否有备课本权限",
@@ -68,12 +59,12 @@
    "apiName": "获取直播器启动协议",
    "desc": "获取直播器启动协议"
  },
-  "API_getLargeClassLiveList":{
+  "API_getLargeClassLiveList": {
    "apiPath": "/apollo/public/businessLive/getLargeClassLiveList",
    "apiContentType": "application/json;charset=utf-8",
    "apiName": "获取大班直播课列表",
    "desc": "获取大班直播课列表"
- },
+  },
  "API_getCourseDocList": {
    "apiPath": "/apollo/anon/businessLive/getCourseDocList",
    "apiContentType": "application/json;charset=utf-8",
@@ -81,13 +72,13 @@
    "desc": "获取直播课下转码后的文档列表"
  },
  "API_sendNotify2Student": {
-    "apiPath":"/apollo/public/businessLive/sendNotify2Student",
+    "apiPath": "/apollo/public/businessLive/sendNotify2Student",
    "apiContentType": "application/json;charset=utf-8",
    "apiName": "直播课群发学生",
    "desc": "直播课群发学生"
  },
  "API_getOnlyOneClassLiveList": {
-    "apiPath":"/apollo/public/businessLive/getOnlyOneClassLiveList",
+    "apiPath": "/apollo/public/businessLive/getOnlyOneClassLiveList",
    "apiContentType": "application/json;charset=utf-8",
    "apiName": "查询乐器陪练课列表",
    "desc": "查询乐器陪练课列表"
@@ -181,4 +172,5 @@
    "apiContentType": "application/json;charset=utf-8",
    "apiName": "删除文件",
    "desc": "删除文件"
-},
+  }
\ No newline at end of file
+}
\ No newline at end of file
--- a/testng.xml
+++ b/testng.xml
@@ -29,7 +29,7 @@
    </test>
    <test name="fileManage" preserve-order="true" verbose="3">
        <packages>
-            <package name="com.live.cases.fileManage"></package>
+            <package name="com.live.cases.fileManage.*"></package>
        </packages>
    </test>
    <test name="interactionLive" preserve-order="true" verbose="3">
@@ -42,4 +42,14 @@
            <package name="com.live.cases.largeClassLive"></package>
        </packages>
    </test>
+    <test name="liveAssets" preserve-order="true" verbose="3">
+        <packages>
+            <package name="com.live.cases.liveAssets"></package>
+        </packages>
+    </test>
+    <test name="musicPlay" preserve-order="true" verbose="3">
+        <packages>
+            <package name="com.live.cases.musicPlay"></package>
+        </packages>
+    </test>
 </suite>
\ No newline at end of file