testautoa 0.4.0 → 0.4.1

data/lib/calabash-android/helpers.rb

@@ -38,22 +38,27 @@ def test_server_path(apk_file_path)
   "test_servers/#{checksum(apk_file_path)}_#{Calabash::Android::VERSION}.apk"
 end
 
+
+def build_test_server_if_needed(app_path)
+  unless File.exist?(test_server_path(app_path))
+    if ARGV.include? "--no-build"
+      puts "No test server found for this combination of app and calabash version. Exiting!"
+      exit 1
+    else
+      puts "No test server found for this combination of app and calabash version. Recreating test server."
+      calabash_build(app_path)
+    end
+  end
+end
+
 def resign_apk(app_path)
   Dir.mktmpdir do |tmp_dir|
     log "Resign apk"
     unsigned_path = File.join(tmp_dir, 'unsigned.apk')
     FileUtils.cp(app_path, unsigned_path)
 
-    #Delete META-INF/*
-    to_remove = Zip::ZipFile.foreach(unsigned_path).find_all { |e| /^META-INF\// =~ e.name}.collect &:name
+    `java -jar "#{File.dirname(__FILE__)}/lib/unsign.jar" "#{unsigned_path}"`
 
-    Zip::ZipFile.open(unsigned_path) do |zip_file|
-      to_remove.each do |x|
-        log "Removing #{x}"
-        zip_file.remove x
-      end
-      zip_file.commit
-    end
     sign_apk(unsigned_path, app_path)
   end
 end
@@ -67,7 +72,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}"
@@ -77,19 +82,32 @@ 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",
     }
   end
 end
 
+def keytool_path
+  if is_windows?
+    "\"#{ENV["JAVA_HOME"]}/bin/keytool.exe\""
+  else
+    "keytool"
+  end
+end
+
 def fingerprint_from_keystore
   keystore_info = read_keystore_info
-  fingerprints = `keytool -v -list -alias #{keystore_info["keystore_alias"]} -keystore #{keystore_info["keystore_location"]} -storepass #{keystore_info["keystore_password"]}`
+  cmd = "#{keytool_path} -v -list -alias #{keystore_info["keystore_alias"]} -keystore \"#{keystore_info["keystore_location"]}\" -storepass #{keystore_info["keystore_password"]}"
+
+  log cmd
+  fingerprints = `#{cmd}`
   md5_fingerprint = extract_md5_fingerprint(fingerprints)
   log "MD5 fingerprint for keystore (#{keystore_info["keystore_location"]}): #{md5_fingerprint}"
   md5_fingerprint
@@ -107,7 +125,9 @@ def fingerprint_from_apk(app_path)
       raise "No RSA file found in META-INF. Cannot proceed." if rsa_files.empty?
       raise "More than one RSA file found in META-INF. Cannot proceed." if rsa_files.length > 1
 
-      fingerprints = `keytool -v -printcert -file #{rsa_files.first}`
+      cmd = "#{keytool_path} -v -printcert -file #{rsa_files.first}"
+      log cmd
+      fingerprints = `#{cmd}`
       md5_fingerprint = extract_md5_fingerprint(fingerprints)
       log "MD5 fingerprint for signing cert (#{app_path}): #{md5_fingerprint}"
       md5_fingerprint
@@ -116,9 +136,17 @@ def fingerprint_from_apk(app_path)
 end
 
 def extract_md5_fingerprint(fingerprints)
-  m = fingerprints.scan(/MD5:\s+((?:[[:xdigit:]][[:xdigit:]]:){15}[[:xdigit:]][[:xdigit:]])/)
-  raise "No MD5 fingerprint found:\n #{fingerprints}" unless m
-  m.last.first
+  log fingerprints
+
+  if is_windows?
+    if fingerprints.encoding.name == "CP850"
+      fingerprints = fingerprints.gsub("\xA0".force_encoding("CP850"),"")
+    end
+  end
+
+  m = fingerprints.scan(/MD5\s*:\s*((?:[a-fA-F\d]{2}:){15}[a-fA-F\d]{2})/).flatten
+  raise "No MD5 fingerprint found:\n #{fingerprints}" if m.empty?
+  m.first
 end
 
 def is_windows?

data/lib/calabash-android/operations.rb

