Commit 227640f7 authored by 张艳玲's avatar 张艳玲

update

parent 769cf56c
......@@ -8,12 +8,12 @@ public class AgentVideo {
private int pageIndex;
private int pageSize;
private String totalCount;
private List<videolist> list;
private List<videoList> list;
private boolean hasNext;
private String totalPage;
@Data
public static class videolist{
public static class videoList{
private String id;
private String videoTitle;
private String videoTag;
......
package com.kjj.bean.manager;
import lombok.Data;
@Data
public class VideoBean {
private Integer id;
}
......@@ -90,7 +90,7 @@ public interface AdminAuthorization {
}
/**
* 访客I(熊大)授权 ID:946
* 访客I(熊大)授权 ID:1239
*/
default void visitorAuth8() {
network.agentCookies.put("authKey", VISITORKEY8);
......
......@@ -19,19 +19,13 @@ public class LiveLater implements AdminAuthorization {
public void setUp() {
agentAuth(); }
public String pageSize;
public String invitationNum;
public String allNum;
public String moreThan20MinNum;
public String sellerName;
public String phoneNumber;
public String jobNumber;
public String teamName;
//直播结束我的客户页面
// 获取直播结束我的客户页面全部tab;
@Test(description="获取直播结束我的客户页面全部tab数据",priority = 1)
public void 获取直播结束我的客户页面全部tab数据() throws IOException {
public void 获取直播结束我的客户页面全部tab数据() {
Map<String, Object> params = new HashMap<String, Object>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("pageIndex",1);
......@@ -44,7 +38,7 @@ public class LiveLater implements AdminAuthorization {
// 获取直播结束我的客户页面直接邀请tab;
@Test(description="获取直播结束我的客户页面直接邀请tab数据",priority = 2)
public void 获取直播结束我的客户页面直接邀请tab数据() throws IOException {
public void 获取直播结束我的客户页面直接邀请tab数据() {
Map<String, Object> params = new HashMap<String, Object>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("pageIndex",1);
......@@ -58,7 +52,7 @@ public class LiveLater implements AdminAuthorization {
// 获取直播结束我的客户页面转介绍tab;
@Test(description="获取直播结束我的客户页面转介绍tab数据",priority = 3)
public void 获取直播结束我的客户页面转介绍tab数据() throws IOException {
public void 获取直播结束我的客户页面转介绍tab数据() {
Map<String, Object> params = new HashMap<String, Object>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("pageIndex",1);
......@@ -72,7 +66,7 @@ public class LiveLater implements AdminAuthorization {
// 获取直播结束我的客户页面中奖tab;
@Test(description="获取直播结束我的客户页面中奖tab数据",priority = 4)
public void 获取直播结束我的客户页面中奖tab数据() throws IOException {
public void 获取直播结束我的客户页面中奖tab数据() {
Map<String, Object> params = new HashMap<String, Object>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("pageIndex",1);
......@@ -86,7 +80,7 @@ public class LiveLater implements AdminAuthorization {
// 获取直播结束我的客户页面报名tab;
@Test(description="获取直播结束我的客户页面报名tab数据",priority = 5)
public void 获取直播结束我的客户页面报名tab数据() throws IOException {
public void 获取直播结束我的客户页面报名tab数据() {
Map<String, Object> params = new HashMap<String, Object>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("pageIndex",1);
......@@ -100,7 +94,7 @@ public class LiveLater implements AdminAuthorization {
// 获取直播结束我的客户页面观看20分钟+tab;
@Test(description="获取直播结束我的客户页面观看20分钟+tab数据",priority = 6)
public void 获取直播结束我的客户页面观看20分钟以上tab数据() throws IOException {
public void 获取直播结束我的客户页面观看20分钟以上tab数据() {
Map<String, Object> params = new HashMap<String, Object>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("pageIndex",1);
......@@ -115,7 +109,7 @@ public class LiveLater implements AdminAuthorization {
//直播结束后中奖名单查询
// 获取直播结束中奖名单;
@Test(description="获取直播结束中奖名单",priority = 7)
public void 获取直播结束中奖名单() throws IOException {
public void 获取直播结束中奖名单() {
Map<String, Object> params = new HashMap<String, Object>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("pageIndex",1);
......
package com.kjj.cases.live.agent;
import com.alibaba.fastjson.JSON;
import com.kjj.bean.agent.AgentBean;
import com.kjj.bean.agent.AgentCard;
import com.kjj.bean.agent.AgentEndList;
import com.kjj.cases.live.admin.AdminAuthorization;
import com.kjj.config.BasicConfig;
import com.kjj.utils.JsonUtil;
import io.restassured.response.Response;
import org.apache.commons.lang3.RandomUtils;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/*代理人端*/
public class Procurator implements AdminAuthorization {
@BeforeClass
public void setUp() {
agentAuth();
}
/*代理人首页直播列表*/
@Test(description = "代理人首页 ", priority = 1)
public void 代理人直播列表() {
Map<String, Object> params = new HashMap<>();
params.put("pageIndex", 1);
params.put("pageSize", 10);
Response response = network.getResponse(params, BasicConfig.MOBILE_Procurator);
List<AgentBean> agentBeans = JsonUtil.parseResponseToPageBean(response, AgentBean.class);
if (agentBeans.size() > 0) {
AgentBean bean = agentBeans.get(0);
System.out.println(JSON.toJSONString(agentBeans));
Assert.assertNotNull(bean, network.message(params, BasicConfig.MOBILE_Procurator, "查询直播列表失败", response.body().asString()));
}
}
/*代理人首页已结束的直播列表*/
@Test(description = "代理人首页已结束的直播列表", priority = 2)
public void 代理人直播结束列表() {
Map<String, Object> params = new HashMap<>();
params.put("pageIndex", 1);
params.put("pageSize", 10);
Response response = network.getResponse(params, BasicConfig.MOBILE_AgentEndList);
List<AgentEndList> agentBeans = JsonUtil.parseResponseToPageBean(response, AgentEndList.class);
if (agentBeans.size() > 0) {
AgentEndList bean = agentBeans.get(0);
System.out.println(JSON.toJSONString(agentBeans));
Assert.assertNotNull(bean, network.message(params, BasicConfig.MOBILE_AgentEndList, "查询直播结束列表失败", response.body().asString()));
}
}
/*代理人信息*/
@Test(description = "代理人信息", priority = 3)
public void 代理人名片信息() {
Map<String, Object> params = new HashMap<>();
Response response = network.getResponse(params, BasicConfig.MOBILE_AgentCardInfo);
AgentCard agentBeans = JsonUtil.parseResponseToBean(response, AgentCard.class);
System.out.println(JSON.toJSONString(agentBeans));
Assert.assertNotNull(agentBeans, network.message(params, BasicConfig.MOBILE_AgentCardInfo, "查询代理人信息失败", response.body().asString()));
}
/*代理人信息*/
@Test(description = "代理人修改信息", priority = 4)
public void 编辑代理人信息() {
Map<String, Object> params = new HashMap<>();
params.put("sellerName", "小智"+ RandomUtils.nextInt(1, 100));
params.put("phoneNumber", "152588101691");
params.put("jobNumber", "技术");
params.put("wechatQrCode", "//yun.dui88.com/kjy/nc/qrcode1/1981ec88d22fe37041feac4724c627670817.png");
Response response = network.postResponse(params, BasicConfig.MOBILE_AgentEditCardInfo);
Boolean agentBeans = JsonUtil.parseResponseToBean(response, Boolean.class);
System.out.println(JSON.toJSONString(agentBeans));
Assert.assertNotNull(agentBeans, network.message(params, BasicConfig.MOBILE_AgentEditCardInfo, "修改代理人信息失败", response.body().asString()));
}
}
......@@ -24,7 +24,7 @@ public class Share implements AdminAuthorization {
Map<String, Object> Params = new HashMap<>();
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
Params.put("mpShareUrl", "//yun.dui88.com/kjy/image/20210526/1622022856685.jpeg");
Params.put("mpShareTitle", "{{welfareName}}」常规分享文案{{name}}");
Params.put("mpShareTitle", "{{welfareName}}」常规分享文案{{name}}");
Params.put("shareType", 1);
Response response = network.postResponse(Params, BasicConfig.MANAGER_saveOrUpdateMpShare);
boolean data =response.jsonPath().getBoolean("data");
......
package com.kjj.cases.live.liveConfig;
import com.kjj.bean.manager.VideoBean;
import com.kjj.cases.live.admin.AdminAuthorization;
import com.kjj.config.BasicConfig;
import com.kjj.utils.BaseUtils;
import com.kjj.utils.JsonUtil;
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.List;
import java.util.Map;
public class Video implements AdminAuthorization {
@BeforeClass
public void setUp() { BaseUtils.ssoLogin(); }
/**
* 精彩视频
*/
public List<VideoBean> VideoId;
@Test(description="新增视频",priority = 1)
public void 新增视频() {
BaseUtils.ssoLogin();
Map<String, Object> params = new HashMap<>();
params.put("companyId",101);
params.put("videoUrl","//yun.dui88.com/kjy/media/file/20210414/b3fc43806a190d56ca4ba57a9a1fef8e.mp4");
params.put("videoTitle","精彩视频");
params.put("videoFirstImg", "//yun.dui88.com/kjy/image/20210414/1618384473776.jpg");
params.put("shareImageUrl", "//yun.dui88.com/kjy/image/20210414/1618384473776.jpg");
params.put("videoScreen",1);
Response response = network.postResponse(params,BasicConfig.MANAGER_SaveOrUpdate);
boolean data = response.jsonPath().getBoolean("data");
System.out.println(data);
Assert.assertTrue(data, network.message(params, BasicConfig.MANAGER_SaveOrUpdate, "新增视频失败", response.body().asString()));
}
@Test(description="获取视频列表",priority = 2)
public void 获取视频列表() {
BaseUtils.ssoLogin();
Map<String, Object> params = new HashMap<>();
params.put("companyId",101);
params.put("pageIndex",1);
params.put("pageSize",10);
Response response = network.getResponse(params,BasicConfig.MANAGER_CompanyVideoList);
List <VideoBean> list = JsonUtil.parseResponseToPageBean(response,VideoBean.class);
this.VideoId=list;
System.out.println(list);
Assert.assertNotNull(list, network.message(params, BasicConfig.MANAGER_CompanyVideoList, "获取视频列表失败", response.body().asString()));
}
//置顶视频
@Test(description="置顶视频",priority = 3)
public void 置顶视频() {
BaseUtils.ssoLogin();
Map<String, Object> params = new HashMap<>();
params.put("id",this.VideoId.get(0).getId());
Response response = network.postResponse(params,BasicConfig.MANAGER_CompanyVideoTop);
boolean data = response.jsonPath().getBoolean("data");
System.out.println(data);
Assert.assertTrue(data, network.message(params, BasicConfig.MANAGER_CompanyVideoTop, "置顶视频失败", response.body().asString()));
}
//取消置顶视频
@Test(description="取消置顶视频",priority = 4)
public void 取消置顶视频() {
BaseUtils.ssoLogin();
Map<String, Object> params = new HashMap<>();
params.put("id",this.VideoId.get(0).getId());
Response response = network.postResponse(params,BasicConfig.MANAGER_CompanyVideoCancelTopt);
boolean success = response.jsonPath().getBoolean("success");
System.out.println(success);
Assert.assertTrue(success, network.message(params, BasicConfig.MANAGER_CompanyVideoCancelTopt, "取消置顶视频失败", response.body().asString()));
}
//上移视频
@Test(description="上移视频",priority = 5)
public void 上移视频() {
BaseUtils.ssoLogin();
Map<String, Object> params = new HashMap<>();
params.put("id",this.VideoId.get(0).getId());
Response response = network.postResponse(params,BasicConfig.MANAGER_CompanyVideoUp);
boolean success = response.jsonPath().getBoolean("success");
System.out.println(success);
Assert.assertTrue(success, network.message(params, BasicConfig.MANAGER_CompanyVideoUp, "上移视频失败", response.body().asString()));
}
//下移视频
@Test(description="下移视频",priority = 6)
public void 下移视频() {
BaseUtils.ssoLogin();
Map<String, Object> params = new HashMap<>();
params.put("id",this.VideoId.get(0).getId());
Response response = network.postResponse(params,BasicConfig.MANAGER_CompanyVideoDown);
boolean success = response.jsonPath().getBoolean("success");
System.out.println(success);
Assert.assertTrue(success, network.message(params, BasicConfig.MANAGER_CompanyVideoDown, "下移视频失败", response.body().asString()));
}
//删除视频
@Test(description="删除视频",priority = 7)
public void 删除视频() {
BaseUtils.ssoLogin();
Map<String, Object> params = new HashMap<>();
params.put("id",this.VideoId.get(0).getId());
Response response = network.postResponse(params,BasicConfig.MANAGER_CompanyVideoDelete);
boolean success = response.jsonPath().getBoolean("success");
System.out.println(success);
Assert.assertTrue(success, network.message(params, BasicConfig.MANAGER_CompanyVideoDelete, "删除视频失败", response.body().asString()));
}
}
......@@ -31,7 +31,7 @@ public class BasicConfig {
//直播访客 (熊二)ID:719
public static String VISITORKEY7 ="LEH7epeHVDJWzhZ6DiexTHnfZVkhkqorGGQahRL1y3zwSbNpp1aULAhVJCfFh6cujPTXfQ99d2qDCrKPgSvwrQ6diTkZR";
//直播访客 (熊大)ID:946
public static String VISITORKEY8 ="LEH7epeHVDJWzhZ6DiexTHnfZVkhkqorGGQahRpVDVGzx7dWtF6qSrZH5EJcyPAQVSdjBa8ioSjRfJzdwoh73PR5jksrE";
public static String VISITORKEY8 ="2Tsc8MwHZmXJKPfze38rXm37UEbpakoFFxPjXnhCqixY2dghFrfLxdsKoqHrPNabbQxNUSStUGGBirKk993ogwuBZqKgm9C";
//直播访客 (日落)ID:703
public static String VISITORKEY10 ="LEH7epeHVDJWzhZ6DiexTHnsaP1qQoaA7tAWpG56Y1NNQvM7gfDV7k263cKpHrAnmSrXY1MMhficzJT8UftKVVeobhNQH";
//直播访客 (小四)ID:108
......@@ -107,6 +107,10 @@ public class BasicConfig {
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_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";
public static final String MANAGER_videoDetail = MANAGER_HOST + "/kjy/manager/live/trans/video/conf/detail";
// *************** 猜数字红包 ***************
public static final String MANAGER_getSurplusAmount = MANAGER_HOST + "/kjy/manager/red/conf/getSurplusAmount";
......@@ -128,10 +132,6 @@ public class BasicConfig {
public static final String MOBILE_guess = MOBILE_HOST + "/clue/guess/number/red/guess";
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 MOBILE_ = MOBILE_HOST + "";
// public static final String MOBILE_ = MOBILE_HOST + "";
// public static final String MOBILE_ = MOBILE_HOST + "";
// *************** 宝箱裂变 ***************
public static final String MANAGER_getList4Admin = MANAGER_HOST + "/kjy/manager/welfare/pre/conf/getList4Admin";
......@@ -270,6 +270,28 @@ public class BasicConfig {
public static final String MOBILE_VideoWatch = MOBILE_HOST + "/kjy/live/company/video/watch";
public static final String MOBILE_VideoLike = MOBILE_HOST + "/kjy/live/company/video/like";
public static final String MOBILE_LiveGuideList = MOBILE_HOST + "/kjy/live/guide/list";
public static final String MOBILE_userInfo1 = MOBILE_HOST + "/kjy/live/userInfo";
public static final String MOBILE_isForbidden = MOBILE_HOST + "/kjy/live/share/isForbidden";
public static final String MOBILE_wxIdAllList = MOBILE_HOST1 + "/kjy/mp/msg/config/live/user/wxIdAllList";
public static final String MOBILE_listDetail = MOBILE_HOST + "/kjy/live/guide/list/detail";
public static final String MOBILE_feedbackSave = MOBILE_HOST + "/kjy/live/user/feedback/save";
public static final String MOBILE_agentInfo = MOBILE_HOST + "/kjy/live/share/help/agent/info";
//排行榜
public static final String MOBILE_allRewardList = MOBILE_HOST + "/kjy/live/reward/allRewardList";
public static final String MOBILE_companyTotalData = MOBILE_HOST + "/kjy/live/team/companyTotalData";
public static final String MOBILE_ownTeamCharts = MOBILE_HOST + "/kjy/live/team/ownTeamCharts";
public static final String MOBILE_ownChartsInTeam = MOBILE_HOST + "/kjy/live/agent/ownChartsInTeam";
public static final String MANAGER_CompanyVideoList = MANAGER_HOST + "/kjy/manager/live/company/video/list";
public static final String MANAGER_SaveOrUpdate = MANAGER_HOST + "/kjy/manager/live/company/video/saveOrUpdate";
public static final String MANAGER_CompanyVideoTop = MANAGER_HOST + "/kjy/manager/live/company/video/top";
public static final String MANAGER_CompanyVideoCancelTopt = MANAGER_HOST + "/kjy/manager/live/company/video/cancelTop";
public static final String MANAGER_CompanyVideoUp = MANAGER_HOST + "/kjy/manager/live/company/video/up";
public static final String MANAGER_CompanyVideoDown = MANAGER_HOST + "/kjy/manager/live/company/video/down";
public static final String MANAGER_CompanyVideoDelete = MANAGER_HOST + "/kjy/manager/live/company/video/delete";
//查询资料列表//
public static final String MOBILE_Resource = MOBILE_HOST + "/clue/resource/list";
......@@ -286,7 +308,7 @@ public class BasicConfig {
public static final String MOBILE_ResourceTestDetail = MOBILE_HOST + "/clue/resource/test/detail";
public static final String MOBILE_ResourceTestParticipate = MOBILE_HOST + "/clue/resource/test/participate";
public static final String MOBILE_ResourceTestSubmit = MOBILE_HOST + "/clue/resource/test/submit";
public static final String MOBILE_GetAgentPosterInfo = MOBILE_HOST + "/kjy/live/share/getAgentPosterInfo";
public static final String MOBILE_GetAgentPosterV2 = MOBILE_HOST + "/kjy/live/share/getAgentPosterInfo/v2";
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_Token = MOBILE_HOST + "/clue/invitation/token";
......@@ -586,13 +608,6 @@ public class BasicConfig {
public static final String MANAGER_PROMOTIONCODELIST = MANAGER_HOST + "/kjy/manager/promotionCode/codeList";
public static final String MANAGER_PROMOTIONBATCHMODIFY = MANAGER_HOST + "/kjy/manager/promotionCode/batchModify";
public static final String MANAGER_PROMOTIONCODEBATCHDETAIL = MANAGER_HOST + "/kjy/manager/promotionCode/batchDetail";
public static final String MANAGER_CompanyVideoList = MANAGER_HOST + "/kjy/manager/live/company/video/list";
public static final String MANAGER_SaveOrUpdate = MANAGER_HOST + "/kjy/manager/live/company/video/saveOrUpdate";
public static final String MANAGER_CompanyVideoTop = MANAGER_HOST + "/kjy/manager/live/company/video/top";
public static final String MANAGER_CompanyVideoCancelTopt = MANAGER_HOST + "/kjy/manager/live/company/video/cancelTop";
public static final String MANAGER_CompanyVideoUp = MANAGER_HOST + "/kjy/manager/live/company/video/up";
public static final String MANAGER_CompanyVideoDown = MANAGER_HOST + "/kjy/manager/live/company/video/down";
public static final String MANAGER_CompanyVideoDelete = MANAGER_HOST + "/kjy/manager/live/company/video/delete";
}
......@@ -13,12 +13,24 @@
</classes>
</test>
<test preserve-order="true" name="精彩视频">
<classes>
<class name="com.kjj.cases.live.liveConfig.Video"/>
</classes>
</test>
<test preserve-order="true" name="创建直播">
<classes>
<class name="com.kjj.cases.live.liveConfig.SaveLive"/>
</classes>
</test>
<test preserve-order="true" name="代理人首页">
<classes>
<class name="com.kjj.cases.live.agent.Agent"/>
</classes>
</test>
<test preserve-order="true" name="小程序分享">
<classes>
<class name="com.kjj.cases.live.liveConfig.Share"/>
......@@ -37,11 +49,6 @@
</classes>
</test>
<test preserve-order="true" name="宝箱裂变">
<classes>
<class name="com.kjj.cases.live.treasure.Treasure"/>
</classes>
</test>
<test preserve-order="true" name="中奖规则配置">
<classes>
......@@ -49,12 +56,6 @@
</classes>
</test>
<test preserve-order="true" name="代理人首页">
<classes>
<class name="com.kjj.cases.live.agent.Procurator"/>
</classes>
</test>
<test preserve-order="true" name="指定中奖">
<classes>
......@@ -82,6 +83,12 @@
</classes>
</test>
<test preserve-order="true" name="宝箱裂变">
<classes>
<class name="com.kjj.cases.live.treasure.Treasure"/>
</classes>
</test>
<test preserve-order="true" name="直播中抽奖">
<classes>
<class name="com.kjj.cases.live.lottery.Lottery"/>
......@@ -105,11 +112,11 @@
<class name="com.kjj.cases.live.anchor.LiveVisitors"/>
</classes>
</test>
<test preserve-order="true" name="获取代理人排行榜及客户信息">
<classes>
<class name="com.kjj.cases.live.agent.LiveAgent"/>
</classes>
</test>
<!-- <test preserve-order="true" name="获取代理人排行榜及客户信息">-->
<!-- <classes>-->
<!-- <class name="com.kjj.cases.live.agent.LiveAgent"/>-->
<!-- </classes>-->
<!-- </test>-->
<test preserve-order="true" name="红包领取">
<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