Merge branch 'master' of ssh://xmgit.ixm5.cn:10022/xiamai-test/xm-sportstest

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

@@ -323,7 +323,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
             String[] result2 = new String[] {"resourceId","consumeType","changeOfUsablePurchaseBalance"};
             String[] result2 = new String[] {"resourceId","consumeType","changeOfUsablePurchaseBalance"};
             String[] respect = new String[] {reserveId,"CANCEL_RESERVE","1.00"};
             String[] respect = new String[] {reserveId,"CANCEL_RESERVE","1.00"};
             String[] message1 = new String[] {"会员卡消耗记录中记录的资源id与实际约课记录id不符合","会员卡消耗记录中记录的资源id与实际约课记录类型不符合","会员卡消耗记录中记录的资源id与实际约课记录余额不符合"};
             String[] message1 = new String[] {"会员卡消耗记录中记录的资源id与实际约课记录id不符合","会员卡消耗记录中记录的资源id与实际约课记录类型不符合","会员卡消耗记录中记录的资源id与实际约课记录余额不符合"};
-            for (int i = 0; i < consumeRecord.size(); i++){
+            for (int i = 0; i < result2.length; i++){
                 Assert.assertEquals(consumeRecord.getJSONObject(0).getString(result2[i]),respect[i],message1[i]);
                 Assert.assertEquals(consumeRecord.getJSONObject(0).getString(result2[i]),respect[i],message1[i]);
             }
             }
 
 

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

@@ -196,7 +196,7 @@ public class TestAddToQueue extends BaseTestImpl {
         // check 2.2 排队学员Amy 会员卡消耗记录中包含该记录释放
         // check 2.2 排队学员Amy 会员卡消耗记录中包含该记录释放
         JSONArray consumeRecord = cardTools.fetchPageOfConsumeRecord(memberId2.getString(1),memberId2.getString(2)).getJSONObject("result").getJSONArray("records");
         JSONArray consumeRecord = cardTools.fetchPageOfConsumeRecord(memberId2.getString(1),memberId2.getString(2)).getJSONObject("result").getJSONArray("records");
         String[] result2 = new String[] {"resourceId","consumeType","changeOfUsablePurchaseBalance"};
         String[] result2 = new String[] {"resourceId","consumeType","changeOfUsablePurchaseBalance"};
-        String[] respect = new String[] {reserveId,"CANCEL_QUEUE","1.00"};
+        String[] respect = new String[] {memberId2.getString(3),"CANCEL_QUEUE","1.00"};
         String[] message = new String[] {"会员卡消耗记录中记录的资源id与实际约课记录id不符合","会员卡消耗记录中记录的资源id与实际约课记录类型不符合","会员卡消耗记录中记录的资源id与实际约课记录余额不符合"};
         String[] message = new String[] {"会员卡消耗记录中记录的资源id与实际约课记录id不符合","会员卡消耗记录中记录的资源id与实际约课记录类型不符合","会员卡消耗记录中记录的资源id与实际约课记录余额不符合"};
         for (int i = 0; i < result2.length; i++){
         for (int i = 0; i < result2.length; i++){
             Assert.assertEquals(consumeRecord.getJSONObject(0).getString(result2[i]),respect[i],message[i]);
             Assert.assertEquals(consumeRecord.getJSONObject(0).getString(result2[i]),respect[i],message[i]);