Skip to content

X
xm-sportstest
Commit 7ea5f7bf by xuyamei
Options

更换员工登录信息

parent b6cf0868
Showing with 93 additions and 36 deletions
src/main/java/com/xiaomai/cases/polar/admin/AdminTools.java
......@@ -43,6 +43,10 @@ public class AdminTools extends XMBaseTest {
avatar.put("content",name.charAt(name.length() - 1));
body.put("avatar",avatar); // 员工头像未设置取昵称最后一个字
body.put("gender","MAN");
body.put("userId",dataApi.getLoginInfo().getUser());
body.put("brandId",dataApi.getLoginInfo().getBrandId());
body.put("studioId",dataApi.getLoginInfo().getStudioId());
body.put("operatorId",dataApi.getLoginInfo().getAdminId());
JSONArray roles = new JSONArray(); // 角色
JSONObject teaching = new JSONObject();
......
src/main/java/com/xiaomai/cases/polar/admin/TestAddStudioAdmin.java
......@@ -11,6 +11,7 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import javax.annotation.Resource;
import javax.swing.*;
import java.util.Random;
/**
......@@ -30,7 +31,7 @@ public class TestAddStudioAdmin extends BaseTestImpl {
@BeforeClass
public void beforeTest(){
setTestInfo(ApiModule.Polar_Admin,"API_addStudioAdmin", LoginAccount.XYM_DEV, Terminal.B,"xym");
setTestInfo(ApiModule.Polar_Admin,"API_addStudioAdmin", LoginAccount.GYM_PROD, Terminal.B,"xym");
super.beforeTest();
}
......@@ -51,12 +52,27 @@ public class TestAddStudioAdmin extends BaseTestImpl {
String[] resultString = {"name","phone","roles","teaching"}; // 新建之后验证相应的值
for (int i = 0; i < resultString.length; i++){
// check 1:创建员工时的值与查询员工详情时的值是否一致
Assert.assertEquals(addRequest.getString(resultString[i]),adminInfo.getJSONObject("result").getString(resultString[i]),"添加员工失败,员工详情与创建员工时的信息不一致");
String checkResult = resultString[i].equals("roles") ? addRequest.getJSONArray("roles").getString(0) : addRequest.getString(resultString[i]);
String expected = resultString[i].equals("roles") ? adminInfo.getJSONObject("result").getJSONArray(resultString[i]).getJSONObject(0).getString("code") : adminInfo.getJSONObject("result").getString(resultString[i]);
Assert.assertEquals(checkResult,expected,"添加员工失败,员工详情与创建员工时的信息不一致");
}
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// check 2: 生成对应的操作日志
String body = "{\"current\":0,\"size\":10,\"domainId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"opEventKey\":\"ADD_ADMIN\"}";
String body = "{\"current\":0,\"size\":10,\"domainId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"brandId\": \""+xmAppApi.getLoginInfo().getBrandId()+"\",\"studioId\": \""+xmAppApi.getLoginInfo().getStudioId()+"\",\"content\": \""+adminInfo.getJSONObject("result").getString("name")+"\",\"opEventKey\":\"ADD_ADMIN\"}";
JSONObject response = configTools.getOpauditPage(body);
Assert.assertEquals(response.getJSONObject("result").getJSONArray("records").getJSONObject(0).getJSONObject("target").getString("targetId"),result,"添加员工未生成操作日志");
}
@Test(description = "添加员工，由于没有删除员工的操作，则每次随机取一个角色")
public void testAddStudioAdmin1(){
for (int i = 0; i < 2; i++){
JSONObject addRequest = adminTools.addStudioAdmin("教练");
}
}
}
src/main/java/com/xiaomai/cases/polar/admin/TestCheckExistInStudio.java
......@@ -27,7 +27,7 @@ public class TestCheckExistInStudio extends BaseTestImpl {
@BeforeClass
@Override
public void beforeTest() {
setTestInfo(ApiModule.Polar_Admin,"API_checkExistInStudio", LoginAccount.XYM_DEV, Terminal.B,"xym");
setTestInfo(ApiModule.Polar_Admin,"API_checkExistInStudio", LoginAccount.GYM_PROD, Terminal.B,"xym");
super.beforeTest();
}
......
src/main/java/com/xiaomai/cases/polar/admin/TestCheckPermConfigDup.java
package com.xiaomai.cases.polar.admin;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.basetest.BaseTestImpl;
import com.xiaomai.enums.ApiModule;
......@@ -23,25 +24,33 @@ public class TestCheckPermConfigDup extends BaseTestImpl {
@BeforeClass
public void beforeTest(){
setTestInfo(ApiModule.Polar_Admin,"API_checkPermConfigDup", LoginAccount.XYM_DEV, Terminal.B,"xym");
setTestInfo(ApiModule.Polar_Admin,"API_checkPermConfigDup", LoginAccount.GYM_PROD, Terminal.B,"xym");
super.beforeTest();
}
@DataProvider()
public Object[][] data(){
return new Object[][]{
{"{\"permCodes\": [\"FitHeadPage\", \"FitCluePrivate\", \"FitSeeValidMember\", \"FitCluePublic\", \"FitAddClue\", \"FitEditClue\", \"FitReleaseClue\"],\n" +
" \"configMap\": {\n" +
" \"memberAccess\": false,\n" +
" \"scheduleAccess\": false,\n" +
" \"reserveAccess\": false,\n" +
" \"followUpAccess\": false,\n" +
" \"importAccess\": false,\n" +
" \"exportAccess\": false,\n" +
" \"taskAccess\": false,\n" +
" \"potentialPhoneMask\": true,\n" +
" \"memberPhoneMask\": false,\n" +
" \"historyPhoneMask\": true}}",true}, // 存在有相同权限的角色
{"{\n" +
"\t\"permCodes\": [\"FitHeadInfo\", \"FitIncomeExpense\", \"FitSeeOrder\", \"FitEditOrder\", \"FitSeeXmPay\", \"FitManageXmPay\", \"FitFinanceData\"],\n" +
"\t\"configMap\": {\n" +
"\t\t\"memberAccess\": true,\n" +
"\t\t\"scheduleAccess\": false,\n" +
"\t\t\"reserveAccess\": false,\n" +
"\t\t\"followUpAccess\": false,\n" +
"\t\t\"importAccess\": true,\n" +
"\t\t\"exportAccess\": true,\n" +
"\t\t\"taskAccess\": true,\n" +
"\t\t\"orderAccess\": true,\n" +
"\t\t\"incomeExpenseAccess\": true,\n" +
"\t\t\"potentialPhoneMask\": false,\n" +
"\t\t\"memberPhoneMask\": false,\n" +
"\t\t\"historyPhoneMask\": false\n" +
"\t},\n" +
"\t\"brandId\": \"1796482011391729666\",\n" +
"\t\"studioId\": \"1800375402938871809\",\n" +
"\t\"operatorId\": \"1796482250721169409\"\n" +
"}",true}, // 存在有相同权限的角色
{"{\n" +
" \"permCodes\": [\"FitHeadPage\", \"FitCluePublic\", \"FitAddClue\", \"FitEditClue\", \"FitReleaseClue\"],\n" +
" \"configMap\": {\n" +
......@@ -60,6 +69,10 @@ public class TestCheckPermConfigDup extends BaseTestImpl {
}
@Test(dataProvider = "data")
public void testCheckPermConfigDup(String body,boolean flag){
JSONObject request = JSONObject.parseObject(body);
request.put("brandId",xmAppApi.getLoginInfo().getBrandId());
request.put("studioId",xmAppApi.getLoginInfo().getStudioId());
request.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
xmAppApi.doRequest(RequestType.JSON,params,body,headers).assetsSuccess(true);
JSONObject response = xmAppApi.getBodyInJSON();
Assert.assertEquals(response.getJSONArray("result").size()>0,flag,"校验角色权限配置是否重复");
......
src/main/java/com/xiaomai/cases/polar/admin/TestCheckRoleNameDup.java
......@@ -24,7 +24,7 @@ public class TestCheckRoleNameDup extends BaseTestImpl {
@BeforeClass
public void beforeTest(){
setTestInfo(ApiModule.Polar_Admin,"API_checkRoleNameDup", LoginAccount.XYM_DEV, Terminal.B,"xym");
setTestInfo(ApiModule.Polar_Admin,"API_checkRoleNameDup", LoginAccount.GYM_PROD, Terminal.B,"xym");
super.beforeTest();
}
......
src/main/java/com/xiaomai/cases/polar/admin/TestDepartStudioAdmin.java
......@@ -31,7 +31,7 @@ public class TestDepartStudioAdmin extends BaseTestImpl {
@BeforeClass
@Override
public void beforeTest() {
setTestInfo(ApiModule.Polar_Admin,"API_departStudioAdmin", LoginAccount.XYM_DEV, Terminal.B,"xym");
setTestInfo(ApiModule.Polar_Admin,"API_departStudioAdmin", LoginAccount.GYM_PROD, Terminal.B,"xym");
super.beforeTest();
}
......@@ -44,6 +44,7 @@ public class TestDepartStudioAdmin extends BaseTestImpl {
if (total>1){
String adminId = adminPage.getJSONObject("result").getJSONArray("records").getJSONObject(1).getString("id");
String phone = adminPage.getJSONObject("result").getJSONArray("records").getJSONObject(1).getString("phone");
String name = adminPage.getJSONObject("result").getJSONArray("records").getJSONObject(1).getString("name");
body = "{\"id\":\""+adminId+"\"}";
xmAppApi.doRequest(RequestType.JSON,params,body,headers).assetsSuccess(true);
try {
......@@ -56,9 +57,13 @@ public class TestDepartStudioAdmin extends BaseTestImpl {
adminPage = adminTools.pageStudioAdmin(body);
total = Integer.parseInt(adminPage.getJSONObject("result").getString("total"));
Assert.assertEquals(total,1,"员工离职失败,用手机号查询离职员工未返回数据");
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// check 2: 生成对应的操作日志
body = "{\"current\":0,\"size\":10,\"domainId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"opEventKey\":\"LEFT_ADMIN\"}";
body = "{\"current\":0,\"size\":10,\"content\": \""+name+"\",\"domainId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"brandId\": \""+xmAppApi.getLoginInfo().getBrandId()+"\",\"studioId\": \""+xmAppApi.getLoginInfo().getStudioId()+"\",\n\"opEventKey\":\"LEFT_ADMIN\"}";
JSONObject response = configTools.getOpauditPage(body);
Assert.assertEquals(response.getJSONObject("result").getJSONArray("records").getJSONObject(0).getJSONObject("target").getString("targetId"),adminId,"员工离职未生成操作日志");
......
src/main/java/com/xiaomai/cases/polar/admin/TestEditStudioAdmin.java
......@@ -31,7 +31,7 @@ public class TestEditStudioAdmin extends BaseTestImpl {
@BeforeClass
@Override
public void beforeTest() {
setTestInfo(ApiModule.Polar_Admin,"API_editStudioAdmin", LoginAccount.XYM_DEV, Terminal.B,"xym");
setTestInfo(ApiModule.Polar_Admin,"API_editStudioAdmin", LoginAccount.GYM_PROD, Terminal.B,"xym");
super.beforeTest();
}
......@@ -97,13 +97,26 @@ public class TestEditStudioAdmin extends BaseTestImpl {
String[] resultString = {"id","phone","name","nickName","gender","avatar","roles","teaching","birthDate","entryDate","memo"}; // 修改之后验证的值
for (int i = 0; i < resultString.length; i++){
String result = adminInfo.getJSONObject("result").getString(resultString[i]);
System.out.println("-------"+resultString[i]);
if (resultString[i].equals("roles")){
JSONArray arr = new JSONArray();
for (int j=0;j<adminInfo.getJSONObject("result").getJSONArray(resultString[i]).size();j++){
arr.add(adminInfo.getJSONObject("result").getJSONArray(resultString[i]).getJSONObject(j).getString("code"));
}
result = arr.toJSONString();
System.out.println("---------------2"+result);
}
Assert.assertEquals(result, requestBody.getString(resultString[i]));
System.out.println(resultString[i] + " : " + result);
System.out.println(adminInfo.getJSONObject("result").getString(resultString[i]));
}
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// check 2: 生成对应的操作日志
body = "{\"current\":0,\"size\":10,\"domainId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"opEventKey\":\"EDIT_ADMIN\"}";
body = "{\"current\":0,\"size\":10,\"domainId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"content\": \""+name+"\",\"brandId\": \""+xmAppApi.getLoginInfo().getBrandId()+"\",\"studioId\": \""+xmAppApi.getLoginInfo().getStudioId()+"\",\"opEventKey\":\"EDIT_ADMIN\"}";
JSONObject response = configTools.getOpauditPage(body);
Assert.assertEquals(response.getJSONObject("result").getJSONArray("records").getJSONObject(0).getJSONObject("target").getString("targetId"),adminId,"编辑员工未生成操作日志");
......
src/main/java/com/xiaomai/cases/polar/admin/TestGetAdmin.java
......@@ -23,7 +23,7 @@ public class TestGetAdmin extends XMBaseTest {
public void beforeTest() {
xmAppApi.setApiModule(ApiModule.Polar_Admin) // API 所属模块
.setApiName("API_getAdmin")
.setLoginUser(LoginAccount.XYM_DEV) // http 接口，测试账号
.setLoginUser(LoginAccount.GYM_PROD) // http 接口，测试账号
.setTerminal(Terminal.B); // 所属端位（B端，C端，M端等, 必传）
dal.setCase_owner("xym")
.setCase_name( Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
......
src/main/java/com/xiaomai/cases/polar/admin/TestReinStateStudioAdmin.java
......@@ -29,7 +29,7 @@ public class TestReinStateStudioAdmin extends BaseTestImpl {
@BeforeClass
@Override
public void beforeTest() {
setTestInfo(ApiModule.Polar_Admin,"API_reinStateStudioAdmin", LoginAccount.XYM_DEV, Terminal.B,"xym");
setTestInfo(ApiModule.Polar_Admin,"API_reinStateStudioAdmin", LoginAccount.GYM_PROD, Terminal.B,"xym");
super.beforeTest();
}
......@@ -42,6 +42,7 @@ public class TestReinStateStudioAdmin extends BaseTestImpl {
if (total>1){
String adminId = adminPage.getJSONObject("result").getJSONArray("records").getJSONObject(1).getString("id");
String phone = adminPage.getJSONObject("result").getJSONArray("records").getJSONObject(1).getString("phone");
String name = adminPage.getJSONObject("result").getJSONArray("records").getJSONObject(1).getString("name");
body = "{\"id\":\""+adminId+"\"}";
xmAppApi.doRequest(RequestType.JSON,params,body,headers).assetsSuccess(true);
try {
......@@ -55,8 +56,13 @@ public class TestReinStateStudioAdmin extends BaseTestImpl {
total = Integer.parseInt(adminPage.getJSONObject("result").getString("total"));
Assert.assertEquals(total,1,"员工离职失败,用手机号查询离职员工未返回数据");
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// check 2: 生成对应的操作日志
body = "{\"current\":0,\"size\":10,\"domainId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"opEventKey\":\"RESTORE_ADMIN\"}";
body = "{\"current\":0,\"size\":10,\"domainId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"content\": \""+name+"\",\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"studioId\": \""+xmAppApi.getLoginInfo().getStudioId()+"\",\"opEventKey\":\"RESTORE_ADMIN\"}";
JSONObject response = configTools.getOpauditPage(body);
Assert.assertEquals(response.getJSONObject("result").getJSONArray("records").getJSONObject(0).getJSONObject("target").getString("targetId"),adminId,"员工离职未生成操作日志");
......
src/main/java/com/xiaomai/cases/polar/admin/TestStudioRoleCreate.java
......@@ -32,7 +32,7 @@ public class TestStudioRoleCreate extends BaseTestImpl {
@BeforeClass
public void beforeTest(){
setTestInfo(ApiModule.Polar_Admin,"API_studioRole_create", LoginAccount.XYM_DEV, Terminal.B,"xym");
setTestInfo(ApiModule.Polar_Admin,"API_studioRole_create", LoginAccount.GYM_PROD, Terminal.B,"xym");
super.beforeTest();
}
@Test(description = "新建角色 --> 查询列表是否有该角色 --> 删除新建的角色")
......@@ -87,7 +87,7 @@ public class TestStudioRoleCreate extends BaseTestImpl {
throw new RuntimeException(e);
}
// 校验2：查询日志是否有创建员工角色记录
body = "{\"current\":0,\"size\":10,\"domainId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"opEventKey\":\"ADD_ROLE\"}";
body = "{\"current\":0,\"size\":10,\"domainId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"content\": \"角#色设定##\",\"brandId\": \""+xmAppApi.getLoginInfo().getBrandId()+"\",\"studioId\": \""+xmAppApi.getLoginInfo().getStudioId()+"\",\"opEventKey\":\"ADD_ROLE\"}";
JSONObject response = configTools.getOpauditPage(body);
Assert.assertEquals(response.getJSONObject("result").getJSONArray("records").getJSONObject(0).getJSONObject("target").getString("targetId"),id,"添加角色未生成操作日志");
......
src/main/java/com/xiaomai/cases/polar/admin/TestStudioRoleEdit.java
......@@ -30,7 +30,7 @@ public class TestStudioRoleEdit extends BaseTestImpl {
ConfigTools configTools;
@BeforeClass
public void beforeTest(){
setTestInfo(ApiModule.Polar_Admin,"API_studioRole_edit", LoginAccount.XYM_DEV, Terminal.B,"xym");
setTestInfo(ApiModule.Polar_Admin,"API_studioRole_edit", LoginAccount.GYM_PROD, Terminal.B,"xym");
super.beforeTest();
}
private String roleCode;
......@@ -87,12 +87,12 @@ public class TestStudioRoleEdit extends BaseTestImpl {
Assert.assertEquals(response.getJSONObject("result").getString("name"),"编辑角色名称","编辑角色名称失败");
try {
Thread.sleep(3000);
Thread.sleep(4000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 校验2：查询日志是否有编辑员工角色记录
body = "{\"current\":0,\"size\":10,\"domainId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"opEventKey\":\"EDIT_ROLE\"}";
body = "{\"current\":0,\"size\":10,\"domainId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"content\": \"编辑角色名称\",\"brandId\": \""+xmAppApi.getLoginInfo().getBrandId()+"\",\"studioId\": \""+xmAppApi.getLoginInfo().getStudioId()+"\",\"opEventKey\":\"EDIT_ROLE\"}";
response = configTools.getOpauditPage(body);
Assert.assertEquals(response.getJSONObject("result").getJSONArray("records").getJSONObject(0).getJSONObject("target").getString("targetId"),id,"编辑角色未生成操作日志");
......
src/main/java/com/xiaomai/cases/polar/admin/TestStudioRoleGetPermList.java
......@@ -23,7 +23,7 @@ import javax.annotation.Resource;
public class TestStudioRoleGetPermList extends BaseTestImpl {
@BeforeClass
public void beforeTest(){
setTestInfo(ApiModule.Polar_Admin,"API_studioRole_getPermList", LoginAccount.XYM_DEV, Terminal.B,"xym");
setTestInfo(ApiModule.Polar_Admin,"API_studioRole_getPermList", LoginAccount.GYM_PROD, Terminal.B,"xym");
super.beforeTest();
}
......@@ -33,7 +33,7 @@ public class TestStudioRoleGetPermList extends BaseTestImpl {
JSONArray jsonArray = xmAppApi.getBodyInJSONArray("$.result");
// 校验1：校验返回结果是否包含8个功能权限
Assert.assertEquals(jsonArray.size()>=8,true,"功能权限缺失" );
String[] arr = {"FitHeadPageCenter","FitBrandCenter","FitSalesCenter","FitMarketingTool","FitMemberCenter","FitBusinessCenter","FitFinanceCenter","FitManage"};
String[] arr = {"FitHeadPageCenter","FitBrandCenter","FitSalesCenter","FitDataCenter","FitMemberCenter","FitBusinessCenter","FitFinanceCenter","FitManage"};
JSONArray arr1 = new JSONArray();
for (String s : arr){
arr1.add(s);
......@@ -44,7 +44,7 @@ public class TestStudioRoleGetPermList extends BaseTestImpl {
result.add(jsonArray.getJSONObject(i).getString("code"));
}
// 校验2：校验返回结果是否包含既定的功能权限
Assert.assertEquals(result.equals(arr1),true,"功能权限模块缺失" );
Assert.assertEquals(result.containsAll(arr1),true,"功能权限模块缺失" );
}
}
src/main/java/com/xiaomai/cases/polar/admin/TestStudioRoleListByStudioId.java
......@@ -23,7 +23,7 @@ import org.testng.annotations.Test;
public class TestStudioRoleListByStudioId extends BaseTestImpl {
@BeforeClass
public void beforeTest(){
setTestInfo(ApiModule.Polar_Admin,"API_studioRole_listByStudioId", LoginAccount.XYM_DEV, Terminal.B,"xym");
setTestInfo(ApiModule.Polar_Admin,"API_studioRole_listByStudioId", LoginAccount.GYM_PROD, Terminal.B,"xym");
super.beforeTest();
}
......
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