Skip to content

X
xm-sportstest
Commit 9dad5640 by yangfangfang
Options

完善标签管理各种场景

parent ae3a43e7
Showing with 216 additions and 16 deletions
src/main/java/com/xiaomai/cases/polar/setting/TagTools.java
package com.xiaomai.cases.polar.setting; package com.xiaomai.cases.polar.setting;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.client.DataUserInfo; import com.xiaomai.client.DataUserInfo;
import com.xiaomai.enums.ApiModule; import com.xiaomai.enums.ApiModule;
...@@ -7,6 +8,9 @@ import com.xiaomai.enums.RequestType; ...@@ -7,6 +8,9 @@ import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal; import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.XMBaseTest; import com.xiaomai.utils.XMBaseTest;
import java.util.ArrayList;
import java.util.List;
public class TagTools extends XMBaseTest { public class TagTools extends XMBaseTest {
/** /**
...@@ -36,7 +40,7 @@ public class TagTools extends XMBaseTest { ...@@ -36,7 +40,7 @@ public class TagTools extends XMBaseTest {
/** /**
* @param * @param
* @description:删除标签 * @description:删除未被使用的标签
* @author: yangfangfang * @author: yangfangfang
* @date: 2024/3/5 14:28 * @date: 2024/3/5 14:28
* @return: com.alibaba.fastjson.JSONObject * @return: com.alibaba.fastjson.JSONObject
...@@ -63,7 +67,34 @@ public class TagTools extends XMBaseTest { ...@@ -63,7 +67,34 @@ public class TagTools extends XMBaseTest {
/** /**
* @param * @param
* @description:删除标签 * @description:删除已被本场馆使用的标签
* @author: yangfangfang
* @date: 2024/3/5 14:28
* @return: com.alibaba.fastjson.JSONObject
**/
public JSONObject tagDelete_Used(String id,DataUserInfo...dataUserInfos) {
dataApi.setApiModule(ApiModule.Polar_Setting)
.setApiName("API_tag_deleteById")
.setTerminal(Terminal.B);
super.beforeDataRequest(dataUserInfos);
JSONObject deleteTag1=new JSONObject();
deleteTag1.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
deleteTag1.put("brandId",xmAppApi.getLoginInfo().getBrandId());
deleteTag1.put("studioId",xmAppApi.getLoginInfo().getStudioId());
deleteTag1.put("id",id);
deleteTag1.put("confirm",true);
dataApi.doRequest(RequestType.JSON, dataparams, deleteTag1.toJSONString(), dataheadrs).assetsSuccess(true);
JSONObject response=dataApi.getBodyInJSON();
return response;
}
/**
* @param
* @description:查询标签
* @author: yangfangfang * @author: yangfangfang
* @date: 2024/3/5 16:28 * @date: 2024/3/5 16:28
* @return: com.alibaba.fastjson.JSONObject * @return: com.alibaba.fastjson.JSONObject
...@@ -87,4 +118,38 @@ public class TagTools extends XMBaseTest { ...@@ -87,4 +118,38 @@ public class TagTools extends XMBaseTest {
return response; return response;
} }
/**
* @param
* @description:修改会员详情的标签
* @author: yangfangfang
* @date: 2024/3/16 16:28
* @return: com.alibaba.fastjson.JSONObject
**/
public JSONObject forceUpdate(String memberId, String name, String phone, String status,String tags, DataUserInfo...dataUserInfos) {
dataApi.setApiModule(ApiModule.Polar_Clue)
.setApiName("API_forceUpdate")
.setTerminal(Terminal.B);
super.beforeDataRequest(dataUserInfos);
JSONObject dataJson=new JSONObject();
dataJson.put("memberId",memberId);
dataJson.put("name",name);
dataJson.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
dataJson.put("phone",phone);
dataJson.put("status",status);
dataJson.put("studioId",xmAppApi.getLoginInfo().getStudioId());
List list = new ArrayList();
list.add(tags);
dataJson.put("tags",list);
dataApi.doRequest(RequestType.JSON, dataparams, dataJson.toJSONString(), dataheadrs).assetsSuccess(true);
JSONObject response=dataApi.getBodyInJSON();
return response;
}
} }
\ No newline at end of file
src/main/java/com/xiaomai/cases/polar/setting/tag/TestDeleteById.java
package com.xiaomai.cases.polar.setting.tag; package com.xiaomai.cases.polar.setting.tag;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.clue.MemberTools;
import com.xiaomai.cases.polar.setting.TagTools; import com.xiaomai.cases.polar.setting.TagTools;
import com.xiaomai.enums.ApiModule; import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount; import com.xiaomai.enums.LoginAccount;
...@@ -60,5 +61,53 @@ public class TestDeleteById extends XMBaseTest { ...@@ -60,5 +61,53 @@ public class TestDeleteById extends XMBaseTest {
Assert.assertEquals(total2,total,"删除标签失败"); Assert.assertEquals(total2,total,"删除标签失败");
} }
// @Test(description = "删除标签--已被会员使用")//待添加线索之后再补充 @Test(description = "删除标签--已被本场馆会员使用-同步删除同场馆会员的标签")
} public void testDeleteById_1(){
//memberId：1768875352924524545-自动化标签会员勿动1（还不能删除线索，不添加这么多，暂时先用一个）
//增加标签
JSONObject createTag=tagTools.tagCreate("自动化标签勿动1");
String tagId1=createTag.getString("result");
//给会员添加标签
JSONObject forceUpdate=tagTools.forceUpdate("1768875352924524545","自动化标签会员勿动1","10022233333","POTENTIAL",tagId1);
//删除标签
JSONObject deleteTag1=new JSONObject();
deleteTag1.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
deleteTag1.put("brandId",xmAppApi.getLoginInfo().getBrandId());
deleteTag1.put("studioId",xmAppApi.getLoginInfo().getStudioId());
deleteTag1.put("id",tagId1);
deleteTag1.put("confirm",true);
xmAppApi.doRequest(RequestType.JSON,params,deleteTag1.toJSONString(),headers).assetsSuccess(true);
JSONObject response=xmAppApi.getBodyInJSON();
String result=response.getJSONObject("result").getString("success");
Assert.assertEquals(result,"true","删除已被本场馆使用标签失败");
//验证是否被删除成功
//查询当前列表中还有没有这个标签
JSONObject fetchPage=tagTools.tagFetchPage("自动化标签勿动1");
int total=Integer.parseInt(fetchPage.getJSONObject("result").getString("total"));
Assert.assertEquals(0,total,"已被本场馆使用标签删除失败");
}
@Test(description = "删除标签--已被非本场馆会员使用-不能删除")
public void testDeleteById_2() {
//被别的场馆使用：tagId：1768900252624130050;memberId：1768900398913064961-自动化标签会员勿动1
//删除标签
JSONObject deleteTag2=new JSONObject();
deleteTag2.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
deleteTag2.put("brandId",xmAppApi.getLoginInfo().getBrandId());
deleteTag2.put("studioId",xmAppApi.getLoginInfo().getStudioId());
deleteTag2.put("id","1768900252624130050");
deleteTag2.put("confirm","");
xmAppApi.doRequest(RequestType.JSON,params,deleteTag2.toJSONString(),headers).assetsSuccess(true);
JSONObject response=xmAppApi.getBodyInJSON();
String result=response.getJSONObject("result").getString("success");
Assert.assertEquals(result,"false","删除已被非本场馆会员使用的标签失败");
}
}
src/main/java/com/xiaomai/cases/polar/setting/tag/TestEdit.java
package com.xiaomai.cases.polar.setting.tag; package com.xiaomai.cases.polar.setting.tag;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.clue.MemberTools;
import com.xiaomai.cases.polar.setting.TagTools; import com.xiaomai.cases.polar.setting.TagTools;
import com.xiaomai.enums.ApiModule; import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount; import com.xiaomai.enums.LoginAccount;
...@@ -15,8 +16,11 @@ import org.testng.annotations.Test; ...@@ -15,8 +16,11 @@ import org.testng.annotations.Test;
public class TestEdit extends XMBaseTest { public class TestEdit extends XMBaseTest {
TagTools tagTools=new TagTools(); TagTools tagTools=new TagTools();
MemberTools memberTools=new MemberTools();
String tagId; String tagId1;
String tagId2;
String tagId3;
@BeforeMethod @BeforeMethod
public void beforeTest(){ public void beforeTest(){
...@@ -33,17 +37,17 @@ public class TestEdit extends XMBaseTest { ...@@ -33,17 +37,17 @@ public class TestEdit extends XMBaseTest {
//添加标签 //添加标签
JSONObject createTag=tagTools.tagCreate("自动化专用"+RandomStringUtil.randomString(2)); JSONObject createTag=tagTools.tagCreate("自动化专用"+RandomStringUtil.randomString(2));
tagId=createTag.getString("result"); tagId1=createTag.getString("result");
//编辑标签 //编辑标签
JSONObject jsonObject=new JSONObject(); JSONObject editTag=new JSONObject();
jsonObject.put("bizAccountId",xmAppApi.getLoginInfo().getAdminId()); editTag.put("bizAccountId",xmAppApi.getLoginInfo().getAdminId());
jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId()); editTag.put("brandId",xmAppApi.getLoginInfo().getBrandId());
jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId()); editTag.put("studioId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("label","自动化编辑"+RandomStringUtil.randomString(2)); editTag.put("label","自动化编辑"+RandomStringUtil.randomString(2));
jsonObject.put("id",tagId); editTag.put("id",tagId1);
xmAppApi.doRequest(RequestType.JSON,params,jsonObject.toJSONString(),headers).assetsSuccess(true); xmAppApi.doRequest(RequestType.JSON,params,editTag.toJSONString(),headers).assetsSuccess(true);
JSONObject response=xmAppApi.getBodyInJSON(); JSONObject response=xmAppApi.getBodyInJSON();
String success=response.getJSONObject("result").getString("success"); String success=response.getJSONObject("result").getString("success");
Assert.assertEquals(success,"true","编辑标签失败"); Assert.assertEquals(success,"true","编辑标签失败");
...@@ -55,11 +59,92 @@ public class TestEdit extends XMBaseTest { ...@@ -55,11 +59,92 @@ public class TestEdit extends XMBaseTest {
} }
} }
// @Test(description = "编辑标签--已被会员使用")//待添加线索之后再补充 @Test(description = "编辑标签--已被本场馆会员使用-同步编辑使用此标签会员的标签")
public void testEdit_1(){
//memberId：1768875352924524545-自动化标签会员勿动1（还不能删除线索，不添加这么多，暂时先用一个）
//增加标签
JSONObject createTag=tagTools.tagCreate("自动化标签勿动2");
tagId2=createTag.getString("result");
//给会员添加标签
JSONObject forceUpdate=tagTools.forceUpdate("1768875352924524545","自动化标签会员勿动1","10022233333","POTENTIAL",tagId2);
//编辑标签
JSONObject editTag1=new JSONObject();
editTag1.put("bizAccountId",xmAppApi.getLoginInfo().getAdminId());
editTag1.put("brandId",xmAppApi.getLoginInfo().getBrandId());
editTag1.put("studioId",xmAppApi.getLoginInfo().getStudioId());
editTag1.put("label","自动化编辑呀");
editTag1.put("id",tagId2);
editTag1.put("confirm",true);
xmAppApi.doRequest(RequestType.JSON,params,editTag1.toJSONString(),headers).assetsSuccess(true);
JSONObject response=xmAppApi.getBodyInJSON();
String success=response.getJSONObject("result").getString("success");
Assert.assertEquals(success,"true","已被本场馆使用标签编辑失败");
//验证标签更新
//查询当前标签列表中这个标签名有没有更新
JSONObject fetchPage=tagTools.tagFetchPage("自动化编辑呀");
int total=Integer.parseInt(fetchPage.getJSONObject("result").getString("total"));
Assert.assertEquals(1,total,"已被本场馆使用标签编辑失败");
//查看会员详情的标签名有没有更新
JSONObject findDetailById=memberTools.getDetailById("1768875352924524545");
String label=findDetailById.getJSONObject("result").getJSONArray("tags").getJSONObject(0).getString("label");
Assert.assertEquals(label,"自动化编辑呀","此标签被使用的会员未同步更新标签");
}
@Test(description = "编辑标签--已被非本场馆会员使用-不能编辑")
public void testEdit_2() {
//被别的场馆使用：tagId：1768900252624130050;memberId：1768900398913064961-自动化标签会员勿动1
//编辑标签
JSONObject editTag2=new JSONObject();
editTag2.put("bizAccountId",xmAppApi.getLoginInfo().getAdminId());
editTag2.put("brandId",xmAppApi.getLoginInfo().getBrandId());
editTag2.put("studioId",xmAppApi.getLoginInfo().getStudioId());
editTag2.put("label","自动化编辑"+RandomStringUtil.randomString(2));
editTag2.put("id","1768900252624130050");
xmAppApi.doRequest(RequestType.JSON,params,editTag2.toJSONString(),headers).assetsSuccess(true);
JSONObject response=xmAppApi.getBodyInJSON();
String success=response.getJSONObject("result").getString("success");
Assert.assertEquals(success,"false","编辑已被非本场馆会员使用的标签失败");
}
@Test(description = "编辑标签--编辑相同标签名失败")
public void testEdit_3() {
//被别的场馆使用：tagId：1768900252624130050;memberId：1768900398913064961-自动化标签会员勿动1
//增加标签
JSONObject createTag=tagTools.tagCreate("自动化标签勿动3");
tagId3=createTag.getString("result");
//编辑标签
JSONObject editTag3=new JSONObject();
editTag3.put("bizAccountId",xmAppApi.getLoginInfo().getAdminId());
editTag3.put("brandId",xmAppApi.getLoginInfo().getBrandId());
editTag3.put("studioId",xmAppApi.getLoginInfo().getStudioId());
editTag3.put("label","自动化标签勿删");
editTag3.put("id",tagId3);
xmAppApi.doRequest(RequestType.JSON,params,editTag3.toJSONString(),headers).assetsSuccess(false);
JSONObject response=xmAppApi.getBodyInJSON();
String success=response.getString("success");
Assert.assertEquals(success,"false","相同标签名已存在，不可重复");
}
//删除标签 //删除标签
@Test(description = "删除标签",priority = 1) @Test(description = "删除标签",priority = 1)
public void deleteTag(){ public void deleteTag(){
tagTools.tagDelete(tagId); tagTools.tagDelete(tagId1);
tagTools.tagDelete_Used(tagId2);
tagTools.tagDelete(tagId3);
} }
} }
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