calabash-android 0.4.19.pre3 → 0.4.19.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: defa8cb4b262a40357f1f00a8c76c7155629952f
-  data.tar.gz: 353e205839ac2e5055d5792400437ba6e6c5c945
+  metadata.gz: 892daba236fc763e62fe4a2f916fa069c89160b8
+  data.tar.gz: dcf99876dcbe495a13add995e5691d229f49202a
 SHA512:
-  metadata.gz: 314abb26cf7d23bdd0020b971c6eb7b474397639fab09f67a699860816a36af9e5dc2066b62c3dd2bcb4824690d5cd558d306d118d655479598fb269439cca45
-  data.tar.gz: 8f554170e76f87e4e33a6d160969e8b84dd03c1febd3c91b969fab036d63bb19c1ec6eed1a696693e19454ae02cf053e40ab4e96c318e87e677d5f50e5258991
+  metadata.gz: af842f99bd51c0aa241fc6e52509525083e43a7cccea261abf0b24de1412382ce02e94a06319d8492b92f0ea4c38b912f7cf3bd9afffde8e0f072f47c26b8d80
+  data.tar.gz: 10ee7275d1c1b0363fbd1064e41c3f676717a559b2363fac33add5f409da3a5a9b79ae8bcdf58aa5dff0956c10b2929e285b5e364101c5580626c0ab9acebbc8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    calabash-android (0.4.19.pre3)
+    calabash-android (0.4.19.pre4)
       awesome_print
       cucumber
       escape (~> 0.0.4)
@@ -40,7 +40,7 @@ GEM
     slowhandcuke (0.0.3)
       cucumber
     thor (0.18.1)
-    xamarin-test-cloud (0.9.26)
+    xamarin-test-cloud (0.9.27)
       bundler (>= 1.3.0, < 2.0)
       json
       rest-client (~> 1.6.7)

data/lib/calabash-android/operations.rb

@@ -701,11 +701,29 @@ module Operations
     raise(msg)
   end
 
-  def touch(uiquery,*args)
-    raise "Cannot touch nil" unless uiquery
+  def double_tap(uiquery, options = {})
+    center_x, center_y = find_coordinate(uiquery)
+
+    performAction("double_tap_coordinate", center_x, center_y)
+  end
+
+  def long_press(uiquery, options = {})
+    center_x, center_y = find_coordinate(uiquery)
+
+    performAction("long_press_coordinate", center_x, center_y)
+  end
+
+  def touch(uiquery, options = {})
+    center_x, center_y = find_coordinate(uiquery)
+
+    performAction("touch_coordinate", center_x, center_y)
+  end
+
+  def find_coordinate(uiquery)
+    raise "Cannot find nil" unless uiquery
 
     if uiquery.instance_of? String
-      elements = query(uiquery, *args)
+      elements = query(uiquery)
       raise "No elements found. Query: #{uiquery}" if elements.empty?
       element = elements.first
     else
@@ -713,10 +731,10 @@ module Operations
       element = element.first if element.instance_of?(Array)
     end
 
-
     center_x = element["rect"]["center_x"]
     center_y = element["rect"]["center_y"]
-    performAction("touch_coordinate", center_x, center_y)
+
+    [center_x, center_y]
   end
 
   def http(path, data = {}, options = {})
@@ -728,12 +746,13 @@ module Operations
   end
 
   def set_text(uiquery, txt)
-    raise "Currently queries are only supported for webviews" unless uiquery.start_with? "webView"
-    uiquery.slice!(0, "webView".length)
-    if uiquery =~ /(css|xpath):\s*(.*)/
+    view,arguments = uiquery.split(" ",2)
+    raise "Currently queries are only supported for webviews" unless view.downcase == "webview"
+
+    if arguments =~ /(css|xpath):\s*(.*)/
       r = performAction("set_text", $1, $2, txt)
     else
-     raise "Invalid query #{uiquery}"
+     raise "Invalid query #{arguments}"
     end
   end
 

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.19.pre3"
+    VERSION = "0.4.19.pre4"
   end
 end

data/test-server/instrumentation-backend/src/com/jayway/android/robotium/solo/SoloEnhanced.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import android.app.Activity;
 import android.app.Instrumentation;
+import android.graphics.PointF;
 
 public class SoloEnhanced extends Solo {
 	private MapViewUtils mapViewUtils;
@@ -72,4 +73,9 @@ public class SoloEnhanced extends Solo {
 	public List<String> getMapBounds() {
 		return mapViewUtils.getBounds();
 	}
+
+    public void doubleTapOnScreen(float x, float y) {
+        clicker.clickOnScreen(x,y);
+        clicker.clickOnScreen(x,y);
+    }
 }

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/DoubleTapCoordinate.java

@@ -0,0 +1,25 @@
+package sh.calaba.instrumentationbackend.actions.gestures;
+
+import android.view.Display;
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+public class DoubleTapCoordinate implements Action {
+    @Override
+    public Result execute(String... args) {
+        Display display = InstrumentationBackend.solo.getCurrentActivity().getWindowManager().getDefaultDisplay();
+
+        float x = Float.parseFloat(args[0]);
+        float y = Float.parseFloat(args[1]);
+
+        InstrumentationBackend.solo.doubleTapOnScreen(x, y);
+
+        return Result.successResult();
+    }
+
+    @Override
+    public String key() {
+        return "double_tap_coordinate";
+    }
+}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/LongPressCoordinate.java

@@ -0,0 +1,25 @@
+package sh.calaba.instrumentationbackend.actions.gestures;
+
+import android.view.Display;
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+public class LongPressCoordinate implements Action {
+    @Override
+    public Result execute(String... args) {
+        Display display = InstrumentationBackend.solo.getCurrentActivity().getWindowManager().getDefaultDisplay();
+
+        float x = Float.parseFloat(args[0]);
+        float y = Float.parseFloat(args[1]);
+
+        InstrumentationBackend.solo.clickLongOnScreen(x, y);
+
+        return Result.successResult();
+    }
+
+    @Override
+    public String key() {
+        return "long_press_coordinate";
+    }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.19.pre3
+  version: 0.4.19.pre4
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -344,8 +344,10 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/contextmenu/LongPressTextAndSelectFromMenuByIndex.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/contextmenu/LongPressTextAndSelectFromMenuByText.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/ClickOnScreen.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/DoubleTapCoordinate.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/Drag.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/DragCoordinates.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/LongPressCoordinate.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/Swipe.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/TouchCoordinates.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/helpers/InspectCurrentDialog.java