Merge branch 'dev_test' of http://gitlab.essa.top:88/zengjin/EssaAuto into dev_test

# Conflicts: # src/main/java/com/essa/pageObject/HomePage.java

Merge branch 'dev_test' of http://gitlab.essa.top:88/zengjin/EssaAuto into dev_test
# Conflicts: # src/main/java/com/essa/pageObject/HomePage.java
toby5221
2 parents 0e4d02cb 5d044c02
Showing 10 changed files with 211 additions and 229 deletions Show diff stats
src/main/java/com/essa/framework/BasePage1.java
src/main/java/com/essa/pageObject/Documentary/PODocumentaryPage.java
src/main/java/com/essa/pageObject/DocumentaryManage/POBoardPage.java
src/main/java/com/essa/pageObject/DocumentaryManage/ReceiptCorePage.java
src/main/java/com/essa/pageObject/HomePage.java
src/main/java/com/essa/pageObject/SupplierOperationsTrackPage.java -> src/main/java/com/essa/pageObject/SupplierManage/SupplierOperationsTrackPage.java
src/main/java/com/essa/pageObject/SupplierStrengthPage.java -> src/main/java/com/essa/pageObject/SupplierManage/SupplierStrengthPage.java
src/main/java/com/essa/testSuite/SendEmail.java
src/main/java/com/essa/testSuite/TestDevelopmentAbility.java
src/main/java/com/essa/testSuite/TestReceiptCore.java
@@ -1,38 +0,0 @@
-package com.essa.framework;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-
-public class BasePage1 {
-	public static WebDriver driver;
-	/**
-	 * 构造方法
-	 * @param driver
-	 */
-	public BasePage1(WebDriver driver) {
-		BasePage.driver = driver;
-	}
-	/**
-	 * 填写文本
-	 * @param element 元素
-	 * @param text    文本值
-	 */
-	protected void sendKeys(WebElement element, String text) {
-		element.clear();// 清除原有文本
-		element.sendKeys(text);
-	}
-	/**
-	 * 鼠标左键点击
-	 * @param element 元素
-	 */
-	protected void click(WebElement element) {
-		element.click();
-	}
-	/**
-	 * 获取当前页面的标题
-	 * @return 标题
-	 */
-	protected String getCurrentPageTitle() {
-		return driver.getTitle();
-	}
-}
@@ -1,17 +0,0 @@
-package com.essa.pageObject.Documentary;
-
-import org.openqa.selenium.WebDriver;
-
-import com.essa.framework.BasePage;
-
-/**
- * @author Administrator
- *PO跟单页面
- */
-public class PODocumentaryPage extends BasePage {
-
-	public PODocumentaryPage(WebDriver driver) {
-		super(driver);
-	}
-
-}
@@ -118,168 +118,5 @@ public class POBoardPage extends BasePage {
 		return isVisibility(By.xpath("//*[contains(text(),'装柜中')]"));
 	}
