testautoa 0.4.1 → 0.4.2.pre1

data/bin/calabash-android

@@ -11,6 +11,24 @@ unless defined? RbConfig.ruby
   end
 end
 
+
+if File.exist? "features/support/app_life_cycle_hooks.rb"
+  content = IO.read("features/support/app_life_cycle_hooks.rb")
+  if content.include? "include Calabash::Android::Operations"
+    puts """
+    Fatal Error!
+    Your Calabash hooks are not compatible with this version of calabash-android.
+    Please remove the following line from 'features/support/app_life_cycle_hooks.rb'.
+
+      include Calabash::Android::Operations
+
+    """
+
+    exit 1
+  end
+end
+
+
 require File.join(File.dirname(__FILE__), "calabash-android-helpers")
 require File.join(File.dirname(__FILE__), "calabash-android-generate")
 require File.join(File.dirname(__FILE__), "calabash-android-build")

data/bin/calabash-android-build.rb

@@ -22,6 +22,10 @@ def calabash_build(app)
         raise "Could not replace package name in manifest"
       end
 
+       unless system %Q{"#{RbConfig.ruby}" -pi.bak -e "gsub(/#testPackage#/, '#{package_name(app)}.test')" AndroidManifest.xml}
+        raise "Could not replace test package name in manifest"
+      end
+
       unless system %Q{"#{ENV["ANDROID_HOME"]}/platform-tools/aapt" package -M AndroidManifest.xml  -I "#{android_platform}/android.jar" -F dummy.apk}
         raise "Could not create dummy.apk"
       end

data/bin/calabash-android-console.rb

@@ -7,10 +7,6 @@ def calabash_console(app_path = nil)
 
   ENV["IRBRC"] = File.join(File.dirname(__FILE__), '..', 'irbrc')
 
-  unless ENV["PACKAGE_NAME"]
-    ENV["PACKAGE_NAME"] = package_name(app_path)
-  end
-
   unless ENV["MAIN_ACTIVITY"]
     ENV["MAIN_ACTIVITY"] = main_activity(app_path)
   end

data/bin/calabash-android-run.rb

@@ -21,8 +21,7 @@ def calabash_run(app_path = nil)
     else
       test_server_port = "34777"
     end
-    env = "PACKAGE_NAME=#{package_name(app_path)} "\
-          "MAIN_ACTIVITY=#{main_activity(app_path)} "\
+    env = "MAIN_ACTIVITY=#{main_activity(app_path)} "\
           "APP_PATH=\"#{app_path}\" "\
           "TEST_APP_PATH=\"#{test_server_path}\" "\
           "TEST_SERVER_PORT=#{test_server_port}"

data/bin/testautoa

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require 'calabash-android/version'
+require 'calabash-android/operations'
 require 'fileutils'
 require 'json'
 require 'uri'
@@ -29,6 +31,8 @@ def print_usage
       Start an Android Virtual Device
     devices
       List connected Android Devices
+    install tools
+      Install all tools
     getbuild list
       List available builds in the build drop
     getbuild <Version>
@@ -39,6 +43,8 @@ def print_usage
       List available scripts
     getscript <Script>
       Download the specified script
+    go <Version> <Script>
+      Download the build with <Version> and start test automation with <Script>
     version
       prints the gem version
 
@@ -137,29 +143,30 @@ def setup
     read_settings
     puts "Settings for Test Automation"
 
-    ask_for_setting(:svn_location, "Please enter svn location", @settings["svn_location"])
-    ask_for_setting(:svn_username, "Please enter svn username", @settings["svn_username"])
-    ask_for_setting(:svn_password, "Please enter svn password", @settings["svn_password"])
+    ask_for_setting("svn_location", "Please enter svn location for scripts", @settings["svn_location"])
+    ask_for_setting("svn_location_tools", "Please enter svn location for tools", @settings["svn_location_tools"])
+    ask_for_setting("svn_username", "Please enter svn username", @settings["svn_username"])
+    ask_for_setting("svn_password", "Please enter svn password", @settings["svn_password"])
 
-    ask_for_setting(:build_drop_location, "Please enter build drop location", @settings["build_drop_location"])
-    ask_for_setting(:build_drop_username, "Please enter the username", @settings["build_drop_username"])
-    ask_for_setting(:build_drop_password, "Please enter the password", @settings["build_drop_password"])
+    ask_for_setting("build_drop_location", "Please enter build drop location", @settings["build_drop_location"])
+    ask_for_setting("build_drop_username", "Please enter the username", @settings["build_drop_username"])
+    ask_for_setting("build_drop_password", "Please enter the password", @settings["build_drop_password"])
   
