ARQ-1515 Allow debugging mode for Selenium APK

arquillian · Oct 2, 2013 · 1a8f6bd · 1a8f6bd
1 parent 62d7c4a
commit 1a8f6bd
Show file tree

Hide file tree

Showing 13 changed files with 97 additions and 289 deletions.
diff --git a/...container-impl/src/main/java/org/arquillian/droidium/container/configuration/Command.java b/...container-impl/src/main/java/org/arquillian/droidium/container/configuration/Command.java
@@ -28,7 +28,7 @@
  */
 public class Command {
 
-    List<String> command;
+    private List<String> command;
 
     public Command() {
         command = new ArrayList<String>();
@@ -155,7 +155,7 @@ public Command addAsString(String tokens) {
     }
 
     /**
-     * Deletes all multiple space and preserve original sense of the text input.
+     * Deletes all multiple spaces and preserve original sense of the text input.
      *
      * @param text
      * @return {@code text} without multiple spaces
@@ -214,6 +214,10 @@ public List<String> getAsList() {
         return command;
     }
 
+    public String[] getAsArray() {
+        return getAsList().toArray(new String[0]);
+    }
+
     public String getAsString() {
         StringBuilder sb = new StringBuilder();
         for (String s : command) {
@@ -237,6 +241,28 @@ public String get(int i) {
         }
     }
 
+    /**
+     *
+     * @return last token from the command
+     */
+    public String getLast() {
+        if (command.isEmpty()) {
+            return null;
+        }
+        return command.get(command.size() - 1);
+    }
+
+    /**
+     *
+     * @return first token from the command
+     */
+    public String getFirst() {
+        if (command.isEmpty()) {
+            return null;
+        }
+        return command.get(0);
+    }
+
     @Override
     public String toString() {
         return getAsString();

diff --git a/...ontainer-impl/src/main/java/org/arquillian/droidium/container/configuration/Validate.java b/...ontainer-impl/src/main/java/org/arquillian/droidium/container/configuration/Validate.java
@@ -360,4 +360,5 @@ public static void isWriteable(final File file, String message) throws IllegalAr
             throw new IllegalArgumentException(message);
         }
     }
+
 }
diff --git a/...-impl/src/main/java/org/arquillian/droidium/native_/android/AndroidApplicationHelper.java b/...-impl/src/main/java/org/arquillian/droidium/native_/android/AndroidApplicationHelper.java
@@ -26,9 +26,9 @@
 import java.util.regex.Pattern;
 
 import org.arquillian.droidium.container.configuration.AndroidSDK;
+import org.arquillian.droidium.container.configuration.Command;
 import org.arquillian.droidium.container.configuration.Validate;
 import org.arquillian.droidium.container.impl.ProcessExecutor;
-import org.arquillian.droidium.native_.utils.Command;
 
 /**
  * Provides various helper methods for Android packages.

diff --git a/...impl/src/main/java/org/arquillian/droidium/native_/android/AndroidApplicationManager.java b/...impl/src/main/java/org/arquillian/droidium/native_/android/AndroidApplicationManager.java
@@ -23,10 +23,10 @@
 import org.arquillian.droidium.container.api.AndroidDevice;
 import org.arquillian.droidium.container.api.AndroidExecutionException;
 import org.arquillian.droidium.container.configuration.AndroidSDK;
+import org.arquillian.droidium.container.configuration.Command;
 import org.arquillian.droidium.container.configuration.Validate;
 import org.arquillian.droidium.container.impl.ProcessExecutor;
 import org.arquillian.droidium.native_.spi.AndroidDeployment;
-import org.arquillian.droidium.native_.utils.Command;
 import org.arquillian.droidium.native_.utils.DroidiumNativeFileUtils;
 import org.arquillian.droidium.native_.utils.Monkey;
 

diff --git a/...ve-impl/src/main/java/org/arquillian/droidium/native_/selendroid/SelendroidRebuilder.java b/...ve-impl/src/main/java/org/arquillian/droidium/native_/selendroid/SelendroidRebuilder.java
@@ -31,9 +31,9 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.arquillian.droidium.container.configuration.AndroidSDK;
+import org.arquillian.droidium.container.configuration.Command;
 import org.arquillian.droidium.container.configuration.Validate;
 import org.arquillian.droidium.container.impl.ProcessExecutor;
-import org.arquillian.droidium.native_.utils.Command;
 import org.arquillian.droidium.native_.utils.DroidiumNativeFileUtils;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;

diff --git a/...mpl/src/main/java/org/arquillian/droidium/native_/selendroid/SelendroidServerManager.java b/...mpl/src/main/java/org/arquillian/droidium/native_/selendroid/SelendroidServerManager.java
@@ -32,10 +32,10 @@
 import org.arquillian.droidium.container.api.AndroidDevice;
 import org.arquillian.droidium.container.api.AndroidExecutionException;
 import org.arquillian.droidium.container.configuration.AndroidSDK;
+import org.arquillian.droidium.container.configuration.Command;
 import org.arquillian.droidium.container.configuration.Validate;
 import org.arquillian.droidium.container.impl.ProcessExecutor;
 import org.arquillian.droidium.native_.spi.SelendroidDeployment;
-import org.arquillian.droidium.native_.utils.Command;
 import org.arquillian.droidium.native_.utils.DroidiumNativeFileUtils;
 import org.arquillian.droidium.native_.utils.Monkey;
 

diff --git a/...an-droidium-native-impl/src/main/java/org/arquillian/droidium/native_/sign/APKSigner.java b/...an-droidium-native-impl/src/main/java/org/arquillian/droidium/native_/sign/APKSigner.java
@@ -22,10 +22,10 @@
 import java.util.logging.Logger;
 
 import org.arquillian.droidium.container.configuration.AndroidSDK;
+import org.arquillian.droidium.container.configuration.Command;
 import org.arquillian.droidium.container.configuration.Validate;
 import org.arquillian.droidium.container.impl.ProcessExecutor;
 import org.arquillian.droidium.native_.configuration.DroidiumNativeConfiguration;
-import org.arquillian.droidium.native_.utils.Command;
 import org.arquillian.droidium.native_.utils.DroidiumNativeFileUtils;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;

diff --git a/...idium-native-impl/src/main/java/org/arquillian/droidium/native_/sign/KeyStoreCreator.java b/...idium-native-impl/src/main/java/org/arquillian/droidium/native_/sign/KeyStoreCreator.java
@@ -24,9 +24,9 @@
 import java.util.logging.Logger;
 
 import org.arquillian.droidium.container.configuration.AndroidSDK;
+import org.arquillian.droidium.container.configuration.Command;
 import org.arquillian.droidium.container.configuration.Validate;
 import org.arquillian.droidium.native_.configuration.DroidiumNativeConfiguration;
-import org.arquillian.droidium.native_.utils.Command;
 
 /**
  * Creates keystore and checks if some keystore already exists in the system.