Updated bean creation condition

Author: christopher.mbaike

src/test/resources/selenium_browser_drivers/firebug-2.0.11-fx.xpi renamed to selenium_browser_drivers/firebug-2.0.11-fx.xpi

@@ -3,45 +3,35 @@
 import com.techboy.selenium.browserdriver.BrowserDriverExtended;
 import com.techboy.selenium.config.BrowserCapabilities;
 import org.openqa.selenium.Proxy;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.*;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.env.Environment;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 
 import javax.annotation.PostConstruct;
-import javax.inject.Inject;
 import java.io.IOException;
 
 import static org.openqa.selenium.Proxy.ProxyType.MANUAL;
 
 /**
- * Created by christopher on 01/12/2015.
+ *
  */
 @PropertySource("classpath:app.properties")
 @Configuration
 public class Beans  {
 
-    @Value("${browser}") String artist;
-
-    @Inject
-    Environment env;
-
     private String workingOS = System.getProperty("os.name").toLowerCase();
     private final boolean proxyEnabled = Boolean.getBoolean("proxyEnabled");
     private final String proxyHostname = System.getProperty("proxyHost");
     private final Integer proxyPort = Integer.getInteger("proxyPort");
     private final String proxyDetails = String.format("%s:%d", proxyHostname, proxyPort);
-    private static String browser="firefox";
 
 
     @PostConstruct
     public void systemPath() throws IOException {
 
-        System.out.println(artist);
-
         if (workingOS.contains("windows")) {
-            System.setProperty("webdriver.chrome.driver","selenium_browser_drivers/windowsChromedriver/chromedriver.exe");
+            System.setProperty("webdriver.chrome.driver", "selenium_browser_drivers/windowsChromedriver/chromedriver.exe");
         } else if (workingOS.contains("mac")) {
             System.setProperty("webdriver.chrome.driver", "selenium_browser_drivers/macChromedriver/chromedriver");
         } else if (workingOS.contains("linux")) {
@@ -75,26 +65,29 @@ public BrowserDriverExtended.ChromeDriverExtended chrome() {
         return new BrowserDriverExtended.ChromeDriverExtended(BrowserCapabilities.newInstance().getChromeCapabilities());
     }
 
-    private static class FirefoxCondition implements Condition {
+      private static class FirefoxCondition implements Condition {
         @Override
         public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
-            return browser.contentEquals("firefox") || browser.contentEquals("");
+            Environment env =context.getEnvironment();
+            return env.getProperty("browser").equalsIgnoreCase("firefox") || env.getProperty("browser").equalsIgnoreCase("");
         }
 
     }
 
     private static class ChromeCondition implements Condition {
         @Override
         public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
-            return browser.contentEquals("chrome");
+            Environment env =context.getEnvironment();
+            return env.getProperty("browser").equalsIgnoreCase("chrome");
         }
 
     }
 
     private static class IECondition implements Condition {
         @Override
         public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
-            return browser.contentEquals("IE");
+            Environment env =context.getEnvironment();
+            return env.getProperty("browser").equalsIgnoreCase("IE");
         }
     }
 
@@ -104,8 +97,6 @@ static PropertySourcesPlaceholderConfigurer placeholderConfigurer() {
         return new PropertySourcesPlaceholderConfigurer();
     }
 
-
-
 }
 
 

src/test/resources/selenium_browser_drivers/firepath-0.9.7.1-fx.xpi renamed to selenium_browser_drivers/firepath-0.9.7.1-fx.xpi

@@ -1 +1 @@
-browser= firefox
+browser= chrome