honeydew 0.12.0 → 0.14.0

data/lib/honeydew/version.rb

@@ -1,3 +1,3 @@
 module Honeydew
-  VERSION = "0.12.0"
+  VERSION = '0.14.0'
 end

data/{android-server → server}/pom.xml

@@ -3,11 +3,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>uiautomator-cucumber</groupId>
-    <artifactId>android-server</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <groupId>amplify</groupId>
+    <artifactId>honeydew-server</artifactId>
+    <version>0.14.0</version>
     <packaging>jar</packaging>
-    <name>UIAutomator Cucumber - Android Server</name>
+    <name>Honeydew Android Server</name>
 
     <properties>
         <platform.version>4.1.1.4</platform.version>
@@ -31,7 +31,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.google.android</groupId>
+                 <groupId>com.google.android</groupId>
             <artifactId>android</artifactId>
             <version>${platform.version}</version>
             <scope>provided</scope>
@@ -68,6 +68,16 @@
             <artifactId>commons-io</artifactId>
             <version>2.4</version>
         </dependency>
+         <dependency>
+            <groupId>fi.iki.elonen</groupId>
+            <artifactId>nanohttpd</artifactId>
+            <version>2.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>fi.iki.elonen</groupId>
+            <artifactId>nanohttpd-webserver</artifactId>
+            <version>2.0.3</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -105,7 +115,7 @@
                         <skip>false</skip>
                         <testClassOrMethods>
                             <testClassOrMethod>
-                                com.uiautomator_cucumber.android_server.TestRunner
+                                com.amplify.honeydew_server.TestRunner
                             </testClassOrMethod>
                         </testClassOrMethods>
                         <createReport>true</createReport>

data/server/repo/fi/iki/elonen/nanohttpd-webserver/2.0.3/nanohttpd-webserver-2.0.3.pom

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>fi.iki.elonen</groupId>
+  <artifactId>nanohttpd-webserver</artifactId>
+  <version>2.0.3</version>
+  <description>POM was created from install:install-file</description>
+</project>

data/server/repo/fi/iki/elonen/nanohttpd-webserver/maven-metadata-local.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>fi.iki.elonen</groupId>
+  <artifactId>nanohttpd-webserver</artifactId>
+  <versioning>
+    <release>2.0.3</release>
+    <versions>
+      <version>2.0.3</version>
+    </versions>
+    <lastUpdated>20130709205330</lastUpdated>
+  </versioning>
+</metadata>

data/server/repo/fi/iki/elonen/nanohttpd/2.0.3/nanohttpd-2.0.3.pom

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>fi.iki.elonen</groupId>
+  <artifactId>nanohttpd</artifactId>
+  <version>2.0.3</version>
+  <description>POM was created from install:install-file</description>
+</project>

data/server/repo/fi/iki/elonen/nanohttpd/maven-metadata-local.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>fi.iki.elonen</groupId>
+  <artifactId>nanohttpd</artifactId>
+  <versioning>
+    <release>2.0.3</release>
+    <versions>
+      <version>2.0.3</version>
+    </versions>
+    <lastUpdated>20130709205249</lastUpdated>
+  </versioning>
+</metadata>

data/{android-server/src/main/java/com/uiautomator_cucumber/android_server → server/src/main/java/com/amplify/honeydew_server}/Action.java

@@ -1,9 +1,7 @@
-package com.uiautomator_cucumber.android_server;
+package com.amplify.honeydew_server;
 
-import com.android.uiautomator.core.UiDevice;
-import com.android.uiautomator.core.UiObject;
-import com.android.uiautomator.core.UiObjectNotFoundException;
-import com.android.uiautomator.core.UiSelector;
+import android.util.Log;
+import com.android.uiautomator.core.*;
 import com.google.common.base.CaseFormat;
 
 import java.util.Map;
