diff --git a/pom.xml b/pom.xml index 43bec79..c2dc74f 100644 --- a/pom.xml +++ b/pom.xml @@ -96,6 +96,17 @@ commons-io 1.3.2 + + + mysql + mysql-connector-java + 6.0.6 + + + org.dbunit + dbunit + 2.5.4 + @@ -107,7 +118,7 @@ - suites/testng.xml + resources/suites/testng.xml diff --git a/resources/chromedriver.exe b/resources/chromedriver.exe new file mode 100644 index 0000000..370e9eb Binary files /dev/null and b/resources/chromedriver.exe differ diff --git a/resources/config.properties b/resources/config.properties new file mode 100644 index 0000000..414e8d8 --- /dev/null +++ b/resources/config.properties @@ -0,0 +1,16 @@ +#browserName=FireFox +#browserName=IE +browserName=Chrome + +SIT=http://bpms.sit.gz.essa +BSIT=http://en.portalsit.cn + +HOTFIX=http://bpms.hotfix.gz.essa +BHOTFIX=http://en.portalhotfix.cn + +UAT=http://bpms.spstoys.com:7291 +BUAT=http://en.spstoys.com:889 + +DIT=http://bpms.dit.gz.essa +BDIT=http://en.portaldit.cn + diff --git a/resources/suites/addOriginalGoods.xml b/resources/suites/addOriginalGoods.xml new file mode 100644 index 0000000..41025ca --- /dev/null +++ b/resources/suites/addOriginalGoods.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/TestConfig/config.properties b/src/main/resources/TestConfig/config.properties deleted file mode 100644 index 414e8d8..0000000 --- a/src/main/resources/TestConfig/config.properties +++ /dev/null @@ -1,16 +0,0 @@ -#browserName=FireFox -#browserName=IE -browserName=Chrome - -SIT=http://bpms.sit.gz.essa -BSIT=http://en.portalsit.cn - -HOTFIX=http://bpms.hotfix.gz.essa -BHOTFIX=http://en.portalhotfix.cn - -UAT=http://bpms.spstoys.com:7291 -BUAT=http://en.spstoys.com:889 - -DIT=http://bpms.dit.gz.essa -BDIT=http://en.portaldit.cn - diff --git a/src/main/resources/chromedriver.exe b/src/main/resources/chromedriver.exe deleted file mode 100644 index 370e9eb..0000000 Binary files a/src/main/resources/chromedriver.exe and /dev/null differ diff --git a/src/test/java/com/essa/framework/BasePage.java b/src/test/java/com/essa/framework/BasePage.java index ebee27c..d2dcb0b 100644 --- a/src/test/java/com/essa/framework/BasePage.java +++ b/src/test/java/com/essa/framework/BasePage.java @@ -7,6 +7,8 @@ import java.awt.event.KeyEvent; import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.sql.Connection; +import java.sql.ResultSet; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -38,6 +40,7 @@ import org.openqa.selenium.support.ui.WebDriverWait; import com.essa.framework.BasePage; import com.essa.framework.LogType; import com.essa.framework.Logger; +import com.mysql.cj.jdbc.PreparedStatement; public class BasePage { @@ -229,21 +232,21 @@ public class BasePage { } /** - * 元素在页面上是否可见 + * 元素在页面上是否可见，不建议用此方法，有时会报错，找不出原因 * @param element * @return boolean */ protected boolean isVisibility(WebElement element) { try { if(ExpectedConditions.visibilityOf(element) != null) { - Logger.Output(LogType.LogTypeName.INFO, "元素在页面上可见：" +partialStr(element.toString(), "xpath:")); + Logger.Output(LogType.LogTypeName.INFO, "元素在页面上可见"); return true; } } catch (NoSuchElementException e) { - Logger.Output(LogType.LogTypeName.ERROR, "无法页面上是否有此元素:"+partialStr(element.toString(), "xpath:")+ e.getMessage()); + Logger.Output(LogType.LogTypeName.ERROR, "无法页面上是否有此元素"); return false; } - Logger.Output(LogType.LogTypeName.INFO, "元素在页面不可见：" +partialStr(element.toString(), "xpath:")); + Logger.Output(LogType.LogTypeName.INFO, "元素在页面不可见"); return false; } @@ -270,16 +273,17 @@ public class BasePage { * 获取元素的文本值 * @param element */ - protected void getText(WebElement element) { + protected String getText(WebElement element) { try { if (element.isEnabled()) { - element.getText(); Logger.Output(LogType.LogTypeName.INFO, "获取当前元素的文本值：" + element.getText()); + return element.getText(); } } catch (Exception e) { Logger.Output(LogType.LogTypeName.ERROR, e.getMessage() + "."); } + return null; } /** @@ -291,7 +295,7 @@ public class BasePage { mywait(element); JavascriptExecutor jsExecutor = (JavascriptExecutor) driver; jsExecutor.executeScript("arguments[0].click();", element); - Logger.Output(LogType.LogTypeName.INFO, "调用JavaScript点击元素：" + element.getText()); + Logger.Output(LogType.LogTypeName.INFO, "调用JavaScript点击元素：" + partialStr(element.toString(), "xpath:")); } catch (Exception e) { Logger.Output(LogType.LogTypeName.ERROR, e.getMessage() + "."); } @@ -625,6 +629,35 @@ public class BasePage { Logger.Output(LogType.LogTypeName.ERROR, "强行等待失败"); } } + /** + * 动态等待，如果元素不存在，等待一秒直到元素出现 + * @param by + */ + protected void dynamicWait(By by) { + while (!(isVisibility(by))) { + forceWait(1000); + } + } + /** + * 连接数据库查询数据 + * @param sql 查询sql + * @param field 需要的字段，这个方法只支持一个字段查询 + * @return 返回字段值 + */ + protected String DBSqlSearch(String sql,String field) { + try { + Connection conn = DButil.getCon(); + PreparedStatement pstmt = (PreparedStatement) conn.prepareStatement(sql); + ResultSet rs = pstmt.executeQuery(); + while (rs.next()) { + return rs.getString(field); + } + DButil.close(rs, pstmt, conn); + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } /** * 获取当前系统时间，得到格式化时间字符串 diff --git a/src/test/java/com/essa/framework/BrowserEngine.java b/src/test/java/com/essa/framework/BrowserEngine.java index d8faa6f..8a1557a 100644 --- a/src/test/java/com/essa/framework/BrowserEngine.java +++ b/src/test/java/com/essa/framework/BrowserEngine.java @@ -9,7 +9,6 @@ import java.util.concurrent.TimeUnit; import org.openqa.selenium.WebDriver; import org.openqa.selenium.chrome.ChromeDriver; import org.openqa.selenium.firefox.FirefoxDriver; -import org.openqa.selenium.firefox.FirefoxProfile; import org.openqa.selenium.ie.InternetExplorerDriver; import org.openqa.selenium.remote.CapabilityType; import org.openqa.selenium.remote.DesiredCapabilities; @@ -20,33 +19,31 @@ public class BrowserEngine { private String serverURL; private String buyerURL; private static WebDriver driver; - private static String env; + private static String env1; public void initConfigData() throws IOException{ - Properties p = new Properties(); // 加载配置文件 -// InputStream ips = new FileInputStream(".\\src\\main\\resources\\TestConfig\\config.properties"); - InputStream ips = new FileInputStream(".\\config.properties"); + InputStream ips = new FileInputStream(".\\resources\\config.properties"); p.load(ips); - Logger.Output(LogType.LogTypeName.INFO, "开始从配置文件中选择浏览器"); -// browserName=p.getProperty("browserName");//使用jframe要注释 + browserName=p.getProperty("browserName");//使用jframe要注释 Logger.Output(LogType.LogTypeName.INFO, "所选择的浏览器类型为: "+ browserName); - if (env=="DIT") { + if (env1=="DIT") { serverURL = p.getProperty("DIT"); buyerURL = p.getProperty("BDIT"); - }else if (env =="HOTFIX") { + }else if (env1 =="HOTFIX") { serverURL = p.getProperty("HOTFIX"); buyerURL = p.getProperty("BHOTFIX"); - }else if (env == "UAT") { + }else if (env1 == "UAT") { serverURL = p.getProperty("UAT"); buyerURL = p.getProperty("BUAT"); }else { serverURL = p.getProperty("SIT"); buyerURL = p.getProperty("BSIT"); } - Logger.Output(LogType.LogTypeName.INFO, "所测试的环境为："+ env); + Logger.Output(LogType.LogTypeName.INFO, "所测试的环境为："+ env1); + Model.setEnv(env1);//我也不知道为什么执行完上面的代码后，env会变为sit ips.close(); } /** @@ -56,7 +53,7 @@ public class BrowserEngine { */ public static void setInit(String environment,String browser) { browserName = browser; - env = environment; + env1 = environment; } /** @@ -66,20 +63,15 @@ public class BrowserEngine { public WebDriver getBrowser(){ if(browserName.equalsIgnoreCase("Firefox")){ - - System.setProperty("webdriver.gecko.driver", ".\\src\\main\\resources\\geckodriver.exe"); - driver = createFireFoxDriver(); + System.setProperty("webdriver.gecko.driver", ".\\resources\\geckodriver.exe"); + driver = new FirefoxDriver(); Logger.Output(LogType.LogTypeName.INFO, "正在启动FireFox浏览器"); - } else if(browserName.equals("Chrome")){ -// System.setProperty("webdriver.chrome.driver", ".\\src\\main\\resources\\chromedriver.exe"); - System.setProperty("webdriver.chrome.driver", ".\\chromedriver.exe"); + System.setProperty("webdriver.chrome.driver", ".\\resources\\chromedriver.exe"); //图形界面 driver= new ChromeDriver(); Logger.Output(LogType.LogTypeName.INFO, "正在启动Chrome浏览器"); - }else if(browserName.equalsIgnoreCase("IE")){ - System.setProperty("webdriver.ie.driver", ".\\src\\main\resources\\IEDriverServer.exe"); driver= new InternetExplorerDriver(); Logger.Output(LogType.LogTypeName.INFO, "正在启动IE浏览器"); @@ -98,10 +90,13 @@ public class BrowserEngine { */ public WebDriver buyerGetBrowser() { if (browserName.equals("Chrome")) { -// System.setProperty("webdriver.chrome.driver", ".\\src\\main\\resources\\chromedriver.exe"); - System.setProperty("webdriver.chrome.driver", ".\\chromedriver.exe"); + System.setProperty("webdriver.chrome.driver", ".\\resources\\chromedriver.exe"); //图形界面 driver= new ChromeDriver(); Logger.Output(LogType.LogTypeName.INFO, "正在启动Chrome浏览器"); + }else if (browserName.equals("Firefox")) { + System.setProperty("webdriver.gecko.driver", ".\\resources\\geckodriver.exe"); + driver = new FirefoxDriver(); + Logger.Output(LogType.LogTypeName.INFO, "正在启动FireFox浏览器"); } driver.manage().window().maximize(); Logger.Output(LogType.LogTypeName.INFO, "窗口最大化"); @@ -111,51 +106,29 @@ public class BrowserEngine { return driver; } - /* - * 关闭浏览器并退出方法 - */ + /** + * 退出驱动 + * @throws InterruptedException + */ public void tearDown() throws InterruptedException{ - Logger.Output(LogType.LogTypeName.INFO, "关闭浏览器"); driver.quit(); Thread.sleep(3000); } - /* + /** * 隐式时间等待方法 - */ + * @param time + */ public void callWait(int time){ driver.manage().timeouts().implicitlyWait(time, TimeUnit.SECONDS); Logger.Output(LogType.LogTypeName.INFO, "设置隐性等待"+time+" 秒"); } - - - /* - * createFireFox Driver - * @Param: null - * @return: WebDriver - */ - - private WebDriver createFireFoxDriver() { - - WebDriver driver = null; - FirefoxProfile firefoxProfile = new FirefoxProfile(); - - firefoxProfile.setPreference("prefs.converted-to-utf8", true); - //set download folder to default folder: TestDownload - firefoxProfile.setPreference("browser.download.folderList", 2); - firefoxProfile.setPreference("browser.download.dir", ".\\TestDownload"); - - try { - driver = new FirefoxDriver(); - } catch (Exception e) { - Logger.Output(LogType.LogTypeName.ERROR, e.getMessage()); - Logger.Output(LogType.LogTypeName.ERROR, "Failed to initilize the Firefox driver"); - } - return driver; - } + /** + *跳过安全链接 + */ public void anQuan() { // 创建DesiredCapabilities类的一个对象实例 DesiredCapabilities cap=DesiredCapabilities.chrome(); diff --git a/src/test/java/com/essa/framework/Logger.java b/src/test/java/com/essa/framework/Logger.java index f2885df..0ea0352 100644 --- a/src/test/java/com/essa/framework/Logger.java +++ b/src/test/java/com/essa/framework/Logger.java @@ -8,8 +8,6 @@ import java.util.Date; import com.essa.framework.LogType; -import demo.firstDemo; - public class Logger { public static String OutputFileName = getDateTimeByFormat(new Date(), "yyyyMMdd"); @@ -58,8 +56,7 @@ public class Logger { } public static void Output(LogType.LogTypeName logTypeName, String logMessage) { - firstDemo aa = new firstDemo(); - Date date = new Date(); + Date date = new Date(); String logTime = getDateTimeByFormat(date, "yyyy-MM-dd HH:mm:ss.SSS"); String logEntry = logTime + " " + logTypeName.name() + ": " + logMessage + "\r\n"; System.out.print(logEntry); diff --git a/src/test/java/com/essa/pageObject/BaseTest.java b/src/test/java/com/essa/pageObject/BaseTest.java index 30b12c5..1eda704 100644 --- a/src/test/java/com/essa/pageObject/BaseTest.java +++ b/src/test/java/com/essa/pageObject/BaseTest.java @@ -4,9 +4,16 @@ import java.io.IOException; import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.PageFactory; + +import com.buyer.pageObject.BuyerLoginPage; +import com.buyer.pageObject.IndexPage; import com.essa.framework.BrowserEngine; import com.essa.pageObject.LoginPage; +/** + * @author Administrator + *测试用例的基类，主要是有登录和调用浏览器的方法 + */ public class BaseTest { public WebDriver driver; @@ -48,5 +55,15 @@ public class BaseTest { LoginPage loginPage = PageFactory.initElements(driver, LoginPage.class); loginPage.login(account, "essa123"); } + /** + * buyer初始化登录 + * @param account + */ + public void loginBuyerValid(String account,String password) { + IndexPage indexPage = PageFactory.initElements(driver, IndexPage.class); + indexPage.toLoginPage(); + BuyerLoginPage loginPage = PageFactory.initElements(driver, BuyerLoginPage.class); + loginPage.login(account, password); + } } diff --git a/src/test/java/com/essa/pageObject/HomePage.java b/src/test/java/com/essa/pageObject/HomePage.java index ea3e92a..f344a60 100644 --- a/src/test/java/com/essa/pageObject/HomePage.java +++ b/src/test/java/com/essa/pageObject/HomePage.java @@ -11,9 +11,15 @@ import com.essa.pageObject.GoodsManage.GoodsBankPage; import com.essa.pageObject.GoodsManage.GoodsRelesePage; import com.essa.pageObject.GoodsManage.MarketGoodsRelesePage; import com.essa.pageObject.buyPlaneManage.SkuCategoryManagerCongfigPage; +import com.essa.pageObject.buyerManage.InvateCodePage; +import com.essa.pageObject.inquiryManage.ProductInquiryTask; import com.essa.pageObject.marketingManage.GroupControlPage; import com.essa.pageObject.marketingManage.GroupSettingPage; +/** + * @author Administrator + *bpms后台首页 + */ public class HomePage extends BasePage{ public HomePage(WebDriver driver) { super(driver); @@ -91,13 +97,43 @@ public class HomePage extends BasePage{ @FindBy (xpath="//*[text()='团购控制']/..") WebElement groupControl; + //采购商管理 + @FindBy (xpath="//*[text()='采购商管理']") + WebElement buyerManage; + + //生成邀请码 + @FindBy (xpath="//*[text()='生成邀请码']" ) + WebElement inviteCode; + + //询价管理 + @FindBy (xpath ="//span[text()='询价管理']") + WebElement inquiryManage; + + //成品询价任务列表 + @FindBy (xpath = "//*[text()='成品询价任务列表']") + WebElement productInquiryTask; + + //产品开发 + @FindBy (xpath ="//*[text()='产品开发']") + WebElement productDev; + + //项目立项书新增 + @FindBy (xpath ="//*[text()='项目立项书新增']") + WebElement addProject; + + //项目立项书查询 + @FindBy (xpath ="//*[text()='项目立项书查询']") + WebElement quiryProject; + + + /* * 方法 */ /** * 进入运营跟进管理页面 - * @return + * @return SupplierOperationsTrackPage */ public SupplierOperationsTrackPage goToSupplierOperationsTrack() { @@ -114,7 +150,7 @@ public class HomePage extends BasePage{ /** * 进入原厂商品发布 - * @return + * @return AddOriginalGoodsPage */ public AddOriginalGoodsPage tOriginalGoodsPage() { click(goodsManage); @@ -125,7 +161,7 @@ public class HomePage extends BasePage{ /** * 进入商品发布管理 - * @return + * @return GoodsRelesePage */ public GoodsRelesePage tGoodsRelesePage() { click(goodsManage); @@ -135,7 +171,7 @@ public class HomePage extends BasePage{ /** * 进入原厂商品发布审核 - * @return + * @return AuditOriginalGoodsPage */ public AuditOriginalGoodsPage toAuditOriginalGoodsPage() { mywait(logout); @@ -146,7 +182,7 @@ public class HomePage extends BasePage{ /** * 进入商品库 - * @return + * @return GoodsBankPage */ public GoodsBankPage toGoodsBankPage() { click(goodsManage); @@ -156,7 +192,7 @@ public class HomePage extends BasePage{ /** * 进入市场商品发布 - * @return + * @return MarketGoodsRelesePage */ public MarketGoodsRelesePage toMarketGoodsRelesePage() { click(goodsManage); @@ -164,8 +200,8 @@ public class HomePage extends BasePage{ return new MarketGoodsRelesePage(driver); } /** - * 进入市场商品发布审核 - * @return + * 进入市场商品发布审核 + * @return AuditMarketGoodsPage */ public AuditMarketGoodsPage toAuditMarketGoodsPage() { click(goodsManage); @@ -174,7 +210,7 @@ public class HomePage extends BasePage{ } /** * 进入商品类目经理分配配置 - * @return + * @return SkuCategoryManagerCongfigPage */ public SkuCategoryManagerCongfigPage toSkuCategoryManagerCongfig() { mywait(logout); @@ -184,7 +220,7 @@ public class HomePage extends BasePage{ } /** * 进入团购设置 - * @return + * @return GroupSettingPage */ public GroupSettingPage toGroupSettingPage() { getHome(); @@ -194,27 +230,50 @@ public class HomePage extends BasePage{ } /** * 进入团购控制 - * @return + * @return GroupControlPage */ public GroupControlPage toGroupControlPage() { // getHome(); + jsExecutorClick(essaIcon); click(marketingManage); click(groupControl); return new GroupControlPage(driver); } - //判断是否存在退出按钮 + /** + * 进入生成邀请码 + * @return InvateCodePage + */ + public InvateCodePage toInvateCodePage() { + click(buyerManage); + moveHeightScroll("100"); + click(inviteCode); + return new InvateCodePage(driver); + } + /** + * 进入成品询价任务列表 + * @return ProductInquiryTask + */ + public ProductInquiryTask toProductInquiryTask() { + click(inquiryManage); + click(productInquiryTask); + return new ProductInquiryTask(driver); + } + + + /** + * 判断是否进入后台首页 + * @return boolean + */ public boolean isSucceed() { - - //判断退出按钮是否存在，存在则表示成功进入首页 return isThisPage("退出", logout); - } - //判断是否选中“供应商管理” + /** + * 判断是否选中“供应商管理” + * @return + */ public boolean isSearchSuppliers() { - return isElementExist(searchSuppliers); - } /** @@ -225,10 +284,10 @@ public class HomePage extends BasePage{ jsExecutorClick(essaIcon); forceWait(1000); } - //退出登录 + /** + * 退出登录 + */ public void logout() { - click(logout); - } } \ No newline at end of file diff --git a/src/test/java/com/essa/pageObject/LoginPage.java b/src/test/java/com/essa/pageObject/LoginPage.java index e680844..5889d58 100644 --- a/src/test/java/com/essa/pageObject/LoginPage.java +++ b/src/test/java/com/essa/pageObject/LoginPage.java @@ -6,11 +6,14 @@ import org.openqa.selenium.support.FindBy; import com.essa.framework.BasePage; +/** + * @author Administrator + *bpms登录页 + */ public class LoginPage extends BasePage{ public LoginPage(WebDriver driver) { super(driver); - // TODO Auto-generated constructor stub } /* @@ -33,21 +36,19 @@ public class LoginPage extends BasePage{ * 页面方法 */ - /* + /** * 1.输入帐号 * 2.输入密码 * 3.点击登录 * 4.将driver返回 + * @param account + * @param password + * @return HomePage */ public HomePage login(String account,String password) { - sendKeys(login_account, account); - sendKeys(login_password, password); - click(login_submit); - return new HomePage(driver); - } } diff --git a/src/test/java/com/essa/testSuite/TestLogin.java b/src/test/java/com/essa/testSuite/TestLogin.java index 5833093..1ed4d57 100644 --- a/src/test/java/com/essa/testSuite/TestLogin.java +++ b/src/test/java/com/essa/testSuite/TestLogin.java @@ -14,6 +14,10 @@ import com.essa.framework.BrowserEngine; import com.essa.pageObject.HomePage; import com.essa.pageObject.LoginPage; +/** + * @author Administrator + *测试用例：登录测试 + */ public class TestLogin { WebDriver driver; diff --git a/suites/addOriginalGoods.xml b/suites/addOriginalGoods.xml deleted file mode 100644 index 41025ca..0000000 --- a/suites/addOriginalGoods.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/classes/META-INF/maven/com.essatest/essa/pom.properties b/target/classes/META-INF/maven/com.essatest/essa/pom.properties index c5677d8..8985f72 100644 --- a/target/classes/META-INF/maven/com.essatest/essa/pom.properties +++ b/target/classes/META-INF/maven/com.essatest/essa/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven Integration for Eclipse -#Sat Aug 18 18:12:23 CST 2018 +#Thu Aug 30 10:15:43 CST 2018 m2e.projectLocation=D\:\\workspace\\demo m2e.projectName=demo groupId=com.essatest diff --git a/target/classes/META-INF/maven/com.essatest/essa/pom.xml b/target/classes/META-INF/maven/com.essatest/essa/pom.xml index 43bec79..c2dc74f 100644 --- a/target/classes/META-INF/maven/com.essatest/essa/pom.xml +++ b/target/classes/META-INF/maven/com.essatest/essa/pom.xml @@ -96,6 +96,17 @@ commons-io 1.3.2 + + + mysql + mysql-connector-java + 6.0.6 + + + org.dbunit + dbunit + 2.5.4 + @@ -107,7 +118,7 @@ - suites/testng.xml + resources/suites/testng.xml diff --git a/target/test-classes/com/essa/framework/BasePage.class b/target/test-classes/com/essa/framework/BasePage.class index 261a1d3..9c0d8bb 100644 Binary files a/target/test-classes/com/essa/framework/BasePage.class and b/target/test-classes/com/essa/framework/BasePage.class differ diff --git a/target/test-classes/com/essa/framework/BrowserEngine.class b/target/test-classes/com/essa/framework/BrowserEngine.class index 0db9d98..f5f2d6a 100644 Binary files a/target/test-classes/com/essa/framework/BrowserEngine.class and b/target/test-classes/com/essa/framework/BrowserEngine.class differ diff --git a/target/test-classes/com/essa/framework/Logger.class b/target/test-classes/com/essa/framework/Logger.class index 9c4bbdc..5032ed1 100644 Binary files a/target/test-classes/com/essa/framework/Logger.class and b/target/test-classes/com/essa/framework/Logger.class differ diff --git a/target/test-classes/com/essa/pageObject/BaseTest.class b/target/test-classes/com/essa/pageObject/BaseTest.class index bb6b7aa..d2bef5a 100644 Binary files a/target/test-classes/com/essa/pageObject/BaseTest.class and b/target/test-classes/com/essa/pageObject/BaseTest.class differ diff --git a/target/test-classes/com/essa/pageObject/HomePage.class b/target/test-classes/com/essa/pageObject/HomePage.class index 857d891..20bce5c 100644 Binary files a/target/test-classes/com/essa/pageObject/HomePage.class and b/target/test-classes/com/essa/pageObject/HomePage.class differ diff --git a/target/test-classes/com/essa/pageObject/LoginPage.class b/target/test-classes/com/essa/pageObject/LoginPage.class index 76360f9..d4b59f4 100644 Binary files a/target/test-classes/com/essa/pageObject/LoginPage.class and b/target/test-classes/com/essa/pageObject/LoginPage.class differ diff --git a/test-output/emailable-report.html b/test-output/emailable-report.html index 5b1f86d..799041f 100644 --- a/test-output/emailable-report.html +++ b/test-output/emailable-report.html @@ -8,13 +8,14 @@ - - + +
Test# Passed# Skipped# FailedTime (ms)Included GroupsExcluded Groups
新增市场商品
addMarketGoods30071,013
提交PO
sendPO40099,569
- +
ClassMethodStartTime (ms)
新增市场商品
addMarketGoods — passed
com.essa.testSuite.TestAddMarketGoodsaddMarketGoods153507959015537865
auditMarketGoods153507962802116655
toMarketGoodsRelesePage15350795838786275
ClassMethodStartTime (ms)
提交PO
sendPO — passed
com.buyer.testSuite.TestAddToCartaddSku153596324356912739
com.buyer.testSuite.TestSendPOconslidation153596329047629695
sendPO153596332017212651
com.essa.testSuite.TestProductInquiryproductInquiry153596326559015888
-

