honeydew 0.20.0 → 0.21.0

data/lib/honeydew/device_matchers.rb

@@ -24,6 +24,7 @@ module Honeydew
       perform_assertion :is_button_present, :text => button_text
     end
 
+    # TODO: Look for a better way to express these similar looking matchers
     def has_child_count?(parent_element_description, child_element_description, child_count)
       perform_assertion :is_child_count_equal_to,
         :parent_description => parent_element_description,
@@ -31,6 +32,13 @@ module Honeydew
          :child_count => child_count
     end
 
+    def has_child_count_greater_than?(parent_element_description, child_element_description, child_count)
+      perform_assertion :is_child_count_greater_than,
+        :parent_description => parent_element_description,
+         :child_description => child_element_description,
+         :child_count => child_count
+    end
+
     def has_element_with_nested_text?(parent_description, child_text)
       perform_assertion :is_element_with_nested_text_present,
         :parent_description => parent_description,

data/lib/honeydew/version.rb

@@ -1,3 +1,3 @@
 module Honeydew
-  VERSION = '0.20.0'
+  VERSION = '0.21.0'
 end

data/server/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>amplify</groupId>
     <artifactId>honeydew-server</artifactId>
-    <version>0.20.0</version>
+    <version>0.21.0</version>
     <packaging>jar</packaging>
     <name>Honeydew Android Server</name>
 
@@ -72,11 +72,12 @@
             <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>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

data/server/src/main/java/com/amplify/honeydew_server/Action.java