@@ -6,29 +6,31 @@ require 'json'
 require 'socket'
 require 'timeout'
 require 'calabash-android/helpers'
+require 'calabash-android/wait_helpers'
+require 'calabash-android/touch_helpers'
+require 'calabash-android/version'
 require 'retriable'
+require 'cucumber'
 
 
 module Calabash module Android
 
 module Operations
-
+  include Calabash::Android::WaitHelpers
+  include Calabash::Android::TouchHelpers
 
   def log(message)
     $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} - #{message}" if (ARGV.include? "-v" or ARGV.include? "--verbose")
   end
 
-  def take_screenshot
-    default_device.take_screenshot
-  end
-
   def macro(txt)
-    if self.respond_to?:step
+    if self.respond_to?(:step)
       step(txt)
     else
       Then(txt)
     end
   end
+
   def default_device
     unless @default_device
       @default_device = Device.new(self, ENV["ADB_DEVICE_ARG"], ENV["TEST_SERVER_PORT"], ENV["APP_PATH"], ENV["TEST_APP_PATH"])
@@ -36,10 +38,22 @@ module Operations
     @default_device
   end
 
+  def set_default_device(device)
+    @default_device = device
+  end
+
   def performAction(action, *arguments)
     default_device.perform_action(action, *arguments)
   end
 
+  def reinstall_apps
+    default_device.reinstall_apps
+  end
+
+  def reinstall_test_server
+    default_device.reinstall_test_server
+  end
+
   def install_app(app_path)
     default_device.install_app(app_path)
   end
@@ -57,7 +71,7 @@ module Operations
     default_device.clear_app_data
   end
 
-  def start_test_server_in_background
+  def start_test_server_in_background(options={})
     default_device.start_test_server_in_background()
   end
 
@@ -74,6 +88,10 @@ module Operations
     default_device.screenshot(options)
   end
 
+  def fail(msg="Error. Check log for details.", options={:prefix => nil, :name => nil, :label => nil})
+   screenshot_and_raise(msg, options)
+  end
+
   def set_gps_coordinates_from_location(location)
     default_device.set_gps_coordinates_from_location(location)
   end
@@ -82,32 +100,49 @@ module Operations
     default_device.set_gps_coordinates(latitude, longitude)
   end
 
-  def wait_for(timeout, &block)
-    begin
-      Timeout::timeout(timeout) do
-        until block.call
-          sleep 0.3
-        end
-      end
-    rescue Exception => e
-      raise e
-    end
-  end
+  def press_back_key
+    default_device.press_back_key
+  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)
-    if uiquery.start_with? "webView"
-      uiquery.slice!(0, "webView".length)
-      if uiquery =~ /(css|xpath):\s*(.*)/
-        r = performAction("query", $1, $2)
-        JSON.parse(r["message"])
+    converted_args = []
+    args.each do |arg|
+      if arg.is_a?(Hash) and arg.count == 1
+        converted_args << {:method_name => arg.keys.first, :arguments => [ arg.values.first ]}
       else
-       raise "Invalid query #{uiquery}"
+        converted_args << arg
       end
-    else
-      arguments = [*args]
-      operation = {"method_name"=>"query", "arguments" => arguments}
-      data = {"query" => uiquery, "operation" => operation}
-      JSON.parse(http("/map",data))
+    end
+    map(uiquery,:query,*converted_args)
+  end
+
+  def each_item(opts={:query => "android.widget.ListView", :post_scroll => 0.2}, &block)
+    uiquery = opts[:query] || "android.widget.ListView"
+    skip_if = opts[:skip_if] || lambda { |i| false }
+    stop_when = opts[:stop_when] || lambda { |i| false }
+    check_element_exists(uiquery)
+    num_items = query(opts[:query], :adapter, :count).first
+    num_items.times do |item|
+      next if skip_if.call(item)
+      break if stop_when.call(item)
+
+      scroll_to_row(opts[:query], item)
+      sleep(opts[:post_scroll]) if opts[:post_scroll] and opts[:post_scroll] > 0
+      yield(item)
     end
   end
 
@@ -132,10 +167,6 @@ module Operations
 
   class Device
 
-    def make_default_device
-      @cucumber_world.default_device = self
-    end
-
     def initialize(cucumber_world, serial, server_port, app_path, test_server_path)
       @cucumber_world = cucumber_world
       @serial = serial
