Commit 2ce6ab4f by yangfangfang

解决报错

parent f59ede04
...@@ -23,6 +23,8 @@ public class TestScanCheckIn extends XMBaseTest { ...@@ -23,6 +23,8 @@ public class TestScanCheckIn extends XMBaseTest {
@Resource(name = "userTools") @Resource(name = "userTools")
UserTools userTools; UserTools userTools;
DataUserInfo info = new DataUserInfo(); DataUserInfo info = new DataUserInfo();
String suiteId;
String groupId;
@BeforeMethod @BeforeMethod
public void beforeTest(){ public void beforeTest(){
...@@ -54,7 +56,7 @@ public class TestScanCheckIn extends XMBaseTest { ...@@ -54,7 +56,7 @@ public class TestScanCheckIn extends XMBaseTest {
//获取当前场地组数量 //获取当前场地组数量
int suiteNum = venueAreaTools.getVenueAreaSuiteList().getJSONArray("result").size(); int suiteNum = venueAreaTools.getVenueAreaSuiteList().getJSONArray("result").size();
//1.创建场地 //1.创建场地
String groupId = venueAreaTools.saveVenueArea(); groupId = venueAreaTools.saveVenueArea();
//检验可预约场地数大于0 //检验可预约场地数大于0
Assert.assertTrue(venueAreaTools.getEnableVenueAreas().getJSONArray("result").size()>0); Assert.assertTrue(venueAreaTools.getEnableVenueAreas().getJSONArray("result").size()>0);
//2.创建场地组名 //2.创建场地组名
...@@ -62,7 +64,7 @@ public class TestScanCheckIn extends XMBaseTest { ...@@ -62,7 +64,7 @@ public class TestScanCheckIn extends XMBaseTest {
//检验该场地组名称是否重名,未重名则创建场地组 //检验该场地组名称是否重名,未重名则创建场地组
boolean flag = venueAreaTools.checkExistsName(suiteName); boolean flag = venueAreaTools.checkExistsName(suiteName);
if(flag==false){ if(flag==false){
String suiteId = venueAreaTools.createOrEditVenueAreaSuite(null,suiteName); suiteId = venueAreaTools.createOrEditVenueAreaSuite(null,suiteName);
//场地组创建成功后,检验场地组列表数量+1 //场地组创建成功后,检验场地组列表数量+1
Assert.assertTrue(venueAreaTools.getVenueAreaSuiteList().getJSONArray("result").size()==suiteNum+1); Assert.assertTrue(venueAreaTools.getVenueAreaSuiteList().getJSONArray("result").size()==suiteNum+1);
//检验场地组详情为启用中 //检验场地组详情为启用中
...@@ -96,8 +98,8 @@ public class TestScanCheckIn extends XMBaseTest { ...@@ -96,8 +98,8 @@ public class TestScanCheckIn extends XMBaseTest {
//获取用户 //获取用户
String memberId = userTools.getMemberInfo(info).getString("memberId"); String memberId = userTools.getMemberInfo(info).getString("memberId");
//获取当前时间小时数值往后+1 //获取当前时间小时数值往后+1
String startMinute = String.valueOf((TimeUtils.hourOfDay()+1)*60); String startMinute ="1410"; //暂时改成了这个时间 // String.valueOf((TimeUtils.hourOfDay()+1)*60);
String endMinute = String.valueOf((TimeUtils.hourOfDay()+1)*60+30);//结束时间与开始时间相差30分钟 String endMinute = "1440";//暂时改成了这个时间 String.valueOf((TimeUtils.hourOfDay()+1)*60+30);//结束时间与开始时间相差30分钟
//首次预约子场地-1,场地不冲突 //首次预约子场地-1,场地不冲突
Assert.assertEquals(XMJSONPath.readPath(venueAreaTools.checkMemberVenueBookingConflict(startMinute,endMinute,"0.00",groupId,memberId,reserveDay,areaId,info),"$.result.conflict"),"false"); Assert.assertEquals(XMJSONPath.readPath(venueAreaTools.checkMemberVenueBookingConflict(startMinute,endMinute,"0.00",groupId,memberId,reserveDay,areaId,info),"$.result.conflict"),"false");
//预约子场地-1 //预约子场地-1
...@@ -141,6 +143,11 @@ public class TestScanCheckIn extends XMBaseTest { ...@@ -141,6 +143,11 @@ public class TestScanCheckIn extends XMBaseTest {
//检验预约失败记录=0 //检验预约失败记录=0
Assert.assertEquals(XMJSONPath.readPath(venueAreaTools.countVenueBookingRefundFail(),"$.result"),"0"); Assert.assertEquals(XMJSONPath.readPath(venueAreaTools.countVenueBookingRefundFail(),"$.result"),"0");
}
}
@Test(description = "清除数据",priority = 1)
public void del(){
//清理数据 //清理数据
//b端场地组移除场地 //b端场地组移除场地
venueAreaTools.unbindVenueAreas(suiteId,groupId); venueAreaTools.unbindVenueAreas(suiteId,groupId);
...@@ -149,5 +156,4 @@ public class TestScanCheckIn extends XMBaseTest { ...@@ -149,5 +156,4 @@ public class TestScanCheckIn extends XMBaseTest {
//b端删除场地 //b端删除场地
venueAreaTools.deleteVenueArea(groupId); venueAreaTools.deleteVenueArea(groupId);
} }
}
} }
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