Skip to content

X
xm-sportstest
Commit 941f334a by yangfangfang
Options

物品

parent 5df002eb
Showing with 49 additions and 33 deletions
src/main/java/com/xiaomai/cases/lunar/goods/TestPurchaseGoods.java
...@@ -308,12 +308,6 @@ public class TestPurchaseGoods extends BaseTestImpl { ...@@ -308,12 +308,6 @@ public class TestPurchaseGoods extends BaseTestImpl {
JSONObject beforeGetCostData_type=financeDataTools.getCostData_type("DAY","GOODS", TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(),info); JSONObject beforeGetCostData_type=financeDataTools.getCostData_type("DAY","GOODS", TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(),info);
BigDecimal beforeConfirmedAmount=new BigDecimal(beforeGetCostData_type.getJSONObject("result").getString("confirmedAmount"));//确认收入 BigDecimal beforeConfirmedAmount=new BigDecimal(beforeGetCostData_type.getJSONObject("result").getString("confirmedAmount"));//确认收入
boolean checkAllowPurchase=Boolean.parseBoolean(goodCTools.checkAllowPurchase(id,memberId,price,beforeInventory).getJSONObject("result").getString("success"));
//校验一下物品购买是否可以通过，为true才可以
if(checkAllowPurchase==true){
//购买0元单规格物品 //购买0元单规格物品
JSONObject purchaseGoods=new JSONObject(); JSONObject purchaseGoods=new JSONObject();
purchaseGoods.put("depositAmount","0.00"); purchaseGoods.put("depositAmount","0.00");
...@@ -353,12 +347,7 @@ public class TestPurchaseGoods extends BaseTestImpl { ...@@ -353,12 +347,7 @@ public class TestPurchaseGoods extends BaseTestImpl {
JSONObject afterGetCostData_type=financeDataTools.getCostData_type("DAY","GOODS", TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(),info); JSONObject afterGetCostData_type=financeDataTools.getCostData_type("DAY","GOODS", TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(),info);
BigDecimal afterConfirmedAmount=new BigDecimal(afterGetCostData_type.getJSONObject("result").getString("confirmedAmount"));//确认收入 BigDecimal afterConfirmedAmount=new BigDecimal(afterGetCostData_type.getJSONObject("result").getString("confirmedAmount"));//确认收入
Assert.assertEquals(afterConfirmedAmount,beforeConfirmedAmount.add(price.setScale(2, RoundingMode.HALF_UP)),"购买1个物品生成待支付订单后，财务中心-营收明细-物品的确认收入应增加对应物品的价格"); Assert.assertEquals(afterConfirmedAmount,beforeConfirmedAmount.add(price.setScale(2, RoundingMode.HALF_UP)),"购买1个物品生成待支付订单后，财务中心-营收明细-物品的确认收入应增加对应物品的价格");
}
else {
System.out.println("物品购买校验未通过，不能下单");
}
} }
......
src/main/java/com/xiaomai/cases/polar/goods/TestCreateGoods.java
...@@ -275,9 +275,10 @@ public class TestCreateGoods extends XMBaseTest { ...@@ -275,9 +275,10 @@ public class TestCreateGoods extends XMBaseTest {
for (int i = 0; i < records.size(); i++) { for (int i = 0; i < records.size(); i++) {
if (records.getJSONObject(i).getString("id").equals(studioResult1)) { if (records.getJSONObject(i).getString("id").equals(studioResult1)) {
success=true; success=true;
break;
} }
Assert.assertEquals(success, true, "新建三个规格的物品成功，但物品列表未找到对应增加的物品ID");
} }
Assert.assertEquals(success, true, "新建三个规格的物品成功，但物品列表未找到对应增加的物品ID");
Assert.assertEquals(afterTotal, beforeTotal + 1, "新建三个规格的物品成功，但物品列表的统计值未增加"); Assert.assertEquals(afterTotal, beforeTotal + 1, "新建三个规格的物品成功，但物品列表的统计值未增加");
try { try {
...@@ -298,9 +299,10 @@ public class TestCreateGoods extends XMBaseTest { ...@@ -298,9 +299,10 @@ public class TestCreateGoods extends XMBaseTest {
for (int i = 0; i < records_C.size(); i++) { for (int i = 0; i < records_C.size(); i++) {
if (records_C.getJSONObject(i).getString("id").equals(studioResult1)) { if (records_C.getJSONObject(i).getString("id").equals(studioResult1)) {
success_C=true; success_C=true;
break;
} }
Assert.assertEquals(success_C, true, "新建三个规格的物品成功，但C端的物品列表未找到对应增加的物品ID");
} }
Assert.assertEquals(success_C, true, "新建三个规格的物品成功，但C端的物品列表未找到对应增加的物品ID");
Assert.assertEquals(afterTotal_C, beforeTotal_C + 1, "新建三个规格的物品成功，但C端物品列表的统计值未增加"); Assert.assertEquals(afterTotal_C, beforeTotal_C + 1, "新建三个规格的物品成功，但C端物品列表的统计值未增加");
...@@ -434,9 +436,10 @@ public class TestCreateGoods extends XMBaseTest { ...@@ -434,9 +436,10 @@ public class TestCreateGoods extends XMBaseTest {
for (int i = 0; i < records.size(); i++) { for (int i = 0; i < records.size(); i++) {
if (records.getJSONObject(i).getString("id").equals(studioResult2)) { if (records.getJSONObject(i).getString("id").equals(studioResult2)) {
success=true; success=true;
break;
} }
Assert.assertEquals(success, true, "新建三个规格的物品成功，但物品列表未找到对应增加的物品ID");
} }
Assert.assertEquals(success, true, "新建三个规格的物品成功，但物品列表未找到对应增加的物品ID");
Assert.assertEquals(afterTotal, beforeTotal + 1, "新建三个规格的物品成功，但物品列表的统计值未增加"); Assert.assertEquals(afterTotal, beforeTotal + 1, "新建三个规格的物品成功，但物品列表的统计值未增加");
try { try {
...@@ -457,9 +460,10 @@ public class TestCreateGoods extends XMBaseTest { ...@@ -457,9 +460,10 @@ public class TestCreateGoods extends XMBaseTest {
for (int i = 0; i < records_C.size(); i++) { for (int i = 0; i < records_C.size(); i++) {
if (records_C.getJSONObject(i).getString("id").equals(studioResult2)) { if (records_C.getJSONObject(i).getString("id").equals(studioResult2)) {
success_C=true; success_C=true;
break;
} }
Assert.assertEquals(success_C, true, "新建三个规格的物品成功，但C端的物品列表未找到对应增加的物品ID");
} }
Assert.assertEquals(success_C, true, "新建三个规格的物品成功，但C端的物品列表未找到对应增加的物品ID");
Assert.assertEquals(afterTotal_C, beforeTotal_C + 1, "新建三个规格的物品成功，但C端物品列表的统计值未增加"); Assert.assertEquals(afterTotal_C, beforeTotal_C + 1, "新建三个规格的物品成功，但C端物品列表的统计值未增加");
......
src/main/java/com/xiaomai/cases/polar/goods/TestCreateGoodsGroup.java
...@@ -60,9 +60,11 @@ public class TestCreateGoodsGroup extends XMBaseTest { ...@@ -60,9 +60,11 @@ public class TestCreateGoodsGroup extends XMBaseTest {
for(int i=0; i < afterListPageGoodsGroup_result.size(); i++){ for(int i=0; i < afterListPageGoodsGroup_result.size(); i++){
if(afterListPageGoodsGroup_result.getJSONObject(i).getString("id").equals(groupId)){ if(afterListPageGoodsGroup_result.getJSONObject(i).getString("id").equals(groupId)){
success=true; success=true;
break;
} }
Assert.assertEquals(success,true,"新建分组成功，但是分组中未找到对应的分组ID");
} }
Assert.assertEquals(success,true,"新建分组成功，但是分组中未找到对应的分组ID");
//校验2：新建物品拉取分组名称的时候也有此条数据 //校验2：新建物品拉取分组名称的时候也有此条数据
JSONObject listGoodsGroup=goodTools.listGoodsGroup(); JSONObject listGoodsGroup=goodTools.listGoodsGroup();
...@@ -72,9 +74,11 @@ public class TestCreateGoodsGroup extends XMBaseTest { ...@@ -72,9 +74,11 @@ public class TestCreateGoodsGroup extends XMBaseTest {
for(int i=0;i < listGoodsGroupResult.size();i++){ for(int i=0;i < listGoodsGroupResult.size();i++){
if(listGoodsGroupResult.getJSONObject(i).getString("id").equals(groupId)){ if(listGoodsGroupResult.getJSONObject(i).getString("id").equals(groupId)){
success_listGoodsGroup=true; success_listGoodsGroup=true;
break;
} }
Assert.assertEquals(success_listGoodsGroup,true,"新建分组成功，但分组中未找到对应的分组ID");
} }
Assert.assertEquals(success_listGoodsGroup,true,"新建分组成功，但分组中未找到对应的分组ID");
//新建一个物品 //新建一个物品
JSONObject create=goodTools.createGoods_multiple("YES","0.01",10); JSONObject create=goodTools.createGoods_multiple("YES","0.01",10);
...@@ -110,9 +114,11 @@ public class TestCreateGoodsGroup extends XMBaseTest { ...@@ -110,9 +114,11 @@ public class TestCreateGoodsGroup extends XMBaseTest {
for(int i=0; i < afterListPageGoodsGroup_result_modify.size(); i++){ for(int i=0; i < afterListPageGoodsGroup_result_modify.size(); i++){
if(afterListPageGoodsGroup_result_modify.getJSONObject(i).getString("name").equals(name2)){ if(afterListPageGoodsGroup_result_modify.getJSONObject(i).getString("name").equals(name2)){
success_modify=true; success_modify=true;
break;
} }
Assert.assertEquals(success_modify,true,"编辑分组成功，但列表中没有编辑成功后的分组");
} }
Assert.assertEquals(success_modify,true,"编辑分组成功，但列表中没有编辑成功后的分组");
//校验2：新建物品拉取分组名称的时候也有此条编辑后的数据 //校验2：新建物品拉取分组名称的时候也有此条编辑后的数据
JSONObject listGoodsGroup_modify=goodTools.listGoodsGroup(); JSONObject listGoodsGroup_modify=goodTools.listGoodsGroup();
...@@ -122,9 +128,11 @@ public class TestCreateGoodsGroup extends XMBaseTest { ...@@ -122,9 +128,11 @@ public class TestCreateGoodsGroup extends XMBaseTest {
for(int i=0;i < listGoodsGroupResult_modify.size();i++){ for(int i=0;i < listGoodsGroupResult_modify.size();i++){
if(listGoodsGroupResult_modify.getJSONObject(i).getString("id").equals(groupId)){ if(listGoodsGroupResult_modify.getJSONObject(i).getString("id").equals(groupId)){
success_listGoodsGroup_modify=true; success_listGoodsGroup_modify=true;
break;
} }
Assert.assertEquals(success_listGoodsGroup_modify,true,"编辑分组成功，但在新建物品时拉取分组未找到对应的分组ID");
} }
Assert.assertEquals(success_listGoodsGroup_modify,true,"编辑分组成功，但在新建物品时拉取分组未找到对应的分组ID");
} }
else { else {
...@@ -174,9 +182,11 @@ public class TestCreateGoodsGroup extends XMBaseTest { ...@@ -174,9 +182,11 @@ public class TestCreateGoodsGroup extends XMBaseTest {
for(int i=0; i < afterListPageGoodsGroup_result.size(); i++){ for(int i=0; i < afterListPageGoodsGroup_result.size(); i++){
if( ! afterListPageGoodsGroup_result.getJSONObject(i).getString("id").equals(groupId)){ if( ! afterListPageGoodsGroup_result.getJSONObject(i).getString("id").equals(groupId)){
success=true; success=true;
break;
} }
Assert.assertEquals(success,true,"删除分组成功，但列表中还有此条数据");
} }
Assert.assertEquals(success,true,"删除分组成功，但列表中还有此条数据");
try { try {
Thread.sleep(1000); Thread.sleep(1000);
...@@ -192,9 +202,10 @@ public class TestCreateGoodsGroup extends XMBaseTest { ...@@ -192,9 +202,10 @@ public class TestCreateGoodsGroup extends XMBaseTest {
for(int i=0;i < listGoodsGroupResult.size();i++){ for(int i=0;i < listGoodsGroupResult.size();i++){
if( ! listGoodsGroupResult.getJSONObject(i).getString("id").equals(groupId)){ if( ! listGoodsGroupResult.getJSONObject(i).getString("id").equals(groupId)){
success_listGoodsGroup=true; success_listGoodsGroup=true;
break;
} }
Assert.assertEquals(success_listGoodsGroup,true,"删除分组成功，但在新建物品时拉取分组还有此条数据");
} }
Assert.assertEquals(success_listGoodsGroup,true,"删除分组成功，但在新建物品时拉取分组还有此条数据");
} }
else { else {
......
src/main/java/com/xiaomai/cases/polar/goods/TestDeleteGood.java
...@@ -45,9 +45,10 @@ public class TestDeleteGood extends XMBaseTest { ...@@ -45,9 +45,10 @@ public class TestDeleteGood extends XMBaseTest {
for (int i=0;i<records.size();i++){ for (int i=0;i<records.size();i++){
if(records.getJSONObject(i).getString("id").equals(id)){ if(records.getJSONObject(i).getString("id").equals(id)){
success=true; success=true;
break;
} }
Assert.assertEquals(success,true,"新建物品成功，但物品列表没有新增此条数据");
} }
Assert.assertEquals(success,true,"新建物品成功，但物品列表没有新增此条数据");
//删除物品 //删除物品
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
...@@ -73,9 +74,11 @@ public class TestDeleteGood extends XMBaseTest { ...@@ -73,9 +74,11 @@ public class TestDeleteGood extends XMBaseTest {
for (int i=0;i<afterRecords.size();i++){ for (int i=0;i<afterRecords.size();i++){
if( ! afterRecords.getJSONObject(i).getString("id").equals(id)){ if( ! afterRecords.getJSONObject(i).getString("id").equals(id)){
afterSuccess=true; afterSuccess=true;
break;
} }
Assert.assertEquals(afterSuccess,true,"删除物品成功，但物品列表还有此条数据");
} }
Assert.assertEquals(afterSuccess,true,"删除物品成功，但物品列表还有此条数据");
......
src/main/java/com/xiaomai/cases/polar/goods/TestModifyGoods.java
...@@ -128,9 +128,10 @@ public class TestModifyGoods extends XMBaseTest { ...@@ -128,9 +128,10 @@ public class TestModifyGoods extends XMBaseTest {
for (int i = 0; i < records.size(); i++) { for (int i = 0; i < records.size(); i++) {
if (records.getJSONObject(i).getString("name").equals(name)) { if (records.getJSONObject(i).getString("name").equals(name)) {
success=true; success=true;
break;
} }
Assert.assertEquals(success, true, "物品列表中有此编辑后的物品名称");
} }
Assert.assertEquals(success, true, "物品列表中有此编辑后的物品名称");
//校验4：获取C端物品列表 //校验4：获取C端物品列表
JSONObject afterStudioGoodsC = goodCTools.pageXcxHomeGoodsC(info); JSONObject afterStudioGoodsC = goodCTools.pageXcxHomeGoodsC(info);
...@@ -139,9 +140,10 @@ public class TestModifyGoods extends XMBaseTest { ...@@ -139,9 +140,10 @@ public class TestModifyGoods extends XMBaseTest {
for (int i = 0; i < recordsC.size(); i++) { for (int i = 0; i < recordsC.size(); i++) {
if (recordsC.getJSONObject(i).getString("name").equals(name)) { if (recordsC.getJSONObject(i).getString("name").equals(name)) {
successC=true; successC=true;
break;
} }
Assert.assertEquals(successC, true, "C端物品列表中有此编辑后的物品名称");
} }
Assert.assertEquals(successC, true, "C端物品列表中有此编辑后的物品名称");
//校验5：生成一条编辑记录，类型为编辑物品 //校验5：生成一条编辑记录，类型为编辑物品
JSONObject pageGoodsModifyRecord=goodTools.pageGoodsModifyRecord(createGoodsId); JSONObject pageGoodsModifyRecord=goodTools.pageGoodsModifyRecord(createGoodsId);
...@@ -393,9 +395,10 @@ public class TestModifyGoods extends XMBaseTest { ...@@ -393,9 +395,10 @@ public class TestModifyGoods extends XMBaseTest {
for (int i = 0; i < records1.size(); i++) { for (int i = 0; i < records1.size(); i++) {
if (records1.getJSONObject(i).getString("name").equals(name1)) { if (records1.getJSONObject(i).getString("name").equals(name1)) {
success1=true; success1=true;
break;
} }
Assert.assertEquals(success1, true, "物品列表中有此编辑后的物品名称");
} }
Assert.assertEquals(success1, true, "物品列表中有此编辑后的物品名称");
//校验4：获取C端物品列表 //校验4：获取C端物品列表
JSONObject afterStudioGoodsC1 = goodCTools.pageXcxHomeGoodsC(info); JSONObject afterStudioGoodsC1 = goodCTools.pageXcxHomeGoodsC(info);
...@@ -404,9 +407,10 @@ public class TestModifyGoods extends XMBaseTest { ...@@ -404,9 +407,10 @@ public class TestModifyGoods extends XMBaseTest {
for (int i = 0; i < recordsC1.size(); i++) { for (int i = 0; i < recordsC1.size(); i++) {
if (recordsC1.getJSONObject(i).getString("name").equals(name1)) { if (recordsC1.getJSONObject(i).getString("name").equals(name1)) {
successC1=true; successC1=true;
break;
} }
Assert.assertEquals(successC1, true, "C端物品列表中有此编辑后的物品名称");
} }
Assert.assertEquals(successC1, true, "C端物品列表中有此编辑后的物品名称");
//校验5：生成一条编辑记录，类型为编辑物品 //校验5：生成一条编辑记录，类型为编辑物品
JSONObject pageGoodsModifyRecord1=goodTools.pageGoodsModifyRecord(createGoodsId); JSONObject pageGoodsModifyRecord1=goodTools.pageGoodsModifyRecord(createGoodsId);
...@@ -567,9 +571,11 @@ public class TestModifyGoods extends XMBaseTest { ...@@ -567,9 +571,11 @@ public class TestModifyGoods extends XMBaseTest {
for (int i = 0; i < records2.size(); i++) { for (int i = 0; i < records2.size(); i++) {
if (records2.getJSONObject(i).getString("name").equals(name2)) { if (records2.getJSONObject(i).getString("name").equals(name2)) {
success2 = true; success2 = true;
break;
} }
Assert.assertEquals(success2, true, "物品列表中有此编辑后的物品名称");
} }
Assert.assertEquals(success2, true, "物品列表中有此编辑后的物品名称");
//校验4：获取C端物品列表 //校验4：获取C端物品列表
JSONObject afterStudioGoodsC2 = goodCTools.pageXcxHomeGoodsC(info); JSONObject afterStudioGoodsC2 = goodCTools.pageXcxHomeGoodsC(info);
...@@ -578,9 +584,10 @@ public class TestModifyGoods extends XMBaseTest { ...@@ -578,9 +584,10 @@ public class TestModifyGoods extends XMBaseTest {
for (int i = 0; i < recordsC2.size(); i++) { for (int i = 0; i < recordsC2.size(); i++) {
if (recordsC2.getJSONObject(i).getString("name").equals(name2)) { if (recordsC2.getJSONObject(i).getString("name").equals(name2)) {
successC2 = true; successC2 = true;
break;
} }
Assert.assertEquals(successC2, true, "C端物品列表中有此编辑后的物品名称");
} }
Assert.assertEquals(successC2, true, "C端物品列表中有此编辑后的物品名称");
//校验5：生成一条编辑记录，类型为编辑物品 //校验5：生成一条编辑记录，类型为编辑物品
JSONObject pageGoodsModifyRecord2 = goodTools.pageGoodsModifyRecord(createGoodsId); JSONObject pageGoodsModifyRecord2 = goodTools.pageGoodsModifyRecord(createGoodsId);
...@@ -676,9 +683,10 @@ public class TestModifyGoods extends XMBaseTest { ...@@ -676,9 +683,10 @@ public class TestModifyGoods extends XMBaseTest {
for (int i = 0; i < records3.size(); i++) { for (int i = 0; i < records3.size(); i++) {
if (records3.getJSONObject(i).getString("name").equals(name3)) { if (records3.getJSONObject(i).getString("name").equals(name3)) {
success3 = true; success3 = true;
break;
} }
Assert.assertEquals(success3, true, "物品列表中有此编辑后的物品名称");
} }
Assert.assertEquals(success3, true, "物品列表中有此编辑后的物品名称");
//校验4：获取C端物品列表 //校验4：获取C端物品列表
JSONObject afterStudioGoodsC3 = goodCTools.pageXcxHomeGoodsC(info); JSONObject afterStudioGoodsC3 = goodCTools.pageXcxHomeGoodsC(info);
...@@ -687,9 +695,10 @@ public class TestModifyGoods extends XMBaseTest { ...@@ -687,9 +695,10 @@ public class TestModifyGoods extends XMBaseTest {
for (int i = 0; i < recordsC3.size(); i++) { for (int i = 0; i < recordsC3.size(); i++) {
if (recordsC3.getJSONObject(i).getString("name").equals(name3)) { if (recordsC3.getJSONObject(i).getString("name").equals(name3)) {
successC3 = true; successC3 = true;
break;
} }
Assert.assertEquals(successC3, true, "C端物品列表中有此编辑后的物品名称");
} }
Assert.assertEquals(successC3, true, "C端物品列表中有此编辑后的物品名称");
//校验5：生成一条编辑记录，类型为编辑物品 //校验5：生成一条编辑记录，类型为编辑物品
JSONObject pageGoodsModifyRecord3 = goodTools.pageGoodsModifyRecord(createGoodsId); JSONObject pageGoodsModifyRecord3 = goodTools.pageGoodsModifyRecord(createGoodsId);
......
src/main/java/com/xiaomai/cases/polar/goods/TestRefundGoods.java
...@@ -50,7 +50,7 @@ public class TestRefundGoods extends XMBaseTest { ...@@ -50,7 +50,7 @@ public class TestRefundGoods extends XMBaseTest {
super.beforeTest(); super.beforeTest();
} }
@Test(description = "退物品：购买&退货退款->作废退&仅退款->作废退&作废购买") @Test(description = "退物品：购买多规格&退货退款->作废退&仅退款->作废退&作废购买")
public void testRefundGoods() { public void testRefundGoods() {
//涉及到订单的都使用存量物品数据，因为购买过物品就不能被删除了，所以不会买一次新建一个 //涉及到订单的都使用存量物品数据，因为购买过物品就不能被删除了，所以不会买一次新建一个
......
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