addMarketGoods

com.essa.testSuite.TestAddMarketGoods#addMarketGoods

back to summary

-

com.essa.testSuite.TestAddMarketGoods#auditMarketGoods

back to summary

-

com.essa.testSuite.TestAddMarketGoods#toMarketGoodsRelesePage

back to summary

+

sendPO

com.buyer.testSuite.TestAddToCart#addSku

back to summary

+

com.buyer.testSuite.TestSendPO#conslidation

back to summary

+

com.buyer.testSuite.TestSendPO#sendPO

back to summary

+

com.essa.testSuite.TestProductInquiry#productInquiry

back to summary

diff --git a/test-output/index.html b/test-output/index.html index cf29b5f..00adaa3 100644 --- a/test-output/index.html +++ b/test-output/index.html @@ -37,8 +37,8 @@
- - 新增市场商品 + + 提交PO
@@ -48,37 +48,37 @@
-
-
+
+
- com.essa.testSuite.TestAddMarketGoods + com.buyer.testSuite.TestSendPO
- - - addMarketGoods + + + conslidation + +(开始拼柜)
- - - auditMarketGoods + + + sendPO + +(设置贴纸唛头，提交PO)
+
+
+
+
+ + com.essa.testSuite.TestProductInquiry +
+
- - - toMarketGoodsRelesePage + + + productInquiry + +(成品询价流程)
-
-
-
+
+
+
+ + com.buyer.testSuite.TestAddToCart +
+
+
+
+ + + addSku + +(将sku加入购物车) +
+
+
+
+
+
- D:\workspace\demo\suites\addMarketGoods.xml + D:\workspace\demo\resources\suites\sendPO.xml 
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="新增市场商品" guice-stage="DEVELOPMENT">
-  <test thread-count="5" name="addMarketGoods">
+<suite name="提交PO" guice-stage="DEVELOPMENT">
+  <test thread-count="5" name="sendPO">
     <classes>
