From a619f762b4de7530264d69a9c585095f679f1eb9 Mon Sep 17 00:00:00 2001 From: suweicheng <2811574534@qq.com> Date: Fri, 26 Oct 2018 10:38:18 +0800 Subject: [PATCH] 开发梳理； --- src/main/java/com/essa/framework/BrowserEngine.java | 5 ++--- src/main/java/com/essa/framework/SuitesEnum.java | 2 +- src/main/java/com/essa/framework/SystemConstant.java | 11 +++++++++++ src/main/java/com/essa/pageObject/BaseTest.java | 20 ++++++++------------ src/main/java/com/essa/testSuite/TestDevelopmentAbility.java | 18 +++++++++--------- src/main/java/com/essa/testSuite/TestLogin.java | 12 ++++++------ src/main/java/swing/SwingMain.java | 125 +++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------- src/main/resources/conf/config_dit.properties | 4 ++-- src/main/resources/conf/config_hotfix.properties | 4 ++-- src/main/resources/conf/config_uat.properties | 13 ++----------- 10 files changed, 86 insertions(+), 128 deletions(-) create mode 100644 src/main/java/com/essa/framework/SystemConstant.java diff --git a/src/main/java/com/essa/framework/BrowserEngine.java b/src/main/java/com/essa/framework/BrowserEngine.java index 94801d8..7ab6d61 100644 --- a/src/main/java/com/essa/framework/BrowserEngine.java +++ b/src/main/java/com/essa/framework/BrowserEngine.java @@ -7,7 +7,6 @@ import org.openqa.selenium.ie.InternetExplorerDriver; import org.openqa.selenium.remote.CapabilityType; import org.openqa.selenium.remote.DesiredCapabilities; -import java.io.IOException; import java.util.concurrent.TimeUnit; public class BrowserEngine { @@ -18,7 +17,7 @@ public class BrowserEngine { private ConfigProperties configProperties; - public void initConfigData() throws IOException{ + public void initConfigData() { env1 = null == env1 ? EnvEnum.SIT : env1; configProperties = ConfigProperties.getConfig(env1); browserEnum = BrowserEnum.fromCode(configProperties.getBrowserName()); @@ -39,7 +38,7 @@ public class BrowserEngine { * @return */ private WebDriver getBrowser(BrowserEnum browser,String url,int waitTime){ - System.setProperty(browser.getExeName(), ".\\src\\main\\resources\\" + browser.getDriver()); + System.setProperty(browser.getExeName(), SystemConstant.RESOURCE_PATH + browser.getDriver()); switch(browser) { case Firefox:{ driver = new FirefoxDriver(); diff --git a/src/main/java/com/essa/framework/SuitesEnum.java b/src/main/java/com/essa/framework/SuitesEnum.java index c56dd8f..d429c3f 100644 --- a/src/main/java/com/essa/framework/SuitesEnum.java +++ b/src/main/java/com/essa/framework/SuitesEnum.java @@ -96,7 +96,7 @@ public enum SuitesEnum { SuitesEnum(String code, String suiteName, String desc) { this.code = code; - this.suiteName = suiteName; + this.suiteName = SystemConstant.SUITES_PATH + suiteName; this.desc = desc; } diff --git a/src/main/java/com/essa/framework/SystemConstant.java b/src/main/java/com/essa/framework/SystemConstant.java new file mode 100644 index 0000000..7a939b5 --- /dev/null +++ b/src/main/java/com/essa/framework/SystemConstant.java @@ -0,0 +1,11 @@ +package com.essa.framework; + +/** + * Created by weicheng on 2018/10/26. + */ +public class SystemConstant { + + public static final String RESOURCE_PATH = ".\\src\\main\\resources\\"; + + public static final String SUITES_PATH = RESOURCE_PATH + "\\suites\\"; +} diff --git a/src/main/java/com/essa/pageObject/BaseTest.java b/src/main/java/com/essa/pageObject/BaseTest.java index 1eda704..f84d78e 100644 --- a/src/main/java/com/essa/pageObject/BaseTest.java +++ b/src/main/java/com/essa/pageObject/BaseTest.java @@ -1,14 +1,10 @@ package com.essa.pageObject; -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; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.support.PageFactory; /** * @author Administrator @@ -26,11 +22,11 @@ public class BaseTest { */ public void initsetUp() { BrowserEngine browserEngine = new BrowserEngine(); - try { +// try { browserEngine.initConfigData(); - } catch (IOException e) { + /*} catch (IOException e) { e.printStackTrace(); - } + }*/ driver = browserEngine.getBrowser(); } @@ -39,11 +35,11 @@ public class BaseTest { */ public void initBuyer() { BrowserEngine browserEngine = new BrowserEngine(); - try { +// try { browserEngine.initConfigData(); - } catch (IOException e) { + /* } catch (IOException e) { e.printStackTrace(); - } + }*/ driver = browserEngine.buyerGetBrowser(); } diff --git a/src/main/java/com/essa/testSuite/TestDevelopmentAbility.java b/src/main/java/com/essa/testSuite/TestDevelopmentAbility.java index b4cf4f6..e564f11 100644 --- a/src/main/java/com/essa/testSuite/TestDevelopmentAbility.java +++ b/src/main/java/com/essa/testSuite/TestDevelopmentAbility.java @@ -1,9 +1,10 @@ package com.essa.testSuite; -import static org.testng.Assert.assertEquals; - -import java.io.IOException; - +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 org.openqa.selenium.WebDriver; import org.openqa.selenium.support.PageFactory; import org.testng.annotations.AfterClass; @@ -12,10 +13,9 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import org.testng.asserts.SoftAssert; -import com.essa.pageObject.HomePage; -import com.essa.pageObject.SupplierOperationsTrackPage; -import com.essa.pageObject.SupplierStrengthPage; -import com.essa.pageObject.BaseTest; +import java.io.IOException; + +import static org.testng.Assert.assertEquals; public class TestDevelopmentAbility extends BaseTest { @@ -102,7 +102,7 @@ public class TestDevelopmentAbility extends BaseTest { try { - return com.essa.framework.BasePage.readExcel(".\\src\\main\\resources", "data.xlsx", "供应商"); + return com.essa.framework.BasePage.readExcel(SystemConstant.RESOURCE_PATH, "data.xlsx", "供应商"); } catch (Exception e) { diff --git a/src/main/java/com/essa/testSuite/TestLogin.java b/src/main/java/com/essa/testSuite/TestLogin.java index 1ed4d57..2a1e966 100644 --- a/src/main/java/com/essa/testSuite/TestLogin.java +++ b/src/main/java/com/essa/testSuite/TestLogin.java @@ -1,7 +1,9 @@ package com.essa.testSuite; -import java.io.IOException; - +import com.essa.framework.BrowserEngine; +import com.essa.framework.SystemConstant; +import com.essa.pageObject.HomePage; +import com.essa.pageObject.LoginPage; import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.PageFactory; import org.testng.annotations.AfterClass; @@ -10,9 +12,7 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import org.testng.asserts.SoftAssert; -import com.essa.framework.BrowserEngine; -import com.essa.pageObject.HomePage; -import com.essa.pageObject.LoginPage; +import java.io.IOException; /** * @author Administrator @@ -80,7 +80,7 @@ public class TestLogin { try { - return com.essa.framework.BasePage.readExcel(".\\src\\main\\resources", "data.xlsx", "users"); + return com.essa.framework.BasePage.readExcel(SystemConstant.RESOURCE_PATH, "data.xlsx", "users"); } catch (Exception e) { diff --git a/src/main/java/swing/SwingMain.java b/src/main/java/swing/SwingMain.java index 11e4b3e..c794112 100644 --- a/src/main/java/swing/SwingMain.java +++ b/src/main/java/swing/SwingMain.java @@ -1,33 +1,8 @@ package swing; -import java.awt.EventQueue; - -import javax.swing.JFrame; -import javax.swing.ButtonGroup; -import javax.swing.JButton; -import java.awt.event.ActionListener; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.RandomAccessFile; -import java.io.StringReader; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Properties; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import java.awt.event.ActionEvent; -import javax.swing.JTextField; - -import org.apache.xmlbeans.impl.xb.xsdschema.Public; +import com.essa.framework.*; +import com.essa.pageObject.GoodsManage.AddOriginalGoodsPage; +import com.essa.pageObject.GoodsManage.UpdatePicPage; import org.jdom.Document; import org.jdom.Element; import org.jdom.JDOMException; @@ -35,47 +10,20 @@ import org.jdom.input.SAXBuilder; import org.jdom.output.XMLOutputter; import org.testng.TestNG; -import com.essa.framework.BrowserEngine; -import com.essa.framework.Logger; -import com.essa.framework.Model; -import com.essa.pageObject.GoodsManage.AddOriginalGoodsPage; -import com.essa.pageObject.GoodsManage.GoodsBankPage; -import com.essa.pageObject.GoodsManage.UpdatePicPage; - -import javax.swing.JLabel; -import javax.swing.JRadioButton; -import javax.swing.JComboBox; -import javax.swing.JFileChooser; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; - -import java.awt.Color; -import javax.swing.DefaultComboBoxModel; -import javax.swing.ImageIcon; -import java.awt.Toolkit; -import java.awt.BorderLayout; -import java.awt.Choice; -import java.awt.Font; -import java.awt.Graphics; - -import javax.swing.JList; -import javax.swing.JMenuBar; -import javax.swing.JTextPane; -import java.awt.event.InputMethodListener; -import java.awt.event.InputMethodEvent; -import java.beans.VetoableChangeListener; -import java.beans.PropertyChangeEvent; -import javax.swing.JPanel; -import java.beans.PropertyChangeListener; +import javax.swing.*; +import javax.swing.border.LineBorder; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import javax.swing.UIManager; -import java.awt.TextField; -import java.awt.Panel; -import javax.swing.JScrollBar; -import javax.swing.ScrollPaneConstants; -import javax.swing.SwingWorker; -import javax.swing.border.LineBorder; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; /** * @author Administrator 图形化 @@ -130,7 +78,7 @@ public class SwingMain { public void initData() { try { SAXBuilder builder = new SAXBuilder(); - Document document = builder.build(new File(".\\resources\\data.xml")); + Document document = builder.build(new File(SystemConstant.RESOURCE_PATH + "\\data.xml")); Element root = document.getRootElement(); Element element = root.getChild("data"); this.buyerAccount = element.getChildText("buyerAccount"); @@ -151,12 +99,12 @@ public class SwingMain { public void setData(String key,String value) { try { SAXBuilder builder = new SAXBuilder(); - Document document = builder.build(new File(".\\resources\\data.xml")); + Document document = builder.build(new File(SystemConstant.RESOURCE_PATH + "\\data.xml")); Element root = document.getRootElement(); Element element = root.getChild("data"); element.getChild(key).setText(value); XMLOutputter XMLOut = new XMLOutputter(); - XMLOut.output(document,new FileOutputStream(".\\resources\\data.xml")); + XMLOut.output(document,new FileOutputStream(SystemConstant.RESOURCE_PATH + "\\data.xml")); } catch (Exception e) { e.printStackTrace(); } @@ -309,10 +257,13 @@ public class SwingMain { } }); selectSystem.setFont(new Font("微软雅黑", Font.PLAIN, 14)); - selectSystem.addItem("SIT"); + for (EnvEnum envEnum : EnvEnum.values()) { + selectSystem.addItem(envEnum.getCode()); + } + /* selectSystem.addItem("SIT"); selectSystem.addItem("HOTFIX"); selectSystem.addItem("UAT"); - selectSystem.addItem("DIT"); + selectSystem.addItem("DIT");*/ frmvBy.getContentPane().add(selectSystem); //添加市场商品 @@ -615,48 +566,58 @@ public class SwingMain { if (Scene == "新增原厂商品") { AddOriginalGoodsPage.setSupplierName(supplierName.getText()); UpdatePicPage.setPicPath(picPath.getText()); - suites.add(".\\resources\\suites\\addOriginalGoods.xml");// 图形界面 + suites.add(SuitesEnum.ADD_ORIGINAL_GOODS.getSuiteName()); +// suites.add(".\\resources\\suites\\addOriginalGoods.xml");// 图形界面 } else if (Scene == "新增市场商品") { Model.setBuyerNo(buyerNo2.getText()); Model.setPicPath(picPath.getText()); Model.setSupplierName(supplierName.getText()); - suites.add(".\\resources\\suites\\addMarketGoods.xml");// 图形界面 + suites.add(SuitesEnum.ADD_MARKET_GOODS.getSuiteName()); +// suites.add(".\\resources\\suites\\addMarketGoods.xml");// 图形界面 } else if (Scene == "发布团购") { AddOriginalGoodsPage.setSupplierName(supplierName.getText()); UpdatePicPage.setPicPath(picPath.getText()); - suites.add(".\\resources\\suites\\publishGroupPurchase.xml");// 图形界面 + suites.add(SuitesEnum.PUBLISH_GROUP_PURCHASE.getSuiteName()); +// suites.add(".\\resources\\suites\\publishGroupPurchase.xml");// 图形界面 } else if (Scene == "采购商注册") { if (!(registerAccount.getText().equals("") || registerAccount.getText().equals("若不填写将自动生成"))) { Model.setEmail(registerAccount.getText()); } - suites.add(".\\resources\\suites\\buyerRegister.xml");// 图形界面 + suites.add(SuitesEnum.BUYER_REGISTER.getSuiteName()); +// suites.add(".\\resources\\suites\\buyerRegister.xml");// 图形界面 } else if (Scene == "添加SKU至购物车") {// 暂时舍弃 Model.setBuyerAccount(account.getText()); Model.setBuyerPassword(password.getText()); Model.setSkuNo(SkuNo.getText()); - suites.add(".\\resources\\suites\\addSkuToCart.xml"); + suites.add(SuitesEnum.ADD_SKU_TO_CART.getSuiteName()); +// suites.add(".\\resources\\suites\\addSkuToCart.xml"); } else if (Scene == "成品询价") { Model.setBuyerAccount(account.getText()); Model.setBuyerPassword(password.getText()); Model.setSkuNo(SkuNo.getText()); if (Model.getIsactivity() == 1) { - suites.add(".\\resources\\suites\\activityInquiry.xml"); + suites.add(SuitesEnum.ACTIVITY_INQUIRY.getSuiteName()); +// suites.add(".\\resources\\suites\\activityInquiry.xml"); }else { - suites.add(".\\resources\\suites\\productInquiry.xml"); + suites.add(SuitesEnum.PRODUCT_INQUIRY.getSuiteName()); +// suites.add(".\\resources\\suites\\productInquiry.xml"); } } else if (Scene == "生成PO") { Model.setBuyerAccount(account.getText()); Model.setBuyerPassword(password.getText()); Model.setSkuNo(SkuNo.getText()); if (Model.getIsactivity() == 1) { - suites.add(".\\resources\\suites\\activitySendPO.xml"); + suites.add(SuitesEnum.ACTIVITY_SEND_PO.getSuiteName()); +// suites.add(".\\resources\\suites\\activitySendPO.xml"); }else { - suites.add(".\\resources\\suites\\sendPO.xml"); + suites.add(SuitesEnum.SEND_PO.getSuiteName()); +// suites.add(".\\resources\\suites\\sendPO.xml"); } } else if (Scene == "PO询价") { Model.setPoNum(po.getText()); - suites.add(".\\resources\\suites\\POInquiry.xml"); + suites.add(SuitesEnum.PO_INQUIRY.getSuiteName()); +// suites.add(".\\resources\\suites\\POInquiry.xml"); } testNG.setTestSuites(suites); testNG.run(); diff --git a/src/main/resources/conf/config_dit.properties b/src/main/resources/conf/config_dit.properties index 8986025..b900f8d 100644 --- a/src/main/resources/conf/config_dit.properties +++ b/src/main/resources/conf/config_dit.properties @@ -2,6 +2,6 @@ #browserName=IE browserName=Chrome -serverURL=http://bpms.sit.gz.essa -buyerURL=http://en.portalsit.cn +serverURL=http://bpms.dit.gz.essa +buyerURL=http://en.portaldit.cn diff --git a/src/main/resources/conf/config_hotfix.properties b/src/main/resources/conf/config_hotfix.properties index 8986025..a0bb274 100644 --- a/src/main/resources/conf/config_hotfix.properties +++ b/src/main/resources/conf/config_hotfix.properties @@ -2,6 +2,6 @@ #browserName=IE browserName=Chrome -serverURL=http://bpms.sit.gz.essa -buyerURL=http://en.portalsit.cn +serverURL=http://bpms.hotfix.gz.essa +buyerURL=http://en.portalhotfix.cn diff --git a/src/main/resources/conf/config_uat.properties b/src/main/resources/conf/config_uat.properties index 414e8d8..634667b 100644 --- a/src/main/resources/conf/config_uat.properties +++ b/src/main/resources/conf/config_uat.properties @@ -2,15 +2,6 @@ #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 +serverURL=http://bpms.spstoys.com:7291 +buyerURL=http://en.spstoys.com:889 -- libgit2 0.21.2