[chromedriver] Fix Android test runner by creating a new driver when needed.

patch.diff

 diff --git a/java/client/src/org/openqa/selenium/chrome/ChromeOptions.java b/java/client/src/org/openqa/selenium/chrome/ChromeOptions.java
-index 322ca9f..bb3918b 100644
+index 322ca9f..79a7109 100644
 --- a/java/client/src/org/openqa/selenium/chrome/ChromeOptions.java
 +++ b/java/client/src/org/openqa/selenium/chrome/ChromeOptions.java
 @@ -71,6 +71,7 @@
    public static final String CAPABILITY = "chromeOptions";
  
    private File binary;
 +  private String androidPackage;
    private List<String> args = Lists.newArrayList();
    private List<File> extensionFiles = Lists.newArrayList();
    private Map<String, Object> experimentalOptions = Maps.newHashMap();
@@ skipping 12 matching lines @@
 +
 +  /**
     * @param arguments The arguments to use when starting Chrome.
     * @see #addArguments(java.util.List)
     */
 @@ -165,6 +176,10 @@ public JSONObject toJson() throws IOException, JSONException {
        options.put("binary", binary.getPath());
      }
  
 +    if (androidPackage != null) {
-+      options.put("android_package", androidPackage);
++      options.put("androidPackage", androidPackage);
 +    }
 +
      options.put("args", ImmutableList.copyOf(args));
  
      List<String> extensions = Lists.newArrayListWithExpectedSize(
-diff --git a/java/client/test/org/openqa/selenium/testing/drivers/ReflectionBackedDriverSupplier.java b/java/client/test/org/openqa/selenium/testing/drivers/ReflectionBackedDriverSupplier.java
-index 3cc5799..7316a41 100644
---- a/java/client/test/org/openqa/selenium/testing/drivers/ReflectionBackedDriverSupplier.java
-+++ b/java/client/test/org/openqa/selenium/testing/drivers/ReflectionBackedDriverSupplier.java
-@@ -29,6 +29,7 @@
+diff --git a/java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java b/java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java
+index ac6efbf..7fbad26 100644
+--- a/java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java
++++ b/java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java
+@@ -27,6 +27,7 @@
+ import org.junit.runner.RunWith;
+ import org.openqa.selenium.Pages;
  import org.openqa.selenium.WebDriver;
- import org.openqa.selenium.firefox.FirefoxDriver;
- import org.openqa.selenium.firefox.FirefoxProfile;
-+import org.openqa.selenium.remote.Augmenter;
- import org.openqa.selenium.remote.DesiredCapabilities;
- import org.openqa.selenium.testing.InProject;
++import org.openqa.selenium.WebDriverException;
+ import org.openqa.selenium.environment.GlobalTestEnvironment;
+ import org.openqa.selenium.environment.InProcessTestEnvironment;
+ import org.openqa.selenium.environment.TestEnvironment;
+@@ -90,6 +91,16 @@ public WebDriver getWrappedDriver() {
+   public static WebDriver actuallyCreateDriver() {
+     WebDriver driver = storedDriver.get();
  
-@@ -76,7 +77,8 @@ public WebDriver get() {
-       }
++    // If the driver is left in a bad state, create a new one.
++    // This happens on Android after any test that creates its own driver.
++    // Since only one instance of Chrome can run on Android at a time, the
++    // stored driver's browser is destroyed.
++    try {
++      if (driver != null)
++        driver.getCurrentUrl();
++    } catch (WebDriverException e) {
++      driver = null;
++    }
+     if (driver == null) {
+       driver = new WebDriverBuilder().get();
+       storedDriver.set(driver);
+@@ -122,4 +133,4 @@ protected boolean isIeDriverTimedOutException(IllegalStateException e) {
+     return e.getClass().getName().contains("TimedOutException");
+   }
  
-       //TODO: Call constructor with two Capabilities arguments for all driver classes
--      return driverClass.getConstructor(Capabilities.class).newInstance(desiredCapsToUse);
-+      WebDriver d = driverClass.getConstructor(Capabilities.class).newInstance(desiredCapsToUse);
-+      return new Augmenter().augment(d);
-     } catch (InvocationTargetException e) {
-       throw Throwables.propagate(e.getTargetException());
-     } catch (Exception e) {
+-}
+\ No newline at end of file
++}
 diff --git a/java/client/test/org/openqa/selenium/testing/drivers/TestChromeDriver.java b/java/client/test/org/openqa/selenium/testing/drivers/TestChromeDriver.java
 index e8a1c22..1629284 100644
 --- a/java/client/test/org/openqa/selenium/testing/drivers/TestChromeDriver.java
 +++ b/java/client/test/org/openqa/selenium/testing/drivers/TestChromeDriver.java
 @@ -73,6 +73,10 @@ private static DesiredCapabilities chromeWithCustomCapabilities(
      if (chromePath != null) {
        options.setBinary(new File(chromePath));
      }
 +    String androidPackage = System.getProperty("webdriver.chrome.android_package");
 +    if (androidPackage != null) {
@@ skipping 48 matching lines @@
 --- a/rake-tasks/crazy_fun/mappings/java.rb
 +++ b/rake-tasks/crazy_fun/mappings/java.rb
 @@ -34,6 +34,7 @@ class JavaMappings
      fun.add_mapping("java_test", CrazyFunJava::RunTests.new)
      fun.add_mapping("java_test", CrazyFunJava::CreateSourceJar.new)
      fun.add_mapping("java_test", CrazyFunJava::CreateUberJar.new)
 +    fun.add_mapping("java_test", CrazyFunJava::CreateProjectSourceJar.new)
      fun.add_mapping("java_test", CrazyFunJava::CreateProjectJar.new)
    end
  end