-      <class name="com.essa.testSuite.TestAddMarketGoods">
+      <class name="com.buyer.testSuite.TestAddToCart">
+        <methods>
+          <include name="addSku"/>
+        </methods>
+      </class> <!-- com.buyer.testSuite.TestAddToCart -->
+      <class name="com.essa.testSuite.TestProductInquiry">
+        <methods>
+          <include name="productInquiry"/>
+        </methods>
+      </class> <!-- com.essa.testSuite.TestProductInquiry -->
+      <class name="com.buyer.testSuite.TestSendPO">
         <methods>
-          <include name="toMarketGoodsRelesePage"/>
-          <include name="addMarketGoods"/>
-          <include name="auditMarketGoods"/>
+          <include name="conslidation"/>
+          <include name="sendPO"/>
         </methods>
-      </class> <!-- com.essa.testSuite.TestAddMarketGoods -->
+      </class> <!-- com.buyer.testSuite.TestSendPO -->
     </classes>
-  </test> <!-- addMarketGoods -->
-</suite> <!-- 新增市场商品 -->
+  </test> <!-- sendPO -->
+</suite> <!-- 提交PO -->
-
+
- Tests for 新增市场商品 + Tests for 提交PO
  • - addMarketGoods (1 class) + sendPO (3 classes)
