Skip to content

O
oto
Commit 1a3a8155 authored by 郭姣's avatar 郭姣
Browse files
Options

Merge branch 'master' into gifeature/2021071102 

# Conflicts:
#	src/test/java/com/kjj/config/BasicConfig.java
#	src/test/wechatTestNG.xml
parents 683d053d 0ef38ccb
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1389 additions and 290 deletions
src/test/java/com/kjj/cases/assistant/DailyPaper.java 0 → 100644
View file @ 1a3a8155
This diff is collapsed.
src/test/java/com/kjj/cases/basics/card/ArticalPersonCard.java → src/test/java/com/kjj/cases/assistant/card/ArticalPersonCard.java
View file @ 1a3a8155
package com.kjj.cases.basics.card; package com.kjj.cases.assistant.card;
import static com.kjj.config.BasicConfig.*; import static com.kjj.config.BasicConfig.*;
import static com.kjj.utils.ThreadSleepUtils.sleep; 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 @ 1a3a8155
package com.kjj.cases.basics.card; package com.kjj.cases.assistant.card;
import com.kjj.bean.card.GoodMajor; import com.kjj.bean.card.GoodMajor;
import com.kjj.bean.card.WechatCard; import com.kjj.bean.card.WechatCard;
......
src/test/java/com/kjj/cases/assistant/whoSawMe/WhoSawMe.java 0 → 100644
View file @ 1a3a8155
This diff is collapsed.
src/test/java/com/kjj/cases/live/agent/Customer.java
View file @ 1a3a8155
...@@ -78,7 +78,7 @@ public class Customer implements Authorization { ...@@ -78,7 +78,7 @@ public class Customer implements Authorization {
int customerNum=response.jsonPath().getInt("data.customerNum"); int customerNum=response.jsonPath().getInt("data.customerNum");
Assert.assertTrue(customerNum>26, network.message(BasicConfig.MOBILE_count, "总客户数量不对", response.body().asString())); Assert.assertTrue(customerNum>26, network.message(BasicConfig.MOBILE_count, "总客户数量不对", response.body().asString()));
int lastOneNewNum = response.jsonPath().getJsonObject("data.lastOneNewNum"); 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 @ 1a3a8155
...@@ -1408,24 +1408,23 @@ public class SaveLive implements Authorization { ...@@ -1408,24 +1408,23 @@ public class SaveLive implements Authorization {
} }
/** /**
* 翻牌活动配置 * 翻牌集字活动配置
*/ */
// @Test(description = "保存翻牌配置", priority = 69) // @Test(description = "保存翻牌配置", priority = 69)
// public void 保存翻牌配置() { // public void 保存翻牌配置() {
// Map<String, Object> Params = new HashMap<>(); // Map<String, Object> Params = new HashMap<>();
// Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey())); // Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
// Params.put("withdrawalAmount", 100); // Params.put("showAmount", 100);
// Params.put("withdrawalCondition", 1); // Params.put("personalShowAmount",1);
// Params.put("withdrawalNum", 1); // Params.put("inviteNum",1);
// Params.put("invitePresentNum", 1); // Params.put("invitePresentNum",1);
// Params.put("initPresentNum", 10); // Params.put("amount", 1);
// Params.put("imgUrl", "https://yun.dui88.com/kjy/image/20210608/1623132676884.jpg"); // Params.put("num", 1);
// Params.put("secondImgUrl", "https://yun.dui88.com/kjy/image/20210608/1623132676884.jpg"); // Response response = network.postResponse(Params, BasicConfig.MANAGER_flipWord);
// Response response = network.postResponse(Params, BasicConfig.MANAGER_card);
// boolean data = response.jsonPath().getBoolean("data"); // boolean data = response.jsonPath().getBoolean("data");
// System.out.println(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 { ...@@ -1433,10 +1432,10 @@ public class SaveLive implements Authorization {
// public void 查看直播翻牌配置详情() { // public void 查看直播翻牌配置详情() {
// Map<String, Object> Params = new HashMap<>(); // Map<String, Object> Params = new HashMap<>();
// Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey())); // 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"); // Object data = response.jsonPath().getJsonObject("data");
// System.out.println(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 { ...@@ -1446,10 +1445,10 @@ public class SaveLive implements Authorization {
// Map<String, Object> Params = new HashMap<>(); // Map<String, Object> Params = new HashMap<>();
// Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey())); // Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
// Params.put("confStatus", 1); // 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"); // boolean data = response.jsonPath().getBoolean("data");
// System.out.println(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 { ...@@ -1458,13 +1457,13 @@ public class SaveLive implements Authorization {
// Map<String, Object> Params = new HashMap<>(); // Map<String, Object> Params = new HashMap<>();
// Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey())); // Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
// Response response = network.getResponse(Params, BasicConfig.MANAGER_getConfDetail); // Response response = network.getResponse(Params, BasicConfig.MANAGER_getConfDetail);
// boolean cardConfBuildStatus = response.jsonPath().getBoolean("data.cardConfBuildStatus"); // boolean flipWordConfBuildStatus = response.jsonPath().getBoolean("data.flipWordConfBuildStatus");
// System.out.println(cardConfBuildStatus); // System.out.println(flipWordConfBuildStatus);
// Assert.assertTrue(cardConfBuildStatus, network.message(Params, BasicConfig.MANAGER_getConfDetail, "未配置翻牌", response.body().asString())); // Assert.assertTrue(flipWordConfBuildStatus, network.message(Params, BasicConfig.MANAGER_getConfDetail, "未配置翻牌", response.body().asString()));
// //
// boolean cardConfStatus = response.jsonPath().getBoolean("data.cardConfStatus"); // boolean flipWordConfStatus = response.jsonPath().getBoolean("data.flipWordConfStatus");
// System.out.println(cardConfStatus); // System.out.println(flipWordConfStatus);
// Assert.assertTrue(cardConfStatus, network.message(Params, BasicConfig.MANAGER_getConfDetail, "未开启翻牌", response.body().asString())); // Assert.assertTrue(flipWordConfStatus, network.message(Params, BasicConfig.MANAGER_getConfDetail, "未开启翻牌", response.body().asString()));
// //
// //
// } // }
...@@ -1749,6 +1748,7 @@ public class SaveLive implements Authorization { ...@@ -1749,6 +1748,7 @@ public class SaveLive implements Authorization {
Assert.assertTrue(data, network.message(Params, BasicConfig.MANAGER_redSwitchStatus, "开启攒现金红包配置失败", response.body().asString())); Assert.assertTrue(data, network.message(Params, BasicConfig.MANAGER_redSwitchStatus, "开启攒现金红包配置失败", response.body().asString()));
} }
/** /**
* 闯关答题 * 闯关答题
*/ */
...@@ -2012,11 +2012,27 @@ public class SaveLive implements Authorization { ...@@ -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 直播预告页弹窗配置() { public void 直播预告页弹窗配置() {
Map<String, Object> Params = new HashMap<>(); Map<String, Object> Params = new HashMap<>();
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey())); Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
...@@ -2031,7 +2047,7 @@ public class SaveLive implements Authorization { ...@@ -2031,7 +2047,7 @@ public class SaveLive implements Authorization {
} }
@Test(description = "预告页弹窗详情", priority = 109) @Test(description = "预告页弹窗详情", priority = 110)
public void 预告页弹窗详情() { public void 预告页弹窗详情() {
Map<String, Object> Params = new HashMap<>(); Map<String, Object> Params = new HashMap<>();
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey())); Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
...@@ -2042,7 +2058,7 @@ public class SaveLive implements Authorization { ...@@ -2042,7 +2058,7 @@ public class SaveLive implements Authorization {
} }
@Test(description = "开启预告页弹窗", priority = 110) @Test(description = "开启预告页弹窗", priority = 111)
public void 开启预告页弹窗() { public void 开启预告页弹窗() {
Map<String, Object> Params = new HashMap<>(); Map<String, Object> Params = new HashMap<>();
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey())); Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
...@@ -2054,7 +2070,25 @@ public class SaveLive implements Authorization { ...@@ -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/wechatTestNG.xml
View file @ 1a3a8155
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="集客助手" verbose="1" thread-count="3"> <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="支付"> <test preserve-order="true" name="支付">
<classes> <classes>
<class name="com.kjj.cases.basics.Pay"/> <class name="com.kjj.cases.basics.Pay"/>
...@@ -43,12 +34,12 @@ ...@@ -43,12 +34,12 @@
</test> </test>
<test preserve-order="true" name="我的名片"> <test preserve-order="true" name="我的名片">
<classes> <classes>
<class name="com.kjj.cases.basics.card.PersonCard"/> <class name="com.kjj.cases.assistant.card.PersonCard"/>
</classes> </classes>
</test> </test>
<test preserve-order="true" name="文章中个人名片"> <test preserve-order="true" name="文章中个人名片">
<classes> <classes>
<class name="com.kjj.cases.basics.card.ArticalPersonCard"/> <class name="com.kjj.cases.assistant.card.ArticalPersonCard"/>
</classes> </classes>
</test> </test>
<test preserve-order="true" name = "种草素材"> <test preserve-order="true" name = "种草素材">
...@@ -56,6 +47,11 @@ ...@@ -56,6 +47,11 @@
<class name="com.kjj.cases.assistant.RecommendMaterial"/> <class name="com.kjj.cases.assistant.RecommendMaterial"/>
</classes> </classes>
</test> </test>
<test preserve-order="true" name = "今日早报">
<classes>
<class name="com.kjj.cases.assistant.DailyPaper"/>
</classes>
</test>
<test preserve-order="true" name = "首页"> <test preserve-order="true" name = "首页">
<classes> <classes>
<class name="com.kjj.cases.assistant.homePage"/> <class name="com.kjj.cases.assistant.homePage"/>
......
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