WebDriverFactory name replace string constant to constant variable.

vmi · Jul 28, 2012 · cf5ea1b · cf5ea1b
1 parent eea47a4
commit cf5ea1b
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 20 deletions.
diff --git a/src/main/java/jp/vmi/selenium/webdriver/WebDriverManager.java b/src/main/java/jp/vmi/selenium/webdriver/WebDriverManager.java
@@ -14,13 +14,23 @@ public class WebDriverManager implements Supplier<WebDriver> {
 
     private static final Logger log = LoggerFactory.getLogger(WebDriverManager.class);
 
+    public static final String FIREFOX = "firefox";
+
+    public static final String CHROME = "chrome";
+
+    public static final String IE = "ie";
+
+    public static final String HTMLUNIT = "htmlunit";
+
+    public static final String SAFARI = "safari";
+
     public static final String WEBDRIVER_FACTORY = "jp.vmi.selenium.webdriver.factory";
 
     private static final WebDriverManager manager = new WebDriverManager();
 
     private boolean isSingleInstance = true;
 
-    private WebDriverFactory factory = new FirefoxDriverFactory();
+    private WebDriverFactory factory;
 
     private DriverOptions driverOptions = new DriverOptions();
 
@@ -31,8 +41,9 @@ public static WebDriverManager getInstance() {
     }
 
     private WebDriverManager() {
+        String factoryName = System.getProperty(WEBDRIVER_FACTORY, FIREFOX);
+        setWebDriverFactory(factoryName);
         Runtime.getRuntime().addShutdownHook(new Thread() {
-
             @Override
             public void run() {
                 quitAllDrivers();
@@ -54,19 +65,19 @@ public void setWebDriverFactory(WebDriverFactory factory) {
 
     public void setWebDriverFactory(String factoryName) {
         if (StringUtils.isBlank(factoryName))
-            factoryName = "firefox";
+            factoryName = FIREFOX;
         else
             factoryName = factoryName.toLowerCase();
         WebDriverFactory factory;
-        if ("firefox".equals(factoryName))
+        if (FIREFOX.equals(factoryName))
             factory = new FirefoxDriverFactory();
-        else if ("chrome".equals(factoryName))
+        else if (CHROME.equals(factoryName))
             factory = new ChromeDriverFactory();
-        else if ("ie".equals(factoryName))
+        else if (IE.equals(factoryName))
             factory = new IEDriverFactory();
-        else if ("safari".equals(factoryName))
+        else if (SAFARI.equals(factoryName))
             factory = new SafariDriverFactory();
-        else if ("htmlunit".equals(factoryName))
+        else if (HTMLUNIT.equals(factoryName))
             factory = new HtmlUnitDriverFactory();
         else {
             try {

diff --git a/src/test/java/jp/vmi/selenium/selenese/CommandRunnerChromeProxyTest.java b/src/test/java/jp/vmi/selenium/selenese/CommandRunnerChromeProxyTest.java
@@ -23,7 +23,7 @@ public void stopProxy() {
     @Override
     protected void setupWebDriverManager() {
         WebDriverManager manager = WebDriverManager.getInstance();
-        manager.setWebDriverFactory("chrome");
+        manager.setWebDriverFactory(WebDriverManager.CHROME);
         manager.setDriverOptions(new DriverOptions().set(DriverOption.PROXY, "localhost:18080"));
     }
 }
diff --git a/src/test/java/jp/vmi/selenium/selenese/CommandRunnerChromeTest.java b/src/test/java/jp/vmi/selenium/selenese/CommandRunnerChromeTest.java
@@ -17,7 +17,7 @@ public void checkChromeProperty() {
     @Override
     protected void setupWebDriverManager() {
         WebDriverManager manager = WebDriverManager.getInstance();
-        manager.setWebDriverFactory("chrome");
+        manager.setWebDriverFactory(WebDriverManager.CHROME);
         manager.setDriverOptions(new DriverOptions());
     }
 }
diff --git a/src/test/java/jp/vmi/selenium/selenese/CommandRunnerFirefoxProxyTest.java b/src/test/java/jp/vmi/selenium/selenese/CommandRunnerFirefoxProxyTest.java
@@ -37,7 +37,7 @@ public void assumeInstalledFirefox() {
     @Override
     protected void setupWebDriverManager() {
         WebDriverManager manager = WebDriverManager.getInstance();
-        manager.setWebDriverFactory("firefox");
+        manager.setWebDriverFactory(WebDriverManager.FIREFOX);
         manager.setDriverOptions(new DriverOptions().set(DriverOption.PROXY, "localhost:" + proxy.getPort()));
     }
 }
diff --git a/src/test/java/jp/vmi/selenium/selenese/CommandRunnerFirefoxTest.java b/src/test/java/jp/vmi/selenium/selenese/CommandRunnerFirefoxTest.java
@@ -23,7 +23,7 @@ public void assumeInstalledFirefox() {
     @Override
     protected void setupWebDriverManager() {
         WebDriverManager manager = WebDriverManager.getInstance();
-        manager.setWebDriverFactory("firefox");
+        manager.setWebDriverFactory(WebDriverManager.FIREFOX);
         manager.setDriverOptions(new DriverOptions());
     }
 }
diff --git a/src/test/java/jp/vmi/selenium/selenese/CommandRunnerHtmlUnitProxyTest.java b/src/test/java/jp/vmi/selenium/selenese/CommandRunnerHtmlUnitProxyTest.java
@@ -23,7 +23,7 @@ public void stopProxy() {
     @Override
     protected void setupWebDriverManager() {
         WebDriverManager manager = WebDriverManager.getInstance();
-        manager.setWebDriverFactory("htmlunit");
+        manager.setWebDriverFactory(WebDriverManager.HTMLUNIT);
         manager.setDriverOptions(new DriverOptions().set(DriverOption.PROXY, "localhost:18080"));
     }
 }
diff --git a/src/test/java/jp/vmi/selenium/selenese/CommandRunnerHtmlUnitTest.java b/src/test/java/jp/vmi/selenium/selenese/CommandRunnerHtmlUnitTest.java
@@ -13,7 +13,7 @@ public class CommandRunnerHtmlUnitTest extends CommandRunnerTest {
     @Override
     protected void setupWebDriverManager() {
         WebDriverManager manager = WebDriverManager.getInstance();
-        manager.setWebDriverFactory("htmlunit");
+        manager.setWebDriverFactory(WebDriverManager.HTMLUNIT);
         manager.setDriverOptions(new DriverOptions());
     }
 

diff --git a/src/test/java/jp/vmi/selenium/selenese/CommandRunnerInternetExplorerProxyTest.java b/src/test/java/jp/vmi/selenium/selenese/CommandRunnerInternetExplorerProxyTest.java
@@ -25,7 +25,7 @@ public void stopProxy() {
     @Override
     protected void setupWebDriverManager() {
         WebDriverManager manager = WebDriverManager.getInstance();
-        manager.setWebDriverFactory("ie");
+        manager.setWebDriverFactory(WebDriverManager.IE);
         manager.setDriverOptions(new DriverOptions().set(DriverOption.PROXY, "localhost:18080"));
     }
 }
diff --git a/src/test/java/jp/vmi/selenium/selenese/CommandRunnerInternetExplorerTest.java b/src/test/java/jp/vmi/selenium/selenese/CommandRunnerInternetExplorerTest.java
@@ -22,7 +22,7 @@ private boolean isSupportedPlatform() {
     @Override
     protected void setupWebDriverManager() {
         WebDriverManager manager = WebDriverManager.getInstance();
-        manager.setWebDriverFactory("ie");
+        manager.setWebDriverFactory(WebDriverManager.IE);
         manager.setDriverOptions(new DriverOptions());
     }
 }
diff --git a/src/test/java/jp/vmi/selenium/selenese/CommandRunnerSafariProxyTest.java b/src/test/java/jp/vmi/selenium/selenese/CommandRunnerSafariProxyTest.java
@@ -24,7 +24,7 @@ public void stopProxy() {
     @Override
     protected void setupWebDriverManager() {
         WebDriverManager manager = WebDriverManager.getInstance();
-        manager.setWebDriverFactory("safari");
+        manager.setWebDriverFactory(WebDriverManager.SAFARI);
         manager.setDriverOptions(new DriverOptions());
     }
 }
diff --git a/src/test/java/jp/vmi/selenium/selenese/CommandRunnerSafariTest.java b/src/test/java/jp/vmi/selenium/selenese/CommandRunnerSafariTest.java
@@ -11,7 +11,7 @@ public class CommandRunnerSafariTest extends CommandRunnerTest {
     @Override
     protected void setupWebDriverManager() {
         WebDriverManager manager = WebDriverManager.getInstance();
-        manager.setWebDriverFactory("safari");
+        manager.setWebDriverFactory(WebDriverManager.SAFARI);
         manager.setDriverOptions(new DriverOptions());
     }
 }
diff --git a/src/test/java/jp/vmi/selenium/selenese/TestSuiteTest.java b/src/test/java/jp/vmi/selenium/selenese/TestSuiteTest.java
@@ -13,7 +13,7 @@ public class TestSuiteTest {
     public void testTestSuite() {
         File script = TestUtils.getScriptFile(TestSuiteTest.class, "");
         WebDriverManager manager = WebDriverManager.getInstance();
-        manager.setWebDriverFactory("firefox");
+        manager.setWebDriverFactory(WebDriverManager.FIREFOX);
         manager.setDriverOptions(new DriverOptions());
         Runner runner = new Runner(manager.get());
         runner.run(script);

diff --git a/src/test/java/jp/vmi/selenium/selenese/command/CommandFactoryTest.java b/src/test/java/jp/vmi/selenium/selenese/command/CommandFactoryTest.java
@@ -26,7 +26,7 @@ public void assumeInstalledFirefox() {
 
     @Before
     public void setupWebDriverManager() {
-        manager.setWebDriverFactory("firefox");
+        manager.setWebDriverFactory(WebDriverManager.FIREFOX);
         manager.setDriverOptions(new DriverOptions());
     }