-
+
- Groups for 新增市场商品 + Groups for 提交PO
-
+
- Times for 新增市场商品 + Times for 提交PO
Total running time: 1 minutes -
-
+
+
-
+
- Reporter output for 新增市场商品 + Reporter output for 提交PO
-
+
- 0 ignored methods + 1 ignored method
+
+ com.buyer.testSuite.TestAddToCart +
+ keywordToCart +
+
+
-
+
Methods in chronological order
-
com.essa.testSuite.TestAddMarketGoods
+
com.buyer.testSuite.TestAddToCart
setUp 0 ms
- toMarketGoodsRelesePage - 9401 ms + addSku + 9513 ms
+
+ tearDown + 22254 ms +
+
+
+
com.essa.testSuite.TestProductInquiry
+
+ setUp + 23031 ms +
+
+ productInquiry + 31534 ms +
+
+ tearDown + 47422 ms +
+
+
+
com.buyer.testSuite.TestSendPO
+
+ setUp + 48238 ms +
- addMarketGoods - 15678 ms + conslidation + 56420 ms
- auditMarketGoods - 53544 ms + sendPO + 86116 ms
tearDown - 70199 ms + 98767 ms
diff --git a/test-output/old/index.html b/test-output/old/index.html index 7e24d37..4f67e56 100644 --- a/test-output/old/index.html +++ b/test-output/old/index.html @@ -4,6 +4,6 @@

Test results

- - -
SuitePassedFailedSkippedtestng.xml
Total300 
新增市场商品300Link
+Total400  +提交PO +400Link diff --git a/test-output/testng-results.xml b/test-output/testng-results.xml index 757f8e6..dc83672 100644 --- a/test-output/testng-results.xml +++ b/test-output/testng-results.xml @@ -1,33 +1,57 @@ - + - + - - - + + + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + -- libgit2 0.21.2