Commit c2bf4d9b by zhangying

review

parent f9e0a35a
......@@ -25,7 +25,7 @@ public class TestCourseLaunch extends XMBaseTest {
super.beforeTest();
}
//@Test
@Test
public void courseLaunch(){
JSONObject jsonObject = new JSONObject();
......
......@@ -24,7 +24,6 @@ public class TestGetCourseList extends XMBaseTest {
public void beforeTest() {
xmAppApi.setApiModule(ApiModele.CloudClass_apollo) // API 所属模块 必传 读取配置文件config.properties配置的api地址
.setApiName("api_getCourseList") // API 名称 必传
// .setEnv("prod") // 运行环境 测试时可指定自己要运行的环境。 不穿默认取系统指定的允许环境
.setLoginUser("zhangy-b") // http 接口,测试账号 必传
.setTerminal(Terminal.B); // 所属端位(B端,C端,M端等, 必传)
dal.setCase_owner("zhangying")
......
package com.live.cases.apollo;
import com.alibaba.fastjson.JSONObject;
import com.live.enums.ApiModele;
import com.live.enums.RequestType;
import com.live.enums.Terminal;
import com.live.xmutils.GetLiveCourseId;
import com.live.utils.XMBaseTest;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
/**
* 查询老师上课数据
* by 张雨朦
*/
public class TestQueryTeacherVisitData extends XMBaseTest {
GetLiveCourseId tools = new GetLiveCourseId();
@BeforeMethod
public void beforeTest(){
xmAppApi.setApiModule(ApiModele.CloudClass_B)
.setApiName("API_queryTeacherVisitData")
.setLoginUser("zhangYuM_b")
.setTerminal(Terminal.B);
super.beforeTest();
}
//@Test
public void queryTeacherVisitData() {
String id = tools.createCourse();
JSONObject jsonObject = new JSONObject();
jsonObject.put("liveCourseId",id);
xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers);
JSONObject responseRes = xmAppApi.getBodyInJSON();
Assert.assertEquals("true",responseRes.getString("success"));
}
}
package com.live.cases.classReport;
import com.alibaba.fastjson.JSONObject;
import com.live.enums.ApiModele;
import com.live.enums.RequestType;
import com.live.enums.Terminal;
import com.live.xmutils.GetStudentId;
import com.live.utils.XMBaseTest;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
/**
* 获取学生课堂报告
* by 张雨朦
*/
public class TestGetStudentReport extends XMBaseTest {
GetStudentId tools = new GetStudentId();
@BeforeMethod
public void beforeTest(){
xmAppApi.setApiModule(ApiModele.CloudClass_B)
.setApiName("API_getStudentReport")
.setLoginUser("zhangYuM_b")
.setTerminal(Terminal.B);
super.beforeTest();
}
//@Test
public void getStudentReport() {
String id = tools.getFinishLiveCourseId();
JSONObject jsonObject = new JSONObject();
jsonObject.put("courseId","1334309884730617857");
jsonObject.put("studentId","1330861588678483970");
xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers);
JSONObject responseRes = xmAppApi.getBodyInJSON();
Assert.assertEquals("success",true);
}
}
//package com.live.cases.classReport;
//import com.alibaba.fastjson.JSONObject;
//import com.live.enums.ApiModele;
//import com.live.enums.RequestType;
//import com.live.enums.Terminal;
//import com.live.xmutils.GetStudentId;
//import com.live.utils.XMBaseTest;
//import org.testng.Assert;
//import org.testng.annotations.BeforeMethod;
//import org.testng.annotations.Test;
//
//
///**
// * 获取学生课堂报告
// * by 张雨朦
// */
//
//public class TestGetStudentReport extends XMBaseTest {
// GetStudentId tools = new GetStudentId();
//
// @BeforeMethod
// public void beforeTest(){
// xmAppApi.setApiModule(ApiModele.CloudClass_B)
// .setApiName("API_getStudentReport")
// .setLoginUser("zhangYuM_b")
// .setTerminal(Terminal.B);
// super.beforeTest();
// }
//
// //@Test
// public void getStudentReport() {
//
// String id = tools.getFinishLiveCourseId();
//
// JSONObject jsonObject = new JSONObject();
// jsonObject.put("courseId","1334309884730617857");
// jsonObject.put("studentId","1330861588678483970");
//
// xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers);
// JSONObject responseRes = xmAppApi.getBodyInJSON();
// Assert.assertEquals("success",true);
// }
//
//
//}
......@@ -25,8 +25,6 @@ public class TestMultiPartUpload extends XMBaseTest {
.setEnv("prod") // 运行环境 测试时可指定自己要运行的环境。 不穿默认取系统指定的允许环境
.setLoginUser("zhangy-b") // http 接口,测试账号 必传
.setTerminal(Terminal.B); // 所属端位(B端,C端,M端等, 必传)
// dal.setCase_owner("zhangying")
// .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
super.beforeTest();
}
......
......@@ -21,9 +21,6 @@ public class TestRenameFolder extends ApiBaseTestFile {
*/
@Test
public void testRenameFolder(){
// GetFolderData getFolderList = new GetFolderData();
// List folerList = getFolderList.getFolderList();
// System.out.println("scoreTypeIdList= "+folerList);
String name = "自动化测试文件夹"+ RandomStringUtil.randomString(6); //文件夹名称
......@@ -36,7 +33,6 @@ public class TestRenameFolder extends ApiBaseTestFile {
Assert.assertEquals("true", jsonBody.getString("success"));
Assert.assertEquals("操作成功!", jsonBody.getString("message"));
// Assert.assertEquals(jsonBody.getJSONObject("result").getString("total"), Integer.toString(jsonBody.getJSONObject("result").getJSONArray("records").size()));
}
......
......@@ -25,11 +25,8 @@ public class TestSaveFolder extends XMBaseTest {
public void beforeTest() {
xmAppApi.setApiModule(ApiModele.CloudClass_File) // API 所属模块 必传 读取配置文件config.properties配置的api地址
.setApiName("API_saveFolder") // API 名称 必传
// .setEnv("prod") // 运行环境 测试时可指定自己要运行的环境。 不穿默认取系统指定的允许环境
.setLoginUser("zhangy-b") // http 接口,测试账号 必传
.setTerminal(Terminal.B); // 所属端位(B端,C端,M端等, 必传)
// dal.setCase_owner("zhangying")
// .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
super.beforeTest();
}
......
package com.live.cases.interactionLive;
import com.alibaba.fastjson.JSONObject;
import com.live.enums.ApiModele;
import com.live.enums.Terminal;
import com.live.utils.XMBaseTest;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import java.util.HashMap;
import java.util.Map;
import static io.restassured.RestAssured.given;
import static org.hamcrest.Matchers.equalTo;
/**
* @author NHX
* @Function C端课表管理-课次详情 按关系Id获取关系
* @Date 2020/11/19 15:01
*/
public class TestGetRelationByRelationId_C extends XMBaseTest {
@BeforeMethod
public void beforeTest() {
xmAppApi.setApiModule(ApiModele.CloudClass_customerLive) // API 所属模块
.setApiName("API_getRelationByRelationId") // API 名称
.setLoginUser("NHX_c") // http 接口,测试账号
.setTerminal(Terminal.C); // 所属端位(B端,C端,M端等, 必传)
dal.setCase_owner("NHX")
.setCase_name("C端课表管理-课次详情 按关系Id获取关系:" + Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
super.beforeTest();
}
//@Test(description = "C端课表管理-课次详情 按关系Id获取关系")
public void testGetRelationByRelationId(){
Map<String,Object> bodyMap = new HashMap<>();
bodyMap.put("relationId","1145627043559436291");
bodyMap.put("relationType","SCHEDULE");
JSONObject jsonBody = new JSONObject(bodyMap);
String data = jsonBody.toJSONString();
System.out.println("请求参数==========="+data);
//
// xmAppApi.doRequest(RequestType.JSON, params, data, headers);
// JSONObject jsonResponseBody = xmAppApi.getBodyInJSON();
// Assert.assertEquals(jsonResponseBody.getString("success"), "true", "操作成功!");
given()
.header("Content-Type", "application/json; charset=UTF-8")
.body(data)
.when()
.post(xmAppApi.getUrl())
.then().log().all()
.body("success", equalTo(true));
}
}
//package com.live.cases.interactionLive;
//
//import com.alibaba.fastjson.JSONObject;
//import com.live.enums.ApiModele;
//import com.live.enums.Terminal;
//import com.live.utils.XMBaseTest;
//import org.testng.annotations.BeforeMethod;
//import org.testng.annotations.Test;
//
//import java.util.HashMap;
//import java.util.Map;
//
//import static io.restassured.RestAssured.given;
//import static org.hamcrest.Matchers.equalTo;
//
///**
// * @author NHX
// * @Function C端课表管理-课次详情 按关系Id获取关系
// * @Date 2020/11/19 15:01
// */
//public class TestGetRelationByRelationId_C extends XMBaseTest {
//
// @BeforeMethod
// public void beforeTest() {
// xmAppApi.setApiModule(ApiModele.CloudClass_customerLive) // API 所属模块
// .setApiName("API_getRelationByRelationId") // API 名称
// .setLoginUser("NHX_c") // http 接口,测试账号
// .setTerminal(Terminal.C); // 所属端位(B端,C端,M端等, 必传)
//
// dal.setCase_owner("NHX")
// .setCase_name("C端课表管理-课次详情 按关系Id获取关系:" + Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
//
// super.beforeTest();
// }
//
// @Test(description = "C端课表管理-课次详情 按关系Id获取关系")
// public void testGetRelationByRelationId(){
//
//
// Map<String,Object> bodyMap = new HashMap<>();
// bodyMap.put("relationId","1145627043559436291");
// bodyMap.put("relationType","SCHEDULE");
//
// JSONObject jsonBody = new JSONObject(bodyMap);
// String data = jsonBody.toJSONString();
//
// System.out.println("请求参数==========="+data);
////
//// xmAppApi.doRequest(RequestType.JSON, params, data, headers);
//// JSONObject jsonResponseBody = xmAppApi.getBodyInJSON();
//// Assert.assertEquals(jsonResponseBody.getString("success"), "true", "操作成功!");
// given()
// .header("Content-Type", "application/json; charset=UTF-8")
// .body(data)
// .when()
// .post(xmAppApi.getUrl())
// .then().log().all()
// .body("success", equalTo(true));
//
//
// }
//
//}
package com.live.cases.interactionLive;
import com.alibaba.fastjson.JSONObject;
import com.live.enums.ApiModele;
import com.live.enums.RequestType;
import com.live.enums.Terminal;
import com.live.utils.XMBaseTest;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import java.util.HashMap;
import java.util.Map;
/**
* @author NHX
* @Function C端获取学生信息列表
* @Date 2020/11/19 15:01
*/
public class TestGetStudentInstLinkageList_C extends XMBaseTest {
@BeforeMethod
public void beforeTest() {
xmAppApi.setApiModule(ApiModele.CloudClass_customerLive) // API 所属模块
.setApiName("API_getStudentInstLinkageList") // API 名称
.setLoginUser("NHX_c") // http 接口,测试账号
.setTerminal(Terminal.C); // 所属端位(B端,C端,M端等, 必传)
dal.setCase_owner("NHX")
.setCase_name("C端获取学生信息列表:" + Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
super.beforeTest();
}
//@Test(description = "C端获取学生信息列表")
public void testGetStudentInstLinkageList(){
Map<String,Object> bodyMap = new HashMap<>();
JSONObject jsonBody = new JSONObject(bodyMap);
String data = jsonBody.toJSONString();
System.out.println("请求参数==========="+data);
// "exception": "java.lang.IllegalArgumentException: userId不能为空; headers加userId
headers.put("userId","1145612151844098049");
xmAppApi.doRequest(RequestType.JSON, params, data, headers);
JSONObject jsonResponseBody = xmAppApi.getBodyInJSON();
Assert.assertEquals(jsonResponseBody.getString("success"), "true", "操作成功!");
}
}
//package com.live.cases.interactionLive;
//
//import com.alibaba.fastjson.JSONObject;
//import com.live.enums.ApiModele;
//import com.live.enums.RequestType;
//import com.live.enums.Terminal;
//import com.live.utils.XMBaseTest;
//import org.testng.Assert;
//import org.testng.annotations.BeforeMethod;
//import org.testng.annotations.Test;
//import java.util.HashMap;
//import java.util.Map;
//
///**
// * @author NHX
// * @Function C端获取学生信息列表
// * @Date 2020/11/19 15:01
// */
//public class TestGetStudentInstLinkageList_C extends XMBaseTest {
//
// @BeforeMethod
// public void beforeTest() {
// xmAppApi.setApiModule(ApiModele.CloudClass_customerLive) // API 所属模块
// .setApiName("API_getStudentInstLinkageList") // API 名称
// .setLoginUser("NHX_c") // http 接口,测试账号
// .setTerminal(Terminal.C); // 所属端位(B端,C端,M端等, 必传)
//
// dal.setCase_owner("NHX")
// .setCase_name("C端获取学生信息列表:" + Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
//
// super.beforeTest();
// }
//
// @Test(description = "C端获取学生信息列表")
// public void testGetStudentInstLinkageList(){
//
// Map<String,Object> bodyMap = new HashMap<>();
//
// JSONObject jsonBody = new JSONObject(bodyMap);
// String data = jsonBody.toJSONString();
//
// System.out.println("请求参数==========="+data);
// // "exception": "java.lang.IllegalArgumentException: userId不能为空; headers加userId
// headers.put("userId","1145612151844098049");
//
// xmAppApi.doRequest(RequestType.JSON, params, data, headers);
// JSONObject jsonResponseBody = xmAppApi.getBodyInJSON();
// Assert.assertEquals(jsonResponseBody.getString("success"), "true", "操作成功!");
//
//
// }
//
//}
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