calabash-android 0.2.18 → 0.2.19

data/CHANGES.txt

@@ -1,3 +1,8 @@
+0.2.19:
+      New actions:
+      Drag action
+      Press image button by content description
+
 0.2.18:
       Various small improvements and bug fixes.
 

data/lib/calabash-android/calabash_steps.rb

@@ -14,5 +14,6 @@ require 'calabash-android/steps/press_button_steps'
 require 'calabash-android/steps/progress_steps'
 require 'calabash-android/steps/rotation_steps'
 require 'calabash-android/steps/screenshot_steps'
+require 'calabash-android/steps/search_steps'
 require 'calabash-android/steps/spinner_steps'
 require 'calabash-android/steps/time_picker_steps'

data/lib/calabash-android/canned_steps.md

@@ -100,8 +100,14 @@ To scroll up
     Then /^I scroll up$/
 
 To open the menu and press the specified text
+
     Then /^I select "([^\"]*)" from the menu$/
+    
+To drag from one point on the screen to another. 
 
+	Then /^I drag from (\d+):(\d+) to (\d+):(\d+) moving with (\d+) steps$/ 
+Note: x:y co-ordinates are expressed as percentages of the screen width:height
+    
 Touching
 --------
     

data/lib/calabash-android/steps/navigation_steps.rb

@@ -38,4 +38,9 @@ end
 
 Then /^I scroll up$/ do
   performAction('scroll_up')
-end
+end
+
+Then /^I drag from (\d+):(\d+) to (\d+):(\d+) moving with (\d+) steps$/ do |fromX, fromY, toX, toY, steps|
+  performAction('drag',fromX,toX,fromY,toY,steps)
+end
+   

data/lib/calabash-android/steps/search_steps.rb

@@ -0,0 +1,7 @@
+Then /^I enter "([^\"]*)" into search field$/ do |text|
+  performAction('enter_query_into_numbered_field', text, 1)
+end
+
+Then /^I enter "([^\"]*)" into search field number (\d+)$/ do |text, number|
+  performAction('enter_query_into_numbered_field', text, number)
+end

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.2.18"
+    VERSION = "0.2.19"
   end
 end

data/test-server/instrumentation-backend/project.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=Google Inc.:Google APIs:15
+target=Google Inc.:Google APIs:8

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/button/PressImageButtonDescription.java

@@ -0,0 +1,31 @@
+package sh.calaba.instrumentationbackend.actions.button;
+
+
+import android.widget.ImageButton;
+import android.view.ViewGroup;
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+
+public class PressImageButtonDescription implements Action {
+
+    @Override
+    public Result execute(String... args) {
+        String err = "No image button found with description "+args[0]+" found. Found only:";
+        for (ImageButton b : InstrumentationBackend.solo.getCurrentImageButtons()){
+            err += " "+ b.getContentDescription();
+            if (args[0].equals(b.getContentDescription())){
+                InstrumentationBackend.solo.clickOnView(b);
+                return Result.successResult();
+            }
+        }
+        return new Result(false, err);
+    }
+
+    @Override
+    public String key() {
+        return "press_image_button_description";
+    }
+
+}

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

@@ -0,0 +1,40 @@
+package sh.calaba.instrumentationbackend.actions.gestures;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+import android.util.DisplayMetrics;
+
+public class Drag implements Action {
+
+	@Override
+	public Result execute(String... args) {
+
+		Float fromX = new Float(args[0]);
+		Float toX = new Float(args[1]);
+		Float fromY = new Float(args[2]);
+		Float toY = new Float(args[3]);
+		Integer stepCount = new Integer(args[4]);
+
+		DisplayMetrics dm = new DisplayMetrics();
+		InstrumentationBackend.solo.getCurrentActivity().getWindowManager()
+				.getDefaultDisplay().getMetrics(dm);
+		Integer windowWidth = dm.widthPixels;
+		Integer windowHeight = dm.heightPixels;
+
+		InstrumentationBackend.solo.drag(fromX / 100 * windowWidth, 
+				toX / 100 * windowWidth, 
+				fromY / 100 * windowHeight, 
+				toY / 100 * windowHeight, 
+				stepCount);
+
+		return Result.successResult();
+	}
+
+	@Override
+	public String key() {
+		return "drag";
+	}
+
+}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/search/EnterQueryByIndex.java

@@ -0,0 +1,31 @@
+package sh.calaba.instrumentationbackend.actions.search;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+public class EnterQueryByIndex implements Action {
+    @Override
+    public Result execute(String... args) {
+        /*
+        final String query = args[0];
+        final SearchView view = (SearchView) InstrumentationBackend.solo.getView(
+                SearchView.class, Integer.parseInt(args[1]) - 1);
+
+        InstrumentationBackend.instrumentation.runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                view.setQuery(query, true);
+            }
+        });
+
+        return Result.successResult();
+        */
+        throw new RuntimeException("Not supported in this version. Will be reintroduced when we have a way to support features from newer versions of Android.");
+    }
+
+    @Override
+    public String key() {
+        return "enter_query_into_numbered_field";
+    }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2012-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -133,6 +133,7 @@ files:
 - lib/calabash-android/steps/progress_steps.rb
 - lib/calabash-android/steps/rotation_steps.rb
 - lib/calabash-android/steps/screenshot_steps.rb
+- lib/calabash-android/steps/search_steps.rb
 - lib/calabash-android/steps/spinner_steps.rb
 - lib/calabash-android/steps/time_picker_steps.rb
 - lib/calabash-android/version.rb
@@ -165,6 +166,7 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/NullAction.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/button/PressButtonNumber.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/button/PressButtonText.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/button/PressImageButtonDescription.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/button/PressImageButtonNumber.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/button/WaitForButton.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/checkbox/ToggleCheckboxNumber.java
@@ -173,6 +175,7 @@ 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/Drag.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/Swipe.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/helpers/ListActions.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/list/GetListItemProperties.java
@@ -203,6 +206,7 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/map_unsupported/UnsupportedMapAction.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/scrolling/ScrollDown.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/scrolling/ScrollUp.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/search/EnterQueryByIndex.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/DownKey.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/EnterKey.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/GoBack.java