曾谨 / EssaAuto

Commit d6c2eca9993c7cdf4e963a50c9b1d2c24d5eab29

Authored by suweicheng
1 parent ca59c24b

开发梳理；

Showing 5 changed files with 9 additions and 1 deletions   Show diff stats
Inline Side-by-side
src/main/java/com/essa/framework/BrowserEngine.java
  Show/Hide comments   View file @d6c2eca
... ... @@ -18,6 +18,7 @@ public class BrowserEngine {
18 18 private ConfigProperties configProperties;
19 19  
20 20 public void initConfigData() {
  21 + //有些地方是没有设置初始化环境直接调用这个方法的，所以默认是sit
21 22 env1 = null == env1 ? EnvEnum.SIT : env1;
22 23 configProperties = ConfigProperties.getConfig(env1);
23 24 browserEnum = BrowserEnum.fromCode(configProperties.getBrowserName());
... ... @@ -39,6 +40,7 @@ public class BrowserEngine {
39 40 */
40 41 private WebDriver getBrowser(BrowserEnum browser,String url,int waitTime){
41 42 System.setProperty(browser.getExeName(), SystemConstant.RESOURCE_PATH + browser.getDriver());
  43 + //根据浏览器类型，初始化对应的驱动
42 44 switch(browser) {
43 45 case Firefox:{
44 46 driver = new FirefoxDriver();
... ...
src/main/java/com/essa/framework/BrowserEnum.java
  Show/Hide comments   View file @d6c2eca
... ... @@ -53,7 +53,7 @@ public enum BrowserEnum {
53 53 private String code;
54 54  
55 55 /**
56   - * 枚举描述
  56 + * 浏览器驱动名字
57 57 */
58 58 private String driver;
59 59  
... ...
src/main/java/com/essa/framework/ConfigProperties.java
  Show/Hide comments   View file @d6c2eca
... ... @@ -11,8 +11,11 @@ import java.util.Properties;
11 11 */
12 12 public class ConfigProperties {
13 13  
  14 + //浏览器名称
14 15 private String browserName;
  16 + //bpms首页url
15 17 private String serverURL;
  18 + //buyer首页url
16 19 private String buyerURL;
17 20  
18 21 // 数据库驱动名字
... ... @@ -31,6 +34,7 @@ public class ConfigProperties {
31 34 private static Map<String,ConfigProperties> configPropertiesMap = new HashMap<String,ConfigProperties>();
32 35  
33 36 static {
  37 + //读取各个环境的配置项
34 38 EnvEnum[] env = EnvEnum.values();
35 39 for (EnvEnum envEnum : env) {
36 40 try {
... ...
src/main/java/com/essa/framework/DButil.java
  Show/Hide comments   View file @d6c2eca
... ... @@ -23,6 +23,7 @@ public class DButil {
23 23  
24 24 Connection conn = null;
25 25 try {
  26 + //通过环境找寻相应的配置，然后初始化数据库连接
26 27 EnvEnum envEnum = EnvEnum.fromCode(Model.getEnv());
27 28 ConfigProperties dbConfig = ConfigProperties.getConfig(envEnum);
28 29 Class.forName(dbConfig.getJdbcName());
... ...
src/main/java/com/essa/framework/SuitesEnum.java
  Show/Hide comments   View file @d6c2eca
... ... @@ -8,6 +8,7 @@ import java.util.concurrent.ConcurrentHashMap;
8 8 import java.util.concurrent.atomic.AtomicReference;
9 9  
10 10 public enum SuitesEnum {
  11 + //suite 第一个是唯一标志，第二个表示需要使用哪个xml(需要换的时候只要改这个即可),第三个描述这个干吗的
11 12 ADD_ORIGINAL_GOODS("ADD_ORIGIN_SKU","addOriginalGoods.xml","新增原厂商品"),
12 13 ADD_MARKET_GOODS("ADD_MARKET_GOODS","addMarketGoods.xml","新增市场商品"),
13 14 PUBLISH_GROUP_PURCHASE("PUBLISH_GROUP_PURCHASE","publishGroupPurchase.xml","发布团购"),
... ...