Skip to content

X
xm-sportstest
Commit bdeb4cf9 by yangfangfang
Options

Merge remote-tracking branch 'origin/master'

parents c14afd56 26d5e736
Showing with 12 additions and 13 deletions
src/main/java/com/xiaomai/cases/polar/entry/TestScan.java
......@@ -49,7 +49,7 @@ public class TestScan extends XMBaseTest {
Assert.assertEquals(res.getString("memberId"),"1805435813468483586");
Assert.assertEquals(res.getString("entryType"),"MEMBER");
Assert.assertEquals(res.getString("entryMethod"),"CODE");
Assert.assertEquals(res.getString("entryVoucherType"),"RESERVE");//原本是RESERVE，后面改成了 VENUE_BOOKING
Assert.assertTrue(res.getString("entryVoucherType").equals("RESERVE")||res.getString("entryVoucherType").equals("VENUE_BOOKING"));//RESERVE是使用约课记录入场，VENUE_BOOKING是使用约场记录入场，优先级是约课记录》约场记录
}
}
src/main/java/com/xiaomai/cases/polar/export/TestExportCard.java
......@@ -63,7 +63,7 @@ public class TestExportCard extends XMBaseTest {
xmAppApi.doRequest(RequestType.JSON,params,object.toString(),headers).assetsSuccess(true);
try {
Thread.sleep(3000);
Thread.sleep(5000);
} catch (InterruptedException e) {
e.printStackTrace();
}
......
src/main/java/com/xiaomai/cases/polar/schedule/camp/TestTrainingSign.java
......@@ -43,7 +43,7 @@ public class TestTrainingSign extends BaseTestImpl {
@Test(description = "训练营签到")
public void testTrainingSign() {
// 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(), "1887314841778122754"); // 造存量训练营活动，最多课次只能排200个课时，所以需要训练营排课时间结束之后重新造训练营数据（因报名人数很多，所以可以进行批量导入）
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(), "1960520725768978433"); // 造存量训练营活动，最多课次只能排200个课时，所以需要训练营排课时间结束之后重新造训练营数据（因报名人数很多，所以可以进行批量导入）
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情
......@@ -91,7 +91,7 @@ public class TestTrainingSign extends BaseTestImpl {
String[] result = new String[]{"id", "benefitId", "reserveMemberNum", "courseType", "reserveState", "scheduleId", "signInState"};
String[] resultData = new String[]{reserveId, benefitId, "1", "TRAINING_CAMP", "SUCCESS", scheduleId, "SIGNED"};
// check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("", "SUCCESS", "SIGNED", "", TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(), memberId, "TRAINING_CAMP", "1887314841778122754");
JSONArray getPageByStudio = reserveTools.getPageByStudio("", "SUCCESS", "SIGNED", "", TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(), memberId, "TRAINING_CAMP", "1960520725768978433");
boolean success = false;
for (int i = 0; i < getPageByStudio.size(); i++) {
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)) {
......@@ -123,7 +123,7 @@ public class TestTrainingSign extends BaseTestImpl {
@Test(description = "训练营请假", priority = 1)
public void testTrainingSign_Leave() {
// 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1887314841778122754");
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1960520725768978433");
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情
......@@ -170,7 +170,7 @@ public class TestTrainingSign extends BaseTestImpl {
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState"};
String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"LEAVE"};
// check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1887314841778122754");
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1960520725768978433");
boolean success = false;
for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){
......@@ -200,11 +200,10 @@ public class TestTrainingSign extends BaseTestImpl {
}
@Test(description = "训练营请假补签到", priority = 2)
public void testTrainingSign_SIGNED() {
// 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1887314841778122754");
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1960520725768978433");
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情
......@@ -259,7 +258,7 @@ public class TestTrainingSign extends BaseTestImpl {
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState"};
String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"SIGNED"};
// check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","SIGNED","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1887314841778122754");
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","SIGNED","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1960520725768978433");
boolean success = false;
for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){
......@@ -294,7 +293,7 @@ public class TestTrainingSign extends BaseTestImpl {
@Test(description = "训练营请假标记已补", priority = 3)
public void testTrainingSign_MARK_REMEDIAL() {
// 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1887314841778122754");
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1960520725768978433");
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情
......@@ -354,7 +353,7 @@ public class TestTrainingSign extends BaseTestImpl {
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState","remedialSignState"};
String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"LEAVE","MARK_REMEDIAL"};
// check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1887314841778122754");
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1960520725768978433");
boolean success = false;
for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){
......@@ -388,7 +387,7 @@ public class TestTrainingSign extends BaseTestImpl {
@Test(description = "训练营请假无需补课", priority = 3)
public void testTrainingSign_NEED_NOT_REMEDIAL() {
// 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1887314841778122754");
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1960520725768978433");
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情
......@@ -448,7 +447,7 @@ public class TestTrainingSign extends BaseTestImpl {
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState","remedialSignState"};
String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"LEAVE","NEED_NOT_REMEDIAL"};
// check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1887314841778122754");
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1960520725768978433");
boolean success = false;
for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment