Skip to content

X
xm-sportstest
Commit 898e0e0f by xuyamei
Options

操作日志没有灰度，则灰度执行自动化跳过操作日志的校验

parent 6abf84be
Showing with 24 additions and 2 deletions
src/main/java/com/xiaomai/cases/polar/admin/TestAddStudioAdmin.java
...@@ -9,7 +9,6 @@ import com.xiaomai.enums.ApiModule; ...@@ -9,7 +9,6 @@ import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount; import com.xiaomai.enums.LoginAccount;
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;
...@@ -63,11 +62,15 @@ public class TestAddStudioAdmin extends BaseTestImpl { ...@@ -63,11 +62,15 @@ public class TestAddStudioAdmin extends BaseTestImpl {
Assert.assertEquals(checkResult,expected,"添加员工失败,员工详情与创建员工时的信息不一致"); Assert.assertEquals(checkResult,expected,"添加员工失败,员工详情与创建员工时的信息不一致");
} }
// 如果运行的环境为灰度则不执行，原因是灰度环境不生成操作日志数据
if(xmAppApi.getUrl().contains("canary-fit.xiaomai5.com"))
return;
try { try {
Thread.sleep(15000); Thread.sleep(15000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
// check 2: 生成对应的操作日志 // check 2: 生成对应的操作日志
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\"}"; 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); JSONObject response = configTools.getOpauditPage(body);
...@@ -106,6 +109,9 @@ public class TestAddStudioAdmin extends BaseTestImpl { ...@@ -106,6 +109,9 @@ public class TestAddStudioAdmin extends BaseTestImpl {
Assert.assertEquals(checkResult,expected,"添加员工失败,员工详情与创建员工时的信息不一致"); Assert.assertEquals(checkResult,expected,"添加员工失败,员工详情与创建员工时的信息不一致");
} }
// 如果运行的环境为灰度则不执行，原因是灰度环境不生成操作日志数据
if(xmAppApi.getUrl().contains("canary-fit.xiaomai5.com"))
return;
try { try {
Thread.sleep(15000); Thread.sleep(15000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
......
src/main/java/com/xiaomai/cases/polar/admin/TestDepartStudioAdmin.java
...@@ -67,6 +67,10 @@ public class TestDepartStudioAdmin extends BaseTestImpl { ...@@ -67,6 +67,10 @@ public class TestDepartStudioAdmin extends BaseTestImpl {
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,"员工离职失败,用手机号查询离职员工未返回数据");
// 如果运行的环境为灰度则不执行，原因是灰度环境不生成操作日志数据
if(xmAppApi.getUrl().contains("canary-fit.xiaomai5.com"))
return;
try { try {
Thread.sleep(20000); Thread.sleep(20000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
......
src/main/java/com/xiaomai/cases/polar/admin/TestEditStudioAdmin.java
...@@ -122,6 +122,10 @@ public class TestEditStudioAdmin extends BaseTestImpl { ...@@ -122,6 +122,10 @@ public class TestEditStudioAdmin extends BaseTestImpl {
System.out.println(resultString[i] + " : " + result); System.out.println(resultString[i] + " : " + result);
System.out.println(adminInfo.getJSONObject("result").getString(resultString[i])); System.out.println(adminInfo.getJSONObject("result").getString(resultString[i]));
} }
// 如果运行的环境为灰度则不执行，原因是灰度环境不生成操作日志数据
if(xmAppApi.getUrl().contains("canary-fit.xiaomai5.com"))
return;
try { try {
Thread.sleep(15000); Thread.sleep(15000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
......
src/main/java/com/xiaomai/cases/polar/admin/TestReinStateStudioAdmin.java
...@@ -67,6 +67,9 @@ public class TestReinStateStudioAdmin extends BaseTestImpl { ...@@ -67,6 +67,9 @@ public class TestReinStateStudioAdmin extends BaseTestImpl {
total = Integer.parseInt(adminPage.getJSONObject("result").getString("total")); total = Integer.parseInt(adminPage.getJSONObject("result").getString("total"));
Assert.assertEquals(total,1,"员工离职失败,用手机号查询离职员工未返回数据"); Assert.assertEquals(total,1,"员工离职失败,用手机号查询离职员工未返回数据");
// 如果运行的环境为灰度则不执行，原因是灰度环境不生成操作日志数据
if(xmAppApi.getUrl().contains("canary-fit.xiaomai5.com"))
return;
try { try {
Thread.sleep(20000); Thread.sleep(20000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
......
src/main/java/com/xiaomai/cases/polar/admin/TestStudioRoleCreate.java
...@@ -82,6 +82,9 @@ public class TestStudioRoleCreate extends BaseTestImpl { ...@@ -82,6 +82,9 @@ public class TestStudioRoleCreate extends BaseTestImpl {
// 校验1：创建角色是否成功 // 校验1：创建角色是否成功
Assert.assertEquals(flag,true,"创建角色失败"); Assert.assertEquals(flag,true,"创建角色失败");
// 如果运行的环境为灰度则不执行，原因是灰度环境不生成操作日志数据
if(xmAppApi.getUrl().contains("canary-fit.xiaomai5.com"))
return;
try { try {
Thread.sleep(10000); Thread.sleep(10000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
......
src/main/java/com/xiaomai/cases/polar/admin/TestStudioRoleEdit.java
...@@ -90,7 +90,9 @@ public class TestStudioRoleEdit extends BaseTestImpl { ...@@ -90,7 +90,9 @@ public class TestStudioRoleEdit extends BaseTestImpl {
adminTools.studioRoleRemove(roleCode); // 删除角色 adminTools.studioRoleRemove(roleCode); // 删除角色
flag = false; // 角色删除标识 flag = false; // 角色删除标识
Assert.assertEquals(response.getJSONObject("result").getString("name"),"编辑角色名称","编辑角色名称失败"); Assert.assertEquals(response.getJSONObject("result").getString("name"),"编辑角色名称","编辑角色名称失败");
// 如果运行的环境为灰度则不执行，原因是灰度环境不生成操作日志数据
if(xmAppApi.getUrl().contains("canary-fit.xiaomai5.com"))
return;
try { try {
Thread.sleep(15000); Thread.sleep(15000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
......
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