XW-655 | use Browser.CHROME

Author: Tomasz Napieralski

src/test/java/com/wikia/webdriver/common/core/annotations/Browser.java

@@ -7,6 +7,9 @@ public class Browser {
   public static final String CHROME_ANDROID = "ANDROID";
   public static final String CHROME_MOBILE_MERCURY = "CHROMEMOBILEMERCURY";
   public static final String GHOST = "GHOST";
+  public static final String SAFARI = "SAFARI";
+  public static final String INTERNET_EXPLORER = "IE";
+  public static final String HTML_UNIT = "HTMLUNIT";
 
   private Browser() {
   }

src/test/java/com/wikia/webdriver/common/core/url/UrlBuilder.java

@@ -1,5 +1,6 @@
 package com.wikia.webdriver.common.core.url;
 
+import com.wikia.webdriver.common.core.annotations.Browser;
 import com.wikia.webdriver.common.core.configuration.Configuration;
 
 import org.apache.commons.lang.StringUtils;
@@ -126,7 +127,7 @@ public String getUrlPath(WebDriver driver) {
   }
 
   private Boolean isMercuryBrowser() {
-    return browser != null && "CHROMEMOBILEMERCURY".equalsIgnoreCase(browser);
+    return browser != null && Browser.CHROME_MOBILE_MERCURY.equalsIgnoreCase(browser);
   }
 
   private String composeUrl(String prefix, String wikiName, String suffix) {

src/test/java/com/wikia/webdriver/common/driverprovider/NewDriverProvider.java

@@ -2,6 +2,7 @@
 
 
 import com.wikia.webdriver.common.core.ExtHelper;
+import com.wikia.webdriver.common.core.annotations.Browser;
 import com.wikia.webdriver.common.core.configuration.Configuration;
 import com.wikia.webdriver.common.logging.PageObjectLogging;
 
@@ -51,26 +52,26 @@ public static EventFiringWebDriver getDriverInstanceForBrowser(String browser) {
     browserName = browser;
 
     // If browser equals IE set driver property as IEWebDriver instance
-    if ("IE".equals(browserName)) {
+    if (Browser.INTERNET_EXPLORER.equals(browserName)) {
       driver = getIEInstance();
 
       // If browser contains FF set driver property as FFWebDriver instance
-    } else if ("FF".equals(browserName)) {
+    } else if (Browser.FIREFOX.equals(browserName)) {
       driver = getFFInstance();
 
       // If browser equals CHROME set driver property as ChromeWebDriver instance
-    } else if (browserName.contains("CHROME")) {
+    } else if (browserName.contains(Browser.CHROME)) {
       driver = getChromeInstance();
 
       // If browser equals SAFARI set driver property as SafariWebDriver instance
-    } else if ("SAFARI".equals(browserName)) {
+    } else if (Browser.SAFARI.equals(browserName)) {
       driver = getSafariInstance();
 
-    } else if ("HTMLUNIT".equals(browserName)) {
+    } else if (Browser.HTML_UNIT.equals(browserName)) {
       driver = new EventFiringWebDriver(new HtmlUnitDriver());
-    } else if ("GHOST".equals(browserName)) {
+    } else if (Browser.GHOST.equals(browserName)) {
       driver = getPhantomJSInstance();
-    } else if ("ANDROID".equals(browserName)) {
+    } else if (Browser.CHROME_ANDROID.equals(browserName)) {
       driver = getAndroidInstance();
     } else {
       throw new WebDriverException("Provided driver is not supported.");
@@ -82,10 +83,10 @@ public static EventFiringWebDriver getDriverInstanceForBrowser(String browser) {
 
   public static void setBrowserUserAgent(String browser, String userAgent) {
     switch (browser.toUpperCase()) {
-      case "FF":
+      case Browser.FIREFOX:
         setFFUserAgent(userAgent);
         break;
-      case "CHROME":
+      case Browser.CHROME:
         setChromeUserAgent(userAgent);
         break;
       default:
@@ -214,7 +215,7 @@ private static EventFiringWebDriver getChromeInstance() {
                            .getPath());
 
     // TODO change mobile tests to use @UserAgent annotation
-    if ("CHROMEMOBILEMERCURY".equals(browserName)) {
+    if (Browser.CHROME_MOBILE_MERCURY.equals(browserName)) {
       chromeOptions
           .addArguments("--user-agent=" + userAgentRegistry.getUserAgent("iPhone"));
     }

src/test/java/com/wikia/webdriver/common/driverprovider/mobileprovider/MobileDriverProvider.java

@@ -1,5 +1,6 @@
 package com.wikia.webdriver.common.driverprovider.mobileprovider;
 
+import com.wikia.webdriver.common.core.annotations.Browser;
 import com.wikia.webdriver.common.core.configuration.Configuration;
 import com.wikia.webdriver.common.driverprovider.NewDriverProvider;
 
@@ -21,23 +22,19 @@ public MobileDriverProvider() {
   public WebDriver getDriverInstance() {
     WebDriver driver = null;
 
-    if ("CHROMEMOBILEMERCURY".equals(browser)) {
+    if (Browser.CHROME_MOBILE_MERCURY.equals(browser)) {
       return NewDriverProvider.getDriverInstanceForBrowser(browser);
     }
 
     switch (platform.toUpperCase()) {
-      case "ANDROID":
+      case Browser.CHROME_ANDROID:
         driver = getChromeDriver();
         break;
-      case "IOS":
-        //@TODO
-        break;
       default:
         throw new WebDriverException(
             "Unknown platform provided \n" +
             "Available platforms:" +
-            "\n\t android" +
-            "\n\t ios"
+            "\n\t android"
         );
     }
     return driver;

src/test/java/com/wikia/webdriver/common/templates/NewTestTemplateCore.java

@@ -3,6 +3,7 @@
 import com.wikia.webdriver.common.contentpatterns.URLsContent;
 import com.wikia.webdriver.common.core.CommonUtils;
 import com.wikia.webdriver.common.core.TestContext;
+import com.wikia.webdriver.common.core.annotations.Browser;
 import com.wikia.webdriver.common.core.annotations.NetworkTrafficDump;
 import com.wikia.webdriver.common.core.configuration.Configuration;
 import com.wikia.webdriver.common.core.geoedge.GeoEdgeBrowserMobProxy;
@@ -70,7 +71,7 @@ protected void setWindowSize() {
     Dimension browserSize = Configuration.getBrowserSize();
     String browser = Configuration.getBrowser();
 
-    if (!browser.contains("ANDROID")) {
+    if (!browser.contains(Browser.CHROME_ANDROID)) {
       if (browserSize != null) {
         driver.manage().window().setSize(browserSize);
       } else {

src/test/java/com/wikia/webdriver/pageobjectsfactory/pageobject/adsbase/AdsFloorAdhesionObject.java

@@ -1,5 +1,6 @@
 package com.wikia.webdriver.pageobjectsfactory.pageobject.adsbase;
 
+import com.wikia.webdriver.common.core.annotations.Browser;
 import com.wikia.webdriver.common.logging.PageObjectLogging;
 
 import org.openqa.selenium.By;
@@ -79,7 +80,7 @@ public void verifyThereIsNoModal(String floorAdhesionModalSelector) {
   }
 
   public void verifyThereIsNoWikiaBar(String browser) {
-    if ("CHROMEMOBILEMERCURY".equalsIgnoreCase(browser)) {
+    if (Browser.CHROME_MOBILE_MERCURY.equalsIgnoreCase(browser)) {
       // Mercury does not have WikiaBar
       // There should be better way to verify skin - remove it after QAART-608 is done
       PageObjectLogging.log(

src/test/java/com/wikia/webdriver/pageobjectsfactory/pageobject/adsbase/helpers/AdsFloorAdhesionSkinContext.java

@@ -1,5 +1,7 @@
 package com.wikia.webdriver.pageobjectsfactory.pageobject.adsbase.helpers;
 
+import com.wikia.webdriver.common.core.annotations.Browser;
+
 public class AdsFloorAdhesionSkinContext {
 
   private static final String OASIS_CREATIVE_ID = "66223683972";
@@ -27,7 +29,7 @@ public AdsFloorAdhesionSkinContext(String browser) {
     modalCloseSelector = OASIS_MODAL_CLOSE_CSS;
     slotName = OASIS_SLOT_NAME;
 
-    if ("CHROMEMOBILEMERCURY".equalsIgnoreCase(browser)) {
+    if (Browser.CHROME_MOBILE_MERCURY.equalsIgnoreCase(browser)) {
       creativeId = MERCURY_CREATIVE_ID;
       lineItemId = MERCURY_LINE_ITEM_ID;
       modalSelector = MERCURY_MODAL_CSS;

src/test/java/com/wikia/webdriver/pageobjectsfactory/pageobject/adsbase/mobile/MobileAdsBaseObject.java

@@ -1,6 +1,7 @@
 package com.wikia.webdriver.pageobjectsfactory.pageobject.adsbase.mobile;
 
 import com.wikia.webdriver.common.core.Assertion;
+import com.wikia.webdriver.common.core.annotations.Browser;
 import com.wikia.webdriver.common.core.configuration.Configuration;
 import com.wikia.webdriver.common.logging.PageObjectLogging;
 import com.wikia.webdriver.pageobjectsfactory.pageobject.adsbase.AdsBaseObject;
@@ -27,7 +28,7 @@ public MobileAdsBaseObject(WebDriver driver, String page) {
     super(driver, page);
     adsComparison = new AdsComparison();
 
-    if ("CHROMEMOBILEMERCURY".equals(Configuration.getBrowser())) {
+    if (Browser.CHROME_MOBILE_MERCURY.equals(Configuration.getBrowser())) {
       verifyMercury();
     }
 

src/test/java/com/wikia/webdriver/pageobjectsfactory/pageobject/visualeditor/VisualEditorPageObject.java

@@ -2,6 +2,7 @@
 
 import com.wikia.webdriver.common.contentpatterns.VEContent;
 import com.wikia.webdriver.common.core.Assertion;
+import com.wikia.webdriver.common.core.annotations.Browser;
 import com.wikia.webdriver.common.core.configuration.Configuration;
 import com.wikia.webdriver.common.dataprovider.VisualEditorDataProvider.Formatting;
 import com.wikia.webdriver.common.dataprovider.VisualEditorDataProvider.Indentation;
@@ -416,7 +417,7 @@ public void deleteGallery(int index) {
     //wait for highlight
     wait.forElementVisible(focusedHighlight);
     //TODO check if any future webdriver upgrade would resolve having to use separate logic
-    if ("CHROME".equalsIgnoreCase(Configuration.getBrowser())) {
+    if (Browser.CHROME.equalsIgnoreCase(Configuration.getBrowser())) {
       Actions actions2 = new Actions(driver);
       actions2.sendKeys(Keys.DELETE).build().perform();
     } else {