Commit e30d4d17 authored by 赵然's avatar 赵然

zr

parent 5a9a6c01
......@@ -47,8 +47,8 @@ public class 配置测试_AccessTest extends DuibaTestBase {
Object[][] result = null;
if(method.getName().equals("重复投注测试")) {
result = new Object[][]{
new Object[]{"3758"},
new Object[]{"3757"},
new Object[]{"7593"},
new Object[]{"7594"},
};
}
return result;
......@@ -81,15 +81,15 @@ public class 配置测试_AccessTest extends DuibaTestBase {
Assert.assertEquals(bonusType1,"4","校验瓜分类型失败");//'瓜分类型1瓜分经验2瓜分红包3发奖品4瓜分积分'
Assert.assertEquals(configStatus1,"3","校验投注活动的状态失败");//'投注活动的状态:1关闭不可见2关闭可见3开启4结束'
Assert.assertEquals(creditsValue1,"2.00","校验积分价值失败");//积分价值
Assert.assertEquals(id1,"1354","校验pk id失败");
Assert.assertTrue(new BigDecimal(shareExp1).compareTo(new BigDecimal("99"))==0,"校验瓜分的经验池失败");//瓜分的经验池
Assert.assertEquals(id1,"3715","校验pk id失败");
Assert.assertTrue(new BigDecimal(shareExp1).compareTo(new BigDecimal("2"))==0,"校验瓜分的经验池失败");//瓜分的经验池
Assert.assertEquals(title1,"瓜分积分","校验投注活动标题失败");//投注活动标题
Assert.assertEquals(unitName1,"元宝","校验消耗类型失败");
Assert.assertEquals(optionId1,"2867","校验选项1 id失败");
Assert.assertEquals(optionImg1,"//yun.dui88.com/images/201812/c5vo081h6h.jpg","校验选项1 图片失败");
Assert.assertEquals(optionId1,"7589","校验选项1 id失败");
Assert.assertEquals(optionImg1,"//yun.dui88.com/images/201903/p7fr0tp014.jpg","校验选项1 图片失败");
Assert.assertEquals(optionName1,"分积分1","校验选项1 title失败");
Assert.assertEquals(optionId2,"2868","校验选项2 id失败");
Assert.assertEquals(optionImg2,"//yun.dui88.com/images/201812/5ib6ews6bw.png","校验选项2 图片失败");
Assert.assertEquals(optionId2,"7590","校验选项2 id失败");
Assert.assertEquals(optionImg2,"//yun.dui88.com/images/201903/ej2ij2xg6r.jpg","校验选项2 图片失败");
Assert.assertEquals(optionName2,"分积分2","校验选项2 title失败");
......@@ -114,15 +114,15 @@ public class 配置测试_AccessTest extends DuibaTestBase {
Assert.assertEquals(bonusType2,"2","校验瓜分类型失败");//'瓜分类型1瓜分经验2瓜分红包3发奖品4瓜分积分'
Assert.assertEquals(configStatus2,"3","校验投注活动的状态失败");//'投注活动的状态:1关闭不可见2关闭可见3开启4结束'
Assert.assertEquals(creditsValue2,"3.00","校验积分价值失败");//积分价值
Assert.assertEquals(id2,"1355","校验pk id失败");
Assert.assertTrue(new BigDecimal(shareExp2).compareTo(new BigDecimal("199"))==0,"校验瓜分的经验池失败");//瓜分的经验池
Assert.assertEquals(id2,"3716","校验pk id失败");
Assert.assertTrue(new BigDecimal(shareExp2).compareTo(new BigDecimal("2000"))==0,"校验瓜分的经验池失败");//瓜分的经验池
Assert.assertEquals(title2,"瓜分红包","校验投注活动标题失败");//投注活动标题
Assert.assertEquals(unitName2,"元宝","校验消耗类型失败");
Assert.assertEquals(optionId3,"2869","校验选项1 id失败");
Assert.assertEquals(optionImg3,"//yun.dui88.com/images/201812/wfvn1m8wm0.jpg","校验选项1 图片失败");
Assert.assertEquals(optionId3,"7591","校验选项1 id失败");
Assert.assertEquals(optionImg3,"//yun.dui88.com/images/201903/f6ee14q3zj.png","校验选项1 图片失败");
Assert.assertEquals(optionName3,"分红包选项一","校验选项1 title失败");
Assert.assertEquals(optionId4,"2870","校验选项2 id失败");
Assert.assertEquals(optionImg4,"//yun.dui88.com/images/201812/ifh1kvaq9m.jpg","校验选项2 图片失败");
Assert.assertEquals(optionId4,"7592","校验选项2 id失败");
Assert.assertEquals(optionImg4,"//yun.dui88.com/images/201903/rgvubpusdu.jpg","校验选项2 图片失败");
Assert.assertEquals(optionName4,"分红包选项二","校验选项2 title失败");
//已投注配置
......@@ -149,19 +149,19 @@ public class 配置测试_AccessTest extends DuibaTestBase {
Assert.assertEquals(bonusType3,"4","校验瓜分类型失败");//'瓜分类型1瓜分经验2瓜分红包3发奖品4瓜分积分'
Assert.assertEquals(configStatus3,"3","校验投注活动的状态失败");//'投注活动的状态:1关闭不可见2关闭可见3开启4结束'
Assert.assertEquals(creditsValue3,"0","校验积分价值失败");//积分价值
Assert.assertEquals(id3,"1799","校验pk id失败");
Assert.assertEquals(id3,"3717","校验pk id失败");
Assert.assertTrue(new BigDecimal(shareExp3).compareTo(new BigDecimal("50"))==0,"校验瓜分的经验池失败");//瓜分的经验池
Assert.assertEquals(title3,"待投注","校验投注活动标题失败");//投注活动标题
Assert.assertEquals(unitName3,"元宝","校验消耗类型失败");
Assert.assertEquals(optionId5,"3757","校验选项1 id失败");
Assert.assertEquals(optionImg5,"//yun.dui88.com/images/201812/2sv582lhyo.png","校验选项1 图片失败");
Assert.assertEquals(optionId5,"7593","校验选项1 id失败");
Assert.assertEquals(optionImg5,"//yun.dui88.com/images/201903/ml6qm3orix.png","校验选项1 图片失败");
Assert.assertEquals(optionName5,"1","校验选项1 title失败");
Assert.assertEquals(chooseThisOption5,"false","校验选项1选择情况失败");
Assert.assertEquals(chooseThisOption5,"true","校验选项1选择情况失败");
Assert.assertEquals(optionId6,"3758","校验选项2 id失败");
Assert.assertEquals(optionImg6,"//yun.dui88.com/images/201812/hyhd36w6be.png","校验选项2 图片失败");
Assert.assertEquals(optionId6,"7594","校验选项2 id失败");
Assert.assertEquals(optionImg6,"//yun.dui88.com/images/201903/15fmwiauzb.png","校验选项2 图片失败");
Assert.assertEquals(optionName6,"2","校验选项2 title失败");
Assert.assertEquals(chooseThisOption6,"true","校验选项2选择情况失败");
Assert.assertEquals(chooseThisOption6,"false","校验选项2选择情况失败");
logger.info("pk组件分红包、分积分配置校验正确!");
}
......@@ -171,11 +171,11 @@ public class 配置测试_AccessTest extends DuibaTestBase {
String url = activityHost + "/betActivity2/doJoin";
Map<String,Object> map = new HashMap<>();
map.put("betId","1355");
map.put("optionId","2869");
map.put("betId","3715");
map.put("optionId","7589");
Response response = given().cookies(authorization.dafuwengLogin(uid)).params(map).post(url);
response.print();
Assert.assertEquals(response.jsonPath().getString("success"),"false","校验success失败");
Assert.assertEquals(response.jsonPath().getString("code"),"100009","校验错误码失败");
Assert.assertEquals(response.jsonPath().getString("desc"),"积分不足","校验desc失败");
......@@ -188,7 +188,7 @@ public class 配置测试_AccessTest extends DuibaTestBase {
String url = activityHost + "/betActivity2/doJoin";
Map<String,Object> map = new HashMap<>();
map.put("betId","1799");
map.put("betId","3717");
map.put("optionId",optionId);
Response response = given().cookies(authorization.dafuwengLogin(uid)).params(map).post(url);
......
......@@ -109,7 +109,7 @@ public class HbaseService {
if(!lvalue.equals("")) {
parm.put("lvalue", lvalue);
}
Response response = given().params(parm).get(url);
Response response = given().params(parm).post(url);
// response.prettyPrint();
// 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