Skip to content

O
oto
Commit d54a8ec8 authored by xiamengchen's avatar xiamengchen
Browse files
Options

Merge branch 'master' into feature/20210729-xmc

parents 89e3c91b 525d02f9
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 92 deletions
src/test/java/com/kjj/cases/admin/Authorization.java
View file @ d54a8ec8
...@@ -155,7 +155,7 @@ public interface Authorization { ...@@ -155,7 +155,7 @@ public interface Authorization {
System.out.println("用户AUTH_KEY：" + visitorAuth13); System.out.println("用户AUTH_KEY：" + visitorAuth13);
} }
//访客N（光头强）非实名用户授权，ID：540 //访客N（光头强）非实名用户授权，ID：1495
default void visitorAuth14() { default void visitorAuth14() {
network.agentCookies.put("authKey", visitorAuth14); network.agentCookies.put("authKey", visitorAuth14);
System.out.println("用户AUTH_KEY：" + visitorAuth14); System.out.println("用户AUTH_KEY：" + visitorAuth14);
......
src/test/java/com/kjj/cases/live/liveConfig/SaveLive.java
View file @ d54a8ec8
...@@ -2119,19 +2119,9 @@ public class SaveLive implements Authorization { ...@@ -2119,19 +2119,9 @@ public class SaveLive implements Authorization {
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey())); Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
Params.put("popupScene",1); Params.put("popupScene",1);
response = network.getResponse(Params, BasicConfig.MANAGER_popupDetail); response = network.getResponse(Params, BasicConfig.MANAGER_popupDetail);
int id = response.jsonPath().getInt("data.id"); int popupScene = response.jsonPath().getInt("data.popupScene");
System.out.println(response.body().asString()); System.out.println(response.body().asString());
Assert.assertNotNull(id, network.message(Params, BasicConfig.MANAGER_popupDetail, "直播抽奖授权弹窗ID查询为null", response.body().asString())); Assert.assertTrue(popupScene==1, network.message(Params, BasicConfig.MANAGER_popupDetail, "直播抽奖授权弹窗ID查询为null", response.body().asString()));
//修改配置
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
Params.put("popupScene",1);
Params.put("id",id);
Params.put("phoneImg","https://yun.dui88.com/kjy/image/20210729/1627545956366.png");
response = network.postResponse(Params, BasicConfig.MANAGER_popupUpdate);
boolean data1 = response.jsonPath().getBoolean("data");
System.out.println(data1);
Assert.assertTrue(data1, network.message(Params, BasicConfig.MANAGER_popupUpdate, "直播抽奖授权弹窗修改失败", response.body().asString()));
} }
...@@ -2152,19 +2142,9 @@ public class SaveLive implements Authorization { ...@@ -2152,19 +2142,9 @@ public class SaveLive implements Authorization {
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey())); Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
Params.put("popupScene", 2); Params.put("popupScene", 2);
response = network.getResponse(Params, BasicConfig.MANAGER_popupDetail); response = network.getResponse(Params, BasicConfig.MANAGER_popupDetail);
int id = response.jsonPath().getInt("data.id"); int popupScene = response.jsonPath().getInt("data.popupScene");
System.out.println(response.body().asString()); System.out.println(response.body().asString());
Assert.assertNotNull(id, network.message(Params, BasicConfig.MANAGER_popupDetail, "裂变宝箱授权弹窗ID查询为null", response.body().asString())); Assert.assertTrue(popupScene==2, network.message(Params, BasicConfig.MANAGER_popupDetail, "裂变宝箱授权弹窗ID查询为null", response.body().asString()));
//修改配置
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
Params.put("popupScene", 2);
Params.put("id", id);
Params.put("phoneImg", "https://yun.dui88.com/kjy/image/20210729/1627547133623.png");
response = network.postResponse(Params, BasicConfig.MANAGER_popupUpdate);
boolean data1 = response.jsonPath().getBoolean("data");
System.out.println(data1);
Assert.assertTrue(data1, network.message(Params, BasicConfig.MANAGER_popupUpdate, "裂变宝箱授权弹窗修改失败", response.body().asString()));
} }
...@@ -2185,20 +2165,9 @@ public class SaveLive implements Authorization { ...@@ -2185,20 +2165,9 @@ public class SaveLive implements Authorization {
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey())); Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
Params.put("popupScene", 3); Params.put("popupScene", 3);
response = network.getResponse(Params, BasicConfig.MANAGER_popupDetail); response = network.getResponse(Params, BasicConfig.MANAGER_popupDetail);
int id = response.jsonPath().getInt("data.id"); int popupScene = response.jsonPath().getInt("data.popupScene");
System.out.println(response.body().asString()); System.out.println(response.body().asString());
Assert.assertNotNull(id, network.message(Params, BasicConfig.MANAGER_popupDetail, "翻牌集字授权弹窗ID查询为null", response.body().asString())); Assert.assertTrue(popupScene==3, network.message(Params, BasicConfig.MANAGER_popupDetail, "翻牌集字授权弹窗ID查询为null", response.body().asString()));
//修改配置
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
Params.put("popupScene", 3);
Params.put("id", id);
Params.put("phoneImg", "https://yun.dui88.com/kjy/image/20210729/1627547271114.png");
response = network.postResponse(Params, BasicConfig.MANAGER_popupUpdate);
boolean data1 = response.jsonPath().getBoolean("data");
System.out.println(data1);
Assert.assertTrue(data1, network.message(Params, BasicConfig.MANAGER_popupUpdate, "翻牌集字授权弹窗修改失败", response.body().asString()));
} }
...@@ -2219,19 +2188,9 @@ public class SaveLive implements Authorization { ...@@ -2219,19 +2188,9 @@ public class SaveLive implements Authorization {
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey())); Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
Params.put("popupScene", 4); Params.put("popupScene", 4);
response = network.getResponse(Params, BasicConfig.MANAGER_popupDetail); response = network.getResponse(Params, BasicConfig.MANAGER_popupDetail);
int id = response.jsonPath().getInt("data.id"); int popupScene = response.jsonPath().getInt("data.popupScene");
System.out.println(response.body().asString()); System.out.println(response.body().asString());
Assert.assertNotNull(id, network.message(Params, BasicConfig.MANAGER_popupDetail, "手气王授权弹窗ID查询为null", response.body().asString())); Assert.assertTrue(popupScene==4, network.message(Params, BasicConfig.MANAGER_popupDetail, "手气王授权弹窗ID查询为null", response.body().asString()));
//修改配置
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
Params.put("popupScene", 4);
Params.put("id", id);
Params.put("phoneImg", "https://yun.dui88.com/kjy/image/20210729/1627547406299.png");
response = network.postResponse(Params, BasicConfig.MANAGER_popupUpdate);
boolean data1 = response.jsonPath().getBoolean("data");
System.out.println(data1);
Assert.assertTrue(data1, network.message(Params, BasicConfig.MANAGER_popupUpdate, "手气王授权弹窗修改失败", response.body().asString()));
} }
...@@ -2252,19 +2211,9 @@ public class SaveLive implements Authorization { ...@@ -2252,19 +2211,9 @@ public class SaveLive implements Authorization {
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey())); Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
Params.put("popupScene",5); Params.put("popupScene",5);
response = network.getResponse(Params, BasicConfig.MANAGER_popupDetail); response = network.getResponse(Params, BasicConfig.MANAGER_popupDetail);
int id = response.jsonPath().getInt("data.id"); int popupScene = response.jsonPath().getInt("data.popupScene");
System.out.println(response.body().asString()); System.out.println(response.body().asString());
Assert.assertNotNull(id, network.message(Params, BasicConfig.MANAGER_popupDetail, "猜数红包授权弹窗ID查询为null", response.body().asString())); Assert.assertTrue(popupScene==5, network.message(Params, BasicConfig.MANAGER_popupDetail, "猜数红包授权弹窗ID查询为null", response.body().asString()));
//修改配置
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
Params.put("popupScene",5);
Params.put("id", id);
Params.put("phoneImg", "https://yun.dui88.com/kjy/image/20210729/1627547406299.png");
response = network.postResponse(Params, BasicConfig.MANAGER_popupUpdate);
boolean data1 = response.jsonPath().getBoolean("data");
System.out.println(data1);
Assert.assertTrue(data1, network.message(Params, BasicConfig.MANAGER_popupUpdate, "猜数红包授权弹窗修改失败", response.body().asString()));
} }
...@@ -2287,21 +2236,9 @@ public class SaveLive implements Authorization { ...@@ -2287,21 +2236,9 @@ public class SaveLive implements Authorization {
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey())); Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
Params.put("popupScene",6); Params.put("popupScene",6);
response = network.getResponse(Params, BasicConfig.MANAGER_popupDetail); response = network.getResponse(Params, BasicConfig.MANAGER_popupDetail);
int id = response.jsonPath().getInt("data.id"); int popupScene = response.jsonPath().getInt("data.popupScene");
System.out.println(response.body().asString()); System.out.println(response.body().asString());
Assert.assertNotNull(id, network.message(Params, BasicConfig.MANAGER_popupDetail, "好运红包授权弹窗ID查询为null", response.body().asString())); Assert.assertTrue(popupScene==6, network.message(Params, BasicConfig.MANAGER_popupDetail, "好运红包授权弹窗ID查询为null", response.body().asString()));
//修改配置
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
Params.put("popupScene",6);
Params.put("id", id);
Params.put("helpImg", "https://yun.dui88.com/kjy/image/20210729/1627547595585.png");
Params.put("phoneImg", "https://yun.dui88.com/kjy/image/20210729/1627547600293.png");
response = network.postResponse(Params, BasicConfig.MANAGER_popupUpdate);
boolean data1 = response.jsonPath().getBoolean("data");
System.out.println(data1);
Assert.assertTrue(data1, network.message(Params, BasicConfig.MANAGER_popupUpdate, "好运红包授权弹窗修改失败", response.body().asString()));
} }
...@@ -2322,21 +2259,9 @@ public class SaveLive implements Authorization { ...@@ -2322,21 +2259,9 @@ public class SaveLive implements Authorization {
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey())); Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
Params.put("popupScene",7); Params.put("popupScene",7);
response = network.getResponse(Params, BasicConfig.MANAGER_popupDetail); response = network.getResponse(Params, BasicConfig.MANAGER_popupDetail);
int id = response.jsonPath().getInt("data.id"); int popupScene = response.jsonPath().getInt("data.popupScene");
System.out.println(response.body().asString()); System.out.println(response.body().asString());
Assert.assertNotNull(id, network.message(Params, BasicConfig.MANAGER_popupDetail, "闯关答题授权弹窗ID查询为null", response.body().asString())); Assert.assertTrue(popupScene==7, network.message(Params, BasicConfig.MANAGER_popupDetail, "闯关答题授权弹窗ID查询为null", response.body().asString()));
//修改配置
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
Params.put("popupScene",7);
Params.put("id", id);
Params.put("helpImg","https://yun.dui88.com/kjy/image/20210729/1627547737805.png");
Params.put("phoneImg","https://yun.dui88.com/kjy/image/20210729/1627547742368.png");
response = network.postResponse(Params, BasicConfig.MANAGER_popupUpdate);
boolean data1 = response.jsonPath().getBoolean("data");
System.out.println(data1);
Assert.assertTrue(data1, network.message(Params, BasicConfig.MANAGER_popupUpdate, "闯关答题弹窗修改失败", response.body().asString()));
} }
/** /**
......
src/test/java/com/kjj/config/BasicConfig.java
View file @ d54a8ec8
...@@ -40,8 +40,8 @@ public class BasicConfig { ...@@ -40,8 +40,8 @@ public class BasicConfig {
public static String visitorAuth12 ="5MgSyboxqzAQZZJEsTf43nVX38FgyAUo2fAxaP2wGJUTHcnhCNQ6xm4rZ8nMSjRk2BTsYwRhe1kABXuFmTA7JsepCEpa"; public static String visitorAuth12 ="5MgSyboxqzAQZZJEsTf43nVX38FgyAUo2fAxaP2wGJUTHcnhCNQ6xm4rZ8nMSjRk2BTsYwRhe1kABXuFmTA7JsepCEpa";
//直播访客 （大妹子）ID：299 //直播访客 （大妹子）ID：299
public static String visitorAuth13 ="LEH7epeHVDJWzhZ6DiexTHnsaN9w9oWNN5DjmEBUV6rxQBX1gPqEDy6fBAMhJF4ZNUHR681CqgJaAwkQttsd8aB5WdCDf"; public static String visitorAuth13 ="LEH7epeHVDJWzhZ6DiexTHnsaN9w9oWNN5DjmEBUV6rxQBX1gPqEDy6fBAMhJF4ZNUHR681CqgJaAwkQttsd8aB5WdCDf";
//直播访客 （光头强）ID：540 //直播访客 （光头强）ID：1495
public static String visitorAuth14 ="LEH7epeHVDJWzhZ6DiexTHnsaN9w9oWNUSEzLEnhXW7GvsDSbF1XDBJeeBRLp1u37nEXDs6aRhV7i8uxwJSKdaMFDutDp"; public static String visitorAuth14 ="2Tsc8MwHZmXJKPfze38rXm37UEpohGG4fZ8hUsUgQKTh6dmCmCVsKPv5xnwP7HZcjhZ1LvGYRW9UJQfY6HVxCiytxd8nkk7";
//直播访客 （少侠）ID：788 //直播访客 （少侠）ID：788
public static String visitorAuth15 ="LEH7epeHVDJWzhZ6DiexTHnsaN9w9oWNQGsjS7kCzWj4MRh8UEgj65qMf774qQKtXQCskA56o29SkFTd6Zvc82mKjQ2P1"; public static String visitorAuth15 ="LEH7epeHVDJWzhZ6DiexTHnsaN9w9oWNQGsjS7kCzWj4MRh8UEgj65qMf774qQKtXQCskA56o29SkFTd6Zvc82mKjQ2P1";
//直播访客 （抬头有飞碟）ID：99 //直播访客 （抬头有飞碟）ID：99
......
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