Commit 97fc548b authored by 龚小红's avatar 龚小红

合并绑定关系

parent 2801f097
...@@ -73,7 +73,7 @@ public class SignIn implements Authorization { ...@@ -73,7 +73,7 @@ public class SignIn implements Authorization {
} }
......
...@@ -239,7 +239,7 @@ public class SecondKill implements Authorization { ...@@ -239,7 +239,7 @@ public class SecondKill implements Authorization {
// 秒杀配置代理人不可参与 // 秒杀配置代理人不可参与
@Test(description = "代理人下单", priority = 13) @Test(description = "代理人下单", priority = 13)
public void 代理人下单() { public void 代理人下单() {
agentAuth(); agentAuth1();
Map<String, Object> orderPar = new HashMap<>(); Map<String, Object> orderPar = new HashMap<>();
orderPar.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey())); orderPar.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
orderPar.put("confId", ConfSecondKill.skIdFirst); orderPar.put("confId", ConfSecondKill.skIdFirst);
......
...@@ -2,27 +2,27 @@ ...@@ -2,27 +2,27 @@
<!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>--> <classes>
<!-- <class name="com.kjj.cases.live.liveConfig.LiveMaterial"/>--> <class name="com.kjj.cases.live.liveConfig.LiveMaterial"/>
<!-- </classes>--> </classes>
<!-- </test>--> </test>
<!-- <test preserve-order="true" name="配置秒杀商品">--> <test preserve-order="true" name="配置秒杀商品">
<!-- <classes>--> <classes>
<!-- <class name="com.kjj.cases.live.secondKill.ManagerConfGoods"/>--> <class name="com.kjj.cases.live.secondKill.ManagerConfGoods"/>
<!-- </classes>--> </classes>
<!-- </test>--> </test>
<!-- <test preserve-order="true" name="团队管理">--> <test preserve-order="true" name="团队管理">
<!-- <classes>--> <classes>
<!-- <class name="com.kjj.cases.live.liveConfig.Team"/>--> <class name="com.kjj.cases.live.liveConfig.Team"/>
<!-- </classes>--> </classes>
<!-- </test>--> </test>
<!-- <test preserve-order="true" name="精彩视频">--> <test preserve-order="true" name="精彩视频">
<!-- <classes>--> <classes>
<!-- <class name="com.kjj.cases.live.liveConfig.Video"/>--> <class name="com.kjj.cases.live.liveConfig.Video"/>
<!-- </classes>--> </classes>
<!-- </test>--> </test>
<test preserve-order="true" name="创建直播"> <test preserve-order="true" name="创建直播">
<classes> <classes>
...@@ -41,85 +41,85 @@ ...@@ -41,85 +41,85 @@
<class name="com.kjj.cases.live.liveConfig.LiveBinding"/> <class name="com.kjj.cases.live.liveConfig.LiveBinding"/>
</classes> </classes>
</test> </test>
<!-- <test preserve-order="true" name="配置代理人邀约奖励">--> <test preserve-order="true" name="配置代理人邀约奖励">
<!-- <classes>--> <classes>
<!-- <class name="com.kjj.cases.live.inviteReward.ManagerRewardConf"/>--> <class name="com.kjj.cases.live.inviteReward.ManagerRewardConf"/>
<!-- </classes>--> </classes>
<!-- </test>--> </test>
<!-- <test preserve-order="true" name="成功案例">--> <test preserve-order="true" name="成功案例">
<!-- <classes>--> <classes>
<!-- <class name="com.kjj.cases.live.liveConfig.LiveCase"/>--> <class name="com.kjj.cases.live.liveConfig.LiveCase"/>
<!-- </classes>--> </classes>
<!-- </test>--> </test>
<!-- <test preserve-order="true" name="资料贴片">--> <test preserve-order="true" name="资料贴片">
<!-- <classes>--> <classes>
<!-- <class name="com.kjj.cases.live.liveConfig.Paster"/>--> <class name="com.kjj.cases.live.liveConfig.Paster"/>
<!-- </classes>--> </classes>
<!-- </test>--> </test>
<!-- <test preserve-order="true" name="代理人首页">--> <test preserve-order="true" name="代理人首页">
<!-- <classes>--> <classes>
<!-- <class name="com.kjj.cases.live.agent.Agent"/>--> <class name="com.kjj.cases.live.agent.Agent"/>
<!-- </classes>--> </classes>
<!-- </test>--> </test>
<!-- <test preserve-order="true" name="小程序分享">--> <test preserve-order="true" name="小程序分享">
<!-- <classes>--> <classes>
<!-- <class name="com.kjj.cases.live.liveConfig.Share"/>--> <class name="com.kjj.cases.live.liveConfig.Share"/>
<!-- </classes>--> </classes>
<!-- </test>--> </test>
<!-- <test preserve-order="true" name="获取抽奖码校验">--> <test preserve-order="true" name="获取抽奖码校验">
<!-- <classes>--> <classes>
<!-- <class name="com.kjj.cases.live.lotteryCode.LotteryCode"/>--> <class name="com.kjj.cases.live.lotteryCode.LotteryCode"/>
<!-- </classes>--> </classes>
<!-- </test>--> </test>
<!-- <test preserve-order="false" name="预告页">--> <test preserve-order="false" name="预告页">
<!-- <classes>--> <classes>
<!-- <class name="com.kjj.cases.live.preview.Preview"/>--> <class name="com.kjj.cases.live.preview.Preview"/>
<!-- </classes>--> </classes>
<!-- </test>--> </test>
<!-- <test preserve-order="false" name="翻牌集字红包">--> <test preserve-order="false" name="翻牌集字红包">
<!-- <classes>--> <classes>
<!-- <class name="com.kjj.cases.live.flipCard.FlipCard"/>--> <class name="com.kjj.cases.live.flipCard.FlipCard"/>
<!-- </classes>--> </classes>
<!-- </test>--> </test>
<!-- <test preserve-order="true" name="中奖规则配置">--> <test preserve-order="true" name="中奖规则配置">
<!-- <classes>--> <classes>
<!-- <class name="com.kjj.cases.live.liveConfig.WinningRules"/>--> <class name="com.kjj.cases.live.liveConfig.WinningRules"/>
<!-- </classes>--> </classes>
<!-- </test>--> </test>
<!-- <test preserve-order="true" name="指定中奖">--> <test preserve-order="true" name="指定中奖">
<!-- <classes>--> <classes>
<!-- <class name="com.kjj.cases.live.lottery.DesignatedWinner"/>--> <class name="com.kjj.cases.live.lottery.DesignatedWinner"/>
<!-- </classes>--> </classes>
<!-- </test>--> </test>
<!-- <test preserve-order="true" name="亲友券">--> <test preserve-order="true" name="亲友券">
<!-- <classes>--> <classes>
<!-- <class name="com.kjj.cases.live.lottery.RelativeLottery"/>--> <class name="com.kjj.cases.live.lottery.RelativeLottery"/>
<!-- </classes>--> </classes>
<!-- </test>--> </test>
<!-- <test preserve-order="true" name="代理人邀约奖励">--> <test preserve-order="true" name="代理人邀约奖励">
<!-- <classes>--> <classes>
<!-- <class name="com.kjj.cases.live.inviteReward.InviteReward"/>--> <class name="com.kjj.cases.live.inviteReward.InviteReward"/>
<!-- </classes>--> </classes>
<!-- </test>--> </test>
<!-- <test preserve-order="true" name="直播前-我的客户页">--> <test preserve-order="true" name="直播前-我的客户页">
<!-- <classes>--> <classes>
<!-- <class name="com.kjj.cases.live.agent.LiveBefore"/>--> <class name="com.kjj.cases.live.agent.LiveBefore"/>
<!-- </classes>--> </classes>
<!-- </test>--> </test>
<!-- <test preserve-order="true" name="宝箱裂变">--> <test preserve-order="true" name="宝箱裂变">
<!-- <classes>--> <classes>
<!-- <class name="com.kjj.cases.live.treasure.Treasure"/>--> <class name="com.kjj.cases.live.treasure.Treasure"/>
<!-- </classes>--> </classes>
<!-- </test>--> </test>
<test preserve-order="true" name="助播-开启直播"> <test preserve-order="true" name="助播-开启直播">
<classes> <classes>
...@@ -127,28 +127,28 @@ ...@@ -127,28 +127,28 @@
</classes> </classes>
</test> </test>
<!-- <test preserve-order="true" name="评论及回复">--> <test preserve-order="true" name="访客签到">
<!-- <classes>--> <classes>
<!-- <class name="com.kjj.cases.live.liveConfig.Comment"/>--> <class name="com.kjj.cases.live.lotteryCode.SignIn"/>
<!-- </classes>--> </classes>
<!-- </test>--> </test>
<!-- <test preserve-order="true" name="直播中编辑资料">-->
<!-- <classes>-->
<!-- <class name="com.kjj.cases.live.liveConfig.EvaluationConf"/>-->
<!-- </classes>-->
<!-- </test>-->
<!-- <test preserve-order="true" name="访客签到">--> <test preserve-order="true" name="评论及回复">
<!-- <classes>--> <classes>
<!-- <class name="com.kjj.cases.live.lotteryCode.SignIn"/>--> <class name="com.kjj.cases.live.liveConfig.Comment"/>
<!-- </classes>--> </classes>
<!-- </test>--> </test>
<test preserve-order="true" name="直播中编辑资料">
<classes>
<class name="com.kjj.cases.live.liveConfig.EvaluationConf"/>
</classes>
</test>
<!-- <test preserve-order="true" name="直播中抽奖">--> <test preserve-order="true" name="直播中抽奖">
<!-- <classes>--> <classes>
<!-- <class name="com.kjj.cases.live.lottery.Lottery"/>--> <class name="com.kjj.cases.live.lottery.Lottery"/>
<!-- </classes>--> </classes>
<!-- </test>--> </test>
<test preserve-order="true" name="秒杀互动"> <test preserve-order="true" name="秒杀互动">
<classes> <classes>
<class name="com.kjj.cases.live.secondKill.SecondKill"/> <class name="com.kjj.cases.live.secondKill.SecondKill"/>
...@@ -272,10 +272,10 @@ ...@@ -272,10 +272,10 @@
<!-- <class name="com.kjj.cases.live.liveConfig.SimpleLiveConfig" />--> <!-- <class name="com.kjj.cases.live.liveConfig.SimpleLiveConfig" />-->
<!-- </classes>--> <!-- </classes>-->
<!-- </test>--> <!-- </test>-->
<test preserve-order="true" name="砸金蛋"> <!-- <test preserve-order="true" name="砸金蛋">-->
<classes> <!-- <classes>-->
<class name="com.kjj.cases.live.treasure.GoldenEgg" /> <!-- <class name="com.kjj.cases.live.treasure.GoldenEgg" />-->
</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