testautoa 0.4.2 → 0.4.3

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/bin/testautoa

@@ -165,8 +165,8 @@ def setup
     ask_for_setting("avd_cpu", "Please enter the CPU of Android emulator", @settings["avd_cpu"] ||= "armeabi-v7a")
     ask_for_setting("avd_sdcard_size", "Please enter the SD card size of Android emulator", @settings["avd_sdcard_size"] ||= "64M")
     ask_for_setting("avd_ram_size", "Please enter the RAM size of Android emulator", @settings["avd_ram_size"] ||= "1024")
-    @settings["build_drop_branch_dir"] = "Mobile/Android/branch"
-    @settings["build_drop_trunk_dir"] = "Mobile/Android/trunk"
+    @settings["build_drop_branch_dir"] = "Mobile/Android/branch/Corp"
+    @settings["build_drop_trunk_dir"] = "Mobile/Android/trunk/Corp"
   
     open('.testautoa_settings', 'w') do |f|
         f.puts @settings.to_json
@@ -234,6 +234,12 @@ def smb_connect_mac(location,username,password)
     location = location.tr('\\','/')
     username = username.tr('\\',';').tr('/',';')
     raise "The build drop location is incorrect" if not location.start_with?("//")
+    paths = location.split('/')
+    if paths.size > 4
+        location = paths.shift(4).join('/')
+        @settings["build_drop_branch_dir"] = [paths.join('/'), @settings["build_drop_branch_dir"]].join('/')
+        @settings["build_drop_trunk_dir"] = [paths.join('/'), @settings["build_drop_trunk_dir"]].join('/')       
+    end    
     cmd = "mount -t smbfs //'#{username}':#{password}@#{location[2..-1]}  #{mount_node}"
     output=`#{cmd}` ; result=$?.success?
     raise "the command '#{cmd}' failed" if result == false
@@ -286,7 +292,9 @@ def get_build
             # copy the version build
             release_path = File.join(mount_node, @settings["build_drop_branch_dir"], "Android#{ARGV.first}/Release")
         end
+        raise "No builds found in #{release_path}" unless File.directory?(release_path)
         build_dir = Dir.entries(release_path).reject{|d|d.start_with?('.')}.sort_by{|c| File.stat(File.join(release_path,c)).ctime}.last 
+        raise "No builds found in #{release_path}" if build_dir == nil
         apk_file = "ConcurMobile.apk"
         source = File.join(release_path, build_dir, apk_file)
         raise "the file '#{source}' does not exist" if not File.exists?(source)
@@ -311,8 +319,8 @@ def get_script
         uri = URI.join(uri, feature)
         puts `svn export --force #{uri} features --username #{username} --password #{password}`
 
-        #uri = URI.join(@settings["svn_location"], "_support/", "support/")
-        #puts `svn export --force #{uri} features/support --username #{username} --password #{password}`
+        uri = URI.join(@settings["svn_location"], "_support/", "support/")
+        puts `svn export --force #{uri} features/support --username #{username} --password #{password}`
         uri = URI.join(@settings["svn_location"], "_support/", "step_definition/")
         puts `svn export --force #{uri} features/step_definitions --username #{username} --password #{password}`
     end
@@ -326,8 +334,12 @@ end
 def adb_path_w_sn
     raise_if_android_home_not_set
     serial_number = @settings["device_serialno"].to_s.strip
-    serial_number = "-s #{serial_number}" unless serial_number.empty?
-    File.join(ENV['ANDROID_HOME'], 'platform-tools', 'adb') + " " + serial_number
+    serial_number = " -s #{serial_number}" unless serial_number.empty?
+    adb_path + serial_number
+end
+
+def adb_shell(command)
+    system("#{adb_path_w_sn} shell #{command}")
 end
 
 def android_path

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/helpers.rb

@@ -81,17 +81,37 @@ def sign_apk(app_path, dest_path)
 end
 
 def read_keystore_info
