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