calabash-android 0.4.3 → 0.4.4

data/Rakefile

@@ -14,7 +14,7 @@ def build
       ant_executable,
       "clean",
       "package",
-      "-Dandroid.api.level=16",
+      "-Dandroid.api.level=17",
       "-Dversion=#{Calabash::Android::VERSION}",
     ]
     Dir.chdir(@test_server_dir) do

data/lib/calabash-android.rb

@@ -1,2 +1,3 @@
 require 'calabash-android/operations'
-require 'calabash-android/version'
+require 'calabash-android/version'
+require 'calabash-android/abase'

data/lib/calabash-android/abase.rb

@@ -0,0 +1,89 @@
+class Calabash::ABase
+  include Calabash::Android::Operations
+
+
+  attr_accessor :world, :transition_duration
+
+  def initialize(world, transition_duration=0.5)
+    self.world = world
+    self.transition_duration = transition_duration
+  end
+
+  def trait
+    raise "You should define a trait method or a title method" unless respond_to?(:title)
+    "* marked:'#{self.title}'"
+  end
+
+  def current_page?
+    element_exists(trait)
+  end
+
+  def page(clz, *args)
+    clz.new(world, *args)
+  end
+
+  def await(wait_opts={})
+    wait_for_elements_exist([trait], wait_opts)
+    self
+  end
+
+  ##
+  # Performs a transition from receiver page to another by performing a +:tap+ gesture
+  # or a user specified +:action+.
+  # Caller must supply a hash of options +transition_options+ to describe the transition.
+  # Transition options may have the following keys
+  #
+  # +:tap+: A uiquery used to perform a tap gesture to begin transition
+  # +:action+: A proc to use begin transition (either :tap or :action must be supplied)
+  # +:page+: A page object or page object class to transition to (target page). If a class is provided this
+  # is instantiated using the +page+ method of self. If no +:page+ is supplied, +self+ is used.
+  # +:await+: If specified and truthy will await the +:page+ after performing gesture (usually to wait
+  # for animation to finish)
+  # +:tap_options+: If +:tap+ is provided used to pass as options to touch
+  # +:wait_options+: When awaiting target page, pass these options to the +await+ method
+  #
+  # Returns the transition target page
+  #
+  # Note it is assumed that the target page is a Calabash::ABase (or acts accordingly)
+  def transition(transition_options={})
+    uiquery = transition_options[:tap]
+    action = transition_options[:action]
+    page_arg = transition_options[:page]
+    should_await = transition_options.has_key?(:await) ? transition_options[:await] : true
+
+    if action.nil? && uiquery.nil?
+      raise "Called transition without providing a gesture (:tap or :action) #{transition_options}"
+    end
+
+    if uiquery
+      tap_options = transition_options[:tap_options] || {}
+      touch(uiquery, tap_options)
+    else
+      action.call()
+    end
+
+    page_obj = page_arg.is_a?(Class) ? page(page_arg) : page_arg
+    page_obj ||= self
+
+    if should_await
+      unless page_obj == self
+        wait_opts = transition_options[:wait_options] || {}
+        page_obj.await(wait_opts)
+      end
+    end
+
+    page_obj
+  end
+
+  def await_screenshot(wait_opts={}, screenshot_opts={})
+    await(wait_opts)
+    screenshot_embed(screenshot_opts)
+  end
+
+
+  protected
+  def method_missing(name, *args, &block)
+    world.send(name, *args, &block)
+  end
+
+end

data/lib/calabash-android/operations.rb

@@ -19,6 +19,10 @@ module Operations
   include Calabash::Android::WaitHelpers
   include Calabash::Android::TouchHelpers
 
+  def current_activity
+    `#{default_device.adb_command} shell dumpsys window windows`.each_line.grep(/mFocusedApp.+[\.\/]([^.\/\}]+)\}/){$1}.first
+  end
+
   def log(message)
     $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} - #{message}" if (ARGV.include? "-v" or ARGV.include? "--verbose")
   end
@@ -142,6 +146,14 @@ module Operations
 
   ###
 
+  ### simple page object helper
+
+  def page(clz, *args)
+    clz.new(self, *args)
+  end
+
+  ###
+
   ### app life cycle
   def connect_to_test_server
     puts "Explicit calls to connect_to_test_server should be removed."
@@ -277,8 +289,7 @@ module Operations
           f.write res
         end
       else
-        device_args = "-s #{@serial}" if @serial
-        screenshot_cmd = "java -jar #{File.join(File.dirname(__FILE__), 'lib', 'screenShotTaker.jar')} #{path} #{device_args}"
+        screenshot_cmd = "java -jar #{File.join(File.dirname(__FILE__), 'lib', 'screenshotTaker.jar')} #{serial} #{path}"
         log screenshot_cmd
         raise "Could not take screenshot" unless system(screenshot_cmd)
       end