@@ -9,6 +9,8 @@ import java.util.Map;
 public abstract class Action {
     protected final UiDevice uiDevice;
 
+    protected final String TAG = getClass().getSimpleName();
+
     public Action(UiDevice uiDevice) {
         this.uiDevice = uiDevice;
     }
@@ -39,17 +41,17 @@ public abstract class Action {
     protected ViewSelector getViewSelector(Map<String, Object> arguments) {
         ViewSelector viewSelector = new ViewSelector();
 
-        Log.d(getClass().getName(), arguments.toString());
+        Log.d(TAG, arguments.toString());
         if (arguments.containsKey("type")) {
-            Log.d(getClass().getName(), String.format("Type %s", (String) arguments.get("type")));
+            Log.d(TAG, 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")));
+            Log.d(TAG, 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")));
+            Log.d(TAG, String.format("Description %s", (String) arguments.get("description")));
             viewSelector.withDescription((String) arguments.get("description"));
         }
         return viewSelector;

data/server/src/main/java/com/amplify/honeydew_server/ActionsExecutor.java

@@ -8,24 +8,26 @@ import com.google.common.base.Stopwatch;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
+import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 
+import static com.google.common.collect.Maps.newHashMap;
 import static com.google.common.collect.Sets.newHashSet;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 public class ActionsExecutor {
 
-    private final UiDevice uiDevice;
-    private final HashMap<String, Action> actions;
+    protected final UiDevice uiDevice;
+    private final Map<String, Action> actions;
+    private static final String TAG = ActionsExecutor.class.getName();
 
     public ActionsExecutor(UiDevice uiDevice) throws IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException {
         this.uiDevice = uiDevice;
-        actions = new HashMap();
+        actions = newHashMap();
         for (Class<? extends Action> actionClass : allActionClasses()) {
             Constructor<? extends Action> constructor = actionClass.getConstructor(UiDevice.class);
-            Action action = constructor.newInstance(getUiDevice());
-            Log.d(getClass().getName(), String.format("Registering action: %s", action.name()));
+            Action action = constructor.newInstance(this.uiDevice);
+            Log.d(TAG, String.format("Registering action: %s", action.name()));
             actions.put(action.name(), action);
         }
     }
@@ -35,12 +37,9 @@ public class ActionsExecutor {
         try {
             Action action = actions.get(actionName);
             if (action == null) {
-                return new Result("Action: " + actionName + " does not exists");
+                return new Result("Action: " + actionName + " does not exist");
             }
-
-            Result result = executeWithStopwatch(command, action);
-
-            return result;
+            return executeWithStopwatch(command, action);
         } catch (Exception e) {
             return new Result("Exception, on calling " + actionName, e);
         }
@@ -52,8 +51,8 @@ public class ActionsExecutor {
         Result result = action.execute(command.getArguments());
 
         timer.stop();
-        Log.i(getClass().getName(), String.format("action '%s' took %d ms to execute on the tablet",
-                command.getAction(), timer.elapsed(TimeUnit.MILLISECONDS)));
+        Log.i(TAG, String.format("action '%s' took %d ms to execute on the tablet",
+                command.getAction(), timer.elapsed(MILLISECONDS)));
         return result;
     }
 
@@ -68,6 +67,7 @@ public class ActionsExecutor {
         actionClasses.add(IsButtonPresent.class);
         actionClasses.add(IsElementWithNestedTextPresent.class);
         actionClasses.add(IsChildCountEqualTo.class);
+        actionClasses.add(IsChildCountGreaterThan.class);
         actionClasses.add(Click.class);
         actionClasses.add(ClickAndWaitForNewWindow.class);
         actionClasses.add(LongClick.class);
@@ -84,8 +84,4 @@ public class ActionsExecutor {
         actionClasses.add(ScrollToTextByIndex.class);
         return actionClasses;
     }
-
-    private UiDevice getUiDevice() {
-        return uiDevice;
-    }
 }

data/server/src/main/java/com/amplify/honeydew_server/TestRunner.java

@@ -5,21 +5,22 @@ import android.view.KeyEvent;
 import com.amplify.honeydew_server.httpd.RemoteCommandReceiver;
 import com.android.uiautomator.core.UiDevice;
 import com.android.uiautomator.testrunner.UiAutomatorTestCase;
-import fi.iki.elonen.ServerRunner;
 
 public class TestRunner extends UiAutomatorTestCase {
 
+    private static final String TAG = TestRunner.class.getSimpleName();
+
     public void testRemoteLoop() throws Exception {
-        Log.d(getClass().getName(), "Starting honeydew-server...");
+        Log.d(TAG, "Starting honeydew-server...");
 
         UiDevice uiDevice = getUiDevice();
         uiDevice.wakeUp();
         unlockEmulator();
 
         RemoteCommandReceiver remoteCommandReceiver =  new RemoteCommandReceiver(new ActionsExecutor(uiDevice));
-        ServerRunner.executeInstance(remoteCommandReceiver);
+        remoteCommandReceiver.start();
 
-        Log.d(getClass().getName(), "honeydew-server started, waiting for commands");
+        Log.d(TAG, "honeydew-server started, waiting for commands");
         while(true) {
             Thread.sleep(1000);
         }

data/server/src/main/java/com/amplify/honeydew_server/actions/AbstractChildCountAction.java

@@ -0,0 +1,33 @@
+package com.amplify.honeydew_server.actions;
+
+import android.util.Log;
+import com.amplify.honeydew_server.Action;
+import com.amplify.honeydew_server.Result;
+import com.android.uiautomator.core.UiCollection;
+import com.android.uiautomator.core.UiDevice;
+import com.android.uiautomator.core.UiObjectNotFoundException;
+import com.android.uiautomator.core.UiSelector;
+
+import java.util.Map;
+
+public abstract class AbstractChildCountAction extends Action {
+    public AbstractChildCountAction(UiDevice uiDevice) {
+        super(uiDevice);
+    }
+
+    protected abstract boolean isTrue(int childCount, int count);
+
+    @Override
+    public final Result execute(Map<String, Object> arguments) throws UiObjectNotFoundException {
+        Log.d(TAG, "Entering " + TAG);
+        String parentDescription = (String) arguments.get("parent_description");
+        String childDescription = (String) arguments.get("child_description");
+        int expectedCount = ((Double) arguments.get("child_count")).intValue();
+
+        UiCollection parentElement = new UiCollection(new UiSelector().description(parentDescription));
+        int actualCount = parentElement.getChildCount(new UiSelector().description(childDescription));
+        Log.d(TAG, "Actual count was: " + actualCount + " when " + expectedCount + " was expected");
+        return new Result(isTrue(expectedCount, actualCount), "Actual count was: " + actualCount + " when " + expectedCount + " was expected");
+
+    }
+}

data/server/src/main/java/com/amplify/honeydew_server/actions/IsChildCountEqualTo.java

@@ -1,25 +1,17 @@
 package com.amplify.honeydew_server.actions;
 
-import com.amplify.honeydew_server.*;
-import com.android.uiautomator.core.*;
+import com.android.uiautomator.core.UiDevice;
 
-import java.util.Map;
-
-public class IsChildCountEqualTo extends Action {
+public class IsChildCountEqualTo extends AbstractChildCountAction {
 
     public IsChildCountEqualTo(UiDevice uiDevice) {
         super(uiDevice);
     }
 
     @Override
-    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 = (Integer) arguments.get("child_count");
-
-        UiCollection parentElement = new UiCollection(new UiSelector().description(parentDescription));
-        int count = parentElement.getChildCount(new UiSelector().description(childDescription));
-        return new Result(childCount == count, "Actual count was: " + count + " when " + childCount + " was expected");
+    protected boolean isTrue(int childCount, int count) {
+        return childCount == count;
     }
 
+
 }

data/server/src/main/java/com/amplify/honeydew_server/actions/IsChildCountGreaterThan.java

@@ -0,0 +1,16 @@
+package com.amplify.honeydew_server.actions;
+
+import com.android.uiautomator.core.UiDevice;
+
+public class IsChildCountGreaterThan extends AbstractChildCountAction {
+
+    public IsChildCountGreaterThan(UiDevice uiDevice) {
+        super(uiDevice);
+    }
+
+    @Override
+    protected boolean isTrue(int expectedCount, int actualCount) {
+        return actualCount > expectedCount;
+    }
+
+}

data/server/src/main/java/com/amplify/honeydew_server/httpd/RemoteCommandReceiver.java

@@ -1,7 +1,9 @@
 package com.amplify.honeydew_server.httpd;
 
 import android.util.Log;
-import com.amplify.honeydew_server.*;
+import com.amplify.honeydew_server.ActionsExecutor;
+import com.amplify.honeydew_server.Command;
+import com.amplify.honeydew_server.Result;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import fi.iki.elonen.NanoHTTPD;
@@ -10,15 +12,20 @@ import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.Map;
 
+import static java.lang.String.format;
+
 public class RemoteCommandReceiver extends NanoHTTPD {
 
     private static final String PLAIN_TEXT = "plain/text";
+    public static final Type ARGUMENTS_COLLECTION_TYPE = new TypeToken<Map<String, Object>>() {
+    }.getType();
     private final ActionsExecutor actionsExecutor;
 
-    private final Response statusOkResponse = new Response("honeydew-server is awaiting commands");
-    private final Response terminateOkResponse = new Response("honeydew-server is stopping");
-    private final Response badRequestResponse = new Response(Response.Status.BAD_REQUEST, PLAIN_TEXT, "Unsupported command");
+    private static final Response OK = new Response("honeydew-server is awaiting commands");
+    private static final Response TERMINATED = new Response("honeydew-server is stopping");
+    private final Response BAD_REQUEST = new Response(Response.Status.BAD_REQUEST, PLAIN_TEXT, "Unsupported command");
 
+    private static final String TAG = RemoteCommandReceiver.class.getSimpleName();
     private final Gson jsonParser = new Gson();
 
     public RemoteCommandReceiver(ActionsExecutor actionsExecutor) throws IOException, InterruptedException {
@@ -29,35 +36,43 @@ public class RemoteCommandReceiver extends NanoHTTPD {
     @Override
     public Response serve(String uri, Method method, Map<String, String> headers, Map<String, String> params, Map<String, String> files) {
         if (method == Method.POST && uri.equalsIgnoreCase("/terminate")) {
-            Log.d(getClass().getName(), "Got terminate request, finishing up...");
-            stop();
-            return terminateOkResponse;
-        } else if (method == Method.POST && uri.equalsIgnoreCase("/command")) {
+            return terminate();
+        }
+        if (method == Method.POST && uri.equalsIgnoreCase("/command")) {
             return performCommand(params);
-        } else if (method == Method.GET && uri.equalsIgnoreCase("/status")) {
-            Log.d(getClass().getName(), "Got status request, responding OK");
-            return statusOkResponse;
         }
+        if (method == Method.GET && uri.equalsIgnoreCase("/status")) {
+            return status();
+        }
+
+        return BAD_REQUEST;
+    }
+
+    private Response status() {
+        Log.d(TAG, "Got status request, responding OK");
+        return OK;
+    }
 
-        return badRequestResponse;
+    private Response terminate() {
+        Log.d(TAG, "Got terminate request, finishing up...");
+        stop();
+        return TERMINATED;
     }
 
     private Response performCommand(Map<String, String> params) {
         String action = params.get("action");
         String argumentJson = params.get("arguments");
-        Type argumentCollectionType = new TypeToken<Map<String, Object>>(){}.getType();
-        Map<String, Object> arguments = jsonParser.fromJson(argumentJson, argumentCollectionType);
+        Map<String, Object> arguments = jsonParser.fromJson(argumentJson, ARGUMENTS_COLLECTION_TYPE);
 
-        Log.i(getClass().getName(), String.format("Performing action %s: %s for %s", action, argumentJson, params.toString()));
+        Log.i(TAG, format("Performing action %s: %s for %s", action, argumentJson, params.toString()));
         try {
             Result result = actionsExecutor.execute(new Command(action, arguments));
             if (result.success) {
                 return new Response(result.description);
-            } else {
-                return new Response(Response.Status.NO_CONTENT, null, (String) null);
             }
-        } catch(Exception exception) {
-            Log.e(getClass().getName(), String.format("Server error while processing command %s: %s", action, exception.toString()));
+            return new Response(Response.Status.NO_CONTENT, null, (String) null);
+        } catch (Exception exception) {
+            Log.e(TAG, format("Server error while processing command %s: %s", action, exception.toString()));
             return new Response(Response.Status.INTERNAL_ERROR, PLAIN_TEXT, exception.getMessage());
         }
     }

metadata

@@ -2,7 +2,7 @@
 name: honeydew
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Selvakumar Natesan
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -182,6 +182,7 @@ files:
 - server/src/main/java/com/amplify/honeydew_server/Command.java
 - server/src/main/java/com/amplify/honeydew_server/Result.java
 - server/src/main/java/com/amplify/honeydew_server/TestRunner.java
+- server/src/main/java/com/amplify/honeydew_server/actions/AbstractChildCountAction.java
 - server/src/main/java/com/amplify/honeydew_server/actions/Click.java
 - server/src/main/java/com/amplify/honeydew_server/actions/ClickAndWaitForNewWindow.java
 - server/src/main/java/com/amplify/honeydew_server/actions/DumpWindowHierarchy.java
@@ -189,6 +190,7 @@ files:
 - server/src/main/java/com/amplify/honeydew_server/actions/InspectOptionInSettingsMenu.java
 - server/src/main/java/com/amplify/honeydew_server/actions/IsButtonPresent.java
 - server/src/main/java/com/amplify/honeydew_server/actions/IsChildCountEqualTo.java
+- server/src/main/java/com/amplify/honeydew_server/actions/IsChildCountGreaterThan.java
 - server/src/main/java/com/amplify/honeydew_server/actions/IsElementWithNestedTextPresent.java
 - server/src/main/java/com/amplify/honeydew_server/actions/IsOptionInSettingsMenuDisabled.java
 - server/src/main/java/com/amplify/honeydew_server/actions/IsOptionInSettingsMenuEnabled.java
@@ -210,7 +212,7 @@ files:
 - spec/honeydew/device_matchers_spec.rb
 - spec/honeydew/device_spec.rb
 - spec/spec_helper.rb
-- server/target/honeydew-server-0.20.0.jar
+- server/target/honeydew-server-0.21.0.jar
 homepage:
 licenses: []
 post_install_message: