Skip to content

X
xm-sportstest
Commit 2325e33c by xyy
Options

fix训练计划case

parent 7417dfa7
Showing with 47 additions and 40 deletions
src/main/java/com/xiaomai/cases/polar/training/TestTrainingPlanRecordCreate.java
...@@ -14,6 +14,7 @@ import com.xiaomai.utils.XMJSONPath; ...@@ -14,6 +14,7 @@ import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider; import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -22,7 +23,10 @@ public class TestTrainingPlanRecordCreate extends BaseTestImpl { ...@@ -22,7 +23,10 @@ public class TestTrainingPlanRecordCreate extends BaseTestImpl {
TrainingTools trainingTools; TrainingTools trainingTools;
@Resource(name="userTools") @Resource(name="userTools")
UserTools userTools; UserTools userTools;
DataUserInfo info = new DataUserInfo(); DataUserInfo info = new DataUserInfo();
String memberId;
String templateId;
@BeforeMethod @BeforeMethod
@Override @Override
...@@ -31,12 +35,12 @@ public class TestTrainingPlanRecordCreate extends BaseTestImpl { ...@@ -31,12 +35,12 @@ public class TestTrainingPlanRecordCreate extends BaseTestImpl {
super.beforeTest(); super.beforeTest();
} }
// @Test(description = "保存动作训练计划>查看计划>发送给学员>删除训练计划") @Test(description = "保存动作训练计划>查看计划>发送给学员>删除训练计划")
public void testTrainingPlanRecordCreate_1(){ public void testTrainingPlanRecordCreate_1()throws InterruptedException{
info.setTerminal(Terminal.C); info.setTerminal(Terminal.minApp);
info.setLoginUser(LoginAccount.GYM_MINIAPPC); info.setLoginUser(LoginAccount.GYM_MINIAPPC);
//1.获取会员id //1.获取会员id
String memberId = userTools.getMemberInfo(info).getString("memberId"); memberId = userTools.getMemberInfo(info).getString("memberId");
//2.搜索动作,获取相关参数 //2.搜索动作,获取相关参数
String exerciseId = trainingTools.getListByName("哑铃").getJSONArray("result").getJSONObject(0).getString("id"); String exerciseId = trainingTools.getListByName("哑铃").getJSONArray("result").getJSONObject(0).getString("id");
...@@ -51,19 +55,18 @@ public class TestTrainingPlanRecordCreate extends BaseTestImpl { ...@@ -51,19 +55,18 @@ public class TestTrainingPlanRecordCreate extends BaseTestImpl {
String itemType = "EXERCISE";//模板内容类型 String itemType = "EXERCISE";//模板内容类型
//4.创建模板 //4.创建模板
String templateName = "动作模板"+ RandomStringUtil.randomString(5); String templateName = "动作模板"+ RandomStringUtil.randomString(5);
String templateId = trainingTools.trainingTemplateCreate(itemType,itemName,templateName); templateId = trainingTools.trainingTemplateCreate(itemType,itemName,templateName);
//获取模板id、模板内容id、创建者、创建时间 //获取模板id、模板内容id、创建者、创建时间
String templateItemId = XMJSONPath.readPath(trainingTools.trainingTemplateDetail(templateId),"$.result.templateItemList[0].templateItemId"); String templateItemId = XMJSONPath.readPath(trainingTools.trainingTemplateDetail(templateId),"$.result.templateItemList[0].templateItemId");
String creatorName = XMJSONPath.readPath(trainingTools.trainingTemplateDetail(templateId),"$.result.creatorName"); String creatorName = XMJSONPath.readPath(trainingTools.trainingTemplateDetail(templateId),"$.result.creatorName");
String lastUpdated = XMJSONPath.readPath(trainingTools.trainingTemplateDetail(templateId),"$.result.lastUpdated"); String lastUpdated = XMJSONPath.readPath(trainingTools.trainingTemplateDetail(templateId),"$.result.lastUpdated");
//获取b端训练计划列表数据条数 //获取b端训练计划列表数据条数
int num = Integer.parseInt(XMJSONPath.readPath(trainingTools.trainingPlanRecordPage(memberId,null),"$.result.total")); int num = Integer.parseInt(XMJSONPath.readPath(trainingTools.trainingPlanRecordPage(memberId,""),"$.result.total"));
//获取c端训练计划列表数据条数
int total = Integer.parseInt(XMJSONPath.readPath(trainingTools.listMyTrainingPlan(memberId,templateName,info),"$.result.total"));
//5.创建训练计划 //5.创建训练计划
String planName = "动作训练计划"+RandomStringUtil.randomString(5); String planName = "动作训练计划"+RandomStringUtil.randomString(5);
//获取c端训练计划列表数据条数
int total = Integer.parseInt(XMJSONPath.readPath(trainingTools.listMyTrainingPlan(memberId,planName,info),"$.result.total"));
//构建template对象 //构建template对象
JSONArray templateItemList=new JSONArray(); JSONArray templateItemList=new JSONArray();
...@@ -108,70 +111,73 @@ public class TestTrainingPlanRecordCreate extends BaseTestImpl { ...@@ -108,70 +111,73 @@ public class TestTrainingPlanRecordCreate extends BaseTestImpl {
String recordId = XMJSONPath.readPath(xmAppApi.getBodyInJSON(),"$.result"); String recordId = XMJSONPath.readPath(xmAppApi.getBodyInJSON(),"$.result");
//检验b端学员名下数据+1 //检验b端学员名下数据+1
Assert.assertTrue(Integer.parseInt(XMJSONPath.readPath(trainingTools.trainingPlanRecordPage(memberId,null),"$.result.total"))==num+1); Assert.assertTrue(Integer.parseInt(XMJSONPath.readPath(trainingTools.trainingPlanRecordPage(memberId,""),"$.result.total"))==num+1);
//检验c端学员名下数据未变化 //检验c端学员名下数据未变化
Assert.assertTrue(Integer.parseInt(XMJSONPath.readPath(trainingTools.listMyTrainingPlan(memberId,templateName,info),"$.result.total"))==total); Assert.assertTrue(Integer.parseInt(XMJSONPath.readPath(trainingTools.listMyTrainingPlan(memberId,planName,info),"$.result.total"))==total);
//检验训练计划详情的状态为未发送，计划内容数据匹配创建值 //检验训练计划详情的状态为未发送，计划内容数据匹配创建值
Assert.assertEquals(trainingTools.trainingPlanRecordDetail(recordId),"$.result.sendStatus","UN_SEND"); Assert.assertEquals(XMJSONPath.readPath(trainingTools.trainingPlanRecordDetail(recordId),"$.result.sendStatus"),"UN_SEND");
Assert.assertEquals(trainingTools.trainingPlanRecordDetail(recordId),"$.result.itemDetailList[0].name",itemName); Assert.assertEquals(XMJSONPath.readPath(trainingTools.trainingPlanRecordDetail(recordId),"$.result.itemDetailList[0].name"),itemName);
Assert.assertEquals(trainingTools.trainingPlanRecordDetail(recordId),"$.result.itemDetailList[0].trainingTemplateItemType",itemType); Assert.assertEquals(XMJSONPath.readPath(trainingTools.trainingPlanRecordDetail(recordId),"$.result.itemDetailList[0].trainingTemplateItemType"),itemType);
//操作发送给学员：训练计划状态从未发送变成已发送 //操作发送给学员：训练计划状态从未发送变成已发送
trainingTools.updateSendStatus(recordId); trainingTools.updateSendStatus(recordId);
//检验训练计划详情的状态为已发送 //检验训练计划详情的状态为已发送
Assert.assertEquals(trainingTools.trainingPlanRecordDetail(recordId),"$.result.sendStatus","SEND"); Assert.assertEquals(XMJSONPath.readPath(trainingTools.trainingPlanRecordDetail(recordId),"$.result.sendStatus"),"SEND");
Thread.sleep(3000);
//检验c端学员名下数据+1 //检验c端学员名下数据+1
Assert.assertTrue(Integer.parseInt(XMJSONPath.readPath(trainingTools.listMyTrainingPlan(memberId,templateName,info),"$.result.total"))==total+1); Assert.assertTrue(Integer.parseInt(XMJSONPath.readPath(trainingTools.listMyTrainingPlan(memberId,planName,info),"$.result.total"))==total+1);
//检验c端训练记录详情 //检验c端训练记录详情
Assert.assertEquals(trainingTools.findMyTrainingPlanDetailById(recordId,info),"$.result.studioId"); Assert.assertEquals(XMJSONPath.readPath(trainingTools.findMyTrainingPlanDetailById(recordId,info),"$.result.studioId"),xmAppApi.getLoginInfo().getStudioId());
Assert.assertEquals(trainingTools.findMyTrainingPlanDetailById(recordId,info),"$.result.trainingPlanName",planName); Assert.assertEquals(XMJSONPath.readPath(trainingTools.findMyTrainingPlanDetailById(recordId,info),"$.result.trainingPlanName"),planName);
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(trainingTools.findMyTrainingPlanDetailById(recordId,info),"$.result.itemDetailList").size()>0); Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(trainingTools.findMyTrainingPlanDetailById(recordId,info),"$.result.itemDetailList").size()>0);
//检验c端分享的数据 //检验c端分享的数据
Assert.assertEquals(trainingTools.getShareDetail(recordId,info),"$.result.detail.trainingPlanName",planName); Assert.assertEquals(XMJSONPath.readPath(trainingTools.getShareDetail(recordId,info),"$.result.detail.trainingPlanName"),planName);
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(trainingTools.getShareDetail(recordId,info),"$.result.detail.itemDetailList").size()>0); Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(trainingTools.getShareDetail(recordId,info),"$.result.detail.itemDetailList").size()>0);
//5.清理数据 //5.清理数据
//删除训练计划 //删除训练计划
trainingTools.trainingPlanRecordDelete(recordId); trainingTools.trainingPlanRecordDelete(recordId);
//检验训练计划列表数据跟初始保持一致 //检验训练计划列表数据跟初始保持一致
Assert.assertTrue(Integer.parseInt(XMJSONPath.readPath(trainingTools.trainingPlanRecordPage(memberId,null),"$.result.total"))==num); Assert.assertTrue(Integer.parseInt(XMJSONPath.readPath(trainingTools.trainingPlanRecordPage(memberId,""),"$.result.total"))==num);
//删除训练模板 //删除训练模板
trainingTools.trainingTemplateDelete(templateId); trainingTools.trainingTemplateDelete(templateId);
} }
@DataProvider @DataProvider
public Object[][] dataProvider() { public Object[][] dataProvider() {
return new Object[][]{ return new Object[][]{
{null}, {""},
{"{\"items\":[{\"content\":\"自动化脚本生成的文本\",\"aspect\":\"\",\"type\":\"TEXT\"}]}"}, {"{\"items\":[{\"content\":\"自动化脚本生成的文本\",\"aspect\":\"\",\"type\":\"TEXT\"}]}"},
}; };
} }
// @Test(description = "保存并发送图文训练计划>查看计划>编辑计划>删除训练计划",dataProvider = "dataProvider") @Test(description = "保存并发送图文训练计划>查看计划>编辑计划>删除训练计划",dataProvider = "dataProvider")
public void testTrainingPlanRecordCreate_2(String content){ public void testTrainingPlanRecordCreate_2(String content)throws InterruptedException{
info.setTerminal(Terminal.C); info.setTerminal(Terminal.minApp);
info.setLoginUser(LoginAccount.GYM_MINIAPPC); info.setLoginUser(LoginAccount.GYM_MINIAPPC);
//1.获取会员id //1.获取会员id
String memberId = userTools.getMemberInfo(info).getString("memberId"); memberId = userTools.getMemberInfo(info).getString("memberId");
String itemName = "饮食搭配";//模板内容标题 String itemName = "饮食搭配";//模板内容标题
String itemType = "GRAPHIC";//模板内容类型 String itemType = "GRAPHIC";//模板内容类型
//2.创建模板 //2.创建模板
String templateName = "图文模板"+ RandomStringUtil.randomString(5); String templateName = "图文模板"+ RandomStringUtil.randomString(5);
String templateId = trainingTools.trainingTemplateCreate(itemType,itemName,templateName); templateId = trainingTools.trainingTemplateCreate(itemType,itemName,templateName);
//获取模板id、模板内容id、创建者、创建时间 //获取模板id、模板内容id、创建者、创建时间
String templateItemId = XMJSONPath.readPath(trainingTools.trainingTemplateDetail(templateId),"$.result.templateItemList[0].templateItemId"); String templateItemId = XMJSONPath.readPath(trainingTools.trainingTemplateDetail(templateId),"$.result.templateItemList[0].templateItemId");
String creatorName = XMJSONPath.readPath(trainingTools.trainingTemplateDetail(templateId),"$.result.creatorName"); String creatorName = XMJSONPath.readPath(trainingTools.trainingTemplateDetail(templateId),"$.result.creatorName");
String lastUpdated = XMJSONPath.readPath(trainingTools.trainingTemplateDetail(templateId),"$.result.lastUpdated"); String lastUpdated = XMJSONPath.readPath(trainingTools.trainingTemplateDetail(templateId),"$.result.lastUpdated");
//获取b端训练计划列表数据条数 //获取b端训练计划列表数据条数
int num = Integer.parseInt(XMJSONPath.readPath(trainingTools.trainingPlanRecordPage(memberId,null),"$.result.total")); int num = Integer.parseInt(XMJSONPath.readPath(trainingTools.trainingPlanRecordPage(memberId,""),"$.result.total"));
//获取c端训练计划列表数据条数
int total = Integer.parseInt(XMJSONPath.readPath(trainingTools.listMyTrainingPlan(memberId,templateName,info),"$.result.total"));
//训练计划名称
String planName = "图文训练计划"+RandomStringUtil.randomString(5); String planName = "图文训练计划"+RandomStringUtil.randomString(5);
//获取c端训练计划列表数据条数
int total = Integer.parseInt(XMJSONPath.readPath(trainingTools.listMyTrainingPlan(memberId,planName,info),"$.result.total"));
//构建template对象 //构建template对象
JSONArray templateItemList=new JSONArray(); JSONArray templateItemList=new JSONArray();
...@@ -216,22 +222,23 @@ public class TestTrainingPlanRecordCreate extends BaseTestImpl { ...@@ -216,22 +222,23 @@ public class TestTrainingPlanRecordCreate extends BaseTestImpl {
String recordId = XMJSONPath.readPath(xmAppApi.getBodyInJSON(),"$.result"); String recordId = XMJSONPath.readPath(xmAppApi.getBodyInJSON(),"$.result");
//检验b端学员名下数据+1 //检验b端学员名下数据+1
Assert.assertTrue(Integer.parseInt(XMJSONPath.readPath(trainingTools.trainingPlanRecordPage(memberId,null),"$.result.total"))==num+1); Assert.assertTrue(Integer.parseInt(XMJSONPath.readPath(trainingTools.trainingPlanRecordPage(memberId,""),"$.result.total"))==num+1);
Thread.sleep(3000);
//检验c端学员名下数据+1 //检验c端学员名下数据+1
Assert.assertTrue(Integer.parseInt(XMJSONPath.readPath(trainingTools.listMyTrainingPlan(memberId,templateName,info),"$.result.total"))==total+1); Assert.assertTrue(Integer.parseInt(XMJSONPath.readPath(trainingTools.listMyTrainingPlan(memberId,planName,info),"$.result.total"))==total+1);
//4.编辑模板 //4.编辑模板
String editName = "编辑训练计划"+RandomStringUtil.randomString(3); String editName = "编辑训练计划"+RandomStringUtil.randomString(3);
trainingTools.trainingPlanRecordEdit(memberId,content,editName,recordId,templateId,templateName,itemType,itemName); trainingTools.trainingPlanRecordEdit(memberId,content,editName,recordId,templateId,templateName,itemType,itemName);
//检验编辑后的训练计划详情数据一致 //检验编辑后的训练计划详情数据一致
Assert.assertEquals(trainingTools.trainingPlanRecordDetail(recordId),"$.result.detail.trainingPlanName",editName);; Assert.assertEquals(XMJSONPath.readPath(trainingTools.trainingPlanRecordDetail(recordId),"$.result.trainingPlanName"),editName);;
//5.清理数据 //5.清理数据
//删除训练计划 //删除训练计划
trainingTools.trainingPlanRecordDelete(recordId); trainingTools.trainingPlanRecordDelete(recordId);
//检验训练计划列表数据跟初始保持一致 //检验训练计划列表数据跟初始保持一致
Assert.assertTrue(Integer.parseInt(XMJSONPath.readPath(trainingTools.trainingPlanRecordPage(memberId,null),"$.result.total"))==num); Assert.assertTrue(Integer.parseInt(XMJSONPath.readPath(trainingTools.trainingPlanRecordPage(memberId,""),"$.result.total"))==num);
//删除训练模板 //删除训练模板
trainingTools.trainingTemplateDelete(templateId); trainingTools.trainingTemplateDelete(templateId);
} }
......
src/main/java/com/xiaomai/cases/polar/training/TrainingTools.java
...@@ -838,10 +838,10 @@ public class TrainingTools extends XMBaseTest { ...@@ -838,10 +838,10 @@ public class TrainingTools extends XMBaseTest {
body.put("templateId",templateId); body.put("templateId",templateId);
body.put("templateName",templateName); body.put("templateName",templateName);
body.put("trainingTemplateDetailList",trainList); body.put("trainingTemplateDetailList",trainList);
body.put("studioId",xmAppApi.getLoginInfo().getStudioId()); body.put("studioId",dataApi.getLoginInfo().getStudioId());
body.put("brandId", xmAppApi.getLoginInfo().getBrandId()); body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("creator",xmAppApi.getLoginInfo().getAdminId()); body.put("creator",dataApi.getLoginInfo().getAdminId());
body.put("operatorId", xmAppApi.getLoginInfo().getAdminId()); body.put("operatorId", dataApi.getLoginInfo().getAdminId());
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs); dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(dataApi.getApi_response(), "$.message")); Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(dataApi.getApi_response(), "$.message"));
...@@ -927,7 +927,7 @@ public class TrainingTools extends XMBaseTest { ...@@ -927,7 +927,7 @@ public class TrainingTools extends XMBaseTest {
public JSONObject listMyTrainingPlan(String memberId,String trainingPlanName,DataUserInfo...userInfo) { public JSONObject listMyTrainingPlan(String memberId,String trainingPlanName,DataUserInfo...userInfo) {
dataApi.setApiModule(ApiModule.Lunar_Training) dataApi.setApiModule(ApiModule.Lunar_Training)
.setApiName("API_listMyTrainingPlan") .setApiName("API_listMyTrainingPlan")
.setTerminal(Terminal.C); .setTerminal(Terminal.minApp);
super.beforeDataRequest(userInfo); super.beforeDataRequest(userInfo);
JSONObject body = new JSONObject(); JSONObject body = new JSONObject();
...@@ -954,7 +954,7 @@ public class TrainingTools extends XMBaseTest { ...@@ -954,7 +954,7 @@ public class TrainingTools extends XMBaseTest {
public JSONObject findMyTrainingPlanDetailById(String recordId,DataUserInfo...userInfo) { public JSONObject findMyTrainingPlanDetailById(String recordId,DataUserInfo...userInfo) {
dataApi.setApiModule(ApiModule.Lunar_Training) dataApi.setApiModule(ApiModule.Lunar_Training)
.setApiName("API_findMyTrainingPlanDetailById") .setApiName("API_findMyTrainingPlanDetailById")
.setTerminal(Terminal.C); .setTerminal(Terminal.minApp);
super.beforeDataRequest(userInfo); super.beforeDataRequest(userInfo);
JSONObject body = new JSONObject(); JSONObject body = new JSONObject();
...@@ -974,7 +974,7 @@ public class TrainingTools extends XMBaseTest { ...@@ -974,7 +974,7 @@ public class TrainingTools extends XMBaseTest {
public JSONObject getShareDetail(String recordId,DataUserInfo...userInfo) { public JSONObject getShareDetail(String recordId,DataUserInfo...userInfo) {
dataApi.setApiModule(ApiModule.Lunar_Training) dataApi.setApiModule(ApiModule.Lunar_Training)
.setApiName("API_getShareDetail") .setApiName("API_getShareDetail")
.setTerminal(Terminal.C); .setTerminal(Terminal.minApp);
super.beforeDataRequest(userInfo); super.beforeDataRequest(userInfo);
JSONObject extJson = new JSONObject(); JSONObject extJson = new JSONObject();
......
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