honeydew 0.14.0 → 0.15.0

data/lib/honeydew/device.rb

@@ -38,6 +38,8 @@ module Honeydew
     def perform_assertion action, arguments = {}, options = {}
       ensure_device_ready
 
+      arguments[:timeout] = Honeydew.config.timeout.to_s
+
       log "performing assertion #{action} with arguments #{arguments}"
       Timeout.timeout Honeydew.config.timeout.to_i, FinderTimeout do
         begin
@@ -53,7 +55,7 @@ module Honeydew
 
     def perform_action action, arguments = {}, options = {}
       ensure_device_ready
-
+      arguments[:timeout] = Honeydew.config.timeout.to_s
       log "performing action #{action} with arguments #{arguments}"
       send_command action, arguments
     end

data/lib/honeydew/version.rb

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

data/server/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>amplify</groupId>
     <artifactId>honeydew-server</artifactId>
-    <version>0.14.0</version>
+    <version>0.15.0</version>
     <packaging>jar</packaging>
     <name>Honeydew Android Server</name>
 

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

@@ -23,6 +23,14 @@ public abstract class Action {
         return uiDevice;
     }
 
+    private Integer getTimeoutInMs(Map<String, Object> arguments){
+        return Integer.parseInt((String) arguments.get("timeout")) * 1000;
+    }
+
+    protected boolean isUiObjectAvailable(UiObject uiObject, Map<String, Object> arguments){
+       return uiObject.waitForExists(getTimeoutInMs(arguments));
+    }
+
     protected UiObject getUiObject(Map<String, Object> arguments) {
         ViewSelector viewSelector = getViewSelector(arguments);
         return viewSelector.find();

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

@@ -3,6 +3,7 @@ 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.UiObject;
 import com.android.uiautomator.core.UiObjectNotFoundException;
 
 import java.util.Map;
@@ -14,7 +15,13 @@ public class Click extends Action {
 
     @Override
     public Result execute(Map<String, Object> arguments) throws UiObjectNotFoundException {
-        getUiObject(arguments).click();
-        return Result.OK;
+        final UiObject uiObject = getUiObject(arguments);
+
+        if (isUiObjectAvailable(uiObject, arguments)) {
+            uiObject.click();
+            return Result.OK;
+        }
+
+        return Result.FAILURE;
     }
 }

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

@@ -1,6 +1,7 @@
 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.amplify.honeydew_server.Action;
 import com.amplify.honeydew_server.Result;
@@ -14,7 +15,13 @@ public class ClickAndWaitForNewWindow extends Action {
 
     @Override
     public Result execute(Map<String, Object> arguments) throws UiObjectNotFoundException {
-        getUiObject(arguments).clickAndWaitForNewWindow();
-        return Result.OK;
+        final UiObject uiObject = getUiObject(arguments);
+
+        if (isUiObjectAvailable(uiObject, arguments)) {
+            uiObject.clickAndWaitForNewWindow();
+            return Result.OK;
+        }
+
+        return Result.FAILURE;
     }
 }

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

@@ -15,8 +15,9 @@ public class HasSettingsMenuItem extends Action {
     @Override
     public Result execute(Map<String, Object> arguments) throws UiObjectNotFoundException {
         String menuName = (String) arguments.get("menuName");
+
         UiScrollable settingsMenu = new UiScrollable(new UiSelector().scrollable(true).focused(true));
         UiObject menuItem = settingsMenu.getChildByText(new UiSelector().className(TextView.class.getName()), menuName);
-        return menuItem.exists() ? Result.OK : Result.FAILURE;
+        return isUiObjectAvailable(menuItem, arguments) ? Result.OK : Result.FAILURE;
     }
 }

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

@@ -21,9 +21,13 @@ public abstract class InspectOptionInSettingsMenu extends SelectMenuInSettings {
         List<String> optionNames = (List<String>)arguments.get("optionNames");
         UiScrollable optionsMenu = new UiScrollable(new UiSelector().className("android.widget.ListView").packageName("com.android.settings").focused(false));
 
+        if(!isUiObjectAvailable(optionsMenu, arguments)){
+            return Result.FAILURE;
+        }
+
         for (String optionName : optionNames) {
             UiObject option = optionsMenu.getChildByText(new UiSelector().className(TextView.class.getName()), optionName);
-            if (!enabled.equals(option.isEnabled())) {
+            if (!isUiObjectAvailable(option, arguments) && !enabled.equals(option.isEnabled())) {
                 return Result.FAILURE;
             }
         }

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

@@ -18,6 +18,6 @@ public class IsButtonPresent extends Action {
     public Result execute(Map<String, Object> arguments) throws UiObjectNotFoundException {
         String text = (String) arguments.get("text");
         UiObject textView = new UiObject(new UiSelector().className(android.widget.Button.class.getName()).textContains(text));
-        return textView.exists() ? Result.OK : Result.FAILURE;
+        return isUiObjectAvailable(textView, arguments) ? Result.OK : Result.FAILURE;
     }
 }

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

@@ -1,8 +1,12 @@
 package com.amplify.honeydew_server.actions;
 
-import com.android.uiautomator.core.*;
 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.UiObject;
+import com.android.uiautomator.core.UiObjectNotFoundException;
+import com.android.uiautomator.core.UiSelector;
 
 import java.util.Map;
 
@@ -18,7 +22,8 @@ public class IsElementWithNestedTextPresent extends Action {
 
         UiCollection parentElement = new UiCollection(new UiSelector().description(parentDescription));
         UiObject child = parentElement.getChild(new UiSelector().text(childText));
-        return child.exists() ? Result.OK : Result.FAILURE;
+
+        return isUiObjectAvailable(child, arguments) ? Result.OK : Result.FAILURE;
     }
 
 }

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

@@ -14,6 +14,6 @@ public class IsTextPresent extends Action {
 
     @Override
     public Result execute(Map<String, Object> arguments) throws UiObjectNotFoundException {
-        return getUiObject(arguments).exists() ? Result.OK : Result.FAILURE;
+        return isUiObjectAvailable(getUiObject(arguments), arguments) ? Result.OK : Result.FAILURE;
     }
 }

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

@@ -15,11 +15,22 @@ public class LaunchApp extends Action {
     public Result execute(Map<String, Object> arguments) throws UiObjectNotFoundException {
         String appName = (String) arguments.get("appName");
         getUiDevice().pressHome();
-        new UiObject(new UiSelector().description("Apps")).click();
+        final UiObject uiObject = new UiObject(new UiSelector().description("Apps"));
+
+        if(isUiObjectAvailable(uiObject,arguments)){
+            uiObject.click();
+        }else{
+            return Result.FAILURE;
+        }
 
         UiScrollable appViews = new UiScrollable(new UiSelector().scrollable(true));
-        appViews.setAsHorizontalList();
-        appViews.getChildByText(new UiSelector().className(android.widget.TextView.class.getName()), appName).clickAndWaitForNewWindow();
-        return Result.OK;
+
+        if(isUiObjectAvailable(appViews, arguments)){
+            appViews.setAsHorizontalList();
+            appViews.getChildByText(new UiSelector().className(android.widget.TextView.class.getName()), appName).clickAndWaitForNewWindow();
+            return Result.OK;
+        }
+
+        return Result.FAILURE;
     }
 }

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

@@ -1,6 +1,7 @@
 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.amplify.honeydew_server.Action;
 import com.amplify.honeydew_server.Result;
@@ -14,7 +15,13 @@ public class LongClick extends Action {
 
     @Override
     public Result execute(Map<String, Object> arguments) throws UiObjectNotFoundException {
-        getUiObject(arguments).longClick();
-        return Result.OK;
+        final UiObject uiObject = getUiObject(arguments);
+
+        if(isUiObjectAvailable(uiObject, arguments)){
+            uiObject.longClick();
+            return Result.OK;
+        }
+
+        return Result.FAILURE;
     }
 }

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

@@ -22,6 +22,11 @@ public class ScrollToTextByIndex extends Action {
         UiSelector scrollSelector = new UiSelector().scrollable(true).index(index);
         UiScrollable uiScrollable = new UiScrollable(scrollSelector);
 
-        return uiScrollable.scrollTextIntoView(text) ? Result.OK : Result.FAILURE;
+        if(isUiObjectAvailable(uiScrollable, arguments)){
+            uiScrollable.scrollTextIntoView(text);
+            return Result.OK;
+        }
+
+        return Result.FAILURE;
     }
 }

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

@@ -1,5 +1,6 @@
 package com.amplify.honeydew_server.actions;
 
+import android.widget.TextView;
 import com.android.uiautomator.core.*;
 import com.amplify.honeydew_server.Action;
 import com.amplify.honeydew_server.Result;
@@ -13,12 +14,23 @@ 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));
+
+        if (!isUiObjectAvailable(settingsMenu, arguments)) {
+            return Result.FAILURE;
+        }
+
         settingsMenu.setAsVerticalList();
