calabash-android 0.4.0.pre1 → 0.4.0.pre2

data/bin/calabash-android-build.rb

@@ -1,5 +1,11 @@
 def calabash_build(app)
   keystore = read_keystore_info()
+  if fingerprint_from_keystore != fingerprint_from_apk(app)
+    puts "#{app} is not signed with the configured keystore '#{keystore["keystore_location"]}' Aborting!"
+    exit 1
+  end
+
+
 
   test_server_file_name = test_server_path(app)
   FileUtils.mkdir_p File.dirname(test_server_file_name) unless File.exist? File.dirname(test_server_file_name)

data/bin/calabash-android-setup.rb

@@ -8,12 +8,11 @@ def calabash_setup
   @settings = {}
 
   puts "Please enter keystore information to use a custom keystore instead of the default"
-  
+
   ask_for_setting(:keystore_location, "Please enter keystore location")
   ask_for_setting(:keystore_password, "Please enter the password for the keystore")
   ask_for_setting(:keystore_alias, "Please enter the alias")
-  ask_for_setting(:keystore_alias_password, "Please enter the password for the alias")
-  
+
   open('.calabash_settings', 'w') do |f|
     f.puts @settings.to_json
   end

data/lib/calabash-android/canned_steps.md

@@ -211,7 +211,7 @@ To take a screenshot of the phone while running the test use any of these steps.
 
 Location steps
 --------------
-If you app has the `ALLOW_MOCK_LOCATION` permission you can change the perceived location of the device by using any of these steps.
+If you allow your phone to use mocked locations (configured on your device under development settings) and your app has the `ACCESS_MOCK_LOCATION` permission you can change the perceived location of the device by using any of these steps.
 
 
 You can change the location any address or named location. This is done using the [geocoder gem](http://www.rubygeocoder.com/).

data/lib/calabash-android/helpers.rb

@@ -83,11 +83,44 @@ def read_keystore_info
     "keystore_location" => "#{ENV["HOME"]}/.android/debug.keystore",
     "keystore_password" => "android",
     "keystore_alias" => "androiddebugkey",
-    "keystore_alias_password" => "android"
     }
   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"]}`
