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

合并绑定关系

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