-    ask_for_setting(:app_package, "Please enter the name of app package", @settings["app_package"])
-    ask_for_setting(:device_serialno, "Please enter the serial number of the device", @settings["device_serialno"])
-    ask_for_setting(:test_server_port, "Please enter the test server port", @settings["test_server_port"] ||= "34777")
+    ask_for_setting("app_package", "Please enter the name of app package", @settings["app_package"])
+    ask_for_setting("device_serialno", "Please enter the serial number of the device", @settings["device_serialno"])
+    ask_for_setting("test_server_port", "Please enter the test server port", @settings["test_server_port"] ||= "34777")
 
-    ask_for_setting(:avd_name, "Please enter the name of Android emulator", @settings["avd_name"] ||= "testauto_avd")
+    ask_for_setting("avd_name", "Please enter the name of Android emulator", @settings["avd_name"] ||= "testauto_avd")
     puts "Available Targets:"
     get_target_names.each{|i| puts "* #{i}" }
-    ask_for_setting(:avd_target, "Please enter the target of Android emulator", @settings["avd_target"] ||= "android-16")
+    ask_for_setting("avd_target", "Please enter the target of Android emulator", @settings["avd_target"] ||= "android-16")
     puts "Available CPUs:"
     get_abis(@settings["avd_target"]).each{|i| puts "* #{i}"}
-    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"
+    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"
   
     open('.testautoa_settings', 'w') do |f|
         f.puts @settings.to_json
@@ -227,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
@@ -257,6 +270,8 @@ def smb_disconnect(mount_node)
 end
 
 def get_build
+    raise "Please configure build drop location, username, and password first by running setup" if @settings["build_drop_location"].to_s.empty? or @settings["build_drop_username"].to_s.empty? or @settings["build_drop_password"].to_s.empty?
+    
     mount_node = smb_connect(@settings["build_drop_location"], 
                              @settings["build_drop_username"], 
                              @settings["build_drop_password"])
@@ -277,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
-        build_dir = Dir.entries(release_path).sort_by{|c| File.stat(File.join(release_path,c)).ctime}.last 
+        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)
@@ -289,6 +306,8 @@ def get_build
 end
 
 def get_script
+    raise "Please configure Subversion location, username, and password first by running setup" if @settings["svn_location"].to_s.empty? or @settings["svn_username"].to_s.empty? or @settings["svn_password"].to_s.empty?
+    
     username = @settings["svn_username"]
     password = @settings["svn_password"]
     uri = URI.join(@settings["svn_location"], "Mobile/", "BVT/", "CTE/")
@@ -300,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
@@ -312,6 +331,17 @@ def adb_path
     File.join(ENV['ANDROID_HOME'], 'platform-tools', 'adb')
 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?
+    adb_path + serial_number
+end
+
+def adb_shell(command)
+    system("#{adb_path_w_sn} shell #{command}")
+end
+
 def android_path
     raise_if_android_home_not_set
     File.join(ENV['ANDROID_HOME'], 'tools', 'android')
@@ -383,6 +413,29 @@ def run_avd
     end
 end
 
+def install_tools
+    raise "Please configure Subversion location for tools, username, and password first by running setup" if @settings["svn_location_tools"].to_s.empty? or @settings["svn_username"].to_s.empty? or @settings["svn_password"].to_s.empty?
+
+    location = @settings["svn_location_tools"]
+    location += '/' unless location.end_with?('/')    
+    username = @settings["svn_username"]
+    password = @settings["svn_password"]
+    serial_number = @settings["device_serialno"].to_s.strip
+    adb_dev_arg = ''
+    adb_dev_arg = "-s #{serial_number}" unless serial_number.empty?
+    
+    # delete tools directory
+    FileUtils.rm_rf(File.join(FileUtils.pwd, "tools"))
+
+    system("svn export --force #{location} tools/ --username #{username} --password #{password}")
+    tools = `svn list #{location} -R --username #{username} --password #{password}`.split(/\n/).select{|i| i.end_with?('.apk')}
+    tools.each do |tool|
+        tool_apk = File.join(FileUtils.pwd, "tools", tool)
+        puts "Installing #{tool_apk}"
+        system("#{adb_path} #{adb_dev_arg} install #{tool_apk}")
+    end
+end
+
 if (ARGV.length == 0)
     print_usage
     exit 0
@@ -415,6 +468,13 @@ elsif cmd == 'devices'
     list_devices
     exit 0
 
