Skip to content

X
xm-sportstest
Commit c169a880 by yangfangfang
Options

Merge remote-tracking branch 'origin/master'

parents 2c827110 e7837af9
Showing with 22 additions and 11 deletions
src/main/java/com/xiaomai/cases/polar/admin/TestDepartStudioAdmin.java
...@@ -8,7 +8,6 @@ import com.xiaomai.enums.LoginAccount; ...@@ -8,7 +8,6 @@ import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.RequestType; import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal; import com.xiaomai.enums.Terminal;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;
...@@ -50,7 +49,7 @@ public class TestDepartStudioAdmin extends BaseTestImpl { ...@@ -50,7 +49,7 @@ public class TestDepartStudioAdmin extends BaseTestImpl {
int pageIndex = rand.nextInt(pages); int pageIndex = rand.nextInt(pages);
// 随机获取一页的随机员工 // 随机获取一页的随机员工
Random random = new Random(); Random random = new Random();
int index = pageIndex+1 == pages ? random.nextInt(total%20-1)+1 : random.nextInt(19)+1; int index = pageIndex == pages ? random.nextInt(total%20-1) : random.nextInt(19)+1;
body = "{\"size\":20,\"current\":"+pageIndex+",\"state\":\"DUTY\"}"; body = "{\"size\":20,\"current\":"+pageIndex+",\"state\":\"DUTY\"}";
adminPage = adminTools.pageStudioAdmin(body); adminPage = adminTools.pageStudioAdmin(body);
String adminId = adminPage.getJSONObject("result").getJSONArray("records").getJSONObject(index).getString("id"); String adminId = adminPage.getJSONObject("result").getJSONArray("records").getJSONObject(index).getString("id");
...@@ -64,12 +63,12 @@ public class TestDepartStudioAdmin extends BaseTestImpl { ...@@ -64,12 +63,12 @@ public class TestDepartStudioAdmin extends BaseTestImpl {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
// 用手机号查询离职员工是否有这个员工 // 用手机号查询离职员工是否有这个员工
body = "{\"size\":10,\"current\":0,\"state\":\"LEFT\",\"searchContext\":\""+phone+"\"}"; body = "{\"size\":20,\"current\":0,\"state\":\"LEFT\",\"searchContext\":\""+phone+"\"}";
adminPage = adminTools.pageStudioAdmin(body); adminPage = adminTools.pageStudioAdmin(body);
total = Integer.parseInt(adminPage.getJSONObject("result").getString("total")); total = Integer.parseInt(adminPage.getJSONObject("result").getString("total"));
Assert.assertEquals(total,1,"员工离职失败,用手机号查询离职员工未返回数据"); Assert.assertEquals(total,1,"员工离职失败,用手机号查询离职员工未返回数据");
try { try {
Thread.sleep(12000); Thread.sleep(20000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
......
src/main/java/com/xiaomai/cases/polar/admin/TestReinStateStudioAdmin.java
...@@ -68,14 +68,14 @@ public class TestReinStateStudioAdmin extends BaseTestImpl { ...@@ -68,14 +68,14 @@ public class TestReinStateStudioAdmin extends BaseTestImpl {
Assert.assertEquals(total,1,"员工离职失败,用手机号查询离职员工未返回数据"); Assert.assertEquals(total,1,"员工离职失败,用手机号查询离职员工未返回数据");
try { try {
Thread.sleep(15000); Thread.sleep(20000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
// check 2: 生成对应的操作日志 // check 2: 生成对应的操作日志
body = "{\"current\":0,\"size\":20,\"domainId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"content\": \""+name+"\",\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"studioId\": \""+xmAppApi.getLoginInfo().getStudioId()+"\",\"opEventKey\":\"RESTORE_ADMIN\"}"; body = "{\"current\":0,\"size\":20,\"domainId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"content\": \""+name+"\",\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"studioId\": \""+xmAppApi.getLoginInfo().getStudioId()+"\",\"opEventKey\":\"RESTORE_ADMIN\"}";
JSONObject response = configTools.getOpauditPage(body); JSONObject response = configTools.getOpauditPage(body);
Assert.assertEquals(response.getJSONObject("result").getJSONArray("records").getJSONObject(0).getJSONObject("target").getString("targetId"),adminId,"员工离职未生成操作日志"); Assert.assertEquals(response.getJSONObject("result").getJSONArray("records").getJSONObject(0).getJSONObject("target").getString("targetId"),adminId,"员工复职未生成操作日志");
} }
......
src/main/java/com/xiaomai/cases/polar/applet/TestSetStyleConfig.java
...@@ -32,7 +32,7 @@ public class TestSetStyleConfig extends XMBaseTest { ...@@ -32,7 +32,7 @@ public class TestSetStyleConfig extends XMBaseTest {
super.beforeTest(); super.beforeTest();
} }
@Test(description = "修改小程序全局配置") //@Test(description = "修改小程序全局配置")
public void testSetStyleConfig(){ public void testSetStyleConfig(){
Random random = new Random(); Random random = new Random();
String[] themeColor = {"132, 111, 234","40, 115, 255","51, 202, 105"};//紫、蓝、绿 String[] themeColor = {"132, 111, 234","40, 115, 255","51, 202, 105"};//紫、蓝、绿
......
src/main/java/com/xiaomai/cases/polar/importExcel/TestImportDeposit.java
...@@ -2,6 +2,7 @@ package com.xiaomai.cases.polar.importExcel; ...@@ -2,6 +2,7 @@ package com.xiaomai.cases.polar.importExcel;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.enums.ExcelImportEnum; import com.xiaomai.cases.polar.enums.ExcelImportEnum;
import com.xiaomai.cases.polar.memberCard.CardTools;
import com.xiaomai.cases.polar.utils.Entity.SignatureVO; import com.xiaomai.cases.polar.utils.Entity.SignatureVO;
import com.xiaomai.cases.polar.utils.ModifyExcelContentUtil; import com.xiaomai.cases.polar.utils.ModifyExcelContentUtil;
import com.xiaomai.cases.polar.utils.ResourceUtil; import com.xiaomai.cases.polar.utils.ResourceUtil;
...@@ -15,12 +16,16 @@ import org.testng.Assert; ...@@ -15,12 +16,16 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import javax.annotation.Resource;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
public class TestImportDeposit extends XMBaseTest { public class TestImportDeposit extends XMBaseTest {
ImportTools importTools = new ImportTools(); ImportTools importTools = new ImportTools();
@Resource(name="cardTools")
CardTools cardTools;
@BeforeMethod @BeforeMethod
public void beforeTest(){ public void beforeTest(){
...@@ -97,7 +102,5 @@ public class TestImportDeposit extends XMBaseTest { ...@@ -97,7 +102,5 @@ public class TestImportDeposit extends XMBaseTest {
Assert.assertEquals(Integer.parseInt(res.getString("total")),total+1); Assert.assertEquals(Integer.parseInt(res.getString("total")),total+1);
Assert.assertEquals(res.getJSONArray("records").getJSONObject(0).getString("resourceId"),resourceId); Assert.assertEquals(res.getJSONArray("records").getJSONObject(0).getString("resourceId"),resourceId);
Assert.assertEquals(res.getJSONArray("records").getJSONObject(0).getString("state"),"SUCCESS"); Assert.assertEquals(res.getJSONArray("records").getJSONObject(0).getString("state"),"SUCCESS");
} }
} }
src/main/java/com/xiaomai/cases/polar/memberCard/TestCreateTerm.java
...@@ -52,7 +52,7 @@ public class TestCreateTerm extends XMBaseTest { ...@@ -52,7 +52,7 @@ public class TestCreateTerm extends XMBaseTest {
Object.put("price","1"); Object.put("price","1");
benefitList.add(Object); benefitList.add(Object);
String title="期限-自动化会员卡"+RandomStringUtil.randomString(3); String title="期限-自动化会员卡"+RandomStringUtil.randomString(4);
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
......
src/main/java/com/xiaomai/cases/polar/membercluster/TestCreateMemberCluster.java
...@@ -168,6 +168,11 @@ public class TestCreateMemberCluster extends BaseTestImpl { ...@@ -168,6 +168,11 @@ public class TestCreateMemberCluster extends BaseTestImpl {
Thread.sleep(2000); Thread.sleep(2000);
//7.1 批量发放微信消息 //7.1 批量发放微信消息
memberClusterTools.batchMessagePushForMemberCluster(clusterIdA, "WECHAT_COMMON"); memberClusterTools.batchMessagePushForMemberCluster(clusterIdA, "WECHAT_COMMON");
if("分群数据同步中，请稍后再操作".equals(XMJSONPath.readPath(dataApi.getApi_response(), "$.message"))){
Thread.sleep(10000);
memberClusterTools.batchMessagePushForMemberCluster(clusterIdA, "WECHAT_COMMON");
}
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"));
Thread.sleep(2000); Thread.sleep(2000);
......
src/main/java/com/xiaomai/cases/polar/reserve/personal/TestCreateNormalDate.java
...@@ -13,7 +13,6 @@ import org.testng.annotations.Test; ...@@ -13,7 +13,6 @@ import org.testng.annotations.Test;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
/** /**
* @BelongsProject: xm-sportstest * @BelongsProject: xm-sportstest
...@@ -97,6 +96,11 @@ public class TestCreateNormalDate extends BaseTestImpl { ...@@ -97,6 +96,11 @@ public class TestCreateNormalDate extends BaseTestImpl {
// 设置常规可约时间 // 设置常规可约时间
reserveTools.createNormalDate(xmAppApi.getLoginInfo().getAdminId(),normalTimeInfoRequests); reserveTools.createNormalDate(xmAppApi.getLoginInfo().getAdminId(),normalTimeInfoRequests);
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
JSONArray personalCoachTime = reserveTools.getPersonalCoachTime(xmAppApi.getLoginInfo().getAdminId(),"normalTimeVOS"); JSONArray personalCoachTime = reserveTools.getPersonalCoachTime(xmAppApi.getLoginInfo().getAdminId(),"normalTimeVOS");
for (int i = 0; i < personalCoachTime.size(); i++){ for (int i = 0; i < personalCoachTime.size(); i++){
......
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