Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xm-autotest-live
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xiamai-test
xm-autotest-live
Commits
c2bf4d9b
Commit
c2bf4d9b
authored
Feb 03, 2021
by
zhangying
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
review
parent
f9e0a35a
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
162 additions
and
214 deletions
+162
-214
src/main/java/com/live/cases/apollo/TestCourseLaunch.java
+1
-1
src/main/java/com/live/cases/apollo/TestGetCourseList.java
+0
-1
src/main/java/com/live/cases/apollo/TestQueryTeacherVisitData.java
+0
-42
src/main/java/com/live/cases/classReport/TestGetStudentReport.java
+45
-45
src/main/java/com/live/cases/fileManage/TestMultiPartUpload.java
+0
-2
src/main/java/com/live/cases/fileManage/TestRenameFolder.java
+0
-4
src/main/java/com/live/cases/fileManage/TestSaveFolder.java
+0
-3
src/main/java/com/live/cases/interactionLive/TestGetRelationByRelationId_C.java
+63
-63
src/main/java/com/live/cases/interactionLive/TestGetStudentInstLinkageList_C.java
+53
-53
No files found.
src/main/java/com/live/cases/apollo/TestCourseLaunch.java
View file @
c2bf4d9b
...
@@ -25,7 +25,7 @@ public class TestCourseLaunch extends XMBaseTest {
...
@@ -25,7 +25,7 @@ public class TestCourseLaunch extends XMBaseTest {
super
.
beforeTest
();
super
.
beforeTest
();
}
}
//
@Test
@Test
public
void
courseLaunch
(){
public
void
courseLaunch
(){
JSONObject
jsonObject
=
new
JSONObject
();
JSONObject
jsonObject
=
new
JSONObject
();
...
...
src/main/java/com/live/cases/apollo/TestGetCourseList.java
View file @
c2bf4d9b
...
@@ -24,7 +24,6 @@ public class TestGetCourseList extends XMBaseTest {
...
@@ -24,7 +24,6 @@ public class TestGetCourseList extends XMBaseTest {
public
void
beforeTest
()
{
public
void
beforeTest
()
{
xmAppApi
.
setApiModule
(
ApiModele
.
CloudClass_apollo
)
// API 所属模块 必传 读取配置文件config.properties配置的api地址
xmAppApi
.
setApiModule
(
ApiModele
.
CloudClass_apollo
)
// API 所属模块 必传 读取配置文件config.properties配置的api地址
.
setApiName
(
"api_getCourseList"
)
// API 名称 必传
.
setApiName
(
"api_getCourseList"
)
// API 名称 必传
// .setEnv("prod") // 运行环境 测试时可指定自己要运行的环境。 不穿默认取系统指定的允许环境
.
setLoginUser
(
"zhangy-b"
)
// http 接口,测试账号 必传
.
setLoginUser
(
"zhangy-b"
)
// http 接口,测试账号 必传
.
setTerminal
(
Terminal
.
B
);
// 所属端位(B端,C端,M端等, 必传)
.
setTerminal
(
Terminal
.
B
);
// 所属端位(B端,C端,M端等, 必传)
dal
.
setCase_owner
(
"zhangying"
)
dal
.
setCase_owner
(
"zhangying"
)
...
...
src/main/java/com/live/cases/apollo/TestQueryTeacherVisitData.java
deleted
100644 → 0
View file @
f9e0a35a
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"
));
}
}
src/main/java/com/live/cases/classReport/TestGetStudentReport.java
View file @
c2bf4d9b
package
com
.
live
.
cases
.
classReport
;
//
package com.live.cases.classReport;
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.GetStudentId
;
//
import com.live.xmutils.GetStudentId;
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;
//
//
/**
/
//
**
* 获取学生课堂报告
//
* 获取学生课堂报告
* by 张雨朦
//
* by 张雨朦
*/
//
*/
//
public
class
TestGetStudentReport
extends
XMBaseTest
{
//
public class TestGetStudentReport extends XMBaseTest {
GetStudentId
tools
=
new
GetStudentId
();
//
GetStudentId tools = new GetStudentId();
//
@BeforeMethod
//
@BeforeMethod
public
void
beforeTest
(){
//
public void beforeTest(){
xmAppApi
.
setApiModule
(
ApiModele
.
CloudClass_B
)
//
xmAppApi.setApiModule(ApiModele.CloudClass_B)
.
setApiName
(
"API_getStudentReport"
)
//
.setApiName("API_getStudentReport")
.
setLoginUser
(
"zhangYuM_b"
)
//
.setLoginUser("zhangYuM_b")
.
setTerminal
(
Terminal
.
B
);
//
.setTerminal(Terminal.B);
super
.
beforeTest
();
//
super.beforeTest();
}
//
}
//
//@Test
//
//@Test
public
void
getStudentReport
()
{
//
public void getStudentReport() {
//
String
id
=
tools
.
getFinishLiveCourseId
();
//
String id = tools.getFinishLiveCourseId();
//
JSONObject
jsonObject
=
new
JSONObject
();
//
JSONObject jsonObject = new JSONObject();
jsonObject
.
put
(
"courseId"
,
"1334309884730617857"
);
//
jsonObject.put("courseId","1334309884730617857");
jsonObject
.
put
(
"studentId"
,
"1330861588678483970"
);
//
jsonObject.put("studentId","1330861588678483970");
//
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
.
assertEquals
(
"success"
,
true
);
//
Assert.assertEquals("success",true);
}
//
}
//
//
}
//
}
src/main/java/com/live/cases/fileManage/TestMultiPartUpload.java
View file @
c2bf4d9b
...
@@ -25,8 +25,6 @@ public class TestMultiPartUpload extends XMBaseTest {
...
@@ -25,8 +25,6 @@ public class TestMultiPartUpload extends XMBaseTest {
.
setEnv
(
"prod"
)
// 运行环境 测试时可指定自己要运行的环境。 不穿默认取系统指定的允许环境
.
setEnv
(
"prod"
)
// 运行环境 测试时可指定自己要运行的环境。 不穿默认取系统指定的允许环境
.
setLoginUser
(
"zhangy-b"
)
// http 接口,测试账号 必传
.
setLoginUser
(
"zhangy-b"
)
// http 接口,测试账号 必传
.
setTerminal
(
Terminal
.
B
);
// 所属端位(B端,C端,M端等, 必传)
.
setTerminal
(
Terminal
.
B
);
// 所属端位(B端,C端,M端等, 必传)
// dal.setCase_owner("zhangying")
// .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
super
.
beforeTest
();
super
.
beforeTest
();
}
}
...
...
src/main/java/com/live/cases/fileManage/TestRenameFolder.java
View file @
c2bf4d9b
...
@@ -21,9 +21,6 @@ public class TestRenameFolder extends ApiBaseTestFile {
...
@@ -21,9 +21,6 @@ public class TestRenameFolder extends ApiBaseTestFile {
*/
*/
@Test
@Test
public
void
testRenameFolder
(){
public
void
testRenameFolder
(){
// GetFolderData getFolderList = new GetFolderData();
// List folerList = getFolderList.getFolderList();
// System.out.println("scoreTypeIdList= "+folerList);
String
name
=
"自动化测试文件夹"
+
RandomStringUtil
.
randomString
(
6
);
//文件夹名称
String
name
=
"自动化测试文件夹"
+
RandomStringUtil
.
randomString
(
6
);
//文件夹名称
...
@@ -36,7 +33,6 @@ public class TestRenameFolder extends ApiBaseTestFile {
...
@@ -36,7 +33,6 @@ public class TestRenameFolder extends ApiBaseTestFile {
Assert
.
assertEquals
(
"true"
,
jsonBody
.
getString
(
"success"
));
Assert
.
assertEquals
(
"true"
,
jsonBody
.
getString
(
"success"
));
Assert
.
assertEquals
(
"操作成功!"
,
jsonBody
.
getString
(
"message"
));
Assert
.
assertEquals
(
"操作成功!"
,
jsonBody
.
getString
(
"message"
));
// Assert.assertEquals(jsonBody.getJSONObject("result").getString("total"), Integer.toString(jsonBody.getJSONObject("result").getJSONArray("records").size()));
}
}
...
...
src/main/java/com/live/cases/fileManage/TestSaveFolder.java
View file @
c2bf4d9b
...
@@ -25,11 +25,8 @@ public class TestSaveFolder extends XMBaseTest {
...
@@ -25,11 +25,8 @@ public class TestSaveFolder extends XMBaseTest {
public
void
beforeTest
()
{
public
void
beforeTest
()
{
xmAppApi
.
setApiModule
(
ApiModele
.
CloudClass_File
)
// API 所属模块 必传 读取配置文件config.properties配置的api地址
xmAppApi
.
setApiModule
(
ApiModele
.
CloudClass_File
)
// API 所属模块 必传 读取配置文件config.properties配置的api地址
.
setApiName
(
"API_saveFolder"
)
// API 名称 必传
.
setApiName
(
"API_saveFolder"
)
// API 名称 必传
// .setEnv("prod") // 运行环境 测试时可指定自己要运行的环境。 不穿默认取系统指定的允许环境
.
setLoginUser
(
"zhangy-b"
)
// http 接口,测试账号 必传
.
setLoginUser
(
"zhangy-b"
)
// http 接口,测试账号 必传
.
setTerminal
(
Terminal
.
B
);
// 所属端位(B端,C端,M端等, 必传)
.
setTerminal
(
Terminal
.
B
);
// 所属端位(B端,C端,M端等, 必传)
// dal.setCase_owner("zhangying")
// .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
super
.
beforeTest
();
super
.
beforeTest
();
}
}
...
...
src/main/java/com/live/cases/interactionLive/TestGetRelationByRelationId_C.java
View file @
c2bf4d9b
package
com
.
live
.
cases
.
interactionLive
;
//
package com.live.cases.interactionLive;
//
import
com.alibaba.fastjson.JSONObject
;
//
import com.alibaba.fastjson.JSONObject;
import
com.live.enums.ApiModele
;
//
import com.live.enums.ApiModele;
import
com.live.enums.Terminal
;
//
import com.live.enums.Terminal;
import
com.live.utils.XMBaseTest
;
//
import com.live.utils.XMBaseTest;
import
org.testng.annotations.BeforeMethod
;
//
import org.testng.annotations.BeforeMethod;
import
org.testng.annotations.Test
;
//
import org.testng.annotations.Test;
//
import
java.util.HashMap
;
//
import java.util.HashMap;
import
java.util.Map
;
//
import java.util.Map;
//
import
static
io
.
restassured
.
RestAssured
.
given
;
//
import static io.restassured.RestAssured.given;
import
static
org
.
hamcrest
.
Matchers
.
equalTo
;
//
import static org.hamcrest.Matchers.equalTo;
//
/**
/
//
**
* @author NHX
//
* @author NHX
* @Function C端课表管理-课次详情 按关系Id获取关系
//
* @Function C端课表管理-课次详情 按关系Id获取关系
* @Date 2020/11/19 15:01
//
* @Date 2020/11/19 15:01
*/
//
*/
public
class
TestGetRelationByRelationId_C
extends
XMBaseTest
{
//
public class TestGetRelationByRelationId_C extends XMBaseTest {
//
@BeforeMethod
//
@BeforeMethod
public
void
beforeTest
()
{
//
public void beforeTest() {
xmAppApi
.
setApiModule
(
ApiModele
.
CloudClass_customerLive
)
// API 所属模块
//
xmAppApi.setApiModule(ApiModele.CloudClass_customerLive) // API 所属模块
.
setApiName
(
"API_getRelationByRelationId"
)
// API 名称
//
.setApiName("API_getRelationByRelationId") // API 名称
.
setLoginUser
(
"NHX_c"
)
// http 接口,测试账号
//
.setLoginUser("NHX_c") // http 接口,测试账号
.
setTerminal
(
Terminal
.
C
);
// 所属端位(B端,C端,M端等, 必传)
//
.setTerminal(Terminal.C); // 所属端位(B端,C端,M端等, 必传)
//
dal
.
setCase_owner
(
"NHX"
)
//
dal.setCase_owner("NHX")
.
setCase_name
(
"C端课表管理-课次详情 按关系Id获取关系:"
+
Thread
.
currentThread
().
getStackTrace
()[
1
].
getFileName
().
split
(
"\\."
)[
0
]);
//
.setCase_name("C端课表管理-课次详情 按关系Id获取关系:" + Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
//
super
.
beforeTest
();
//
super.beforeTest();
}
//
}
//
//
@Test(description = "C端课表管理-课次详情 按关系Id获取关系")
//
@Test(description = "C端课表管理-课次详情 按关系Id获取关系")
public
void
testGetRelationByRelationId
(){
//
public void testGetRelationByRelationId(){
//
//
Map
<
String
,
Object
>
bodyMap
=
new
HashMap
<>();
//
Map<String,Object> bodyMap = new HashMap<>();
bodyMap
.
put
(
"relationId"
,
"1145627043559436291"
);
//
bodyMap.put("relationId","1145627043559436291");
bodyMap
.
put
(
"relationType"
,
"SCHEDULE"
);
//
bodyMap.put("relationType","SCHEDULE");
//
JSONObject
jsonBody
=
new
JSONObject
(
bodyMap
);
//
JSONObject jsonBody = new JSONObject(bodyMap);
String
data
=
jsonBody
.
toJSONString
();
//
String data = jsonBody.toJSONString();
//
System
.
out
.
println
(
"请求参数==========="
+
data
);
//
System.out.println("请求参数==========="+data);
//
//
//
// xmAppApi.doRequest(RequestType.JSON, params, data, headers);
//
//
xmAppApi.doRequest(RequestType.JSON, params, data, headers);
// JSONObject jsonResponseBody = xmAppApi.getBodyInJSON();
//
//
JSONObject jsonResponseBody = xmAppApi.getBodyInJSON();
// Assert.assertEquals(jsonResponseBody.getString("success"), "true", "操作成功!");
//
//
Assert.assertEquals(jsonResponseBody.getString("success"), "true", "操作成功!");
given
()
//
given()
.
header
(
"Content-Type"
,
"application/json; charset=UTF-8"
)
//
.header("Content-Type", "application/json; charset=UTF-8")
.
body
(
data
)
//
.body(data)
.
when
()
//
.when()
.
post
(
xmAppApi
.
getUrl
())
//
.post(xmAppApi.getUrl())
.
then
().
log
().
all
()
//
.then().log().all()
.
body
(
"success"
,
equalTo
(
true
));
//
.body("success", equalTo(true));
//
//
}
//
}
//
}
//
}
src/main/java/com/live/cases/interactionLive/TestGetStudentInstLinkageList_C.java
View file @
c2bf4d9b
package
com
.
live
.
cases
.
interactionLive
;
//
package com.live.cases.interactionLive;
//
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.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;
import
java.util.HashMap
;
//
import java.util.HashMap;
import
java.util.Map
;
//
import java.util.Map;
//
/**
/
//
**
* @author NHX
//
* @author NHX
* @Function C端获取学生信息列表
//
* @Function C端获取学生信息列表
* @Date 2020/11/19 15:01
//
* @Date 2020/11/19 15:01
*/
//
*/
public
class
TestGetStudentInstLinkageList_C
extends
XMBaseTest
{
//
public class TestGetStudentInstLinkageList_C extends XMBaseTest {
//
@BeforeMethod
//
@BeforeMethod
public
void
beforeTest
()
{
//
public void beforeTest() {
xmAppApi
.
setApiModule
(
ApiModele
.
CloudClass_customerLive
)
// API 所属模块
//
xmAppApi.setApiModule(ApiModele.CloudClass_customerLive) // API 所属模块
.
setApiName
(
"API_getStudentInstLinkageList"
)
// API 名称
//
.setApiName("API_getStudentInstLinkageList") // API 名称
.
setLoginUser
(
"NHX_c"
)
// http 接口,测试账号
//
.setLoginUser("NHX_c") // http 接口,测试账号
.
setTerminal
(
Terminal
.
C
);
// 所属端位(B端,C端,M端等, 必传)
//
.setTerminal(Terminal.C); // 所属端位(B端,C端,M端等, 必传)
//
dal
.
setCase_owner
(
"NHX"
)
//
dal.setCase_owner("NHX")
.
setCase_name
(
"C端获取学生信息列表:"
+
Thread
.
currentThread
().
getStackTrace
()[
1
].
getFileName
().
split
(
"\\."
)[
0
]);
//
.setCase_name("C端获取学生信息列表:" + Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
//
super
.
beforeTest
();
//
super.beforeTest();
}
//
}
//
//
@Test(description = "C端获取学生信息列表")
//
@Test(description = "C端获取学生信息列表")
public
void
testGetStudentInstLinkageList
(){
//
public void testGetStudentInstLinkageList(){
//
Map
<
String
,
Object
>
bodyMap
=
new
HashMap
<>();
//
Map<String,Object> bodyMap = new HashMap<>();
//
JSONObject
jsonBody
=
new
JSONObject
(
bodyMap
);
//
JSONObject jsonBody = new JSONObject(bodyMap);
String
data
=
jsonBody
.
toJSONString
();
//
String data = jsonBody.toJSONString();
//
System
.
out
.
println
(
"请求参数==========="
+
data
);
//
System.out.println("请求参数==========="+data);
// "exception": "java.lang.IllegalArgumentException: userId不能为空; headers加userId
//
// "exception": "java.lang.IllegalArgumentException: userId不能为空; headers加userId
headers
.
put
(
"userId"
,
"1145612151844098049"
);
//
headers.put("userId","1145612151844098049");
//
xmAppApi
.
doRequest
(
RequestType
.
JSON
,
params
,
data
,
headers
);
//
xmAppApi.doRequest(RequestType.JSON, params, data, headers);
JSONObject
jsonResponseBody
=
xmAppApi
.
getBodyInJSON
();
//
JSONObject jsonResponseBody = xmAppApi.getBodyInJSON();
Assert
.
assertEquals
(
jsonResponseBody
.
getString
(
"success"
),
"true"
,
"操作成功!"
);
//
Assert.assertEquals(jsonResponseBody.getString("success"), "true", "操作成功!");
//
//
}
//
}
//
}
//
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment