Commit 795fd243 authored by 张艳玲's avatar 张艳玲

解决报错问题

parent 6fce76ec
......@@ -108,7 +108,6 @@ public class Customer implements Authorization {
System.out.println(response.body().asString());
boolean data=response.jsonPath().getBoolean("data");
Assert.assertTrue(data, network.message(BasicConfig.MOBILE_customerUpdate, "性别修改失败", response.body().asString()));
Map<String, Object> ageParam = new HashMap<>();
ageParam.put("customerId",customerId);
ageParam.put("key",2);
......@@ -117,7 +116,6 @@ public class Customer implements Authorization {
System.out.println(ageRes.body().asString());
boolean data1=ageRes.jsonPath().getBoolean("data");
Assert.assertTrue(data1, network.message(BasicConfig.MOBILE_customerUpdate, "年龄修改失败", ageRes.body().asString()));
Map<String, Object> professionalParam = new HashMap<>();
professionalParam.put("customerId",customerId);
professionalParam.put("key",3);
......@@ -126,7 +124,6 @@ public class Customer implements Authorization {
System.out.println(professionalRes.body().asString());
boolean data2=professionalRes.jsonPath().getBoolean("data");
Assert.assertTrue(data2, network.message(BasicConfig.MOBILE_customerUpdate, "职业修改失败", professionalRes.body().asString()));
Map<String, Object> incomeParam = new HashMap<>();
incomeParam.put("customerId",customerId);
incomeParam.put("key",4);
......@@ -135,7 +132,6 @@ public class Customer implements Authorization {
System.out.println(incomeRes.body().asString());
boolean data3=incomeRes.jsonPath().getBoolean("data");
Assert.assertTrue(data3, network.message(BasicConfig.MOBILE_customerUpdate, "收入修改失败", incomeRes.body().asString()));
Map<String, Object> addressParam = new HashMap<>();
addressParam.put("customerId",customerId);
addressParam.put("key",5);
......@@ -144,7 +140,6 @@ public class Customer implements Authorization {
System.out.println(addressRes.body().asString());
boolean data4=addressRes.jsonPath().getBoolean("data");
Assert.assertTrue(data4, network.message(BasicConfig.MOBILE_customerUpdate, "所在地址修改失败", addressRes.body().asString()));
Map<String, Object> hobbyParam = new HashMap<>();
hobbyParam.put("customerId",customerId);
hobbyParam.put("key",6);
......@@ -153,7 +148,6 @@ public class Customer implements Authorization {
System.out.println(hobbyRes.body().asString());
boolean data5=hobbyRes.jsonPath().getBoolean("data");
Assert.assertTrue(data5, network.message(BasicConfig.MOBILE_customerUpdate, "爱好修改失败", hobbyRes.body().asString()));
Map<String, Object> insuranceParam = new HashMap<>();
insuranceParam.put("customerId",customerId);
insuranceParam.put("key",7);
......@@ -162,7 +156,6 @@ public class Customer implements Authorization {
System.out.println(insuranceRes.body().asString());
boolean data6=insuranceRes.jsonPath().getBoolean("data");
Assert.assertTrue(data6, network.message(BasicConfig.MOBILE_customerUpdate, "保险意识强弱修改失败", hobbyRes.body().asString()));
Map<String, Object> bartenderParam = new HashMap<>();
bartenderParam.put("customerId",customerId);
bartenderParam.put("key",8);
......
......@@ -62,13 +62,13 @@ public class LiveLater implements Authorization {
Object data = response.jsonPath().getJsonObject("data");
System.out.println(data);
long allNum=response.jsonPath().getLong("data.allNum");
Assert.assertTrue(allNum==18, network.message(params, BasicConfig.MOBILE_ClueNum, "总的线索数不对", response.body().asString()));
Assert.assertTrue(allNum>10, network.message(params, BasicConfig.MOBILE_ClueNum, "总的线索数不对", response.body().asString()));
long newCustomNum =response.jsonPath().getLong("data.newCustomNum");
Assert.assertTrue(newCustomNum==15, network.message(params, BasicConfig.MOBILE_ClueNum, "转介绍线索数不对", response.body().asString()));
Assert.assertTrue(newCustomNum>10, network.message(params, BasicConfig.MOBILE_ClueNum, "转介绍线索数不对", response.body().asString()));
long oldCustomNum =response.jsonPath().getLong("data.oldCustomNum");
Assert.assertTrue(oldCustomNum==3, network.message(params, BasicConfig.MOBILE_ClueNum, "直接邀请线索数不对", response.body().asString()));
long awardNum =response.jsonPath().getLong("data.awardNum");
Assert.assertTrue(awardNum==7, network.message(params, BasicConfig.MOBILE_ClueNum, "中奖数量不对", response.body().asString()));
Assert.assertTrue(awardNum==8, network.message(params, BasicConfig.MOBILE_ClueNum, "中奖数量不对", response.body().asString()));
boolean showAward =response.jsonPath().getBoolean("data.showAward");
Assert.assertTrue(showAward, network.message(params, BasicConfig.MOBILE_ClueNum, "未展示中奖tab", response.body().asString()));
long submitFormNum =response.jsonPath().getLong("data.submitFormNum");
......@@ -303,7 +303,7 @@ public class LiveLater implements Authorization {
Object data = response.jsonPath().getJsonObject("data");
System.out.println(data);
Integer clueCount =response.jsonPath().getInt("data.clueCount");
Assert.assertTrue(clueCount==18, network.message(params, BasicConfig.MOBILE_clueNum, "线索总数不对", response.body().asString()));
Assert.assertTrue(clueCount>10, network.message(params, BasicConfig.MOBILE_clueNum, "线索总数不对", response.body().asString()));
Integer notFollowedClueCount=response.jsonPath().getInt("data.notFollowedClueCount");
Assert.assertTrue(notFollowedClueCount>0, network.message(params, BasicConfig.MOBILE_clueNum, "未跟进线索数不对", response.body().asString()));
......
......@@ -87,7 +87,7 @@ public class Reward implements Authorization {
System.out.println(data);
Integer allCount =response.jsonPath().getInt("data.allCount");
Assert.assertTrue(allCount>5, network.message(params, BasicConfig.MOBILE_head, "中奖总数", response.body().asString()));
Assert.assertTrue(allCount>0, network.message(params, BasicConfig.MOBILE_head, "中奖总数", response.body().asString()));
Integer signCount=response.jsonPath().getInt("data.signCount");
Assert.assertTrue(signCount==0, network.message(params, BasicConfig.MOBILE_head, "签收数量", response.body().asString()));
......@@ -228,7 +228,7 @@ public class Reward implements Authorization {
System.out.println(data);
Integer allCount =response.jsonPath().getInt("data.allCount");
Assert.assertTrue(allCount>5, network.message(params, BasicConfig.MOBILE_head, "中奖总数", response.body().asString()));
Assert.assertTrue(allCount>0, network.message(params, BasicConfig.MOBILE_head, "中奖总数", response.body().asString()));
Integer signCount=response.jsonPath().getInt("data.signCount");
Assert.assertTrue(signCount==1, network.message(params, BasicConfig.MOBILE_head, "签收数量", response.body().asString()));
......
......@@ -15,7 +15,7 @@ import java.util.Map;
public class FlipCard implements Authorization {
public String cardConfId;
public String redConfId;
public String shareSign;
@Test(description = "查询翻牌集字配置状态", priority = 1)
......@@ -24,8 +24,8 @@ public class FlipCard implements Authorization {
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response response = network.getResponse(params, BasicConfig.MOBILE_status);
System.out.println(response.body().asString());
int confStatus = response.jsonPath().getInt("data.confStatus");
System.out.println(confStatus);
Assert.assertTrue(confStatus==2, network.message(params, BasicConfig.MOBILE_status, "未开启", response.body().asString()));
}
......@@ -36,29 +36,14 @@ public class FlipCard implements Authorization {
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response response = network.getResponse(params, BasicConfig.MOBILE_wordConf);
Object data = response.jsonPath().getJsonObject("data");
System.out.println(data);
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_wordConf, "查询直播翻牌配置详情失败", response.body().asString()));
}
//用户任务完成
//签到
@Test(description = "用户签到", priority = 3)
public void 用户签到() {
visitorAuth9();
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
// params.put("markIds",);
Response response = network.postResponse(params, BasicConfig.MOBILE_checkIn);
boolean data = response.jsonPath().getBoolean("data");
System.out.println(response.body().asString());
Assert.assertTrue(data, network.message(params, BasicConfig.MOBILE_checkIn, "用户签到失败", response.body().asString()));
String redConfId = response.jsonPath().getString("data.redConfId");
this.redConfId=redConfId;
Assert.assertNotNull(redConfId, network.message(params, BasicConfig.MOBILE_wordConf, "查询直播翻牌配置详情失败", response.body().asString()));
}
//用户任务完成
@Test(description = "访客H分享直播间", priority = 3)
public void 访客H分享直播间() {
visitorAuth9();
......@@ -117,7 +102,7 @@ public class FlipCard implements Authorization {
infoParam.put("liveId",LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
infoParam.put("shareSign",shareSign);
infoParam.put("shareType",12);
// infoParam.put("confId",);
infoParam.put("confId",this.redConfId);
Response response = network.getResponse(infoParam, BasicConfig.MOBILE_info);
Object data = response.jsonPath().getJsonObject("data");
System.out.println(data);
......@@ -133,50 +118,97 @@ public class FlipCard implements Authorization {
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("shareSign",shareSign);
params.put("shareType",12);
// params.put("confId",);
params.put("confId",this.redConfId);
Response response = network.postResponse(params, BasicConfig.MOBILE_assist);
boolean data = response.jsonPath().getBoolean("data");
System.out.println(data);
Assert.assertTrue(data, network.message(params, BasicConfig.MOBILE_assist, "用户B给用户H助力失败", response.body().asString()));
Assert.assertTrue(data, network.message(params, BasicConfig.MOBILE_assist, "用户V给用户H助力失败", response.body().asString()));
}
//预约
@Test(description = "翻牌集字_预约", priority = 8)
public void 翻牌集字_预约() {
@Test(description = "访客V分享直播间", priority = 9)
public void 访客V分享直播间() {
visitorAuth22();
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("shareType",2);
Response signRes = network.getResponse(params, BasicConfig.MOBILE_sign);
String data = signRes.jsonPath().getString("data");
this.shareSign = data;
System.out.println(shareSign);
Assert.assertNotNull(shareSign, network.message(params, BasicConfig.MOBILE_sign, "分享失败", signRes.body().asString()));
}
@Test(description = "用户H给用户V助力", priority = 10)
public void 用户H给用户V助力() {
visitorAuth9();
Map<String, Object> params = new HashMap<>();
params.put("bizType",2);
// params.put("bizId",);
// params.put("markIds",);
Response response = network.postResponse(params, BasicConfig.MOBILE_appointment);
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("shareSign",shareSign);
params.put("shareType",12);
params.put("confId",this.redConfId);
Response response = network.postResponse(params, BasicConfig.MOBILE_assist);
boolean data = response.jsonPath().getBoolean("data");
System.out.println(data);
Assert.assertTrue(data, network.message(params, BasicConfig.MOBILE_appointment, "预约失败", response.body().asString()));
Assert.assertTrue(data, network.message(params, BasicConfig.MOBILE_assist, "用户H给用户V助力失败", response.body().asString()));
}
//签到
@Test(description = "用户签到", priority = 11)
public void 用户签到() {
@Test(description = "用户邀请订阅", priority = 8)
public void 用户邀请订阅() {
visitorAuth9();
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
List<Long> markIds = new ArrayList<>();
markIds.add(142L);
markIds.add(143L);
markIds.add(140L);
params.put("markIds", markIds);
params.put("markIds",149);
visitorAuth9();
Response response = network.postResponse(params, BasicConfig.MOBILE_checkIn);
boolean data = response.jsonPath().getBoolean("data");
System.out.println(response.body().asString());
Assert.assertTrue(data, network.message(params, BasicConfig.MOBILE_checkIn, "用户签到失败", response.body().asString()));
visitorAuth22();
Response checkinRes = network.postResponse(params, BasicConfig.MOBILE_checkIn);
boolean data1 = checkinRes.jsonPath().getBoolean("data");
System.out.println(checkinRes.body().asString());
Assert.assertTrue(data1, network.message(params, BasicConfig.MOBILE_checkIn, "用户签到失败", checkinRes.body().asString()));
}
//预约
@Test(description = "翻牌集字_预约", priority = 12)
public void 翻牌集字_预约() {
Map<String, Object> params = new HashMap<>();
params.put("bizType",2);
params.put("bizId",LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("markIds",144);
visitorAuth9();
Response response = network.postResponse(params, BasicConfig.MOBILE_appointment);
boolean data = response.jsonPath().getBoolean("data");
System.out.println(data);
Assert.assertTrue(data, network.message(params, BasicConfig.MOBILE_appointment, "用户邀请订阅失败", response.body().asString()));
Assert.assertTrue(data, network.message(params, BasicConfig.MOBILE_appointment, "预约失败", response.body().asString()));
visitorAuth22();
Response appointmentRes = network.postResponse(params, BasicConfig.MOBILE_appointment);
boolean data1 = appointmentRes.jsonPath().getBoolean("data");
System.out.println(data1);
Assert.assertTrue(data1, network.message(params, BasicConfig.MOBILE_appointment, "预约失败", appointmentRes.body().asString()));
}
@Test(description = "用户完成任务情况", priority = 8)
@Test(description = "用户完成任务情况", priority = 13)
public void 用户完成任务情况() {
visitorAuth9();
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
visitorAuth9();
Response response = network.postResponse(params, BasicConfig.MOBILE_tasks);
System.out.println(response.body().asString());
boolean checkInStatus=response.jsonPath().getBoolean("data.checkInStatus");
......@@ -186,33 +218,51 @@ public class FlipCard implements Authorization {
int helpNum=response.jsonPath().getInt("data.helpNum");
Assert.assertTrue(helpNum==1, network.message(params, BasicConfig.MOBILE_tasks, "助力用户数为null", response.body().asString()));
visitorAuth22();
Response tasksRes = network.postResponse(params, BasicConfig.MOBILE_tasks);
System.out.println(tasksRes.body().asString());
boolean checkInStatus1=tasksRes.jsonPath().getBoolean("data.checkInStatus");
Assert.assertTrue(checkInStatus1, network.message(params, BasicConfig.MOBILE_tasks, "签到未完成", tasksRes.body().asString()));
boolean appointmentStatus1=tasksRes.jsonPath().getBoolean("data.appointmentStatus");
Assert.assertTrue(appointmentStatus1, network.message(params, BasicConfig.MOBILE_tasks, "预约失败", tasksRes.body().asString()));
int helpNum1=tasksRes.jsonPath().getInt("data.helpNum");
Assert.assertTrue(helpNum1==1, network.message(params, BasicConfig.MOBILE_tasks, "助力用户数为null", tasksRes.body().asString()));
}
@Test(description = "用户参与翻牌详情", priority = 13)
@Test(description = "用户参与翻牌详情", priority = 14)
public void 用户参与翻牌详情() {
visitorAuth9();
ThreadSleepUtils.sleep(1000);
Map<String, Object> params = new HashMap<>();
params.put("liveId",LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
visitorAuth9();
Response response = network.getResponse(params, BasicConfig.MOBILE_record);
System.out.println(response.body().asString());
int leftNum =response.jsonPath().getJsonObject("data.leftNum");
Assert.assertNotNull(leftNum, network.message(params, BasicConfig.MOBILE_record, "翻牌次数不足", response.body().asString()));
visitorAuth22();
Response recordRes= network.getResponse(params, BasicConfig.MOBILE_record);
System.out.println(recordRes.body().asString());
int leftNum1 =response.jsonPath().getJsonObject("data.leftNum");
Assert.assertNotNull(leftNum1, network.message(params, BasicConfig.MOBILE_record, "翻牌次数不足", recordRes.body().asString()));
}
@Test(description = "翻牌", priority = 9)
@Test(description = "翻牌", priority = 15)
public void 翻牌() {
visitorAuth9();
for (int i =0;i<6;i++){
Map<String, Object> params = new HashMap<>();
params.put("turnType",1);//1-活动页翻牌,2-助力翻牌
params.put("slot",i);
params.put("pos",i);
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
visitorAuth9();
Response response = network.postResponse(params, BasicConfig.MOBILE_turn);
boolean data = response.jsonPath().getBoolean("data");
System.out.println(data);
......@@ -221,24 +271,37 @@ public class FlipCard implements Authorization {
ThreadSleepUtils.sleep(5000);
Map<String, Object> infoParam = new HashMap<>();
infoParam.put("turnType",1);
infoParam.put("slot",i);
infoParam.put("pos",i);
infoParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response infoRes = network.getResponse(params, BasicConfig.MOBILE_turnState);
Object data1 = infoRes.jsonPath().getJsonObject("data");
System.out.println(data1);
Assert.assertNotNull(data1, network.message(params, BasicConfig.MOBILE_turnState, "用户H翻牌参与详情查询失败", infoRes.body().asString()));
visitorAuth22();
Response turnRes = network.postResponse(params, BasicConfig.MOBILE_turn);
boolean data2 = turnRes.jsonPath().getBoolean("data");
System.out.println(data2);
Assert.assertTrue(data2, network.message(params, BasicConfig.MOBILE_turn, "翻牌开启失败", turnRes.body().asString()));
}
ThreadSleepUtils.sleep(5000);
Map<String, Object> turnStateParam = new HashMap<>();
turnStateParam.put("turnType",1);
turnStateParam.put("pos",i);
turnStateParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response turnStateParamRes = network.getResponse(params, BasicConfig.MOBILE_turnState);
Object data3 = turnStateParamRes.jsonPath().getJsonObject("data");
System.out.println(data3);
Assert.assertNotNull(data3, network.message(params, BasicConfig.MOBILE_turnState, "用户H翻牌参与详情查询失败", turnStateParamRes.body().asString()));
}
}
@Test(description = "翻牌集字领取历史记录", priority = 13)
@Test(description = "翻牌集字领取历史记录", priority = 16)
public void 翻牌集字领取历史记录() {
visitorAuth9();
ThreadSleepUtils.sleep(1000);
......@@ -254,7 +317,7 @@ public class FlipCard implements Authorization {
//开红包
@Test(description = "用户开红包资格查询", priority = 13)
@Test(description = "用户开红包资格查询", priority = 17)
public void 用户开红包资格查询() {
visitorAuth9();
ThreadSleepUtils.sleep(5000);
......@@ -268,9 +331,9 @@ public class FlipCard implements Authorization {
Assert.assertTrue(redStatus==1, network.message(params, BasicConfig.MOBILE_finishStatus, "开红包", response.body().asString()));
}
@Test(description = "放弃开红包", priority = 13)
@Test(description = "放弃开红包", priority = 18)
public void 放弃开红包() {
visitorAuth9();
visitorAuth22();
ThreadSleepUtils.sleep(5000);
Map<String, Object> params = new HashMap<>();
params.put("liveId",LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
......@@ -281,7 +344,7 @@ public class FlipCard implements Authorization {
}
@Test(description = "开红包", priority = 13)
@Test(description = "开红包", priority = 19)
public void 开红包() {
visitorAuth9();
ThreadSleepUtils.sleep(5000);
......@@ -293,7 +356,7 @@ public class FlipCard implements Authorization {
Assert.assertTrue(data, network.message(params, BasicConfig.MOBILE_redOpen, "开红包失败", response.body().asString()));
}
@Test(description = "开红包结果", priority = 13)
@Test(description = "开红包结果", priority = 20)
public void 开红包结果() {
visitorAuth9();
ThreadSleepUtils.sleep(5000);
......
......@@ -1411,62 +1411,61 @@ public class SaveLive implements Authorization {
* 翻牌集字活动配置
*/
// @Test(description = "保存翻牌配置", priority = 69)
// public void 保存翻牌配置() {
// Map<String, Object> Params = new HashMap<>();
// Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
// Params.put("showAmount", 100);
// Params.put("personalShowAmount",1);
// Params.put("inviteNum",1);
// Params.put("invitePresentNum",1);
// Params.put("amount", 1);
// Params.put("num", 1);
// Response response = network.postResponse(Params, BasicConfig.MANAGER_flipWord);
// boolean data = response.jsonPath().getBoolean("data");
// System.out.println(data);
// Assert.assertTrue(data, network.message(Params, BasicConfig.MANAGER_flipWord, "保存翻牌配置失败", response.body().asString()));
//
// }
//
// @Test(description = "查看直播翻牌配置详情", priority = 70)
// public void 查看直播翻牌配置详情() {
// Map<String, Object> Params = new HashMap<>();
// Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
// Response response = network.getResponse(Params, BasicConfig.MANAGER_wordDetail);
// Object data = response.jsonPath().getJsonObject("data");
// System.out.println(data);
// Assert.assertNotNull(data, network.message(Params, BasicConfig.MANAGER_wordDetail, "查看直播翻牌配置详情失败", response.body().asString()));
//
// }
//
//
// @Test(description = "开启翻牌配置", priority = 71)
// public void 开启翻牌配置() {
// Map<String, Object> Params = new HashMap<>();
// Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
// Params.put("confStatus", 1);
// Response response = network.postResponse(Params, BasicConfig.MANAGER_wordSwitchStatus);
// boolean data = response.jsonPath().getBoolean("data");
// System.out.println(data);
// Assert.assertTrue(data, network.message(Params, BasicConfig.MANAGER_wordSwitchStatus, "开启翻牌配置失败", response.body().asString()));
//
// }
//
// @Test(description = "查看直播配置", priority = 72)
// public void 查看直播配置() {
// Map<String, Object> Params = new HashMap<>();
// Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
// Response response = network.getResponse(Params, BasicConfig.MANAGER_getConfDetail);
// boolean flipWordConfBuildStatus = response.jsonPath().getBoolean("data.flipWordConfBuildStatus");
// System.out.println(flipWordConfBuildStatus);
// Assert.assertTrue(flipWordConfBuildStatus, network.message(Params, BasicConfig.MANAGER_getConfDetail, "未配置翻牌", response.body().asString()));
//
// boolean flipWordConfStatus = response.jsonPath().getBoolean("data.flipWordConfStatus");
// System.out.println(flipWordConfStatus);
// Assert.assertTrue(flipWordConfStatus, network.message(Params, BasicConfig.MANAGER_getConfDetail, "未开启翻牌", response.body().asString()));
//
//
// }
@Test(description = "保存翻牌配置", priority = 69)
public void 保存翻牌配置() {
Map<String, Object> Params = new HashMap<>();
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
Params.put("amount", 1000);
Params.put("helpNum", 1);
Params.put("num",1);
Params.put("showAmount",1000);
Params.put("showMaxAmount",1000);
Response response = network.postResponse(Params, BasicConfig.MANAGER_flipWord);
boolean data = response.jsonPath().getBoolean("data");
System.out.println(data);
Assert.assertTrue(data, network.message(Params, BasicConfig.MANAGER_flipWord, "保存翻牌配置失败", response.body().asString()));
}
@Test(description = "查看直播翻牌配置详情", priority = 70)
public void 查看直播翻牌配置详情() {
Map<String, Object> Params = new HashMap<>();
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
Response response = network.getResponse(Params, BasicConfig.MANAGER_wordDetail);
Object data = response.jsonPath().getJsonObject("data");
System.out.println(data);
Assert.assertNotNull(data, network.message(Params, BasicConfig.MANAGER_wordDetail, "查看直播翻牌配置详情失败", response.body().asString()));
}
@Test(description = "开启翻牌配置", priority = 71)
public void 开启翻牌配置() {
Map<String, Object> Params = new HashMap<>();
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
Params.put("confStatus",2);
Response response = network.postResponse(Params, BasicConfig.MANAGER_wordSwitchStatus);
boolean data = response.jsonPath().getBoolean("data");
System.out.println(data);
Assert.assertTrue(data, network.message(Params, BasicConfig.MANAGER_wordSwitchStatus, "开启翻牌配置失败", response.body().asString()));
}
@Test(description = "查看直播配置", priority = 72)
public void 查看直播配置() {
Map<String, Object> Params = new HashMap<>();
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
Response response = network.getResponse(Params, BasicConfig.MANAGER_getConfDetail);
boolean flipWordConfBuildStatus = response.jsonPath().getBoolean("data.flipWordConfBuildStatus");
System.out.println(flipWordConfBuildStatus);
Assert.assertTrue(flipWordConfBuildStatus, network.message(Params, BasicConfig.MANAGER_getConfDetail, "未配置翻牌", response.body().asString()));
boolean flipWordConfStatus = response.jsonPath().getBoolean("data.flipWordConfStatus");
System.out.println(flipWordConfStatus);
Assert.assertTrue(flipWordConfStatus, network.message(Params, BasicConfig.MANAGER_getConfDetail, "未开启翻牌", response.body().asString()));
}
/**
* 直播中过渡视频
......
......@@ -46,7 +46,7 @@ public class WinningRules implements Authorization {
public void 上传企业指定中奖名单() {
Map<String, Object> Params = new HashMap<>();
Params.put("confId",confIdList.get(2).getConfId());
Params.put("excelUrl", "https://yun.dui88.com/kjy/media/file/20210420/51716f59605424332f50a26f0a5d531f.xlsx");
Params.put("excelUrl", "https://yun.dui88.com/kjy/media/file/20210719/05af7f67cafeda53930c1f12a46daa6a.xlsx");
Params.put("fileName", "指定中奖名单");
Response response = network.postResponse(Params, BasicConfig.MANAGER_import);
taskId = response.jsonPath().getInt("data");
......@@ -85,7 +85,7 @@ public class WinningRules implements Authorization {
public void 上传新的企业指定中奖名单() {
Map<String, Object> Params = new HashMap<>();
Params.put("confId",confIdList.get(2).getConfId());
Params.put("excelUrl", "https://yun.dui88.com/kjy/media/file/20210421/14cfc6260713bc97e7cd6a9b27b0e763.xlsx");
Params.put("excelUrl", "https://yun.dui88.com/kjy/media/file/20210719/05af7f67cafeda53930c1f12a46daa6a.xlsx");
Params.put("fileName", "指定中奖名单");
Response response = network.postResponse(Params, BasicConfig.MANAGER_import);
taskId = response.jsonPath().getInt("data");
......
......@@ -24,12 +24,12 @@ public class Lottery implements Authorization {
@Test(description = "代理人抽奖活动弹层福利列表", priority = 1)
public void 抽奖活动弹层福利列表() {
agentAuth();
Map<String, Object> lotterParam = new HashMap<>();
lotterParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response response = network.getResponse(lotterParam, BasicConfig.USER_listLiveLottery);
Map<String, Object> Params = new HashMap<>();
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response response = network.getResponse(Params, BasicConfig.USER_listLiveLottery);
Object data = response.jsonPath().getJsonObject("data");
System.out.println(data);
Assert.assertNotNull(data, network.message(lotterParam, BasicConfig.USER_listLiveLottery, "抽奖活动弹层福利列表查询失败", response.body().asString()));
Assert.assertNotNull(data, network.message(Params, BasicConfig.USER_listLiveLottery, "抽奖活动弹层福利列表查询失败", response.body().asString()));
}
@Test(description = "代理人查询抽奖奖品列表", priority = 2)
......@@ -354,8 +354,12 @@ public class Lottery implements Authorization {
Params.put("scene",4);
Response response = network.postResponse(Params, BasicConfig.ANCHOR_getRed);
System.out.println( response.body().asString());
Object data = response.jsonPath().getJsonObject("data");
Assert.assertNotNull(data, network.message(Params, BasicConfig.ANCHOR_getRed, "好运红包获取失败", response.body().asString()));
boolean firstGet = response.jsonPath().getBoolean("data.firstGet");
Assert.assertTrue(firstGet, network.message(Params, BasicConfig.ANCHOR_getRed, "非第1次获取好运红包", response.body().asString()));
int redNum = response.jsonPath().getInt("data.redNum");
Assert.assertTrue(redNum>1, network.message(Params, BasicConfig.ANCHOR_getRed, "红包个数不对", response.body().asString()));
}
......@@ -379,8 +383,8 @@ public class Lottery implements Authorization {
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response response = network.getResponse(Params, BasicConfig.MOBILE_receiveRecord);
System.out.println( response.body().asString());
boolean success = response.jsonPath().getBoolean("success");
Assert.assertTrue(success, network.message(Params, BasicConfig.MOBILE_receiveRecord, "访客B获取好运红包领取记录失败", response.body().asString()));
Object data = response.jsonPath().getJsonObject("data");
Assert.assertNull(data, network.message(Params, BasicConfig.MOBILE_receiveRecord, "访客B获取好运红包领取记录不为空", response.body().asString()));
}
......@@ -392,8 +396,8 @@ public class Lottery implements Authorization {
Params.put("shareUserId","Kj20ODYz");
Response response = network.postResponse(Params, BasicConfig.MOBILE_receiverOpen);
System.out.println( response.body().asString());
Object data = response.jsonPath().getJsonObject("data");
Assert.assertNotNull(data, network.message(Params, BasicConfig.MOBILE_receiverOpen, "访客B领取好运红包失败", response.body().asString()));
boolean data = response.jsonPath().getBoolean("data");
Assert.assertTrue(data, network.message(Params, BasicConfig.MOBILE_receiverOpen, "访客B领取好运红包失败", response.body().asString()));
}
......@@ -405,8 +409,12 @@ public class Lottery implements Authorization {
Params.put("shareUserId","Kj20ODYz");
Response response = network.getResponse(Params, BasicConfig.MOBILE_joinRecord);
System.out.println( response.body().asString());
Object data = response.jsonPath().getJsonObject("data");
Assert.assertNotNull(data, network.message(Params, BasicConfig.MOBILE_joinRecord, "访客B参与记录查询失败", response.body().asString()));
int redStatus = response.jsonPath().getInt("data.redStatus");
Assert.assertTrue(redStatus==2, network.message(Params, BasicConfig.MOBILE_joinRecord, "领取失败", response.body().asString()));
int awardType = response.jsonPath().getInt("data.awardType");
Assert.assertTrue(awardType==2, network.message(Params, BasicConfig.MOBILE_joinRecord, "奖励类型不对", response.body().asString()));
int amount = response.jsonPath().getInt("data.amount");
Assert.assertTrue(amount==30, network.message(Params, BasicConfig.MOBILE_joinRecord, "红包金额为null", response.body().asString()));
}
......@@ -418,8 +426,13 @@ public class Lottery implements Authorization {
Params.put("shareUserId","Kj20ODYz");
Response response = network.getResponse(Params, BasicConfig.MOBILE_joinRecord);
System.out.println( response.body().asString());
Object data = response.jsonPath().getJsonObject("data");
Assert.assertNotNull(data, network.message(Params, BasicConfig.MOBILE_joinRecord, "访客A获取好运红包领取记录失败", response.body().asString()));
int redStatus = response.jsonPath().getJsonObject("data.redStatus");
Assert.assertTrue(redStatus==2, network.message(Params, BasicConfig.MOBILE_joinRecord, "领取失败", response.body().asString()));
int awardType = response.jsonPath().getJsonObject("data.awardType");
Assert.assertTrue(awardType==2, network.message(Params, BasicConfig.MOBILE_joinRecord, "奖励类型不对", response.body().asString()));
int amount = response.jsonPath().getJsonObject("data.amount");
Assert.assertTrue(amount==30, network.message(Params, BasicConfig.MOBILE_joinRecord, "领取金额为null", response.body().asString()));
}
......@@ -437,14 +450,6 @@ public class Lottery implements Authorization {
Response myLotteryCodeRes = network.getResponse(myLotteryCodeParam, BasicConfig.MOBILE_MyLotteryCode);
Object data = myLotteryCodeRes.jsonPath().getJsonObject("data");
System.out.println(data);
// List<Object> values = myLotteryCodeRes.jsonPath().getList("data.list");
// boolean result = false;
// for (Object value : values) {
// if (Objects.equals(((Map) value).get("codeSource"), 5)) {
// result = true;
// break;
// }
// }
Assert.assertNotNull(data, network.message(myLotteryCodeParam, BasicConfig.MOBILE_MyLotteryCode, "查询访客A抽奖券列表失败", myLotteryCodeRes.body().asString()));
}
......@@ -688,13 +693,21 @@ public class Lottery implements Authorization {
@Test(description = "访客F到场", priority = 51)
public void 访客F到场() {
visitorAuth6();
Map<String, Object> connectSuccessParam = new HashMap<>();
connectSuccessParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
visitorAuth6();
Response response = network.getResponse(connectSuccessParam, BasicConfig.USER_connectSuccess);
boolean success = response.jsonPath().getBoolean("success");
System.out.println(success);
Assert.assertTrue(success, network.message(connectSuccessParam, BasicConfig.USER_connectSuccess, "访客到场请求失败", response.body().asString()));
agentAuth();
Response connectRes = network.getResponse(connectSuccessParam, BasicConfig.USER_connectSuccess);
boolean success1 = connectRes.jsonPath().getBoolean("success");
System.out.println(success1);
Assert.assertTrue(success1, network.message(connectSuccessParam, BasicConfig.USER_connectSuccess, "访客到场请求失败", connectRes.body().asString()));
}
@Test(description = "访客F关注直播间", priority = 52)
......@@ -775,13 +788,22 @@ public class Lottery implements Authorization {
@Test(description = "访客G关注直播间", priority = 58)
public void 访客G关注直播间() {
visitorAuth7();
Map<String, Object> subscribeParam = new HashMap<>();
subscribeParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
visitorAuth7();
Response subscribeRes = network.postResponse(subscribeParam, BasicConfig.USER_SUBSCRIBE);
boolean data = subscribeRes.jsonPath().getBoolean("data");
System.out.println(data);
Assert.assertTrue(data, network.message(subscribeParam, BasicConfig.USER_SUBSCRIBE, "关注失败", subscribeRes.body().asString()));
agentAuth();
Response response = network.postResponse(subscribeParam, BasicConfig.USER_SUBSCRIBE);
boolean data1 = response.jsonPath().getBoolean("data");
System.out.println(data1);
Assert.assertTrue(data1, network.message(subscribeParam, BasicConfig.USER_SUBSCRIBE, "关注失败", response.body().asString()));
}
@Test(description = "访客G抽奖码数量", priority = 59)
......@@ -1007,20 +1029,29 @@ public class Lottery implements Authorization {
Object data = startRes.jsonPath().getJsonObject("data");
System.out.println(data);
Assert.assertNotNull(data, network.message(startParam, BasicConfig.ANCHOR_start, "开启第三轮抽奖失败", startRes.body().asString()));
}
@Test(description = "查询第三轮正在抽奖的福利", priority = 73)
public void 查询第三轮正在抽奖的福利() {
visitorAuth6();
ThreadSleepUtils.sleep(1000);
Map<String, Object> infoParam = new HashMap<>();
infoParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
visitorAuth6();
Response infoRes = network.getResponse(infoParam, BasicConfig.USER_info);
System.out.println("result=" + infoRes.asString());
Object data = infoRes.jsonPath().getJsonObject("data");
System.out.println(data);
Assert.assertNotNull(data, network.message(infoParam, BasicConfig.USER_info, "获取正在抽奖的福利失败", infoRes.body().asString()));
agentAuth();
Response response = network.getResponse(infoParam, BasicConfig.USER_info);
Object data1 = response.jsonPath().getJsonObject("data");
System.out.println(data1);
Assert.assertNotNull(data1, network.message(infoParam, BasicConfig.USER_info, "获取正在抽奖的福利失败", response.body().asString()));
}
@Test(description = "查询第三轮是否可以结束抽奖状态", priority = 74)
......@@ -1034,6 +1065,8 @@ public class Lottery implements Authorization {
boolean data = statusRes.jsonPath().getBoolean("data");
System.out.println(data);
Assert.assertTrue(data, network.message(statusParam, BasicConfig.ANCHOR_status, "抽奖状态查询失败", statusRes.body().asString()));
}
@Test(description = "结束第三轮抽奖", priority = 75)
......@@ -1050,11 +1083,13 @@ public class Lottery implements Authorization {
@Test(description = "企业指定访客E是否中奖", priority = 76)
public void 企业指定访客E是否中奖() {
visitorAuth5();
ThreadSleepUtils.sleep(3000);
Map<String, Object> hasEndParam = new HashMap<>();
hasEndParam.put("confId", this.List_ConfId.get(2).getWelfareConfId());
hasEndParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
visitorAuth5();
Response hasEndRes = network.getResponse(hasEndParam, BasicConfig.USER_result);
try {
Boolean data = hasEndRes.jsonPath().getBoolean("data.lottery");
......@@ -1064,6 +1099,16 @@ public class Lottery implements Authorization {
throw e;
}
agentAuth();
Response response = network.getResponse(hasEndParam, BasicConfig.USER_result);
try {
Boolean data = response.jsonPath().getBoolean("data.lottery");
Assert.assertTrue(data, network.message(hasEndParam, BasicConfig.USER_result, "企业指定访客E未中奖", response.body().asString()));
} catch (Exception e) {
System.out.println("result = " + JSON.toJSONString(response.jsonPath().get()));
throw e;
}
}
......@@ -1074,10 +1119,10 @@ public class Lottery implements Authorization {
visitorAuth9();
Map<String, Object> connectSuccessParam = new HashMap<>();
connectSuccessParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response connectSuccessoRes = network.getResponse(connectSuccessParam, BasicConfig.USER_connectSuccess);
boolean success = connectSuccessoRes.jsonPath().getBoolean("success");
Response response = network.getResponse(connectSuccessParam, BasicConfig.USER_connectSuccess);
boolean success = response.jsonPath().getBoolean("success");
System.out.println(success);
Assert.assertTrue(success, network.message(connectSuccessParam, BasicConfig.USER_connectSuccess, "访客到场请求失败", connectSuccessoRes.body().asString()));
Assert.assertTrue(success, network.message(connectSuccessParam, BasicConfig.USER_connectSuccess, "访客到场请求失败", response.body().asString()));
}
@Test(description = "访客H关注直播间", priority = 78)
......
......@@ -65,9 +65,9 @@ public class BasicConfig {
//***********************************************************************
// 基础线代理人 TKU,sid:2991
public static String AGENT_TKU = "T3gM31f18jCFEcfTyJdjfJAfSjDmKNMHfH7CvpLDC6UCQd8X84RJEiiPHRHPqbrJYL3KL7tLsZEM5LjN4z";
public static String AGENT_TKU = "T3gM31f18jCFEcfTyJdjfJAfSjDmKNMHfH7CvpLDC6UCLbai6Pc41VyJK3bXHe1wg7Hb5FGFZheeLvHjbE";
// 基础线访客 TKU
public static String VISITOR_TKU = "T3gM31f18jCGvqvoyJRzyMTdpcPDJWUJJP4VQje7p9sfHcRNmyhTEzEbfmwrGFy5doVEinb1k3SVwreYQE";
public static String VISITOR_TKU = "T3gM31f18jCGvqvoyJRzyMTdpcPDJWUJJP4VQje7p9sfC4HKmj5NJfCUkxusAyFb5SpkWS31srDTYr6KtV";
// 访客的sids
public static final String sids = "Kj21MjMwNTU";
// 访客的userId(固定)
......
......@@ -57,7 +57,7 @@
</classes>
</test>
<!-- <test preserve-order="false" name="翻牌红包">-->
<!-- <test preserve-order="false" name="翻牌集字红包">-->
<!-- <classes>-->
<!-- <class name="com.kjj.cases.live.flipCard.FlipCard"/>-->
<!-- </classes>-->
......
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