honeydew 0.12.0 → 0.14.0

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

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

data/{android-server/src/main/java/com/uiautomator_cucumber/android_server → server/src/main/java/com/amplify/honeydew_server}/actions/IsTextPresent.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/LaunchApp.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/LaunchHome.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/LongClick.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/PressBack.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/PressEnter.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,4 +16,4 @@ public class PressEnter extends Action {
         getUiDevice().pressEnter();
         return Result.OK;
     }
-}
+}

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

@@ -0,0 +1,27 @@
+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.*;
+
+import java.util.Map;
+
+public class ScrollToTextByIndex extends Action {
+    public ScrollToTextByIndex(UiDevice uiDevice) {
+        super(uiDevice);
+    }
+
+    @Override
+    public Result execute(Map<String, Object> arguments) throws UiObjectNotFoundException {
+        Log.i("ScrollToTextByIndex", "Found index field: " + arguments.get("index"));
+
+        String text = (String) arguments.get("text");
+        int index = Integer.parseInt((String) arguments.get("index"));
+
+        UiSelector scrollSelector = new UiSelector().scrollable(true).index(index);
+        UiScrollable uiScrollable = new UiScrollable(scrollSelector);
+
+        return uiScrollable.scrollTextIntoView(text) ? Result.OK : Result.FAILURE;
+    }
+}

data/{android-server/src/main/java/com/uiautomator_cucumber/android_server → server/src/main/java/com/amplify/honeydew_server}/actions/SelectFromAppsList.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;
 
@@ -13,7 +13,7 @@ public class SelectFromAppsList extends Action {
 
     @Override
     public Result execute(Map<String, Object> arguments) throws UiObjectNotFoundException {
-        String appName = (String) arguments.get("appName");
+        String appName = (String)arguments.get("appName");
         //TODO: Using a better selector
         UiScrollable settingsMenu = new UiScrollable(new UiSelector().scrollable(true).focused(false));
         settingsMenu.setAsVerticalList();

data/{android-server/src/main/java/com/uiautomator_cucumber/android_server → server/src/main/java/com/amplify/honeydew_server}/actions/SelectMenuInSettings.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/SetText.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/SetTextByIndex.java

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

data/{android-server/src/main/java/com/uiautomator_cucumber/android_server → server/src/main/java/com/amplify/honeydew_server}/actions/SetTextByLabel.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/Unlock.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/WakeUp.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 android.os.RemoteException;
 
 import java.util.Map;
@@ -21,4 +21,4 @@ public class WakeUp extends Action {
         }
         return Result.OK;
     }
-}
+}

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

@@ -0,0 +1,66 @@
+package com.amplify.honeydew_server.httpd;
+
+import android.util.Log;
+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;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Map;
+
+public class RemoteCommandReceiver extends NanoHTTPD {
+
+    private static final String PLAIN_TEXT = "plain/text";
+    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 final Gson jsonParser = new Gson();
+
+    public RemoteCommandReceiver(ActionsExecutor actionsExecutor) throws IOException, InterruptedException {
+        super(7120);
+        this.actionsExecutor = actionsExecutor;
+    }
+
+    @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")) {
+            stop();
+            return terminateOkResponse;
+        } else if (method == Method.POST && uri.equalsIgnoreCase("/command")) {
+            return performCommand(params);
+        } else if (method == Method.GET && uri.equalsIgnoreCase("/status")) {
+            return statusOkResponse;
+        }
+
+        return badRequestResponse;
+    }
+
+    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);
+
+        Log.i(getClass().getName(), String.format("Performing action %s: %s for %s", action, argumentJson, params.toString()));
+        try {
+            Result result = actionsExecutor.execute(new Command(action, arguments));
+            if (result.success == true) {
+                return new Response(result.description);
+            } else {
+                // TODO: NanoHTTPD does not provide a particularly complete set of status codes, so use 416 for now
+                return new Response(Response.Status.RANGE_NOT_SATISFIABLE, PLAIN_TEXT, result.errorMessage);
+            }
+        } catch(Exception exception) {
+            Log.e(getClass().getName(), String.format("Server error while processing command %s: %s", action, exception.toString()));
+            return new Response(Response.Status.INTERNAL_ERROR, PLAIN_TEXT, exception.toString());
+        }
+    }
+}

data/spec/honeydew/device_matchers_spec.rb

@@ -1,58 +1,37 @@
 require 'spec_helper'
 
 describe Honeydew::DeviceMatchers do
-
-  class DeviceTest
-    include Honeydew::DeviceMatchers
-    def perform_action; end
+  let(:device) do
+    Class.new do
+      include Honeydew::DeviceMatchers
+      def perform_assertion; end
+    end.new
   end
 
-  let (:device) { DeviceTest.new }
-
-  describe "#has_textview_text" do
-    let (:text) { "some text" }
-
-    it "should perform action for is_text_present" do
-      device.should_receive(:perform_action).with(hash_including({action: "is_text_present"}))
-
-      device.has_textview_text? text
-    end
-
-    it "should retry for a default timeout" do
-      device.should_receive(:perform_action).with(hash_including({retry_until: Honeydew.config.timeout}))
-
-      device.has_textview_text? text
-    end
+  describe '#has_textview_text' do
+    let(:text) { 'some text' }
 
