honeydew 0.1.4 → 0.10.0

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

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

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

@@ -1,8 +1,8 @@
-package com.uiautomator_cucumber.android_server;
+package com.amplify.honeydew;
 
 import android.util.Log;
 import com.android.uiautomator.core.UiDevice;
-import com.uiautomator_cucumber.android_server.actions.*;
+import com.amplify.honeydew.actions.*;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;

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

@@ -1,4 +1,4 @@
-package com.uiautomator_cucumber.android_server;
+package com.amplify.honeydew;
 
 import java.util.Map;
 

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

@@ -1,4 +1,4 @@
-package com.uiautomator_cucumber.android_server;
+package com.amplify.honeydew;
 
 import org.apache.commons.lang.exception.ExceptionUtils;
 

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

@@ -1,9 +1,9 @@
-package com.uiautomator_cucumber.android_server;
+package com.amplify.honeydew;
 
 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.httpd.RemoteCommandReceiver;
 
 public class TestRunner extends UiAutomatorTestCase {
 
@@ -23,4 +23,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}/actions/Click.java

@@ -1,9 +1,9 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew.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.Action;
+import com.amplify.honeydew.Result;
 
 import java.util.Map;
 

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

@@ -1,9 +1,9 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew.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.Action;
+import com.amplify.honeydew.Result;
 
 import java.util.Map;
 

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

@@ -1,9 +1,9 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew.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.Action;
+import com.amplify.honeydew.Result;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

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

@@ -1,9 +1,9 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew.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.Action;
+import com.amplify.honeydew.Result;
 
 import java.util.List;
 import java.util.Map;
@@ -20,4 +20,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}/actions/InspectOptionInSettingsMenu.java

@@ -1,8 +1,8 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew.actions;
 
 import android.widget.TextView;
 import com.android.uiautomator.core.*;
-import com.uiautomator_cucumber.android_server.Result;
+import com.amplify.honeydew.Result;
 
 import java.util.List;
 import java.util.Map;

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

@@ -1,11 +1,11 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew.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.Action;
+import com.amplify.honeydew.Result;
 
 import java.util.Map;
 

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew.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}/actions/IsOptionInSettingsMenuEnabled.java

@@ -1,4 +1,4 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew.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}/actions/IsTextPresent.java

@@ -1,9 +1,9 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew.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.Action;
+import com.amplify.honeydew.Result;
 
 import java.util.Map;
 

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

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

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

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

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

@@ -1,9 +1,9 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew.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.Action;
+import com.amplify.honeydew.Result;
 
 import java.util.Map;
 

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

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

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

@@ -1,8 +1,8 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew.actions;
 
 import com.android.uiautomator.core.*;
-import com.uiautomator_cucumber.android_server.Action;
-import com.uiautomator_cucumber.android_server.Result;
+import com.amplify.honeydew.Action;
+import com.amplify.honeydew.Result;
 
 import java.util.Map;
 
@@ -16,4 +16,4 @@ public class PressEnter extends Action {
         getUiDevice().pressEnter();
         return Result.OK;
     }
-}
+}

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

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

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

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

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

@@ -1,11 +1,11 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew.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.Action;
+import com.amplify.honeydew.Result;
 
 import java.util.Map;
 

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

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

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

@@ -1,11 +1,11 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew.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.Action;
+import com.amplify.honeydew.Result;
 
 import java.util.Map;
 

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

@@ -1,11 +1,11 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew.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.Action;
+import com.amplify.honeydew.Result;
 
 import java.util.Map;
 

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

@@ -1,8 +1,8 @@
-package com.uiautomator_cucumber.android_server.actions;
+package com.amplify.honeydew.actions;
 
 import com.android.uiautomator.core.*;
-import com.uiautomator_cucumber.android_server.Action;
-import com.uiautomator_cucumber.android_server.Result;
+import com.amplify.honeydew.Action;
+import com.amplify.honeydew.Result;
 import android.os.RemoteException;
 
 import java.util.Map;
@@ -21,4 +21,4 @@ public class WakeUp extends Action {
         }
         return Result.OK;
     }
-}
+}

data/{android-server/src/main/java/com/uiautomator_cucumber/android_server → server/src/main/java/com/amplify/honeydew}/httpd/NanoHTTPD.java

@@ -1,4 +1,4 @@
-package com.uiautomator_cucumber.android_server.httpd;
+package com.amplify.honeydew.httpd;
 
 import java.io.*;
 import java.net.ServerSocket;
@@ -1097,4 +1097,4 @@ public class NanoHTTPD
                     "THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n"+
                     "(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n"+
                     "OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.";
-}
+}

data/{android-server/src/main/java/com/uiautomator_cucumber/android_server → server/src/main/java/com/amplify/honeydew}/httpd/RemoteCommandReceiver.java

@@ -1,10 +1,10 @@
-package com.uiautomator_cucumber.android_server.httpd;
+package com.amplify.honeydew.httpd;
 
 import android.util.Log;
 import com.google.gson.Gson;
-import com.uiautomator_cucumber.android_server.ActionsExecutor;
-import com.uiautomator_cucumber.android_server.Command;
-import com.uiautomator_cucumber.android_server.Result;
+import com.amplify.honeydew.ActionsExecutor;
+import com.amplify.honeydew.Command;
+import com.amplify.honeydew.Result;
 
 import java.io.File;
 import java.io.IOException;
@@ -61,4 +61,4 @@ public class RemoteCommandReceiver extends NanoHTTPD {
     private void log(String uri, String method, Properties params) {
         Log.d(TAG, String.format("Processing uri: %s, method: %s, params: %s", uri, method, params));
     }
-}
+}

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: Honeydew.config.timeout)
 
       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: Honeydew.config.timeout)
 
       device.has_textview_with_text_and_description? text, description
     end
-
   end
-end
+end