+elsif cmd == 'install'
+    read_settings
+    tools = ARGV.shift
+    if tools == 'tools'
+        install_tools
+    end
+
 elsif cmd == 'list'
     option = ARGV.shift
     if option == 'target'

data/lib/calabash-android/operations.rb

@@ -59,8 +59,8 @@ module Operations
   end
 
   def uninstall_apps
-    default_device.uninstall_app("sh.calaba.android.test")
-    default_device.uninstall_app(ENV["PACKAGE_NAME"])
+    default_device.uninstall_app(package_name(default_device.test_server_path))
+    default_device.uninstall_app(package_name(default_device.app_path))
   end
 
   def wake_up
@@ -104,6 +104,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
@@ -166,15 +170,18 @@ module Operations
   end
 
   class Device
+    attr_reader :app_path, :test_server_path, :serial, :server_port, :test_server_port
+
+    def initialize(cucumber_world, serial, server_port, app_path, test_server_path, test_server_port = 7102)
 
-    def initialize(cucumber_world, serial, server_port, app_path, test_server_path)
       @cucumber_world = cucumber_world
       @serial = serial
       @server_port = server_port
       @app_path = app_path
       @test_server_path = test_server_path
+      @test_server_port = test_server_port
 
-      forward_cmd = "#{adb_command} forward tcp:#{server_port} tcp:7102"
+      forward_cmd = "#{adb_command} forward tcp:#{@server_port} tcp:#{@test_server_port}"
       log forward_cmd
       log `#{forward_cmd}`
     end
@@ -334,8 +341,10 @@ 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),
+                     :test_server_port => @test_server_port,
                      :debug => options[:debug] || false,
                      :class => options[:class] || "sh.calaba.instrumentationbackend.InstrumentationBackend"}
 
@@ -347,7 +356,7 @@ module Operations
         cmd_arr << val.to_s
       end
 
-      cmd_arr << "sh.calaba.android.test/sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner"
+      cmd_arr << "#{package_name(@test_server_path)}/sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner"
 
       cmd = cmd_arr.join(" ")
 
@@ -435,6 +444,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/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.1"
+    VERSION = "0.4.2.pre1"
   end
 end

data/test-server/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="sh.calaba.android.test"
+      package="#testPackage#"
       android:versionCode="3"
       android:versionName="0.3.0">
     <application android:label="instrumentation_backend">

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

@@ -21,7 +21,7 @@ public class CalabashInstrumentationTestRunner extends InstrumentationTestRunner
 		}
 
         // Start the HttpServer as soon as possible in a not-ready state
-        HttpServer.instantiate();
+        HttpServer.instantiate(Integer.parseInt(arguments.getString("test_server_port")));
 
         InstrumentationBackend.testPackage = arguments.getString("target_package");
 

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

@@ -42,20 +42,14 @@ public class HttpServer extends NanoHTTPD {
 	 * 
 	 * Can only be called once. Otherwise, you'll get an IllegalStateException.
 	 */
-	public synchronized static HttpServer instantiate() {
+	public synchronized static HttpServer instantiate(int testServerPort) {
 		if (instance != null) {
 			throw new IllegalStateException("Can only instantiate once!");
 		}
-		instance = new HttpServer();
+		instance = new HttpServer(testServerPort);
 		return instance;
 	}
 
-	/**
-	 * Returns the singleton instance for HttpServer.
-	 * 
-	 * If {@link #instantiate()} hasn't already been called, an
-	 * IllegalStateException is thrown.
-	 */
 	public synchronized static HttpServer getInstance() {
 		if (instance == null) {
 			throw new IllegalStateException("Must be initialized!");
@@ -63,8 +57,8 @@ public class HttpServer extends NanoHTTPD {
 		return instance;
 	}
 
-	private HttpServer() {
-		super(7102, new File("/"));
+	private HttpServer(int testServerPort) {
+		super(testServerPort, new File("/"));
 	}
 
 	@SuppressWarnings("rawtypes")

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/UIQueryUtils.java

@@ -254,6 +254,7 @@ public class UIQueryUtils {
 			String textWithPings = val.getText();
 			String text = textWithPings
 					.substring(1, textWithPings.length() - 1);
+            text = text.replaceAll("\\\\'", "'");
 			return text;
 		}
 		case UIQueryParser.INT:

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: testautoa
 version: !ruby/object:Gem::Version
-  version: 0.4.1
-  prerelease: 
+  version: 0.4.2.pre1
+  prerelease: 6
 platform: ruby
 authors:
 - jimtsay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Description
 email: 
 executables:
@@ -848,9 +864,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25