Skip to content

O
oto
Commit 76b0a438 authored by xiamengchen's avatar xiamengchen
Browse files
Options

Merge branch 'master' into feature/live_kill

parents f41e53f7 f42241b4
Show whitespace changes
Inline Side-by-side
Showing with 197 additions and 27 deletions
src/test/java/com/kjj/cases/assistant/homePage/HomePage.java
View file @ 76b0a438
......@@ -235,27 +235,191 @@ public class HomePage implements Authorization {
Assert.assertNotNull(data, network.message(infoParams,HOME_findPosterById,"查询海报失败",findPosterRes.body().asString()));
}
//管理后台新增视频
@Test(description = "管理后台_编辑视频",priority = 14)
public void 管理后台_编辑视频(){
Map<String,Object> params = new HashMap<>();
List list = new ArrayList();
list.add(723);
list.add(724);
List tagList = new ArrayList();
tagList.add(list);
params.put("accurateContentType",5);
params.put("anxietyType",4);
params.put("contentId",247806);
params.put("firstTagId",101);
params.put("isHotContent",0);
params.put("productId",0);
params.put("status",0);
params.put("tagList",tagList);
System.out.println(params);
Response response = network.postResponse(params,MANAGER_grassContentEdit);
boolean data = response.jsonPath().getBoolean("data");
String desc = response.jsonPath().getString("desc");
Assert.assertTrue(data,network.message(params,MANAGER_grassContentEdit,"编辑视频失败",response.body().asString()));
Assert.assertEquals(desc,"OK",network.message(params,MANAGER_grassContentEdit,"编辑视频失败",response.body().asString()));
//启用视频
Map<String,Object> openParams = new HashMap<>();
openParams.put("id",247806);
openParams.put("status",2);
Response openRes = network.postResponse(openParams,MANAGER_videoOpen);
boolean openData = openRes.jsonPath().getBoolean("data");
String openDesc = openRes.jsonPath().getString("desc");
Assert.assertTrue(openData,network.message(openParams,MANAGER_videoOpen,"启用视频失败",openRes.body().asString()));
Assert.assertEquals(openDesc,"OK",network.message(openParams,MANAGER_videoOpen,"启用视频失败",openRes.body().asString()));
}
//获取视频标签列表
@Test(description = "首页_视频标签列表",priority = 15)
public void 首页_视频标签列表(){
Map<String,Object> params = new HashMap<>();
params.put("tagName","视频"); //%E8%A7%86%E9%A2%91
Response response = network.getResponse(params,HOME_getGrassTagByName);
Object data = response.jsonPath().getJsonObject("data");
Assert.assertNotNull(data, network.message(params,HOME_getGrassTagByName,"获取视频标签失败",response.body().asString()));
}
//获取首页视频列表
@Test(description = "首页_视频列表",priority = 14)
@Test(description = "首页_视频列表",priority = 16)
public void 首页_视频列表(){
sleep(5000);
Map<String,Object> params = new HashMap<>();
params.put("firstTagId",723); //一级标签
params.put("secondTagId",724); //二级标签
params.put("contentType","video");
Response response = network.getResponse(params,HOME_getContentList);
Object obj = response.jsonPath().getJsonObject("data.list");
Assert.assertNotNull(obj, network.message(params,HOME_getContentList,"获取首页视频列表失败",response.body().asString()));
Object obj = response.jsonPath().getJsonObject("data.totalCount");
Assert.assertEquals(obj,3,network.message(params,HOME_getContentList,"获取首页视频列表失败",response.body().asString()));
}
//验证视频是否下架成功
@Test(description = "下架视频",priority = 17)
public void 下架视频(){
//管理后台下架视频
Map<String,Object> openParams = new HashMap<>();
openParams.put("id",247806);
openParams.put("status",1);
Response openRes = network.postResponse(openParams,MANAGER_videoOpen);
boolean openData = openRes.jsonPath().getBoolean("data");
String openDesc = openRes.jsonPath().getString("desc");
Assert.assertTrue(openData,network.message(openParams,MANAGER_videoOpen,"下架视频失败",openRes.body().asString()));
Assert.assertEquals(openDesc,"OK",network.message(openParams,MANAGER_videoOpen,"下架视频失败",openRes.body().asString()));
sleep(5000);
//验证视频是否下架成功，原本视频列表有三个视频，下架后还剩2个
Map<String,Object> params = new HashMap<>();
params.put("firstTagId",723);
params.put("secondTagId",724);
params.put("contentType","video");
Response response = network.getResponse(params,HOME_getContentList);
Object obj = response.jsonPath().getJsonObject("data.totalCount");
Assert.assertEquals(obj,2,network.message(params,HOME_getContentList,"获取首页视频列表失败",response.body().asString()));
}
//管理后台新增公司专区内容
@Test(description = "管理后台_新增内容",priority = 18)
public void 新增内容(){
//根据文章内容id匹配
Map<String,Object> params = new HashMap<>();
params.put("id",9398);
params.put("contentType","article");
Response response = network.getResponse(params,MANAGER_simpleInfo);
String mainImgUrl = response.jsonPath().getString("data.mainImgUrl");
String title = response.jsonPath().getString("data.title");
String infoDesc = response.jsonPath().getString("desc");
Assert.assertEquals(infoDesc,"OK",network.message(params,MANAGER_simpleInfo,"匹配内容失败",response.body().asString()));
//新增公司专区内容
Map<String,Object> addParams = new HashMap<>();
List list = new ArrayList();
list.add(589);
List tagList = new ArrayList();
tagList.add(list);
addParams.put("contentTag","");
addParams.put("customUrl","");
addParams.put("id","");
addParams.put("exclusiveAreaId",21);
addParams.put("itemId",9398);
addParams.put("itemType","article");
addParams.put("mainImgUrl",mainImgUrl);
addParams.put("sort",1);
addParams.put("tagList",tagList);
addParams.put("title",title);
System.out.println(addParams);
Response addRes = network.postResponse(addParams,MANAGER_itemAddOrUpdate);
String desc = addRes.jsonPath().getString("desc");
Assert.assertEquals(desc,"OK",network.message(addParams,MANAGER_itemAddOrUpdate,"新增公司专区内容失败",addRes.body().asString()));
}
//获取首页公司专区
@Test(description = "首页_公司专区列表",priority = 15)
public void 首页_公司专区列表(){
@Test(description = "首页_公司专区",priority = 19)
public void 首页_公司专区(){
Response response = network.getResponse(HOME_getExclusiveArea);
String desc = response.jsonPath().getString("desc");
Assert.assertEquals(desc,"OK",network.message(HOME_getExclusiveArea,"获取公司专区列表失败",response.body().asString()));
Assert.assertEquals(desc,"OK",network.message(HOME_getExclusiveArea,"获取公司专区失败",response.body().asString()));
}
//管理后台新增成功案例
@Test(description = "管理后台_新增成功案例",priority = 15)
//获取公司首页公司专区列表 HOME_companyGetContentList
@Test(description = "首页_公司专区列表",priority = 20)
public void 首页_公司专区列表(){
//获取公司专区标签id
Response response = network.getResponse(Daily_getTagList);
Object id = response.jsonPath().getJsonObject("data.get(0).id");
String desc = response.jsonPath().getString("desc");
Assert.assertEquals(desc,"OK",network.message(Daily_getTagList,"获取标签id失败",response.body().asString()));
sleep(5000);
//获取专区列表
Map<String,Object> params = new HashMap<>();
params.put("firstTagId",id);
params.put("pageSize",20);
params.put("pageIndex",1);
params.put("source",1);
Response listRes = network.getResponse(params,HOME_companyGetContentList);
int totalCount = listRes.jsonPath().getInt("data.totalCount");
Assert.assertEquals(totalCount,2,network.message(params,HOME_companyGetContentList,"获取公司专区内容列表数据错误",listRes.body().asString()));
}
//管理后台删除文章
@Test(description = "管理后台_删除公司专区内容",priority = 21)
public void 管理后台_删除公司专区内容(){
//获取删除的内容的id
Map<String,Object> params = new HashMap<>();
params.put("exclusiveAreaId",21);
params.put("title","");
params.put("state",0);
params.put("pageNo",1);
params.put("pageSize",20);
Response listRes = network.getResponse(params,MANAGER_exclusiveItemPage);
Object id = listRes.jsonPath().getJsonObject("data.list.get(1).id");
String desc = listRes.jsonPath().getString("desc");
Assert.assertEquals(desc,"OK",network.message(params,MANAGER_exclusiveItemPage,"获取id失败",listRes.body().asString()));
//删除公司专区内容
Map<String,Object> delParams = new HashMap<>();
delParams.put("id",id);
Response delRes = network.getResponse(delParams,MANAGER_exclusiveItemDel);
String delDesc = delRes.jsonPath().getJsonObject("desc");
Assert.assertEquals(delDesc,"OK",network.message(delParams,MANAGER_exclusiveItemDel,"删除公司专区内容失败",delRes.body().asString()));
sleep(5000);
//验证删除是否成功
Response response = network.getResponse(Daily_getTagList);
Object tagId = response.jsonPath().getJsonObject("data.get(0).id");
Map<String,Object> paramsList = new HashMap<>();
paramsList.put("firstTagId",tagId);
paramsList.put("pageSize",20);
paramsList.put("pageIndex",1);
paramsList.put("source",1);
Response dataRes = network.getResponse(paramsList,HOME_companyGetContentList);
int totalCount = dataRes.jsonPath().getInt("data.totalCount");
Assert.assertEquals(totalCount,1,network.message(paramsList,HOME_companyGetContentList,"获取公司专区内容列表数据错误",dataRes.body().asString()));
}
//管理后台新增成功案例
@Test(description = "管理后台_新增成功案例",priority = 22)
public void 新增成功案例(){
//根据内容ID匹配内容标题
......@@ -283,7 +447,7 @@ public class HomePage implements Authorization {
Assert.assertTrue(addSuccess, network.message(addParams,MANAGER_addOrUpdateCases,"新增成功案例失败",addRes.body().asString()));
}
@Test(description = "管理后台_获取成功案例列表",priority = 16)
@Test(description = "管理后台_获取成功案例列表",priority = 23)
public void 获取成功案例列表(){
Response response = network.getResponse(MANAGER_caseList);
Object list = response.jsonPath().getJsonObject("data.list");
......@@ -291,7 +455,7 @@ public class HomePage implements Authorization {
Assert.assertNotNull(list,network.message(MANAGER_caseList,"获取成功案例列表失败",response.body().asString()));
}
@Test(description = "管理后台_获取案例详情",priority = 17)
@Test(description = "管理后台_获取案例详情",priority = 24)
public void 获取案例详情(){
Map<String,Object> params = new HashMap<>();
params.put("id",caseId);
......@@ -300,7 +464,7 @@ public class HomePage implements Authorization {
Assert.assertNotNull(data,network.message(params,MANAGER_successCaseDetail,"获取案例详情失败",response.body().asString()));
}
@Test(description = "管理后台_编辑案例",priority = 18)
@Test(description = "管理后台_编辑案例",priority = 25)
public void 编辑案例(){
//编辑成功案例
Map<String,Object> params = new HashMap<>();
......@@ -319,7 +483,7 @@ public class HomePage implements Authorization {
Assert.assertTrue(addSuccess, network.message(params,MANAGER_addOrUpdateCases,"编辑成功案例失败",addRes.body().asString()));
}
@Test(description = "管理后台_上架/下架成功案例",priority = 19)
@Test(description = "管理后台_上架/下架成功案例",priority = 26)
public void 上架成功案例(){
//上架成功案例 status = 2
Map<String,Object> params = new HashMap<>();
......@@ -343,7 +507,7 @@ public class HomePage implements Authorization {
}
//个人中心—我的反馈
@Test(description = "个人中心_我的反馈",priority = 20)
@Test(description = "个人中心_我的反馈",priority = 27)
public void 我的反馈(){
//tku 切换为访客的
network.agentCookies.put("tku", VISITOR_TKU);
......@@ -359,7 +523,7 @@ public class HomePage implements Authorization {
Assert.assertTrue(success,network.message(params,HOME_feedBackSave,"反馈意见提交成功",response.body().asString()));
}
//管理后台-集客助手反馈
@Test(description = "管理后台_集客助手反馈",priority = 21)
@Test(description = "管理后台_集客助手反馈",priority = 28)
public void 集客助手反馈结果(){
//验证管理后台是否接收到消息
Response manageRes = network.getResponse(MANAGER_feedBackList);
......@@ -370,7 +534,7 @@ public class HomePage implements Authorization {
//***********************文章配置素材*******************************
@Test(description = "代理人_访问文章未配置互动素材", priority = 26)
@Test(description = "代理人_访问文章未配置互动素材", priority = 29)
public void 代理人_访问文章未配置互动素材() {
agentTku();
Map<String, Object> params = new HashMap<String, Object>();
......@@ -389,7 +553,7 @@ public class HomePage implements Authorization {
Assert.assertNotNull(scid, network.message(params, GETSCID, "获取文章的scid失败", response.body().asString()));
}
@Test(description = "管理后台_新增互动方案", priority = 27)
@Test(description = "管理后台_新增互动方案", priority = 30)
public void 管理后台_新增互动方案() {
ssoLogin();
Map<String, Object> params = new HashMap<String, Object>();
......@@ -448,7 +612,7 @@ public class HomePage implements Authorization {
Assert.assertNotNull(activity2, network.message(params, MANAGER_searchAnswerList, "返回数据为空", response.body().asString()));
}
@Test(description = "管理后台_修改互动方案", priority = 28)
@Test(description = "管理后台_修改互动方案", priority = 31)
public void 管理后台_修改互动方案() {
Map<String, Object> params = new HashMap<String, Object>();
params.put("id", activity2);
......@@ -475,7 +639,7 @@ public class HomePage implements Authorization {
Assert.assertEquals(activityName, "快来摆摊测试吧",network.message(params, MANAGER_searchAnswerList, "返回数据为空", response.body().asString()));
}
@Test(description = "管理后台_通过方案id查找方案是否存在", priority = 29)
@Test(description = "管理后台_通过方案id查找方案是否存在", priority = 32)
public void 管理后台_通过方案id查找方案是否存在() {
Map<String, Object> params = new HashMap<String, Object>();
//存在
......@@ -495,7 +659,7 @@ public class HomePage implements Authorization {
Assert.assertEquals(data,null, network.message(params, MANAGER_activityName, "此方案存在", response.body().asString()));
}
@Test(description = "管理后台_新增文章关联互动方案", priority = 30)
@Test(description = "管理后台_新增文章关联互动方案", priority = 33)
public void 管理后台_新增文章关联互动方案() {
Map<String, Object> params = new HashMap<String, Object>();
ArrayList<Integer> interactIds = new ArrayList<Integer>();
......@@ -527,7 +691,7 @@ public class HomePage implements Authorization {
Assert.assertEquals(aolutionId, activity2,network.message(params, MANAGER_articlePageList, "返回数据为空", response.body().asString()));
}
@Test(description = "管理后台_互动方案使用中会删除失败", priority = 31)
@Test(description = "管理后台_互动方案使用中会删除失败", priority = 34)
public void 管理后台_互动方案使用中会删除失败() {
Map<String, Object> params = new HashMap<String, Object>();
params.put("id", activity2);
......@@ -548,7 +712,7 @@ public class HomePage implements Authorization {
Assert.assertNotNull(data, network.message(params, MANAGER_solutionPageList, "有文章使用互动方案删除成功", response.body().asString()));
}
@Test(description = "代理人_访问文章新增配置互动素材", priority = 32)
@Test(description = "代理人_访问文章新增配置互动素材", priority = 35)
public void 代理人_访问文章新增配置互动素材() {
sleep(10000);
Map<String, Object> params = new HashMap<String, Object>();
......@@ -566,7 +730,7 @@ public class HomePage implements Authorization {
Assert.assertEquals(activityId,answer2, network.message(params, ARTICLE_interact, "访问文章配置素材ID与实际配置不一致", response.body().asString()));
}
@Test(description = "管理后台_修改文章关联互动方案", priority = 33)
@Test(description = "管理后台_修改文章关联互动方案", priority = 36)
public void 管理后台_修改文章关联互动方案() {
Map<String, Object> params = new HashMap<String, Object>();
ArrayList<Integer> interactIds = new ArrayList<Integer>();
......@@ -595,7 +759,7 @@ public class HomePage implements Authorization {
Assert.assertEquals(aolutionId, activity1,network.message(params, MANAGER_articlePageList, "返回数据为空", response.body().asString()));
}
@Test(description = "代理人_访问文章修改配置互动素材并转发", priority = 34)
@Test(description = "代理人_访问文章修改配置互动素材并转发", priority = 37)
public void 代理人_访问文章修改配置互动素材并转发() {
sleep(10000);
Map<String, Object> params = new HashMap<String, Object>();
......@@ -624,7 +788,7 @@ public class HomePage implements Authorization {
Assert.assertNotNull(response.jsonPath().getJsonObject("data"),network.message(USER_INFO,"获取用户信息失败",response.body().asString()));
}
@Test(description = "访客_访问文章并参与测评", priority = 34)
@Test(description = "访客_访问文章并参与测评", priority = 38)
public void 访客_访问文章并参与测评() {
//切换为新用户小葡萄，每次都会产生线索
network.agentCookies.put("tku", tku);
......@@ -691,7 +855,7 @@ public class HomePage implements Authorization {
Assert.assertTrue(result, network.message(params, GAME_sendInfoForRisk, "申请领取食谱失败", response.body().asString()));
}
@Test(description = "管理后台_删除文章关联互动方案", priority = 35)
@Test(description = "管理后台_删除文章关联互动方案", priority = 39)
public void 管理后台_删除文章关联互动方案() {
Map<String, Object> params = new HashMap<String, Object>();
params.put("articleId", articleId);
......@@ -715,7 +879,7 @@ public class HomePage implements Authorization {
Assert.assertEquals(size, 0, network.message(params, MANAGER_articlePageList, "删除失败", response.body().asString()));
}
@Test(description = "代理人_访问文章删除配置互动素材", priority = 36)
@Test(description = "代理人_访问文章删除配置互动素材", priority = 40)
public void 代理人_访问文章删除配置互动素材() {
agentTku();
sleep(10000);
......@@ -728,7 +892,7 @@ public class HomePage implements Authorization {
Assert.assertEquals(size, 0, network.message(params, ARTICLE_interact, "返回数据不为空", response.body().asString()));
}
@Test(description = "管理后台_删除互动方案成功", priority = 37)
@Test(description = "管理后台_删除互动方案成功", priority = 41)
public void 管理后台_删除互动方案成功() {
Map<String, Object> params = new HashMap<String, Object>();
params.put("id", activity1);
......
src/test/java/com/kjj/config/BasicConfig.java
View file @ 76b0a438
......@@ -1062,5 +1062,11 @@ public class BasicConfig {
public static final String MANAGER_activityName = MANAGER_HOST + "/kjy/manager/interact/solution/activityName";
public static final String MANAGER_deleteInteract = MANAGER_HOST + "/kjy/manager/interact/article/delete";
public static final String MANAGER_deleteActivity = MANAGER_HOST + "/kjy/manager/interact/solution/delete";
public static final String MANAGER_grassContentEdit = MANAGER_HOST + "/kjy/manager/grassContent/edit";
public static final String MANAGER_videoOpen = MANAGER_HOST + "/kjy/manager/content/video/open";
public static final String MANAGER_simpleInfo = MANAGER_HOST + "/kjy/manager/content/simpleInfo";
public static final String MANAGER_itemAddOrUpdate = MANAGER_HOST + "/kjy/manager/exclusiveItem/addOrUpdate";
public static final String MANAGER_exclusiveItemPage = MANAGER_HOST + "/kjy/manager/exclusiveItem/page";
public static final String MANAGER_exclusiveItemDel = MANAGER_HOST + "/kjy/manager/exclusiveItem/del";
public static final String MANAGER_searchCompany = MANAGER_HOST + "/kjy/manager/live/company/search";
}
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