@@ -151,6 +182,10 @@ module Operations
     def reinstall_apps()
       uninstall_app(package_name(@app_path))
       install_app(@app_path)
+      reinstall_test_server()
+    end
+
+    def reinstall_test_server()
       uninstall_app(package_name(@test_server_path))
       install_app(@test_server_path)
     end
@@ -164,7 +199,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
@@ -224,25 +259,6 @@ module Operations
       end
     end
 
-    def take_screenshot
-      puts "take_screenshot is deprecated. Use screenshot_embed instead."
-      path = ENV["SCREENSHOT_PATH_PREFIX"] || "results"
-      FileUtils.mkdir_p path unless File.exist? path
-      filename_prefix = FeatureNameMemory.feature_name.gsub(/\s+/, '_').downcase
-      begin
-        Timeout.timeout(30) do
-          file_name = "#{path}/#{filename_prefix}_#{FeatureNameMemory.invocation}_#{StepCounter.step_line}.png"
-          image = http("/screenshot")
-          open(file_name ,"wb") { |file|
-            file.write(image)
-          }
-          log "Screenshot stored in: #{file_name}!!!"
-        end
-      rescue Timeout::Error
-        raise Exception, "take_screenshot timed out"
-      end
-    end
-
     def screenshot(options={:prefix => nil, :name => nil})
       prefix = options[:prefix] || ENV['SCREENSHOT_PATH'] || ""
       name = options[:name]
@@ -311,14 +327,30 @@ module Operations
       raise "Could not clear data" unless system(cmd)
     end
 
-    def start_test_server_in_background
-      raise "Will not start test server because of previous failures." if Cucumber.wants_to_quit
+    def start_test_server_in_background(options={})
+      raise "Will not start test server because of previous failures." if ::Cucumber.wants_to_quit
 
       if keyguard_enabled?
         wake_up
       end
 
-      cmd = "#{adb_command} shell am instrument -e target_package #{ENV["PACKAGE_NAME"]} -e main_activity #{ENV["MAIN_ACTIVITY"]} -e class sh.calaba.instrumentationbackend.InstrumentationBackend sh.calaba.android.test/sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner"
+      env_options = {:target_package => options[:target_package] || package_name(@app_path),
+                     :main_activity => options[:main_activity] || main_activity(@app_path),
+                     :debug => options[:debug] || false,
+                     :class => options[:class] || "sh.calaba.instrumentationbackend.InstrumentationBackend"}
+
+      cmd_arr = [adb_command, "shell am instrument"]
+
+      env_options.each_pair do |key, val|
+        cmd_arr << "-e"
+        cmd_arr << key.to_s
+        cmd_arr << val.to_s
+      end
+
+      cmd_arr << "sh.calaba.android.test/sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner"
+
+      cmd = cmd_arr.join(" ")
+
       log "Starting test server using:"
       log cmd
       raise "Could not execute command to start test server" unless system("#{cmd} 2>&1")
@@ -340,12 +372,37 @@ 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 run 'reinstall_test_server' to make sure you have the correct version"
+        msg_s = msg.join("\n")
+        log(msg_s)
+        raise msg_s
+      end
+      unless response['message'] == Calabash::Android::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::VERSION}"
+        msg << "\n\nSolution:\n\n"
+        msg << "Run 'reinstall_test_server' to make sure you have the correct version"
+        msg_s = msg.join("\n")
+        log(msg_s)
+        raise msg_s
+      end
+      log("Client and server versions match. Proceeding...")
+
+
     end
 
     def shutdown_test_server
@@ -369,6 +426,15 @@ module Operations
     def set_gps_coordinates(latitude, longitude)
       perform_action('set_gps_coordinates', latitude, longitude)
     end
+      
+    def input_keyevent(keycode)
+      cmd = "#{adb_command} shell input keyevent #{keycode.to_s}"
+      result = `#{cmd}`
+    end
+      
+    def press_back_key
+      input_keyevent(4)
+    end
   end
 
 
@@ -379,22 +445,24 @@ module Operations
 
   def screenshot_and_raise(msg)
     screenshot_embed
-    sleep 5
     raise(msg)
   end
 
   def touch(uiquery,*args)
+    raise "Cannot touch nil" unless uiquery
+
     if uiquery.instance_of? String
       elements = query(uiquery, *args)
