Merge remote-tracking branch 'origin/master'

src/main/java/com/xiaomai/cases/polar/applet/TestSetPageConfig.java

@@ -32,7 +32,7 @@ public class TestSetPageConfig extends XMBaseTest {
         super.beforeTest();
         super.beforeTest();
     }
     }
 
 
-    @Test(description = "修改小程序页面配置-首页")
+    //@Test(description = "修改小程序页面配置-首页")
     public void testSetStyleConfig(){
     public void testSetStyleConfig(){
         String shareText = "自动化脚本首页分享"+RandomStringUtil.randomString(5);
         String shareText = "自动化脚本首页分享"+RandomStringUtil.randomString(5);
 
 
@@ -42,7 +42,7 @@ public class TestSetPageConfig extends XMBaseTest {
         Assert.assertEquals(appletTools.getPageConfig("HOME").getJSONObject("result").getJSONObject("shareSetting").getString("shareText"),shareText);
         Assert.assertEquals(appletTools.getPageConfig("HOME").getJSONObject("result").getJSONObject("shareSetting").getString("shareText"),shareText);
     }
     }
 
 
-    @Test(description = "修改小程序页面配置-约课")
+    //@Test(description = "修改小程序页面配置-约课")
     public void testSetStyleConfig_1(){
     public void testSetStyleConfig_1(){
         String shareText = "自动化脚本约课页面分享"+RandomStringUtil.randomString(5);
         String shareText = "自动化脚本约课页面分享"+RandomStringUtil.randomString(5);
 
 
@@ -52,7 +52,7 @@ public class TestSetPageConfig extends XMBaseTest {
 
 
     }
     }
 
 
-    @Test(description = "修改小程序页面配置-我的")
+    //@Test(description = "修改小程序页面配置-我的")，json一直在更新，每次上线后脚本的json不更新就会产生脏数据，先注释掉
     public void testSetStyleConfig_2(){
     public void testSetStyleConfig_2(){
 
 
         String shareText = "自动化脚本我的页面分享"+RandomStringUtil.randomString(5);
         String shareText = "自动化脚本我的页面分享"+RandomStringUtil.randomString(5);

src/main/java/com/xiaomai/cases/polar/reserve/group/TestAddMemberReserve.java

@@ -231,8 +231,9 @@ public class TestAddMemberReserve extends BaseTestImpl {
     public void testAddMemberReserve3(){
     public void testAddMemberReserve3(){
         //  修改课次人数上限为1
         //  修改课次人数上限为1
         groupScheduleTools.editGroupSchedule(scheduleId,startTime,xmAppApi.getLoginInfo().getAdminId(),1,1);
         groupScheduleTools.editGroupSchedule(scheduleId,startTime,xmAppApi.getLoginInfo().getAdminId(),1,1);
+
         try {
         try {
-            Thread.sleep(2000);
+            Thread.sleep(3000);
         } catch (InterruptedException e) {
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
             throw new RuntimeException(e);
         }
         }
@@ -242,7 +243,11 @@ public class TestAddMemberReserve extends BaseTestImpl {
         Random random = new Random();
         Random random = new Random();
         int bookingSeatCount = random.nextInt(10)+1; // 席位
         int bookingSeatCount = random.nextInt(10)+1; // 席位
         ruleTools.saveGroupBookingRules(id,false,bookingSeatCount,true,true,random.nextInt(30)+10,true,random.nextInt(100)+10,random.nextInt(5)+1,true,random.nextInt(100)+10,"minutes",true,random.nextInt(100)+10,"minutes");
         ruleTools.saveGroupBookingRules(id,false,bookingSeatCount,true,true,random.nextInt(30)+10,true,random.nextInt(100)+10,random.nextInt(5)+1,true,random.nextInt(100)+10,"minutes",true,random.nextInt(100)+10,"minutes");
-
+        try {
+            Thread.sleep(2000);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
         // 新学员 购买卡
         // 新学员 购买卡
         String memberId2 = "";
         String memberId2 = "";
         // 查询存量的学员没有则创建学员
         // 查询存量的学员没有则创建学员