Merge branch '20210409bxl1' into 'master'

20210409bxl1

See merge request test-group/kejiji!44

src/test/java/com/kjj/bean/AnchorRedList.java

+package com.kjj.bean;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AnchorRedList {
+
+    private String surplusAmount;
+
+    private List<RedList> redList;
+
+    @Data
+    public static class RedList
+    {
+        private String confId;
+        private int totalAmount;
+        private int totalNum;
+        private int luckAmount;
+        private int luckNum;
+        private int luckHelpNum;
+        private int generalNum;
+        private int showAmount;
+        private int totalSurplusNum;
+        private int luckSurplusNum;
+        private int redStatus;
+    }
+    private String redPackReceiving;
+
+
+}

src/test/java/com/kjj/bean/GetShareSign.java

+package com.kjj.bean;
+
+import lombok.Data;
+
+@Data
+public class GetShareSign {
+    private String posterUrl;
+    private String mpQrcode;
+    private String mpShareUrl;
+    private String mpShareTitle;
+    private String shareSign;
+    private String shareContent;
+    private String liveType;
+}

src/test/java/com/kjj/bean/RedGetSimple.java

+package com.kjj.bean;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class RedGetSimple {
+
+    private Date startTime;
+}

src/test/java/com/kjj/bean/RedHelpInfo.java

+package com.kjj.bean;
+
+import lombok.Data;
+
+@Data
+public class RedHelpInfo {
+
+    private String avatar;
+
+    private String confId;
+
+    private int myHelpNum;
+
+    private String nickname;
+
+}

src/test/java/com/kjj/bean/RedHelpQuery.java

+package com.kjj.bean;
+
+import lombok.Data;
+
+@Data
+public class RedHelpQuery {
+    private String avatar;
+    private String end;
+    private String hasConfLuck;
+    private String help;
+    private String helpShareUser;
+    private String nickname;
+    private String selfShare;
+
+
+}
+

src/test/java/com/kjj/bean/RedHepDetail.java

+package com.kjj.bean;
+
+import lombok.Data;
+
+@Data
+public class RedHepDetail {
+    private String helpAvatarList;
+    private int myHelpNum;
+}

src/test/java/com/kjj/bean/RedLuckResult.java

+package com.kjj.bean;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class RedLuckResult {
+
+
+    private List<LuckList> list;
+
+
+    @Data
+    public static class LuckList
+    {
+        private String avatar;
+        private String nickname;
+        private String receivedAmount;
+
+    }
+
+
+
+
+
+}
+
+

src/test/java/com/kjj/bean/RedNum.java

+package com.kjj.bean;
+
+import lombok.Data;
+
+@Data
+public class RedNum {
+
+    private String totalAmount;
+
+    private String luckAmount;
+
+    private String luckNum;
+
+}

src/test/java/com/kjj/bean/RedOrdinary.java

+package com.kjj.bean;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class RedOrdinary {
+    private String confId;
+    private int redStatus;
+    private Date startTime;
+    private int showAmount;
+    private int luckHelpNum;
+}

src/test/java/com/kjj/bean/RedSimpleDetail.java

+package com.kjj.bean;
+
+import lombok.Data;
+
+import java.util.Date;
+
+
+@Data
+public class RedSimpleDetail {
+
+    private int totalAmount;
+    private int luckAmount;
+    private int luckNum;
+    private int luckHelpNum;
+    private Date startTime;
+    private int redStatus;
+}

src/test/java/com/kjj/bean/RedState.java

+package com.kjj.bean;
+
+import lombok.Data;
+
+@Data
+public class RedState {
+    private int state;
+    private int amount;
+    private String luck;
+    private int code;
+}

src/test/java/com/kjj/cases/live/LiveVisitors.java

@@ -6,6 +6,7 @@ import com.kjj.bean.*;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.JsonUtil;
+import com.kjj.utils.ThreadSleepUtils;
 import io.restassured.response.Response;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