-    public static class ReceiptCorePage extends BasePage {
-        public ReceiptCorePage(WebDriver driver) { super(driver);}
-
-        /*
-        * 页面元素定位
-        * */
-
-        @FindBy (xpath = "//i[@class='iconfont icon-double-arrow-right']")
-    //    @FindBy (xpath = "//*[contains(text(),'高级查询')]")
-        WebElement advancedQuery; //高级查询
-
-        @FindBy (xpath = "/html[1]/body[1]/div[2]/div[2]/div[1]/div[1]/div[1]/div[1]/form[2]/div[5]/div[1]/input[1]")
-    //    @FindBy (xpath = "//input[@type='text' and @ng-model='query.params.poCode']")
-
-        WebElement PO_numbers;  //PO单号
-
-        @FindBy (xpath = "//*[text()='查询']")
-    //    @FindBy (xpath = "//*/button[@type='submit']")
-
-        WebElement Query ; //查询
-
-        @FindBy (xpath = "//tbody//tr[1]")
-    //    @FindBy (xpath = "//*[@id=\"frontSendListCtrlView\"]/div/div/table/tbody/tr[1]")
-
-        WebElement list_1; //列表第一条数据
-
-        @FindBy (xpath = "/html[1]/body[1]/div[2]/div[2]/div[1]/div[1]/div[1]/div[1]/div[1]/table[1]/tbody[1]")
-
-        WebElement list; //列表
-
-        @FindBy (xpath = "/html[1]/body[1]/div[2]/div[2]/div[1]/div[1]/div[1]/div[1]/div[1]/table[1]/tbody[1]/tr[1]/td[1]")
-
-        WebElement document_code; //单据编号
-
-        @FindBy (xpath = "//*[text()='开始发单']")
-    //    @FindBy (xpath = "/html[1]/body[1]/div[2]/div[2]/div[1]/div[1]/div[1]/div[1]/div[1]/div[1]/button[1]")
-
-        WebElement  start_billing;  // 开始发单
-
-        @FindBy (xpath = "//button[@class='btn btn-danger ng-scope']")
-
-        WebElement  start_billing_1 ;  //前台发单扫码平台的开始发单
-
-        @FindBy (xpath = "//div[@class='input-group ng-isolate-scope ng-pristine ng-valid']//input[@type='text']")
-
-        WebElement input_document_code;//单据编号输入框
-
-        @FindBy (xpath = "//button[@type='button' and @ng-click='clickBtn()']")
-    //            @FindBy (xpath = "//*[contains(@ng-click,'clickBtn')]")
-
-                WebElement  search ;// 搜索按钮
-
-        @FindBy (xpath = "//a[contains(text(),'扫码确认接单')]")
-
-        WebElement Confirm_billing ; // 扫码确认接单
-
-        @FindBy (xpath = "//*[text()='接单完成']")
-
-        WebElement finish_billing; //接单完成
-
-        @FindBy (xpath = "//*[contains(text(),'所选的工厂订单状态必须为“制单中”或“重新发单”')]")
-
-        WebElement Fail_billing; //发单失败
-
-        @FindBy (xpath = "//*[contains(text(),'所选的工厂订单状态必须为“发单中”')]")
-
-        //*[coantains(text(),'所选的工厂订单状态必须为']
-       // *[@data-notify='message']
-       //*[@data-notify='message'] and text()='所选的工厂订单状态必须为“发单中”'
-        //*[(text()=' 所选的工厂订单状态必须为“发单中”']
-
-        WebElement Fail_order; //接单失败
-
-        @FindBy (xpath = "//*[contains(text(),'操作成功')]")
-
-        WebElement  Succeed_billing; //发单成功
-
-
-
-
-
-        /*
-        * 页面方法
-        * */
-
-        public  void  BillOrder(String PO_Code) {
-            click(advancedQuery);
-            forceWait(1000);
-
-            sendKeys(PO_numbers,PO_Code);
-            forceWait(1000);
-
-            click(Query);
-    //        forceWait(3000);
-
-            dynamicWait(By.xpath("/html[1]/body[1]/div[2]/div[2]/div[1]/div[1]/div[1]/div[1]/div[1]/table[1]/tbody[1]"));
-
-    //        actionDoubleClick(document_code); // 双击元素
-    //        forceWait(1000);
-            String Fo = document_code.getText();
-            forceWait(1000);
-
-            click(start_billing);
-            forceWait(1000);
-            sendKeys(input_document_code,Fo);
-            forceWait(1000);
-
-            click(search);
-            forceWait(1000);
-
-            click(start_billing_1);
-            forceWait(1000);
-    //        isVisibility(By.xpath("//*[contains(text(),'所选的工厂订单状态必须为“发单中”')]"));
-
-            click(start_billing);
-            forceWait(1000);
-
-            click(Confirm_billing);
-            forceWait(1000);
-
-            sendKeys(input_document_code,Fo);
-            forceWait(1000);
-
-            click(search);
-            forceWait(1000);
-
-            click(finish_billing);
-            forceWait(3000);
-
-
-
-        }
-
-
-        /*
-        *用于断言发单接单是否成功
-        * @return boolean
-        */
-
-        public  boolean isSucceed() {return  isElementExist(Succeed_billing);}
-
-        /*
-         *用于断言发单是否成功
-         * @return boolean
-         */
-
-        public  boolean FailBilling() {return  isElementExist(Fail_billing);}
-
-        /*
-         *用于断言接单是否成功
-         * @return boolean
-         */
-
-
-        public  boolean FailOrder() {return  isElementExist(Fail_order);}
-
-
-
-
-
-
-
-    }
 }