-      raise "No elements found" if elements.empty?
+      raise "No elements found. Query: #{uiquery}" if elements.empty?
       element = elements.first
     else
       element = uiquery
+      element = element.first if element.instance_of?(Array)
     end
 
 
-    center_x = element["frame"]["x"] + element["frame"]["width"] / 2
-    center_y = element["frame"]["y"] + element["frame"]["height"] / 2
+    center_x = element["rect"]["center_x"]
+    center_y = element["rect"]["center_y"]
     performAction("touch_coordinate", center_x, center_y)
   end
 
@@ -436,7 +504,8 @@ module Operations
   end
 
   def scroll_to_row(uiquery,number)
-    ni
+    query(uiquery, {:smoothScrollToPosition => number})
+    puts "TODO:detect end of scroll - use sleep for now"
   end
 
   def pinch(in_out,options={})
@@ -451,12 +520,16 @@ module Operations
     ni
   end
 
+  def element_does_not_exist(uiquery)
+    query(uiquery).empty?
+  end
+
   def element_exists(uiquery)
-    !query(uiquery).empty?
+    not element_does_not_exist(uiquery)
   end
 
   def view_with_mark_exists(expected_mark)
-    element_exists( "view marked:'#{expected_mark}'" )
+    element_exists( "android.view.View marked:'#{expected_mark}'" )
   end
 
   def check_element_exists( query )
@@ -505,8 +578,19 @@ module Operations
     ni
   end
 
-  def map( query, method_name, *method_args )
-    ni
+  def map(query, method_name, *method_args)
+    operation_map = {
+        :method_name => method_name,
+        :arguments => method_args
+    }
+    res = http("/map",
+               {:query => query, :operation => operation_map})
+    res = JSON.parse(res)
+    if res['outcome'] != 'SUCCESS'
+      screenshot_and_raise "map #{query}, #{method_name} failed because: #{res['reason']}\n#{res['details']}"
+    end
+
+    res['results']
   end
 
   def url_for( verb )

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

@@ -26,7 +26,7 @@ Then /^The "([^\"]*)" for row (\d+) should be "([^\"]*)"$/ do | view_id, row, va
   
   if( response['children'] )
     found_id = false
-    response['children'] each do | view |
+    response['children'].each do | view |
 	  if( view['id'] == view_id )
 	    raise "Text is #{view['text']}, expected #{value}" unless( view['text'] == value )
 		found_id = true

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

@@ -4,5 +4,5 @@ Given /^I set the time to "(\d\d:\d\d)" on TimePicker with index "([^\"]*)"$/ do
 end
 
 Given /^I set the "([^\"]*)" time to "(\d\d:\d\d)"$/ do |content_description, time|
-  performAction('set_time_with_description', time, content_description)
+  performAction('set_time_with_description', content_description, time)
 end

data/lib/calabash-android/touch_helpers.rb

@@ -0,0 +1,9 @@
+module Calabash
+  module Android
+    module TouchHelpers
+      def tap(mark, *args)
+        touch("* marked:'#{mark}'", *args)
+      end
+    end
+  end
+end

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   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/AndroidManifest.xml

@@ -22,6 +22,8 @@
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COURSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.INTERNET" />
 
 </manifest>

data/test-server/build.xml

@@ -69,6 +69,7 @@
       <copy todir="${staging.dir}/assets">
         <fileset dir="${calabashjs.dir}"/>
       </copy>
+      <replace file="${staging.dir}/src/sh/calaba/instrumentationbackend/actions/version/Version.java" token="####VERSION####" value="${version}" failOnNoReplacements="true" />
     </target>
 
 

data/test-server/instrumentation-backend/.classpath

@@ -3,7 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="src" path="assets"/>
-	<classpathentry kind="src" path="tests"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="lib" path="libs/robotium-solo-3.6.jar"/>

data/test-server/instrumentation-backend/AndroidManifest.xml

@@ -6,7 +6,7 @@
 
     <uses-sdk android:minSdkVersion="6" />
 
-    <application android:label="CalabashTestServer" >
+    <application android:label="CalabashTestServer" android:debuggable="true">
         <uses-library android:name="android.test.runner" />
         <uses-library android:name="com.google.android.maps" android:required="false" />
     </application>