Commit d9cf33cb authored by 马博's avatar 马博

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

parents 5dc5104d 39a9ab0a
......@@ -15,7 +15,7 @@ import java.util.Map;
/**
* Created by mabo on 2018/5/17
*/
public class 手动开奖出奖_DuibaTest extends DuibaTestBase {
public class 手动开奖出奖 extends DuibaTestBase {
@Autowired
NewActivityService newActivityService;
@Autowired
......
......@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
* Created by lvwenyan on 2018/11/23.
*/
public class 新建活动测试_DuibaTest extends DuibaTestBase{
public class 新建活动测试 extends DuibaTestBase{
@Autowired
DeveloperService developerService;
......
......@@ -18,7 +18,7 @@ import org.testng.annotations.Test;
* Created by zhaoran on 2018/5/19.
*/
@ContextConfiguration(classes = Config.class)
public class 活动中奖限制_DuibaTest extends AbstractTestNGSpringContextTests {
public class 活动中奖限制 extends AbstractTestNGSpringContextTests {
@Autowired
SigninService signinService;
@Autowired
......
......@@ -19,7 +19,7 @@ import java.lang.reflect.Method;
* Created by zhaoran on 2018/3/15
*/
@ContextConfiguration(classes = Config.class)
public class 活动次数测试_DuibaTest extends AbstractTestNGSpringContextTests {
public class 活动次数测试 extends AbstractTestNGSpringContextTests {
@Autowired
NewActivityService newActivityService;
......
......@@ -15,7 +15,7 @@ import org.testng.annotations.Test;
* Created by zhaoran on 2018/1/2
*/
@ContextConfiguration(classes = Config.class)
public class 独立活动测试_DuibaTest extends AbstractTestNGSpringContextTests {
public class 独立活动测试 extends AbstractTestNGSpringContextTests {
@Autowired
NewActivityService newActivityService;
......
......@@ -17,7 +17,7 @@ import java.util.Map;
/**
* Created by mabo on 2018/5/17
*/
public class 自有活动出奖_DuibaTest extends DuibaTestBase {
public class 自有活动出奖 extends DuibaTestBase {
@Autowired
NewActivityService newActivityService;
@Autowired
......
......@@ -23,7 +23,7 @@ import java.util.Map;
* Created by zhaoran on 2018/5/19.
*/
@ContextConfiguration(classes = Config.class)
public class 自有答题测试_DuibaTest extends DuibaTestBase {
public class 自有答题测试 extends DuibaTestBase {
@Autowired
SigninService signinService;
@Autowired
......
......@@ -19,7 +19,7 @@ import org.testng.annotations.Test;
import java.util.Map;
//@ContextConfiguration(classes = DuibaConfig.class)
public class Exchange_ExchangeTest extends CheckTemplet {
public class Exchange extends CheckTemplet {
@Value("${manager.host}")
String ManagerHost;
@Autowired
......
......@@ -23,7 +23,7 @@ import java.util.Map;
* Created by yeqinqin on 2018/4/24.
*/
public class ObjectExchange_ExchangeTest extends CheckTemplet {
public class ObjectExchange extends CheckTemplet {
@Autowired
private MobileService mobileService;
......
......@@ -29,7 +29,7 @@ import java.util.concurrent.ThreadFactory;
/**
* Created by mabo on 2018/9/13
*/
public class Qb_兑换流程测试_ExchangeTest extends CheckTemplet {
public class Qb_兑换流程测试 extends CheckTemplet {
@Autowired
private MobileService mobileService;
@Autowired
......
......@@ -26,7 +26,7 @@ import java.util.Map;
/**
* Created by mabo on 2018/9/13
*/
public class Qb_兑换限制测试_ExchangeTest extends CheckTemplet {
public class Qb_兑换限制测试 extends CheckTemplet {
@Autowired
private MobileService mobileService;
@Autowired
......
......@@ -24,7 +24,7 @@ import static io.restassured.RestAssured.given;
* Created by lvwenyan on 2019/3/14
*/
public class 多档位话费_兑换流程测试_ExchangeTest extends CheckTemplet {
public class 多档位话费_兑换流程测试 extends CheckTemplet {
@Autowired
private MobileService mobileService;
......
......@@ -28,7 +28,7 @@ import static io.restassured.RestAssured.given;
* Created by lvwenyan on 2018/08/24.
*/
public class 支付宝_兑换流程测试_ExchangeTest extends CheckTemplet {
public class 支付宝_兑换流程测试 extends CheckTemplet {
@Autowired
AlipayExchangeService alipayExchangeService;
......
......@@ -23,7 +23,7 @@ import java.util.Map;
* Created by lvwenyan on 2019/5/30
*/
public class Qb_兑换流程测试_ExchangeTest extends CheckTemplet {
public class Qb_兑换流程测试 extends CheckTemplet {
@Autowired
gawService gawService;
......
......@@ -23,7 +23,7 @@ import java.util.Map;
* Created by lvwenyan on 2019/5/30
*/
public class 新多档位话费_兑换流程测试_ExchangeTest extends CheckTemplet {
public class 新多档位话费_兑换流程测试 extends CheckTemplet {
@Autowired
gawService gawService;
......
......@@ -28,7 +28,7 @@ import static io.restassured.RestAssured.given;
* Created by lvwenyan on 2019/05/23.
*/
public class 新支付宝_兑换流程测试_ExchangeTest extends CheckTemplet {
public class 新支付宝_兑换流程测试 extends CheckTemplet {
@Autowired
gawService gawService;
......
......@@ -23,7 +23,7 @@ import static io.restassured.RestAssured.given;
/**
* Created by mabo on 2019/2/28
*/
public class 话费_兑换限制测试_ExchangeTest extends CheckTemplet {
public class 话费_兑换限制测试 extends CheckTemplet {
@Autowired
private MobileService mobileService;
@Autowired
......
......@@ -34,7 +34,7 @@ import static io.restassured.RestAssured.urlEncodingEnabled;
* Created by lvwenyan on 2019/3/26.
*/
public class 兑吧卡密_兑换流程测试_ExchangeTest extends CheckTemplet {
public class 兑吧卡密_兑换流程测试 extends CheckTemplet {
@Autowired
gawService gawService;
......
......@@ -29,7 +29,7 @@ import static io.restassured.RestAssured.given;
*/
public class 兑吧新优惠券_兑换流程测试_ExchangeTest extends CheckTemplet {
public class 兑吧新优惠券_兑换流程测试 extends CheckTemplet {
@Autowired
......
......@@ -31,7 +31,7 @@ import static io.restassured.RestAssured.given;
* Created by lvwenyan on 2019/3/19.
*/
public class 兑吧新实物_兑换流程测试_ExchangeTest extends CheckTemplet {
public class 兑吧新实物_兑换流程测试 extends CheckTemplet {
@Autowired
gawService gawService;
......
......@@ -30,7 +30,7 @@ import static io.restassured.RestAssured.given;
* Created by lvwenyan on 2018/07/06.
*/
public class 兑吧老优惠券_兑换流程测试_ExchangeTest extends CheckTemplet {
public class 兑吧老优惠券_兑换流程测试 extends CheckTemplet {
@Autowired
private MobileService mobileService;
......
......@@ -31,7 +31,7 @@ import static io.restassured.RestAssured.given;
/**
* Created by yeqinqin on 2018/6/11.
*/
public class 兑吧老实物_兑换流程测试_ExchangeTest extends CheckTemplet {
public class 兑吧老实物_兑换流程测试 extends CheckTemplet {
@Autowired
private MobileService mobileService;
......
......@@ -22,7 +22,7 @@ import java.util.Map;
* Created by lvwenyan on 2018/06/08.
*/
public class 商品订单失败测试_ExchangeTest extends CheckTemplet {
public class 商品订单失败测试 extends CheckTemplet {
@Autowired
......
......@@ -25,7 +25,7 @@ import static io.restassured.RestAssured.given;
*/
//@ContextConfiguration(classes = DuibaConfig.class)
public class 平台券_兑换流程测试_ExchangeTest extends CheckTemplet {
public class 平台券_兑换流程测试 extends CheckTemplet {
@Autowired
AppPlatformCouponService appPlatformCouponService;
......
......@@ -23,7 +23,7 @@ import java.util.Map;
* 测试开发者账号:zhaoran@duiba.com.cn , 用户uid:4386
*/
public class 开发者账户余额校验测试_ExchangeTest extends CheckTemplet {
public class 开发者账户余额校验测试 extends CheckTemplet {
@Autowired
......
......@@ -22,7 +22,7 @@ import java.util.Map;
/**
* Created by mabo on 2019/3/25
*/
public class 自有新优惠券_兑换限制测试_ExchangeTest extends CheckTemplet{
public class 自有新优惠券_兑换限制测试 extends CheckTemplet{
@Autowired
http.service.app.gawService gawService;
......
......@@ -27,7 +27,7 @@ import static io.restassured.config.RestAssuredConfig.newConfig;
/**
* Created by mabo on 2019/3/26
*/
public class 自有新卡密_兑换限制测试_ExchangeTest extends CheckTemplet {
public class 自有新卡密_兑换限制测试 extends CheckTemplet {
/**
* 15968831723 duibaduiba123
* 查询库存 SELECT stock_id,id from tb_goods_batch where gtype = 6 and gid = 50 //gtype=6 表示卡密类型,gid 是卡密的id,查到的id是goods_batch_id
......
......@@ -16,7 +16,7 @@ import java.lang.reflect.Method;
import java.sql.SQLException;
import java.util.Map;
public class 自有新实物_兑换流程测试_ExchangeTest extends CheckTemplet {
public class 自有新实物_兑换流程测试 extends CheckTemplet {
@Autowired
http.service.app.gawService gawService;
@Autowired
......
......@@ -19,7 +19,7 @@ import java.util.Map;
/**
* Created by mabo on 2019/3/26
*/
public class 自有新虚拟商品_充值_兑换限制_ExchangeTest extends CheckTemplet{
public class 自有新虚拟商品_充值_兑换限制 extends CheckTemplet{
@Autowired
http.service.app.gawService gawService;
@Autowired
......
......@@ -28,7 +28,7 @@ import static io.restassured.RestAssured.given;
/**
* Created by mabo on 2019/3/22
*/
public class 自有老优惠券商品_兑换限制测试_ExchangeTest extends CheckTemplet {
public class 自有老优惠券商品_兑换限制测试 extends CheckTemplet {
@Autowired
private MobileService mobileService;
@Autowired
......
......@@ -27,7 +27,7 @@ import static io.restassured.RestAssured.given;
/**
* Created by mabo on 2019/3/22
*/
public class 自有老实物_兑换限制测试_ExchangeTest extends CheckTemplet {
public class 自有老实物_兑换限制测试 extends CheckTemplet {
@Autowired
private MobileService mobileService;
@Autowired
......
......@@ -24,7 +24,7 @@ import java.util.Map;
/**
* Created by mabo on 2019/3/25
*/
public class 自有老虚拟商品_兑换限制测试_ExchangeTest extends CheckTemplet {
public class 自有老虚拟商品_兑换限制测试 extends CheckTemplet {
@Autowired
private MobileService mobileService;
@Autowired
......
......@@ -25,7 +25,7 @@ import static io.restassured.RestAssured.given;
* Created by panyuli on 2018/07/06.
*/
public class 自有老优惠券_兑换流程测试_ExchangeTest extends CheckTemplet {
public class 自有老优惠券_兑换流程测试 extends CheckTemplet {
@Autowired
......
......@@ -22,7 +22,7 @@ import java.util.Map;
/**
* Created by panyuli on 2018/6/11.
*/
public class 虚拟商品_兑换异常测试_ExchangeTest extends CheckTemplet {
public class 虚拟商品_兑换异常测试 extends CheckTemplet {
@Autowired
private MobileService mobileService;
......
......@@ -41,7 +41,7 @@ public class 游戏_中奖优惠券_AccessTest extends DuibaTestBase {
@Test
//@Test
public void 游戏_普通优惠券中奖测试() throws Exception{
try {
//查询游戏前奖项库存信息
......@@ -55,6 +55,7 @@ public class 游戏_中奖优惠券_AccessTest extends DuibaTestBase {
Long itemStock = Long.parseLong(itemStockResult.get("stock").toString());
Response response = this.playGame("20178","z0eyz5d3","88",uid_Nomal);
logger.info("dddddddddddd"+response.prettyPrint());
//游戏后的奖项库存
Map<String,Object> ngameStockResult1 = jdbc.findSimpleResult("select * from ngame.ngame_stock where game_option_id = ?\n",optionId);
String optionStock1 = ngameStockResult1.get("stock").toString();
......@@ -116,7 +117,7 @@ public class 游戏_中奖优惠券_AccessTest extends DuibaTestBase {
int j=8;
while (j>0&&((!checkNomal("getStartStatus",statusResponse))||(message.equals("处理中")))){
Thread.sleep(1000);
Thread.sleep(10000);
statusResponse = newGameService.getStartStatus(ticketId,uid);
statusResponse.prettyPrint();
statusSuccess = MatcherString.getString(statusResponse.asString(),"\"success\": (.*?),",1);
......
......@@ -23,7 +23,7 @@ import java.util.Map;
* Created by zhaoran on 2018/1/2
*/
@ContextConfiguration(classes = Config.class)
public class 优惠券测试_DuibaTest extends AbstractTestNGSpringContextTests {
public class 优惠券测试 extends AbstractTestNGSpringContextTests {
@Autowired
NewActivityService newActivityService;
......
......@@ -16,7 +16,7 @@ import org.testng.annotations.Test;
* Created by lvwenyan on 2019/4/4.
*/
public class 兑吧活动工具_新商品_DuibaTest extends DuibaTestBase {
public class 兑吧活动工具_新商品 extends DuibaTestBase {
@Autowired
AdminNewDuibaHdtoolService adminNewDuibaHdtoolService;
......
......@@ -16,7 +16,7 @@ import java.util.Map;
/**
* Created by zhaoran on 2018/1/2
*/
public class 新活动工具测试_DuibaTest extends DuibaTestBase {
public class 新活动工具测试 extends DuibaTestBase {
@Autowired
NewActivityService newActivityService;
......
......@@ -19,7 +19,7 @@ import java.util.Map;
* Created by lvwenyan on 2019/4/4.
*/
public class 自有活动工具_新商品_DuibaTest extends DuibaTestBase {
public class 自有活动工具_新商品 extends DuibaTestBase {
@Autowired
LaunchService launchService;
......
......@@ -28,7 +28,7 @@ import java.sql.SQLException;
import java.util.Map;
public class 瓜分积分_实际瓜分_主胜方_AccessTest extends DuibaTestBase {
public class 瓜分积分_实际瓜分_主胜方 extends DuibaTestBase {
@Autowired
PkDevelopService pkDevelopService;
......
/**
* Copyright (C), 2015-2018
* FileName: 配置测试_AccessTest
* FileName: 配置测试
* Author: zhaoran
* Date: 2018/12/10 19:45
* Description:
......@@ -29,7 +29,7 @@ import java.util.Map;
import static io.restassured.RestAssured.given;
public class 配置测试_AccessTest extends DuibaTestBase {
public class 配置测试 extends DuibaTestBase {
@Value("${activity.host}")
String activityHost;
......
......@@ -38,7 +38,7 @@ import java.util.Map;
* @create 2018/8/9
* @since 1.0.0
*/
public class pk_瓜分优惠券_AccessTest extends DuibaTestBase {
public class pk_瓜分优惠券 extends DuibaTestBase {
@Autowired
PkService pkService;
......
/**
* Copyright (C), 2015-2018
* FileName: pk_瓜分红包_首页中奖弹层测试_AccessTest
* FileName: pk_瓜分红包_首页中奖弹层测试
* Author: qianwenjun
* Date: 2018/12/22 12:38
* Description:
......
......@@ -39,7 +39,7 @@ import java.util.Map;
* @create 2018/8/9
* @since 1.0.0
*/
public class pk_瓜分红包_投放两个app_AccessTest extends DuibaTestBase {
public class pk_瓜分红包_投放两个app extends DuibaTestBase {
@Autowired
PkService pkService;
......
......@@ -39,7 +39,7 @@ import java.util.Map;
* @create 2018/8/9
* @since 1.0.0
*/
public class pk_瓜分红包_押注人数不同测试_AccessTest extends DuibaTestBase {
public class pk_瓜分红包_押注人数不同测试 extends DuibaTestBase {
@Autowired
PkService pkService;
......
......@@ -39,7 +39,7 @@ import java.util.Map;
* @create 2018/8/9
* @since 1.0.0
*/
public class pk_瓜分红包_押注人数相同测试_AccessTest extends DuibaTestBase {
public class pk_瓜分红包_押注人数相同测试 extends DuibaTestBase {
@Autowired
PkService pkService;
......
/**
* Copyright (C), 2015-2018
* FileName: pk_瓜分红包_首页中奖弹层测试_AccessTest
* FileName: pk_瓜分红包_首页中奖弹层测试
* Author: qianwenjun
* Date: 2018/12/22 12:38
* Description:
......@@ -38,7 +38,7 @@ import static io.restassured.RestAssured.given;
* @create 2018/12/22
* @since 1.0.0
*/
public class pk_瓜分红包_首页中奖弹层测试_AccessTest extends DuibaTestBase {
public class pk_瓜分红包_首页中奖弹层测试 extends DuibaTestBase {
@Autowired
......
......@@ -17,7 +17,7 @@ import java.util.Map;
/**
* Created by zhaoran on 2018/6/8.
*/
public class 自有单品抽奖_AccessTest extends DuibaTestBase {
public class 自有单品抽奖 extends DuibaTestBase {
@Autowired
SingleLotteryService singleLotteryService;
private static DuibaLog logger = DuibaLog.getLogger();
......
......@@ -17,7 +17,7 @@ import java.util.Map;
/**
* Created by lvwenyan on 2019/4/4.
*/
public class 自有单品抽奖_新商品_AccessTest extends DuibaTestBase {
public class 自有单品抽奖_新商品 extends DuibaTestBase {
@Autowired
SingleLotteryService singleLotteryService;
......
......@@ -14,7 +14,7 @@ import java.util.Map;
/**
* Created by zhaoran on 2018/6/8.
*/
public class 自有库存不足_AccessTest extends DuibaTestBase {
public class 自有库存不足 extends DuibaTestBase {
@Autowired
SingleLotteryService singleLotteryService;
private static DuibaLog logger = DuibaLog.getLogger();
......
......@@ -13,7 +13,7 @@ import org.testng.annotations.Test;
import java.util.Map;
public class 权益一期线上用户核销中匹配兑换码兑换_DuibaTest extends CheckTemplet {
public class 权益一期线上用户核销中匹配兑换码兑换 extends CheckTemplet {
@Autowired
public equityPrizeService equityPrizeService;
@Autowired
......
......@@ -16,7 +16,7 @@ import java.util.List;
import java.util.Map;
public class 权益二期线上用户核销匹配权益及兑换码兑换_DuibaTest extends CheckTemplet {
public class 权益二期线上用户核销匹配权益及兑换码兑换 extends CheckTemplet {
@Autowired
public equityPrizeService equityPrizeService;
@Autowired
......
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