@@ -0,0 +1,180 @@
+package com.essa.pageObject.DocumentaryManage;
+
+import com.essa.framework.BasePage;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+
+public  class ReceiptCorePage extends BasePage {
+
+    public ReceiptCorePage(WebDriver driver) { super(driver);}
+
+    /*
+     * 页面元素定位
+     * */
+
+    @FindBy (xpath = "//*[contains(text(),'对不起！没有查询到相关数据')]")
+
+    WebElement Wait ;//等待
+
+    @FindBy(xpath = "//i[@class='iconfont icon-double-arrow-right']")
+    //    @FindBy (xpath = "//*[contains(text(),'高级查询')]")
+            WebElement advancedQuery; //高级查询
+
+    @FindBy (xpath = "/html[1]/body[1]/div[2]/div[2]/div[1]/div[1]/div[1]/div[1]/form[2]/div[5]/div[1]/input[1]")
+    //    @FindBy (xpath = "//input[@type='text' and @ng-model='query.params.poCode']")
+
+            WebElement PO_numbers;  //PO单号
+
+    @FindBy (xpath = "//*[text()='查询']")
+    //    @FindBy (xpath = "//*/button[@type='submit']")
+
+            WebElement Query ; //查询
+
+    @FindBy (xpath = "//tbody//tr[1]")
+    //    @FindBy (xpath = "//*[@id=\"frontSendListCtrlView\"]/div/div/table/tbody/tr[1]")
+
+            WebElement list_1; //列表第一条数据
+
+    @FindBy (xpath = "/html[1]/body[1]/div[2]/div[2]/div[1]/div[1]/div[1]/div[1]/div[1]/table[1]/tbody[1]")
+
+    WebElement list; //列表
+
+    @FindBy (xpath = "/html[1]/body[1]/div[2]/div[2]/div[1]/div[1]/div[1]/div[1]/div[1]/table[1]/tbody[1]/tr[1]/td[1]")
+
+    WebElement document_code; //单据编号
+
+    @FindBy (xpath = "//*[text()='开始发单']")
+    //    @FindBy (xpath = "/html[1]/body[1]/div[2]/div[2]/div[1]/div[1]/div[1]/div[1]/div[1]/div[1]/button[1]")
+
+            WebElement  start_billing;  // 开始发单
+
+    @FindBy (xpath = "//button[@class='btn btn-danger ng-scope']")
+
+    WebElement  start_billing_1 ;  //前台发单扫码平台的开始发单
+
+    @FindBy (xpath = "//div[@class='input-group ng-isolate-scope ng-pristine ng-valid']//input[@type='text']")
+
+    WebElement input_document_code;//单据编号输入框
+
+    @FindBy (xpath = "//button[@type='button' and @ng-click='clickBtn()']")
+    //            @FindBy (xpath = "//*[contains(@ng-click,'clickBtn')]")
+
+            WebElement  search ;// 搜索按钮
+
+    @FindBy (xpath = "//a[contains(text(),'扫码确认接单')]")
+
+    WebElement Confirm_billing ; // 扫码确认接单
+
+    @FindBy (xpath = "//*[text()='接单完成']")
+
+    WebElement finish_billing; //接单完成
+
+    @FindBy (xpath = "//*[contains(text(),'所选的工厂订单状态必须为“制单中”或“重新发单”')]")
+
+    WebElement Fail_billing; //发单失败
+
+    @FindBy (xpath = "//*[contains(text(),'所选的工厂订单状态必须为“发单中”')]")
+
+    //*[coantains(text(),'所选的工厂订单状态必须为']
+            // *[@data-notify='message']
+            //*[@data-notify='message'] and text()='所选的工厂订单状态必须为“发单中”'
+            //*[(text()=' 所选的工厂订单状态必须为“发单中”']
+
+            WebElement Fail_order; //接单失败
+
+    @FindBy (xpath = "//*[contains(text(),'操作成功')]")
+
+    WebElement  Succeed_billing; //发单成功
+
+
+
+
+
+    /**
+     *页面方法
+     * 前台发单中心页面
+     */
+
+    public  void  BillOrder(String PO_Code) {
+
+        dynamicWait(By.xpath("//tbody//tr[1]"));
+
+        click(advancedQuery);
+        forceWait(1000);
+
+        sendKeys(PO_numbers,PO_Code);
+        forceWait(1000);
+
+        click(Query);
+        //        forceWait(3000);
+
+        dynamicWait(By.xpath("/html[1]/body[1]/div[2]/div[2]/div[1]/div[1]/div[1]/div[1]/div[1]/table[1]/tbody[1]"));
+
+        //        actionDoubleClick(document_code); // 双击元素
+        //        forceWait(1000);
+        String Fo = document_code.getText();
+        forceWait(1000);
+
+        click(start_billing);
+        forceWait(1000);
+        sendKeys(input_document_code,Fo);
+        forceWait(1000);
+
+        click(search);
+        forceWait(1000);
+
+        click(start_billing_1);
+        forceWait(1000);
+        //        isVisibility(By.xpath("//*[contains(text(),'所选的工厂订单状态必须为“发单中”')]"));
+
+        click(start_billing);
+        forceWait(1000);
+
+        click(Confirm_billing);
+        forceWait(1000);
+
+        sendKeys(input_document_code,Fo);
+        forceWait(1000);
+
+        click(search);
+        forceWait(1000);
+
+        click(finish_billing);
+        forceWait(3000);
+
+
+
+    }
+
+
+    /*
+     *用于断言发单接单是否成功
+     * @return boolean
+     */
+
+    public  boolean isSucceed() {return  isElementExist(Succeed_billing);}
+
+    /*
+     *用于断言发单是否成功
+     * @return boolean
+     */
+
+    public  boolean FailBilling() {return  isElementExist(Fail_billing);}
+
+    /*
+     *用于断言接单是否成功
+     * @return boolean
+     */
+
+
+    public  boolean FailOrder() {return  isElementExist(Fail_order);}
+
+
+
+
+
+
+
+}
 package com.essa.pageObject;  
 import com.essa.pageObject.DocumentaryManage.POBoardPage;
