From a524812adec50a6560ec5d46b3e69e8c2367b3aa Mon Sep 17 00:00:00 2001 From: zengjin Date: Fri, 26 Oct 2018 15:32:56 +0800 Subject: [PATCH] idea增加epd环境 --- src/main/java/com/essa/framework/BasePage.java | 8 +++++++- src/main/java/com/essa/framework/EnvEnum.java | 3 ++- src/main/java/com/essa/testSuite/TestTail.java | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------- src/main/resources/conf/config_epd.properties | 11 +++++++++++ 4 files changed, 84 insertions(+), 66 deletions(-) create mode 100644 src/main/resources/conf/config_epd.properties diff --git a/src/main/java/com/essa/framework/BasePage.java b/src/main/java/com/essa/framework/BasePage.java index a656e03..d760376 100644 --- a/src/main/java/com/essa/framework/BasePage.java +++ b/src/main/java/com/essa/framework/BasePage.java @@ -267,7 +267,7 @@ public class BasePage { /** * 元素在页面上是否可见 - * @param element + * @param * @return */ protected boolean isVisibility(By by) { @@ -653,6 +653,12 @@ public class BasePage { forceWait(1000); } } + /** + * bpms动态等待，指的是我们后台系统那个加载的圈圈 + */ + protected void dynamicWait() { + dynamicWait(By.xpath("//*[@name='tailDeliveryDay']")); + } /** * 与上面的方法相反，如果元素存在，等待直到元素不存在，最长7秒 diff --git a/src/main/java/com/essa/framework/EnvEnum.java b/src/main/java/com/essa/framework/EnvEnum.java index bed6b0a..382ca76 100644 --- a/src/main/java/com/essa/framework/EnvEnum.java +++ b/src/main/java/com/essa/framework/EnvEnum.java @@ -11,7 +11,8 @@ public enum EnvEnum { DIT("dit","DIT"), HOTFIX("hotfix","HOTFIX"), UAT("uat","UAT"), - SIT("sit","SIT"); + SIT("sit","SIT"), + EPD("epd","EPD"); /** * 原子引用(全部) diff --git a/src/main/java/com/essa/testSuite/TestTail.java b/src/main/java/com/essa/testSuite/TestTail.java index 4368a3d..eaa4515 100644 --- a/src/main/java/com/essa/testSuite/TestTail.java +++ b/src/main/java/com/essa/testSuite/TestTail.java @@ -17,70 +17,70 @@ import com.essa.pageObject.StorageManage.ReceiveTaskDealPage; import com.essa.pageObject.needDealt.NeedDealtApplyPage; public class TestTail extends BaseTest { - WebDriver driver; + WebDriver driver; - @BeforeClass - public void setUp() { - initsetUp(); - loginValid("yuwanhang"); - } - - @AfterClass - public void tearDown() { - driver.quit(); - } + @BeforeClass + public void setUp() { + initsetUp(); + loginValid("yuwanhang"); + } - /** - * 转尾货 - */ - @Test - public void testTail() { - driver = getDriver(); - HomePage homePage = PageFactory.initElements(driver, HomePage.class); - PODocumentaryListPage poDocumentaryListPage = PageFactory.initElements(driver, PODocumentaryListPage.class); - POBoardPage poBoardPage = PageFactory.initElements(driver, POBoardPage.class); - ConvertTailPage convertTailPage = PageFactory.initElements(driver, ConvertTailPage.class); - homePage.toPoDocumentaryListPage(); - poDocumentaryListPage.todetail(); - poBoardPage.toTail(); - convertTailPage.convertTail(); - } - - /** - * 设置收货、装柜的仓库地址 - */ - @Test - public void noticReceive() { - driver = getDriver(); - HomePage homePage = PageFactory.initElements(driver, HomePage.class); - NoticeReceivePage noticeReceivePage = PageFactory.initElements(driver, NoticeReceivePage.class); - homePage.toNoticeReceivePage(); - noticeReceivePage.setWareHouse(); - } - - /** - * 收货通知处理 - */ - @Test - public void dealWithDelivery() { - driver = getDriver(); - HomePage homePage = PageFactory.initElements(driver, HomePage.class); - GoodsReceiveTaskPage goodsReceiveTaskPage = PageFactory.initElements(driver, GoodsReceiveTaskPage.class); - ReceiveTaskDealPage receiveTaskDealPage = PageFactory.initElements(driver, ReceiveTaskDealPage.class); - homePage.toGoodsReceiveTaskPage(); - goodsReceiveTaskPage.dealReceive(); - receiveTaskDealPage.allReceive(); - } - - /** - * 大跟单确认船期 - */ - @Test - public void confirmSailingDate() { - driver = getDriver(); - HomePage homePage = PageFactory.initElements(driver, HomePage.class); - NeedDealtApplyPage needDealtApplyPage = PageFactory.initElements(driver, NeedDealtApplyPage.class); - homePage.toSailingDateConfirmPage(); - needDealtApplyPage.confirmSailingDate(); - } + @AfterClass + public void tearDown() { + driver.quit(); + } + + /** + * 转尾货 + */ + @Test + public void testTail() { + driver = getDriver(); + HomePage homePage = PageFactory.initElements(driver, HomePage.class); + PODocumentaryListPage poDocumentaryListPage = PageFactory.initElements(driver, PODocumentaryListPage.class); + POBoardPage poBoardPage = PageFactory.initElements(driver, POBoardPage.class); + ConvertTailPage convertTailPage = PageFactory.initElements(driver, ConvertTailPage.class); + homePage.toPoDocumentaryListPage(); + poDocumentaryListPage.todetail(); + poBoardPage.toTail(); + convertTailPage.convertTail(); + } + + /** + * 设置收货、装柜的仓库地址 + */ + @Test + public void noticReceive() { + driver = getDriver(); + HomePage homePage = PageFactory.initElements(driver, HomePage.class); + NoticeReceivePage noticeReceivePage = PageFactory.initElements(driver, NoticeReceivePage.class); + homePage.toNoticeReceivePage(); + noticeReceivePage.setWareHouse(); + } + + /** + * 收货通知处理 + */ + @Test + public void dealWithDelivery() { + driver = getDriver(); + HomePage homePage = PageFactory.initElements(driver, HomePage.class); + GoodsReceiveTaskPage goodsReceiveTaskPage = PageFactory.initElements(driver, GoodsReceiveTaskPage.class); + ReceiveTaskDealPage receiveTaskDealPage = PageFactory.initElements(driver, ReceiveTaskDealPage.class); + homePage.toGoodsReceiveTaskPage(); + goodsReceiveTaskPage.dealReceive(); + receiveTaskDealPage.allReceive(); + } + + /** + * 大跟单确认船期 + */ + @Test + public void confirmSailingDate() { + driver = getDriver(); + HomePage homePage = PageFactory.initElements(driver, HomePage.class); + NeedDealtApplyPage needDealtApplyPage = PageFactory.initElements(driver, NeedDealtApplyPage.class); + homePage.toSailingDateConfirmPage(); + needDealtApplyPage.confirmSailingDate(); + } } diff --git a/src/main/resources/conf/config_epd.properties b/src/main/resources/conf/config_epd.properties new file mode 100644 index 0000000..3d61e14 --- /dev/null +++ b/src/main/resources/conf/config_epd.properties @@ -0,0 +1,11 @@ +#browserName=FireFox +#browserName=IE +browserName=Chrome + +serverURL=http://www.yesazhineng.cn:8000/ +buyerURL=https://epd-en.essatoy.com/ + +jdbc.driver=com.mysql.cj.jdbc.Driver +jdbc.url=jdbc:mysql://120.76.152.227:3325/bpms +jdbc.user=essa_epd +jdbc.pwd=H5]L(VUONwe,.-)- \ No newline at end of file -- libgit2 0.21.2