Commit fa19d1a8 authored by 张艳玲's avatar 张艳玲

update

parent dd82d44a
package com.kjj.cases.live;
import com.kjj.config.BasicConfig;
import com.kjj.constants.LiveConstants;
import io.restassured.response.Response;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import java.util.HashMap;
import java.util.Map;
public class DesignatedWinner implements AdminAuthorization{
@BeforeClass
public void setUp() {
agentAuth();
}
@Test(description = "查询指定中奖配置", priority = 1)
public void 查询指定中奖配置() {
Map<String, Object> awardConfParam = new HashMap<>();
awardConfParam.put("liveId",LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response awardConfRes = network.getResponse(awardConfParam, BasicConfig.MOBILE_AgentSpecifyAwardConf);
Object data = awardConfRes.jsonPath().getJsonObject("data");
System.out.println(data);
Assert.assertNotNull(data, network.message(awardConfParam, BasicConfig.MOBILE_AgentSpecifyAwardConf, "中奖配置查询失败", awardConfRes.body().asString()));
}
@Test(description = "代理人指定访客中奖表单提交", priority = 2)
public void 代理人指定访客中奖表单提交() {
Map<String, Object> SubmitParam = new HashMap<>();
SubmitParam.put("liveId",LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
SubmitParam.put("visitorId","Kj21NDE0NTU");
Response SubmitRes = network.getResponse(SubmitParam, BasicConfig.MOBILE_AgentSpecifyAwardConf);
Object data = SubmitRes.jsonPath().getJsonObject("data");
System.out.println(data);
Assert.assertNotNull(data, network.message(SubmitParam, BasicConfig.MOBILE_AgentSpecifyAwardConf, "代理人指定中奖失败", SubmitRes.body().asString()));
}
}
package com.kjj.cases.live; package com.kjj.cases.live;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.kjj.bean.VoteBean; import com.kjj.bean.VoteBean;
import com.kjj.bean.VoteListBean; import com.kjj.bean.VoteListBean;
import com.kjj.bean.WelfareBean; import com.kjj.bean.WelfareBean;
...@@ -8,7 +7,6 @@ import com.kjj.bean.WelfareListBean; ...@@ -8,7 +7,6 @@ import com.kjj.bean.WelfareListBean;
import com.kjj.config.BasicConfig; import com.kjj.config.BasicConfig;
import com.kjj.utils.BaseUtils; import com.kjj.utils.BaseUtils;
import com.kjj.utils.JsonUtil; import com.kjj.utils.JsonUtil;
import groovy.json.JsonBuilder;
import io.restassured.response.Response; import io.restassured.response.Response;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeClass;
......
...@@ -34,16 +34,15 @@ public class User implements AdminAuthorization{ ...@@ -34,16 +34,15 @@ public class User implements AdminAuthorization{
} }
//访客与代理人建立绑定关系
@Test(description = "邀请关系绑定", priority = 2) @Test(description = "邀请关系绑定", priority = 2)
public void 邀请关系绑定() { public void 邀请关系绑定() {
Map<String, Object> bindingParam = new HashMap<>(); Map<String, Object> bindingParam = new HashMap<>();
bindingParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey())); bindingParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
bindingParam.put("shareType", shareSign); bindingParam.put("shareType", shareSign);
Response bindingRes = network.postResponse(bindingParam, BasicConfig.MOBILE_BINDING); Response bindingRes = network.postResponse(bindingParam, BasicConfig.MOBILE_binding);
boolean success = bindingRes.jsonPath().getJsonObject("success"); boolean success = bindingRes.jsonPath().getJsonObject("success");
System.out.println(success); System.out.println(success);
Assert.assertTrue(success, network.message(bindingParam, BasicConfig.MOBILE_BINDING, "绑定失败", bindingRes.body().asString())); Assert.assertTrue(success, network.message(bindingParam, BasicConfig.MOBILE_binding, "绑定失败", bindingRes.body().asString()));
} }
...@@ -93,10 +92,10 @@ public class User implements AdminAuthorization{ ...@@ -93,10 +92,10 @@ public class User implements AdminAuthorization{
public void 保存海报获得抽奖码() { public void 保存海报获得抽奖码() {
Map<String, Object> savePosterParam = new HashMap<>(); Map<String, Object> savePosterParam = new HashMap<>();
savePosterParam.put("liveId",LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey())); savePosterParam.put("liveId",LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response savePosterRes = network.postResponse(savePosterParam, BasicConfig.USER_SAVEPOSTER); Response savePosterRes = network.postResponse(savePosterParam, BasicConfig.USER_savePoster);
boolean data = savePosterRes.jsonPath().getBoolean("data"); boolean data = savePosterRes.jsonPath().getBoolean("data");
System.out.println(data); System.out.println(data);
Assert.assertTrue(data, network.message(savePosterParam, BasicConfig.USER_SAVEPOSTER, "海报保存失败", savePosterRes.body().asString())); Assert.assertTrue(data, network.message(savePosterParam, BasicConfig.USER_savePoster, "海报保存失败", savePosterRes.body().asString()));
} }
...@@ -104,10 +103,10 @@ public class User implements AdminAuthorization{ ...@@ -104,10 +103,10 @@ public class User implements AdminAuthorization{
public void 我的抽奖码数量() { public void 我的抽奖码数量() {
Map<String, Object> myCountParam = new HashMap<>(); Map<String, Object> myCountParam = new HashMap<>();
myCountParam.put("liveId",LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey())); myCountParam.put("liveId",LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response myCountRes = network.getResponse(myCountParam, BasicConfig.USER_MYCOUNT); Response myCountRes = network.getResponse(myCountParam, BasicConfig.USER_myCount);
long data = myCountRes.jsonPath().getLong("data"); long data = myCountRes.jsonPath().getLong("data");
System.out.println(data); System.out.println(data);
Assert.assertNotNull(data, network.message(myCountParam, BasicConfig.USER_MYCOUNT, "获取抽奖码数量失败", myCountRes.body().asString())); Assert.assertNotNull(data, network.message(myCountParam, BasicConfig.USER_myCount, "获取抽奖码数量失败", myCountRes.body().asString()));
} }
......
...@@ -48,8 +48,8 @@ public class BasicConfig { ...@@ -48,8 +48,8 @@ public class BasicConfig {
public static final String USER_START = MOBILE_HOST + "/kjy/live/assist/lottery/start"; public static final String USER_START = MOBILE_HOST + "/kjy/live/assist/lottery/start";
public static final String USER_DRAW = MOBILE_HOST + "/kjy/live/user/lottery/draw"; public static final String USER_DRAW = MOBILE_HOST + "/kjy/live/user/lottery/draw";
public static final String USER_END = MOBILE_HOST + "/kjy/live/assist/lottery/end"; public static final String USER_END = MOBILE_HOST + "/kjy/live/assist/lottery/end";
public static final String USER_SAVEPOSTER = MOBILE_HOST + "/kjy/live/user/share/savePoster"; public static final String USER_savePoster = MOBILE_HOST + "/kjy/live/user/share/savePoster";
public static final String USER_MYCOUNT = MOBILE_HOST + "/kjy/live/user/lottery/myCount"; public static final String USER_myCount = MOBILE_HOST + "/kjy/live/user/lottery/myCount";
// *************** 直播管理端 *************** // *************** 直播管理端 ***************
public static final String MANAGER_SAVEANDUPDATE = MANAGER_HOST + "/kjy/manager/live/pre/conf/saveAndUpdate"; public static final String MANAGER_SAVEANDUPDATE = MANAGER_HOST + "/kjy/manager/live/pre/conf/saveAndUpdate";
...@@ -69,6 +69,7 @@ public class BasicConfig { ...@@ -69,6 +69,7 @@ public class BasicConfig {
public static final String MANAGER_ADD = MANAGER_HOST + "/kjy/manager/lottery/pre/conf/add"; public static final String MANAGER_ADD = MANAGER_HOST + "/kjy/manager/lottery/pre/conf/add";
public static final String MANAGER_ADD1 = MANAGER_HOST + "/kjy/manager/lottery/conf/add"; public static final String MANAGER_ADD1 = MANAGER_HOST + "/kjy/manager/lottery/conf/add";
public static final String MANAGER_SAVEORUPDATE7 = MANAGER_HOST + "/kjy/manager/welfare/pre/conf/saveOrUpdate"; public static final String MANAGER_SAVEORUPDATE7 = MANAGER_HOST + "/kjy/manager/welfare/pre/conf/saveOrUpdate";
public static final String MANAGER_getLiveAwardList = MANAGER_HOST + "/kjy/manager/specifyAward/pre/conf/getLiveAwardList";
// *************** 代理人 *************** // *************** 代理人 ***************
...@@ -85,7 +86,8 @@ public class BasicConfig { ...@@ -85,7 +86,8 @@ public class BasicConfig {
public static final String MOBILE_ClueList = MOBILE_HOST + "/kjy/live/agent/clue/list"; public static final String MOBILE_ClueList = MOBILE_HOST + "/kjy/live/agent/clue/list";
public static final String MOBILE_AGENTSPECIFYAWARDSUBMIN = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardSubmit"; public static final String MOBILE_AGENTSPECIFYAWARDSUBMIN = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardSubmit";
public static final String MOBILE_GETSHARESIGN = MOBILE_HOST + "/kjy/live/getShareSign"; public static final String MOBILE_GETSHARESIGN = MOBILE_HOST + "/kjy/live/getShareSign";
public static final String MOBILE_BINDING = MOBILE_HOST + "/clue/invitation/binding"; public static final String MOBILE_binding = MOBILE_HOST + "/clue/invitation/binding";
public static final String MOBILE_AgentSpecifyAwardConf = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardConf";
//***************直播素材***************** //***************直播素材*****************
public static final String MANAGER_SAVEORUPDATE6 = MANAGER_HOST+ "/kjy/manager/conf/base/welfare/saveOrUpdate"; public static final String MANAGER_SAVEORUPDATE6 = MANAGER_HOST+ "/kjy/manager/conf/base/welfare/saveOrUpdate";
......
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
</classes> </classes>
</test> </test>
<test preserve-order="true" name="助播-开启直播"> <test preserve-order="true" name="指定中奖">
<classes> <classes>
<class name="com.kjj.cases.live.OpenLive"/> <class name="com.kjj.cases.live.DesignatedWinner"/>
</classes> </classes>
</test> </test>
<test preserve-order="true" name="获取代理人排行榜及客户信息"> <test preserve-order="true" name="获取代理人排行榜及客户信息">
...@@ -36,6 +36,12 @@ ...@@ -36,6 +36,12 @@
<class name="com.kjj.cases.live.LiveAgent"/> <class name="com.kjj.cases.live.LiveAgent"/>
</classes> </classes>
</test> </test>
<test preserve-order="true" name="助播-开启直播">
<classes>
<class name="com.kjj.cases.live.OpenLive"/>
</classes>
</test>
<test preserve-order="true" name="助播-结束直播"> <test preserve-order="true" name="助播-结束直播">
<classes> <classes>
<class name="com.kjj.cases.live.CloseLive"/> <class name="com.kjj.cases.live.CloseLive"/>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<suite-files> <suite-files>
<suite-file path="liveTestNG.xml"></suite-file> <suite-file path="liveTestNG.xml"></suite-file>
<!-- <suite-file path="wechatTestNG.xml"></suite-file>--> <suite-file path="wechatTestNG.xml"></suite-file>
</suite-files> </suite-files>
<!-- 监听器--> <!-- 监听器-->
......
This diff is collapsed.
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