Merge branch 'Feature/20210222-gxh' into 'master'

修改变量名称

See merge request test-group/kejiji!225

src/test/Test.xml

@@ -4,21 +4,45 @@
 
     <!-->专用于自测</!-->
 
+    <test preserve-order="true" name="直播素材">
+        <classes>
+            <class name="com.kjj.cases.live.liveConfig.LiveMaterial"/>
+        </classes>
+    </test>
+
     <test preserve-order="true" name="创建直播">
         <classes>
-            <class name="com.kjj.cases.live.liveConfig.SimpleLive"/>
+            <class name="com.kjj.cases.live.liveConfig.SaveLive"/>
+        </classes>
+    </test>
+
+    <test preserve-order="true" name="配置秒杀轮次及秒杀预告">
+        <classes>
+            <class name="com.kjj.cases.live.secondKill.ConfSecondKill"/>
+        </classes>
+    </test>
+
+    <test preserve-order="true" name="绑定关系绑定">
+        <classes>
+            <class name="com.kjj.cases.live.liveConfig.LiveBinding"/>
+        </classes>
+    </test>
+
+    <test preserve-order="true" name="助播-开启直播">
+        <classes>
+            <class name="com.kjj.cases.live.anchor.OpenLive"/>
         </classes>
     </test>
 
-    <test preserve-order="true" name="配置代理人赠送秒杀优惠券">
+    <test preserve-order="true" name="秒杀到场">
         <classes>
-            <class name="com.kjj.cases.live.secondKill.VoucherConf"/>
+            <class name="com.kjj.cases.live.liveConfig.ConnectLive"/>
         </classes>
     </test>
 
-    <test preserve-order="true" name="代理人赠送秒杀优惠券并用户使用代金券">
+    <test preserve-order="true" name="秒杀互动">
         <classes>
-            <class name="com.kjj.cases.live.secondKill.Voucher"/>
+            <class name="com.kjj.cases.live.secondKill.SecondKill"/>
         </classes>
     </test>
 

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

@@ -298,10 +298,9 @@ public interface Authorization {
         System.out.println("用户AUTH_KEY：" + visitorAuth30);
     }
 
-    //自动化假用户
-    // 用户ID：4054
-    default void visitorAuto1() {
-        network.agentCookies.put("authKey", visitorAuto1);
-        System.out.println("用户AUTH_KEY：" + visitorAuto1);
+    // 用户ID：81
+    default void visitorAuth31() {
+        network.agentCookies.put("authKey", visitorAuth31);
+        System.out.println("用户AUTH_KEY：" + visitorAuth31);
     }
 }

src/test/java/com/kjj/cases/live/liveConfig/ConnectLive.java

@@ -18,7 +18,7 @@ public class ConnectLive implements Authorization {
         visitorAuth1();
         connectSuccess();
 
-        visitorAuto1();
+        visitorAuth31();
         connectSuccess();
 
         visitorAuth7();

src/test/java/com/kjj/cases/live/liveConfig/LiveBinding.java

@@ -13,10 +13,6 @@ import org.testng.annotations.Test;
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.kjj.config.BasicConfig.MOBILE_binding;
-import static com.kjj.config.BasicConfig.MOBILE_sign;
-import static com.kjj.utils.ThreadSleepUtils.sleep;
-
 public class LiveBinding implements Authorization {
 
     @BeforeClass
@@ -147,7 +143,7 @@ public class LiveBinding implements Authorization {
         binding(this.shareSign);;
         token();
 
-        visitorAuto1();
+        visitorAuth31();
         binding(this.shareSign);;
         token();
 

src/test/java/com/kjj/cases/live/secondKill/SecondKill.java

 package com.kjj.cases.live.secondKill;
 
-import com.kjj.bean.agent.GrabWelfares;
 import com.kjj.bean.resources.ResourceForm;
 import com.kjj.bean.secondKill.AnchorGetSKList;
 import com.kjj.bean.secondKill.KillGoods;
@@ -13,8 +12,6 @@ import com.kjj.utils.JsonUtil;
 import com.kjj.utils.ThreadSleepUtils;
 import io.restassured.response.Response;
 import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
@@ -37,7 +34,7 @@ public class SecondKill implements Authorization {
     public void setUp(){
         BaseUtils.ssoLogin();
         //到场
-        visitorAuto1();
+        visitorAuth31();
         connectSuccess();
 
         agentAuth2();
@@ -940,7 +937,7 @@ public class SecondKill implements Authorization {
     //用于退款
     @Test(description = "用户成功支付_待退款", priority = 47)
     public void 用户成功支付_待退款() {
-        visitorAuto1();
+        visitorAuth31();
         // 新建订单
         Map<String, Object> orderPar = new HashMap<>();
         orderPar.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));

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

@@ -10,8 +10,6 @@ public class BasicConfig {
   /**
    * 直播账号授权key
    */
-  //自动化假用户 UserID：4055 ，liveUserID；81
-  public static String visitorAuto1 ="5MgSyboxqzAQZZJEsTf43nVX4vbZ5hG86sgJ5fSN7NzKxCH5WfE2XDHGMFm785nWo1pHKu5V5GPuQZHz3AfUEPenT5jh";
 
   //直播管理员（吉吉）
   public static String ADMIN_KEY="zFNkBc7JtvLPL6ifAfXbcgXf7k8AofD7jRHCDreREzhP8iW4bahfqRFePosTb9G6ESGPwScVFCQyuZBcc4brtRfaNz";
@@ -81,6 +79,8 @@ public class BasicConfig {
   public static String visitorAuth29 ="LEH7epeHVDJWzhZ6DiexTHnserXQHCtM8rNeniNbC71CxsgmmfFgGJ7aKtkJ7LiLe759DtAzp1miMwGP2GVPK6BrD8hgR";
   //直播访客 （袁静怡）ID：1470
   public static String visitorAuth30 ="2Tsc8MwHZmXJKPfze38rXm37Ua5bBkXUECt1BQhT2U2csy4dyb7wA2YMxV7aSRVhXXWFyZqrNgBSreXUWbnYnVqd5xsvBAX";
+  //直播访客 （大同）ID：81
+  public static String visitorAuth31 ="5MgSyboxqzAQZZJEsTf43nVX4vbZ5hG86sgJ5fSN7NzKxCH5WfE2XDHGMFm785nWo1pHKu5V5GPuQZHz3AfUEPenT5jh";
 
 
   /**