Skip to content

T
test-platform
Commit 7867093d authored by 马博's avatar 马博
Browse files
Options

sign update

parent 436a7ffe
Show whitespace changes
Inline Side-by-side
Showing with 221 additions and 54 deletions
src/test/java/http/cases/SignTest/Signin_signTest.java
View file @ 7867093d
......@@ -36,14 +36,11 @@ public class Signin_signTest extends DuibaTestBase {
DuibaLog logger = DuibaLog.getLogger();
//指定用户
private int uid = 2722;
private static int uid = 2722;
private Map<String,Object> maptest ;
@BeforeClass
public void beforeclass(){
// jdbc = new MysqlUtils("");
maptest = authorization.dafuwengLogin(uid);
logger.info("_ac:"+maptest.get("_ac"));
try {
jdbc.update("delete from sign_record.tb_sign_log where consumer_id=100028002 and source_relation_id=69");
jdbc.update("delete from sign_record.tb_sign_statics where consumer_id=100028002 and source_relation_id=69");
......@@ -68,16 +65,15 @@ public class Signin_signTest extends DuibaTestBase {
String url = MatcherString.getString(response.asString(),"\"resultUrl\": \"(.*?)\"",1);
System.out.println(url);
response = given(). cookies(maptest).get(url);
response = given(). cookies(authorization.dafuwengLogin(uid)).get(url);
response.prettyPrint();
System.out.println(response.getDetailedCookies());
}
@Test
public void 签到_今日签到() throws Exception {
logger.info("Current Thread Id: " + Thread.currentThread().getId());
//签到信息查询
Response response = signactivityService.getSignInfo(maptest,"65");
Response response = signactivityService.getSignInfo(authorization.dafuwengLogin(uid),"65");
//今日奖励抽奖次数
String activityCount = response.jsonPath().getString("signInfoVO.activityCount");
//明天签到奖励抽奖次数
......@@ -94,7 +90,7 @@ public class Signin_signTest extends DuibaTestBase {
//签到
response = signactivityService.doSign(maptest,"65");
response = signactivityService.doSign(authorization.dafuwengLogin(uid),"65");
//今日是否签到
todaySigned = response.jsonPath().getString("signInfoVO.todaySigned");
//连续签到天数
......@@ -103,14 +99,14 @@ public class Signin_signTest extends DuibaTestBase {
Assert.assertEquals(continueDay,"1","连续签到天数不正确");
//获取签到logId
String logId = response.jsonPath().getString("logId");
response = signactivityService.getSignResult(maptest,logId);
response = signactivityService.getSignResult(authorization.dafuwengLogin(uid),logId);
//签到状态
String status = response.jsonPath().getString("status");
//接口异步处理
int i=3;
while(status.equals("0")&&i>0){
Thread.sleep(1000);
response = signactivityService.getSignResult(maptest,logId);
response = signactivityService.getSignResult(authorization.dafuwengLogin(uid),logId);
status = response.jsonPath().getString("status");
i--;
}
......@@ -119,19 +115,16 @@ public class Signin_signTest extends DuibaTestBase {
}
@Test
public void 补签() throws Exception {
logger.info("Current Thread Id: " + Thread.currentThread().getId());
// Map<String,String> map = authorization.dafuwengLogin(uid);
Map consumerCredits= jdbc.findSimpleResult("select * from consumer.consumer_0010 where id=100028002");
Map consumerCredits= jdbc.findSimpleResult("select * from new_consumer.consumer_0010 where id=100028002");
logger.info("数据库积分："+consumerCredits.get("credits"));
//签到信息查询
logger.info("_ac1:"+maptest.get("_ac"));
Response response = signactivityService.getSignInfo(maptest,"69");
Response response = signactivityService.getSignInfo(authorization.dafuwengLogin(uid),"69");
//获取当前用户积分
String credits = response.jsonPath().getString("credits");
//补签前一天
response = signactivityService.reSign(maptest,"69",null,getTime(-1));
response = signactivityService.reSign(authorization.dafuwengLogin(uid),"69",null,getTime(-1));
//补签加抽奖次数
String activityCount = response.jsonPath().getString("data.activityCount");
//补签加积分
......@@ -146,14 +139,14 @@ public class Signin_signTest extends DuibaTestBase {
Assert.assertEquals(creditsFirst,"1","补签加积分不正确");
Assert.assertEquals(hasConsume,"true","补签消耗与否不正确");
Assert.assertEquals(reSignConsumeCount,"1","补签消耗数量不正确");
response = signactivityService.getSignResult(maptest,logId);
response = signactivityService.getSignResult(authorization.dafuwengLogin(uid),logId);
//签到状态
String status = response.jsonPath().getString("status");
//接口异步处理
int i=3;
while(status.equals("0")&&i>0){
Thread.sleep(1000);
response = signactivityService.getSignResult(maptest,logId);
response = signactivityService.getSignResult(authorization.dafuwengLogin(uid),logId);
status = response.jsonPath().getString("status");
i--;
}
......@@ -171,14 +164,14 @@ public class Signin_signTest extends DuibaTestBase {
Assert.assertEquals(act,exp,"积分与预期不符");
//校验consumer和user表的积分
Thread.sleep(2000);
consumerCredits= jdbc.findSimpleResult("select * from consumer.consumer_0010 where id=100028002");
consumerCredits= jdbc.findSimpleResult("select * from new_consumer.consumer_0010 where id=100028002");
Map userCredits = jdbc.findSimpleResult("select * from dafuweng.user where id ="+uid);
Assert.assertEquals(consumerCredits.get("credits").toString().trim(),String.valueOf(exp),"consumer积分与预期不符");
Assert.assertEquals(userCredits.get("credits").toString().trim(),String.valueOf(exp),"user积分与预期不符");
//补签前两天
response = signactivityService.reSign(maptest,"69",null,getTime(-2));
response = signactivityService.reSign(authorization.dafuwengLogin(uid),"69",null,getTime(-2));
//补签加抽奖次数
activityCount = response.jsonPath().getString("data.activityCount");
//补签加积分
......@@ -193,14 +186,14 @@ public class Signin_signTest extends DuibaTestBase {
Assert.assertEquals(reSignConsumeCount,"1","补签消耗数量不正确");
//补签logid
logId = response.jsonPath().getString("data.logId");
response = signactivityService.getSignResult(maptest,logId);
response = signactivityService.getSignResult(authorization.dafuwengLogin(uid),logId);
//签到状态
status = response.jsonPath().getString("status");
//接口异步处理
i=3;
while(status.equals("0")&&i>0){
Thread.sleep(1000);
response = signactivityService.getSignResult(maptest,logId);
response = signactivityService.getSignResult(authorization.dafuwengLogin(uid),logId);
status = response.jsonPath().getString("status");
i--;
}
......@@ -218,14 +211,14 @@ public class Signin_signTest extends DuibaTestBase {
Assert.assertEquals(act,exp,"积分与预期不符");
//校验consumer和user表的积分
Thread.sleep(2000);
consumerCredits= jdbc.findSimpleResult("select * from consumer.consumer_0010 where id=100028002");
consumerCredits= jdbc.findSimpleResult("select * from new_consumer.consumer_0010 where id=100028002");
userCredits = jdbc.findSimpleResult("select * from dafuweng.user where id ="+uid);
Assert.assertEquals(consumerCredits.get("credits").toString().trim(),String.valueOf(exp),"consumer积分与预期不符");
Assert.assertEquals(userCredits.get("credits").toString().trim(),String.valueOf(exp),"user积分与预期不符");
//补签前三天
response = signactivityService.reSign(maptest,"69",null,getTime(-3));
response = signactivityService.reSign(authorization.dafuwengLogin(uid),"69",null,getTime(-3));
// response.prettyPrint();
String message = response.jsonPath().getString("message");
......
src/test/java/http/cases/SignTest/补签测试_signTest.java
View file @ 7867093d
package http.cases.SignTest;
import com.alibaba.fastjson.JSONObject;
import common.DuibaLog;
import common.DuibaTestBase;
import http.service.Activity.ManagerService;
......@@ -10,16 +9,16 @@ import http.service.Authorization;
import http.service.hd.SigninService;
import io.restassured.response.Response;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
import java.util.Map;
import java.util.*;
import static io.restassured.RestAssured.given;
/**
* Created by humengxin on 2018/5/9.
......@@ -35,19 +34,21 @@ public class 补签测试_signTest extends DuibaTestBase {
@Autowired
ManagerService managerService;
// MysqlUtils jdbc = null;
@Value("${activity.host}")
String activityHost;
@Value("${hdserver.host}")
String hdHost;
private static DuibaLog logger = DuibaLog.getLogger();
//指定用户
private int uid = 3746;
private String consumer_id = "100085132";
private String tag = "0396";
private Map<String,Object> cookies ;
private static int uid = 3746;
private static String consumer_id = "100085132";
private static String tag = "0396";
@BeforeClass
public void beforeclass() {
// jdbc = new MysqlUtils("");
cookies = authorization.dafuwengLogin(uid);
try {
jdbc.update("delete from sign_record.tb_sign_log where consumer_id="+consumer_id+" and source_relation_id=70");
jdbc.update("delete from sign_record.tb_sign_statics where consumer_id="+consumer_id+" and source_relation_id=70");
......@@ -57,6 +58,10 @@ public class 补签测试_signTest extends DuibaTestBase {
jdbc.update("delete from sign_record.tb_sign_statics where consumer_id="+consumer_id+" and source_relation_id=80");
jdbc.update("delete from sign_record.tb_sign_log where consumer_id="+consumer_id+" and source_relation_id=82");
jdbc.update("delete from sign_record.tb_sign_statics where consumer_id="+consumer_id+" and source_relation_id=82");
jdbc.update("delete from sign_record.tb_sign_log where consumer_id="+consumer_id+" and source_relation_id=94");
jdbc.update("delete from sign_record.tb_sign_statics where consumer_id="+consumer_id+" and source_relation_id=94");
jdbc.update("delete from sign_record.tb_sign_statics where consumer_id="+consumer_id+" and source_relation_id=93");
jdbc.update("delete from sign_record.tb_sign_log where consumer_id="+consumer_id+" and source_relation_id=93");
jdbc.update("UPDATE consumer_accounts.tb_consumer_account_"+tag+" SET balance_amount = '100' WHERE id = '4'");
} catch (SQLException e) {
logger.info("数据库更新异常");
......@@ -71,7 +76,6 @@ public class 补签测试_signTest extends DuibaTestBase {
@Test(description = "虚拟卡补签")
public void 虚拟卡补签() throws Exception {
logger.info("Current Thread Id: " + Thread.currentThread().getId());
//获取目前虚拟卡数量
Map map = jdbc.findSimpleResult("select * from consumer_accounts.tb_consumer_account_"+tag+" where id = 4");
String amount = String.valueOf(map.get("balance_amount"));
......@@ -79,13 +83,13 @@ public class 补签测试_signTest extends DuibaTestBase {
amount = String.valueOf(Integer.valueOf(amount)-10);
//签到信息查询（没补之前的，没签到今天的，此用例都不自动签到当天的，只补过去的）
Response response = signactivityService.getSignInfo(cookies,"70");
Response response = signactivityService.getSignInfo(authorization.dafuwengLogin(uid),"70");
//获取当前用户积分（没补签之前的，getSignInfo接口中的返回字段）
String credits = response.jsonPath().getString("credits");
logger.info("没签之前查询签到的积分为——————————————"+credits+"-------------------------------------");
//补签前一天（前2天-2，当天0，后一天+1）
response = signactivityService.reSign(cookies,"70","255",getTime(-1));
response = signactivityService.reSign(authorization.dafuwengLogin(uid),"70","255",getTime(-1));
//补签加抽奖次数
String activityCount = response.jsonPath().getString("data.activityCount");
//补签加积分
......@@ -105,7 +109,7 @@ public class 补签测试_signTest extends DuibaTestBase {
Assert.assertEquals(reSignConsumeCount,"10","虚拟卡补签消耗数量不正确");
Assert.assertEquals(reSignConsumeTypeStr,"补签卡","补签消耗类型不正确");
Thread.sleep(2000);
response = signactivityService.getSignResult(cookies,logId);
response = signactivityService.getSignResult(authorization.dafuwengLogin(uid),logId);
//签到状态（补签之后查询签到结果，2为成功）
String status = response.jsonPath().getString("status");
......@@ -113,7 +117,7 @@ public class 补签测试_signTest extends DuibaTestBase {
int i=10;
while(status.equals("0")&&i>0){
Thread.sleep(1000);
response = signactivityService.getSignResult(cookies,logId);
response = signactivityService.getSignResult(authorization.dafuwengLogin(uid),logId);
status = response.jsonPath().getString("status");
i--;
}
......@@ -132,7 +136,7 @@ public class 补签测试_signTest extends DuibaTestBase {
Assert.assertEquals(act,exp,"积分与预期不符");
//校验consumer和user表的积分
Thread.sleep(2000);
Map consumerCredits= jdbc.findSimpleResult("select * from consumer.consumer_0010 where id="+consumer_id+"");
Map consumerCredits= jdbc.findSimpleResult("select * from new_consumer.consumer_0010 where id="+consumer_id+"");
Map userCredits = jdbc.findSimpleResult("select * from dafuweng.user where id ="+uid);
Assert.assertEquals(consumerCredits.get("credits").toString().trim(),String.valueOf(exp),"consumer积分与预期不符");
Assert.assertEquals(userCredits.get("credits").toString().trim(),String.valueOf(exp),"user积分与预期不符");
......@@ -148,7 +152,6 @@ public class 补签测试_signTest extends DuibaTestBase {
//@Test(description = "补签失败场景——扣积分失败")
public void 补签_扣积分失败() throws Exception {
logger.info("Current Thread Id: " + Thread.currentThread().getId());
managerService.index();
try{
//修改活动扣积分模板 consumeTemplateId: 1-扣积分成功；2-扣积分失败
......@@ -197,10 +200,9 @@ public class 补签测试_signTest extends DuibaTestBase {
@Test(description = "补签失败场景——积分不足")
public void 补签_积分不足() throws Exception {
logger.info("Current Thread Id: " + Thread.currentThread().getId());
//补签前一天（前2天-2，当天0，后一天+1）
Response response = signactivityService.reSign(cookies, "80", null, getTime(-1));
Response response = signactivityService.reSign(authorization.dafuwengLogin(uid), "80", null, getTime(-1));
//response.prettyPrint();
String hasConsume = response.jsonPath().getString("data.hasConsume");
//补签消耗数量
......@@ -212,14 +214,14 @@ public class 补签测试_signTest extends DuibaTestBase {
Assert.assertEquals(reSignConsumeTypeStr,"积分","补签消耗类型是否为积分");
//补签logid
String logId = response.jsonPath().getString("data.logId");
response = signactivityService.getSignResult(cookies, logId);
response = signactivityService.getSignResult(authorization.dafuwengLogin(uid), logId);
//签到状态
String status = response.jsonPath().getString("status");
//接口异步处理
int i=10;
while(status.equals("0")&&i>0){
Thread.sleep(1000);
response = signactivityService.getSignResult(cookies,logId);
response = signactivityService.getSignResult(authorization.dafuwengLogin(uid),logId);
status = response.jsonPath().getString("status");
i--;
}
......@@ -237,7 +239,7 @@ public class 补签测试_signTest extends DuibaTestBase {
public void 补签_超过补签期限() throws Exception {
//补签前一天（前2天-2，当天0，后一天+1）
Response response = signactivityService.reSign(cookies, "82", null, getTime(-8));
Response response = signactivityService.reSign(authorization.dafuwengLogin(uid), "82", null, getTime(-8));
response.prettyPrint();
String success = response.jsonPath().getString("success");
String message = response.jsonPath().getString("message");
......@@ -248,6 +250,142 @@ public class 补签测试_signTest extends DuibaTestBase {
logger.info("补签失败用例成功，原因——超过补签期限");
}
@Test(description = "自定义周期,自然月滚动补签,活动id：93，补签限制5天")
public void 自定义周期补签限制() throws Exception{
String date = this.getTime_data(-10);
// 修改周期开始时间
Map<String,String> map = new HashMap<>();
map.put("appId","2239");
map.put("title","自动化_自然月周期签到 ");
map.put("description","");
map.put("id","93");
map.put("signRule","{\"acValidityType\":\"DAY\",\"cusCirType\":\"MONTH\",\"cusCirStart\":\"" + date + "\",\"type\":\"CUSTOM_CIRCLE\"}");
map.put("reSignRule","{\"open\":true,\"dateUnit\":\"CUSTOM\",\"days\":31,\"conType\":\"NO\",\"credits\":null,\"card\":null,\"awardType\":\"NO\",\"countLimit\":5}");
map.put("cntReward","{\"rwType\":\"CONTINUE\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":null,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":false}");
map.put("cirReward","{\"rwType\":\"CIRCLE\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":null,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":true}");
map.put("acmReward","{\"rwType\":\"ACCUMULATE\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":false}");
map.put("firstSignReward","{\"rwType\":\"FIRST_SIGN\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":false}");
map.put("fullSignReward", "{\"rwType\":\"FULL_SIGN\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":false}");
map.put("operatingPositions","[]");
logger.info("请求configEdit接口");
Response response = given().contentType("application/x-www-form-urlencoded;charset=UTF-8").cookies(authorization.hdLogin()).params(map).post("http://"+hdHost+"/signin/configEdit");
try {
Assert.assertEquals(response.jsonPath().getString("success"), "true", "/signin/configEdit接口失败");
} catch (Exception e) {
throw new Exception("/signin/configEdit接口失败,返回信息：" + response.asString());
} catch (Error er) {
throw new Exception("/signin/configEdit接口失败,返回信息：" + response.asString());
}
// 查询补签前信息
Response signInfoRes = signactivityService.getSignInfo(authorization.dafuwengLogin(uid),"93");
String resignCount = signInfoRes.jsonPath().getString("signInfoVO.resignCount");
logger.info("补签前剩余补签次数为：" + resignCount);
Assert.assertEquals(resignCount, "5", "补签前剩余补签次数不正确");
// 补签5天
for(int i = 0 ; i < 5; i++){
this.resign(authorization.dafuwengLogin(uid),"93",i-5);
Thread.sleep(500);
}
// 查询补签后的信息
signInfoRes = signactivityService.getSignInfo(authorization.dafuwengLogin(uid), "93");
resignCount = signInfoRes.jsonPath().getString("signInfoVO.resignCount");
Assert.assertEquals(resignCount, "0", "补签后剩余补签次数不正确");
Response resignRes = signactivityService.reSign(authorization.dafuwengLogin(uid), "93", null, this.getTime(-6));
String success = resignRes.jsonPath().getString("success");
String message = resignRes.jsonPath().getString("message");
//判断结果
Assert.assertEquals(success,"false","补签结果不正确，应补签失败");
Assert.assertEquals(message,"补签失败,补签超过限定次数","补签失败返回信息不对");
}
@Test(description = "自定义周期，补签上一个周期，不消耗本周期的补签次数，活动id：94")
public void A自定义周期补签次数() throws Exception{
String date = this.getTime_data(-9);
// 修改周期开始时间
Map<String,String> map = new HashMap<>();
map.put("appId", "2239");
map.put("title", "自动化_自定义固定天数");
map.put("description","");
map.put("id", "94");
map.put("signRule", "{\"acValidityType\":\"DAY\",\"cusCirType\":\"FIXED_DAYS\",\"cusCirStart\":\""+ date +"\",\"cusCirDays\":7,\"type\":\"CUSTOM_CIRCLE\"}");
map.put("reSignRule", "{\"open\":true,\"dateUnit\":\"CUSTOM\",\"days\":7,\"conType\":\"NO\",\"credits\":null,\"card\":null,\"awardType\":\"NO\",\"countLimit\":5}");
map.put("cntReward", "{\"rwType\":\"CONTINUE\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":null,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":false}");
map.put("cirReward", "{\"rwType\":\"CIRCLE\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":null,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":true}");
map.put("acmReward", "{\"rwType\":\"ACCUMULATE\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":false}");
map.put("firstSignReward", "{\"rwType\":\"FIRST_SIGN\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":false}");
map.put("fullSignReward","{\"rwType\":\"FULL_SIGN\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":false}");
map.put("operatingPositions","[]");
logger.info("请求configEdit接口");
Response response = given().contentType("application/x-www-form-urlencoded;charset=UTF-8").cookies(authorization.hdLogin()).params(map).post("http://"+hdHost+"/signin/configEdit");
try {
Assert.assertEquals(response.jsonPath().getString("success"), "true", "/signin/configEdit接口失败");
} catch (Exception e) {
throw new Exception("/signin/configEdit接口失败,返回信息：" + response.asString());
} catch (Error er) {
throw new Exception("/signin/configEdit接口失败,返回信息：" + response.asString());
}
// 补签前查询剩余补签次数
Response signInfoRes = signactivityService.getSignInfo(authorization.dafuwengLogin(uid),"94");
String resignCount = signInfoRes.jsonPath().getString("signInfoVO.resignCount");
logger.info("补签前剩余补签次数为：" + resignCount);
Assert.assertEquals(resignCount, "5", "补签前剩余补签次数不正确");
// 补签5天，其中3天为上一个周期
for(int i = 0 ; i < 5; i++){
this.resign(authorization.dafuwengLogin(uid),"94",i-5);
Thread.sleep(500);
}
// 查询补签后的剩余补签次数
signInfoRes = signactivityService.getSignInfo(authorization.dafuwengLogin(uid), "94");
resignCount = signInfoRes.jsonPath().getString("signInfoVO.resignCount");
Assert.assertEquals(resignCount, "3", "补签后剩余补签次数不正确");
}
@Test(description = "自定义周期，开启新的周期，补签次数重置，活动id：94")
public void B自定义周期补签次数重置() throws Exception{
// 修改周期前查询剩余补签次数
Response signInfoRes = signactivityService.getSignInfo(authorization.dafuwengLogin(uid),"94");
String resignCount = signInfoRes.jsonPath().getString("signInfoVO.resignCount");
logger.info("修改周期前剩余补签次数为：" + resignCount);
Assert.assertEquals(resignCount, "3", "修改周期前剩余补签次数不正确");
// 修改周期开始时间
String date = this.getTime_data(0);
Map<String,String> map = new HashMap<>();
map.put("appId", "2239");
map.put("title", "自动化_自定义固定天数");
map.put("description","");
map.put("id", "94");
map.put("signRule", "{\"acValidityType\":\"DAY\",\"cusCirType\":\"FIXED_DAYS\",\"cusCirStart\":\""+ date +"\",\"cusCirDays\":7,\"type\":\"CUSTOM_CIRCLE\"}");
map.put("reSignRule", "{\"open\":true,\"dateUnit\":\"CUSTOM\",\"days\":7,\"conType\":\"NO\",\"credits\":null,\"card\":null,\"awardType\":\"NO\",\"countLimit\":5}");
map.put("cntReward", "{\"rwType\":\"CONTINUE\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":null,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":false}");
map.put("cirReward", "{\"rwType\":\"CIRCLE\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":null,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":true}");
map.put("acmReward", "{\"rwType\":\"ACCUMULATE\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":false}");
map.put("firstSignReward", "{\"rwType\":\"FIRST_SIGN\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":false}");
map.put("fullSignReward","{\"rwType\":\"FULL_SIGN\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":false}");
map.put("operatingPositions","[]");
logger.info("请求configEdit接口");
Response response = given().contentType("application/x-www-form-urlencoded;charset=UTF-8").cookies(authorization.hdLogin()).params(map).post("http://"+hdHost+"/signin/configEdit");
try {
Assert.assertEquals(response.jsonPath().getString("success"), "true", "/signin/configEdit接口失败");
} catch (Exception e) {
throw new Exception("/signin/configEdit接口失败,返回信息：" + response.asString());
} catch (Error er) {
throw new Exception("/signin/configEdit接口失败,返回信息：" + response.asString());
}
Thread.sleep(61000);
// 修改周期后，查询剩余补签次数
signInfoRes = signactivityService.getSignInfo(authorization.dafuwengLogin(uid),"94");
resignCount = signInfoRes.jsonPath().getString("signInfoVO.resignCount");
logger.info("修改周期前剩余补签次数为：" + resignCount);
Assert.assertEquals(resignCount, "5", "修改周期后剩余补签次数不正确");
}
// 获取时间方法
public String getTime(int amount){
SimpleDateFormat dateFormat = new SimpleDateFormat("EEE MMM d yyyy", Locale.ENGLISH);
......@@ -262,18 +400,54 @@ public class 补签测试_signTest extends DuibaTestBase {
return time;
}
public static void main(String[] args) {
SimpleDateFormat dateFormat = new SimpleDateFormat("EEE MMM d yyyy",Locale.ENGLISH);
//获取string日期
private String getTime_data(int amount){
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH);
Date date = new Date();
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.add(Calendar.DAY_OF_MONTH, 0);
calendar.add(Calendar.DAY_OF_MONTH, amount);
date = calendar.getTime();
System.out.println(dateFormat.format(date));
String time = dateFormat.format(date)+" 08:00:00 GMT+0800 (CST)";
System.out.println(time);
String time = dateFormat.format(date);
return time;
}
// public static void main(String[] args) {
// SimpleDateFormat dateFormat = new SimpleDateFormat("EEE MMM d yyyy",Locale.ENGLISH);
// Date date = new Date();
// Calendar calendar = Calendar.getInstance();
// calendar.setTime(date);
// calendar.add(Calendar.DAY_OF_MONTH, 0);
// date = calendar.getTime();
// System.out.println(dateFormat.format(date));
// String time = dateFormat.format(date)+" 08:00:00 GMT+0800 (CST)";
// System.out.println(time);
//
// }
//补签
public Response resign(Map cookies,String activityId,int data) throws Exception {
//补签前天，凑足累计签到2天
Response response = signactivityService.reSign(cookies,activityId,null,getTime(data));
//补签logid
String logId = response.jsonPath().getString("data.logId");
response = signactivityService.getSignResult(cookies,logId);
//签到状态
String status = response.jsonPath().getString("status");
String activityCountStatus = response.jsonPath().getString("activityCountStatus");
String creditsStatus = response.jsonPath().getString("creditsStatus");
//接口异步处理
int i=10;
while(status.equals("0") || activityCountStatus.equals("0") || creditsStatus.equals("0")&&i>0){
Thread.sleep(1000);
response = signactivityService.getSignResult(cookies,logId);
status = response.jsonPath().getString("status");
activityCountStatus = response.jsonPath().getString("activityCountStatus");
creditsStatus = response.jsonPath().getString("creditsStatus");
i--;
}
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