Merge remote-tracking branch 'origin/master'

src/main/java/com/xiaomai/cases/polar/memberCard/TestMemberCardSearch.java

@@ -30,15 +30,19 @@ public class TestMemberCardSearch extends XMBaseTest {
     }
     @Test(description = "会员卡列表根据卡名称-全局搜索")
     public void testMemberCardcommonSearch() {
-        String memberCardName="次卡-自动化卡"+ RandomStringUtil.randomString(3);
-        cardTools.memberCardCreate(memberCardName);//创建随机的名的次卡
+        cardTools.fetchPageOfMemberCard("MEMBER_CARD");
+        String memberCardName=XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].title");
+        //String memberCardName="次卡-自动化卡"+ RandomStringUtil.randomString(3);
+        //cardTools.memberCardCreate(memberCardName);//创建随机的名的次卡
+        //cardTools.oneKeyCreateMembershipCardNumberCard(memberCardName);
+
         //cardTools.memberCardCreate("次卡-自动化卡"+ RandomStringUtil.randomString(4));//创建随机的名的次卡
         //cardTools.fetchPageOfMemberCard("MEMBER_CARD");
         //String memberCardName=XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].title");//列表第一张
 
         cardTools.fetchPageOfMemberCard("MEMBER_CARD");//创建成功后查询会员卡列表（此处也可以不查询）
         Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(),"$.result.records").size()>=1,"创建会员卡成功后，会员卡列表数据为空");
-        Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].title"),memberCardName,"创建成功后，列表中第一条数据不是显示的该卡");
+        Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].title"),memberCardName,"第一张卡不是该卡");
 
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());