Merge branch '2021071502' into 'master'

2021071502

See merge request test-group/kejiji!67

src/test/java/com/kjj/bean/card/GoodMajor.java

+package com.kjj.bean.card;
+
+import lombok.Data;
+
+@Data
+public class GoodMajor {
+    String code;
+    String desc;
+    boolean choose;
+    String type;
+}

src/test/java/com/kjj/bean/card/WechatCard.java

+package com.kjj.bean.card;
+
+import lombok.Data;
+
+@Data
+public class WechatCard {
+    String avatar;
+    String address;
+    String addressLocation;
+    int avatarStyle;
+    int companyId;
+    String jobPost;
+    String phoneNumber;
+    String sellerName;
+    String wechatNumber;
+}

src/test/java/com/kjj/cases/admin/Authorization.java

@@ -36,6 +36,7 @@ public interface Authorization {
     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);
     }
 

src/test/java/com/kjj/cases/live/treasure/Treasure.java

@@ -146,7 +146,7 @@ public class Treasure implements Authorization {
         Assert.assertNotNull(data, network.message(simpleParam, BasicConfig.MOBILE_simple, "未登录查询分享人头像昵称失败", response.body().asString()));
     }
 
-    @Test(description = "已登录查询分享人头像昵称", priority = 10)
+    @Test(description = "已登录查询助力信息", priority = 10)
     public void 已登录查询分享人头像昵称() {
         visitorAuth2();
         Map<String, Object> infoParam = new HashMap<>();

src/test/java/com/kjj/config/BasicConfig.java

@@ -612,7 +612,33 @@ public class BasicConfig {
     public static final String SELLERCARD_GETSELLERCARDSTYLE = HOST + "/kjy/mp/sellerConfig/getSellerCardStyle";
     public static final String SELLERCARD_TOPOFCONTENT = HOST + "/kjy/mp/sellerCardV5/topOfContent";
     public static final String SELLERCARD_BOTTOMOFCONTENT = HOST + "/kjy/mp/sellerCardV5/bottomOfContent";
-
+    public static final String SELLERCARD_GETPERSONINTROTEMPLATE = HOST + "/kjy/mp/sellerCardV5/getPersonalIntroTemplate";
+    public static final String SELLERCARD_UPDATESPLENDINGIMAGE = HOST + "/kjy/mp/sellerCard/updateSplendidImage";
+    public static final String SELLERCARD_GETSPLENDINGIMAGE = HOST + "/kjy/mp/sellerCard/getSellerSplendidImage";
+    public static final String SELLERCARD_EDITDELLERCASE = HOST + "/kjy/mp/sellerCard/editSellerCase";
+    public static final String SELLERCARD_UPDATESHOWSTATUSFORCASE = HOST + "/kjy/mp/sellerCardV5/updateShowStatusForCase";
+    public static final String SELLERCARD_DELETESELLERCASE = HOST + "/kjy/mp/sellerCard/deleteSellerCase";
+    public static final String SELLERCARD_ADDORUPDATEPRODUCT = HOST + "/kjy/mp/sellerCardV5/addOrUpdateProduct";
+    public static final String SELLERCARD_UPDATESHOWSTATUSFORPRODUCT = HOST + "/kjy/mp/sellerCardV5/updateShowStatusForProduct";
+    public static final String SELLERCARD_DELETEPRODUCT = HOST + "/kjy/mp/sellerCardV5/deleteProduct";
+    public static final String SELLERCARD_GETSELLERCASEINFO = HOST +  "/kjy/mp/sellerCardV5/getSellerCaseInfo";
+    public static final String SELLERCARD_SAVECARDAPPRAISE = HOST +  "/kjy/mp/sellerCard/saveCardAppraise";
+    public static final String SELLERCARD_DELCARDAPPRAISE = HOST +  "/kjy/mp/sellerCard/delCardAppraise";
+    public static final String SELLERCARD_EDITCARDAPPRAISE = HOST +  "/kjy/mp/sellerCard/editCardAppraise";
+    public static final String SELLERCARD_COMPANYINFO = HOST +  "/kjy/mp/sellerCard/company/info";
+    public static final String SELLERCARD_AYSNCGETMPORCODE = HOST +  "/kjy/mp/sellerCard/asyncGetMpQrCode";
+    public static final String SELLERCARD_HASLIVEAUTH = HOST +  "/kjy/mp/liveAgent/hasLiveAuth";
+    public static final String SELLERCARD_CARDGUIDE= HOST +  "/kjy/mp/rookieGuide/cardGuide";
+    public static final String SELLERCARD_INSURANCELISTV2= HOST +  "/kjy/mp/welfare/insuranceListV2";
+    public static final String SELLERCARD_GETENHANCEDCOLUMNCONFIG = HOST + "/kjy/mp/sellerConfig/getEnhancedColumnConfig";
+    public static final String SELLERCARD_GETQUESTIONDETAIL = HOST + "/kjy/mp/explosioncontent/qa/getQuestionDetail";
+    public static final String SELLERCARD_SENDPUSHFORSCAN = HOST + "/kjy/mp/explosioncontent/qa/sendPushForScan";
+    public static final String SELLERCARD_REWARDUSERS = HOST + "/kjy/mp/seller/novice/rewardUsers";
+    public static final String SELLERCARD_RECOMMENDLISTV3 = HOST + "/kjy/mp/welfare/recommendListV3";
+    public static final String SELLERCARD_READDETAIL = HOST + "/kjy/mp/sellerCard/readDetail";
+    public static final String SELLERCARD_GETINTERACTIONCONFIG = HOST + "/kjy/mp/sellerConfig/getInteractionConfig";
+    public static final String SELLERCARD_GETSELLERPROMOTEINFO = HOST + "/kjy/mp/seller/getSellerPromoteInfo";
+    public static final String SELLERCARD_DIRECT = HOST + "/kjy/mp/user/direct";
 
 
     // ***************   上传  ***************

src/test/java/com/kjj/utils/JsonUtil.java

@@ -73,4 +73,9 @@ public class JsonUtil {
         return JSON.parseArray(str, tClass);
     }
 
+    public static  <T> List<T> parseResponsePathToListBean(Response response, String path,Class<T> tClass){
+        Object data = response.jsonPath().getJsonObject(path);
+        String str = new JsonBuilder(data).toString();
+        return JSON.parseArray(str, tClass);
+    }
 }

src/test/wechatTestNG.xml

@@ -16,21 +16,11 @@
             <class name="com.kjj.cases.basics.Pay"/>
         </classes>
     </test>
-    <test preserve-order="true" name="名片">
-        <classes>
-            <class name="com.kjj.cases.basics.SellerCard"/>
-        </classes>
-    </test>
     <test preserve-order="true" name="上传">
         <classes>
             <class name="com.kjj.cases.basics.Upload"/>
         </classes>
     </test>
-    <test preserve-order="true" name="文章">
-        <classes>
-            <class name="com.kjj.cases.basics.Article"/>
-        </classes>
-    </test>
     <test preserve-order="true" name="发圈">
         <classes>
             <class name="com.kjj.cases.basics.CircleFriends"/>
@@ -51,6 +41,16 @@
             <class name="com.kjj.cases.basics.GreetingCard"/>
         </classes>
     </test>
+    <test preserve-order="true" name="我的名片">
+        <classes>
+            <class name="com.kjj.cases.basics.card.PersonCard"/>
+        </classes>
+    </test>
+    <test preserve-order="true" name="文章中个人名片">
+        <classes>
+            <class name="com.kjj.cases.basics.card.ArticalPersonCard"/>
+        </classes>
+    </test>
     <test preserve-order="true" name = "种草素材">
         <classes>
             <class name="com.kjj.cases.assistant.RecommendMaterial"/>