calabash-android 0.5.1 → 0.5.2.pre1

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/PressKey.java

@@ -0,0 +1,85 @@
+package sh.calaba.instrumentationbackend.actions.softkey;
+
+import android.app.Instrumentation;
+import android.view.KeyEvent;
+
+import java.lang.reflect.Field;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+public class PressKey implements Action {
+    @Override
+    public Result execute(String ... args) {
+        if (args.length != 1) {
+            return Result.failedResult("This action takes one argument ([String/int] key).");
+        }
+
+        String keyString = args[0];
+        Integer keyCode = null;
+
+        if (isNumber(keyString)) {
+            keyCode = Integer.parseInt(keyString);
+        } else {
+            keyCode = getKey(keyString);
+        }
+        
+        if (keyCode == null || keyCode < 0) {
+            return Result.failedResult("Could not find key code from argument '" + keyString + "'");
+        }
+
+        Instrumentation instrumentation = InstrumentationBackend.instrumentation;
+        Exception securityException = new SecurityException();
+
+        for (int i = 0; i < 10; i++) { // Retry sending the key 10 times
+            try {
+                instrumentation.sendKeyDownUpSync(keyCode);
+
+                return Result.successResult();
+            } catch (SecurityException e) {
+                securityException = e;
+
+                // Sleep and try again
+                try {
+                    Thread.sleep(200);
+                } catch (InterruptedException interruptedException) {
+
+                }
+            }
+        }
+
+        // The input event injection failed. This is most likely due to the application not having focus
+        throw new SecurityException(securityException);
+    }
+
+    @Override
+    public String key() {
+        return "press_key";
+    }
+
+    public static Integer getKey(String keyName) {
+        keyName = keyName.toUpperCase();
+
+        Class<?> keyEventClass = KeyEvent.class;
+        try {
+            Field field = keyEventClass.getField(keyName);
+            
+            return field.getInt(null);
+        } catch (NoSuchFieldException e) {
+            return null;
+        } catch (IllegalAccessException e) {
+            return null;
+        }
+    }
+
+    private static boolean isNumber(String string) {
+        try {
+            Integer.parseInt(string);
+
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
+    }
+}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/HideSoftKeyboard.java

@@ -5,6 +5,8 @@ import android.content.Context;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 
+import java.lang.reflect.Field;
+
 import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.Result;
 import sh.calaba.instrumentationbackend.actions.Action;
@@ -16,7 +18,13 @@ public class HideSoftKeyboard implements Action {
         InputMethodManager inputMethodManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
 
         Activity activity = InstrumentationBackend.solo.getCurrentActivity();
-        View view = activity.getCurrentFocus();
+        View view;
+
+        view = tryGetServedView();
+
+        if (view == null) {
+            view = activity.getCurrentFocus();
+        }
 
         if (view == null) {
             view = new View(activity);
@@ -27,8 +35,22 @@ public class HideSoftKeyboard implements Action {
         return Result.successResult();
     }
 
+    View tryGetServedView() {
+        Context context = InstrumentationBackend.instrumentation.getTargetContext();
+
+        try {
+            InputMethodManager inputMethodManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+            Field servedViewField = InputMethodManager.class.getDeclaredField("mServedView");
+            servedViewField.setAccessible(true);
+
+            return (View)servedViewField.get(inputMethodManager);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
     @Override
     public String key() {
         return "hide_soft_keyboard";
     }
-}
+}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/PressUserActionButton.java

@@ -0,0 +1,128 @@
+package sh.calaba.instrumentationbackend.actions.text;
+
+import android.app.Activity;
+import android.content.Context;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputMethodManager;
+
+import java.lang.Integer;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.HashMap;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+public class PressUserActionButton implements Action {
+    private static Map<String,Integer> actionCodeMap;
+
+    static {
+        actionCodeMap = new HashMap<String, Integer>();
+        actionCodeMap.put("normal", 0);
+        actionCodeMap.put("unspecified", 0);
+        actionCodeMap.put("none", 1);
+        actionCodeMap.put("go", 2);
+        actionCodeMap.put("search", 3);
+        actionCodeMap.put("send", 4);
+        actionCodeMap.put("next", 5);
+        actionCodeMap.put("done", 6);
+        actionCodeMap.put("previous", 7);
+    }
+
+    @Override
+    public Result execute(String... args) {
+        if (args.length > 1) {
+            return Result.failedResult("This action takes zero arguments or one argument ([String] action name)");
+        }
+
+        final View view = getServedView();
+        final InputConnection inputConnection = getInputConnection();
+        final int imeActionCode;
+
+        if (inputConnection == null) {
+            return Result.failedResult("Could not press user action button. No element has focus.");
+        }
+
+        if (args.length >= 1) {
+            try {
+                imeActionCode = findActionCode(args[0]);
+            } catch (IllegalArgumentException e) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            imeActionCode = findActionCode(view);
+        }
+
+        InstrumentationBackend.solo.runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                inputConnection.performEditorAction(imeActionCode);
+            }
+        });
+
+        return Result.successResult();
+    }
+
+    @Override
+    public String key() {
+        return "press_user_action_button";
+    }
+
+    InputConnection getInputConnection() {
+        Context context = InstrumentationBackend.instrumentation.getTargetContext();
+
+        try {
+            InputMethodManager inputMethodManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+            Field servedInputConnectionField = InputMethodManager.class.getDeclaredField("mServedInputConnection");
+            servedInputConnectionField.setAccessible(true);
+
+            return (InputConnection)servedInputConnectionField.get(inputMethodManager);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    View getServedView() {
+        Context context = InstrumentationBackend.instrumentation.getTargetContext();
+
+        try {
+            InputMethodManager inputMethodManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+            Field servedViewField = InputMethodManager.class.getDeclaredField("mServedView");
+            servedViewField.setAccessible(true);
+
+            return (View)servedViewField.get(inputMethodManager);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private int findActionCode(View view) {
+        EditorInfo editorInfo = new EditorInfo();
+        view.onCreateInputConnection(editorInfo);
+
+        int actionId = editorInfo.actionId;
+        int imeOptions = editorInfo.imeOptions & EditorInfo.IME_MASK_ACTION;
+
+        if (actionId > 0) {
+            return actionId;
+        } else if (imeOptions > 0) {
+            return imeOptions;
+        } else {
+            return findActionCode("done");
+        }
+    }
+
+    private int findActionCode(String actionName) throws IllegalArgumentException {
+        actionName = actionName.toLowerCase();
+
+        try {
+            return actionCodeMap.get(actionName);
+        } catch (NullPointerException e) {
+            throw new IllegalArgumentException("Action name '" + actionName + "' invalid");
+        }
+    }
+}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/QueryHelper.java

@@ -46,13 +46,20 @@ public class QueryHelper {
 			int center_y = (int)translateCoordToScreen(webviewLocation[1], scale, rectangle.get("center_y"));
 
 			int x = (int)translateCoordToScreen(webviewLocation[0], scale, rectangle.get("left"));
-			int y = (int)translateCoordToScreen(webviewLocation[0], scale, rectangle.get("top"));
+			int y = (int)translateCoordToScreen(webviewLocation[1], scale, rectangle.get("top"));
+
+            int width = (int)translateCoordToScreen(0, scale, rectangle.get("width"));
+            int height = (int)translateCoordToScreen(0, scale, rectangle.get("height"));
+
 			Map<String,Integer> result = new HashMap<String, Integer>(rectangle);
 
 			result.put("x", x);
 			result.put("y", y);
 			result.put("center_x", center_x);
 			result.put("center_y", center_y);
+            
+            result.put("width", width);
+            result.put("height", height);
 
 			return result;
 		} catch (Exception e) {

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/InvocationOperation.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
 import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
 
 public class InvocationOperation implements Operation {
 
@@ -12,14 +13,16 @@ public class InvocationOperation implements Operation {
 	@SuppressWarnings("rawtypes")
 	private final List arguments;
 	private final Class<?>[] classes;
+    private final Class<?>[] boxedClasses;
 	private final Class<?>[] classesWithCharseq;
 
 	@SuppressWarnings("rawtypes")
 	public InvocationOperation(String methodName, List arguments) {
 		this.methodName = methodName;
 		this.arguments = arguments;
-		this.classes = extractArgumentTypes(false);
-		this.classesWithCharseq = extractArgumentTypes(true);
+		this.classes = extractArgumentTypes(false, false);
+        this.boxedClasses = extractArgumentTypes(false, true);
+		this.classesWithCharseq = extractArgumentTypes(true, false);
 	}	
 
 	@SuppressWarnings("rawtypes")
@@ -71,7 +74,27 @@ public class InvocationOperation implements Operation {
 							return;
 						}
 					} catch (NoSuchMethodException ee) {
-						System.out.println("Method not found with correct argument types. Trying to type convert.");
+                        try {
+                            Method method = o.getClass().getMethod(InvocationOperation.this.methodName, InvocationOperation.this.boxedClasses);
+                            method.setAccessible(true);
+                            try {
+                                Object result;
+                                if( method.getReturnType().equals(Void.TYPE)){
+                                    invokeMethod(o, method);
+                                    result = "<VOID>";
+                                }
+                                else {
+                                    result = invokeMethod(o, method);
+                                }
+                                ref.set(result);
+                                return;
+                            } catch (Exception eee) {
+                                refEx.set(eee);
+                                return;
+                            }
+                        } catch (NoSuchMethodException eee) {
+                            System.out.println("Method not found with correct argument types. Trying to type convert.");
+                        }
 					}
 				}
 				//Warning: Slow path
@@ -100,7 +123,27 @@ public class InvocationOperation implements Operation {
 						}							
 					}
 				}
-		
+
+                StringBuilder stringBuilder = new StringBuilder("No such method found: ");
+                stringBuilder.append(InvocationOperation.this.methodName);
+                stringBuilder.append("(");
+                int length = InvocationOperation.this.arguments.size();
+
+                for (int i = 0; i < length; i++) {
+                    Object argument = InvocationOperation.this.arguments.get(i);
+
+                    if (i != 0) {
+                        stringBuilder.append(", ");
+                    }
+
+                    stringBuilder.append("[").append(argument.getClass().getSimpleName()).append("]");
+                }
+
+                stringBuilder.append(")");
+
+
+                ref.set(UIQueryResultVoid.instance
+                        .asMap(InvocationOperation.this.methodName, o, stringBuilder.toString()));
 			}
 			 
 		 });