-    it "should pass the arguments for the text view" do
-      device.should_receive(:perform_action).with(hash_including({arguments: { text: text, type: 'TextView'}}))
+    it 'should perform action for is_text_present' do
+      device.should_receive(:perform_assertion)
+        .with(:is_text_present,
+              hash_including(text: text, type: 'TextView'),
+              timeout: nil)
 
       device.has_textview_text? text
     end
-
   end
 
-  describe "#has_textview_with_text_and_description" do
-    let (:text) { "some text" }
-    let (:description) { "some description" }
-
-    it "should perform action for is_text_present" do
-      device.should_receive(:perform_action).with(hash_including({action: "is_text_present"}))
-
-      device.has_textview_with_text_and_description? text, description
-    end
-
-    it "should retry for a default timeout" do
-      device.should_receive(:perform_action).with(hash_including({retry_until: Honeydew.config.timeout}))
+  describe '#has_textview_with_text_and_description' do
+    let(:text) { 'some text' }
+    let(:description) { 'some description' }
 
-      device.has_textview_with_text_and_description? text, description
-    end
-
-    it "should pass the arguments for the text view" do
-      device.should_receive(:perform_action).with(hash_including({arguments: { text: text, description: description, type: 'TextView'}}))
+    it 'performs the is_text_present action' do
+      device.should_receive(:perform_assertion)
+        .with(:is_text_present,
+              hash_including(text: text, type: 'TextView'),
+              timeout: nil)
 
       device.has_textview_with_text_and_description? text, description
     end
-
   end
-end
+end

data/spec/honeydew/device_spec.rb

@@ -1,66 +1,68 @@
 require 'spec_helper'
 
-describe Honeydew::Device, :silence_puts do
-  let(:response) { "{ \"success\": true }" }
-  let(:command)  { {"action" => '', "arguments" => {}} }
-  let(:serial)   { "ABC123DEF" }
+describe Honeydew::Device do
+  let(:response) { '{"success": true }' }
+  let(:device)   { Honeydew::Device.new('ABC123DEF') }
+  let(:device_end_point) do
+    "http://127.0.0.1:#{device.port}"
+  end
 
   before do
-    @device =  Honeydew::Device.new serial
-    @device_end_point = "http://127.0.0.1:#{@device.port}"
-    RestClient.stub(:get).with(@device_end_point, params: { "command" => command}).and_return(response)
+    Net::HTTP.stub(:post_form).and_return(response)
   end
 
-  describe "contains_textview_text?" do
-    let(:text)     { "Ok" }
-    let(:command)  { {"action" => 'is_text_present', "arguments" => {"text" => text, "type" => 'TextView'}} }
+  describe '#contains_textview_text?' do
+    let(:text)     { 'Ok' }
+    let(:command)  do
+      {'action' => 'is_text_present',
+       'arguments' => {'text' => text, 'type' => 'TextView'}}
+    end
 
-    it "should make the call with command is_text_present" do
-      RestClient.should_receive(:get).with(@device_end_point, params: { "command" => command}).and_return(response)
-      @device.contains_textview_text?(text)
+    it 'should make the call with command is_text_present' do
+      Net::HTTP.should_receive(:post_form).with(device_end_point, params: {'command' => command})
+      device.contains_textview_text?(text)
     end
 
-    context "on successful response" do
-      let(:response) { "{ \"success\": true }" }
+    context 'on successful response' do
+      let(:response) { '{ "success": true }' }
 
-      it "should return true" do
-        @device.contains_textview_text?(text).should be_true
+      it 'should return true' do
+        device.contains_textview_text?(text).should be_true
       end
     end
 
-    context "on failure response" do
-      let(:response) { "{ \"success\": false }" }
+    context 'on failure response' do
+      let(:response) { '{ "success": false }' }
 
-      it "should return false" do
-        @device.contains_textview_text?(text).should be_false
+      it 'should return false' do
+        device.contains_textview_text?(text).should be_false
       end
     end
   end
 
-  describe "contains_button?" do
-    let(:text)     { "Ok" }
-    let(:command)  { {"action" => 'is_button_present', "arguments" => {"text" => text}} }
+  describe '#contains_button?' do
+    let(:text)     { 'Ok' }
+    let(:command)  { {'action' => 'is_button_present', 'arguments' => {'text' => text}} }
 
-    it "should make the call with command is_button_present" do
-      RestClient.should_receive(:get).with(@device_end_point, params: { "command" => command}).and_return(response)
-      @device.contains_button?(text)
+    it 'should make the call with command is_button_present' do
+      Net::HTTP.should_receive(:post_form).with(device_end_point, params: {'command' => command})
+      device.contains_button?(text)
     end
 
-    context "on successful response" do
-      let(:response) { "{ \"success\": true }" }
+    context 'on successful response' do
+      let(:response) { '{ "success": true }' }
 
-      it "should return true" do
-        @device.contains_button?(text).should be_true
+      it 'should return true' do
+        device.contains_button?(text).should be_true
       end
     end
 
-    context "on failure response" do
-      let(:response) { "{ \"success\": false }" }
+    context 'on failure response' do
+      let(:response) { '{ "success": false }' }
 
-      it "should return false" do
-        @device.contains_button?(text).should be_false
+      it 'should return false' do
+        device.contains_button?(text).should be_false
       end
     end
   end
-
 end