+        final UiSelector childPattern = new UiSelector().className(TextView.class.getName());
+        final UiObject childByText = settingsMenu.getChildByText(childPattern, appName);
+
+        if (isUiObjectAvailable(childByText, arguments)) {
+            childByText.click();
+            return Result.OK;
+        }
 
-        (settingsMenu.getChildByText(new UiSelector().className(android.widget.TextView.class.getName()),appName)).click();
-        return Result.OK;
+        return Result.FAILURE;
     }
 }

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

@@ -1,5 +1,6 @@
 package com.amplify.honeydew_server.actions;
 
+import android.widget.TextView;
 import com.android.uiautomator.core.*;
 import com.amplify.honeydew_server.Action;
 import com.amplify.honeydew_server.Result;
@@ -14,9 +15,19 @@ public class SelectMenuInSettings extends Action {
     @Override
     public Result execute(Map<String, Object> arguments) throws UiObjectNotFoundException {
         String menuName = (String) arguments.get("menuName");
-        UiScrollable settingsMenu = new UiScrollable(new UiSelector().scrollable(true).focused(true));
 
-        (settingsMenu.getChildByText(new UiSelector().className(android.widget.TextView.class.getName()),menuName)).click();
-        return Result.OK;
+        final UiScrollable settingsMenu = new UiScrollable(new UiSelector().scrollable(true).focused(true));
+        if(!isUiObjectAvailable(settingsMenu,arguments)){
+            return Result.FAILURE;
+        }
+
+        final UiSelector childPattern = new UiSelector().className(TextView.class.getName());
+        final UiObject childByText = settingsMenu.getChildByText(childPattern, menuName);
+        if (isUiObjectAvailable(childByText, arguments)) {
+            childByText.click();
+            return Result.OK;
+        }
+
+        return Result.FAILURE;
     }
 }

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

