calabash-android 0.4.22.pre1 → 0.4.22.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc93d1240918ff9a76dae74dde0855edb68a05b6
-  data.tar.gz: 9622711e7861d7402da6865b2dbc94a954251a13
+  metadata.gz: 6d221e4c80dd7613507106fb29b003b973f7bb90
+  data.tar.gz: 00acef8ea096b2fadd7d4d78a3351fdc14e080f6
 SHA512:
-  metadata.gz: dda85df8ba2995fad39966ed162ad282cb3d20dd2c208bd2cd1267cc3de9c0303426ca72ab6a4d0dfb66c3655ce61fc531a61f77cc5d4913c0e4e83c188095f2
-  data.tar.gz: 526469c307c9e51a7a76c46ebc4f308bdf04e954d144e1bd691ec5642841057b07e7bdd847f8287eb022dd8d99eabee7a62378d03f26906418f5e61282973fe7
+  metadata.gz: ca7532fbf81f589c0a34b889db471ac9ce0730240dcd2cfde663271f937319e0784194575d4feb1993271f1c3936cc88be175fe4a2114507ee1113901ba0e0e7
+  data.tar.gz: 1e5a8fceb981f4508120066a950ffde01fbb2744f1b501429162f2a36609ebc0c54f171f450b6ccf4647d3ba1ab9f521e3206e3bf73a1ccc6d1aeeee08d3d651

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    calabash-android (0.4.20)
+    calabash-android (0.4.22.pre1)
       awesome_print
       cucumber
       escape (~> 0.0.4)
@@ -17,7 +17,7 @@ GEM
   specs:
     awesome_print (1.2.0)
     builder (3.2.2)
-    cucumber (1.3.10)
+    cucumber (1.3.11)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
@@ -30,7 +30,7 @@ GEM
     httpclient (2.3.4.1)
     json (1.8.1)
     mime-types (1.25.1)
-    multi_json (1.8.4)
+    multi_json (1.9.0)
     multi_test (0.0.3)
     rake (10.1.0)
     rest-client (1.6.7)
@@ -40,7 +40,7 @@ GEM
     slowhandcuke (0.0.3)
       cucumber
     thor (0.18.1)
-    xamarin-test-cloud (0.9.28)
+    xamarin-test-cloud (0.9.29)
       bundler (>= 1.3.0, < 2.0)
       json
       mime-types (< 2.0)

data/lib/calabash-android/operations.rb

@@ -722,6 +722,16 @@ module Operations
     performAction("touch_coordinate", center_x, center_y)
   end
 
+  def keyboard_enter_text(text, options = {})
+    performAction('keyboard_enter_text', text)
+  end
+
+  def enter_text(uiquery, text, options = {})
+    touch(uiquery, options)
+    sleep 0.5
+    keyboard_enter_text(text, options)
+  end
+
   def find_coordinate(uiquery)
     raise "Cannot find nil" unless uiquery
 

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.22.pre1"
+    VERSION = "0.4.22.pre3"
   end
 end

data/lib/calabash-android/wait_helpers.rb

@@ -7,26 +7,32 @@ module Calabash
       class WaitError < RuntimeError
       end
 
+      # 'post_timeout' is the time to wait after a wait function returns true
+      DEFAULT_OPTS = {
+          :timeout => 30,
+          :retry_frequency => 0.3,
+          :post_timeout => 0,
+          :timeout_message => 'Timed out waiting...',
+          :screenshot_on_error => true
+      }.freeze
 
-      def wait_for(options_or_timeout=
-          {:timeout => 10,
-           :retry_frequency => 0.2,
-           :post_timeout => 0.1,
-           :timeout_message => "Timed out waiting...",
-           :screenshot_on_error => true}, &block)
+      def wait_for(options_or_timeout=DEFAULT_OPTS, &block)
         #note Hash is preferred, number acceptable for backwards compat
-        timeout=options_or_timeout
-        post_timeout=0.1
-        retry_frequency=0.2
+        default_timeout = 30
+        timeout = options_or_timeout || default_timeout
+        post_timeout=0
+        retry_frequency=0.3
         timeout_message = nil
         screenshot_on_error = true
 
         if options_or_timeout.is_a?(Hash)
-          timeout = options_or_timeout[:timeout] || 10
-          retry_frequency = options_or_timeout[:retry_frequency] || 0.2
-          post_timeout = options_or_timeout[:post_timeout] || 0.1
+          timeout = options_or_timeout[:timeout] || default_timeout
+          retry_frequency = options_or_timeout[:retry_frequency] || retry_frequency
+          post_timeout = options_or_timeout[:post_timeout] || post_timeout
           timeout_message = options_or_timeout[:timeout_message]
