Commit 2d8482da authored by 龚小红's avatar 龚小红

备份

parent eb1e5eb8
...@@ -209,7 +209,7 @@ public class GameLottery implements Authorization { ...@@ -209,7 +209,7 @@ public class GameLottery implements Authorization {
prizeDetails.add(prizeDetail); prizeDetails.add(prizeDetail);
//奖品列表 //奖品列表
params.put("scid",scid); params.put("scid",scid);
params.put("pageTitle","来抽奖吧"); params.put("pageTitle","指定中奖抽奖转盘自动化测试");
params.put("prizeDetails",prizeDetails); params.put("prizeDetails",prizeDetails);
System.out.println(JSON.toJSONString(params)); System.out.println(JSON.toJSONString(params));
Response response = network.postResponse(params, LOTTERRY_saveOrUpdateConf); Response response = network.postResponse(params, LOTTERRY_saveOrUpdateConf);
...@@ -484,7 +484,7 @@ public class GameLottery implements Authorization { ...@@ -484,7 +484,7 @@ public class GameLottery implements Authorization {
prizeDetails.add(prizeDetail); prizeDetails.add(prizeDetail);
//奖品列表 //奖品列表
params.put("scid",rateScid); params.put("scid",rateScid);
params.put("pageTitle","来抽奖吧"); params.put("pageTitle","概率中奖抽奖转盘自动化测试");
params.put("prizeDetails",prizeDetails); params.put("prizeDetails",prizeDetails);
System.out.println(JSON.toJSONString(params)); System.out.println(JSON.toJSONString(params));
response = network.postResponse(params, LOTTERRY_saveOrUpdateConf); response = network.postResponse(params, LOTTERRY_saveOrUpdateConf);
...@@ -510,6 +510,15 @@ public class GameLottery implements Authorization { ...@@ -510,6 +510,15 @@ public class GameLottery implements Authorization {
Assert.assertTrue(success,network.message(params,CONTENT_READ,"接口返回失败",response.body().asString())); Assert.assertTrue(success,network.message(params,CONTENT_READ,"接口返回失败",response.body().asString()));
Assert.assertNotNull(data,network.message(params,CONTENT_READ,"获取访问贺卡记录失败",response.body().asString())); Assert.assertNotNull(data,network.message(params,CONTENT_READ,"获取访问贺卡记录失败",response.body().asString()));
params.clear();
params.put("scid",rateScid);
params.put("forwardTime",System.currentTimeMillis());
response = network.postResponse(params, DYNAMIC_addVisit);
success = response.jsonPath().getBoolean("success");
data = response.jsonPath().getJsonObject("data");
Assert.assertTrue(success,network.message(params,DYNAMIC_addVisit,"接口返回失败",response.body().asString()));
Assert.assertNotNull(data,network.message(params, DYNAMIC_addVisit,"接口返回数据为空",response.body().asString()));
//抽奖 //抽奖
params.clear(); params.clear();
params.put("scid",rateScid); params.put("scid",rateScid);
......
...@@ -6,8 +6,7 @@ import com.kjj.utils.JsonUtil; ...@@ -6,8 +6,7 @@ import com.kjj.utils.JsonUtil;
import com.kjj.utils.NetworkUtils; import com.kjj.utils.NetworkUtils;
import io.restassured.response.Response; import io.restassured.response.Response;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.BeforeClass; import org.testng.annotations.*;
import org.testng.annotations.Test;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -133,7 +132,7 @@ public class GreetingCrad implements Authorization{ ...@@ -133,7 +132,7 @@ public class GreetingCrad implements Authorization{
Assert.assertNotNull(data,network.message(params,GREETING_findByType,"返回数据为空",response.body().asString())); Assert.assertNotNull(data,network.message(params,GREETING_findByType,"返回数据为空",response.body().asString()));
int size = response.jsonPath().getInt("data.list.size()"); int size = response.jsonPath().getInt("data.list.size()");
Assert.assertTrue(size>0,network.message(params,GREETING_findByType,"贺卡列表为空",response.body().asString())); Assert.assertTrue(size>0,network.message(params,GREETING_findByType,"标签列表为空",response.body().asString()));
} }
@Test(description = "代理人_获取当前用户关注公众号类型",priority = 9) @Test(description = "代理人_获取当前用户关注公众号类型",priority = 9)
......
This diff is collapsed.
...@@ -611,7 +611,9 @@ public class BasicConfig { ...@@ -611,7 +611,9 @@ public class BasicConfig {
public static final String VISITHEADER = HOST + "/kjy/mp/visit/header/v2"; public static final String VISITHEADER = HOST + "/kjy/mp/visit/header/v2";
public static final String SELLERWEEKLY = HOST + "/kjy/mp/whoSawMe/sellerWeekly"; public static final String SELLERWEEKLY = HOST + "/kjy/mp/whoSawMe/sellerWeekly";
public static final String WEEKLY_LIST = HOST + "/kjy/mp/seller/weekly/list"; public static final String WEEKLY_LIST = HOST + "/kjy/mp/seller/weekly/list";
public static final String QRCODE_create= HOST + "/kjy/mp/qrcode/create";
public static final String UPLOAD_image= HOST + "/kjy/mp/upload/image";
public static final String DYNAMIC_addVisit= HOST + "/kjy/mp/seller/dynamic/addVisit";
// *************** 支付 *************** // *************** 支付 ***************
public static final String PAY_getMiddleDetail = HOST + "/kjy/mp/payMiddle/getMiddleDetail"; public static final String PAY_getMiddleDetail = HOST + "/kjy/mp/payMiddle/getMiddleDetail";
...@@ -762,6 +764,18 @@ public class BasicConfig { ...@@ -762,6 +764,18 @@ public class BasicConfig {
public static final String HOME_getPosterTemplateList = HOST + "/kjy/mp/posterTemplate/getPosterTemplateList"; public static final String HOME_getPosterTemplateList = HOST + "/kjy/mp/posterTemplate/getPosterTemplateList";
public static final String HOME_findPosterById = HOST + "/kjy/mp/posterTemplate/findPosterById"; public static final String HOME_findPosterById = HOST + "/kjy/mp/posterTemplate/findPosterById";
//******************个人中心**********************
public static final String USINGSTRATAGY_index = HOST + "/kjy/mp/usingStrategy/index";
public static final String USINGSTRATAGY_strategyList = HOST + "/kjy/mp/usingStrategy/strategyList";
public static final String USINGSTRATAGY_faqDetail = HOST + "/kjy/mp/usingStrategy/faqDetail";
public static final String USINGSTRATAGY_useful = HOST + "/kjy/mp/usingStrategy/useful";
public static final String USINGSTRATAGY_strategyDetail = HOST + "/kjy/mp/usingStrategy/strategyDetail";
public static final String USINGSTRATAGY_successCaseDetail = HOST + "/kjy/mp/usingStrategy/successCaseDetail";
public static final String PUSH_list = HOST + "/kjy/mp/seller/push/list";
public static final String PUSH_switch = HOST + "/kjy/mp/seller/push/switch";
public static final String PUSH_updateCloseTime = HOST + "/kjy/mp/seller/push/updateCloseTime";
public static final String SELLERCARD_getInsuranceConceptConfig = HOST + "/kjy/mp/sellerConfig/getInsuranceConceptConfig";
public static final String SELLERCARD_getIncreaseStaffConfig = HOST + "/kjy/mp/sellerConfig/getIncreaseStaffConfig";
// ************** 设置中心 *************** // ************** 设置中心 ***************
public static final String SELLERCONFIG_EDITCONFIG = HOST + "/kjy/mp/sellerConfig/editConfig"; public static final String SELLERCONFIG_EDITCONFIG = HOST + "/kjy/mp/sellerConfig/editConfig";
...@@ -841,6 +855,23 @@ public class BasicConfig { ...@@ -841,6 +855,23 @@ public class BasicConfig {
public static final String LOTTERRY_getDrawRecord= HOST + "/kjy/mp/game/getDrawRecord"; public static final String LOTTERRY_getDrawRecord= HOST + "/kjy/mp/game/getDrawRecord";
public static final String LOTTERRY_getDrawWinningRecord= HOST + "/kjy/mp/game/getDrawWinningRecord"; public static final String LOTTERRY_getDrawWinningRecord= HOST + "/kjy/mp/game/getDrawWinningRecord";
//*********************邀请函************************
public static final String INViTATION_index= HOST + "/kjy/mp/invitationLetter/index";
public static final String INViTATION_preView= HOST + "/kjy/mp/invitationLetter/preView";
public static final String INViTATION_saveOrUpdate= HOST + "/kjy/mp/invitationLetter/saveOrUpdate";
public static final String INViTATION_getH5ShareInfo= HOST + "/kjy/mp/invitationLetter/getH5ShareInfo";
public static final String INViTATION_savePosterImg= HOST + "/kjy/mp/invitationLetter/savePosterImg";
public static final String INViTATION_view= HOST + "/kjy/mp/invitationLetter/view";
public static final String INViTATION_acceptInvitation= HOST + "/kjy/mp/invitationLetter/acceptInvitation";
public static final String INViTATION_myInvitationLetters = HOST + "/kjy/mp/invitationLetter/myInvitationLetters";
public static final String INViTATION_getConfigDetail = HOST + "/kjy/mp/invitationLetter/getConfigDetail";
public static final String INViTATION_getViewRecordList = HOST + "/kjy/mp/invitationLetter/getViewRecordList";
public static final String INViTATION_getAcceptRecordList = HOST + "/kjy/mp/invitationLetter/getAcceptRecordList";
//*********************趣味测试************************
public static final String GAME_answerPageList = HOST + "/kjy/mp/game/answerPageList";
public static final String GAME_clueList = HOST + "/kjy/mp/tag/clue/list";
// *************** 管理后台 *************** // *************** 管理后台 ***************
public static final String SSO_doLogin = SSO_HOST + "/doLogin"; public static final String SSO_doLogin = SSO_HOST + "/doLogin";
public static final String MANAGER_disableUser= MANAGER_HOST + "/kjy/manager/testUser/disableUser"; public static final String MANAGER_disableUser= MANAGER_HOST + "/kjy/manager/testUser/disableUser";
......
...@@ -2,59 +2,69 @@ ...@@ -2,59 +2,69 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="集客助手" verbose="1" thread-count="3"> <suite name="集客助手" verbose="1" thread-count="3">
<test preserve-order="true" name="支付"> <!-- <test preserve-order="true" name="支付">-->
<!-- <classes>-->
<!-- <class name="com.kjj.cases.assistant.Pay"/>-->
<!-- </classes>-->
<!-- </test>-->
<!-- <test preserve-order="true" name = "首页">-->
<!-- <classes>-->
<!-- <class name="com.kjj.cases.assistant.homePage"/>-->
<!-- </classes>-->
<!-- </test>-->
<!-- <test preserve-order="true" name="我的名片">-->
<!-- <classes>-->
<!-- <class name="com.kjj.cases.assistant.card.PersonCard"/>-->
<!-- </classes>-->
<!-- </test>-->
<!-- <test preserve-order="true" name="文章中个人名片">-->
<!-- <classes>-->
<!-- <class name="com.kjj.cases.assistant.card.ArticalPersonCard"/>-->
<!-- </classes>-->
<!-- </test>-->
<!-- <test preserve-order="true" name = "种草素材">-->
<!-- <classes>-->
<!-- <class name="com.kjj.cases.assistant.RecommendMaterial"/>-->
<!-- </classes>-->
<!-- </test>-->
<!-- <test preserve-order="true" name = "今日早报">-->
<!-- <classes>-->
<!-- <class name="com.kjj.cases.assistant.DailyPaper"/>-->
<!-- </classes>-->
<!-- </test>-->
<!-- <test preserve-order="true" name = "获取访客">-->
<!-- <classes>-->
<!-- <class name="com.kjj.cases.assistant.whoSawMe.ForwardAndRead"/>-->
<!-- </classes>-->
<!-- </test>-->
<!-- <test preserve-order="true" name = "谁看过我">-->
<!-- <classes>-->
<!-- <class name="com.kjj.cases.assistant.whoSawMe.WhoSawMe"/>-->
<!-- </classes>-->
<!-- </test>-->
<!-- <test preserve-order="true" name = "我的转发">-->
<!-- <classes>-->
<!-- <class name="com.kjj.cases.assistant.whoSawMe.MyForward"/>-->
<!-- </classes>-->
<!-- </test>-->
<!-- <test preserve-order="true" name = "贺卡">-->
<!-- <classes>-->
<!-- <class name="com.kjj.cases.assistant.markettools.GreetingCrad"/>-->
<!-- </classes>-->
<!-- </test>-->
<!-- <test preserve-order="true" name = "抽奖转盘">-->
<!-- <classes>-->
<!-- <class name="com.kjj.cases.assistant.markettools.GameLottery"/>-->
<!-- </classes>-->
<!-- </test>-->
<!-- <test preserve-order="true" name = "邀请函和趣味测评">-->
<!-- <classes>-->
<!-- <class name="com.kjj.cases.assistant.markettools.InvitationLetter"/>-->
<!-- </classes>-->
<!-- </test>-->
<test preserve-order="true" name = "使用攻略和设置中心">
<classes> <classes>
<class name="com.kjj.cases.assistant.Pay"/> <class name="com.kjj.cases.assistant.menu.PersonalCenter"/>
</classes>
</test>
<test preserve-order="true" name = "首页">
<classes>
<class name="com.kjj.cases.assistant.homePage"/>
</classes>
</test>
<test preserve-order="true" name="我的名片">
<classes>
<class name="com.kjj.cases.assistant.card.PersonCard"/>
</classes>
</test>
<test preserve-order="true" name="文章中个人名片">
<classes>
<class name="com.kjj.cases.assistant.card.ArticalPersonCard"/>
</classes>
</test>
<test preserve-order="true" name = "种草素材">
<classes>
<class name="com.kjj.cases.assistant.RecommendMaterial"/>
</classes>
</test>
<test preserve-order="true" name = "今日早报">
<classes>
<class name="com.kjj.cases.assistant.DailyPaper"/>
</classes>
</test>
<test preserve-order="true" name = "获取访客">
<classes>
<class name="com.kjj.cases.assistant.whoSawMe.ForwardAndRead"/>
</classes>
</test>
<test preserve-order="true" name = "谁看过我">
<classes>
<class name="com.kjj.cases.assistant.whoSawMe.WhoSawMe"/>
</classes>
</test>
<test preserve-order="true" name = "我的转发">
<classes>
<class name="com.kjj.cases.assistant.whoSawMe.MyForward"/>
</classes>
</test>
<test preserve-order="true" name = "贺卡">
<classes>
<class name="com.kjj.cases.assistant.markettools.GreetingCrad"/>
</classes>
</test>
<test preserve-order="true" name = "抽奖转盘">
<classes>
<class name="com.kjj.cases.assistant.markettools.GameLottery"/>
</classes> </classes>
</test> </test>
</suite> </suite>
......
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