diff --git a/src/main/java/com/essa/pageObject/PODocumentary/POBoardPage.java b/src/main/java/com/essa/pageObject/PODocumentary/POBoardPage.java index 8309c42..b078555 100644 --- a/src/main/java/com/essa/pageObject/PODocumentary/POBoardPage.java +++ b/src/main/java/com/essa/pageObject/PODocumentary/POBoardPage.java @@ -92,10 +92,14 @@ public class POBoardPage extends BasePage { sendKeys(inputReceiveDate,date); click(reveiveDate); click(submit); - forceWait(3000); return new POBoardPage(driver); } + public boolean isNoticeReceSucceed(){ + forceWait(2000); + return isVisibility(By.xpath("//*[contains(text(),'收货中')]")); + } + //通知装柜 public POBoardPage noticeLoad(){ click(noticeLoad); @@ -108,4 +112,10 @@ public class POBoardPage extends BasePage { forceWait(2000); return new POBoardPage(driver); } + + public boolean isNoticeLoadSucceed(){ + forceWait(2000); + return isVisibility(By.xpath("//*[contains(text(),'装柜中')]")); + } + } diff --git a/src/main/java/com/essa/pageObject/PODocumentary/PODocumentaryListPage.java b/src/main/java/com/essa/pageObject/PODocumentary/PODocumentaryListPage.java index f72771a..31313e6 100644 --- a/src/main/java/com/essa/pageObject/PODocumentary/PODocumentaryListPage.java +++ b/src/main/java/com/essa/pageObject/PODocumentary/PODocumentaryListPage.java @@ -65,10 +65,10 @@ public class PODocumentaryListPage extends BasePage { public PODocumentaryListPage toPoFollowDetail(){ sendKeys(keySearch, Model.getPoNum()); click(magnifierSearch); - forceWait(5000); + forceWait(8000); dynamicWait(By.xpath("//div[@class='row xxrow-header-bg row-border-bottom no-margin padding-horizontal-5']")); click(followDetail); - forceWait(5000); + forceWait(8000); dynamicWait(By.xpath("//div[@class='panel-body']")); return new PODocumentaryListPage(driver); } diff --git a/src/main/java/com/essa/testSuite/TestNoticeReceiveAndLoad.java b/src/main/java/com/essa/testSuite/TestNoticeReceiveAndLoad.java index 9dc22ca..134a408 100644 --- a/src/main/java/com/essa/testSuite/TestNoticeReceiveAndLoad.java +++ b/src/main/java/com/essa/testSuite/TestNoticeReceiveAndLoad.java @@ -9,6 +9,7 @@ import org.openqa.selenium.support.PageFactory; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import org.testng.asserts.SoftAssert; public class TestNoticeReceiveAndLoad extends BaseTest{ @@ -36,8 +37,24 @@ public class TestNoticeReceiveAndLoad extends BaseTest{ PODocumentaryListPage poDocumentaryListPage = PageFactory.initElements(driver,PODocumentaryListPage.class); POBoardPage poBoardPage = PageFactory.initElements(driver,POBoardPage.class); poDocumentaryListPage.toPoFollowDetail(); + + //通知收货 poBoardPage.noticeReceive(); + + //断言:通知收货是否成功 + boolean actualReceive = poBoardPage.isNoticeReceSucceed(); + SoftAssert softAssert = new SoftAssert(); + softAssert.assertEquals(actualReceive,true,"通知收货失败!"); + softAssert.assertAll(); + + //通知装柜 poBoardPage.noticeLoad(); + + //断言:通知收货是否成功 + boolean actualLoae = poBoardPage.isNoticeReceSucceed(); + SoftAssert anAssert = new SoftAssert(); + anAssert.assertEquals(actualLoae,true,"通知装柜失败!"); + anAssert.assertAll(); } } -- libgit2 0.21.2