From d7f15c1c569886017a8198f780d44c9363397bab Mon Sep 17 00:00:00 2001 From: zengjin Date: Wed, 31 Oct 2018 15:09:31 +0800 Subject: [PATCH] 提交并且覆盖之前的 --- src/main/java/com/buyer/testSuite/TestAddToCart.java | 3 --- src/main/java/com/essa/framework/EnvEnum.java | 2 +- src/main/java/com/essa/framework/Model.java | 8 ++++---- src/main/java/com/essa/pageObject/DocumentaryManage/BillingCenterPage.java | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/main/java/com/essa/pageObject/DocumentaryManage/POBoardPage.java | 4 ++-- src/main/java/com/essa/pageObject/DocumentaryManage/PODocumentaryListPage.java | 8 ++++---- src/main/java/com/essa/pageObject/DocumentaryManage/ReceiptCorePage.java | 19 ++++++++++--------- src/main/java/com/essa/pageObject/HomePage.java | 20 +++++++++++++++++++- src/main/java/com/essa/pageObject/StorageManage/GoodsReceiveTaskPage.java | 17 +++++++++++++++-- src/main/java/com/essa/pageObject/StorageManage/LoadContainerHandlePage.java | 10 +++------- src/main/java/com/essa/pageObject/StorageManage/LoadContainerManagePage.java | 10 +++++++--- src/main/java/com/essa/pageObject/StorageManage/NoticeReceivePage.java | 12 +++++++++--- src/main/java/com/essa/pageObject/StorageManage/ReceiveTaskDealPage.java | 4 +++- src/main/java/com/essa/pageObject/inquiryManage/ProductInquiryTaskPage.java | 2 ++ src/main/java/com/essa/pageObject/needDealt/NeedDealtApplyPage.java | 7 ++++--- src/main/java/com/essa/testSuite/TestLoadContainer.java | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/main/java/com/essa/testSuite/TestNoticeReceiveAndLoad.java | 61 ------------------------------------------------------------- src/main/java/com/essa/testSuite/TestReceiptCore.java | 4 ++-- src/main/java/com/essa/testSuite/TestShippingMark.java | 6 ++---- src/main/java/com/essa/testSuite/TestTail.java | 86 -------------------------------------------------------------------------------------- src/main/java/swing/SwingMain.java | 23 ++--------------------- src/main/resources/suites/LoadContainer.xml | 43 +++++++++++++++++++++++++++++++++++++++++++ src/main/resources/suites/sendPO.xml | 9 +++++++++ 23 files changed, 437 insertions(+), 217 deletions(-) create mode 100644 src/main/java/com/essa/pageObject/DocumentaryManage/BillingCenterPage.java create mode 100644 src/main/java/com/essa/testSuite/TestLoadContainer.java delete mode 100644 src/main/java/com/essa/testSuite/TestNoticeReceiveAndLoad.java delete mode 100644 src/main/java/com/essa/testSuite/TestTail.java create mode 100644 src/main/resources/suites/LoadContainer.xml diff --git a/src/main/java/com/buyer/testSuite/TestAddToCart.java b/src/main/java/com/buyer/testSuite/TestAddToCart.java index c9076f1..d4d4f9c 100644 --- a/src/main/java/com/buyer/testSuite/TestAddToCart.java +++ b/src/main/java/com/buyer/testSuite/TestAddToCart.java @@ -24,9 +24,6 @@ public class TestAddToCart extends BaseTest { public void setUp() { initBuyer(); loginBuyerValid(Model.getBuyerAccount(),Model.getBuyerPassword()); -// loginBuyerValid("buyer51551@essa.cn","essa123"); -// Model.setIsactivity(1); -// Model.setSkuNo(""); } @AfterClass public void tearDown() { diff --git a/src/main/java/com/essa/framework/EnvEnum.java b/src/main/java/com/essa/framework/EnvEnum.java index 382ca76..49969bd 100644 --- a/src/main/java/com/essa/framework/EnvEnum.java +++ b/src/main/java/com/essa/framework/EnvEnum.java @@ -8,10 +8,10 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; public enum EnvEnum { + SIT("sit","SIT"), DIT("dit","DIT"), HOTFIX("hotfix","HOTFIX"), UAT("uat","UAT"), - SIT("sit","SIT"), EPD("epd","EPD"); /** diff --git a/src/main/java/com/essa/framework/Model.java b/src/main/java/com/essa/framework/Model.java index 8dc9730..05a478f 100644 --- a/src/main/java/com/essa/framework/Model.java +++ b/src/main/java/com/essa/framework/Model.java @@ -13,12 +13,12 @@ public class Model { public static String email = "buyer"+Tools.getTime()+"@essa.cn";//采购商邮箱 public static String invateCode;//邀请码 public static String env;//所选环境 - public static String buyerAccount;//采购商账号 - public static String buyerPassword;//采购商密码 - public static String poNum;//po单号 + public static String buyerAccount="meng18@essa.cn";//采购商账号 + public static String buyerPassword="essa123";//采购商密码 + public static String poNum="A181115T9194I";//po单号 public static int isactivity=0;//是否是活动商品 1：是 0：否 public static String manager;//商品的类目经理 - public static String serialNum;//待办流水号 + public static String serialNum="RW2018060800058";//待办流水号 public static String materialName;//物料名称 public static String projectName;//项目立项书名称 diff --git a/src/main/java/com/essa/pageObject/DocumentaryManage/BillingCenterPage.java b/src/main/java/com/essa/pageObject/DocumentaryManage/BillingCenterPage.java new file mode 100644 index 0000000..cd8a43c --- /dev/null +++ b/src/main/java/com/essa/pageObject/DocumentaryManage/BillingCenterPage.java @@ -0,0 +1,161 @@ +package com.essa.pageObject.DocumentaryManage; + +import com.essa.framework.BasePage; +import com.essa.framework.Model; +import com.essa.pageObject.HomePage; +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; +import org.testng.asserts.SoftAssert; + +/** +* @Description: 发单中心页面 +* @Author: ZengJin +* @CreateTime: 2018/10/31 +*/ +public class BillingCenterPage extends BasePage { + /** + * 构造方法 + * + * @param driver + */ + public BillingCenterPage(WebDriver driver) { + super(driver); + } + /** + * 元素定位 + */ + @FindBy (xpath = "//*[@ng-model='query.params.keyword']") + WebElement keyword;//关键字搜索框 + + @FindBy (xpath = "//*[text()='高级查询']") + WebElement advancedSearch;//高级查询 + + @FindBy (xpath = "//*[@ng-model='query.params.poCode']") + WebElement PONum;//根据PO单号查询 + + @FindBy (xpath = "//*[@ng-click='richSearch()']") + WebElement search;//高级查询：查询按钮 + + @FindBy (xpath = "//*[text()='开始发单']") + WebElement send;//开始发单按钮 + + @FindBy (xpath = "//*[text()='登记接单']") + WebElement accept;//登记接单按钮 + + @FindBy (xpath = "//tbody//tr[1]/td[1]") + WebElement firstFo;//第一个FO单编号 + + @FindBy (xpath = "//tbody//tr[1]/td[3]") + WebElement status;//第一个FO单发单状态 + + @FindBy (xpath = "//*[@ng-model='scanValue']") + WebElement FOKeyword;//弹框里的FO单号查询输入框 + + @FindBy (xpath = "//*[@ng-click='clickBtn()']") + WebElement FOSearch;//FO查询搜索框 + + @FindBy (xpath = "//*[@ng-click='sendBill()']") + WebElement sendBill;//开始发单按钮 + + @FindBy (xpath = "//*[@ng-click='acceptBill()']") + WebElement acceptBill;//接单完成 + + @FindBy (xpath = "//div[@class='left ng-scope']//span[2]") + WebElement total;//一共有多少个FO单 + + @FindBy (xpath = "//button[contains(text(),'50')]") + WebElement show50;//分页展示50个 + + /** + * 页面方法 + */ + /** + *单个Fo单的发单方法 + * @param + * @return homePage + */ + public HomePage Billing(){ + forceWait(2000); + sendKeys(keyword,"程序仍在进行，等待页面加载完成中……"); + forceWait(4000); + dynamicLoad(By.xpath("//*[text()='对不起！没有查询到相关数据。']")); + clear(keyword); + click(advancedSearch); + sendKeys(PONum,Model.getPoNum()); + click(search); + dynamicLoad(); + String FO = firstFo.getText(); + click(send); + sendKeys(FOKeyword,FO); + click(FOSearch); + forceWait(500); + click(sendBill); + forceWait(500); + SoftAssert softAssert = new SoftAssert(); + softAssert.assertEquals(status.getText(),"发单中","发单失败！"); + click(accept); + sendKeys(FOKeyword,FO); + click(FOSearch); + forceWait(500); + click(acceptBill); + forceWait(500); + softAssert.assertEquals(status.getText(),"已接单","接单失败！"); + softAssert.assertAll(); + return new HomePage(driver); + } + /** + *多个FO单时的发单 + * @param + * @return + */ + public HomePage MoreBilling(){ + forceWait(2000); + sendKeys(keyword,"程序仍在进行，等待页面加载完成中……"); + forceWait(4000); + dynamicLoad(By.xpath("//*[text()='对不起！没有查询到相关数据。']")); + clear(keyword); + click(advancedSearch); + sendKeys(PONum,Model.getPoNum()); + click(search); + dynamicLoad(); + int totalNum = Integer.parseInt(total.getText());//根据分页获取FO单总数 + if (totalNum>10){ + click(show50); + forceWait(1000); + } + for(int i=1;i<=totalNum;i++){ + WebElement FOs = driver.findElement(By.xpath("//tbody//tr["+i+"]/td[1]"));//获取Fo单号 + WebElement FoStatus = driver.findElement(By.xpath("//tbody//tr["+i+"]/td[3]"));//当前FO单状态 + String FO = FOs.getText(); + switch (FoStatus.getText()){ + case "制单中" : + click(send); + sendKeys(FOKeyword,FO); + click(FOSearch); + forceWait(500); + click(sendBill); + forceWait(500); + click(accept); + sendKeys(FOKeyword,FO); + click(FOSearch); + forceWait(500); + click(acceptBill); + forceWait(500); + break; + case "发单中" : + click(accept); + sendKeys(FOKeyword,FO); + click(FOSearch); + forceWait(500); + click(acceptBill); + forceWait(500); + break; + default : + break; + } + } + return new HomePage(driver); + } +} diff --git a/src/main/java/com/essa/pageObject/DocumentaryManage/POBoardPage.java b/src/main/java/com/essa/pageObject/DocumentaryManage/POBoardPage.java index bf3eb22..2c2716b 100644 --- a/src/main/java/com/essa/pageObject/DocumentaryManage/POBoardPage.java +++ b/src/main/java/com/essa/pageObject/DocumentaryManage/POBoardPage.java @@ -107,9 +107,9 @@ public class POBoardPage extends BasePage { String date = getDateTimeByFormat(new Date(),"MM/dd/yyyy"); sendKeys(inutLoadDate,date); click(loadDate); - forceWait(3000); + forceWait(1000); click(submit); - forceWait(2000); +// forceWait(2000); return new POBoardPage(driver); } diff --git a/src/main/java/com/essa/pageObject/DocumentaryManage/PODocumentaryListPage.java b/src/main/java/com/essa/pageObject/DocumentaryManage/PODocumentaryListPage.java index 73cf69a..56e9de0 100644 --- a/src/main/java/com/essa/pageObject/DocumentaryManage/PODocumentaryListPage.java +++ b/src/main/java/com/essa/pageObject/DocumentaryManage/PODocumentaryListPage.java @@ -63,13 +63,13 @@ public class PODocumentaryListPage extends BasePage { * @return */ public PODocumentaryListPage toPoFollowDetail(){ + forceWait(1000); sendKeys(keySearch, Model.getPoNum()); click(magnifierSearch); - forceWait(8000); - dynamicWait(By.xpath("//div[@class='row xxrow-header-bg row-border-bottom no-margin padding-horizontal-5']")); + dynamicLoad(); click(followDetail); - forceWait(8000); - dynamicWait(By.xpath("//div[@class='panel-body']")); + forceWait(3000); + dynamicLoad(); return new PODocumentaryListPage(driver); } } diff --git a/src/main/java/com/essa/pageObject/DocumentaryManage/ReceiptCorePage.java b/src/main/java/com/essa/pageObject/DocumentaryManage/ReceiptCorePage.java index be7e09b..c269236 100644 --- a/src/main/java/com/essa/pageObject/DocumentaryManage/ReceiptCorePage.java +++ b/src/main/java/com/essa/pageObject/DocumentaryManage/ReceiptCorePage.java @@ -1,6 +1,7 @@ package com.essa.pageObject.DocumentaryManage; import com.essa.framework.BasePage; +import com.essa.framework.Model; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; @@ -97,15 +98,15 @@ public class ReceiptCorePage extends BasePage { * 前台发单中心页面 */ - public void BillOrder(String PO_Code) { + public void BillOrder() { dynamicWait(By.xpath("//tbody//tr[1]")); click(advancedQuery); - forceWait(1000); +// forceWait(1000); - sendKeys(PO_numbers,PO_Code); - forceWait(1000); + sendKeys(PO_numbers, Model.getPoNum()); +// forceWait(1000); click(Query); // forceWait(3000); @@ -115,20 +116,20 @@ public class ReceiptCorePage extends BasePage { // actionDoubleClick(document_code); // 双击元素 // forceWait(1000); String Fo = document_code.getText(); - forceWait(1000); +// forceWait(1000); click(start_billing); forceWait(1000); sendKeys(input_document_code,Fo); - forceWait(1000); +// forceWait(1000); click(search); - forceWait(1000); + forceWait(500); click(start_billing_1); - forceWait(1000); +// forceWait(1000); // isVisibility(By.xpath("//*[contains(text(),'所选的工厂订单状态必须为“发单中”')]")); - + dynamicLoad(); click(start_billing); forceWait(1000); diff --git a/src/main/java/com/essa/pageObject/HomePage.java b/src/main/java/com/essa/pageObject/HomePage.java index 59d6ca7..06024b4 100644 --- a/src/main/java/com/essa/pageObject/HomePage.java +++ b/src/main/java/com/essa/pageObject/HomePage.java @@ -1,5 +1,6 @@ package com.essa.pageObject; +import com.essa.pageObject.DocumentaryManage.BillingCenterPage; import com.essa.pageObject.DocumentaryManage.POBoardPage; import com.essa.pageObject.DocumentaryManage.ReceiptCorePage; import com.essa.pageObject.GoodsManage.*; @@ -188,6 +189,10 @@ public class HomePage extends BasePage{ @FindBy (xpath = "//a[@name='child.text'][contains(text(),'装柜任务管理')]") WebElement loadContainerTask; + //前台发单中心 + @FindBy (xpath = "//*[text()='前台发单中心']") + WebElement billingCenter; + /* * 方法 @@ -397,6 +402,7 @@ public class HomePage extends BasePage{ * @return PO跟单列表页 */ public PODocumentaryListPage toPoDocumentaryListPage() { + getHome(); click(DocumentaryManage); click(PODocumentary); return new PODocumentaryListPage(driver); @@ -417,6 +423,7 @@ public class HomePage extends BasePage{ * @return 收货任务管理页面 */ public GoodsReceiveTaskPage toGoodsReceiveTaskPage() { + getHome(); click(StorageManage); click(goodsReceiveTask); return new GoodsReceiveTaskPage(driver); @@ -437,10 +444,11 @@ public class HomePage extends BasePage{ * @return 返回装柜任务处理管理页面 */ public NeedDealtApplyPage toLoadContainer(){ + getHome(); click(StorageManage); click(loadContainerTask); dynamicWait(By.xpath("//div[@class='loading ng-scope']")); - forceWait(3000); +// forceWait(3000); return new NeedDealtApplyPage(driver); } @@ -508,4 +516,14 @@ public class HomePage extends BasePage{ click(quiryProject); return new ProjectListPage(driver); } + /** + *进入前台发单中心 + * @param + * @return 前台发单中心页面 + */ + public BillingCenterPage toBillingCenterPage() { + click(DocumentaryManage); + click(billingCenter); + return new BillingCenterPage(driver); + } } \ No newline at end of file diff --git a/src/main/java/com/essa/pageObject/StorageManage/GoodsReceiveTaskPage.java b/src/main/java/com/essa/pageObject/StorageManage/GoodsReceiveTaskPage.java index 79d12df..4a7f6cb 100644 --- a/src/main/java/com/essa/pageObject/StorageManage/GoodsReceiveTaskPage.java +++ b/src/main/java/com/essa/pageObject/StorageManage/GoodsReceiveTaskPage.java @@ -33,6 +33,9 @@ public class GoodsReceiveTaskPage extends BasePage { @FindBy (xpath = "//button[contains(text(),'处理')]") WebElement deal;//处理 + + @FindBy (xpath = "//tbody//tr[1]/td[8]") + WebElement status;//第一个结果的状态 /* * 页面方法 @@ -42,12 +45,22 @@ public class GoodsReceiveTaskPage extends BasePage { * @return PO收货任务处理页 */ public GoodsReceiveTaskPage dealReceive() { - dynamicWait(By.xpath("//tbody/tr[1]")); + forceWait(1000); + dynamicWait(By.xpath("//tbody//tr[1]")); sendKeys(keyword, Model.getPoNum()); click(search); - dynamicWait(By.xpath("//div[@style='display: none;' and @id='mask']")); + dynamicLoad(); click(firstResult); click(deal); return new GoodsReceiveTaskPage(driver); } + /** + *判断是否全部收货完成：true完成，false未完成 + * @param + * @return boolean + */ + public boolean isFinish(){ + forceWait(500); + return status.getText().equals("完成"); + } } diff --git a/src/main/java/com/essa/pageObject/StorageManage/LoadContainerHandlePage.java b/src/main/java/com/essa/pageObject/StorageManage/LoadContainerHandlePage.java index f879592..b9a4aed 100644 --- a/src/main/java/com/essa/pageObject/StorageManage/LoadContainerHandlePage.java +++ b/src/main/java/com/essa/pageObject/StorageManage/LoadContainerHandlePage.java @@ -46,6 +46,7 @@ public class LoadContainerHandlePage extends BasePage { * 页面方法 */ public LoadContainerHandlePage loadTaskHandle(){ + forceWait(1000); jsExecutorRemoveAttribute(actLoadTime,"readonly"); String date = getDateTimeByFormat(new Date(), "MM/dd/yyyy"); sendKeys(actLoadTime,date); @@ -58,13 +59,8 @@ public class LoadContainerHandlePage extends BasePage { // 对计算结果转换成string,并赋值给“实装柜数量” String quantity = String.valueOf(tail); sendKeys(actLoadQuantity,quantity); - forceWait(1000); -// // 上传装柜图片 -// click(actPicture); -// uploadFile(Model.getPicPath()); -// forceWait(1000); -// click(submit); -// forceWait(2000); + click(submit); + dynamicLoad(); return new LoadContainerHandlePage(driver); } } diff --git a/src/main/java/com/essa/pageObject/StorageManage/LoadContainerManagePage.java b/src/main/java/com/essa/pageObject/StorageManage/LoadContainerManagePage.java index 810d27a..4d7b7c6 100644 --- a/src/main/java/com/essa/pageObject/StorageManage/LoadContainerManagePage.java +++ b/src/main/java/com/essa/pageObject/StorageManage/LoadContainerManagePage.java @@ -3,6 +3,7 @@ package com.essa.pageObject.StorageManage; import com.essa.framework.BasePage; import com.essa.framework.Model; import net.bytebuddy.asm.Advice; +import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; @@ -39,12 +40,15 @@ public class LoadContainerManagePage extends BasePage { * @return */ public LoadContainerManagePage toLoadContainerDetail() { + forceWait(1000); + dynamicLoad(By.xpath("//div[@style='display: none;' and @id='mask']")); sendKeys(inputKeySearch, Model.getPoNum()); - forceWait(5000); +// forceWait(5000); click(keySearch); - forceWait(2000); +// forceWait(2000); + dynamicLoad(); click(firstPO); - forceWait(2000); +// forceWait(2000); click(handle); return new LoadContainerManagePage(driver); } diff --git a/src/main/java/com/essa/pageObject/StorageManage/NoticeReceivePage.java b/src/main/java/com/essa/pageObject/StorageManage/NoticeReceivePage.java index f34856d..aaf3af2 100644 --- a/src/main/java/com/essa/pageObject/StorageManage/NoticeReceivePage.java +++ b/src/main/java/com/essa/pageObject/StorageManage/NoticeReceivePage.java @@ -62,9 +62,15 @@ public class NoticeReceivePage extends BasePage { dynamicWait(By.xpath("//div[@style='display: none;' and @id='mask']")); click(set); forceWait(500); - click(wareHouse); - click(zone); - click(shelf); + jsExecutorClick(wareHouse); + jsExecutorClick(zone); + jsExecutorClick(shelf); +// click(wareHouse); +// forceWait(1000); +// click(zone); +// forceWait(1000); +// click(shelf); +// forceWait(1000); click(confirm); forceWait(1000); click(sysch); diff --git a/src/main/java/com/essa/pageObject/StorageManage/ReceiveTaskDealPage.java b/src/main/java/com/essa/pageObject/StorageManage/ReceiveTaskDealPage.java index 6003716..985fa3e 100644 --- a/src/main/java/com/essa/pageObject/StorageManage/ReceiveTaskDealPage.java +++ b/src/main/java/com/essa/pageObject/StorageManage/ReceiveTaskDealPage.java @@ -33,12 +33,14 @@ public class ReceiveTaskDealPage extends BasePage { */ public GoodsReceiveTaskPage allReceive() { forceWait(1000); - dynamicWait(By.xpath("//div[@style='display: none;' and @id='mask']")); + dynamicLoad(); + moveHeightScroll("0"); click(allReceive); forceWait(500); click(confirm); forceWait(1000); click(confirm); + dynamicLoad(); return new GoodsReceiveTaskPage(driver); } } diff --git a/src/main/java/com/essa/pageObject/inquiryManage/ProductInquiryTaskPage.java b/src/main/java/com/essa/pageObject/inquiryManage/ProductInquiryTaskPage.java index a252036..7031122 100644 --- a/src/main/java/com/essa/pageObject/inquiryManage/ProductInquiryTaskPage.java +++ b/src/main/java/com/essa/pageObject/inquiryManage/ProductInquiryTaskPage.java @@ -57,9 +57,11 @@ public class ProductInquiryTaskPage extends BasePage { */ public ProductInquiryFeedbackPage toFeedback() { // mywait(firstRow); + dynamicWait(By.xpath("//*[@ng-table='tableParams1']/tbody/tr[1]")); click(advancedQuery); sendKeys(skuNoQuery, Model.getSkuNo()); click(search); + forceWait(1000); mywait(firstRow); click(firstRow); click(feedBack); diff --git a/src/main/java/com/essa/pageObject/needDealt/NeedDealtApplyPage.java b/src/main/java/com/essa/pageObject/needDealt/NeedDealtApplyPage.java index 849cf3c..786021b 100644 --- a/src/main/java/com/essa/pageObject/needDealt/NeedDealtApplyPage.java +++ b/src/main/java/com/essa/pageObject/needDealt/NeedDealtApplyPage.java @@ -144,10 +144,10 @@ public class NeedDealtApplyPage extends BasePage { */ public HomePage toClaimShippingMark(){ - mywait(checkpoint); - forceWait(5000); + dynamicWait(By.xpath("//*[contains(text(),'待办工作')]")); + Model.setSerialNum(partialStr(serialNumber.getText(), "流水号：")); if(isVisibility(By.xpath("//*[text()='认领']"))){ - moveHeightScroll("100"); + moveHeightScroll("0"); click(claim); } forceWait(3000); @@ -164,6 +164,7 @@ public class NeedDealtApplyPage extends BasePage { sendKeys(inputShipperArriveDate,"11/10/2018"); //提交 click(submit); + dynamicLoad(); return new HomePage(driver); } diff --git a/src/main/java/com/essa/testSuite/TestLoadContainer.java b/src/main/java/com/essa/testSuite/TestLoadContainer.java new file mode 100644 index 0000000..b559659 --- /dev/null +++ b/src/main/java/com/essa/testSuite/TestLoadContainer.java @@ -0,0 +1,135 @@ +package com.essa.testSuite; + +import com.essa.pageObject.BaseTest; +import com.essa.pageObject.DocumentaryManage.BillingCenterPage; +import com.essa.pageObject.DocumentaryManage.ConvertTailPage; +import com.essa.pageObject.DocumentaryManage.POBoardPage; +import com.essa.pageObject.DocumentaryManage.PODocumentaryListPage; +import com.essa.pageObject.HomePage; +import com.essa.pageObject.StorageManage.GoodsReceiveTaskPage; +import com.essa.pageObject.StorageManage.NoticeReceivePage; +import com.essa.pageObject.StorageManage.ReceiveTaskDealPage; +import com.essa.pageObject.needDealt.NeedDealtApplyPage; +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; +import org.testng.asserts.SoftAssert; + +public class TestLoadContainer extends BaseTest { + WebDriver driver; + + @BeforeClass + public void setUp() { + initsetUp(); + loginValid("zhidanbu"); +// loginValid("chenyijie"); + } + + @AfterClass + public void tearDown() { + driver.quit(); + } + + /** + * 转尾货 + */ + @Test + public void toTail() { + driver = getDriver(); + loginValid("chenyijie"); + HomePage homePage = PageFactory.initElements(driver, HomePage.class); + PODocumentaryListPage poDocumentaryListPage = PageFactory.initElements(driver, PODocumentaryListPage.class); + POBoardPage poBoardPage = PageFactory.initElements(driver, POBoardPage.class); + ConvertTailPage convertTailPage = PageFactory.initElements(driver, ConvertTailPage.class); + homePage.toPoDocumentaryListPage(); + poDocumentaryListPage.todetail(); + poBoardPage.toTail(); + convertTailPage.convertTail(); + } + + /** + * 设置收货、装柜的仓库地址 + */ + @Test + public void noticReceive() { + driver = getDriver(); + HomePage homePage = PageFactory.initElements(driver, HomePage.class); + NoticeReceivePage noticeReceivePage = PageFactory.initElements(driver, NoticeReceivePage.class); + homePage.toNoticeReceivePage(); + noticeReceivePage.setWareHouse(); + } + + /** + * 通知收货、装柜 + */ + @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(); + + //断言：通知收货是否成功 + boolean actualReceive = poBoardPage.isNoticeReceSucceed(); + SoftAssert softAssert = new SoftAssert(); + softAssert.assertEquals(actualReceive,true,"通知收货失败！"); + //通知装柜 + poBoardPage.noticeLoad(); + + //断言：通知装柜是否成功 + boolean actualLoae = poBoardPage.isNoticeLoadSucceed(); + softAssert.assertEquals(actualLoae,true,"通知装柜失败！"); + softAssert.assertAll(); +// homePage.logout(); + } + + /** + * 收货任务管理，处理 + */ + @Test + public void dealWithDelivery() { + driver = getDriver(); + HomePage homePage = PageFactory.initElements(driver, HomePage.class); + GoodsReceiveTaskPage goodsReceiveTaskPage = PageFactory.initElements(driver, GoodsReceiveTaskPage.class); + ReceiveTaskDealPage receiveTaskDealPage = PageFactory.initElements(driver, ReceiveTaskDealPage.class); + homePage.toGoodsReceiveTaskPage(); + while (!goodsReceiveTaskPage.isFinish()) { + goodsReceiveTaskPage.dealReceive(); + receiveTaskDealPage.allReceive(); + } + } + + /** + * 大跟单确认船期 + */ + @Test + public void confirmSailingDate() { + driver = getDriver(); + loginValid("yuwanhang"); + HomePage homePage = PageFactory.initElements(driver, HomePage.class); + NeedDealtApplyPage needDealtApplyPage = PageFactory.initElements(driver, NeedDealtApplyPage.class); + homePage.toSailingDateConfirmPage(); + needDealtApplyPage.confirmSailingDate(); + } + /** + *制单部发单 + * @param + * @return + */ + @Test + public void Billing(){ + this.driver = getDriver(); + HomePage homePage = PageFactory.initElements(driver, HomePage.class); + BillingCenterPage billingCenterPage = PageFactory.initElements(driver,BillingCenterPage.class); + homePage.toBillingCenterPage(); + billingCenterPage.MoreBilling(); + homePage.logout(); + } +} diff --git a/src/main/java/com/essa/testSuite/TestNoticeReceiveAndLoad.java b/src/main/java/com/essa/testSuite/TestNoticeReceiveAndLoad.java deleted file mode 100644 index 0535b16..0000000 --- a/src/main/java/com/essa/testSuite/TestNoticeReceiveAndLoad.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.essa.testSuite; - -import com.essa.pageObject.BaseTest; -import com.essa.pageObject.HomePage; -import com.essa.pageObject.DocumentaryManage.POBoardPage; -import com.essa.pageObject.DocumentaryManage.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; -import org.testng.asserts.SoftAssert; - -public class TestNoticeReceiveAndLoad extends BaseTest{ - - WebDriver driver; - - @BeforeClass - public void setUp(){ - initsetUp(); - loginValid("chenyijie"); - } - - @AfterClass - public void tearDown(){ - driver.quit(); - } - - /** - * 通知收货、装柜 - */ - @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(); - - //断言：通知收货是否成功 - 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(); - homePage.logout(); - } - -} diff --git a/src/main/java/com/essa/testSuite/TestReceiptCore.java b/src/main/java/com/essa/testSuite/TestReceiptCore.java index e08b643..5f4a08a 100644 --- a/src/main/java/com/essa/testSuite/TestReceiptCore.java +++ b/src/main/java/com/essa/testSuite/TestReceiptCore.java @@ -34,9 +34,9 @@ public class TestReceiptCore extends BaseTest { HomePage homePage = PageFactory.initElements(driver,HomePage.class); homePage.toReceiptCore(); ReceiptCorePage receiptCorePage = PageFactory.initElements(driver,ReceiptCorePage.class); - String PO = LinkSQL.SQLQuery(); +// String PO = LinkSQL.SQLQuery(); - receiptCorePage.BillOrder(PO); + receiptCorePage.BillOrder(); SoftAssert softAssert = new SoftAssert(); boolean SucceedElement = receiptCorePage.isSucceed(); diff --git a/src/main/java/com/essa/testSuite/TestShippingMark.java b/src/main/java/com/essa/testSuite/TestShippingMark.java index 9886fa8..752ba99 100644 --- a/src/main/java/com/essa/testSuite/TestShippingMark.java +++ b/src/main/java/com/essa/testSuite/TestShippingMark.java @@ -1,15 +1,14 @@ package com.essa.testSuite; -import com.essa.framework.BasePage; import com.essa.pageObject.BaseTest; import com.essa.pageObject.HomePage; import com.essa.pageObject.needDealt.NeedDealtApplyPage; -import org.openqa.selenium.By; 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; /** * 测试用例：登记备选船期 @@ -32,10 +31,9 @@ public class TestShippingMark extends BaseTest{ /** * 登记备选船期 */ - @org.testng.annotations.Test(description = "登记备选船期待办") + @Test(description = "登记备选船期待办") public void ShippingMarkWait(){ this.driver = getDriver(); - HomePage homePage = PageFactory.initElements(driver,HomePage.class); homePage.toShippingMarkWait(); NeedDealtApplyPage needDealtApplyPage = PageFactory.initElements(driver,NeedDealtApplyPage.class); diff --git a/src/main/java/com/essa/testSuite/TestTail.java b/src/main/java/com/essa/testSuite/TestTail.java deleted file mode 100644 index 5127462..0000000 --- a/src/main/java/com/essa/testSuite/TestTail.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.essa.testSuite; - -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; - -import com.essa.pageObject.BaseTest; -import com.essa.pageObject.HomePage; -import com.essa.pageObject.DocumentaryManage.ConvertTailPage; -import com.essa.pageObject.DocumentaryManage.POBoardPage; -import com.essa.pageObject.DocumentaryManage.PODocumentaryListPage; -import com.essa.pageObject.StorageManage.GoodsReceiveTaskPage; -import com.essa.pageObject.StorageManage.NoticeReceivePage; -import com.essa.pageObject.StorageManage.ReceiveTaskDealPage; -import com.essa.pageObject.needDealt.NeedDealtApplyPage; - -public class TestTail extends BaseTest { - WebDriver driver; - - @BeforeClass - public void setUp() { - initsetUp(); - loginValid("yuwanhang"); - } - - @AfterClass - public void tearDown() { - driver.quit(); - } - - /** - * 转尾货 - */ - @Test - public void testTail() { - driver = getDriver(); - HomePage homePage = PageFactory.initElements(driver, HomePage.class); - PODocumentaryListPage poDocumentaryListPage = PageFactory.initElements(driver, PODocumentaryListPage.class); - POBoardPage poBoardPage = PageFactory.initElements(driver, POBoardPage.class); - ConvertTailPage convertTailPage = PageFactory.initElements(driver, ConvertTailPage.class); - homePage.toPoDocumentaryListPage(); - poDocumentaryListPage.todetail(); - poBoardPage.toTail(); - convertTailPage.convertTail(); - } - - /** - * 设置收货、装柜的仓库地址 - */ - @Test - public void noticReceive() { - driver = getDriver(); - HomePage homePage = PageFactory.initElements(driver, HomePage.class); - NoticeReceivePage noticeReceivePage = PageFactory.initElements(driver, NoticeReceivePage.class); - homePage.toNoticeReceivePage(); - noticeReceivePage.setWareHouse(); - } - - /** - * 收货通知处理 - */ - @Test - public void dealWithDelivery() { - driver = getDriver(); - HomePage homePage = PageFactory.initElements(driver, HomePage.class); - GoodsReceiveTaskPage goodsReceiveTaskPage = PageFactory.initElements(driver, GoodsReceiveTaskPage.class); - ReceiveTaskDealPage receiveTaskDealPage = PageFactory.initElements(driver, ReceiveTaskDealPage.class); - homePage.toGoodsReceiveTaskPage(); - goodsReceiveTaskPage.dealReceive(); - receiveTaskDealPage.allReceive(); - } - - /** - * 大跟单确认船期 - */ - @Test - public void confirmSailingDate() { - driver = getDriver(); - HomePage homePage = PageFactory.initElements(driver, HomePage.class); - NeedDealtApplyPage needDealtApplyPage = PageFactory.initElements(driver, NeedDealtApplyPage.class); - homePage.toSailingDateConfirmPage(); - needDealtApplyPage.confirmSailingDate(); - } -} diff --git a/src/main/java/swing/SwingMain.java b/src/main/java/swing/SwingMain.java index 7514c65..ecf2e8b 100644 --- a/src/main/java/swing/SwingMain.java +++ b/src/main/java/swing/SwingMain.java @@ -240,31 +240,10 @@ public class SwingMain { //场景选择，插入对应的值，并打印在日志上 final JComboBox selectSystem = new JComboBox(); selectSystem.setBounds(102, 51, 114, 20); -// selectSystem.addActionListener(new ActionListener() { -// public void actionPerformed(ActionEvent e) { -// if ("SIT".equals((String) selectSystem.getSelectedItem())) { -// Model.setEnv("SIT"); -// ja.append(getCurrentTime() + "已选择环境：SIT\r\n"); -// } else if ("DIT".equals((String) selectSystem.getSelectedItem())) { -// Model.setEnv("DIT"); -// ja.append(getCurrentTime() + "已选择环境：DIT\r\n"); -// } else if ("HOTFIX".equals((String) selectSystem.getSelectedItem())) { -// Model.setEnv("HOTFIX"); -// ja.append(getCurrentTime() + "已选择环境：HOTFIX\r\n"); -// } else if ("UAT".equals((String) selectSystem.getSelectedItem())) { -// Model.setEnv("UAT"); -// ja.append(getCurrentTime() + "已选择环境：UAT\r\n"); -// } -// } -// }); selectSystem.setFont(new Font("微软雅黑", Font.PLAIN, 14)); for (EnvEnum envEnum : EnvEnum.values()) { selectSystem.addItem(envEnum.getCode()); } - /* selectSystem.addItem("SIT"); - selectSystem.addItem("HOTFIX"); - selectSystem.addItem("UAT"); - selectSystem.addItem("DIT");*/ frmvBy.getContentPane().add(selectSystem); //添加市场商品 @@ -623,6 +602,7 @@ public class SwingMain { case "新增开发商品": Model.setPicPath(picPath.getText()); suites.add(SuitesEnum.ADD_DEV_GOODS.getSuiteName()); + break; } testNG.setTestSuites(suites); testNG.run(); @@ -630,6 +610,7 @@ public class SwingMain { switch (Scene){ default: //默认新增原厂商品 case "新增市场商品": + case "新增开发商品": case "发布团购": no = Model.getSkuNo(); if (no != null) { diff --git a/src/main/resources/suites/LoadContainer.xml b/src/main/resources/suites/LoadContainer.xml new file mode 100644 index 0000000..98db3eb --- /dev/null +++ b/src/main/resources/suites/LoadContainer.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/suites/sendPO.xml b/src/main/resources/suites/sendPO.xml index e5f17ee..e853739 100644 --- a/src/main/resources/suites/sendPO.xml +++ b/src/main/resources/suites/sendPO.xml @@ -21,5 +21,14 @@ + + + + + + + + + -- libgit2 0.21.2