@@ -26,18 +24,27 @@ public abstract class Action {
     }
 
     protected UiObject getUiObject(Map<String, Object> arguments) {
+        ViewSelector viewSelector = getViewSelector(arguments);
+        return viewSelector.find();
+    }
+
+    protected ViewSelector getViewSelector(Map<String, Object> arguments) {
         ViewSelector viewSelector = new ViewSelector();
 
+        Log.d(getClass().getName(), arguments.toString());
         if (arguments.containsKey("type")) {
+            Log.d(getClass().getName(), String.format("Type %s", (String) arguments.get("type")));
             viewSelector.withType((String) arguments.get("type"));
         }
         if (arguments.containsKey("text")) {
+            Log.d(getClass().getName(), String.format("Text %s", (String) arguments.get("text")));
             viewSelector.withText((String) arguments.get("text"));
         }
         if (arguments.containsKey("description")) {
+            Log.d(getClass().getName(), String.format("Description %s", (String) arguments.get("description")));
             viewSelector.withDescription((String) arguments.get("description"));
         }
-        return viewSelector.find();
+        return viewSelector;
     }
 
     public static class ViewSelector {

data/{android-server/src/main/java/com/uiautomator_cucumber/android_server → server/src/main/java/com/amplify/honeydew_server}/ActionsExecutor.java

@@ -1,8 +1,8 @@
-package com.uiautomator_cucumber.android_server;
+package com.amplify.honeydew_server;
 
 import android.util.Log;
 import com.android.uiautomator.core.UiDevice;
-import com.uiautomator_cucumber.android_server.actions.*;
+import com.amplify.honeydew_server.actions.*;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -64,6 +64,7 @@ public class ActionsExecutor {
         actionClasses.add(HasSettingsMenuItem.class);
         actionClasses.add(SelectFromAppsList.class);
         actionClasses.add(Unlock.class);
+        actionClasses.add(ScrollToTextByIndex.class);
         return actionClasses;
     }
 

data/{android-server/src/main/java/com/uiautomator_cucumber/android_server → server/src/main/java/com/amplify/honeydew_server}/Command.java

@@ -1,4 +1,4 @@
-package com.uiautomator_cucumber.android_server;
+package com.amplify.honeydew_server;
 
 import java.util.Map;
 
@@ -6,6 +6,11 @@ public class Command {
     private String action;
     private Map<String, Object> arguments;
 
+    public Command(String action, Map<String, Object> arguments) {
+        this.action = action;
+        this.arguments = arguments;
+    }
+
     public String getAction() {
         return action;
     }

data/{android-server/src/main/java/com/uiautomator_cucumber/android_server → server/src/main/java/com/amplify/honeydew_server}/Result.java

@@ -1,22 +1,22 @@
-package com.uiautomator_cucumber.android_server;
+package com.amplify.honeydew_server;
 
 import org.apache.commons.lang.exception.ExceptionUtils;
 
 public class Result {
-    private final boolean success;
-    private String description;
-    private String errorMessage;
-    private String stackTrace;
+    public final boolean success;
+    public String description;
+    public String errorMessage;
+    public String stackTrace;
 
     public static Result OK = new Result();
     public static Result FAILURE = new Result(false);
 
     public Result() {
-        this.success = true;
+        this(true);
     }
 
     public Result(boolean success) {
-        this.success = success;
+        this(success, success ? "Success!" : "Failure.");
     }
 
     public Result(boolean success, String description) {

data/{android-server/src/main/java/com/uiautomator_cucumber/android_server → server/src/main/java/com/amplify/honeydew_server}/TestRunner.java

@@ -1,20 +1,28 @@
-package com.uiautomator_cucumber.android_server;
+package com.amplify.honeydew_server;
 
+import android.util.Log;
 import android.view.KeyEvent;
 import com.android.uiautomator.core.UiDevice;
 import com.android.uiautomator.testrunner.UiAutomatorTestCase;
-import com.uiautomator_cucumber.android_server.httpd.RemoteCommandReceiver;
+import com.amplify.honeydew_server.httpd.RemoteCommandReceiver;
+import fi.iki.elonen.ServerRunner;
 
 public class TestRunner extends UiAutomatorTestCase {
 
-    public static final String TAG = "UIAutomatorRemote";
-
     public void testRemoteLoop() throws Exception {
+        Log.d(getClass().getName(), "Starting honeydew-server...");
+
         UiDevice uiDevice = getUiDevice();
         uiDevice.wakeUp();
         unlockEmulator();
 
-        new RemoteCommandReceiver(new ActionsExecutor(uiDevice));
+        RemoteCommandReceiver remoteCommandReceiver =  new RemoteCommandReceiver(new ActionsExecutor(uiDevice));
+        ServerRunner.executeInstance(remoteCommandReceiver);
+
+        Log.d(getClass().getName(), "honeydew-server started, waiting for commands");
+        while(true) {
+            Thread.sleep(1000);
+        }
     }
 
     private void unlockEmulator() {
@@ -23,4 +31,4 @@ public class TestRunner extends UiAutomatorTestCase {
         getUiDevice().pressKeyCode(KeyEvent.KEYCODE_MENU);
         getUiDevice().pressKeyCode(KeyEvent.KEYCODE_MENU);
     }
-}
+}

data/{android-server/src/main/java/com/uiautomator_cucumber/android_server → server/src/main/java/com/amplify/honeydew_server}/actions/Click.java

@@ -1,9 +1,9 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew_server.actions;
 
+import com.amplify.honeydew_server.Action;
+import com.amplify.honeydew_server.Result;
 import com.android.uiautomator.core.UiDevice;
 import com.android.uiautomator.core.UiObjectNotFoundException;
-import com.uiautomator_cucumber.android_server.Action;
-import com.uiautomator_cucumber.android_server.Result;
 
 import java.util.Map;
 

data/{android-server/src/main/java/com/uiautomator_cucumber/android_server → server/src/main/java/com/amplify/honeydew_server}/actions/ClickAndWaitForNewWindow.java

@@ -1,9 +1,9 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew_server.actions;
 
 import com.android.uiautomator.core.UiDevice;
 import com.android.uiautomator.core.UiObjectNotFoundException;
-import com.uiautomator_cucumber.android_server.Action;
-import com.uiautomator_cucumber.android_server.Result;
+import com.amplify.honeydew_server.Action;
+import com.amplify.honeydew_server.Result;
 
 import java.util.Map;
 

data/{android-server/src/main/java/com/uiautomator_cucumber/android_server → server/src/main/java/com/amplify/honeydew_server}/actions/DumpWindowHierarchy.java

@@ -1,9 +1,9 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew_server.actions;
 
 import com.android.uiautomator.core.UiDevice;
 import com.android.uiautomator.core.UiObjectNotFoundException;
-import com.uiautomator_cucumber.android_server.Action;
-import com.uiautomator_cucumber.android_server.Result;
+import com.amplify.honeydew_server.Action;
+import com.amplify.honeydew_server.Result;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
@@ -22,7 +22,7 @@ public class DumpWindowHierarchy extends Action {
         } catch (IOException e) {
             return new Result("Create directory failed", e);
         }
-        uiDevice.dumpWindowHierarchy("honeydew-window-hierarchy");
-        return new Result(true, "/data/local/tmp/local/tmp/honeydew-window-hierarchy");
+        uiDevice.dumpWindowHierarchy("honeydew_server-window-hierarchy");
+        return new Result(true, "/data/local/tmp/local/tmp/honeydew_server-window-hierarchy");
     }
 }

data/{android-server/src/main/java/com/uiautomator_cucumber/android_server → server/src/main/java/com/amplify/honeydew_server}/actions/HasSettingsMenuItem.java

@@ -1,11 +1,10 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew_server.actions;
 
 import android.widget.TextView;
 import com.android.uiautomator.core.*;
-import com.uiautomator_cucumber.android_server.Action;
-import com.uiautomator_cucumber.android_server.Result;
+import com.amplify.honeydew_server.Action;
+import com.amplify.honeydew_server.Result;
 
-import java.util.List;
 import java.util.Map;
 
 public class HasSettingsMenuItem extends Action {
@@ -20,4 +19,4 @@ public class HasSettingsMenuItem extends Action {
         UiObject menuItem = settingsMenu.getChildByText(new UiSelector().className(TextView.class.getName()), menuName);
         return menuItem.exists() ? Result.OK : Result.FAILURE;
     }
-}
+}

data/{android-server/src/main/java/com/uiautomator_cucumber/android_server → server/src/main/java/com/amplify/honeydew_server}/actions/InspectOptionInSettingsMenu.java

@@ -1,8 +1,8 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew_server.actions;
 
 import android.widget.TextView;
 import com.android.uiautomator.core.*;
-import com.uiautomator_cucumber.android_server.Result;
+import com.amplify.honeydew_server.Result;
 
 import java.util.List;
 import java.util.Map;
@@ -18,7 +18,7 @@ public abstract class InspectOptionInSettingsMenu extends SelectMenuInSettings {
     @Override
     public Result execute(Map<String, Object> arguments) throws UiObjectNotFoundException {
         super.execute(arguments);
-        List<String> optionNames = (List<String>) arguments.get("optionNames");
+        List<String> optionNames = (List<String>)arguments.get("optionNames");
         UiScrollable optionsMenu = new UiScrollable(new UiSelector().className("android.widget.ListView").packageName("com.android.settings").focused(false));
 
         for (String optionName : optionNames) {

data/{android-server/src/main/java/com/uiautomator_cucumber/android_server → server/src/main/java/com/amplify/honeydew_server}/actions/IsButtonPresent.java

@@ -1,11 +1,11 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew_server.actions;
 
 import com.android.uiautomator.core.UiDevice;
 import com.android.uiautomator.core.UiObject;
 import com.android.uiautomator.core.UiObjectNotFoundException;
 import com.android.uiautomator.core.UiSelector;
-import com.uiautomator_cucumber.android_server.Action;
-import com.uiautomator_cucumber.android_server.Result;
+import com.amplify.honeydew_server.Action;
+import com.amplify.honeydew_server.Result;
 
 import java.util.Map;
 

data/{android-server/src/main/java/com/uiautomator_cucumber/android_server → server/src/main/java/com/amplify/honeydew_server}/actions/IsChildCountEqualTo.java

@@ -1,8 +1,8 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew_server.actions;
 
 import com.android.uiautomator.core.*;
-import com.uiautomator_cucumber.android_server.Action;
-import com.uiautomator_cucumber.android_server.Result;
+import com.amplify.honeydew_server.Action;
+import com.amplify.honeydew_server.Result;
 
 import java.util.Map;
 
@@ -16,7 +16,7 @@ public class IsChildCountEqualTo extends Action {
     public Result execute(Map<String, Object> arguments) throws UiObjectNotFoundException {
         String parentDescription = (String) arguments.get("parent_description");
         String childDescription = (String) arguments.get("child_description");
-        int childCount = ((Double)arguments.get("child_count")).intValue();
+        int childCount = (Integer) arguments.get("child_count");
 
         UiCollection parentElement = new UiCollection(new UiSelector().description(parentDescription));
         int count = parentElement.getChildCount(new UiSelector().description(childDescription));

data/{android-server/src/main/java/com/uiautomator_cucumber/android_server → server/src/main/java/com/amplify/honeydew_server}/actions/IsElementWithNestedTextPresent.java

@@ -1,8 +1,8 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew_server.actions;
 
 import com.android.uiautomator.core.*;
-import com.uiautomator_cucumber.android_server.Action;
-import com.uiautomator_cucumber.android_server.Result;
+import com.amplify.honeydew_server.Action;
+import com.amplify.honeydew_server.Result;
 
 import java.util.Map;
 

data/{android-server/src/main/java/com/uiautomator_cucumber/android_server → server/src/main/java/com/amplify/honeydew_server}/actions/IsOptionInSettingsMenuDisabled.java

@@ -1,4 +1,4 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew_server.actions;
 
 import com.android.uiautomator.core.UiDevice;