曾谨 / EssaAuto

Compare View

switch
from
...
to
 
Commits (2)
Showing 4 changed files   Show diff stats
Inline Side-by-side
src/main/java/com/essa/framework/BasePage.java
  Show/Hide comments   View file @9e8e2bb
@@ -267,7 +267,7 @@ public class BasePage { @@ -267,7 +267,7 @@ public class BasePage {
267 267
268 /** 268 /**
269 * 元素在页面上是否可见 269 * 元素在页面上是否可见
270 - * @param element 270 + * @param
271 * @return 271 * @return
272 */ 272 */
273 protected boolean isVisibility(By by) { 273 protected boolean isVisibility(By by) {
@@ -653,6 +653,12 @@ public class BasePage { @@ -653,6 +653,12 @@ public class BasePage {
653 forceWait(1000); 653 forceWait(1000);
654 } 654 }
655 } 655 }
  656 + /**
  657 + * bpms动态等待，指的是我们后台系统那个加载的圈圈
  658 + */
  659 + protected void dynamicWait() {
  660 + dynamicWait(By.xpath("//*[@name='tailDeliveryDay']"));
  661 + }
656 662
657 /** 663 /**
658 * 与上面的方法相反，如果元素存在，等待直到元素不存在，最长7秒 664 * 与上面的方法相反，如果元素存在，等待直到元素不存在，最长7秒
src/main/java/com/essa/framework/EnvEnum.java
  Show/Hide comments   View file @9e8e2bb
@@ -11,7 +11,8 @@ public enum EnvEnum { @@ -11,7 +11,8 @@ public enum EnvEnum {
11 DIT("dit","DIT"), 11 DIT("dit","DIT"),
12 HOTFIX("hotfix","HOTFIX"), 12 HOTFIX("hotfix","HOTFIX"),
13 UAT("uat","UAT"), 13 UAT("uat","UAT"),
14 - SIT("sit","SIT"); 14 + SIT("sit","SIT"),
  15 + EPD("epd","EPD");
15 16
16 /** 17 /**
17 * 原子引用(全部) 18 * 原子引用(全部)
src/main/java/com/essa/testSuite/TestTail.java
  Show/Hide comments   View file @9e8e2bb
@@ -17,70 +17,70 @@ import com.essa.pageObject.StorageManage.ReceiveTaskDealPage; @@ -17,70 +17,70 @@ import com.essa.pageObject.StorageManage.ReceiveTaskDealPage;
17 import com.essa.pageObject.needDealt.NeedDealtApplyPage; 17 import com.essa.pageObject.needDealt.NeedDealtApplyPage;
18 18
19 public class TestTail extends BaseTest { 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 - }  
27 -  
28 - @AfterClass  
29 - public void tearDown() {  
30 - driver.quit();  
31 - } 22 + @BeforeClass
  23 + public void setUp() {
  24 + initsetUp();
  25 + loginValid("yuwanhang");
  26 + }
32 27
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 -  
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 -  
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 -  
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 - } 28 + @AfterClass
  29 + public void tearDown() {
  30 + driver.quit();
  31 + }
  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 + }
  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 + }
  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 + }
  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 + }
86 } 86 }
src/main/resources/conf/config_epd.properties 0 → 100644
  Show/Hide comments   View file @9e8e2bb
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
  1 +#browserName=FireFox
  2 +#browserName=IE
  3 +browserName=Chrome
  4 +
  5 +serverURL=http://www.yesazhineng.cn:8000/
  6 +buyerURL=https://epd-en.essatoy.com/
  7 +
  8 +jdbc.driver=com.mysql.cj.jdbc.Driver
  9 +jdbc.url=jdbc:mysql://120.76.152.227:3325/bpms
  10 +jdbc.user=essa_epd
  11 +jdbc.pwd=H5]L(VUONwe,.-)-
0 \ No newline at end of file 12 \ No newline at end of file