Commit 5e2ca625 authored by 张艳玲's avatar 张艳玲

Merge branch '20210420bxl' into 'master'

红包异常场景

See merge request test-group/kejiji!56
parents a84c7620 a16cadb3
...@@ -73,5 +73,20 @@ public interface AdminAuthorization { ...@@ -73,5 +73,20 @@ public interface AdminAuthorization {
System.out.println("用户AUTH_KEY:" + VISITORKEY6); System.out.println("用户AUTH_KEY:" + VISITORKEY6);
} }
/**
* 访客(熊二)授权
*/
default void visitorAuth7() {
network.agentCookies.put("authKey", VISITORKEY7);
System.out.println("用户AUTH_KEY:" + VISITORKEY7);
}
/**
* 访客(喜洋洋)授权
*/
default void visitorAuth8() {
network.agentCookies.put("authKey", VISITORKEY8);
System.out.println("用户AUTH_KEY:" + VISITORKEY8);
}
} }
...@@ -37,9 +37,4 @@ public class OpenLive implements AdminAuthorization { ...@@ -37,9 +37,4 @@ public class OpenLive implements AdminAuthorization {
Assert.assertNotNull(data, network.message(openParam, BasicConfig.ANCHOR_OPEN, "开启直播失败", openRes.body().asString())); Assert.assertNotNull(data, network.message(openParam, BasicConfig.ANCHOR_OPEN, "开启直播失败", openRes.body().asString()));
ThreadSleepUtils.sleep(10000); ThreadSleepUtils.sleep(10000);
} }
} }
...@@ -31,7 +31,7 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -31,7 +31,7 @@ public class LiveVistorRed implements AdminAuthorization {
/*主播端添加手气王红包*/ /*主播端添加手气王红包*/
@Test(description = "主播端添加手气王红包", priority =1) @Test(description = "主播端添加手气王红包", priority =1)
public void 主播端添加红包() public void 主播端添加手气王红包()
{ {
ThreadSleepUtils.sleep(10000); ThreadSleepUtils.sleep(10000);
adminAuth(); adminAuth();
...@@ -164,9 +164,9 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -164,9 +164,9 @@ public class LiveVistorRed implements AdminAuthorization {
} }
/*开普通红包*/ /*访客A开普通红包*/
@Test(description = "红包", priority = 9) @Test(description = "访客A开普通红包", priority = 9)
public void 红包() public void 访客A开普通红包()
{ {
visitorAuth(); visitorAuth();
ThreadSleepUtils.sleep(60000); ThreadSleepUtils.sleep(60000);
...@@ -176,7 +176,7 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -176,7 +176,7 @@ public class LiveVistorRed implements AdminAuthorization {
Response response = network.postResponse(params, BasicConfig.MOBILE_RedOpen); Response response = network.postResponse(params, BasicConfig.MOBILE_RedOpen);
boolean data = response.jsonPath().getBoolean("success"); boolean data = response.jsonPath().getBoolean("success");
System.out.println(JSON.toJSONString(data)); System.out.println(JSON.toJSONString(data));
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedOpen, "红包失败", response.body().asString())); Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedOpen, "访客A开普通红包失败", response.body().asString()));
} }
/*代理人开普通红包*/ /*代理人开普通红包*/
...@@ -193,7 +193,23 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -193,7 +193,23 @@ public class LiveVistorRed implements AdminAuthorization {
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedOpen, "开红包失败", response.body().asString())); Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedOpen, "开红包失败", response.body().asString()));
} }
@Test(description = "红包个数", priority = 11)
//黑名单用户领红包
@Test(description = "黑名单用户领红包", priority = 11)
public void 黑名单用户领红包()
{
visitorAuth7();
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("confId", confId_Red);
Response response = network.postResponse(params, BasicConfig.MOBILE_RedOpen);
boolean data = response.jsonPath().getBoolean("success");
System.out.println(JSON.toJSONString(data));
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedOpen, "黑名单用户开红包失败", response.body().asString()));
}
@Test(description = "红包个数", priority = 12)
public void 红包个数() public void 红包个数()
{ {
visitorAuth(); visitorAuth();
...@@ -208,7 +224,7 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -208,7 +224,7 @@ public class LiveVistorRed implements AdminAuthorization {
/*领普通红包轮询结果*/ /*领普通红包轮询结果*/
@Test(description = "领普通红包轮询结果", priority = 12) @Test(description = "领普通红包轮询结果", priority = 13)
public void 领普通红包轮询结果() public void 领普通红包轮询结果()
{ {
ThreadSleepUtils.sleep(10000); ThreadSleepUtils.sleep(10000);
...@@ -223,7 +239,7 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -223,7 +239,7 @@ public class LiveVistorRed implements AdminAuthorization {
} }
/*领红包结果*/ /*领红包结果*/
@Test(description = "领红包结果", priority = 13) @Test(description = "领红包结果", priority = 14)
public void 领红包结果() public void 领红包结果()
{ {
visitorAuth(); visitorAuth();
...@@ -236,8 +252,9 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -236,8 +252,9 @@ public class LiveVistorRed implements AdminAuthorization {
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedState, "领红包结果查询失败", response.body().asString())); Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedState, "领红包结果查询失败", response.body().asString()));
} }
/*查询红包领取结果列表-看看大家手气*/ /*查询红包领取结果列表-看看大家手气*/
@Test(description = "查询红包领取结果列表", priority = 14) @Test(description = "查询红包领取结果列表", priority = 15)
public void 查询红包领取结果列表() public void 查询红包领取结果列表()
{ {
visitorAuth(); visitorAuth();
...@@ -257,7 +274,7 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -257,7 +274,7 @@ public class LiveVistorRed implements AdminAuthorization {
//************手气王红包************// //************手气王红包************//
//************手气王红包************// //************手气王红包************//
/*再次查询主播端红包轮次*/ /*再次查询主播端红包轮次*/
@Test(description = "再次查询主播端红包轮次", priority = 15) @Test(description = "再次查询主播端红包轮次", priority = 16)
public void 再次查询主播端红包轮次() public void 再次查询主播端红包轮次()
{ {
...@@ -273,7 +290,7 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -273,7 +290,7 @@ public class LiveVistorRed implements AdminAuthorization {
} }
//主播端单个手气王红包配置详情查询 //主播端单个手气王红包配置详情查询
@Test(description = "主播端单个红包配置详情查询", priority = 16) @Test(description = "主播端单个红包配置详情查询", priority = 17)
public void 主播端单个手气王红包配置详情查询() public void 主播端单个手气王红包配置详情查询()
{ {
adminAuth(); adminAuth();
...@@ -287,7 +304,7 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -287,7 +304,7 @@ public class LiveVistorRed implements AdminAuthorization {
} }
/*主播端上架手气王红包*/ /*主播端上架手气王红包*/
@Test(description = "主播端上架手气王红包", priority = 17) @Test(description = "主播端上架手气王红包", priority = 18)
public void 主播端上架手气王红包() public void 主播端上架手气王红包()
{ {
adminAuth(); adminAuth();
...@@ -300,9 +317,9 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -300,9 +317,9 @@ public class LiveVistorRed implements AdminAuthorization {
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_Grounding, "上架普通红包失败", response.body().asString())); Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_Grounding, "上架普通红包失败", response.body().asString()));
} }
/*访客端-获取直播间参数-getShareSign*/ /*访客端-访客A获取直播间参数-getShareSign*/
@Test(description = "获取直播间参数", priority = 18) @Test(description = "访客A获取直播间参数", priority = 19)
public void 获取直播间参数() public void 访客A获取直播间参数()
{ {
visitorAuth(); visitorAuth();
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
...@@ -316,11 +333,11 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -316,11 +333,11 @@ public class LiveVistorRed implements AdminAuthorization {
Assert.assertNotNull(red_sharesign, network.message(params, BasicConfig.MOBILE_GETSHARESIGN, "获取直播间参数失败", response.body().asString())); Assert.assertNotNull(red_sharesign, network.message(params, BasicConfig.MOBILE_GETSHARESIGN, "获取直播间参数失败", response.body().asString()));
} }
/*访客端助力者-助力查询*/ /*访客端-访客B查询被助力者访客A的信息*/
@Test(description = "助力者助力查询", priority = 19) @Test(description = "访客B查询被助力者访客A的信息", priority = 20)
public void 助力者助力查询() public void 访客B查询被助力者访客A的信息()
{ {
visitorAuth2(); visitorAuth8();
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("confId", confId_Red); params.put("confId", confId_Red);
params.put("shareSign", red_sharesign); params.put("shareSign", red_sharesign);
...@@ -330,11 +347,11 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -330,11 +347,11 @@ public class LiveVistorRed implements AdminAuthorization {
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedHelpQuery, "帮好友助力失败", response.body().asString())); Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedHelpQuery, "帮好友助力失败", response.body().asString()));
} }
/*访客端-帮好友助力*/ /*访客端-访客B帮访客A助力*/
@Test(description = "帮好友助力", priority = 20) @Test(description = "访客B帮访客A助力", priority = 21)
public void 帮好友助力() public void 访客B帮访客A助力()
{ {
visitorAuth2(); visitorAuth8();
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey())); params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("shareSign", red_sharesign); params.put("shareSign", red_sharesign);
...@@ -345,8 +362,54 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -345,8 +362,54 @@ public class LiveVistorRed implements AdminAuthorization {
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedLuckHelp, "帮好友助力失败", response.body().asString())); Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedLuckHelp, "帮好友助力失败", response.body().asString()));
} }
/*被助力者-手气王助力详情信息查询*/ /*访客端-访客B获取直播间参数-getShareSign*/
@Test(description = "红包详情助力信息", priority = 21) @Test(description = "访客B获取直播间参数", priority = 22)
public void 访客B获取直播间参数()
{
visitorAuth8();
Map<String, Object> params = new HashMap<>();
params.put("liveId",LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("shareType", 2);
Response response = network.getResponse(params, BasicConfig.MOBILE_RedGetShareSign);
HashMap data = response.jsonPath().getJsonObject("data");
System.out.println(data);
this.red_sharesign = (String)data.get("shareSign");
System.out.println(red_sharesign);
Assert.assertNotNull(red_sharesign, network.message(params, BasicConfig.MOBILE_GETSHARESIGN, "获取直播间参数失败", response.body().asString()));
}
/*访客端-访客A查询被助力者访客B的信息*/
@Test(description = "访客A查询被助力者访客B的信息", priority = 23)
public void 访客A查询被助力者访客B的信息()
{
visitorAuth();
Map<String, Object> params = new HashMap<>();
params.put("confId", confId_Red);
params.put("shareSign", red_sharesign);
Response response = network.postResponse(params, BasicConfig.MOBILE_RedHelpQuery);
RedHelpQuery data=JsonUtil.parseResponseToBean(response, RedHelpQuery.class);
System.out.println(JSON.toJSONString(data));
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedHelpQuery, "帮好友助力失败", response.body().asString()));
}
/*访客端-访客A帮访客B助力*/
@Test(description = "访客A帮访客B助力", priority = 24)
public void 访客A帮访客B助力()
{
visitorAuth();
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("shareSign", red_sharesign);
params.put("confRedPacketId", confId_Red);
Response response = network.postResponse(params, BasicConfig.MOBILE_RedLuckHelp);
boolean data = response.jsonPath().getBoolean("success");
System.out.println(JSON.toJSONString(data));
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedLuckHelp, "帮好友助力失败", response.body().asString()));
}
/*被助力者A-手气王助力详情信息查询*/
@Test(description = "红包详情助力信息", priority = 25)
public void 红包详情助力信息() public void 红包详情助力信息()
{ {
visitorAuth(); visitorAuth();
...@@ -359,9 +422,22 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -359,9 +422,22 @@ public class LiveVistorRed implements AdminAuthorization {
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedHelpDetail, "查询手气王助力失败", response.body().asString())); Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedHelpDetail, "查询手气王助力失败", response.body().asString()));
} }
/*被助力者B-手气王助力详情信息查询*/
@Test(description = "被助力者B-红包详情助力信息", priority = 26)
public void 被助力者B红包详情助力信息()
{
visitorAuth8();
Map<String, Object> params = new HashMap<>();
params.put("confId", confId_Red);
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response response = network.getResponse(params, BasicConfig.MOBILE_RedHelpDetail);
RedHepDetail data = JsonUtil.parseResponseToBean(response, RedHepDetail.class);
System.out.println(JSON.toJSONString(data));
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedHelpDetail, "查询手气王助力失败", response.body().asString()));
}
/*主播端发放手气王红包*/ /*主播端发放手气王红包*/
@Test(description = "主播端发放手气王红包", priority =22) @Test(description = "主播端发放手气王红包", priority =27)
public void 主播端发放手气王红包() public void 主播端发放手气王红包()
{ {
adminAuth(); adminAuth();
...@@ -375,7 +451,7 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -375,7 +451,7 @@ public class LiveVistorRed implements AdminAuthorization {
} }
/*再次查询访客端红包状态*/ /*再次查询访客端红包状态*/
@Test(description = "再次查询红包状态", priority = 23) @Test(description = "再次查询红包状态", priority = 28)
public void 再次查询红包状态列表() public void 再次查询红包状态列表()
{ {
visitorAuth(); visitorAuth();
...@@ -387,9 +463,23 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -387,9 +463,23 @@ public class LiveVistorRed implements AdminAuthorization {
Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_FindRedList, "查询红包状态失败", response.body().asString())); Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_FindRedList, "查询红包状态失败", response.body().asString()));
} }
/*开手气王红包*/ /*查询访客端访客B红包状态*/
@Test(description = "开手气王红包", priority = 24) @Test(description = "查询访客端访客B红包状态", priority = 29)
public void 开手气王红包() public void 查询访客端访客B红包状态()
{
visitorAuth8();
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response response = network.getResponse(params, BasicConfig.MOBILE_FindRedList);
List<RedOrdinary> Beans = JsonUtil.parseResponseToListBean(response, RedOrdinary.class);
System.out.println(JSON.toJSONString(Beans));
Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_FindRedList, "查询红包状态失败", response.body().asString()));
}
/*访客A开手气王红包*/
@Test(description = "访客A开手气王红包", priority = 30)
public void 访客A开手气王红包()
{ {
visitorAuth(); visitorAuth();
ThreadSleepUtils.sleep(63000); ThreadSleepUtils.sleep(63000);
...@@ -402,8 +492,23 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -402,8 +492,23 @@ public class LiveVistorRed implements AdminAuthorization {
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedOpen, "开红包失败", response.body().asString())); Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedOpen, "开红包失败", response.body().asString()));
} }
/*访客B开手气王红包*/
@Test(description = "访客B开手气王红包", priority = 31)
public void 访客B开手气王红包()
{
visitorAuth8();
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("confId", confId_Red);
Response response = network.postResponse(params, BasicConfig.MOBILE_RedOpen);
boolean data = response.jsonPath().getBoolean("success");
System.out.println(JSON.toJSONString(data));
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedOpen, "开红包失败", response.body().asString()));
}
/*查询访客端手气王红包状态*/ /*查询访客端手气王红包状态*/
@Test(description = "手气王红包状态查询", priority = 25) @Test(description = "手气王红包状态查询", priority = 32)
public void 手气王红包状态查询列表() public void 手气王红包状态查询列表()
{ {
visitorAuth(); visitorAuth();
...@@ -416,7 +521,7 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -416,7 +521,7 @@ public class LiveVistorRed implements AdminAuthorization {
} }
/*领手气王红包结果查询*/ /*领手气王红包结果查询*/
@Test(description = "领手气王红包结果查询", priority = 26) @Test(description = "领手气王红包结果查询", priority = 33)
public void 领手气王红包结果查询() public void 领手气王红包结果查询()
{ {
visitorAuth(); visitorAuth();
...@@ -430,7 +535,7 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -430,7 +535,7 @@ public class LiveVistorRed implements AdminAuthorization {
} }
/*手气王红包领取结果列表-看看大家手气*/ /*手气王红包领取结果列表-看看大家手气*/
@Test(description = "查询手气王红包领取结果列表", priority = 27) @Test(description = "查询手气王红包领取结果列表", priority = 34)
public void 查询手气王红包领取结果列表() public void 查询手气王红包领取结果列表()
{ {
visitorAuth(); visitorAuth();
...@@ -447,7 +552,7 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -447,7 +552,7 @@ public class LiveVistorRed implements AdminAuthorization {
} }
/*领红包轮询结果*/ /*领红包轮询结果*/
@Test(description = "领手气王红包轮询结果", priority = 28) @Test(description = "领手气王红包轮询结果", priority = 35)
public void 领手气王红包轮询结果() public void 领手气王红包轮询结果()
{ {
visitorAuth(); visitorAuth();
...@@ -460,8 +565,24 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -460,8 +565,24 @@ public class LiveVistorRed implements AdminAuthorization {
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_OpenState, "领手气王红包轮询结果查询失败", response.body().asString())); Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_OpenState, "领手气王红包轮询结果查询失败", response.body().asString()));
} }
/*访客B领红包轮询结果*/
@Test(description = "访客B领手气王红包轮询结果", priority = 36)
public void 访客B领手气王红包轮询结果()
{
visitorAuth8();
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("confId", confId_Red);
Response response = network.getResponse(params, BasicConfig.MOBILE_OpenState);
RedOpendate data=JsonUtil.parseResponseToBean(response, RedOpendate.class);
System.out.println(JSON.toJSONString(data));
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_OpenState, "领手气王红包轮询结果查询失败", response.body().asString()));
}
/*手气王公示*/ /*手气王公示*/
@Test(description = "手气王公示", priority = 29) @Test(description = "手气王公示", priority = 37)
public void 手气王公示() public void 手气王公示()
{ {
visitorAuth(); visitorAuth();
...@@ -476,7 +597,7 @@ public class LiveVistorRed implements AdminAuthorization { ...@@ -476,7 +597,7 @@ public class LiveVistorRed implements AdminAuthorization {
} }
/*主播端获取剩余红包金额*/ /*主播端获取剩余红包金额*/
@Test(description = "获取剩余红包金额", priority = 30) @Test(description = "获取剩余红包金额", priority = 38)
public void 获取剩余红包金额() public void 获取剩余红包金额()
{ {
adminAuth(); adminAuth();
......
...@@ -62,21 +62,22 @@ public class QuestionAwards implements AdminAuthorization { ...@@ -62,21 +62,22 @@ public class QuestionAwards implements AdminAuthorization {
return null; return null;
} }
/*主播端添加有奖答题-奖品奖励*/ /*主播端添加有奖答题-现金红包*/
@Test(description = "主播端添加有奖答题奖品奖励", priority = 2) @Test(description = "主播端添加有奖答题现金红包", priority = 1)
public void 主播端添加有奖答题奖品奖励() public void 主播端添加有奖答题现金红包()
{ {
adminAuth(); adminAuth();
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("quesType","2"); params.put("quesType","1");
WelfareDetail welfareDetail = new WelfareDetail(); AddAnswer RedDetail = new AddAnswer();
welfareDetail.setRewardId("Kj22MTU0Mw"); RedDetail.setTotalAmount(100);
welfareDetail.setRewardNum("2"); RedDetail.setShowAmount(100);
params.put("welfareDetail",welfareDetail); RedDetail.setTotalNum(3);
params.put("redDetail",RedDetail);
QuesConf quesConf=new QuesConf(); QuesConf quesConf=new QuesConf();
quesConf.setQuestionDetail("盲盒锦鲤奖品"); quesConf.setQuestionDetail("问题");
List<Option> optionlist=new ArrayList<>(); List<Option> optionlist=new ArrayList<>();
quesConf.setOptionList(optionlist); quesConf.setOptionList(optionlist);
...@@ -87,9 +88,9 @@ public class QuestionAwards implements AdminAuthorization { ...@@ -87,9 +88,9 @@ public class QuestionAwards implements AdminAuthorization {
optionlist.add(option1); optionlist.add(option1);
Option option2=new Option(); Option option2=new Option();
option2.setOptionDetail("错误1"); option2.setOptionDetail("错误");
option2.setOptionType(2); option2.setOptionType(2);
option2.setAnswerLen(3); option2.setAnswerLen(2);
optionlist.add(option2); optionlist.add(option2);
params.put("questionConf",quesConf); params.put("questionConf",quesConf);
...@@ -102,22 +103,21 @@ public class QuestionAwards implements AdminAuthorization { ...@@ -102,22 +103,21 @@ public class QuestionAwards implements AdminAuthorization {
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_QuesSaveOrUpdate, "主播端添加有奖答题现金红包失败", response.body().asString())); Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_QuesSaveOrUpdate, "主播端添加有奖答题现金红包失败", response.body().asString()));
} }
/*主播端添加有奖答题-现金红包*/ /*主播端添加有奖答题-奖品奖励*/
@Test(description = "主播端添加有奖答题现金红包", priority = 1) @Test(description = "主播端添加有奖答题奖品奖励", priority = 2)
public void 主播端添加有奖答题现金红包() public void 主播端添加有奖答题奖品奖励()
{ {
adminAuth(); adminAuth();
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("quesType","1"); params.put("quesType","2");
AddAnswer RedDetail = new AddAnswer(); WelfareDetail welfareDetail = new WelfareDetail();
RedDetail.setTotalAmount(100); welfareDetail.setRewardId("Kj22MTU0Mw");
RedDetail.setShowAmount(100); welfareDetail.setRewardNum("1");
RedDetail.setTotalNum(3); params.put("welfareDetail",welfareDetail);
params.put("redDetail",RedDetail);
QuesConf quesConf=new QuesConf(); QuesConf quesConf=new QuesConf();
quesConf.setQuestionDetail("问题"); quesConf.setQuestionDetail("盲盒锦鲤奖品");
List<Option> optionlist=new ArrayList<>(); List<Option> optionlist=new ArrayList<>();
quesConf.setOptionList(optionlist); quesConf.setOptionList(optionlist);
...@@ -128,9 +128,9 @@ public class QuestionAwards implements AdminAuthorization { ...@@ -128,9 +128,9 @@ public class QuestionAwards implements AdminAuthorization {
optionlist.add(option1); optionlist.add(option1);
Option option2=new Option(); Option option2=new Option();
option2.setOptionDetail("错误"); option2.setOptionDetail("错误1");
option2.setOptionType(2); option2.setOptionType(2);
option2.setAnswerLen(2); option2.setAnswerLen(3);
optionlist.add(option2); optionlist.add(option2);
params.put("questionConf",quesConf); params.put("questionConf",quesConf);
...@@ -239,9 +239,9 @@ public class QuestionAwards implements AdminAuthorization { ...@@ -239,9 +239,9 @@ public class QuestionAwards implements AdminAuthorization {
Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_QuesParticipate, "领取答题红包失败", response.body().asString())); Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_QuesParticipate, "领取答题红包失败", response.body().asString()));
} }
/*领取答题红包-选择正确选项*/ /*领取答题红包-访客A选择正确选项*/
@Test(description = "领取答题红包-答题正确", priority = 9) @Test(description = "访客A领取答题红包-答题正确", priority = 9)
public void 领取答题红包成功() public void 访客A领取答题红包成功()
{ {
visitorAuth(); visitorAuth();
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
...@@ -254,8 +254,39 @@ public class QuestionAwards implements AdminAuthorization { ...@@ -254,8 +254,39 @@ public class QuestionAwards implements AdminAuthorization {
Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_QuesParticipate, "领取答题红包失败", response.body().asString())); Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_QuesParticipate, "领取答题红包失败", response.body().asString()));
} }
/*领取答题红包-访客B选择正确选项*/
@Test(description = "领取答题红包-访客B答题正确", priority = 10)
public void 访客B领取答题红包成功()
{
visitorAuth7();
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("quesConfId", confId_ques);
params.put("optionId", rightanswer);
Response response = network.postResponse(params, BasicConfig.MOBILE_QuesParticipate);
AnswerQues Beans=JsonUtil.parseResponseToBean(response, AnswerQues.class);
System.out.println(JSON.toJSONString(Beans));
Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_QuesParticipate, "领取答题红包失败", response.body().asString()));
}
/*领取答题红包-黑名单用户选择正确选项*/
@Test(description = "领取答题红包-黑名单用户答题正确", priority = 11)
public void 黑名单用户领取答题红包成功()
{
visitorAuth7();
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("quesConfId", confId_ques);
params.put("optionId", rightanswer);
Response response = network.postResponse(params, BasicConfig.MOBILE_QuesParticipate);
AnswerQues Beans=JsonUtil.parseResponseToBean(response, AnswerQues.class);
System.out.println(JSON.toJSONString(Beans));
Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_QuesParticipate, "领取答题红包失败", response.body().asString()));
}
/*代理人领取答题红包*/ /*代理人领取答题红包*/
@Test(description = "代理人领取答题红包", priority = 10) @Test(description = "代理人领取答题红包", priority = 12)
public void 代理人领取答题红包() public void 代理人领取答题红包()
{ {
agentAuth(); agentAuth();
...@@ -270,7 +301,7 @@ public class QuestionAwards implements AdminAuthorization { ...@@ -270,7 +301,7 @@ public class QuestionAwards implements AdminAuthorization {
} }
/*领取答题红包结果*/ /*领取答题红包结果*/
@Test(description = "领取答题红包结果", priority = 11) @Test(description = "领取答题红包结果", priority = 13)
public void 领取答题红包结果() public void 领取答题红包结果()
{ {
visitorAuth(); visitorAuth();
...@@ -287,7 +318,7 @@ public class QuestionAwards implements AdminAuthorization { ...@@ -287,7 +318,7 @@ public class QuestionAwards implements AdminAuthorization {
//*****************有奖答题福利类型*****************// //*****************有奖答题福利类型*****************//
//*****************有奖答题福利类型*****************// //*****************有奖答题福利类型*****************//
/*查询主播端有奖答题列表*/ /*查询主播端有奖答题列表*/
@Test(description = "再次查询主播端有奖答题列表", priority = 12) @Test(description = "再次查询主播端有奖答题列表", priority = 14)
public void 再次查询主播端有奖答题列表() public void 再次查询主播端有奖答题列表()
{ {
ThreadSleepUtils.sleep(70000); ThreadSleepUtils.sleep(70000);
...@@ -305,7 +336,7 @@ public class QuestionAwards implements AdminAuthorization { ...@@ -305,7 +336,7 @@ public class QuestionAwards implements AdminAuthorization {
} }
/*上架主播端未发放的有奖答题-福利*/ /*上架主播端未发放的有奖答题-福利*/
@Test(description = "上架答题为福利", priority = 13) @Test(description = "上架答题为福利", priority = 15)
public void 上架答题为福利() public void 上架答题为福利()
{ {
adminAuth(); adminAuth();
...@@ -319,7 +350,7 @@ public class QuestionAwards implements AdminAuthorization { ...@@ -319,7 +350,7 @@ public class QuestionAwards implements AdminAuthorization {
} }
/*主播端发放福利类型的有奖答题*/ /*主播端发放福利类型的有奖答题*/
@Test(description = "主播端发放福利类型的有奖答题", priority = 14) @Test(description = "主播端发放福利类型的有奖答题", priority = 16)
public void 主播端发放福利类型的有奖答题() public void 主播端发放福利类型的有奖答题()
{ {
adminAuth(); adminAuth();
...@@ -333,7 +364,7 @@ public class QuestionAwards implements AdminAuthorization { ...@@ -333,7 +364,7 @@ public class QuestionAwards implements AdminAuthorization {
} }
/*查询访客端有奖答题配置详情*/ /*查询访客端有奖答题配置详情*/
@Test(description = "查询访客端有奖答题-福利类型的配置详情", priority = 15) @Test(description = "查询访客端有奖答题-福利类型的配置详情", priority = 17)
public void 查询访客端有奖答题福利类型配置详情() public void 查询访客端有奖答题福利类型配置详情()
{ {
visitorAuth(); visitorAuth();
...@@ -356,7 +387,7 @@ public class QuestionAwards implements AdminAuthorization { ...@@ -356,7 +387,7 @@ public class QuestionAwards implements AdminAuthorization {
} }
/*领取有奖答题福利类型-错误选项*/ /*领取有奖答题福利类型-错误选项*/
@Test(description = "领取有奖答题福利类型-错误选项", priority = 16) @Test(description = "领取有奖答题福利类型-错误选项", priority = 18)
public void 领取有奖答题福利类型选择错误() public void 领取有奖答题福利类型选择错误()
{ {
visitorAuth(); visitorAuth();
...@@ -371,8 +402,8 @@ public class QuestionAwards implements AdminAuthorization { ...@@ -371,8 +402,8 @@ public class QuestionAwards implements AdminAuthorization {
Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_QuesParticipate, "领取答题红包失败", response.body().asString())); Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_QuesParticipate, "领取答题红包失败", response.body().asString()));
} }
/*领取有奖答题福利类型-选择正确选项*/ /*领取有奖答题福利类型-访客A选择正确选项*/
@Test(description = "领取有奖答题福利类型-答题正确", priority = 17) @Test(description = "领取有奖答题福利类型-答题正确", priority = 19)
public void 领取有奖答题福利类型() public void 领取有奖答题福利类型()
{ {
visitorAuth2(); visitorAuth2();
...@@ -386,8 +417,38 @@ public class QuestionAwards implements AdminAuthorization { ...@@ -386,8 +417,38 @@ public class QuestionAwards implements AdminAuthorization {
Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_QuesParticipate, "领取答题红包失败", response.body().asString())); Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_QuesParticipate, "领取答题红包失败", response.body().asString()));
} }
/*领取有奖答题福利类型-访客A选择正确选项*/
@Test(description = "领取有奖答题福利类型-访客A答题正确", priority = 20)
public void 访客A领取有奖答题福利类型()
{
visitorAuth3();
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("quesConfId", confId_reward);
params.put("optionId", rightanswer);
Response response = network.postResponse(params, BasicConfig.MOBILE_QuesParticipate);
AnswerQues Beans=JsonUtil.parseResponseToBean(response, AnswerQues.class);
System.out.println(JSON.toJSONString(Beans));
Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_QuesParticipate, "领取答题红包失败", response.body().asString()));
}
/*领取有奖答题福利类型-黑名单用户选择正确选项*/
@Test(description = "领取有奖答题福利类型-访客B答题正确", priority = 21)
public void 访客B领取有奖答题福利类型()
{
visitorAuth7();
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("quesConfId", confId_reward);
params.put("optionId", rightanswer);
Response response = network.postResponse(params, BasicConfig.MOBILE_QuesParticipate);
AnswerQues Beans=JsonUtil.parseResponseToBean(response, AnswerQues.class);
System.out.println(JSON.toJSONString(Beans));
Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_QuesParticipate, "领取答题红包失败", response.body().asString()));
}
/*代理人领取有奖答题福利类型*/ /*代理人领取有奖答题福利类型*/
@Test(description = "代理人领取有奖答题福利类型", priority = 18) @Test(description = "代理人领取有奖答题福利类型", priority = 22)
public void 代理人领取有奖答题福利类型() public void 代理人领取有奖答题福利类型()
{ {
agentAuth(); agentAuth();
...@@ -402,7 +463,7 @@ public class QuestionAwards implements AdminAuthorization { ...@@ -402,7 +463,7 @@ public class QuestionAwards implements AdminAuthorization {
} }
/*领取有奖答题福利类型结果*/ /*领取有奖答题福利类型结果*/
@Test(description = "领取有奖答题福利类型结果", priority = 19) @Test(description = "领取有奖答题福利类型结果", priority = 23)
public void 领取有奖答题福利类型结果() public void 领取有奖答题福利类型结果()
{ {
visitorAuth(); visitorAuth();
......
...@@ -24,6 +24,11 @@ public class BasicConfig { ...@@ -24,6 +24,11 @@ public class BasicConfig {
public static String VISITORKEY5 ="zFNkBc7JtvLPL6ifAfXbcgYH7WruadzDMUjR7buv4kTkfKtxsjyzHLTi7V9HNnQ7ia7Reb5rk5k11dFQPNSuMzsEMW"; public static String VISITORKEY5 ="zFNkBc7JtvLPL6ifAfXbcgYH7WruadzDMUjR7buv4kTkfKtxsjyzHLTi7V9HNnQ7ia7Reb5rk5k11dFQPNSuMzsEMW";
//直播访客 (新强) //直播访客 (新强)
public static String VISITORKEY6 ="DyGoVEPj7nANppy7P8NS4Z4v3PAwxeqJodqYrmwYkoHYMsV4yAxbTXwZ5wWmGQTddQgxdWoNCmN43P8fzhcuWRmdE"; public static String VISITORKEY6 ="DyGoVEPj7nANppy7P8NS4Z4v3PAwxeqJodqYrmwYkoHYMsV4yAxbTXwZ5wWmGQTddQgxdWoNCmN43P8fzhcuWRmdE";
//直播访客 (熊二)
public static String VISITORKEY7 ="LEH7epeHVDJWzhZ6DiexTHnsy28pGo5XmzZG7KzUUKbJwaH84WuambhcvuhbKjYEBPivHr6LyYkQiCkh1fAg4BKKkJmoX";
//直播访客 (熊大)
public static String VISITORKEY8 ="LEH7epeHVDJWzhZ6DiexTHnsy28pGo5bL75Lr5VqnVBDBqZVAUZDaFbXuMHKrnKVvTa8qAQcvrVmqN9fxue59EMwYib7p";
// 基础线代理人 TKU // 基础线代理人 TKU
public static String AGENT_TKU = "T3gM31f18jCFEcfoYxvVk1LsF5T1YkcBNDbUaryi3TgvwatuP6mroJjZ2k7iCHjC9Srujh7k311i3vFuZm"; public static String AGENT_TKU = "T3gM31f18jCFEcfoYxvVk1LsF5T1YkcBNDbUaryi3TgvwatuP6mroJjZ2k7iCHjC9Srujh7k311i3vFuZm";
// 基础线访客 TKU // 基础线访客 TKU
...@@ -126,6 +131,9 @@ public class BasicConfig { ...@@ -126,6 +131,9 @@ public class BasicConfig {
public static final String MANAGER_rewardList = MANAGER_HOST + "/kjy/manager/live/ques/reward/list"; public static final String MANAGER_rewardList = MANAGER_HOST + "/kjy/manager/live/ques/reward/list";
public static final String MANAGER_delete = MANAGER_HOST + "/kjy/manager/live/ques/reward/delete"; public static final String MANAGER_delete = MANAGER_HOST + "/kjy/manager/live/ques/reward/delete";
public static final String MANAGER_update = MANAGER_HOST + "/kjy/manager/live/ques/reward/update"; public static final String MANAGER_update = MANAGER_HOST + "/kjy/manager/live/ques/reward/update";
public static final String MANAGER_TreasureBenefits = MANAGER_HOST + "/kjy/manager/treasure/time/conf/list";
public static final String MANAGER_TreasureDetail = MANAGER_HOST + "/kjy/manager/treasure/time/conf/detail";
public static final String MANAGER_TreasureConUpdate = MANAGER_HOST + "/kjy/manager/treasure/time/conf/update";
// *************** 代理人 *************** // *************** 代理人 ***************
//代理人列表// //代理人列表//
......
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