Skip to content

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

Merge branch 'feature/20210807-xmc' into 'master' 

Feature/20210807 xmc

See merge request test-group/kejiji!94
parents ba46b1cc b9db222b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 174 additions and 88 deletions
src/test/java/com/kjj/bean/whoSawMe/ClueStatistics.java 0 → 100644
View file @ a948910d
package com.kjj.bean.whoSawMe;
import lombok.Data;
@Data
public class ClueStatistics {
private int drawMaterial; //领取资料次数
private int drawPresentInsuranceCount; // 领取赠险次数
private int faqCount; // 查看FAQ次数
private int grassCount; // 阅读种草素材次数
private int riskTestCount; // 参与风险评测次数
private int visitCount; // 来访次数
}
src/test/java/com/kjj/cases/assistant/whoSawMe/MyForward.java
View file @ a948910d
......@@ -20,7 +20,6 @@ public class MyForward implements Authorization {
private Response response;
private Map<String, Object> param;
private String visitorEncodeUserId;
private ForwardAndRead far;
@BeforeClass
public void setUp() throws IOException {
......@@ -28,9 +27,8 @@ public class MyForward implements Authorization {
BaseUtils.ssoLogin();
visitor2Tku();
far = new ForwardAndRead();
// 关闭数据看板演示数据
far.closeDemoData();
ForwardAndRead.closeDemoData();
}
// 进入我的转发页面获取转发统计头部信息
......@@ -169,7 +167,7 @@ public class MyForward implements Authorization {
@Test(description = "文章详情_头部信息", priority = 9)
public void 文章详情_头部信息() throws IOException{
param = new HashMap<>();
param.put("scid", far.getContentScId(BasicConfig.ARTICLE_CONTENTID));
param.put("scid", ForwardAndRead.getContentScId(BasicConfig.ARTICLE_CONTENTID));
response = network.getResponse(param, BasicConfig.FORWARD_CONTENTHEADER);
Assert.assertTrue(response.jsonPath().getBoolean("success"), network.message(param, BasicConfig.FORWARD_CONTENTHEADER, "接口请求失败", response.body().asString()));
int clueNum = response.jsonPath().getInt("data.clueNum");
......@@ -184,14 +182,14 @@ public class MyForward implements Authorization {
@Test(description = "文章详情_全部访客记录", priority = 10)
public void 文章详情_全部访客记录() throws IOException{
param = new HashMap<>();
param.put("scid", far.getContentScId(BasicConfig.ARTICLE_CONTENTID));
param.put("scid", ForwardAndRead.getContentScId(BasicConfig.ARTICLE_CONTENTID));
param.put("pageSize", 20);
param.put("type", 1);
response = network.getResponse(param, BasicConfig.FORWARD_VISITRECORD);
Assert.assertTrue(response.jsonPath().getBoolean("success"), network.message(param, BasicConfig.FORWARD_VISITRECORD, "接口请求失败", response.body().asString()));
String visitorUserIdEncode = response.jsonPath().getString("data.list[0].userId");
// 获取访客加密的userId
visitorEncodeUserId = far.encodeId(far.decodeTku(VISITOR1_TKU).get("userId"));
visitorEncodeUserId = ForwardAndRead.encodeId(ForwardAndRead.decodeTku(VISITOR1_TKU).get("userId"));
Assert.assertEquals(visitorUserIdEncode, visitorEncodeUserId, network.message(param, BasicConfig.FORWARD_VISITRECORD, "转发素材访客记录中首条记录用户userId不正确", response.body().asString()));
}
......@@ -199,7 +197,7 @@ public class MyForward implements Authorization {
@Test(description = "文章详情_访客记录_留下线索", priority = 11)
public void 文章详情_访客记录_留下线索() throws IOException{
param = new HashMap<>();
param.put("scid", far.getContentScId(BasicConfig.ARTICLE_CONTENTID));
param.put("scid", ForwardAndRead.getContentScId(BasicConfig.ARTICLE_CONTENTID));
param.put("pageSize", 20);
param.put("type", 2);
response = network.getResponse(param, BasicConfig.FORWARD_VISITRECORD);
......@@ -215,7 +213,7 @@ public class MyForward implements Authorization {
@Test(description = "文章详情_访客记录_转发素材", priority = 12)
public void 文章详情_访客记录_转发素材() throws IOException{
param = new HashMap<>();
param.put("scid", far.getContentScId(BasicConfig.ARTICLE_CONTENTID));
param.put("scid", ForwardAndRead.getContentScId(BasicConfig.ARTICLE_CONTENTID));
param.put("pageSize", 20);
param.put("type", 3);
response = network.getResponse(param, BasicConfig.FORWARD_VISITRECORD);
......@@ -231,7 +229,7 @@ public class MyForward implements Authorization {
@Test(description = "文章详情_访客记录_多度人脉", priority = 13)
public void 文章详情_访客记录_多度人脉() throws IOException{
param = new HashMap<>();
param.put("scid", far.getContentScId(BasicConfig.ARTICLE_CONTENTID));
param.put("scid", ForwardAndRead.getContentScId(BasicConfig.ARTICLE_CONTENTID));
param.put("pageSize", 20);
param.put("type", 4);
response = network.getResponse(param, BasicConfig.FORWARD_VISITRECORD);
......@@ -244,7 +242,7 @@ public class MyForward implements Authorization {
@Test(description = "文章详情_访客记录_转发关系", priority = 14)
public void 文章详情_访客记录_转发关系() throws IOException{
param = new HashMap<>();
param.put("scid", far.getContentScId(BasicConfig.ARTICLE_CONTENTID));
param.put("scid", ForwardAndRead.getContentScId(BasicConfig.ARTICLE_CONTENTID));
param.put("pageIndex", 1);
param.put("pageSize", 20);
response = network.getResponse(param, BasicConfig.INVITATIONCHAIN);
......
src/test/java/com/kjj/config/BasicConfig.java
View file @ a948910d
......@@ -73,9 +73,9 @@ public class BasicConfig {
// 基础线访客 TKU---"请勿打扰"
public static String VISITOR_TKU = "T3gM31f18jCGvqvoyJRzyMTdpcPDJWUJJP4VQje7p9sfC4HKmj5NJfCUkxusAyFb5SpkWS31srDTYr6KtV";
// 基础线访客(小雪人) TKU
public static String VISITOR1_TKU = "T3gM31f18jCFXzk692pKjJCqJZdDv8Nb3htkzNk983cPMspUQD6pVEn2FNMefM2nieKPicXG9c1tDg8qtN";
public static String VISITOR1_TKU = "T3gM31f18jCFXzk692pKjJCqJZdDv8Nb3htkzNk983cPPrfjggTn4Gv1ytpR3XAQusWRz7uTsHaibp6Es8";
// 基础线访客
public static String VISITOR2_TKU = "T3gM31f18jCeKCBVHf5MANgyXeBZGCm8vTJQTuWYXHFqx97PATsWyUYamGaNdNip8bEs9shoE9tTsAmp8x"; // 二度访客用
public static String VISITOR2_TKU = "T3gM31f18jCeKCBVHf5MANgyXeBZGCm8vTJQTuWYXHFr27f8asoYpZASD6JzN5VJsBpQ8NxvzrJFGz2Ame"; // 二度访客用
// 访客的sids
public static final String sids = "Kj21MjMwNTU";
// 访客(SuYi) userID：4425
......@@ -87,6 +87,7 @@ public class BasicConfig {
// *************** 客集集域名 ***************
public static final String HOST = "https://kjj.m.duibatest.com.cn";
public static final String ACTIVITY_HOST = "https://kjj-activity.duibatest.com.cn";
public static final String ACTIVITY1_HOST = "https://kjj-activity-1.duibatest.com.cn";
public static final String SSO_HOST = "https://sso.duibatest.com.cn";
public static final String MANAGER_HOST = "https://kjj-mng.duibatest.com.cn";
public static final String MOBILE_HOST = "https://live.duibatest.com.cn";
......@@ -736,6 +737,7 @@ public class BasicConfig {
public static final String DYNAMIC_ADDVISIT = HOST + "/kjy/mp/seller/dynamic/addVisit";
public static final String CLUEINFO = HOST + "/kjy/mp/whoSawMe/clue/info";
public static final String CLUEADVISE = HOST + "/kjy/mp/whoSawMe/clue/info/advise";
public static final String FOLLOWADVICE = HOST + "/kjy/mp/whoSawMe/clue/followAdvice";
// *************** 运营周报 ***************
public static final String WEEKLY_INDEXINFO = HOST + "/kjy/mp/weekly/getWeeklyIndexInfo";
......@@ -803,6 +805,8 @@ public class BasicConfig {
public static final String ARTICLE_ENHANCEDCOLUMN_GETFAQS = HOST + "/kjy/mp/enhancedColumn/getFAQs";
public static final String ARTICLE_getQuestionDetail = HOST +"/kjy/mp/explosioncontent/qa/getQuestionDetail";
public static final String ARTICLE_GETEXPLOSIONCONTENTLIST = HOST + "/kjy/mp/explosioncontent/getExplosionContentList";
// 风险评测
public static final String RISKTEST_SENDINFO = ACTIVITY1_HOST + "/kjy/mp/activity/sendInfoForRisk";
// ************** 发圈素材 ***************
public static final String FRIENDS_GETMATERIALTAGS = HOST + "/kjy/mp/materialContent/getmaterialTags";
......@@ -990,6 +994,7 @@ public class BasicConfig {
public static final String MANAGER_dailyPostersDelete = MANAGER_HOST + "/kjy/manager/dailyPosters/delete";
public static final String MANAGER_SELLERTEAM_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_ID_DECODE = MANAGER_HOST + "/kjy/manager/testUser/decode";
public static final String MANAGER_TKU_DECODE = MANAGER_HOST + "/kjy/manager/testUser/decryptTku";
public static final String MANAGER_getPushContent = MANAGER_HOST + "/kjy/manager/pushManager/getPushContent";
public static final String MANAGER_addOrUpdateCases = MANAGER_HOST + "/kjy/manager/successCases/addOrUpdateCases";
......@@ -1007,4 +1012,6 @@ public class BasicConfig {
public static final String MANAGER_encryptTku = MANAGER_HOST + "/kjy/manager/testUser/encryptTku";
public static final String MANAGER_changeCompany = MANAGER_HOST + "/kjy/manager/seller/changeCompany";
public static final String MANAGER_feedBackList = MANAGER_HOST + "/kjy/manager/feedback/list";
public static final String MANAGER_articleInteraction = MANAGER_HOST + "/kjy/manager/interact/article/searchPageList";
public static final String MANAGER_interactSolution = MANAGER_HOST + "/kjy/manager/interact/solution/searchPageList";
}
src/test/wechatTestNG.xml
View file @ a948910d
......@@ -46,7 +46,6 @@
<class name="com.kjj.cases.assistant.homePage.Upload"/>
</classes>
</test>
<test preserve-order="true" name = "获取访客">
<classes>
<class name="com.kjj.cases.assistant.whoSawMe.ForwardAndRead"/>
......
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