+import com.essa.pageObject.DocumentaryManage.ReceiptCorePage;
 import org.openqa.selenium.By;
+import com.essa.pageObject.SupplierManage.SupplierOperationsTrackPage;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;  
 import org.openqa.selenium.support.FindBy;
@@ -452,9 +454,9 @@ public class HomePage extends BasePage{
     /*
      * 进入前台发单中心页面
      * */
-    public POBoardPage.ReceiptCorePage toReceiptCore() {
+    public ReceiptCorePage toReceiptCore() {
         click(DocumentaryManage);
         click(Receipt_core);
-        return new POBoardPage.ReceiptCorePage(driver);
+        return new ReceiptCorePage (driver);
     }
 }
 \ No newline at end of file
-package com.essa.pageObject;
+package com.essa.pageObject.SupplierManage;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
@@ -6,6 +6,11 @@ import org.openqa.selenium.support.FindBy;
 import com.essa.framework.BasePage;
+/*
+* @Description:BD跟进管理页面
+* @Author: ZengJin
+* @CreateTime: 2018/10/29
+*/
 public class SupplierOperationsTrackPage extends BasePage {
 	public SupplierOperationsTrackPage(WebDriver driver) {
 		super(driver);
-package com.essa.pageObject;
+package com.essa.pageObject.SupplierManage;
 import java.util.List;
@@ -8,7 +8,11 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import com.essa.framework.BasePage;
-
+/*
+* @Description:综合实力评估页面
+* @Author: ZengJin
+* @CreateTime: 2018/10/29
+*/
 public class SupplierStrengthPage extends BasePage{
 	public SupplierStrengthPage(WebDriver driver) {  
         super(driver);  
@@ -16,7 +16,11 @@ import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeBodyPart;  
 import javax.mail.internet.MimeMessage;  
 import javax.mail.internet.MimeMultipart;  
-  
+/*
+* @Description:发送邮件的demo
+* @Author: ZengJin
+* @CreateTime: 2018/10/29
+*/
 public class SendEmail {  
     public static void main(String[] args) {  
@@ -3,8 +3,8 @@ package com.essa.testSuite;
 import com.essa.framework.SystemConstant;
 import com.essa.pageObject.BaseTest;
 import com.essa.pageObject.HomePage;
-import com.essa.pageObject.SupplierOperationsTrackPage;
-import com.essa.pageObject.SupplierStrengthPage;
+import com.essa.pageObject.SupplierManage.SupplierOperationsTrackPage;
+import com.essa.pageObject.SupplierManage.SupplierStrengthPage;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.support.PageFactory;
 import org.testng.annotations.AfterClass;
@@ -16,7 +16,11 @@ import org.testng.asserts.SoftAssert;
 import java.io.IOException;
 import static org.testng.Assert.assertEquals;
-
+/*
+* @Description:综合实力评估
+* @Author: ZengJin
+* @CreateTime: 2018/10/29
+*/
 public class TestDevelopmentAbility extends BaseTest {
 	WebDriver driver;
 package com.essa.testSuite;
+
 import com.essa.framework.LinkSQL;
 import com.essa.pageObject.BaseTest;
-import com.essa.pageObject.DocumentaryManage.POBoardPage;
+import com.essa.pageObject.DocumentaryManage.ReceiptCorePage;
 import com.essa.pageObject.HomePage;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.support.PageFactory;
@@ -32,7 +33,7 @@ public class TestReceiptCore extends BaseTest {
         this.driver = getDriver();
         HomePage homePage = PageFactory.initElements(driver,HomePage.class);
         homePage.toReceiptCore();
-        POBoardPage.ReceiptCorePage receiptCorePage = PageFactory.initElements(driver,POBoardPage.ReceiptCorePage.class);
+        ReceiptCorePage receiptCorePage = PageFactory.initElements(driver,ReceiptCorePage.class);
         String PO = LinkSQL.SQLQuery();
         receiptCorePage.BillOrder(PO);