+  keystore = default_keystore
+
   if File.exist? ".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" => %Q("#{File.expand_path(File.join(ENV["HOME"], "/.android/debug.keystore"))}\"),
+    fail_if_key_missing(keystore, "keystore_location")
+    fail_if_key_missing(keystore, "keystore_password")
+    fail_if_key_missing(keystore, "keystore_alias")
+    keystore["keystore_location"] = File.expand_path(keystore["keystore_location"])
+  end
+  keystore["keystore_location"] = put_in_quotes(remove_quotes(keystore["keystore_location"]))
+  keystore
+end
+
+def default_keystore
+  {
+    "keystore_location" => File.expand_path(File.join(ENV["HOME"], "/.android/debug.keystore")),
     "keystore_password" => "android",
     "keystore_alias" => "androiddebugkey",
-    }
-  end
+  }
+end
+
+def fail_if_key_missing(map, key)
+  raise "Found .calabash_settings but no #{key} defined." unless map[key]
+end
+
+def remove_quotes(s)
+  s.gsub(/"/, "")
+end
+
+def put_in_quotes(s)
+  %Q{"#{s}"}
 end
 
 def keytool_path
@@ -104,7 +124,7 @@ end
 
 def fingerprint_from_keystore
   keystore_info = read_keystore_info
-  cmd = "#{keytool_path} -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}`
@@ -138,13 +158,7 @@ end
 def extract_md5_fingerprint(fingerprints)
   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
+  m = fingerprints.scan(/MD5.*((?:[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

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
@@ -71,8 +75,16 @@ module Operations
     default_device.clear_app_data
   end
 
+  def pull(remote, local)
+    default_device.pull(remote, local)
+  end
+
+  def push(local, remote)
+    default_device.push(local, remote)
+  end
+
   def start_test_server_in_background(options={})
-    default_device.start_test_server_in_background()
+    default_device.start_test_server_in_background(options)
   end
 
   def shutdown_test_server
@@ -104,6 +116,10 @@ module Operations
     default_device.press_back_key
   end
     
+  def switch_wifi(on)
+    default_device.switch_wifi(on)
+  end
+    
   #def wait_for(timeout, &block)
   #  value = nil
   #  begin
@@ -152,6 +168,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,12 +301,7 @@ module Operations
       @@screenshot_count ||= 0
       path = "#{prefix}#{name}_#{@@screenshot_count}.png"
 
-      if ENV["SCREENSHOT_VIA_USB"] == "true"
-        device_args = "-s #{@serial}" if @serial
-        screenshot_cmd = "java -jar #{File.join(File.dirname(__FILE__), 'lib', 'screenShotTaker.jar')} #{path} #{device_args}"
-        log screenshot_cmd
-        raise "Could not take screenshot" unless system(screenshot_cmd)
-      else
+      if ENV["SCREENSHOT_VIA_USB"] == "false"
         begin
           res = http("/screenshot")
         rescue EOFError
@@ -291,31 +310,48 @@ module Operations
         File.open(path, 'wb') do |f|
           f.write res
         end
+      else
+        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
 
-
       @@screenshot_count += 1
       path
     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 sh.calaba.android.test/sh.calaba.instrumentationbackend.WakeUp"
+      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:"
       log wake_up_cmd
       raise "Could not wake up the device" unless system(wake_up_cmd)
@@ -326,10 +362,20 @@ module Operations
     end
 
     def clear_app_data
-      cmd = "#{adb_command} shell am instrument sh.calaba.android.test/sh.calaba.instrumentationbackend.ClearAppData"
+      cmd = "#{adb_command} shell am instrument #{package_name(@test_server_path)}/sh.calaba.instrumentationbackend.ClearAppData"
       raise "Could not clear data" unless system(cmd)
     end
 
+    def pull(remote, local)
+      cmd = "#{adb_command} pull #{remote} #{local}"
+      raise "Could not pull #{remote} to #{local}" unless system(cmd)
+    end
+
+    def push(local, remote)
+      cmd = "#{adb_command} push #{local} #{remote}"
+      raise "Could not push #{local} to #{remote}" unless system(cmd)
+    end
+
     def start_test_server_in_background(options={})
       raise "Will not start test server because of previous failures." if ::Cucumber.wants_to_quit
 
@@ -337,12 +383,13 @@ module Operations
         wake_up
       end
 
-      puts "app_path: #{@app_path}"
-      env_options = {:target_package => options[:target_package] || package_name(@app_path),
-                     :main_activity => options[:main_activity] || main_activity(@app_path),
+      env_options = {:target_package => package_name(@app_path),
+                     :main_activity => main_activity(@app_path),
                      :test_server_port => @test_server_port,
-                     :debug => options[:debug] || false,
-                     :class => options[:class] || "sh.calaba.instrumentationbackend.InstrumentationBackend"}
+                     :debug => false,
+                     :class => "sh.calaba.instrumentationbackend.InstrumentationBackend"}
+
+      env_options = env_options.merge(options)
 
       cmd_arr = [adb_command, "shell am instrument"]
 
@@ -413,6 +460,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
@@ -440,6 +492,11 @@ module Operations
     def press_back_key
       input_keyevent(4)
     end
+      
+    def switch_wifi(on)
+        cmd = "#{adb_command} shell am start -n com.concur.wifiswitch/." + (on ? "On" : "Off") + "Activity"
+        result = `#{cmd}`
+    end
   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.2"
+    VERSION = "0.4.3"
   end
 end

data/test-server/calabash-js/src/calabash.js

@@ -36,6 +36,10 @@
         {
             res.href = object.href;
         }
+        if (object.hasOwnProperty('value'))
+        {
+            res.value = object.value || '';
+        }
         res.html = object.outerHTML || '';
         res.textContent = object.textContent;
         return res;

data/test-server/calabash-js/src/set_text.js

@@ -1,49 +1,49 @@
 (function () {
-	function simulateKeyEvent(elem, character) {
-	    var ch = character.charCodeAt(0);
-	            
-	    var evt;
-	    evt = document.createEvent('KeyboardEvent');
-	    evt.initKeyboardEvent('keydown', true, true, window, 0, 0, 0, 0, 0, ch);
-	    elem.dispatchEvent(evt);
-	   
-	    evt = document.createEvent('KeyboardEvent');
-	    evt.initKeyboardEvent('keyup', true, true, window, 0, 0, 0, 0, 0, ch);
-	    elem.dispatchEvent(evt);
-	    evt = document.createEvent('KeyboardEvent');
-	    evt.initKeyboardEvent('keypress', true, true, window, 0, 0, 0, 0, 0, ch);
-	    elem.dispatchEvent(evt);
-	}
-
-	 
-	function enterTextIntoInputField(elem, text) {
-      elem.value = "";
-	    for (var i = 0; i < text.length; i++) {
-	        var ch = text.charAt(i);
-	        elem.value += ch;
-	        simulateKeyEvent(elem, ch);
-	    }
-	}
-	                            
-
-	function fireHTMLEvent(elem, eventName) {
-	    var evt = document.createEvent("HTMLEvents");
-	    evt.initEvent(eventName, true, true );
-	    return !elem.dispatchEvent(evt);
-	}
-
-	function selectInputField(elem) {
-	    elem.click();
-	    elem.focus();
-	}
-
-
-	function deselectInputField(elem) {
-	    fireHTMLEvent(elem, 'change');
-	    fireHTMLEvent(elem, 'blur');
-	}
-	
-	
+        function simulateKeyEvent(elem, character) {
+            var ch = character.charCodeAt(0);
+
+            var evt;
+            evt = document.createEvent('KeyboardEvent');
+            evt.initKeyboardEvent('keydown', true, true, window, 0, 0, 0, 0, 0, ch);
+            elem.dispatchEvent(evt);
+
+            evt = document.createEvent('KeyboardEvent');
+            evt.initKeyboardEvent('keyup', true, true, window, 0, 0, 0, 0, 0, ch);
+            elem.dispatchEvent(evt);
+            evt = document.createEvent('KeyboardEvent');
+            evt.initKeyboardEvent('keypress', true, true, window, 0, 0, 0, 0, 0, ch);
+            elem.dispatchEvent(evt);
+        }
+
+
+        function enterTextIntoInputField(elem, text) {
+            elem.value = "";
+            for (var i = 0; i < text.length; i++) {
+                var ch = text.charAt(i);
+                elem.value += ch;
+                simulateKeyEvent(elem, ch);
+            }
+        }
+
+
+        function fireHTMLEvent(elem, eventName) {
+            var evt = document.createEvent("HTMLEvents");
+            evt.initEvent(eventName, true, true );
+            return !elem.dispatchEvent(evt);
+        }
+
+        function selectInputField(elem) {
+            elem.click();
+            elem.focus();
+        }
+
+
+        function deselectInputField(elem) {
+            fireHTMLEvent(elem, 'change');
+            fireHTMLEvent(elem, 'blur');
+        }
+
+
     /** David Mark's isHostMethod function,
       * http://peter.michaux.ca/articles/feature-detection-state-of-the-art-browser-scripting
       * Modified to use strict equality
@@ -72,7 +72,7 @@
         }
         else if (object instanceof Node)//TODO: support for frames!
         {
-            res = {}
+            res = {};
             if (isHostMethod(object,'getBoundingClientRect'))
             {
                 res['rect'] = object.getBoundingClientRect();
@@ -81,6 +81,9 @@
             res.nodeName = object.nodeName;
             res.id = object.id || '';
             res['class'] = object.className || '';
+            if (object.hasOwnProperty('value')) {
+                res.value = object.value;
+            }
             res.html = object.outerHTML || '';
             res.nodeValue = object.nodeValue;
         }
@@ -102,23 +105,26 @@
         }
         return res;
     }
-    
+
     ///TODO: no support for now frames
     //idea would be map XPath across window.frames
     //must take care of visibility questions
 
     try
-    {   
-    	var exp = JSON.parse('%@')/* dynamic */,
-        	el,
-        	text = '%@',
-        	i,N;
- 
+    {
+        var exp = JSON.parse('%@')/* dynamic */,
+                el,
+                text = '%@',
+                i,N;
+
         el=document.elementFromPoint(exp.rect.left, exp.rect.top);
+        if(exp.id){
+            el = document.getElementById(exp.id);
+        }
         if (/input/i.test(el.tagName))
         {
-        	selectInputField(el);
-        	enterTextIntoInputField(el, text);
+                selectInputField(el);
+                enterTextIntoInputField(el, text);
         }
         else
         {
@@ -130,4 +136,4 @@
        return JSON.stringify({error:'Exception while running query: '+exp, details:e.toString()})
     }
     return JSON.stringify(toJSON(el));
-})();
+})();

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

@@ -9,7 +9,7 @@ import sh.calaba.instrumentationbackend.actions.HttpServer;
 
 public class CalabashInstrumentationTestRunner extends InstrumentationTestRunner {
 	@Override
-    public void onCreate(Bundle arguments) {		
+    public void onCreate(Bundle arguments) {
 		try {
 			Context context = getTargetContext ();
 			Class<?> c = Class.forName("mono.MonoPackageManager");
@@ -24,6 +24,7 @@ public class CalabashInstrumentationTestRunner extends InstrumentationTestRunner
         HttpServer.instantiate(Integer.parseInt(arguments.getString("test_server_port")));
 
         InstrumentationBackend.testPackage = arguments.getString("target_package");
+        InstrumentationBackend.extras = arguments;
 
         try {
             InstrumentationBackend.mainActivity = Class.forName(arguments.getString("main_activity"));

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

@@ -1,5 +1,7 @@
 package sh.calaba.instrumentationbackend;
 
+import android.content.Intent;
+import android.os.Bundle;
 import sh.calaba.instrumentationbackend.actions.Actions;
 import sh.calaba.instrumentationbackend.actions.HttpServer;
 import android.Manifest;
@@ -17,6 +19,7 @@ import com.jayway.android.robotium.solo.SoloEnhanced;
 public class InstrumentationBackend extends ActivityInstrumentationTestCase2 {
     public static String testPackage;
     public static Class mainActivity;
+    public static Bundle extras;
     
     private static final String TAG = "InstrumentationBackend";
     
@@ -32,7 +35,10 @@ public class InstrumentationBackend extends ActivityInstrumentationTestCase2 {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        
+        Intent i = new Intent();
+        i.setClassName(testPackage, mainActivity.getName());
+        i.putExtras(extras);
+        setActivityIntent(i);
         solo = new SoloEnhanced(getInstrumentation(), this.getActivity());
         viewFetcher = new PublicViewFetcher(getInstrumentation(), this.getActivity());
         actions = new Actions(getInstrumentation(), this);

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: testautoa
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 Z
+date: 2013-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -155,6 +155,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
@@ -162,7 +163,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