@@ -112,7 +155,7 @@ public class InvocationOperation implements Operation {
 	}
 	
 	@SuppressWarnings("rawtypes")
-	private Class[] extractArgumentTypes(boolean convertStringCharSeq) {
+	private Class[] extractArgumentTypes(boolean convertStringCharSeq, boolean userWrapperClass) {
 		Class[] types = new Class[arguments.size()];
 		for (int i=0;i<arguments.size(); i++) {
 			Object o = arguments.get(i);
@@ -120,10 +163,14 @@ public class InvocationOperation implements Operation {
 				Class<?> c = o.getClass();
 				if (convertStringCharSeq && c.equals(String.class)) {
 					c = CharSequence.class;//Android API specific optimization
-				} 								
-				types[i] = mapToPrimitiveClass(c); 	
-			}
-			else {
+				}
+
+                if (userWrapperClass) {
+                    types[i] = c;
+                } else {
+                    types[i] = mapToPrimitiveClass(c);
+                }
+			} else {
 				types[i] = null;
 			}			
 		}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2.pre1
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -159,7 +159,10 @@ files:
 - lib/calabash-android/canned_steps.md
 - lib/calabash-android/color_helper.rb
 - lib/calabash-android/cucumber.rb
+- lib/calabash-android/deprecated_actions.map
 - lib/calabash-android/env.rb
+- lib/calabash-android/environment_helpers.rb
+- lib/calabash-android/gestures.rb
 - lib/calabash-android/helpers.rb
 - lib/calabash-android/java_keystore.rb
 - lib/calabash-android/lib/AXMLPrinter2.jar
@@ -312,6 +315,7 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/Action.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/Actions.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/HttpServer.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/MultiTouchGesture.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/NanoHTTPD.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/NullAction.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/ViewDump.java
@@ -348,15 +352,13 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/EnterKey.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/GoBack.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/LeftKey.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/PressKey.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/PressMenu.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/RightKey.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/UpKey.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/HideSoftKeyboard.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/KeyboardEnterText.java
-- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/time/SetDateByContentDescription.java
-- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/time/SetDateByIndex.java
-- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/time/SetTimeByContentDescription.java
-- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/time/SetTimeByIndex.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/PressUserActionButton.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/version/Version.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/GetActivityName.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/IsCurrentActivityFocused.java
@@ -826,9 +828,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.10