Skip to content

O
oto
Commit ee1ba3cb authored by 张艳玲's avatar 张艳玲
Browse files
Options

更新删除接口

parent da66bcf8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 254 additions and 196 deletions
src/test/java/com/kjj/cases/basics/card/ArticalPersonCard.java → src/test/java/com/kjj/cases/assistant/card/ArticalPersonCard.java
View file @ ee1ba3cb
package com.kjj.cases.basics.card;
package com.kjj.cases.assistant.card;
import static com.kjj.config.BasicConfig.*;
import static com.kjj.utils.ThreadSleepUtils.sleep;
......
src/test/java/com/kjj/cases/basics/card/PersonCard.java → src/test/java/com/kjj/cases/assistant/card/PersonCard.java
View file @ ee1ba3cb
package com.kjj.cases.basics.card;
package com.kjj.cases.assistant.card;
import com.kjj.bean.card.GoodMajor;
import com.kjj.bean.card.WechatCard;
......
src/test/java/com/kjj/cases/live/agent/Customer.java
View file @ ee1ba3cb
......@@ -78,7 +78,7 @@ public class Customer implements Authorization {
int customerNum=response.jsonPath().getInt("data.customerNum");
Assert.assertTrue(customerNum>26, network.message(BasicConfig.MOBILE_count, "总客户数量不对", response.body().asString()));
int lastOneNewNum = response.jsonPath().getJsonObject("data.lastOneNewNum");
Assert.assertTrue(lastOneNewNum>17, network.message(BasicConfig.MOBILE_count, "上场新增客户数量", response.body().asString()));
Assert.assertTrue(lastOneNewNum>15, network.message(BasicConfig.MOBILE_count, "上场新增客户数量", response.body().asString()));
}
......
src/test/java/com/kjj/cases/live/liveConfig/SaveLive.java
View file @ ee1ba3cb
......@@ -1408,24 +1408,23 @@ 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("withdrawalAmount", 100);
// Params.put("withdrawalCondition", 1);
// Params.put("withdrawalNum", 1);
// Params.put("invitePresentNum", 1);
// Params.put("initPresentNum", 10);
// Params.put("imgUrl", "https://yun.dui88.com/kjy/image/20210608/1623132676884.jpg");
// Params.put("secondImgUrl", "https://yun.dui88.com/kjy/image/20210608/1623132676884.jpg");
// Response response = network.postResponse(Params, BasicConfig.MANAGER_card);
// 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_card, "保存翻牌配置失败", response.body().asString()));
// Assert.assertTrue(data, network.message(Params, BasicConfig.MANAGER_flipWord, "保存翻牌配置失败", response.body().asString()));
//
// }
//
......@@ -1433,10 +1432,10 @@ public class SaveLive implements Authorization {
// 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_cardDetail);
// 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_cardDetail, "查看直播翻牌配置详情失败", response.body().asString()));
// Assert.assertNotNull(data, network.message(Params, BasicConfig.MANAGER_wordDetail, "查看直播翻牌配置详情失败", response.body().asString()));
//
// }
//
......@@ -1446,10 +1445,10 @@ public class SaveLive implements Authorization {
// 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_switch);
// 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_switch, "开启翻牌配置失败", response.body().asString()));
// Assert.assertTrue(data, network.message(Params, BasicConfig.MANAGER_wordSwitchStatus, "开启翻牌配置失败", response.body().asString()));
//
// }
//
......@@ -1458,13 +1457,13 @@ public class SaveLive implements Authorization {
// 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 cardConfBuildStatus = response.jsonPath().getBoolean("data.cardConfBuildStatus");
// System.out.println(cardConfBuildStatus);
// Assert.assertTrue(cardConfBuildStatus, network.message(Params, BasicConfig.MANAGER_getConfDetail, "未配置翻牌", response.body().asString()));
// boolean flipWordConfBuildStatus = response.jsonPath().getBoolean("data.flipWordConfBuildStatus");
// System.out.println(flipWordConfBuildStatus);
// Assert.assertTrue(flipWordConfBuildStatus, network.message(Params, BasicConfig.MANAGER_getConfDetail, "未配置翻牌", response.body().asString()));
//
// boolean cardConfStatus = response.jsonPath().getBoolean("data.cardConfStatus");
// System.out.println(cardConfStatus);
// Assert.assertTrue(cardConfStatus, 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()));
//
//
// }
......@@ -1749,6 +1748,7 @@ public class SaveLive implements Authorization {
Assert.assertTrue(data, network.message(Params, BasicConfig.MANAGER_redSwitchStatus, "开启攒现金红包配置失败", response.body().asString()));
}
/**
* 闯关答题
*/
......@@ -2012,11 +2012,27 @@ public class SaveLive implements Authorization {
}
@Test(description = "查看直播好运配置状态", priority = 108)
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 configFortune = response.jsonPath().getBoolean("data.configFortune");
System.out.println(configFortune);
Assert.assertTrue(configFortune, network.message(Params, BasicConfig.MANAGER_getConfDetail, "未配置好运红包", response.body().asString()));
boolean fortuneConfBuildStatus = response.jsonPath().getBoolean("data.fortuneConfBuildStatus");
System.out.println(fortuneConfBuildStatus);
Assert.assertTrue(fortuneConfBuildStatus, network.message(Params, BasicConfig.MANAGER_getConfDetail, "未开启好运红包配置", response.body().asString()));
}
/**
* 直播预告页弹窗
*/
@Test(description = "直播预告页弹窗配置", priority = 108)
@Test(description = "直播预告页弹窗配置", priority = 109)
public void 直播预告页弹窗配置() {
Map<String, Object> Params = new HashMap<>();
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
......@@ -2031,7 +2047,7 @@ public class SaveLive implements Authorization {
}
@Test(description = "预告页弹窗详情", priority = 109)
@Test(description = "预告页弹窗详情", priority = 110)
public void 预告页弹窗详情() {
Map<String, Object> Params = new HashMap<>();
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
......@@ -2042,7 +2058,7 @@ public class SaveLive implements Authorization {
}
@Test(description = "开启预告页弹窗", priority = 110)
@Test(description = "开启预告页弹窗", priority = 111)
public void 开启预告页弹窗() {
Map<String, Object> Params = new HashMap<>();
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
......@@ -2054,7 +2070,25 @@ public class SaveLive implements Authorization {
}
@Test(description = "查看直播预告页弹窗配置状态", priority = 112)
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 preLayerConfStatus = response.jsonPath().getBoolean("data.preLayerConfStatus");
System.out.println(preLayerConfStatus);
Assert.assertTrue(preLayerConfStatus, network.message(Params, BasicConfig.MANAGER_getConfDetail, "未配置预告页弹窗", response.body().asString()));
boolean preLayerOpenStatus = response.jsonPath().getBoolean("data.preLayerOpenStatus");
System.out.println(preLayerOpenStatus);
Assert.assertTrue(preLayerOpenStatus, network.message(Params, BasicConfig.MANAGER_getConfDetail, "未开启预告页弹窗", response.body().asString()));
}
}
src/test/java/com/kjj/config/BasicConfig.java
View file @ ee1ba3cb
......@@ -99,10 +99,12 @@ public class BasicConfig {
public static final String MANAGER_redConfDetail = MANAGER_HOST + "/kjy/manager/live/fortune/red/confDetail";
public static final String MANAGER_redSwitch = MANAGER_HOST + "/kjy/manager/live/fortune/red/status/switch";
public static final String MANAGER_insertOrUpdate = MANAGER_HOST + "/kjy/manager/live/pre/conf/insertOrUpdate";
public static final String MANAGER_preLayer = MANAGER_HOST + "/kjy/manager/live/pre/conf/preLayer";
public static final String MANAGER_openPreLayer = MANAGER_HOST + "/kjy/manager/live/pre/conf/openPreLayer";
public static final String MOBILE_receiveRecord = MOBILE_HOST + "/kjy/live/fortune/receiver/receiveRecord";
public static final String MOBILE_receiverOpen= MOBILE_HOST + "/kjy/live/fortune/receiver/open";
public static final String MOBILE_joinRecord= MOBILE_HOST + "/kjy/live/fortune/receiver/joinRecord";
// *************** 闯关答题 ***************
public static final String MANAGER_addOrUpdateQues = MANAGER_HOST + "/kjy/manager/pass/ques/addOrUpdateQues";
......@@ -176,20 +178,25 @@ public class BasicConfig {
public static final String ANCHOR_listLiveFreeReward = MOBILE_HOST + "/kjy/live/lottery/listLiveFreeReward";
public static final String ANCHOR_receive = MOBILE_HOST + "/kjy/live/user/lottery/receive";
// *************** 翻牌红包 ***************
public static final String MANAGER_card = MANAGER_HOST + "/kjy/manager/live/flip/card/save";
public static final String MANAGER_switch = MANAGER_HOST + "/kjy/manager/live/flip/card/status/switch";
public static final String MANAGER_cardDetail = MANAGER_HOST + "/kjy/manager/live/flip/card/detail";
public static final String MOBILE_status = MOBILE_HOST + "/kjy/live/flip/card/status";
public static final String MOBILE_cardDetail= MOBILE_HOST + "/kjy/live/flip/card/detail";
public static final String MOBILE_userInfo= MOBILE_HOST + "/kjy/live/flip/card/userInfo";
public static final String MOBILE_cardOpen= MOBILE_HOST + "/kjy/live/flip/card/open";
public static final String MOBILE_participateInfo= MOBILE_HOST + "/kjy/live/flip/card/participateInfo";
public static final String MOBILE_withdrawal= MOBILE_HOST + "/kjy/live/flip/card/withdrawal";
public static final String MOBILE_withdrawalResult= MOBILE_HOST + "/kjy/live/flip/card/withdrawalResult";
public static final String MOBILE_withdrawalRecord= MOBILE_HOST + "/kjy/live/flip/card/withdrawalRecord";
// *************** 翻牌集字红包 ***************
public static final String MANAGER_flipWord = MANAGER_HOST + "/kjy/manager/flip/word/saveOrUpdate";
public static final String MANAGER_wordSwitchStatus = MANAGER_HOST + "/kjy/manager/flip/word/switchStatus";
public static final String MANAGER_wordDetail = MANAGER_HOST + "/kjy/manager/flip/word/detail";
public static final String MOBILE_status = MOBILE_HOST + "/kjy/live/flip/word/status";
public static final String MOBILE_wordConf= MOBILE_HOST + "/kjy/live/flip/word/conf";
public static final String MOBILE_checkIn= MOBILE_HOST + "/kjy/live/flip/word/checkIn";
public static final String MOBILE_history= MOBILE_HOST + "/kjy/live/flip/word/user/history";
public static final String MOBILE_finishStatus= MOBILE_HOST + "/kjy/live/flip/word/user/finishStatus";
public static final String MOBILE_redOpen= MOBILE_HOST + "/kjy/live/flip/word/red/open";
public static final String MOBILE_redOpenState= MOBILE_HOST + "/kjy/live/flip/word/red/open/state";
public static final String MOBILE_abort= MOBILE_HOST + "/kjy/live/flip/word/red/abort";
public static final String MOBILE_appointment= MOBILE_HOST + "/kjy/live/user/appointment";
public static final String MOBILE_tasks= MOBILE_HOST + "/kjy/live/flip/word/user/tasks";
public static final String MOBILE_record= MOBILE_HOST + "/kjy/live/flip/word/user/record";
public static final String MOBILE_turn= MOBILE_HOST + "/kjy/live/flip/word/turn";
public static final String MOBILE_turnState= MOBILE_HOST + "/kjy/live/flip/word/turn/state";
// *************** 直播间过渡视频 ***************
public static final String MANAGER_confCaveOrUpdate = MANAGER_HOST + "/kjy/manager/live/trans/video/conf/saveOrUpdate";
public static final String MANAGER_videoSwitch = MANAGER_HOST + "/kjy/manager/live/trans/video/conf/status/switch";
......@@ -216,6 +223,10 @@ public class BasicConfig {
public static final String MOBILE_open= MOBILE_HOST + "/clue/guess/number/red/open";
public static final String MOBILE_result = MOBILE_HOST + "/clue/guess/number/red/result";
public static final String MANAGER_encode = MANAGER_HOST + "/kjy/manager/testUser/encode";
// *************** 宝箱裂变 ***************
public static final String MANAGER_getList4Admin = MANAGER_HOST + "/kjy/manager/welfare/pre/conf/getList4Admin";
public static final String MANAGER_saveTreasureConf = MANAGER_HOST + "/kjy/manager/live/treasure/saveTreasureConf";
......@@ -290,7 +301,7 @@ public class BasicConfig {
public static final String ANCHOR_status = MOBILE_HOST + "/conf/live/lottery/status";
public static final String ANCHOR_end = MOBILE_HOST + "/conf/live/lottery/end";
public static final String ANCHOR_luckDetail = MOBILE_HOST + "/clue/lottery/task/luckDetail";
public static final String ANCHOR_inviteDrawDetail = MOBILE_HOST + "/clue/lottery/task/inviteDrawDetail";
public static final String ANCHOR_getRed = MOBILE_HOST + "/kjy/live/fortune/sharer/getRed";
// *************** 访客端 ***************
public static final String USER_SUBSCRIBE = MOBILE_HOST + "/kjy/live/user/appointment/subscribe";
......
src/test/wechatTestNG.xml
View file @ ee1ba3cb
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="集客助手" verbose="1" thread-count="3">
<!-- <test preserve-order="true" name="首页" >-->
<!-- <classes>-->
<!-- <class name="com.kjj.qa.cases.Home"/>-->
<!-- </classes>-->
<!-- </test>-->
<!-- <test preserve-order="true" name="新手任务">-->
<!-- <classes>-->
<!-- <class name="com.kjj.qa.cases.Novice"/>-->
<!-- </classes>-->
<!-- </test>-->
<test preserve-order="true" name="支付">
<classes>
<class name="com.kjj.cases.basics.Pay"/>
......@@ -43,12 +34,12 @@
</test>
<test preserve-order="true" name="我的名片">
<classes>
<class name="com.kjj.cases.basics.card.PersonCard"/>
<class name="com.kjj.cases.assistant.card.PersonCard"/>
</classes>
</test>
<test preserve-order="true" name="文章中个人名片">
<classes>
<class name="com.kjj.cases.basics.card.ArticalPersonCard"/>
<class name="com.kjj.cases.assistant.card.ArticalPersonCard"/>
</classes>
</test>
<test preserve-order="true" name = "种草素材">
......
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