From 3c8ba65917daa5a38b557fcc88fabfa708d05acd Mon Sep 17 00:00:00 2001
From: Stefan Miklosovic <smikloso@redhat.com>
Date: Mon, 9 Mar 2015 15:29:59 +0100
Subject: [PATCH] ARQ-1933 Update Droidium to use Selendroid 0.15.0

---
 .../configuration/DroidiumNativeConfiguration.java    | 11 +----------
 .../native_/configuration/SelendroidDownloader.java   | 11 ++++-------
 pom.xml                                               |  2 +-
 tests/build.gradle                                    |  4 ++--
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/droidium-native/arquillian-droidium-native/src/main/java/org/arquillian/droidium/native_/configuration/DroidiumNativeConfiguration.java b/droidium-native/arquillian-droidium-native/src/main/java/org/arquillian/droidium/native_/configuration/DroidiumNativeConfiguration.java
index d4296ee0..14eecea7 100644
--- a/droidium-native/arquillian-droidium-native/src/main/java/org/arquillian/droidium/native_/configuration/DroidiumNativeConfiguration.java
+++ b/droidium-native/arquillian-droidium-native/src/main/java/org/arquillian/droidium/native_/configuration/DroidiumNativeConfiguration.java
@@ -30,26 +30,18 @@
  */
 public class DroidiumNativeConfiguration {
 
-    public static final String SELENDROID_VERSION = "0.14.0";
+    public static final String SELENDROID_VERSION = "0.15.0";
 
     public static final String SERVER_HOME = System.getProperty("user.home") + "/.droidium/selendroid-server-" + SELENDROID_VERSION + ".apk";
 
-    public static final String DRIVER_HOME = System.getProperty("user.home") + "/.droidium/android-driver-app-" + SELENDROID_VERSION + ".apk";
-
     private String serverApk = SERVER_HOME;
 
-    private String driverApk = DRIVER_HOME;
-
     private Map<String, String> properties = new HashMap<String, String>();
 
     public File getServerApk() {
         return new File(getProperty("serverApk", serverApk));
     }
 
-    public File getDriverApk() {
-        return new File(getProperty("driverApk", driverApk));
-    }
-
     /**
      * Sets properties as configuration.
      *
@@ -106,7 +98,6 @@ public void validate() throws IllegalArgumentException, IllegalStateException {
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append(String.format("%-40s %s\n", "serverApk", getServerApk()));
-        sb.append(String.format("%-40s %s\n", "driverApk", getDriverApk()));
         return sb.toString();
     }
 }
diff --git a/droidium-native/arquillian-droidium-native/src/main/java/org/arquillian/droidium/native_/configuration/SelendroidDownloader.java b/droidium-native/arquillian-droidium-native/src/main/java/org/arquillian/droidium/native_/configuration/SelendroidDownloader.java
index c0c10c21..207b9587 100644
--- a/droidium-native/arquillian-droidium-native/src/main/java/org/arquillian/droidium/native_/configuration/SelendroidDownloader.java
+++ b/droidium-native/arquillian-droidium-native/src/main/java/org/arquillian/droidium/native_/configuration/SelendroidDownloader.java
@@ -58,14 +58,13 @@ public void onDroidiumNativeConfigured(@Observes DroidiumNativeConfigured event)
 
         DroidiumNativeConfiguration configuration = this.configuration.get();
 
-        if (!Validate.isReadable(configuration.getServerApk()) || !Validate.isReadable(configuration.getDriverApk())) {
+        if (!Validate.isReadable(configuration.getServerApk())) {
             configuration.setProperty("serverApk", DroidiumNativeConfiguration.SERVER_HOME);
-            configuration.setProperty("driverApk", DroidiumNativeConfiguration.DRIVER_HOME);
 
-            if (!Validate.isReadable(configuration.getServerApk()) || !Validate.isReadable(configuration.getDriverApk())) {
+            if (!Validate.isReadable(configuration.getServerApk())) {
 
-                logger.info("You must provide a valid path both to Android Server APK and Android driver APK for Arquillian Droidium"
-                    + " native plugin. Please be sure you have the read access to specified files. Both APKs are going to be "
+                logger.info("You must provide a valid path to Selendroid server APK to Arquillian Droidium"
+                    + " native plugin. Please be sure you have the read access to specified file. APK is going to be "
                     + "downloaded for you automatically right now.");
 
                 try {
@@ -82,8 +81,6 @@ public void onDroidiumNativeConfigured(@Observes DroidiumNativeConfigured event)
                     DroidiumFileUtils.copyFileToDirectory(new File(unzipped, "/prebuild/selendroid-server-" + DroidiumNativeConfiguration.SELENDROID_VERSION + ".apk"),
                         new File(System.getProperty("user.home") + "/.droidium"));
 
-                    DroidiumFileUtils.copyFileToDirectory(new File(unzipped, "/prebuild/android-driver-app-" + DroidiumNativeConfiguration.SELENDROID_VERSION + ".apk"),
-                        new File(System.getProperty("user.home") + "/.droidium"));
                 } catch (TimeoutExecutionException ex) {
                     throw new TimeoutExecutionException(String.format("Unable to download Selendroid from "
                         + "%s in %s minutes.", SELENDROID_SERVER_URL, DOWNLOAD_TIMEOUT_IN_MINUTES));
diff --git a/pom.xml b/pom.xml
index ef7e49ee..5fff9b44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
         <version.recorder>1.0.0.Final</version.recorder>
 
         <!-- Selendroid -->
-        <version.selendroid>0.14.0</version.selendroid>
+        <version.selendroid>0.15.0</version.selendroid>
 
         <!-- Other versions -->
         <version.maven.animal.sniffer>1.12</version.maven.animal.sniffer>
diff --git a/tests/build.gradle b/tests/build.gradle
index 69bbd147..7373a32d 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -29,8 +29,8 @@ ext {
 
     // downloads from GitHub
     selendroidOrganization = "selendroid"
-    selendroidVersion = "0.14.0"
-    selendroidCommit = "0.14.0"
+    selendroidVersion = "0.15.0"
+    selendroidCommit = "0.15.0"
 
     // downloads from GitHub
     recorderOrganization = "arquillian"