-          screenshot_on_error = options_or_timeout[:screenshot_on_error] || true
+          if options_or_timeout.key?(:screenshot_on_error)
+            screenshot_on_error = options_or_timeout[:screenshot_on_error]
+          end
         end
 
         begin
@@ -35,12 +41,31 @@ module Calabash
           end
           sleep(post_timeout) if post_timeout > 0
         rescue WaitError => e
-          handle_error_with_options(e, timeout_message, screenshot_on_error)
+          msg = timeout_message || e
+          if screenshot_on_error
+            sleep(retry_frequency)
+            return screenshot_and_retry(msg, &block)
+          else
+            raise wait_error(msg)
+          end
         rescue Exception => e
           handle_error_with_options(e, nil, screenshot_on_error)
         end
       end
 
+      def screenshot_and_retry(msg, &block)
+        path  = screenshot
+        res = yield
+        # Validate after taking screenshot
+        if res
+          FileUtils.rm_f(path)
+          return res
+        else
+          embed(path, 'image/png', msg)
+          raise wait_error(msg)
+        end
+      end
+
       def wait_poll(opts, &block)
         test = opts[:until]
         if test.nil?
@@ -58,16 +83,21 @@ module Calabash
         end
       end
 
-#options for wait_for apply
+      #options for wait_for apply
       def wait_for_elements_exist(elements_arr, options={})
+        if elements_arr.is_a?(String) || elements_arr.is_a?(Symbol)
+          elements_arr = [elements_arr.to_s]
+        end
         options[:timeout_message] = options[:timeout_message] || "Timeout waiting for elements: #{elements_arr.join(",")}"
         wait_for(options) do
           elements_arr.all? { |q| element_exists(q) }
         end
       end
-
-#options for wait_for apply
+      #options for wait_for apply
       def wait_for_elements_do_not_exist(elements_arr, options={})
+        if elements_arr.is_a?(String)
+          elements_arr = [elements_arr]
+        end
         options[:timeout_message] = options[:timeout_message] || "Timeout waiting for no elements matching: #{elements_arr.join(",")}"
         wait_for(options) do
           elements_arr.none? { |q| element_exists(q) }
@@ -86,6 +116,60 @@ module Calabash
         end
       end
 
+      def wait_error(msg)
+        (msg.is_a?(String) ? WaitError.new(msg) : msg)
+      end
+
+      # Performs a lambda action until the element (a query string) appears.
+      # The default action is to do nothing.
+      #
+      # Raises an error if no uiquery is specified. Same options as wait_for
+      # which are timeout, retry frequency, post_timeout, timeout_message, and
+      # screenshot on error.
+      #
+      # Example usage:
+      # until_element_exists("Button", :action => lambda { swipe("up") })
+      def until_element_exists(uiquery, opts = {})
+        extra_opts = { :until_exists => uiquery, :action => lambda { ; } }
+        opts = DEFAULT_OPTS.merge(extra_opts).merge(opts)
+        wait_poll(opts) do
+          opts[:action].call
+        end
+      end
+
+      # Performs a lambda action until the element (a query string) disappears.
+      # The default action is to do nothing.
+      #
+      # Raises an error if no uiquery is specified. Same options as wait_for
+      # which are timeout, retry frequency, post_timeout, timeout_message, and
+      # screenshot on error.
+      #
+      # Example usage:
+      # until_element_does_not_exist("Button", :action => lambda { swipe("up") })
+      def until_element_does_not_exist(uiquery, opts = {})
+        condition = lambda { element_exists(uiquery) ? false : true }
+        extra_opts = { :until => condition, :action => lambda { ; } }
+        opts = DEFAULT_OPTS.merge(extra_opts).merge(opts)
+        wait_poll(opts) do
+          opts[:action].call
+        end
+      end
+
+      # Performs a lambda action once the element exists.
+      # The default behavior is to touch the specified element.
+      #
+      # Raises an error if no uiquery is specified. Same options as wait_for
+      # which are timeout, retry frequency, post_timeout, timeout_message, and
+      # screenshot on error.
+      #
+      # Example usage: when_element_exists("Button", :timeout => 10)
+      def when_element_exists(uiquery, opts = {})
+        action = { :action => lambda { touch uiquery } }
+        opts = DEFAULT_OPTS.merge(action).merge(opts)
+        wait_for_elements_exist([uiquery], opts)
+        opts[:action].call
+      end
+
 
     end
   end

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

