Merge remote-tracking branch 'origin/dev_test' into dev_test

zengjin
2 parents a524812a a0824d2d
Showing 8 changed files with 106 additions and 7 deletions Show diff stats
src/main/java/com/essa/framework/BrowserEngine.java
src/main/java/com/essa/framework/BrowserEnum.java
src/main/java/com/essa/framework/ConfigProperties.java
src/main/java/com/essa/framework/DButil.java
src/main/java/com/essa/framework/SuitesEnum.java
src/main/java/com/essa/pageObject/PODocumentary/POBoardPage.java
src/main/java/com/essa/pageObject/PODocumentary/PODocumentaryListPage.java
src/main/java/com/essa/testSuite/TestNoticeReceiveAndLoad.java
@@ -18,6 +18,7 @@ public class BrowserEngine {
     private ConfigProperties configProperties;
  
     public void initConfigData() {
+        //有些地方是没有设置初始化环境直接调用这个方法的，所以默认是sit
         env1 = null == env1 ? EnvEnum.SIT : env1;
         configProperties = ConfigProperties.getConfig(env1);
         browserEnum = BrowserEnum.fromCode(configProperties.getBrowserName());
@@ -39,6 +40,7 @@ public class BrowserEngine {
      */
     private WebDriver getBrowser(BrowserEnum browser,String url,int waitTime){
         System.setProperty(browser.getExeName(), SystemConstant.RESOURCE_PATH + browser.getDriver());
+        //根据浏览器类型，初始化对应的驱动
         switch(browser) {
             case Firefox:{
                 driver = new FirefoxDriver();
@@ -53,7 +53,7 @@ public enum BrowserEnum {
     private String code;
  
     /**
-     * 枚举描述
+     * 浏览器驱动名字
      */
     private String driver;
  
@@ -11,8 +11,11 @@ import java.util.Properties;
  */
 public class ConfigProperties {
  
+    //浏览器名称
     private String browserName;
+    //bpms首页url
     private String serverURL;
+    //buyer首页url
     private String buyerURL;
  
     // 数据库驱动名字
@@ -31,6 +34,7 @@ public class ConfigProperties {
     private static Map<String,ConfigProperties> configPropertiesMap = new HashMap<String,ConfigProperties>();
  
     static {
+        //读取各个环境的配置项
         EnvEnum[] env = EnvEnum.values();
         for (EnvEnum envEnum : env) {
             try {
@@ -23,6 +23,7 @@ public class DButil {
  
 		Connection conn = null;
 		try {
+			//通过环境找寻相应的配置，然后初始化数据库连接
 			EnvEnum envEnum = EnvEnum.fromCode(Model.getEnv());
 			ConfigProperties dbConfig = ConfigProperties.getConfig(envEnum);
 			Class.forName(dbConfig.getJdbcName());
@@ -8,6 +8,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
  
 public enum SuitesEnum {
+    //suite 第一个是唯一标志，第二个表示需要使用哪个xml(需要换的时候只要改这个即可),第三个描述这个干吗的
     ADD_ORIGINAL_GOODS("ADD_ORIGIN_SKU","addOriginalGoods.xml","新增原厂商品"),
     ADD_MARKET_GOODS("ADD_MARKET_GOODS","addMarketGoods.xml","新增市场商品"),
     PUBLISH_GROUP_PURCHASE("PUBLISH_GROUP_PURCHASE","publishGroupPurchase.xml","发布团购"),
@@ -8,6 +8,8 @@ import com.essa.framework.BasePage;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
  
+import java.util.Date;
+
 public class POBoardPage extends BasePage {
  
 	public POBoardPage(WebDriver driver) {
@@ -31,11 +33,34 @@ public class POBoardPage extends BasePage {
 	@FindBy (xpath ="//button[contains(text(),'转在途尾货')]")
 	WebElement toTail;//转在途尾货按钮
  
+	// 通知收货
 	@FindBy (xpath = "//button[contains(text(),'通知收货')]")
-	WebElement noticeReceive;//通知收货按钮
+	WebElement noticeReceive;
+
+	//收货日期
+	@FindBy (xpath = "//*[contains(text(),'收货日期')]")  ///label[@class='control-label col-sm-8']
+			WebElement reveiveDate;
+
+	// 收货日期输入框
+	@FindBy (xpath = " //div[@class='col-sm-16']//input[@type='text']")
+	WebElement inputReceiveDate;
+
+	// 确定
+	@FindBy (xpath = "//button[contains(text(),'确定')]")
+	WebElement submit;
+
+	// 通知装柜
+	@FindBy(xpath = "//button[contains(text(),'通知装柜')]")
+	WebElement noticeLoad;
+
+	// 装柜日期空白处
+	@FindBy(xpath = " //label[@class='control-label col-md-8']")
+	WebElement loadDate;
+
+	// 装柜日期输入框
+	@FindBy (xpath = "//input[@name='newDate']")
+	WebElement inutLoadDate;
  
-	@FindBy(xpath ="//button[contains(text(),'通知装柜')]")
-	WebElement noticeLoad;//通知装柜按钮
  
 	/*
 	 * 页面方法
@@ -55,4 +80,32 @@ public class POBoardPage extends BasePage {
 		click(toTail);
 		return new ConvertTailPage(driver);
 	}
+
+	/**
+	 * PO通知收货和通知装柜
+	 */
+	// 通知收货
+	public POBoardPage noticeReceive(){
+		click(noticeReceive);
+		jsExecutorRemoveAttribute(inputReceiveDate,"readonly");
+		String date = getDateTimeByFormat(new Date(),"MM/dd/yyyy");
+		sendKeys(inputReceiveDate,date);
+		click(reveiveDate);
+		click(submit);
+		forceWait(3000);
+		return new POBoardPage(driver);
+	}
+
+	//通知装柜
+	public POBoardPage noticeLoad(){
+		click(noticeLoad);
+		jsExecutorRemoveAttribute(inutLoadDate,"readonly");
+		String date = getDateTimeByFormat(new Date(),"MM/dd/yyyy");
+		sendKeys(inutLoadDate,date);
+		click(loadDate);
+		forceWait(3000);
+		click(submit);
+		forceWait(2000);
+		return new POBoardPage(driver);
+	}
 }
@@ -33,6 +33,18 @@ public class PODocumentaryListPage extends BasePage {
 	@FindBy (xpath = "//*[@id='listView']/div/table/tbody/tr[1]/td/div/div[1]/div/ul/li[1]/a")
 	WebElement detail;//搜索结果中的一个查看详情
  
+	// 关键字查询
+	@FindBy (xpath = "//*[contains(@placeholder,'请输入PO单号、客户编号等关键字查询')]")
+	WebElement keySearch;
+
+	// 放大镜查询按钮
+	@FindBy (xpath = "//*[contains(@ng-click,'search()')]")
+	WebElement magnifierSearch;
+
+	// 查看详情
+	@FindBy (xpath = "//*[contains(text(),'查看详情')]")
+	WebElement followDetail;
+
 	/*
 	 * 页面方法
 	 */
@@ -45,4 +57,19 @@ public class PODocumentaryListPage extends BasePage {
 		click(detail);
 		return new POBoardPage(driver);
 	}
+
+	/**
+	 * 进入PO跟单详情
+	 * @return
+	 */
+	public PODocumentaryListPage toPoFollowDetail(){
+		sendKeys(keySearch, Model.getPoNum());
+		click(magnifierSearch);
+		forceWait(5000);
+		dynamicWait(By.xpath("//div[@class='row xxrow-header-bg row-border-bottom no-margin padding-horizontal-5']"));
+		click(followDetail);
+		forceWait(5000);
+		dynamicWait(By.xpath("//div[@class='panel-body']"));
+		return new PODocumentaryListPage(driver);
+	}
 }
 package com.essa.testSuite;
  
 import com.essa.pageObject.BaseTest;
+import com.essa.pageObject.HomePage;
+import com.essa.pageObject.PODocumentary.POBoardPage;
+import com.essa.pageObject.PODocumentary.PODocumentaryListPage;
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.support.PageFactory;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -22,11 +26,18 @@ public class TestNoticeReceiveAndLoad extends BaseTest{
     }
  
     /**
-     * 通知收货和通知装柜
+     * 通知收货、装柜
      */
-    @Test(description = "通知收货和通知装柜")
+    @Test(description = "通知收货、装柜")
     public void NoticeReceiveAndLoad(){
         this.driver = getDriver();
-
+        HomePage homePage = PageFactory.initElements(driver,HomePage.class);
+        homePage.toPoDocumentaryListPage();
+        PODocumentaryListPage poDocumentaryListPage = PageFactory.initElements(driver,PODocumentaryListPage.class);
+        POBoardPage poBoardPage = PageFactory.initElements(driver,POBoardPage.class);
+        poDocumentaryListPage.toPoFollowDetail();
+        poBoardPage.noticeReceive();
+        poBoardPage.noticeLoad();
     }
+
 }