Commit b272eea1 by zhangying

review

parent 67aca65e
...@@ -31,7 +31,7 @@ public class TestAddFileUserAuthorityList extends XMBaseTest { ...@@ -31,7 +31,7 @@ public class TestAddFileUserAuthorityList extends XMBaseTest {
/** /**
* 测试资料云盘-公共文件夹添加成员,新文件夹 * 测试资料云盘-公共文件夹添加成员,新文件夹
*/ */
@Test @Test(description = "测试资料云盘-公共文件夹添加成员,新文件夹")
public void testAddFileUserAuthorityList() { public void testAddFileUserAuthorityList() {
GetFolderData commonFolderList = new GetFolderData(); GetFolderData commonFolderList = new GetFolderData();
JSONObject folderData = commonFolderList.saveFolder(); JSONObject folderData = commonFolderList.saveFolder();
...@@ -68,7 +68,7 @@ public class TestAddFileUserAuthorityList extends XMBaseTest { ...@@ -68,7 +68,7 @@ public class TestAddFileUserAuthorityList extends XMBaseTest {
* 测试资料云盘-公共文件夹添加成员,文件夹中二次添加成员 * 测试资料云盘-公共文件夹添加成员,文件夹中二次添加成员
*/ */
@Test @Test(description = "测试资料云盘-公共文件夹添加成员,文件夹中二次添加成员")
public void testAddFileUserAuthorityLis1t() throws InterruptedException { public void testAddFileUserAuthorityLis1t() throws InterruptedException {
GetFolderData commonFolderList = new GetFolderData(); GetFolderData commonFolderList = new GetFolderData();
JSONObject folderList = commonFolderList.getCommonFolderList(); JSONObject folderList = commonFolderList.getCommonFolderList();
......
...@@ -29,7 +29,7 @@ public class TestUpdateFileUserAuthority extends XMBaseTest { ...@@ -29,7 +29,7 @@ public class TestUpdateFileUserAuthority extends XMBaseTest {
/** /**
* 测试资料云盘-公共文件夹成员管理,修改权限,可查看/下载——>可编辑 * 测试资料云盘-公共文件夹成员管理,修改权限,可查看/下载——>可编辑
*/ */
@Test @Test(description = "测试资料云盘-公共文件夹成员管理,修改权限,可查看/下载——>可编辑")
public void testUpdateFileUserAuthority() throws InterruptedException { public void testUpdateFileUserAuthority() throws InterruptedException {
GetFolderData commonFolderList = new GetFolderData(); GetFolderData commonFolderList = new GetFolderData();
JSONObject folderList = commonFolderList.getCommonFolderList(); JSONObject folderList = commonFolderList.getCommonFolderList();
...@@ -67,7 +67,7 @@ public class TestUpdateFileUserAuthority extends XMBaseTest { ...@@ -67,7 +67,7 @@ public class TestUpdateFileUserAuthority extends XMBaseTest {
/** /**
* 测试资料云盘-公共文件夹添加员工,可编辑——>可查看/下载 * 测试资料云盘-公共文件夹添加员工,可编辑——>可查看/下载
*/ */
@Test @Test(description = "测试资料云盘-公共文件夹添加员工,可编辑——>可查看/下载")
public void testUpdateFileUserAuthority1() throws InterruptedException { public void testUpdateFileUserAuthority1() throws InterruptedException {
GetFolderData commonFolderList = new GetFolderData(); GetFolderData commonFolderList = new GetFolderData();
JSONObject folderList = commonFolderList.getCommonFolderList(); JSONObject folderList = commonFolderList.getCommonFolderList();
...@@ -100,7 +100,7 @@ public class TestUpdateFileUserAuthority extends XMBaseTest { ...@@ -100,7 +100,7 @@ public class TestUpdateFileUserAuthority extends XMBaseTest {
/** /**
* 测试资料云盘-公共文件夹添加员工,操作账户无操作权限 * 测试资料云盘-公共文件夹添加员工,操作账户无操作权限
*/ */
@Test @Test(description = "测试资料云盘-公共文件夹添加员工,操作账户无操作权限(异常情况)")
public void testUpdateFileUserAuthority2() throws InterruptedException { public void testUpdateFileUserAuthority2() throws InterruptedException {
GetFolderData commonFolderList = new GetFolderData(); GetFolderData commonFolderList = new GetFolderData();
JSONObject folderList = commonFolderList.getCommonFolderList(); JSONObject folderList = commonFolderList.getCommonFolderList();
...@@ -128,7 +128,7 @@ public class TestUpdateFileUserAuthority extends XMBaseTest { ...@@ -128,7 +128,7 @@ public class TestUpdateFileUserAuthority extends XMBaseTest {
/** /**
* 测试资料云盘-公共文件夹添加员工,从列表中移除员工 * 测试资料云盘-公共文件夹添加员工,从列表中移除员工
*/ */
@Test @Test(description = "测试资料云盘-公共文件夹员工列表,从列表中移除员工")
public void testUpdateFileUserAuthority3() throws InterruptedException { public void testUpdateFileUserAuthority3() throws InterruptedException {
GetFolderData commonFolderList = new GetFolderData(); GetFolderData commonFolderList = new GetFolderData();
JSONObject folderList = commonFolderList.getCommonFolderList(); JSONObject folderList = commonFolderList.getCommonFolderList();
......
...@@ -8,6 +8,7 @@ import com.live.utils.RandomStringUtil; ...@@ -8,6 +8,7 @@ import com.live.utils.RandomStringUtil;
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.DataProvider;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
...@@ -29,7 +30,20 @@ public class TestEmployeeFolderList1 extends XMBaseTest { ...@@ -29,7 +30,20 @@ public class TestEmployeeFolderList1 extends XMBaseTest {
/** /**
* 测试资料云盘-员工文件列表 * 测试资料云盘-员工文件列表
*/ */
@Test
@DataProvider(name = "testData")
public Object[][] testdata(){
return new Object[][]{
{"MYSELF", 10, 1},
{"COMMON", 10 ,1},
{"EMPLOYEE", 10 ,1}
};
}
@Test(dataProvider = "testData")
// @Test
public void testEmployeeFolderList1() { public void testEmployeeFolderList1() {
String name = "测试文件夹新增"+ RandomStringUtil.randomString(6); //云盘文件名称 String name = "测试文件夹新增"+ RandomStringUtil.randomString(6); //云盘文件名称
...@@ -37,7 +51,7 @@ public class TestEmployeeFolderList1 extends XMBaseTest { ...@@ -37,7 +51,7 @@ public class TestEmployeeFolderList1 extends XMBaseTest {
jsonObject.put("current", "1"); jsonObject.put("current", "1");
jsonObject.put("disk", "EMPLOYEE"); jsonObject.put("disk", "EMPLOYEE");
jsonObject.put("folderIdType", "FOLDER"); jsonObject.put("folderIdType", "FOLDER");
jsonObject.put("instId", "1235115978015883266"); jsonObject.put("instId", xmAppApi.getLoginInfo().getInstId());
jsonObject.put("searchName", "测试文件夹新增"); jsonObject.put("searchName", "测试文件夹新增");
jsonObject.put("size", "10"); jsonObject.put("size", "10");
......
...@@ -29,7 +29,7 @@ public class TestGetStudentReport extends XMBaseTest { ...@@ -29,7 +29,7 @@ public class TestGetStudentReport extends XMBaseTest {
/** /**
* 大班互动-查看学员课堂报告 * 大班互动-查看学员课堂报告
*/ */
@Test @Test(description = "大班互动-查看学员课堂报告")
public void testGetStudentReport() { public void testGetStudentReport() {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
......
...@@ -28,7 +28,7 @@ public class TestLargeClassDelCourse extends XMBaseTest { ...@@ -28,7 +28,7 @@ public class TestLargeClassDelCourse extends XMBaseTest {
/** /**
* 大班直播课-删除课程(已完成) * 大班直播课-删除课程(已完成)
*/ */
@Test @Test(description = "大班直播课-删除课程(已完成)")
public void testLargeClassDelCourse() { public void testLargeClassDelCourse() {
GetLiveCourseData getLiveCourseData = new GetLiveCourseData(); GetLiveCourseData getLiveCourseData = new GetLiveCourseData();
JSONObject getLargeCourseData = getLiveCourseData.getLargeClassLiveListFinish(); JSONObject getLargeCourseData = getLiveCourseData.getLargeClassLiveListFinish();
...@@ -56,7 +56,7 @@ public class TestLargeClassDelCourse extends XMBaseTest { ...@@ -56,7 +56,7 @@ public class TestLargeClassDelCourse extends XMBaseTest {
/** /**
* 大班直播课-删除课程(未成功开课) * 大班直播课-删除课程(未成功开课)
*/ */
@Test @Test(description = "大班直播课-删除课程(未成功开课)")
public void testLargeClassDelCourse1() { public void testLargeClassDelCourse1() {
GetLiveCourseData getLiveCourseData = new GetLiveCourseData(); GetLiveCourseData getLiveCourseData = new GetLiveCourseData();
JSONObject getLargeCourseData = getLiveCourseData.getLargeClassLiveListExpired(); JSONObject getLargeCourseData = getLiveCourseData.getLargeClassLiveListExpired();
...@@ -84,7 +84,7 @@ public class TestLargeClassDelCourse extends XMBaseTest { ...@@ -84,7 +84,7 @@ public class TestLargeClassDelCourse extends XMBaseTest {
/** /**
* 大班直播课-删除课程(待上课) * 大班直播课-删除课程(待上课)
*/ */
@Test @Test(description = "大班直播课-删除课程(待上课)")
public void testLargeClassDelCourse2() throws InterruptedException { public void testLargeClassDelCourse2() throws InterruptedException {
GetLiveCourseData getLiveCourseData = new GetLiveCourseData(); GetLiveCourseData getLiveCourseData = new GetLiveCourseData();
JSONObject getLargeCourseData = getLiveCourseData.createLargeClassLive(); JSONObject getLargeCourseData = getLiveCourseData.createLargeClassLive();
...@@ -112,7 +112,7 @@ public class TestLargeClassDelCourse extends XMBaseTest { ...@@ -112,7 +112,7 @@ public class TestLargeClassDelCourse extends XMBaseTest {
/** /**
* 大班直播课-删除课程(上课中) * 大班直播课-删除课程(上课中)
*/ */
@Test @Test(description = "大班直播课-删除课程(上课中)")
public void testLargeClassDelCourse3() throws InterruptedException { public void testLargeClassDelCourse3() throws InterruptedException {
GetLiveCourseData getLiveCourseData = new GetLiveCourseData(); GetLiveCourseData getLiveCourseData = new GetLiveCourseData();
......
...@@ -30,7 +30,7 @@ public class TestUpdateCourse extends XMBaseTest { ...@@ -30,7 +30,7 @@ public class TestUpdateCourse extends XMBaseTest {
/** /**
* 测试大班直播课,编辑课程-编辑名称 * 测试大班直播课,编辑课程-编辑名称
*/ */
@Test @Test(description = "测试大班直播课,编辑课程-编辑名称")
public void testUpdateCourse() throws InterruptedException { public void testUpdateCourse() throws InterruptedException {
GetLiveCourseData getLiveCourseData = new GetLiveCourseData(); GetLiveCourseData getLiveCourseData = new GetLiveCourseData();
JSONObject getLargeCourseData = getLiveCourseData.createLargeClassLive(); JSONObject getLargeCourseData = getLiveCourseData.createLargeClassLive();
...@@ -74,7 +74,7 @@ public class TestUpdateCourse extends XMBaseTest { ...@@ -74,7 +74,7 @@ public class TestUpdateCourse extends XMBaseTest {
/** /**
* 测试大班直播课,编辑课程-修改分享设置 * 测试大班直播课,编辑课程-修改分享设置
*/ */
@Test @Test(description = "测试大班直播课,编辑课程-修改分享设置")
public void testUpdateCourse1() { public void testUpdateCourse1() {
GetLiveCourseData getLiveCourseData = new GetLiveCourseData(); GetLiveCourseData getLiveCourseData = new GetLiveCourseData();
JSONObject getLargeCourseData = getLiveCourseData.getLargeClassLiveList(); JSONObject getLargeCourseData = getLiveCourseData.getLargeClassLiveList();
...@@ -119,7 +119,7 @@ public class TestUpdateCourse extends XMBaseTest { ...@@ -119,7 +119,7 @@ public class TestUpdateCourse extends XMBaseTest {
/** /**
* 测试大班直播课,编辑课程-添加扣课时学员 * 测试大班直播课,编辑课程-添加扣课时学员
*/ */
@Test @Test(description = "测试大班直播课,编辑课程-添加扣课时学员")
public void testUpdateCourse2() { public void testUpdateCourse2() {
GetLiveCourseData getLiveCourseData = new GetLiveCourseData(); GetLiveCourseData getLiveCourseData = new GetLiveCourseData();
JSONObject getLargeCourseData = getLiveCourseData.getLargeClassLiveList(); JSONObject getLargeCourseData = getLiveCourseData.getLargeClassLiveList();
...@@ -174,7 +174,7 @@ public class TestUpdateCourse extends XMBaseTest { ...@@ -174,7 +174,7 @@ public class TestUpdateCourse extends XMBaseTest {
/** /**
* 测试大班直播课,编辑课程-添加封面图 * 测试大班直播课,编辑课程-添加封面图
*/ */
@Test @Test(description = "测试大班直播课,编辑课程-添加封面图")
public void testUpdateCourse3() { public void testUpdateCourse3() {
GetLiveCourseData getLiveCourseData = new GetLiveCourseData(); GetLiveCourseData getLiveCourseData = new GetLiveCourseData();
JSONObject getLargeCourseData = getLiveCourseData.getLargeClassLiveList(); JSONObject getLargeCourseData = getLiveCourseData.getLargeClassLiveList();
......
...@@ -31,7 +31,7 @@ public class TestGetLiveCourseRecordInfos extends XMBaseTest { ...@@ -31,7 +31,7 @@ public class TestGetLiveCourseRecordInfos extends XMBaseTest {
public void testGetClassReport() { public void testGetClassReport() {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("liveCourseId","1356196461296828418"); jsonObject.put("liveCourseId","1356196461296828418"); //固定课程记录
xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers); xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers);
JSONObject jsonBody = xmAppApi.getBodyInJSON(); JSONObject jsonBody = xmAppApi.getBodyInJSON();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment