Skip to content

T
test-platform
Commit 2c595630 authored by 马博's avatar 马博
Browse files
Options

Merge branch 'master' of gitlab2.dui88.com:mabo/test-platform

parents 88a78ed3 4b24a25b
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 49 deletions
src/test/java/http/cases/ExchangeTest/Database.java
View file @ 2c595630
......@@ -12,4 +12,5 @@ public class Database {
public static String orders5 = "orders_0209";
public static String orders6 = "orders_0210";
public static String orders7 = "orders_0211";
public static String orders8 = "orders_0090";
}
src/test/java/http/cases/ExchangeTest/ObjectExchange_ExchangeTest.java
View file @ 2c595630
......@@ -150,6 +150,7 @@ public class ObjectExchange_ExchangeTest extends DuibaTestBase{
//直充类单档话费兑换_1元话费
@Test(description = "直充类单档话费兑换")
public void phonebillDingzhi() throws Exception {
Thread.sleep(2000);
Map<String, Object> mapuser = jdbc.findSimpleResult("select * from dafuweng.user where id="+uid);
String credits = String.valueOf(mapuser.get("credits"));
logger.info("兑换前积分：" + credits);
......@@ -194,6 +195,7 @@ public class ObjectExchange_ExchangeTest extends DuibaTestBase{
}
//查询数据库，获取当前积分
Thread.sleep(2000);
mapuser = jdbc.findSimpleResult("select * from dafuweng.user where id="+uid);
String creditsNew = String.valueOf(mapuser.get("credits"));
logger.info("兑换后积分：" + creditsNew);
......
src/test/java/http/cases/ExchangeTest/开发者账户余额校验测试.java
View file @ 2c595630
......@@ -42,22 +42,23 @@ public class 开发者账户余额校验测试 extends DuibaTestBase {
private DuibaLog logger = DuibaLog.getLogger();
//指定用户
private static int uid = 3769;
//private static int uid = 3769;
private static int uid = 4386;
@DataProvider
public Object[][] providerMethod(Method method) {
Object[][] result = null;
if (method.getName().equals("优惠券审核通过测试")) {
if (method.getName().equals("优惠券兑换审核通过测试")) {
result = new Object[][]{
new Object[]{1,"169698", "29156", "兑吧优惠券审核通过测试"}, //case1
new Object[]{2,"172178", "", "自有优惠券审核通过测试"}, //case2
new Object[]{1,"184936", "29156", "兑吧优惠券审核通过测试"}, //case1
new Object[]{2,"184937", "", "自有优惠券审核通过测试"}, //case2
};
}
return result;
}
@Test
public void 商品订单支付宝审核不通过测试() throws Exception{
public void 支付宝兑换审核不通过测试() throws Exception{
//查询兑换前的开发者账户余额
// Response accountResponse = developerAccountService.accountInfo();
......@@ -69,7 +70,7 @@ public class 开发者账户余额校验测试 extends DuibaTestBase {
logger.info("订单号：" + orderId);
//订单审核,判断是否在待审核节点
Map<String,Object> mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders5+" WHERE id = " + orderId);
Map<String,Object> mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders8+" WHERE id = " + orderId);
String flowWork = String.valueOf(mapOrder.get("flowwork_stage"));
logger.info("数据库订单节点:" + flowWork);
String orderIdmain = String.valueOf(mapOrder.get("order_num"));
......@@ -77,22 +78,22 @@ public class 开发者账户余额校验测试 extends DuibaTestBase {
int i =10;
while (i > 0 && !flowWork.equals("Audit-started")) {
Thread.sleep(300);
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders5+" WHERE id = " + orderId);
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders8+" WHERE id = " + orderId);
flowWork = String.valueOf(mapOrder.get("flowwork_stage"));
logger.info("数据库订单节点:" + flowWork);
i--;
}
//订单审核
Response auditResponse = dsOrderService.submitAudit(orderId,"reject");
Response auditResponse = dsOrderService.submitAudit(orderId,"reject","zhaoran@duiba.com.cn");
auditResponse.prettyPrint();
//判断订单是否审核失败
int j =10;
while (j > 0 && !flowWork.equals("Fail-complete")) {
Thread.sleep(1000);
auditResponse = dsOrderService.submitAudit(orderId,"reject");
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders5+" WHERE id = " + orderId);
auditResponse = dsOrderService.submitAudit(orderId,"reject","zhaoran@duiba.com.cn");
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders8+" WHERE id = " + orderId);
flowWork = String.valueOf(mapOrder.get("flowwork_stage"));
logger.info("当前订单节点:" + flowWork);
j--;
......@@ -117,7 +118,7 @@ public class 开发者账户余额校验测试 extends DuibaTestBase {
}
@Test
public void Qb审核通过测试() throws Exception {
public void Qb兑换审核通过测试() throws Exception {
//查询兑换前的开发者账户余额
// Response accountResponse = developerAccountService.accountInfo();
......@@ -125,7 +126,7 @@ public class 开发者账户余额校验测试 extends DuibaTestBase {
// logger.info("兑换前的开发者账户余额：" + remainMoney);
// String remainMoneyNew =String.valueOf(Integer.valueOf(remainMoney) - 9600) ;
int uid = 2709;
// int uid = 2709;
Response response = qbExchangeService.doTakePrize(authorization.dafuwengLogin(uid),"1234345554","100");
String orderId = (String)response.jsonPath().get("orderId");
......@@ -133,7 +134,7 @@ public class 开发者账户余额校验测试 extends DuibaTestBase {
response.prettyPrint();
//订单审核,判断是否在待审核节点
Map<String,Object> mapOrder = jdbc.findSimpleResult("SELECT * from orders_consumer.orders_0616 where id ="+orderId);
Map<String,Object> mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders8+" where id ="+orderId);
String flowWork = String.valueOf(mapOrder.get("flowwork_stage"));
logger.info("数据库订单节点:" + flowWork);
String orderIdmain = String.valueOf(mapOrder.get("order_num"));
......@@ -141,21 +142,21 @@ public class 开发者账户余额校验测试 extends DuibaTestBase {
int i =10;
while (i > 0 && !flowWork.equals("Audit-started")) {
Thread.sleep(300);
mapOrder = jdbc.findSimpleResult("SELECT * from orders_consumer.orders_0616 where id ="+orderId);
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders8+" where id ="+orderId);
flowWork = String.valueOf(mapOrder.get("flowwork_stage"));
logger.info("数据库订单节点:" + flowWork);
i--;
}
Response auditResponse = dsOrderService.submitAudit(orderId,"pass");
Response auditResponse = dsOrderService.submitAudit(orderId,"pass","zhaoran@duiba.com.cn");
auditResponse.prettyPrint();
//判断订单是否审核成功，如果订单没有成功则继续审核
int j =10;
while (j > 0 && !flowWork.equals("Success-complete")) {
Thread.sleep(1000);
auditResponse = dsOrderService.submitAudit(orderId,"pass");
mapOrder = jdbc.findSimpleResult("SELECT * from orders_consumer.orders_0616 where id ="+orderId);
auditResponse = dsOrderService.submitAudit(orderId,"pass","zhaoran@duiba.com.cn");
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders8+" where id ="+orderId);
flowWork = String.valueOf(mapOrder.get("flowwork_stage"));
logger.info("数据库订单节点:" + flowWork);
j--;
......@@ -182,7 +183,7 @@ public class 开发者账户余额校验测试 extends DuibaTestBase {
}
@Test
public void Qb审核不通过测试() throws Exception{
public void Qb兑换审核不通过测试() throws Exception{
//查询兑换前的开发者账户余额
// Response accountResponse = developerAccountService.accountInfo();
......@@ -190,12 +191,12 @@ public class 开发者账户余额校验测试 extends DuibaTestBase {
// logger.info("兑换前的开发者账户余额：" + remainMoney);
//qb兑换
int uid = 2709;
//int uid = 2709;
Response response = qbExchangeService.doTakePrize(authorization.dafuwengLogin(uid),"1234345554","100");
String orderId = (String)response.jsonPath().get("orderId");
//订单审核,判断是否在待审核节点
Map<String,Object> mapOrder = jdbc.findSimpleResult("SELECT * from orders_consumer.orders_0616 where id ="+orderId);
Map<String,Object> mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders8+" where id ="+orderId);
String flowWork = String.valueOf(mapOrder.get("flowwork_stage"));
logger.info("数据库订单节点:" + flowWork);
String orderIdmain = String.valueOf(mapOrder.get("order_num"));
......@@ -203,22 +204,22 @@ public class 开发者账户余额校验测试 extends DuibaTestBase {
int i =10;
while (i > 0 && !flowWork.equals("Audit-started")) {
Thread.sleep(300);
mapOrder = jdbc.findSimpleResult("SELECT * from orders_consumer.orders_0616 where id ="+orderId);
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders8+" where id ="+orderId);
flowWork = String.valueOf(mapOrder.get("flowwork_stage"));
logger.info("数据库订单节点:" + flowWork);
i--;
}
//订单审核
Response auditResponse = dsOrderService.submitAudit(orderId,"reject");
Response auditResponse = dsOrderService.submitAudit(orderId,"reject","zhaoran@duiba.com.cn");
auditResponse.prettyPrint();
//判断订单是否审核失败
int j =10;
while (j > 0 && !flowWork.equals("Fail-complete")) {
Thread.sleep(1000);
auditResponse = dsOrderService.submitAudit(orderId,"reject");
mapOrder = jdbc.findSimpleResult("SELECT * from orders_consumer.orders_0616 where id ="+orderId);
auditResponse = dsOrderService.submitAudit(orderId,"reject","zhaoran@duiba.com.cn");
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders8+" where id ="+orderId);
flowWork = String.valueOf(mapOrder.get("flowwork_stage"));
logger.info("当前订单节点:" + flowWork);
j--;
......@@ -252,8 +253,8 @@ public class 开发者账户余额校验测试 extends DuibaTestBase {
* @throws Exception
*/
@Test(dataProvider = "providerMethod")
public void 优惠券审核通过测试(int caseNum, String appItemId, String itemId, String caseName) throws Exception{
int uid = 3768;
public void 优惠券兑换审核通过测试(int caseNum, String appItemId, String itemId, String caseName) throws Exception{
// int uid = 3768;
logger.info(caseName);
//查询兑换前的开发者余额
// Response accountResponse = developerAccountService.accountInfo();
......@@ -266,7 +267,7 @@ public class 开发者账户余额校验测试 extends DuibaTestBase {
logger.info("订单号：" + orderId);
//订单审核,判断是否在待审核节点
Map<String,Object> mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders4+" WHERE id = " + orderId);
Map<String,Object> mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders8+" WHERE id = " + orderId);
String flowWork = String.valueOf(mapOrder.get("flowwork_stage"));
logger.info("数据库订单节点:" + flowWork);
String orderIdmain = String.valueOf(mapOrder.get("order_num"));
......@@ -274,21 +275,21 @@ public class 开发者账户余额校验测试 extends DuibaTestBase {
int i =10;
while (i > 0 && !flowWork.equals("Audit-started")) {
Thread.sleep(300);
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders4+" WHERE id = " + orderId);
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders8+" WHERE id = " + orderId);
flowWork = String.valueOf(mapOrder.get("flowwork_stage"));
logger.info("数据库订单节点:" + flowWork);
i--;
}
Response auditResponse = dsOrderService.submitAudit(orderId,"pass");
Response auditResponse = dsOrderService.submitAudit(orderId,"pass","zhaoran@duiba.com.cn");
auditResponse.prettyPrint();
//判断订单是否审核成功，如果订单没有成功则继续审核
int j =10;
while (j > 0 && !flowWork.equals("Success-complete")) {
Thread.sleep(1000);
auditResponse = dsOrderService.submitAudit(orderId,"pass");
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders4+" WHERE id = " + orderId);
auditResponse = dsOrderService.submitAudit(orderId,"pass","zhaoran@duiba.com.cn");
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders8+" WHERE id = " + orderId);
flowWork = String.valueOf(mapOrder.get("flowwork_stage"));
logger.info("数据库订单节点:" + flowWork);
j--;
......@@ -325,8 +326,8 @@ public class 开发者账户余额校验测试 extends DuibaTestBase {
}
@Test
public void 支付宝审核通过测试() throws Exception{
int uid = 3771;
public void 支付宝兑换审核通过测试() throws Exception{
// int uid = 3771;
//查询兑换前的开发者账户余额
// Response accountResponse = developerAccountService.accountInfo();
// String remainMoney = accountResponse.jsonPath().getString("data.remainMoney");
......@@ -338,7 +339,7 @@ public class 开发者账户余额校验测试 extends DuibaTestBase {
logger.info("订单号：" + orderId);
//订单审核,判断是否在待审核节点
Map<String,Object> mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders7+" WHERE id = " + orderId);
Map<String,Object> mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders8+" WHERE id = " + orderId);
String flowWork = String.valueOf(mapOrder.get("flowwork_stage"));
logger.info("数据库订单节点:" + flowWork);
String orderIdmain = String.valueOf(mapOrder.get("order_num"));
......@@ -346,21 +347,21 @@ public class 开发者账户余额校验测试 extends DuibaTestBase {
int i =10;
while (i > 0 && !flowWork.equals("Audit-started")) {
Thread.sleep(300);
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders7+" WHERE id = " + orderId);
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders8+" WHERE id = " + orderId);
flowWork = String.valueOf(mapOrder.get("flowwork_stage"));
logger.info("数据库订单节点:" + flowWork);
i--;
}
Response auditResponse = dsOrderService.submitAudit(orderId,"pass");
Response auditResponse = dsOrderService.submitAudit(orderId,"pass","zhaoran@duiba.com.cn");
auditResponse.prettyPrint();
//判断订单是否审核成功，如果订单没有成功则继续审核
int j =10;
while (j > 0 && !flowWork.equals("Success-complete")) {
Thread.sleep(1000);
auditResponse = dsOrderService.submitAudit(orderId,"pass");
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders7+" WHERE id = " + orderId);
auditResponse = dsOrderService.submitAudit(orderId,"pass","zhaoran@duiba.com.cn");
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders8+" WHERE id = " + orderId);
flowWork = String.valueOf(mapOrder.get("flowwork_stage"));
logger.info("数据库订单节点:" + flowWork);
j--;
......
src/test/java/http/cases/GameTest/Game_AccessTest.java
View file @ 2c595630
package http.cases.GameTest;
import base.Config;
import base.DuibaLog;
import http.service.Activity.ManagerService;
import http.service.Activity.NgapiService;
......@@ -33,6 +34,7 @@ import static org.hamcrest.Matchers.equalTo;
* case3:游戏测试：马上使用跳转优惠券兑换记录页的链接
* case4:游戏测试：马上使用跳转福袋的链接
*/
@ContextConfiguration(classes = Config.class)
public class Game_AccessTest extends AbstractTestNGSpringContextTests {
@Autowired
......
src/test/java/http/cases/GameTest/游戏_中奖优惠券_AccessTest.java
View file @ 2c595630
......@@ -34,9 +34,10 @@ public class 游戏_中奖优惠券_AccessTest extends DuibaTestBase {
private static DuibaLog logger = DuibaLog.getLogger();
private String virtualOrderIds = null;
private static final Integer uid_Nomal = 2708;
private static final String consumerId = "100011623";
// private static final Integer uid_Nomal = 2708;
// private static final String consumerId = "100011623";
private static final Integer uid_Nomal = 4390;
private static final String consumerId = "100094047";
......
src/test/java/http/cases/GameTest/游戏_中奖异常流程测试_AccessTest.java
View file @ 2c595630
......@@ -33,7 +33,8 @@ public class 游戏_中奖异常流程测试_AccessTest extends DuibaTestBase {
NewGameService newGameService;
private static DuibaLog logger = DuibaLog.getLogger();
private static final Integer uid_Nomal = 2708;
//private static final Integer uid_Nomal = 2708;
private static final Integer uid_Nomal = 4389;
//ok
......
src/test/java/http/cases/GameTest/游戏_中奖限制测试_AccessTest.java
View file @ 2c595630
......@@ -36,8 +36,10 @@ public class 游戏_中奖限制测试_AccessTest extends DuibaTestBase {
NewGameService newGameService;
private static final Integer uid_Nomal = 2708;
private static final String consumerId_Nomal = "100011623";
// private static final Integer uid_Nomal = 2708;
// private static final String consumerId_Nomal = "100011623";
private static final Integer uid_Nomal = 4388;
private static final String consumerId_Nomal = "100094045";
private static DuibaLog logger = DuibaLog.getLogger();
......
src/test/java/http/cases/GameTest/游戏_奖项限制测试_AccessTest.java
View file @ 2c595630
......@@ -35,9 +35,10 @@ public class 游戏_奖项限制测试_AccessTest extends DuibaTestBase {
NewGameService newGameService;
private static DuibaLog logger = DuibaLog.getLogger();
private static final Integer uid_Nomal = 2708;
private static final String consumerId = "100011623";
// private static final Integer uid_Nomal = 2708;
// private static final String consumerId = "100011623";
private static final Integer uid_Nomal = 4387;
private static final String consumerId = "100094044";
......
src/test/java/http/service/hd/DeveloperAccountService.java
View file @ 2c595630
......@@ -76,7 +76,7 @@ public class DeveloperAccountService {
map.put("mode","two");
map.put("orderId",orderId);
map.put("rowId","1");
Response response=given().cookies(authorization.hdLogin()).params(map).get("http://"+url);
Response response=given().cookies(authorization.hdLoginCommon("zhaoran@duiba.com.cn")).params(map).get("http://"+url);
try{
Assert.assertEquals(response.jsonPath().getString("success"),"true","/developerAccount/cashDetail接口失败");
......
src/test/java/http/service/hd/DsOrderService.java
View file @ 2c595630
......@@ -49,9 +49,28 @@ public class DsOrderService {
throw new Exception("请求订单审核接口失败,返回信息："+response.asString());
}
return response;
}
//审核订单
public Response submitAudit(String idArray,String audit,String email) throws Exception{
String url = hdHost + "/dsOrder/submitAudit";
}
Map<String,String> map = new HashMap<>();
map.put("appId","18714");
map.put("idArray",idArray);
map.put("audit",audit);
map.put("reason","测试订单审核不通过");
logger.info("请求订单审核接口：" + url);
Response response=given().contentType("application/x-www-form-urlencoded;charset=UTF-8").cookies(authorization.hdLoginCommon(email)).params(map).post("http://"+url);
try{
Assert.assertEquals(response.jsonPath().getString("desc"),"成功");
}catch(Exception e){
throw new Exception("请求订单审核接口失败,返回信息："+response.asString());
}catch(Error er){
throw new Exception("请求订单审核接口失败,返回信息："+response.asString());
}
return response;
}
}
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