honeydew 0.10.0 → 0.11.0

data/README.md

@@ -1,9 +1,6 @@
 # Honeydew
 
-NOTE: Honeydew is currently in alpha and is not quite ready for use.
-
-Honeydew is a Ruby driver for UIAutomator which enables automated testing of
-Android devices.
+TODO: Write a gem description
 
 ## Installation
 

data/Rakefile

@@ -11,7 +11,7 @@ task :build_android_server do
 end
 
 def android_server_path
-  File.absolute_path(File.join(File.dirname(__FILE__), 'server'))
+  File.absolute_path(File.join(File.dirname(__FILE__), 'android-server'))
 end
 
-task :build => [:spec, :build_android_server]
+task :build => [:spec, :build_android_server]

data/{server → android-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>amplify</groupId>
-    <artifactId>honeydew-server</artifactId>
-    <version>0.10.0</version>
+    <groupId>uiautomator-cucumber</groupId>
+    <artifactId>android-server</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
-    <name>Honeydew Android Server</name>
+    <name>UIAutomator Cucumber - Android Server</name>
 
     <properties>
         <platform.version>4.1.1.4</platform.version>
@@ -105,7 +105,7 @@
                         <skip>false</skip>
                         <testClassOrMethods>
                             <testClassOrMethod>
-                                com.amplify.honeydew.TestRunner
+                                com.uiautomator_cucumber.android_server.TestRunner
                             </testClassOrMethod>
                         </testClassOrMethods>
                         <createReport>true</createReport>

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

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

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

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

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

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

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

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

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

@@ -1,9 +1,9 @@
-package com.amplify.honeydew;
+package com.uiautomator_cucumber.android_server;
 
 import android.view.KeyEvent;
 import com.android.uiautomator.core.UiDevice;
 import com.android.uiautomator.testrunner.UiAutomatorTestCase;
-import com.amplify.honeydew.httpd.RemoteCommandReceiver;
+import com.uiautomator_cucumber.android_server.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/{server/src/main/java/com/amplify/honeydew → android-server/src/main/java/com/uiautomator_cucumber/android_server}/actions/Click.java

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

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

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

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

@@ -1,9 +1,9 @@
-package com.amplify.honeydew.actions;
+package com.uiautomator_cucumber.android_server.actions;
 
 import com.android.uiautomator.core.UiDevice;
 import com.android.uiautomator.core.UiObjectNotFoundException;
-import com.amplify.honeydew.Action;
-import com.amplify.honeydew.Result;
+import com.uiautomator_cucumber.android_server.Action;
+import com.uiautomator_cucumber.android_server.Result;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

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

@@ -1,9 +1,9 @@
-package com.amplify.honeydew.actions;
+package com.uiautomator_cucumber.android_server.actions;
 
 import android.widget.TextView;
 import com.android.uiautomator.core.*;
-import com.amplify.honeydew.Action;
-import com.amplify.honeydew.Result;
+import com.uiautomator_cucumber.android_server.Action;
+import com.uiautomator_cucumber.android_server.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/{server/src/main/java/com/amplify/honeydew → android-server/src/main/java/com/uiautomator_cucumber/android_server}/actions/InspectOptionInSettingsMenu.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,8 +1,8 @@
-package com.amplify.honeydew.actions;
+package com.uiautomator_cucumber.android_server.actions;
 
 import com.android.uiautomator.core.*;
-import com.amplify.honeydew.Action;
-import com.amplify.honeydew.Result;
+import com.uiautomator_cucumber.android_server.Action;
+import com.uiautomator_cucumber.android_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 → android-server/src/main/java/com/uiautomator_cucumber/android_server}/actions/SelectFromAppsList.java

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,8 +1,8 @@
-package com.amplify.honeydew.actions;
+package com.uiautomator_cucumber.android_server.actions;
 
 import com.android.uiautomator.core.*;
-import com.amplify.honeydew.Action;
-import com.amplify.honeydew.Result;
+import com.uiautomator_cucumber.android_server.Action;
+import com.uiautomator_cucumber.android_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 → android-server/src/main/java/com/uiautomator_cucumber/android_server}/httpd/NanoHTTPD.java

@@ -1,4 +1,4 @@
-package com.amplify.honeydew.httpd;
+package com.uiautomator_cucumber.android_server.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/{server/src/main/java/com/amplify/honeydew → android-server/src/main/java/com/uiautomator_cucumber/android_server}/httpd/RemoteCommandReceiver.java

@@ -1,10 +1,10 @@
-package com.amplify.honeydew.httpd;
+package com.uiautomator_cucumber.android_server.httpd;
 
 import android.util.Log;
 import com.google.gson.Gson;
-import com.amplify.honeydew.ActionsExecutor;
-import com.amplify.honeydew.Command;
-import com.amplify.honeydew.Result;
+import com.uiautomator_cucumber.android_server.ActionsExecutor;
+import com.uiautomator_cucumber.android_server.Command;
+import com.uiautomator_cucumber.android_server.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/example/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'honeydew'
-gem 'rspec'
-gem 'rake'
+gem 'honeydew', :path => File.join(File.dirname(__FILE__), '..')
+gem 'cucumber'
+gem 'rake'

data/honeydew.gemspec

@@ -6,13 +6,11 @@ require 'honeydew/version'
 Gem::Specification.new do |spec|
   spec.name          = "honeydew"
   spec.version       = Honeydew::VERSION
-  spec.authors       = ["Selvakumar Natesan", "Christopher Rex", "Shyam Vala", "John Barker"]
-  spec.email         = ["scmp-team@amplify.com", "jbarker@amplify.com"]
-  spec.summary       = %q{Ruby DSL for controlling Android devices}
-  spec.description   = <<-EOF
-Honeydew is a Ruby driver for UIAutomator which enables automated testing of
-Android devices.
-  EOF
+  spec.authors       = ["Selva", "Christopher Rex"]
+  spec.email         = ["scmp-team@amplify.com"]
+  spec.description   = %q{Automated functional testing on Android with uiautomator and cucumber}
+  spec.summary       = %q{Automated functional testing on Android with uiautomator and cucumber}
+  spec.homepage      = ""
 
   spec.files         = `git ls-files`.split($/) + Dir['android-server/target/*.jar']
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -23,6 +21,7 @@ Android devices.
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 
+  spec.add_dependency("cucumber")
   spec.add_dependency("json")
   spec.add_dependency("rest-client")
   spec.add_dependency("activesupport")

data/lib/honeydew/device.rb

@@ -18,15 +18,24 @@ module Honeydew
     end
 
     def contains_textview_text?(text, timeout = Honeydew.config.timeout)
-      has_textview_text? text, timeout
+      response = has_textview_text? text, timeout
+      response['success']
+    rescue
+      false
     end
 
     def contains_element_with_description?(description, timeout = Honeydew.config.timeout)
-       has_element_with_description? description, timeout
+      response = has_element_with_description? description, timeout
+      response['success']
+    rescue
+      false
     end
 
     def contains_button?(text, timeout = Honeydew.config.timeout)
-      has_button? text, timeout
+      response = has_button? text, timeout
+      response['success']
+    rescue
+      false
     end
 
     def is_app_installed?(package_name)