From 1458ba60e58f711d2eeea9803b8b7da4d01d2b57 Mon Sep 17 00:00:00 2001 From: zengjin Date: Wed, 31 Oct 2018 15:58:27 +0800 Subject: [PATCH] 组装用例 --- src/main/java/com/essa/framework/Model.java | 2 +- src/main/java/com/essa/pageObject/StorageManage/GoodsReceiveTaskPage.java | 3 ++- src/main/java/com/essa/testSuite/TestLoadContainer.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/essa/framework/Model.java b/src/main/java/com/essa/framework/Model.java index 05a478f..f2654d7 100644 --- a/src/main/java/com/essa/framework/Model.java +++ b/src/main/java/com/essa/framework/Model.java @@ -15,7 +15,7 @@ public class Model { public static String env;//所选环境 public static String buyerAccount="meng18@essa.cn";//采购商账号 public static String buyerPassword="essa123";//采购商密码 - public static String poNum="A181115T9194I";//po单号 + public static String poNum="A181115T9194K";//po单号 public static int isactivity=0;//是否是活动商品 1：是 0：否 public static String manager;//商品的类目经理 public static String serialNum="RW2018060800058";//待办流水号 diff --git a/src/main/java/com/essa/pageObject/StorageManage/GoodsReceiveTaskPage.java b/src/main/java/com/essa/pageObject/StorageManage/GoodsReceiveTaskPage.java index 4a7f6cb..c0c136c 100644 --- a/src/main/java/com/essa/pageObject/StorageManage/GoodsReceiveTaskPage.java +++ b/src/main/java/com/essa/pageObject/StorageManage/GoodsReceiveTaskPage.java @@ -61,6 +61,7 @@ public class GoodsReceiveTaskPage extends BasePage { */ public boolean isFinish(){ forceWait(500); - return status.getText().equals("完成"); + boolean b = isVisibility(By.xpath("//*[text()='完成']")); + return b; } } diff --git a/src/main/java/com/essa/testSuite/TestLoadContainer.java b/src/main/java/com/essa/testSuite/TestLoadContainer.java index b559659..79a8466 100644 --- a/src/main/java/com/essa/testSuite/TestLoadContainer.java +++ b/src/main/java/com/essa/testSuite/TestLoadContainer.java @@ -100,10 +100,10 @@ public class TestLoadContainer extends BaseTest { GoodsReceiveTaskPage goodsReceiveTaskPage = PageFactory.initElements(driver, GoodsReceiveTaskPage.class); ReceiveTaskDealPage receiveTaskDealPage = PageFactory.initElements(driver, ReceiveTaskDealPage.class); homePage.toGoodsReceiveTaskPage(); - while (!goodsReceiveTaskPage.isFinish()) { + do { goodsReceiveTaskPage.dealReceive(); receiveTaskDealPage.allReceive(); - } + }while (!(goodsReceiveTaskPage.isFinish())); } /** -- libgit2 0.21.2