@@ -40,11 +41,7 @@ public class LiveVisitors implements AdminAuthorization
     @Test(description = "访客端权益列表", priority = 1)
     public void 访客端权益列表()
     {
-        try {
-            Thread.sleep(30000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
+        ThreadSleepUtils.sleep(30000);
         Map<String, Object> params = new HashMap<>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Response response = network.getResponse(params, BasicConfig.MOBILE_Resource);

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

@@ -114,8 +114,6 @@ 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_OrdinaryRed = MOBILE_HOST + "/clue/red/findRedList";
-    public static final String MOBILE_OrdinaryRed1 = MOBILE_HOST + "/clue/red/findSimpleDetail";
     public static final String MOBILE_GetAgentPosterInfo = MOBILE_HOST + "/kjy/live/share/getAgentPosterInfo";
     public static final String MOBILE_ClueNum = MOBILE_HOST + "/kjy/live/agent/clue/clueNum";
     public static final String MOBILE_ClueList = MOBILE_HOST + "/kjy/live/agent/clue/list";
@@ -133,6 +131,31 @@ public class BasicConfig {
     public static final String MOBILE_agentSpecifyAwardConf = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardConf";
 
 
+    //红包//
+    public static final String MOBILE_AnchorRedList = MOBILE_HOST + "/conf/live/red/findRedList";
+    public static final String MOBILE_GetSurplusAmount = MOBILE_HOST + "/conf/live/red/getSurplusAmount";
+    public static final String MOBILE_Grounding = MOBILE_HOST + "/conf/live/red/up";
+    public static final String MOBILE_RedStart = MOBILE_HOST + "/conf/live/red/start";
+    public static final String MOBILE_RedGetSimple = MOBILE_HOST + "/conf/live/red/getSimple";
+    public static final String MOBILE_RedSaveOrUpdate = MOBILE_HOST + "/conf/live/red/saveOrUpdate";
+    public static final String MOBILE_QuesSaveOrUpdate = MOBILE_HOST + "/conf/live/ques/reward/saveOrUpdate";
+    public static final String MOBILE_FindRedList = MOBILE_HOST + "/clue/red/findRedList";
+    public static final String MOBILE_RedFindSimpleDetail = MOBILE_HOST + "/clue/red/findSimpleDetail";
+    public static final String MOBILE_RedHelpDetail = MOBILE_HOST + "/kjy/live/user/red/help/detail";
+    public static final String MOBILE_GetRedMpShare = MOBILE_HOST + "/kjy/live/share/getRedMpShare";
+    public static final String MOBILE_RedOpen = MOBILE_HOST + "/clue/red/open";
+    public static final String MOBILE_RedNum = MOBILE_HOST + "/clue/red/num";
+    public static final String MOBILE_RedResultList = MOBILE_HOST + "/clue/red/resultList";
+    public static final String MOBILE_RedState = MOBILE_HOST + "/clue/red/state";
+    public static final String MOBILE_RedHelpQuery = MOBILE_HOST + "/kjy/live/user/red/helpQuery";
+    public static final String MOBILE_RedHelpInfo = MOBILE_HOST + "/kjy/live/user/red/helpInfo";
+    public static final String MOBILE_RedGetShareSign= MOBILE_HOST + "/kjy/live/getShareSign";
+    public static final String MOBILE_RedLuckResult = MOBILE_HOST + "/clue/red/luckResultList";
+    public static final String MOBILE_RedLuckHelp = MOBILE_HOST + "/kjy/live/user/red/help";
+    public static final String MOBILE_QuesRewardList = MOBILE_HOST + "/conf/live/ques/reward/list";
+
+
+
     //***************直播素材*****************
     public static final String MANAGER_SAVEORUPDATE6 = MANAGER_HOST+ "/kjy/manager/conf/base/welfare/saveOrUpdate";
     public static final String MANAGER_WELFARELIST = MANAGER_HOST+ "/kjy/manager/conf/base/welfare/list";
@@ -152,6 +175,7 @@ public class BasicConfig {
     public static final String MANAGER_TEST= MANAGER_HOST+ "/kjy/manager/live/resource/saveOrUpdateTest";
 
 
+
     // ***************  素材ID  ***************
     public static final String ARTICLE_CONTENTID = "Kj21NjM4NDc";
     public static final String ANIMATION_CONTENTID = "Kj21MzgzMTk";
@@ -159,6 +183,7 @@ public class BasicConfig {
     public static final String UPLOAD_CONTENTID = "Kj21NjA1NTE";
 
 
+
     // ***************   公共  ***************
     public static final String CREATE_USER = HOST + "/kjy/mp/autotest/create/user";
     public static final String AUTOTEST_UNSUBSCRIBE = HOST + "/kjy/mp/autotest/unsubscribe";
@@ -174,6 +199,7 @@ public class BasicConfig {
     public static final String INTERACTION_LIKE =  HOST + "/kjy/mp/interaction/like";
 
 
+
     // ***************   支付  ***************
     public static final String PAY_GETMIDDLEDETAIL = HOST + "/kjy/mp/payMiddle/getMiddleDetail";
     public static final String PAY_HASSITESALEVALID = HOST + "/kjy/mp/seller/dist/hasSiteSaleValid";
@@ -186,6 +212,7 @@ public class BasicConfig {
     public static final String PAY_DISTRIBUTE = HOST + "/kjy/sp/visitorPayment/distribute";
 
 
+
     // ***************   名片  ***************
     public static final String SELLERCARD_TOPOFDETAIL = HOST + "/kjy/mp/sellerCardV5/topOfDetail";
     public static final String SELLERCARD_EDITBASEINFO = HOST + "/kjy/mp/sellerCard/editBaseInfo";
@@ -203,6 +230,7 @@ public class BasicConfig {
     public static final String SELLERCARD_BOTTOMOFCONTENT = HOST + "/kjy/mp/sellerCardV5/bottomOfContent";
 
 
+
     // ***************   上传  ***************
     public static final String UPLOAD = HOST + "/kjy/mp/seller/import/upload";
     public static final String UPLOAD_TASKSTATUS = HOST + "/kjy/mp/seller/import/taskStatus";
@@ -216,6 +244,7 @@ public class BasicConfig {
     public static final String UPLOAD_UNBIND = HOST + "/kjy/mp/seller/import/unbind";
 
 
+
     // ***************   新手任务  ***************
     public static final String NOVICE_LIST = HOST + "/kjy/mp/seller/novice/list";
     public static final String NOVICE_MONGOLIANLAYERISPLAY = HOST + "/kjy/mp/seller/novice/mongolianLayerDisplay";
@@ -237,6 +266,7 @@ public class BasicConfig {
     public static final String ARTICLE_GETEXPLOSIONCONTENTLIST = HOST + "/kjy/mp/explosioncontent/getExplosionContentList";
 
 
+
     // **************  发圈素材  ***************
     public static final String FRIENDS_GETMATERIALTAGS = HOST + "/kjy/mp/materialContent/getmaterialTags";
     public static final String FRIENDS_ISUSERFIRSTENTERANDCOLLECT = HOST + "/kjy/mp/materialContent/isUserFirstEnterAndCollect";
@@ -251,12 +281,16 @@ public class BasicConfig {
     public static final String FRIENDS_CHANNELDETAIL = HOST + "/kjy/mp/materialContent/channelDetail";
     public static final String FRIENDS_GETCURRENTINFO = HOST + "/kjy/mp/timelineContent/getCurrentInfo";
 
+
+
     // ************** 首页 ****************
     public static final String HOME_GETHOMETIMELINECONTENT = HOST + "/kjy/mp/home/getHomeTimeLineContent";
 
+
     // **************  设置中心  ***************
     public static final String SELLERCONFIG_EDITCONFIG = HOST + "/kjy/mp/sellerConfig/editConfig";
 
+
     // **************  BOSS看板  ***************
     public static final String BOSS_ROLE = HOST + "/kjy/mp/seller/team/member/role";
     public static final String BOSS_CODE = HOST + "/kjy/mp/seller/team/invite/code";
@@ -274,6 +308,7 @@ public class BasicConfig {
     public static final String BOSS_RECEIVERLIST = HOST + "/kjy/mp/seller/team/task/receiverList";
 
 
+
     // *************** 贺卡 ***************
     public static final String GREETING_BANNER = HOST + "/kjy/mp/greeting/banner";
     public static final String GREETING_SHOW = HOST + "/kjy/mp/seller/parctice/show";
@@ -288,6 +323,7 @@ public class BasicConfig {
     public static final String GREETING_SAVEDEFAULT = ACTIVITY_HOST + "/kjy/mp/greeting/conf/saveDefault";
 
 
+
     // *************** 管理后台 ***************
     public static final int PROMOTION_CODE = 451; // 优惠码ID
     public static final String SSO_DOLOGIN = SSO_HOST + "/doLogin";
@@ -300,4 +336,5 @@ public class BasicConfig {
     public static final String MANAGER_PROMOTIONBATCHMODIFY = MANAGER_HOST + "/kjy/manager/promotionCode/batchModify";
     public static final String MANAGER_PROMOTIONCODEBATCHDETAIL = MANAGER_HOST + "/kjy/manager/promotionCode/batchDetail";
 
+
 }

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

+package com.kjj.utils;
+
+public class ThreadSleepUtils {
+
+    private ThreadSleepUtils() {}
+
+    public static void sleep(long millis) {
+        try {
+            Thread.sleep(millis);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+}

src/test/liveTestNG.xml

@@ -59,6 +59,11 @@
         </classes>
     </test>
 
+    <test preserve-order="true" name="红包领取">
+        <classes>
+            <class name="com.kjj.cases.live.LiveVistorRed"/>
+        </classes>
+    </test>
     <test preserve-order="true" name="助播-结束直播">
         <classes>
             <class name="com.kjj.cases.live.CloseLive"/>