@@ -19,9 +19,15 @@ public class SetText extends Action {
     public Result execute(Map<String, Object> arguments) throws UiObjectNotFoundException {
         String textDescription = (String) arguments.get("description");
         String text = (String) arguments.get("text");
+
         UiObject textField = new UiObject(new UiSelector().description(textDescription));
-        textField.setText(text);
-        uiDevice.pressDPadDown();
-        return Result.OK;
+
+        if(isUiObjectAvailable(textField, arguments)){
+            textField.setText(text);
+            uiDevice.pressDPadDown();
+            return Result.OK;
+        }
+
+        return Result.FAILURE;
     }
 }

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

@@ -1,10 +1,13 @@
 package com.amplify.honeydew_server.actions;
 
-import android.util.*;
-import com.android.uiautomator.core.*;
-import com.amplify.honeydew_server.*;
+import com.amplify.honeydew_server.Action;
+import com.amplify.honeydew_server.Result;
+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 java.util.*;
+import java.util.Map;
 
 public class SetTextByIndex extends Action {
 
@@ -14,12 +17,15 @@ public class SetTextByIndex extends Action {
 
     @Override
     public Result execute(Map<String, Object> arguments) throws UiObjectNotFoundException {
-        Log.i("SetTextByIndex", "Found index field: " + arguments.get("index"));
         int index = Integer.parseInt((String) arguments.get("index"));
         String text = (String) arguments.get("text");
         UiObject textField = new UiObject(new UiSelector().className("android.widget.EditText").index(index));
-        Log.i("SetTextByIndex", "Found text field: " + textField);
-        textField.setText(text);
-        return Result.OK;
+
+        if (isUiObjectAvailable(textField, arguments)) {
+            textField.setText(text);
+            return Result.OK;
+        }
+
+        return Result.FAILURE;
     }
 }

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

@@ -19,10 +19,14 @@ public class SetTextByLabel extends Action {
     public Result execute(Map<String, Object> arguments) throws UiObjectNotFoundException {
         String label = (String) arguments.get("label");
         String inputText = (String) arguments.get("text");
-        UiObject textField = null;
-        textField = new UiObject(new UiSelector().text(label));
-        textField.setText(inputText);
-        uiDevice.pressDPadDown();
-        return Result.OK;
+        UiObject textField = new UiObject(new UiSelector().text(label));
+
+        if (isUiObjectAvailable(textField, arguments)) {
+            textField.setText(inputText);
+            uiDevice.pressDPadDown();
+            return Result.OK;
+        }
+
+        return Result.FAILURE;
     }
 }

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

@@ -1,11 +1,11 @@
 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.UiObject;
 import com.android.uiautomator.core.UiObjectNotFoundException;
 import com.android.uiautomator.core.UiSelector;
-import com.amplify.honeydew_server.Action;
-import com.amplify.honeydew_server.Result;
 
 import java.util.Map;
 
@@ -17,9 +17,9 @@ public class Unlock extends Action {
     @Override
     public Result execute(Map<String, Object> arguments) throws UiObjectNotFoundException {
         UiObject uiObject = new UiObject(new UiSelector().description("Slide area."));
-        uiObject = uiObject.exists() ? uiObject : new UiObject(new UiSelector().className("android.view.View"));
+        uiObject = isUiObjectAvailable(uiObject, arguments) ? uiObject : new UiObject(new UiSelector().className("android.view.View"));
         try {
-            if (uiObject.exists()) {
+            if (isUiObjectAvailable(uiObject, arguments)) {
                 uiObject.swipeRight(100);
             }
         } catch (UiObjectNotFoundException e) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeydew
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -198,7 +198,7 @@ files:
 - spec/honeydew/device_matchers_spec.rb
 - spec/honeydew/device_spec.rb
 - spec/spec_helper.rb
-- server/target/honeydew-server-0.14.0.jar
+- server/target/honeydew-server-0.15.0.jar
 homepage: 
 licenses: []
 post_install_message: