calabash-android 0.4.0.pre11 → 0.4.0.pre15

data/Rakefile

@@ -3,7 +3,7 @@ load 'lib/calabash-android/helpers.rb'
 
 def build
   test_server_template_dir = File.join(File.dirname(__FILE__), 'test-server')
-  
+
   Dir.mktmpdir do |workspace_dir|
     
     @test_server_dir = File.join(workspace_dir, 'test-server')
@@ -34,8 +34,32 @@ def build
 end
 
 
+desc "Update server version to expected server version"
+task :match_versions do
+  test_server_template_dir = File.join(File.dirname(__FILE__), 'test-server')
+
+  version_command = File.join(test_server_template_dir,
+                              "instrumentation-backend",
+                              "src",
+                              "sh",
+                              "calaba",
+                              "instrumentationbackend",
+                              "actions",
+                              "version",
+                              "Version.java" )
+
+  unless File.exist?(version_command)
+    raise "Unable to find version file at: #{version_command}"
+  end
+
+  text = File.read(version_command)
+  text.gsub!(/public static final String VERSION=".*";/,%Q[public static final String VERSION="#{Calabash::Android::SERVER_VERSION}";])
+  File.open(version_command, 'w') { |f| f.write(text) }
+
+end
 
-task :build do
+
+task :build => :match_versions do
   unless File.exists? "test-server/calabash-js/src"
     puts "calabash-js not found!"
     puts "For instuctions see: https://github.com/calabash/calabash-android/wiki/Building-calabash-android"
@@ -48,4 +72,5 @@ task :build do
 
 end
 
+
 Bundler::GemHelper.install_tasks

data/lib/calabash-android/helpers.rb

@@ -59,7 +59,7 @@ def sign_apk(app_path, dest_path)
     jarsigner_path = "jarsigner"
   end
 
-  cmd = "#{jarsigner_path} -sigalg MD5withRSA -digestalg SHA1 -signedjar #{dest_path} -storepass #{keystore["keystore_password"]} -keystore \"#{File.expand_path keystore["keystore_location"]}\" #{app_path} #{keystore["keystore_alias"]}"
+  cmd = "#{jarsigner_path} -sigalg MD5withRSA -digestalg SHA1 -signedjar #{dest_path} -storepass #{keystore["keystore_password"]} -keystore #{keystore["keystore_location"]} #{app_path} #{keystore["keystore_alias"]}"
   log cmd
   unless system(cmd)
     puts "jarsigner command: #{cmd}"
@@ -69,10 +69,12 @@ end
 
 def read_keystore_info
   if File.exist? ".calabash_settings"
-    JSON.parse(IO.read(".calabash_settings"))
+    keystore = JSON.parse(IO.read(".calabash_settings"))
+    keystore["keystore_location"] = '"' + File.expand_path(keystore["keystore_location"]) + '"' if keystore["keystore_location"]
+    keystore
   else
     {
-    "keystore_location" => "#{ENV["HOME"]}/.android/debug.keystore",
+    "keystore_location" => %Q("#{File.expand_path(File.join(ENV["HOME"], "/.android/debug.keystore"))}\"),
     "keystore_password" => "android",
     "keystore_alias" => "androiddebugkey",
     }

data/lib/calabash-android/operations.rb

@@ -6,12 +6,16 @@ require 'json'
 require 'socket'
 require 'timeout'
 require 'calabash-android/helpers'
+require 'calabash-android/wait_helpers'
+require 'calabash-android/version'
 require 'retriable'
+require 'cucumber'
 
 
 module Calabash module Android
 
 module Operations
+  include Calabash::Android::WaitHelpers
 
   def log(message)
     $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} - #{message}" if (ARGV.include? "-v" or ARGV.include? "--verbose")
@@ -86,19 +90,19 @@ module Operations
     default_device.set_gps_coordinates(latitude, longitude)
   end
 
-  def wait_for(timeout, &block)
-    value = nil
-    begin
-      Timeout::timeout(timeout) do
-        until (value = block.call)
-          sleep 0.3
-        end
-      end
-    rescue Exception => e
-      raise e
-    end
-    value
-  end
+  #def wait_for(timeout, &block)
+  #  value = nil
+  #  begin
+  #    Timeout::timeout(timeout) do
+  #      until (value = block.call)
+  #        sleep 0.3
+  #      end
+  #    end
+  #  rescue Exception => e
+  #    raise e
+  #  end
+  #  value
+  #end
 
   def query(uiquery, *args)
     converted_args = []
@@ -177,7 +181,7 @@ module Operations
       succeeded = `#{adb_command} shell pm list packages`.include?("package:#{pn}")
 
       unless succeeded
-        Cucumber.wants_to_quit = true
+        ::Cucumber.wants_to_quit = true
         raise "#{pn} did not get installed. Aborting!"
       end
     end
@@ -325,7 +329,7 @@ module Operations
     end
 
     def start_test_server_in_background(options={})
-      raise "Will not start test server because of previous failures." if Cucumber.wants_to_quit
+      raise "Will not start test server because of previous failures." if ::Cucumber.wants_to_quit
 
       if keyguard_enabled?
         wake_up
@@ -369,12 +373,39 @@ module Operations
               log "Instrumentation backend is ready!"
             end
         end
+      rescue Exception => e
 
-      rescue
         msg = "Unable to make connection to Calabash Test Server at http://127.0.0.1:#{@server_port}/\n"
         msg << "Please check the logcat output for more info about what happened\n"
         raise msg
       end
+
+      log "Checking client-server version match..."
+      response = perform_action('version')
+      unless response['success']
+        msg = ["Unable to obtain Test Server version. "]
+        msg << "Please delete your test_servers"
+        msg << "and re-run calabash-android run..."
+        msg_s = msg.join("\n")
+        log(msg_s)
+        raise msg_s
+      end
+      unless response['message'] == Calabash::Android::SERVER_VERSION
+
+        msg = ["Calabash Client and Test-server version mismatch."]
+        msg << "Client version #{Calabash::Android::VERSION}"
+        msg << "Test-server version #{response['message']}"
+        msg << "Expected Test-server version #{Calabash::Android::SERVER_VERSION}"
+        msg << "\n\nSolution:\n\n"
+        msg << "Please delete your test_servers"
+        msg << "and re-run calabash-android run..."
+        msg_s = msg.join("\n")
+        log(msg_s)
+        raise msg_s
+      end
+      log("Client and server versions match. Proceeding...")
+
+
     end
 
     def shutdown_test_server
@@ -408,7 +439,6 @@ module Operations
 
   def screenshot_and_raise(msg)
     screenshot_embed
-    sleep 5
     raise(msg)
   end
 

data/lib/calabash-android/version.rb

@@ -1,5 +1,6 @@
 module Calabash
   module Android
-    VERSION = "0.4.0.pre11"
+    SERVER_VERSION = "0.4.0.pre15"
+    VERSION = "0.4.0.pre15"
   end
 end

data/lib/calabash-android/wait_helpers.rb

@@ -0,0 +1,93 @@
+module Calabash
+  module Android
+
+    module WaitHelpers
+
+
+      class WaitError < RuntimeError
+      end
+
+
+      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)
+        #note Hash is preferred, number acceptable for backwards compat
+        timeout=options_or_timeout
+        post_timeout=0.1
+        retry_frequency=0.2
+        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_message = options_or_timeout[:timeout_message]
+          screenshot_on_error = options_or_timeout[:screenshot_on_error] || true
+        end
+
+        begin
+          Timeout::timeout(timeout, WaitError) do
+            sleep(retry_frequency) until yield
+          end
+          sleep(post_timeout) if post_timeout > 0
+        rescue WaitError => e
+          handle_error_with_options(e, timeout_message, screenshot_on_error)
+        rescue Exception => e
+          handle_error_with_options(e, nil, screenshot_on_error)
+        end
+      end
+
+      def wait_poll(opts, &block)
+        test = opts[:until]
+        if test.nil?
+          cond = opts[:until_exists]
+          raise "Must provide :until or :until_exists" unless cond
+          test = lambda { element_exists(cond) }
+        end
+        wait_for(opts) do
+          if test.call()
+            true
+          else
+            yield
+            false
+          end
+        end
+      end
+
+#options for wait_for apply
+      def wait_for_elements_exist(elements_arr, options={})
+        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
+      def wait_for_elements_do_not_exist(elements_arr, options={})
+        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) }
+        end
+      end
+
+      def handle_error_with_options(ex, timeout_message, screenshot_on_error)
+        msg = (timeout_message || ex)
+        if ex
+          msg = "#{msg} (#{ex.class})"
+        end
+        if screenshot_on_error
+          screenshot_and_raise msg
+        else
+          raise msg
+        end
+      end
+
+
+    end
+  end
+end
+

data/test-server/instrumentation-backend/antlr/UIQuery.g

@@ -12,7 +12,7 @@ options {
     package sh.calaba.instrumentationbackend.query.antlr;
 }
 
-@members {
+@lexer::members {
   public String getErrorMessage(RecognitionException e, String[] tokenNames)
   {
     List stack = getRuleInvocationStack(e, this.getClass().getName());
@@ -20,6 +20,7 @@ options {
     if ( e instanceof NoViableAltException ) {
       NoViableAltException nvae = (NoViableAltException)e;
       msg = " no viable alt; token="+e.token+" (decision="+nvae.decisionNumber+" state "+nvae.stateNumber+")"+" decision=<<"+nvae.grammarDecisionDescription+">>";
+      throw new RuntimeException(msg, e);
     }
     else {
     msg = super.getErrorMessage(e, tokenNames);

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/activity/FinishOpenedActivities.java

@@ -0,0 +1,19 @@
+package sh.calaba.instrumentationbackend.actions.activity;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+public class FinishOpenedActivities implements Action {
+
+    @Override
+    public Result execute(String... args) {
+        InstrumentationBackend.solo.finishOpenedActivities();
+        return Result.successResult();
+    }
+
+    @Override
+    public String key() {
+        return "finish_opened_activities";
+    }
+}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/activity/GetOpenedActivities.java

@@ -0,0 +1,31 @@
+package sh.calaba.instrumentationbackend.actions.activity;
+
+import java.util.ArrayList;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+import android.app.Activity;
+
+public class GetOpenedActivities implements Action {
+
+    @Override
+    public Result execute(String... args) {
+        final ArrayList<Activity> activities = InstrumentationBackend.solo
+                .getAllOpenedActivities();
+        final ArrayList<String> opened = new ArrayList<String>(
+                activities.size());
+
+        for (final Activity activity : activities) {
+            opened.add(activity.getClass().getSimpleName());
+        }
+
+        // opened is attached to bonusInformation
+        return new Result(true, opened);
+    }
+
+    @Override
+    public String key() {
+        return "get_opened_activities";
+    }
+}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/activity/GoBackToActivity.java

@@ -0,0 +1,67 @@
+package sh.calaba.instrumentationbackend.actions.activity;
+
+import java.util.ArrayList;
+
+import android.app.Activity;
+import android.view.KeyEvent;
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+import sh.calaba.instrumentationbackend.actions.Actions;
+
+public class GoBackToActivity implements Action {
+
+    @Override
+    public Result execute(String... args) {
+
+        if (args == null) {
+            return Result
+                    .failedResult("Target activity name must not be null.");
+        }
+
+        if (args.length != 1) {
+            return Result.failedResult("Must pass exactly one argument.");
+        }
+
+        if (args[0].trim().length() == 0) {
+            return Result.failedResult("Argument must not be whitespace.");
+        }
+
+        final String targetActivityName = args[0];
+
+        final ArrayList<Activity> activities = InstrumentationBackend.solo
+                .getAllOpenedActivities();
+        boolean success = false;
+
+        final ArrayList<String> opened = new ArrayList<String>(
+                activities.size());
+
+        for (final Activity activity : activities) {
+            final String name = activity.getClass().getSimpleName();
+            if (name.contentEquals(targetActivityName)) {
+                success = true;
+            }
+            opened.add(name);
+        }
+
+        if (!success) {
+            return new Result(false, opened);
+        }
+
+        while (!InstrumentationBackend.solo.getCurrentActivity().getClass()
+                .getSimpleName().contentEquals(targetActivityName)) {
+            try {
+                Actions.parentInstrumentation
+                        .sendKeyDownUpSync(KeyEvent.KEYCODE_BACK);
+            } catch (Exception exception) {
+            }
+        }
+
+        return new Result(true, opened);
+    }
+
+    @Override
+    public String key() {
+        return "go_back_to_activity";
+    }
+}

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

@@ -0,0 +1,28 @@
+package sh.calaba.instrumentationbackend.actions.gestures;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+public class DragCoordinates implements Action {
+
+	@Override
+	public Result execute(String... args) {
+
+		Float fromX = new Float(args[0]);
+		Float fromY = new Float(args[1]);
+		Float toX = new Float(args[2]);
+		Float toY = new Float(args[3]);
+		Integer stepCount = 40;
+
+		InstrumentationBackend.solo.drag(fromX,	toX, fromY,	toY, stepCount);
+
+		return Result.successResult();
+	}
+
+	@Override
+	public String key() {
+		return "drag_coordinates";
+	}
+
+}