Skip to content

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

Merge branch '2021072702-gxh' into 'master' 

2021072702 gxh

See merge request test-group/kejiji!82
parents 80696635 28aab9aa
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 879 additions and 99 deletions
src/test/java/com/kjj/bean/gift/Gift.java → src/test/java/com/kjj/bean/marketTools/Gift.java
View file @ 2accc348
package com.kjj.bean.gift;
package com.kjj.bean.marketTools;
import lombok.Data;
......
src/test/java/com/kjj/bean/marketTools/LotteryTable.java 0 → 100644
View file @ 2accc348
package com.kjj.bean.marketTools;
import lombok.Data;
@Data
public class LotteryTable {
private int id;
private String title;
private int status;
private int publicly;
}
src/test/java/com/kjj/bean/marketTools/PrizeDetail.java 0 → 100644
View file @ 2accc348
package com.kjj.bean.marketTools;
import lombok.Data;
import java.util.ArrayList;
@Data
public class PrizeDetail {
private int customPrizeRate;
private int customPrizeType;
private String activityCustomPrizeId;
private String prizeImg;
private String prizeName;
private int totalStock;
private ArrayList<String> winnerIds;
}
src/test/java/com/kjj/bean/marketTools/Visitor.java 0 → 100644
View file @ 2accc348
package com.kjj.bean.marketTools;
import lombok.Data;
@Data
public class Visitor {
private String avatar;
private String visitorId;
private String visitorNickname;
}
src/test/java/com/kjj/cases/admin/Authorization.java
View file @ 2accc348
......@@ -32,12 +32,23 @@ public interface Authorization {
}
// 获取访客tku
// 获取访客tku：Su Yi
default void userTku() {
AGENT_TKU = BaseUtils.createTku();
VISITOR_TKU = BaseUtils.getTku(VISITOR_USERID);
network.agentCookies.put("tku", VISITOR_TKU);
System.out.println("访客tku：" + VISITOR_TKU);
String tku = BaseUtils.getTku(VISITOR_USERID);
network.agentCookies.put("tku", tku);
System.out.println("访客tku：" + tku);
}
// 获取访客tku：请勿打扰
default void userTku1() {
network.agentCookies.put("tku", VISITOR1_TKU);
System.out.println("访客tku：" + VISITOR1_TKU);
}
// 获取访客tku：小雪人
default void userTku2() {
network.agentCookies.put("tku", VISITOR1_TKU);
System.out.println("访客tku：" + VISITOR1_TKU);
}
/**
......
src/test/java/com/kjj/cases/assistant/card/ArticalPersonCard.java
View file @ 2accc348
......@@ -271,8 +271,8 @@ public class ArticalPersonCard implements Authorization {
System.out.println(response.body().asString());
boolean success = response.jsonPath().getBoolean("success");
Object data = response.jsonPath().getJsonObject("success");
Assert.assertTrue(success, network.message(params,SELLERCARD_GETSELLERPROMOTEINFO,"获取专业解读列表有误",response.body().asString()));
Assert.assertNotNull(data, network.message(params,SELLERCARD_GETSELLERPROMOTEINFO,"获取专业解读列表有误",response.body().asString()));
Assert.assertTrue(success, network.message(params,SELLERCARD_GETSELLERPROMOTEINFO,"接口返回失败",response.body().asString()));
Assert.assertNotNull(data, network.message(params,SELLERCARD_GETSELLERPROMOTEINFO,"返回数据为空",response.body().asString()));
}
// 获取互动区-专业解读
......@@ -323,7 +323,4 @@ public class ArticalPersonCard implements Authorization {
String desc = response.jsonPath().getString("desc");
Assert.assertEquals(desc,"OK",network.message(params, CHECKUNREAD, "访客-获取私信有误",response.body().asString()));
}
}
src/test/java/com/kjj/cases/assistant/card/PersonCard.java
View file @ 2accc348
......@@ -235,11 +235,11 @@ public class PersonCard implements Authorization {
Map<String, Object> params = new HashMap<String, Object>();
params.put("page","seller_card");
params.put("timestamp",System.currentTimeMillis());
Response response = network.getResponse(params, GREETING_getTipsByPage);
Response response = network.getResponse(params, GETTIPSBYPAGE);
boolean success = response.jsonPath().getBoolean("success");
Object data = response.jsonPath().getJsonObject("data");
Assert.assertTrue(success,network.message(params, GREETING_getTipsByPage,"接口返回失败状态",response.body().asString()));
Assert.assertNotNull(data,network.message(params, GREETING_getTipsByPage,"返回数据为空",response.body().asString()));
Assert.assertTrue(success,network.message(params, GETTIPSBYPAGE,"接口返回失败状态",response.body().asString()));
Assert.assertNotNull(data,network.message(params, GETTIPSBYPAGE,"返回数据为空",response.body().asString()));
}
@Test(description = "获取客户投保案例模块", priority = 11) //priorty 方法执行优先级
......@@ -892,5 +892,4 @@ public class PersonCard implements Authorization {
Assert.assertEquals(guideType,0,network.message(SELLERCARD_CARDGUIDE ,"引导类型错误",response.body().asString()));
}
}
src/test/java/com/kjj/config/BasicConfig.java
View file @ 2accc348
......@@ -69,13 +69,13 @@ public class BasicConfig {
//***********************************************************************
// 基础线代理人 TKU，sid：2991
public static String AGENT_TKU = "T3gM31f18jCFEcfTyJdjfJAfSjDmKNMHfH7CvpLDC6UCLbai6Pc41VyJK3bXHe1wg7Hb5FGFZheeLvHjbE";
// 基础线访客 TKU
// 基础线访客 TKU---"请勿打扰"
public static String VISITOR_TKU = "T3gM31f18jCGvqvoyJRzyMTdpcPDJWUJJP4VQje7p9sfC4HKmj5NJfCUkxusAyFb5SpkWS31srDTYr6KtV";
// 基础线访客(小雪人) TKU
public static String VISITOR1_TKU = "T3gM31f18jCFXzk692pKjJCqJZdDv8Nb3htkzNk983cPMspUQD6pVEn2FNMefM2nieKPicXG9c1tDg8qtN";
// 访客的sids
public static final String sids = "Kj21MjMwNTU";
// 访客的userId(固定)
// 访客的userId(固定)--"Su Yi"
public static final int VISITOR_USERID = 4425;
// 客集云公众号的oaSourceId(固定)
public static final String OASOURCE_ID = "gh_3b9884c7b0ee";
......@@ -405,8 +405,6 @@ public class BasicConfig {
public static final String MOBILE_clueList = MOBILE_HOST + "/kjy/live/agent/clue/list";
public static final String MOBILE_livingClueStatistic = MOBILE_HOST + "/kjy/live/agent/clue/livingClueStatistic";
//排行榜
public static final String MOBILE_allRewardList = MOBILE_HOST + "/kjy/live/reward/allRewardList";
public static final String MOBILE_companyTotalData = MOBILE_HOST + "/kjy/live/team/companyTotalData";
......@@ -788,7 +786,7 @@ public class BasicConfig {
public static final String GREETING_confList = HOST + "/kjy/mp/greeting/conf/list";
public static final String GREETING_H5SHARE = ACTIVITY_HOST + "/kjy/mp/greeting/conf/h5share";
public static final String GREETING_H5INFO = ACTIVITY_HOST + "/kjy/mp/content/h5info";
public static final String GREETING_getTipsByPage = HOST + "/kjy/mp/tips/getTipsByPage";
public static final String GREETING_SAVEDEFAULT = ACTIVITY_HOST + "/kjy/mp/greeting/conf/saveDefault";
public static final String GREETING_getMarketingToolArea = HOST + "/kjy/mp/home/getMarketingToolArea";
public static final String GREETING_answerPageList = HOST + "/kjy/mp/game/answerPageList";
public static final String GREETING_getSellerVipInfo = HOST + "/kjy/mp/seller/getSellerVipInfo";
......@@ -821,6 +819,24 @@ public class BasicConfig {
public static final String GREETING_receiveDetail= HOST + "/kjy/mp/greeting/conf/detail";
public static final String GREETING_receiveList= HOST + "/kjy/mp/greeting/conf/receiveList";
//*********************抽奖转盘************************
public static final String LOTTERRY_templatePageList= HOST + "/kjy/mp/game/templatePageList";
public static final String LOTTERRY_check= HOST + "/kjy/mp/game/check";
public static final String LOTTERRY_getElements= ACTIVITY_HOST + "/kjy/mp/lottery/getElements";
public static final String LOTTERRY_getConfDetail= HOST + "/kjy/mp/game/getConfDetail";
public static final String LOTTERRY_customerList= HOST + "/kjy/mp/seller/customer/list";
public static final String LOTTERRY_addWinnersEn= HOST + "/kjy/mp/game/addWinnersEn";
public static final String LOTTERRY_saveOrUpdateConf= HOST + "/kjy/mp/game/saveOrUpdateConf";
public static final String LOTTERRY_getConf= HOST + "/kjy/mp/game/getConf";
public static final String LOTTERRY_getH5ShareInfo= HOST + "/kjy/mp/game/getH5ShareInfo";
public static final String LOTTERRY_gdoJoin= ACTIVITY_HOST + "/kjy/mp/lottery/doJoin";
public static final String LOTTERRY_getOrderStatus= ACTIVITY_HOST + "/kjy/mp/lottery/getOrderStatus";
public static final String LOTTERRY_getRecordById= ACTIVITY_HOST + "/kjy/mp/lottery/getRecordById";
public static final String LOTTERRY_commitWinnerInfo= ACTIVITY_HOST + "/kjy/mp/lottery/commitWinnerInfo";
public static final String LOTTERRY_getSellerCard= ACTIVITY_HOST + "/kjy/mp/lottery/getSellerCard";
public static final String LOTTERRY_confPageList= HOST + "/kjy/mp/game/confPageList";
public static final String LOTTERRY_getDrawRecord= HOST + "/kjy/mp/game/getDrawRecord";
public static final String LOTTERRY_getDrawWinningRecord= HOST + "/kjy/mp/game/getDrawWinningRecord";
// *************** 管理后台 ***************
public static final String SSO_doLogin = SSO_HOST + "/doLogin";
......@@ -837,4 +853,6 @@ public class BasicConfig {
public static final String MANAGER_removeMember = MANAGER_HOST + "/kjy/manager/sellerTeam/removeMember";
public static final String MANAGER_ID_ENCODE = MANAGER_HOST + "/kjy/manager/testUser/encode";
public static final String MANAGER_TKU_DECODE = MANAGER_HOST + "/kjy/manager/testUser/decryptTku";
public static final String MANAGER_searchTemplateList = MANAGER_HOST + "/kjy/manager/game/searchTemplateList";
public static final String MANAGER_getTemplateDetail = MANAGER_HOST + "/kjy/manager/game/getTemplateDetail";
}
src/test/wechatTestNG.xml
View file @ 2accc348
......@@ -49,10 +49,14 @@
</test>
<test preserve-order="true" name = "贺卡">
<classes>
<class name="com.kjj.cases.assistant.markettools.greetingCrad"/>
<class name="com.kjj.cases.assistant.markettools.GreetingCrad"/>
</classes>
</test>
<test preserve-order="true" name = "抽奖转盘">
<classes>
<class name="com.kjj.cases.assistant.markettools.GameLottery"/>
</classes>
</test>
</suite>
<!-- Suite -->
......
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