@@ -78,4 +78,8 @@ public class SoloEnhanced extends Solo {
         clicker.clickOnScreen(x,y);
         clicker.clickOnScreen(x,y);
     }
+
+    public void runOnMainSync(Runnable runner) {
+        instrumentation.runOnMainSync(runner);
+    }
 }

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

@@ -12,7 +12,7 @@ public class CalabashInstrumentationTestRunner extends InstrumentationTestRunner
 	@Override
     public void onCreate(Bundle arguments) {
 		try {
-			Context context = getTargetContext ();
+			Context context = getTargetContext();
 			Class<?> c = Class.forName("mono.MonoPackageManager");
 			Method  method = c.getDeclaredMethod ("LoadApplication", Context.class, String.class, String[].class);
 			method.invoke (null, context, null, new String[]{context.getApplicationInfo ().sourceDir});
@@ -28,8 +28,8 @@ public class CalabashInstrumentationTestRunner extends InstrumentationTestRunner
         InstrumentationBackend.extras = arguments;
 
         try {
-            InstrumentationBackend.mainActivity = Class.forName(arguments.getString("main_activity")).asSubclass(Activity.class);
-        } catch (ClassNotFoundException e) {
+            InstrumentationBackend.mainActivity = arguments.getString("main_activity");
+        } catch (Exception e) {
             throw new RuntimeException(e);
         }
 

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

@@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicReference;
 
 public class InstrumentationBackend extends ActivityInstrumentationTestCase2<Activity> {
     public static String testPackage;
-    public static Class<? extends Activity> mainActivity;
+    public static String mainActivity;
     public static Bundle extras;
     
     private static final String TAG = "InstrumentationBackend";
@@ -34,16 +34,36 @@ public class InstrumentationBackend extends ActivityInstrumentationTestCase2<Act
     public static PublicViewFetcher viewFetcher;
     public static Actions actions;
 
-    @SuppressWarnings({ "deprecation", "unchecked" })
     public InstrumentationBackend() {
-        super(testPackage, (Class<Activity>) mainActivity);
+        super(null);
+    }
+
+    @Override
+    public Activity getActivity() {
+        try {
+            setMainActivity(Class.forName(mainActivity).asSubclass(Activity.class));
+            return super.getActivity();
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void setMainActivity(Class<? extends Activity> mainActivity) {
+        try {
+            Field mActivityClass = ActivityInstrumentationTestCase2.class.getDeclaredField("mActivityClass");
+            mActivityClass.setAccessible(true);
+            mActivityClass.set(this, mainActivity);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        Intent i = new Intent();
-        i.setClassName(testPackage, mainActivity.getName());
+        Intent i = new Intent(Intent.ACTION_MAIN);
+        i.setClassName(testPackage, mainActivity);
+        i.addCategory("android.intent.category.LAUNCHER");
         i.putExtras(extras);
         setActivityIntent(i);
 

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

@@ -0,0 +1,62 @@
+package sh.calaba.instrumentationbackend.actions.text;
+
+import android.app.Activity;
+import android.content.Context;
+import android.view.View;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputMethodManager;
+
+import java.lang.Character;
+import java.lang.reflect.Field;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+public class KeyboardEnterText implements Action {
+    @Override
+    public Result execute(String... args) {
+        if (args.length != 1) {
+            return Result.failedResult("This action takes one argument ([String] text).");
+        }
+
+        final InputConnection inputConnection = getInputConnection();
+
+        final String textToEnter = args[0];
+        InstrumentationBackend.solo.runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                for (char c : textToEnter.toCharArray()) {
+                    inputConnection.commitText(Character.toString(c), 0);
+                }
+            }
+        });
+
+        return Result.successResult();
+    }
+
+    @Override
+    public String key() {
+        return "keyboard_enter_text";
+    }
+
+    InputConnection getInputConnection() {
+        Activity currentActivity = InstrumentationBackend.solo.getCurrentActivity();
+        final View view = currentActivity.getCurrentFocus();
+
+        Context context = view.getContext();
+
+        if (context == null) {
+            context = currentActivity.getApplicationContext();
+        }
+
+        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);
+        }
+    }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.22.pre1
+  version: 0.4.22.pre3
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -399,6 +399,7 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/EnterTextById.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/EnterTextByIndex.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/GetTextById.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