Commit 1458ba60e58f711d2eeea9803b8b7da4d01d2b57
1 parent
d7f15c1c
组装用例
Showing
3 changed files
with
5 additions
and
4 deletions
Show diff stats
src/main/java/com/essa/framework/Model.java
| @@ -15,7 +15,7 @@ public class Model { | @@ -15,7 +15,7 @@ public class Model { | ||
| 15 | public static String env;//所选环境 | 15 | public static String env;//所选环境 |
| 16 | public static String buyerAccount="meng18@essa.cn";//采购商账号 | 16 | public static String buyerAccount="meng18@essa.cn";//采购商账号 |
| 17 | public static String buyerPassword="essa123";//采购商密码 | 17 | public static String buyerPassword="essa123";//采购商密码 |
| 18 | - public static String poNum="A181115T9194I";//po单号 | 18 | + public static String poNum="A181115T9194K";//po单号 |
| 19 | public static int isactivity=0;//是否是活动商品 1：是 0：否 | 19 | public static int isactivity=0;//是否是活动商品 1：是 0：否 |
| 20 | public static String manager;//商品的类目经理 | 20 | public static String manager;//商品的类目经理 |
| 21 | public static String serialNum="RW2018060800058";//待办流水号 | 21 | public static String serialNum="RW2018060800058";//待办流水号 |
src/main/java/com/essa/pageObject/StorageManage/GoodsReceiveTaskPage.java
| @@ -61,6 +61,7 @@ public class GoodsReceiveTaskPage extends BasePage { | @@ -61,6 +61,7 @@ public class GoodsReceiveTaskPage extends BasePage { | ||
| 61 | */ | 61 | */ |
| 62 | public boolean isFinish(){ | 62 | public boolean isFinish(){ |
| 63 | forceWait(500); | 63 | forceWait(500); |
| 64 | - return status.getText().equals("完成"); | 64 | + boolean b = isVisibility(By.xpath("//*[text()='完成']")); |
| 65 | + return b; | ||
| 65 | } | 66 | } |
| 66 | } | 67 | } |
src/main/java/com/essa/testSuite/TestLoadContainer.java
| @@ -100,10 +100,10 @@ public class TestLoadContainer extends BaseTest { | @@ -100,10 +100,10 @@ public class TestLoadContainer extends BaseTest { | ||
| 100 | GoodsReceiveTaskPage goodsReceiveTaskPage = PageFactory.initElements(driver, GoodsReceiveTaskPage.class); | 100 | GoodsReceiveTaskPage goodsReceiveTaskPage = PageFactory.initElements(driver, GoodsReceiveTaskPage.class); |
| 101 | ReceiveTaskDealPage receiveTaskDealPage = PageFactory.initElements(driver, ReceiveTaskDealPage.class); | 101 | ReceiveTaskDealPage receiveTaskDealPage = PageFactory.initElements(driver, ReceiveTaskDealPage.class); |
| 102 | homePage.toGoodsReceiveTaskPage(); | 102 | homePage.toGoodsReceiveTaskPage(); |
| 103 | - while (!goodsReceiveTaskPage.isFinish()) { | 103 | + do { |
| 104 | goodsReceiveTaskPage.dealReceive(); | 104 | goodsReceiveTaskPage.dealReceive(); |
| 105 | receiveTaskDealPage.allReceive(); | 105 | receiveTaskDealPage.allReceive(); |
| 106 | - } | 106 | + }while (!(goodsReceiveTaskPage.isFinish())); |
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | /** | 109 | /** |