+  md5_fingerprint = extract_md5_fingerprint(fingerprints)
+  log "MD5 fingerprint for keystore (#{keystore_info["keystore_location"]}): #{md5_fingerprint}"
+  md5_fingerprint
+end
+
+def fingerprint_from_apk(app_path)
+  Dir.mktmpdir do |tmp_dir|
+    Dir.chdir(tmp_dir) do
+      FileUtils.cp(app_path, "app.apk")
+      FileUtils.mkdir("META-INF")
+      Zip::ZipFile.foreach("app.apk") do |z|
+        z.extract if /^META-INF\/\w+.(RSA|rsa)/ =~ z.name
+      end
+      rsa_files = Dir["#{tmp_dir}/META-INF/*"]
+      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}`
+      md5_fingerprint = extract_md5_fingerprint(fingerprints)
+      log "MD5 fingerprint for signing cert (#{app_path}): #{md5_fingerprint}"
+      md5_fingerprint
+    end
+  end
+end
+
+def extract_md5_fingerprint(fingerprints)
+  m = fingerprints.scan(/MD5:\s+((?:\h\h:){15}\h\h)/)
+  raise "No MD5 fingerprint found:\n #{fingerprints}" unless m
+  m.last.first
+end
+
 def is_windows?
   require 'rbconfig'
   (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
@@ -95,4 +128,4 @@ end
 
 def log(message, error = false)
   $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} - #{message}" if (error or ARGV.include? "-v" or ARGV.include? "--verbose")
-end
+end

data/lib/calabash-android/operations.rb

@@ -83,16 +83,17 @@ module Operations
   end
 
   def wait_for(timeout, &block)
+    value = nil
     begin
       Timeout::timeout(timeout) do
-        until block.call
+        until value = block.call
           sleep 0.3
         end
       end
     rescue Exception => e
-      take_screenshot
       raise e
     end
+    value
   end
 
   def query(uiquery, *args)
@@ -105,7 +106,10 @@ module Operations
        raise "Invalid query #{uiquery}"
       end
     else
-      JSON.parse(http("/query", {"query" => uiquery}))
+      arguments = [*args]
+      operation = {"method_name"=>"query", "arguments" => arguments}
+      data = {"query" => uiquery, "operation" => operation}
+      JSON.parse(http("/map",data))
     end
   end
 
@@ -381,16 +385,19 @@ module Operations
     raise(msg)
   end
 
-  def touch(uiquery,options={})
+  def touch(uiquery,*args)
     if uiquery.instance_of? String
-      elements = query(uiquery, options)
+      elements = query(uiquery, *args)
       raise "No elements found" if elements.empty?
       element = elements.first
     else
       element = uiquery
     end
 
-    performAction("touch_coordinate", element["frame"]["x"], element["frame"]["y"])
+
+    center_x = element["frame"]["x"] + element["frame"]["width"] / 2
+    center_y = element["frame"]["y"] + element["frame"]["height"] / 2
+    performAction("touch_coordinate", center_x, center_y)
   end
 
   def http(options, data=nil)

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.0.pre1"
+    VERSION = "0.4.0.pre2"
   end
 end

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

@@ -3,8 +3,9 @@
 	<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.3.jar"/>
+	<classpathentry kind="lib" path="libs/robotium-solo-3.6.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

data/test-server/instrumentation-backend/antlr.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+java -cp build-libs/antlr-3.4-complete.jar org.antlr.Tool antlr/UIQuery.g -o src/sh/calaba/instrumentationbackend/query

data/test-server/instrumentation-backend/antlr/UIQuery.g

@@ -0,0 +1,70 @@
+grammar UIQuery;
+options {
+    output=AST;
+    ASTLabelType=CommonTree;
+}
+
+
+@header {
+    package sh.calaba.instrumentationbackend.query.antlr;
+}
+@lexer::header {
+    package sh.calaba.instrumentationbackend.query.antlr;
+}
+
+
+query	:	expr (WHITE! expr)*  
+		;
+	
+
+expr	:	(className | filter) 
+		;
+
+className   :   (NAME^ | QUALIFIED_NAME^);
+
+QUALIFIED_NAME : NAME ('.' NAME)+;
+
+filter : NAME FILTER_COLON^ (INT | STRING | BOOL | NIL);
+
+FILTER_COLON  : ':'
+	;
+
+
+INT :	'0'..'9'+
+    ;
+
+BOOL :	'true' | 'false'
+    ;
+
+NIL :	'nil' | 'null'
+    ;
+
+NAME  :	('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'0'..'9'|'_')*
+    ;
+
+STRING
+    :  '\'' ( ESC_SEQ | ~('\\'|'"') )* '\''
+    ;
+
+WHITE   :	' '* ;
+fragment
+HEX_DIGIT : ('0'..'9'|'a'..'f'|'A'..'F') ;
+
+fragment
+ESC_SEQ
+    :   '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\')
+    |   UNICODE_ESC
+    |   OCTAL_ESC
+    ;
+
+fragment
+OCTAL_ESC
+    :   '\\' ('0'..'3') ('0'..'7') ('0'..'7')
+    |   '\\' ('0'..'7') ('0'..'7')
+    |   '\\' ('0'..'7')
+    ;
+
+fragment
+UNICODE_ESC
+    :   '\\' 'u' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
+    ;

data/test-server/instrumentation-backend/antlr/UIQuery.tokens

@@ -0,0 +1,12 @@
+T__12=12
+T__13=13
+ESC_SEQ=4
+HEX_DIGIT=5
+ID=6
+INT=7
+OCTAL_ESC=8
+STRING=9
+UNICODE_ESC=10
+WHITE=11
+'.'=12
+':'=13

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

@@ -0,0 +1,56 @@
+<project name="instrumentationbackend" basedir="." default="test">
+
+    <property name="src.dir"     value="src"/>
+    <property name="test.dir"     value="tests"/>
+
+    <property name="build.dir"   value="build"/>
+    <property name="classes.dir" value="${build.dir}/classes"/>
+    <property name="jar.dir"     value="${build.dir}/jar"/>
+
+
+    <property name="lib.dir"     value="build-libs"/>
+
+    <path id="classpath">
+        <fileset dir="${lib.dir}" includes="**/*.jar"/>
+    </path>
+        
+    <target name="clean">
+        <delete dir="${build.dir}"/>
+    </target>
+
+    <target name="compile">
+        <mkdir dir="${classes.dir}"/>
+        <javac 
+            sourcepath="" 
+            srcdir="${src.dir}"
+            classpathref="classpath"
+            includeantruntime="false"
+			destdir="${build.dir}" >
+			    <include name="sh/calaba/instrumentationbackend/query/**/*.java"/>
+			    <exclude name="sh/calaba/instrumentationbackend/query/*.java"/> 
+			  </javac>
+    </target>
+
+
+     <target name="test" depends="compile">
+         <javac 
+            sourcepath="" 
+            srcdir="${test.dir}"
+            classpathref="classpath"
+            includeantruntime="false"
+			destdir="${build.dir}" >
+			    <include name="sh/calaba/instrumentationbackend/query/**/*.java"/>
+			     
+			  </javac>
+        <junit showoutput="true" >
+            <classpath>
+                <path refid="classpath"/>  
+                <pathelement location="${build.dir}"/>              
+            </classpath>
+             <formatter type="plain" usefile="false" /> 
+            <batchtest fork="yes">
+                <fileset dir="${test.dir}" includes="**/*Test.java"/>
+            </batchtest>
+        </junit>
+    </target>
+</project>

data/test-server/instrumentation-backend/src/org/antlr/runtime/ANTLRFileStream.java

@@ -0,0 +1,78 @@
+/*
+ [The "BSD license"]
+ Copyright (c) 2005-2009 Terence Parr
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.antlr.runtime;
+
+import java.io.*;
+
+/** This is a char buffer stream that is loaded from a file
+ *  all at once when you construct the object.  This looks very
+ *  much like an ANTLReader or ANTLRInputStream, but it's a special case
+ *  since we know the exact size of the object to load.  We can avoid lots
+ *  of data copying. 
+ */
+public class ANTLRFileStream extends ANTLRStringStream {
+	protected String fileName;
+
+	public ANTLRFileStream(String fileName) throws IOException {
+		this(fileName, null);
+	}
+
+	public ANTLRFileStream(String fileName, String encoding) throws IOException {
+		this.fileName = fileName;
+		load(fileName, encoding);
+	}
+
+	public void load(String fileName, String encoding)
+		throws IOException
+	{
+		if ( fileName==null ) {
+			return;
+		}
+		File f = new File(fileName);
+		int size = (int)f.length();
+		InputStreamReader isr;
+		FileInputStream fis = new FileInputStream(fileName);
+		if ( encoding!=null ) {
+			isr = new InputStreamReader(fis, encoding);
+		}
+		else {
+			isr = new InputStreamReader(fis);
+		}
+		try {
+			data = new char[size];
+			super.n = isr.read(data);
+		}
+		finally {
+			isr.close();
+		}
+	}
+
+	public String getSourceName() {
+		return fileName;
+	}
+}

data/test-server/instrumentation-backend/src/org/antlr/runtime/ANTLRInputStream.java

@@ -0,0 +1,70 @@
+/*
+ [The "BSD license"]
+ Copyright (c) 2005-2009 Terence Parr
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.antlr.runtime;
+
+import java.io.*;
+
+/** A kind of ReaderStream that pulls from an InputStream.
+ *  Useful for reading from stdin and specifying file encodings etc...
+  */
+public class ANTLRInputStream extends ANTLRReaderStream {
+	public ANTLRInputStream() {
+	}
+
+	public ANTLRInputStream(InputStream input) throws IOException {
+		this(input, null);
+	}
+
+	public ANTLRInputStream(InputStream input, int size) throws IOException {
+		this(input, size, null);
+	}
+
+	public ANTLRInputStream(InputStream input, String encoding) throws IOException {
+		this(input, INITIAL_BUFFER_SIZE, encoding);
+	}
+
+	public ANTLRInputStream(InputStream input, int size, String encoding) throws IOException {
+		this(input, size, READ_BUFFER_SIZE, encoding);
+	}
+
+	public ANTLRInputStream(InputStream input,
+							int size,
+							int readBufferSize,
+							String encoding)
+		throws IOException
+	{
+		InputStreamReader isr;
+		if ( encoding!=null ) {
+			isr = new InputStreamReader(input, encoding);
+		}
+		else {
+			isr = new InputStreamReader(input);
+		}
+		load(isr, size, readBufferSize);
+	}
+}