曾谨 / EssaAuto

Commit 0b640e79807a1727c2de80bf5eb4e232e1971949

Authored by zengjin
1 parent 438eca07

修改设置装柜的返回值

Showing 2 changed files with 63 additions and 61 deletions   Show diff stats
Inline Side-by-side
src/main/java/com/essa/pageObject/StorageManage/NoticeReceivePage.java
  Show/Hide comments   View file @0b640e7
... ... @@ -55,7 +55,7 @@ public class NoticeReceivePage extends BasePage {
55 55 /**
56 56 * 设置装柜仓库
57 57 */
58   - public void setWareHouse() {
  58 + public NoticeReceivePage setWareHouse() {
59 59 dynamicWait(By.xpath("//div[@style='display: none;' and @id='mask']"));
60 60 sendKeys(keyword, Model.getPoNum());
61 61 click(search);
... ... @@ -69,7 +69,9 @@ public class NoticeReceivePage extends BasePage {
69 69 forceWait(1000);
70 70 click(sysch);
71 71 forceWait(1000);
  72 + isVisibility(By.xpath("//*[text()='设置成功']"));
72 73 click(succeed);
  74 + return new NoticeReceivePage(driver);
73 75 }
74 76  
75 77 }
... ...
src/main/java/com/essa/testSuite/TestTail.java
  Show/Hide comments   View file @0b640e7
... ... @@ -17,70 +17,70 @@ import com.essa.pageObject.StorageManage.ReceiveTaskDealPage;
17 17 import com.essa.pageObject.needDealt.NeedDealtApplyPage;
18 18  
19 19 public class TestTail extends BaseTest {
20   - WebDriver driver;
  20 + WebDriver driver;
21 21  
22   - @BeforeClass
23   - public void setUp() {
24   - initsetUp();
25   - loginValid("yuwanhang");
26   - }
  22 + @BeforeClass
  23 + public void setUp() {
  24 + initsetUp();
  25 + loginValid("yuwanhang");
  26 + }
27 27  
28   - @AfterClass
29   - public void tearDown() {
30   - driver.quit();
31   - }
  28 + @AfterClass
  29 + public void tearDown() {
  30 + driver.quit();
  31 + }
32 32  
33   - /**
34   - * 转尾货
35   - */
36   - @Test
37   - public void testTail() {
38   - driver = getDriver();
39   - HomePage homePage = PageFactory.initElements(driver, HomePage.class);
40   - PODocumentaryListPage poDocumentaryListPage = PageFactory.initElements(driver, PODocumentaryListPage.class);
41   - POBoardPage poBoardPage = PageFactory.initElements(driver, POBoardPage.class);
42   - ConvertTailPage convertTailPage = PageFactory.initElements(driver, ConvertTailPage.class);
43   - homePage.toPoDocumentaryListPage();
44   - poDocumentaryListPage.todetail();
45   - poBoardPage.toTail();
46   - convertTailPage.convertTail();
47   - }
  33 + /**
  34 + * 转尾货
  35 + */
  36 + @Test
  37 + public void testTail() {
  38 + driver = getDriver();
  39 + HomePage homePage = PageFactory.initElements(driver, HomePage.class);
  40 + PODocumentaryListPage poDocumentaryListPage = PageFactory.initElements(driver, PODocumentaryListPage.class);
  41 + POBoardPage poBoardPage = PageFactory.initElements(driver, POBoardPage.class);
  42 + ConvertTailPage convertTailPage = PageFactory.initElements(driver, ConvertTailPage.class);
  43 + homePage.toPoDocumentaryListPage();
  44 + poDocumentaryListPage.todetail();
  45 + poBoardPage.toTail();
  46 + convertTailPage.convertTail();
  47 + }
48 48  
49   - /**
50   - * 设置收货、装柜的仓库地址
51   - */
52   - @Test
53   - public void noticReceive() {
54   - driver = getDriver();
55   - HomePage homePage = PageFactory.initElements(driver, HomePage.class);
56   - NoticeReceivePage noticeReceivePage = PageFactory.initElements(driver, NoticeReceivePage.class);
57   - homePage.toNoticeReceivePage();
58   - noticeReceivePage.setWareHouse();
59   - }
  49 + /**
  50 + * 设置收货、装柜的仓库地址
  51 + */
  52 + @Test
  53 + public void noticReceive() {
  54 + driver = getDriver();
  55 + HomePage homePage = PageFactory.initElements(driver, HomePage.class);
  56 + NoticeReceivePage noticeReceivePage = PageFactory.initElements(driver, NoticeReceivePage.class);
  57 + homePage.toNoticeReceivePage();
  58 + noticeReceivePage.setWareHouse();
  59 + }
60 60  
61   - /**
62   - * 收货通知处理
63   - */
64   - @Test
65   - public void dealWithDelivery() {
66   - driver = getDriver();
67   - HomePage homePage = PageFactory.initElements(driver, HomePage.class);
68   - GoodsReceiveTaskPage goodsReceiveTaskPage = PageFactory.initElements(driver, GoodsReceiveTaskPage.class);
69   - ReceiveTaskDealPage receiveTaskDealPage = PageFactory.initElements(driver, ReceiveTaskDealPage.class);
70   - homePage.toGoodsReceiveTaskPage();
71   - goodsReceiveTaskPage.dealReceive();
72   - receiveTaskDealPage.allReceive();
73   - }
  61 + /**
  62 + * 收货通知处理
  63 + */
  64 + @Test
  65 + public void dealWithDelivery() {
  66 + driver = getDriver();
  67 + HomePage homePage = PageFactory.initElements(driver, HomePage.class);
  68 + GoodsReceiveTaskPage goodsReceiveTaskPage = PageFactory.initElements(driver, GoodsReceiveTaskPage.class);
  69 + ReceiveTaskDealPage receiveTaskDealPage = PageFactory.initElements(driver, ReceiveTaskDealPage.class);
  70 + homePage.toGoodsReceiveTaskPage();
  71 + goodsReceiveTaskPage.dealReceive();
  72 + receiveTaskDealPage.allReceive();
  73 + }
74 74  
75   - /**
76   - * 大跟单确认船期
77   - */
78   - @Test
79   - public void confirmSailingDate() {
80   - driver = getDriver();
81   - HomePage homePage = PageFactory.initElements(driver, HomePage.class);
82   - NeedDealtApplyPage needDealtApplyPage = PageFactory.initElements(driver, NeedDealtApplyPage.class);
83   - homePage.toSailingDateConfirmPage();
84   - needDealtApplyPage.confirmSailingDate();
85   - }
  75 + /**
  76 + * 大跟单确认船期
  77 + */
  78 + @Test
  79 + public void confirmSailingDate() {
  80 + driver = getDriver();
  81 + HomePage homePage = PageFactory.initElements(driver, HomePage.class);
  82 + NeedDealtApplyPage needDealtApplyPage = PageFactory.initElements(driver, NeedDealtApplyPage.class);
  83 + homePage.toSailingDateConfirmPage();
  84 + needDealtApplyPage.confirmSailingDate();
  85 + }
86 86 }
... ...