calabash-android 0.4.0.pre6 → 0.4.0.pre7

data/bin/calabash-android

@@ -1,8 +1,15 @@
 #!/usr/bin/env ruby
 
 require 'fileutils'
+require 'rbconfig'
 require 'calabash-android/helpers'
 
+# for ruby 1.9.1 and earlier
+unless defined? RbConfig.ruby
+  def RbConfig.ruby
+    File.join(RbConfig::CONFIG["bindir"], RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"])
+  end
+end
 
 require File.join(File.dirname(__FILE__), "calabash-android-helpers")
 require File.join(File.dirname(__FILE__), "calabash-android-generate")

data/bin/calabash-android-build.rb

@@ -18,7 +18,7 @@ def calabash_build(app)
       FileUtils.cp(unsigned_test_apk, "TestServer.apk")
       FileUtils.cp(File.join(File.dirname(__FILE__), '..', 'test-server/AndroidManifest.xml'), "AndroidManifest.xml")
 
-      unless system %Q{ruby -pi.bak -e "gsub(/#targetPackage#/, '#{package_name(app)}')" AndroidManifest.xml}
+      unless system %Q{"#{RbConfig.ruby}" -pi.bak -e "gsub(/#targetPackage#/, '#{package_name(app)}')" AndroidManifest.xml}
         raise "Could not replace package name in manifest"
       end
 

data/bin/calabash-android-console.rb

@@ -23,5 +23,5 @@ def calabash_console(app_path = nil)
     ENV["TEST_APP_PATH"] = test_server_path
   end
 
-  system "irb"
+  system "#{RbConfig.ruby} -S irb"
 end

data/bin/calabash-android-run.rb

@@ -40,7 +40,7 @@ def calabash_run(app_path = nil)
 
   STDOUT.sync = true
   arguments = ARGV - ["--no-build"]
-  cmd = "cucumber #{arguments.join(" ")} #{env}"
+  cmd = "#{RbConfig.ruby} -S cucumber #{arguments.join(" ")} #{env}"
   log cmd
   exit_code = system(cmd)
 

data/calabash-android.gemspec

@@ -20,5 +20,6 @@ Gem::Specification.new do |s|
   s.add_dependency( "retriable" )
   s.add_dependency( "slowhandcuke" )
   s.add_dependency( "rubyzip" )
+  s.add_dependency( "awesome_print" )
 
 end

data/irbrc

@@ -1,6 +1,8 @@
 require 'rubygems'
 require 'irb/completion'
 require 'irb/ext/save-history'
+require 'awesome_print'
+AwesomePrint.irb!
 
 ARGV.concat [ "--readline",
               "--prompt-mode",

data/lib/calabash-android/helpers.rb

@@ -116,8 +116,10 @@ def fingerprint_from_apk(app_path)
 end
 
 def extract_md5_fingerprint(fingerprints)
-  if fingerprints.encoding.name == "CP850"
-    fingerprints = fingerprints.gsub("\xA0".force_encoding("CP850"),"")
+  if is_windows?
+    if fingerprints.encoding.name == "CP850"
+      fingerprints = fingerprints.gsub("\xA0".force_encoding("CP850"),"")
+    end
   end
 
   m = fingerprints.scan(/MD5\s*:\s*((?:\h\h:){15}\h\h)/).flatten

data/lib/calabash-android/operations.rb

@@ -13,7 +13,6 @@ module Calabash module Android
 
 module Operations
 
-
   def log(message)
     $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} - #{message}" if (ARGV.include? "-v" or ARGV.include? "--verbose")
   end
@@ -29,6 +28,7 @@ module Operations
       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,6 +36,10 @@ 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
@@ -97,20 +101,15 @@ module Operations
   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 ni
@@ -134,10 +133,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
@@ -320,8 +315,8 @@ module Operations
         wake_up
       end
 
-      env_options = {:target_package => options[:target_package] || ENV["PACKAGE_NAME"],
-                     :main_activity => options[:main_activity] || ENV["MAIN_ACTIVITY"],
+      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"}
 
@@ -402,17 +397,20 @@ module Operations
   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?
       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
 
@@ -527,8 +525,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/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.0.pre6"
+    VERSION = "0.4.0.pre7"
   end
 end

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/antlr/UIQuery.g

@@ -35,13 +35,22 @@ query	:	expr (WHITE! expr)*
 		;
 	
 
-expr	:	(className | filter) 
+expr	:	(className | filter | visibility) 
 		;
 
-className   :   (NAME^ | QUALIFIED_NAME^);
+className   :   (WILDCARD^ | NAME^ | QUALIFIED_NAME^);
+
+WILDCARD : '*';
 
 QUALIFIED_NAME : NAME ('.' NAME)+;
 
+visibility   :   (ALL^ | VISIBLE^);
+
+ALL : 'all';
+
+VISIBLE : 'visible';
+
+
 filter : NAME FILTER_COLON^ (INT | STRING | BOOL | NIL);
 
 FILTER_COLON  : ':'

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

@@ -44,8 +44,9 @@ public class Command {
 
     public Result execute() {
         final Action action = InstrumentationBackend.actions.lookup(getCommand());
-
-        if ( Looper.getMainLooper().getThread() != Thread.currentThread()) {
+        return action.execute(getArguments());
+        /*
+        if ( Looper.getMainLooper().getThread() == Thread.currentThread()) {
             return action.execute(getArguments());
         }
 
@@ -57,7 +58,7 @@ public class Command {
             }
         });
         return result.get();
-
+*/
     }
 
 }

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

@@ -0,0 +1,95 @@
+package sh.calaba.instrumentationbackend;
+
+import java.io.CharArrayWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
+
+/**
+ * Represents a response in the Frankly protocol.
+ * This protocol is a JSON over HTTP protocol which is
+ * used across Calabash iOS, Calabash Android and Frank.
+ * @author krukow
+ * @see https://github.com/moredip/Frank/blob/master/doc/frankly.md
+ *
+ */
+public class FranklyResult {
+	
+    final boolean success;
+    final String reason;
+    final String detail;
+    @SuppressWarnings("rawtypes")
+	final List results;
+        
+
+	@SuppressWarnings({ "rawtypes" })
+	public FranklyResult(boolean success, List results, String reason,
+			String detail) {
+		super();
+		this.success = success;
+		this.results = results;		
+		this.reason = reason;
+		this.detail = detail;
+	}
+
+	public static FranklyResult fromThrowable(Throwable t) {
+    	CharArrayWriter caw = new CharArrayWriter();
+    	t.printStackTrace(new PrintWriter(caw));		
+		return new FranklyResult(false,Collections.EMPTY_LIST,t.getMessage(),caw.toString());
+    }
+    
+    public static FranklyResult emptyResult() {
+    	return new FranklyResult(true,Collections.EMPTY_LIST,null,null);
+    }
+
+    public static FranklyResult failedResult(String message,String detail) {
+        return new FranklyResult(false,Collections.EMPTY_LIST,message,detail);
+    }
+    
+    public String asJson() {
+        ObjectMapper mapper = new ObjectMapper();
+
+        try {        	
+            return mapper.writeValueAsString(asMap());
+        } catch (IOException e) {
+            throw new RuntimeException("Could not convert result to json", e);
+        }
+    }
+
+	public Map<String,Object> asMap() 
+	{
+		Map<String,Object> result = new HashMap<String, Object>();
+		result.put("outcome", this.success ? "SUCCESS" : "ERROR");
+		
+		if (this.success) 
+		{
+			result.put("results",this.results);	
+		}
+		else 
+		{
+			result.put("reason", this.reason);
+			if (this.detail != null)
+			{
+				result.put("detail", this.detail);
+			}						
+		}
+		return result;
+	}
+
+	@Override
+	public String toString() 
+	{
+		return "FranklyResult [success=" + success + ", reason=" + reason
+				+ ", details=" + detail + ", results=" + results + "]";
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static FranklyResult successResult(List result) {
+		return new FranklyResult(true, result, null,null);
+	}    
+}

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

@@ -22,7 +22,13 @@ public class Result {
 		this.success = success;
 		this.message = message;
     }
-    
+
+    public Result(boolean success, List<String> messages) {
+		this.success = success;
+		this.message = null;
+		this.bonusInformation = messages;
+    }
+
     public String getMessage() {
     	return message;
     }

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

@@ -14,13 +14,13 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import sh.calaba.instrumentationbackend.Command;
+import sh.calaba.instrumentationbackend.FranklyResult;
 import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.Result;
 import sh.calaba.instrumentationbackend.query.Query;
 import sh.calaba.instrumentationbackend.query.QueryResult;
 import sh.calaba.org.codehaus.jackson.map.DeserializationConfig.Feature;
 import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
-import sh.calaba.org.codehaus.jackson.type.TypeReference;
 import android.graphics.Bitmap;
 import android.util.Log;
 import android.view.View;
@@ -75,6 +75,7 @@ public class HttpServer extends NanoHTTPD {
 			return new NanoHTTPD.Response(HTTP_OK, MIME_HTML, "pong");
 
 		} else if (uri.endsWith("/map")) {
+			FranklyResult errorResult = null;
 			try {
 				String commandString = params.getProperty("json");
 				ObjectMapper mapper = new ObjectMapper();
@@ -85,32 +86,23 @@ public class HttpServer extends NanoHTTPD {
 				String methodName = (String) op.get("method_name");
 				List arguments = (List) op.get("arguments");
 				
-				QueryResult queryResult = new Query(uiQuery,arguments).execute();
+				//For now we only support query and query_all
+				//query_all includes also invisible views, while query filters them
+				boolean includeInVisible = "query_all".equals(methodName);
+				
+				
+				List queryResult = new Query(uiQuery,arguments).executeQuery();
 
-				return new NanoHTTPD.Response(HTTP_OK, "application/json;charset=utf-8",
-						queryResult.asJson());
-			} catch (IOException e) {
-				e.printStackTrace();
+				return new NanoHTTPD.Response(HTTP_OK, "application/json;charset=utf-8", 
+						FranklyResult.successResult(queryResult).asJson());
 			} catch (Exception e ) {
-                System.err.println("Query failed!");
-                e.printStackTrace();
+				e.printStackTrace();
+                errorResult = FranklyResult.fromThrowable(e);
             }
-            return new NanoHTTPD.Response(HTTP_INTERNALERROR, MIME_HTML, "Query failed");
+            return new NanoHTTPD.Response(HTTP_OK, "application/json;charset=utf-8", errorResult.asJson());
 		} else if (uri.endsWith("/query")) {
-			try {
-				String commandString = params.getProperty("json");
-				ObjectMapper mapper = new ObjectMapper();
-				Map<String, String> command = mapper.readValue(commandString,
-						new TypeReference<Map<String, String>>() {
-						});
-				QueryResult result = new Query(command.get("query")).executeInMainThread();
-				return new NanoHTTPD.Response(HTTP_OK, MIME_HTML,
-						result.asJson());
-			} catch (IOException e) {
-				e.printStackTrace();
-				return new Response(HTTP_INTERNALERROR, MIME_PLAINTEXT,
-						"Could not parse arguments as JSON");
-			}
+			return new Response(HTTP_BADREQUEST, MIME_PLAINTEXT,
+					"/query endpoint is discontinued - use /map with operation query");
 		} else if (uri.endsWith("/kill")) {
 			lock.lock();
 			try {

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

@@ -10,6 +10,8 @@ import android.location.Location;
 import android.location.LocationManager;
 import android.location.LocationProvider;
 
+import java.lang.reflect.Method;
+
 
 public class FakeGPSLocation implements Action {
 	
@@ -73,15 +75,22 @@ public class FakeGPSLocation implements Action {
     	
     	private void setLocation(LocationManager locationManager, String locationProvider, double latitude, double longitude) {
 
-    		//locationManager.clearTestProviderLocation(locationProvider);
-
     		Location location = new Location(locationProvider);
     		location.setLatitude(latitude);
     		location.setLongitude(longitude);
     		location.setAccuracy(1);
     		location.setTime(System.currentTimeMillis());
 
-    		locationManager.setTestProviderLocation(locationProvider, location);        
+            try {
+                Method makeComplete = Location.class.getMethod("makeComplete");
+                if (makeComplete != null) {
+                    makeComplete.invoke(location);
+                }
+            } catch (Exception e) {
+                //Method only available in Jelly Bean
+            }
+
+            locationManager.setTestProviderLocation(locationProvider, location);
     	}
 
     	public void finish() {
@@ -93,13 +102,7 @@ public class FakeGPSLocation implements Action {
     public String key() {
         return "set_gps_coordinates";
     }
-    
-    /**
-     * Causes error if Device does not support given provider
-     * 
-     * @param provider
-     * @return 
-     */
+
     private boolean doesDeviceProvideGPS() {
     LocationManager locationManager = (LocationManager) InstrumentationBackend.solo.getCurrentActivity().getSystemService(Context.LOCATION_SERVICE);
     if (locationManager.getProvider(LocationManager.GPS_PROVIDER) == null) {