@@ -288,21 +299,35 @@ module Operations
     end
 
     def adb_command
+      "#{adb} -s #{serial}"
+    end
+
+    def adb
       if is_windows?
-        %Q("#{ENV["ANDROID_HOME"]}\\platform-tools\\adb.exe" #{device_args})
+        %Q("#{ENV["ANDROID_HOME"]}\\platform-tools\\adb.exe")
       else
-        %Q("#{ENV["ANDROID_HOME"]}/platform-tools/adb" #{device_args})
+        %Q("#{ENV["ANDROID_HOME"]}/platform-tools/adb")
       end
     end
 
-    def device_args
-      if @serial
-        "-s #{@serial}"
-      else
-        ""
-      end
+    def serial
+      @serial || default_serial
     end
 
+    def default_serial
+      devices = connected_devices
+      log "connected_devices: #{devices}"
+      raise "No connected devices" if devices.empty?
+      raise "More than one device connected. Specify device serial using ADB_DEVICE_ARG" if devices.length > 1
+      devices.first
+    end
+
+    def connected_devices
+      lines = `#{adb} devices`.split("\n")
+      lines.shift
+      lines.collect { |l| l.split("\t").first}
+    end  
+
     def wake_up
       wake_up_cmd = "#{adb_command} shell am start -a android.intent.action.MAIN -n #{package_name(@test_server_path)}/sh.calaba.instrumentationbackend.WakeUp"
       log "Waking up device using:"
@@ -413,6 +438,11 @@ module Operations
     def shutdown_test_server
       begin
         http("/kill")
+        Timeout::timeout(3) do
+          sleep 0.3 while app_running?
+        end
+      rescue Timeout::Error
+        log ("Could not kill app. Waited to 3 seconds.")
       rescue EOFError
         log ("Could not kill app. App is most likely not running anymore.")
       end

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

@@ -1,4 +1,4 @@
-Then /^I compare the current screen with the reference image "([^\"]*) manually"$/ do |name|
+Then /^I compare the current screen with the reference image "([^\"]*)" manually$/ do |name|
     # TODO: once test artifacts directory is configurable, the image location
     # will need to be either a fully qualified path somewhere (webserver?) or
     # be relative to the output HTML file

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.3"
+    VERSION = "0.4.4"
   end
 end

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

@@ -42,7 +42,8 @@ public class Actions {
                     addAction(element);
                 }
             }
-        } catch (Exception e) {
+            dexFile.close();
+	    } catch (Exception e) {
             throw new RuntimeException(e);
         }
     }

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/wait/WaitForScreen.java

@@ -16,7 +16,7 @@ public class WaitForScreen implements Action {
             if (InstrumentationBackend.solo.waitForActivity(args[0], DEFAULT_TIMEOUT)) {
                 return Result.successResult();
             } else {
-            	String currentActivity = InstrumentationBackend.solo.getCurrentActivity().getLocalClassName();
+            	String currentActivity = InstrumentationBackend.solo.getCurrentActivity().getClass().getSimpleName();
             	Result result = new Result(false, "Screen " + args[0] + " not found.  Current activity is " + currentActivity);
             	result.addBonusInformation(currentActivity);
             	return result;
@@ -35,7 +35,7 @@ public class WaitForScreen implements Action {
             if (InstrumentationBackend.solo.waitForActivity(args[0], timeout)) {
                 return Result.successResult();
             } else {
-                String currentActivity = InstrumentationBackend.solo.getCurrentActivity().getLocalClassName();
+                String currentActivity = InstrumentationBackend.solo.getCurrentActivity().getClass().getSimpleName();
             	Result result = new Result(false, "Screen " + args[0] + " not found.  Current activity is " + currentActivity);
             	result.addBonusInformation(currentActivity);
             	return result;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -138,6 +138,7 @@ files:
 - features-skeleton/support/hooks.rb
 - irbrc
 - lib/calabash-android.rb
+- lib/calabash-android/abase.rb
 - lib/calabash-android/calabash_steps.rb
 - lib/calabash-android/canned_steps.md
 - lib/calabash-android/color_helper.rb
@@ -145,7 +146,7 @@ files:
 - lib/calabash-android/helpers.rb
 - lib/calabash-android/lib/AXMLPrinter2.jar
 - lib/calabash-android/lib/manifest_extractor.jar
-- lib/calabash-android/lib/screenShotTaker.jar
+- lib/calabash-android/lib/screenshotTaker.jar
 - lib/calabash-android/lib/unsign.jar
 - lib/calabash-android/management/adb.rb
 - lib/calabash-android/management/app_installation.rb