Merge remote-tracking branch 'origin/master'

b8b10e58 · fanyuanmeng · 2513f61a · 49d9dba0 · b8b10e58 · b8b10e58
Commit b8b10e58 authored Feb 24, 2021 by fanyuanmeng
12 changed files
--- a/src/main/java/com/live/cases/fileManage/commonFolder/TestUpdateFileUserAuthority.java
+++ b/src/main/java/com/live/cases/fileManage/commonFolder/TestUpdateFileUserAuthority.java
@@ -28,16 +28,18 @@ public class TestUpdateFileUserAuthority extends XMBaseTest {
    /**
     * 测试资料云盘-公共文件夹成员管理，修改权限，可查看/下载——>可编辑
     */
-    @Test
+//    @Test
    public void testUpdateFileUserAuthority() throws InterruptedException {
        GetFolderData commonFolderList = new GetFolderData();
-        JSONObject folderList = commonFolderList.getCommonFolderList();
+        String folderId = commonFolderList.getCommonFolderWithUser();
-        String folderId = folderList.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
+        System.out.println("folderId =="+folderId);
+//        String folderId = folderList.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
        JSONObject userAuthority = commonFolderList.getFileUserAuthority(folderId);
-        String updateId = userAuthority.getJSONArray("result").getJSONObject(0).getString("userId");//操作账户的userId
+//        String updateId = userAuthority.getJSONArray("result").getJSONObject(0).getString("userId");//操作账户的userId
        String userId = userAuthority.getJSONArray("result").getJSONObject(1).getString("userId");
+        String updateId = "1235115979394306049";   //当前操作账户的userId
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("instId", xmAppApi.getLoginInfo().getInstId());
        jsonObject.put("id", folderId);
@@ -60,7 +62,7 @@ public class TestUpdateFileUserAuthority extends XMBaseTest {
    /**
     * 测试资料云盘-公共文件夹添加员工，可编辑——>可查看/下载
     */
-    @Test
+//    @Test
    public void testUpdateFileUserAuthority1() throws InterruptedException {
        GetFolderData commonFolderList = new GetFolderData();
        JSONObject folderList = commonFolderList.getCommonFolderList();
@@ -93,7 +95,7 @@ public class TestUpdateFileUserAuthority extends XMBaseTest {
    /**
     * 测试资料云盘-公共文件夹添加员工，操作账户无操作权限
     */
-    @Test
+//    @Test
    public void testUpdateFileUserAuthority2() throws InterruptedException {
        GetFolderData commonFolderList = new GetFolderData();
        JSONObject folderList = commonFolderList.getCommonFolderList();
@@ -121,7 +123,7 @@ public class TestUpdateFileUserAuthority extends XMBaseTest {
    /**
     * 测试资料云盘-公共文件夹添加员工，从列表中移除员工
     */
-    @Test
+//    @Test
    public void testUpdateFileUserAuthority3() throws InterruptedException {
        GetFolderData commonFolderList = new GetFolderData();
        JSONObject folderList = commonFolderList.getCommonFolderList();

--- a/src/main/java/com/live/cases/largeClassLive/TestExportLargeClassLiveAsync.java
+++ b/src/main/java/com/live/cases/largeClassLive/TestExportLargeClassLiveAsync.java
@@ -33,7 +33,7 @@ public  class TestExportLargeClassLiveAsync extends XMBaseTest {
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("exportLiveType","0");
-        jsonObject.put("liveCourseId","1356196461296828418");
+        jsonObject.put("liveCourseId","1356196461296828418");  //zy大班直播自动化测试（勿删）--固定直播课
        System.out.println("jsonObject ="+jsonObject );
        xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers);

--- a/src/main/java/com/live/cases/largeClassLive/TestGetClassReport.java
+++ b/src/main/java/com/live/cases/largeClassLive/TestGetClassReport.java
@@ -32,7 +32,7 @@ public  class TestGetClassReport extends XMBaseTest {
    public void testGetClassReport() {
        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("courseId","1356196461296828418");
+        jsonObject.put("courseId","1356196461296828418");  //zy大班直播自动化测试（勿删）--固定直播课
        System.out.println("jsonObject ="+jsonObject );
        xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers);

--- a/src/main/java/com/live/cases/largeClassLive/TestGetCourseDetail.java
+++ b/src/main/java/com/live/cases/largeClassLive/TestGetCourseDetail.java
@@ -33,7 +33,6 @@ public  class TestGetCourseDetail extends XMBaseTest {
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("liveCourseId","1356196461296828418");
-        System.out.println("jsonObject ="+jsonObject );
        xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers);
        System.out.println(xmAppApi);

--- a/src/main/java/com/live/cases/largeClassLive/TestGetLargeClassLiveList.java
+++ b/src/main/java/com/live/cases/largeClassLive/TestGetLargeClassLiveList.java
@@ -32,10 +32,9 @@ public  class TestGetLargeClassLiveList extends XMBaseTest {
    public void testGetLargeClassLiveList() {
        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("instId","1235115978015883266");
+        jsonObject.put("instId",xmAppApi.getLoginInfo().getInstId());
        jsonObject.put("current","1");
        jsonObject.put("size","10");
-        System.out.println("jsonObject ="+jsonObject );
        xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers);
        System.out.println(xmAppApi);
@@ -55,7 +54,7 @@ public  class TestGetLargeClassLiveList extends XMBaseTest {
    public void testGetLargeClassLiveList1() {
        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("instId","1235115978015883266");
+        jsonObject.put("instId",xmAppApi.getLoginInfo().getInstId());
        jsonObject.put("current","1");
        jsonObject.put("size","10");
        jsonObject.put("courseName","zy大班直播自动化测试（勿删）");
@@ -84,7 +83,7 @@ public  class TestGetLargeClassLiveList extends XMBaseTest {
    public void testGetLargeClassLiveList2() {
        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("instId","1235115978015883266");
+        jsonObject.put("instId",xmAppApi.getLoginInfo().getInstId());
        jsonObject.put("current","1");
        jsonObject.put("size","10");
        jsonObject.put("courseState","EXPIRED");

--- a/src/main/java/com/live/cases/largeClassLive/TestGetLiveCourseRecordInfos.java
+++ b/src/main/java/com/live/cases/largeClassLive/TestGetLiveCourseRecordInfos.java
@@ -33,7 +33,7 @@ public  class TestGetLiveCourseRecordInfos extends XMBaseTest {
    public void testGetLiveCourseRecordInfos() {
        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("liveCourseId","1356196461296828418");
+        jsonObject.put("liveCourseId","1356196461296828418");  //zy大班直播自动化测试（勿删）--固定直播课
        xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers);
        System.out.println(xmAppApi);

--- a/src/main/java/com/live/cases/largeClassLive/TestQueryStudentVisitData.java
+++ b/src/main/java/com/live/cases/largeClassLive/TestQueryStudentVisitData.java
@@ -32,7 +32,7 @@ public  class TestQueryStudentVisitData extends XMBaseTest {
    public void testQueryStudentVisitData() {
        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("liveCourseId","1356196461296828418");
+        jsonObject.put("liveCourseId","1356196461296828418");  //zy大班直播自动化测试（勿删）--固定直播课
        jsonObject.put("nameOrPhone","");
        jsonObject.put("current","1");
        jsonObject.put("size","10000");

--- a/src/main/java/com/live/cases/largeClassLive/TestQueryTeacherVisitData.java
+++ b/src/main/java/com/live/cases/largeClassLive/TestQueryTeacherVisitData.java
@@ -32,7 +32,7 @@ public  class TestQueryTeacherVisitData extends XMBaseTest {
    public void testQueryTeacherVisitData() {
        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("liveCourseId","1356196461296828418");
+        jsonObject.put("liveCourseId","1356196461296828418");  //zy大班直播自动化测试（勿删）--固定直播课
        System.out.println("jsonObject ="+jsonObject );
        xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers);

--- a/src/main/java/com/live/cases/largeClassLive/TestQueryUserReplayRecordPage.java
+++ b/src/main/java/com/live/cases/largeClassLive/TestQueryUserReplayRecordPage.java
@@ -34,7 +34,7 @@ public  class TestQueryUserReplayRecordPage extends XMBaseTest {
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("current","1");
        jsonObject.put("size","10");
-        jsonObject.put("liveCourseId","1356196461296828418");
+        jsonObject.put("liveCourseId","1356196461296828418"); //zy大班直播自动化测试（勿删）--固定直播课
        xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers);
        System.out.println(xmAppApi);

--- a/src/main/java/com/live/cases/largeClassLive/TestTransformRecordUrl.java
+++ b/src/main/java/com/live/cases/largeClassLive/TestTransformRecordUrl.java
@@ -32,7 +32,7 @@ public  class TestTransformRecordUrl extends XMBaseTest {
    public void testTransformRecordUrl() {
        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("liveCourseId","1356196461296828418");
+        jsonObject.put("liveCourseId","1356196461296828418");  //zy大班直播自动化测试（勿删）--固定直播课
        System.out.println("jsonObject ="+jsonObject );
        xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers);

--- a/src/main/resources/apicase/api-b.json
+++ b/src/main/resources/apicase/api-b.json
@@ -178,5 +178,11 @@
    "apiContentType": "application/json;charset=utf-8",
    "apiName": "账户管理-服务协议",
    "desc": "账户管理-服务协议"
+  },
+  "API_updateCourse": {
+    "apiPath": "/apollo/public/businessLive/updateCourse",
+    "apiContentType": "application/json;charset=utf-8",
+    "apiName": "编辑直播课",
+    "desc": "编辑直播课"
  }
 }
\ No newline at end of file
--- a/testng.xml
+++ b/testng.xml
@@ -52,4 +52,9 @@
            <package name="com.live.cases.videoCourse"></package>
        </packages>
    </test>
+    <test name="seriesCourse" preserve-order="true" verbose="3">
+        <packages>
+            <package name="com.live.cases.seriesCourse"></package>
+        </packages>
+    </test>
 </suite>
\ No newline at end of file