Merge branch 'master' into feature/20210907-xmc

# Conflicts:
#	src/test/java/com/kjj/config/BasicConfig.java

src/test/java/com/kjj/cases/live/lottery/RelativeLottery.java

@@ -34,8 +34,10 @@ public class RelativeLottery implements Authorization {
         getLiveAwardListParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Response response = network.getResponse(getLiveAwardListParam, MOBILE_allLottery);
         System.out.println(response.body().asString());
-        int fissionLotteryConfStatus = response.jsonPath().getInt("data.on");
-        Assert.assertEquals(fissionLotteryConfStatus, 1,network.message(getLiveAwardListParam, MOBILE_allLottery, "亲友配置券未开启", response.body().asString()));
+        int on = response.jsonPath().getInt("data.on");
+        String confStr = Integer.toBinaryString(on);
+        char fissionLotteryConfStatus = confStr.charAt(confStr.length()-1);
+        Assert.assertEquals(fissionLotteryConfStatus, '1',network.message(getLiveAwardListParam, MOBILE_allLottery, "亲友配置券未开启", response.body().asString()));
     }
 
     @Test(description = "仅一度用户可以领取抽奖券", priority = 2)

src/test/java/com/kjj/cases/live/preview/Preview.java

@@ -40,7 +40,6 @@ public class Preview implements Authorization{
         visitorAuth22();
         Map<String,Object> params = new HashMap<>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
-        params.put("liveId","Kj21NDM3OTE");
         Response response = network.postResponse(params,BasicConfig.ANCHOR_watchVideo);
         boolean data = response.jsonPath().getBoolean("data");
         Assert.assertTrue(data,network.message(params,BasicConfig.ANCHOR_watchVideo,"访客观看视频的抽奖码失败",response.body().asString()));

src/test/liveTestNG.xml

@@ -29,7 +29,7 @@
             <class name="com.kjj.cases.live.liveConfig.SaveLive"/>
         </classes>
     </test>
-    <test preserve-order="true" name="配置秒杀轮次">
+    <test preserve-order="true" name="配置秒杀轮次及秒杀预告">
         <classes>
             <class name="com.kjj.cases.live.secondKill.ConfSecondKill"/>
         </classes>
@@ -82,7 +82,6 @@
         </classes>
     </test>
 
-
     <test preserve-order="true" name="指定中奖">
         <classes>
             <class name="com.kjj.cases.live.lottery.DesignatedWinner"/>
@@ -94,7 +93,6 @@
         </classes>
     </test>
 
-
     <test preserve-order="true" name="直播前-我的客户页">
         <classes>
             <class name="com.kjj.cases.live.agent.LiveBefore"/>