calabash-android 0.4.4 → 0.4.5.pre1

data/Rakefile

@@ -14,6 +14,8 @@ def build
       ant_executable,
       "clean",
       "package",
+      "-debug",
+      "-Dtools.dir=\"#{tools_dir}\"",
       "-Dandroid.api.level=17",
       "-Dversion=#{Calabash::Android::VERSION}",
     ]

data/bin/calabash-android-build.rb

@@ -11,7 +11,8 @@ def calabash_build(app)
   FileUtils.mkdir_p File.dirname(test_server_file_name) unless File.exist? File.dirname(test_server_file_name)
 
   unsigned_test_apk = File.join(File.dirname(__FILE__), '..', 'lib/calabash-android/lib/TestServer.apk')
-  android_platform = Dir["#{ENV["ANDROID_HOME"].gsub("\\", "/")}/platforms/android-*"].last
+  platforms = Dir["#{android_home_path}/platforms/android-*"].sort_by! { |item| '%08s' % item.split('-').last }
+  android_platform = platforms.last
   raise "No Android SDK found in #{ENV["ANDROID_HOME"].gsub("\\", "/")}/platforms/" unless android_platform
   Dir.mktmpdir do |workspace_dir|
     Dir.chdir(workspace_dir) do
@@ -26,7 +27,7 @@ def calabash_build(app)
         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}
+      unless system %Q{"#{tools_dir}/aapt" package -M AndroidManifest.xml  -I "#{android_platform}/android.jar" -F dummy.apk}
         raise "Could not create dummy.apk"
       end
 
@@ -44,4 +45,4 @@ def calabash_build(app)
     end
   end
   puts "Done signing the test server. Moved it to #{test_server_file_name}"
-end
+end

data/lib/calabash-android/canned_steps.md

@@ -244,6 +244,10 @@ Simulates that the user pressed the toggle button with the label text of the l10
 	Then /^I wait for the translated "([^\"]*)" l10nkey to appear$/ 
 Waits until the text of the translated l10nkey is displayed.
 
+Note: you can assert or press interface elements using [Android's String resources](http://developer.android.com/reference/android/R.string.html) by passing a package in a custom step:
+
+    performAction('press_l10n_element', 'ok', nil, 'android')
+
 Rotation
 --------
 

data/lib/calabash-android/helpers.rb

@@ -80,6 +80,16 @@ def sign_apk(app_path, dest_path)
   end
 end
 
+def tools_dir
+  dirs = Dir["#{android_home_path}/build-tools/*/"] + Dir["#{android_home_path}/platform-tools/"]
+  raise "Could not find tools directory in ANDROID_HOME" if dirs.empty?
+  dirs.first
+end
+
+def android_home_path
+  ENV["ANDROID_HOME"].gsub("\\", "/")
+end
+
 def read_keystore_info
   keystore = default_keystore
 

data/lib/calabash-android/operations.rb

@@ -215,7 +215,11 @@ module Operations
     end
 
     def app_running?
-      `#{adb_command} shell ps`.include?(ENV["PROCESS_NAME"] || package_name(@app_path))
+      begin
+        http("/ping") == "pong"
+      rescue
+        false
+      end
     end
 
     def keyguard_enabled?
@@ -255,12 +259,9 @@ module Operations
         http.read_timeout = options[:read_timeout] if options[:read_timeout]
         resp = http.post(path, "#{data.to_json}", {"Content-Type" => "application/json;charset=utf-8"})
         resp.body
-      rescue Exception => e
-        if app_running?
+      rescue EOFError => e
+          log "It looks like your app is no longer running. \nIt could be because of a crash or because your test script shut it down."
           raise e
-        else
-          raise "App no longer running"
-        end
       end
     end
 

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.4"
+    VERSION = "0.4.5.pre1"
   end
 end

data/test-server/AndroidManifest.xml

@@ -22,7 +22,7 @@
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COURSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.INTERNET" />
 

data/test-server/build.xml

@@ -6,7 +6,6 @@
 
     <property name="adb.device.arg" value="" />
     <property environment="env"/>
-    <property file="build.properties"/>
     <property name="staging.dir" location="staging"/>
     <property name="bin.dir" location="bin"/>
     <property name="test.app.aapt" location="${bin.dir}/Test_aapt.apk"/>
@@ -14,24 +13,19 @@
     <property name="test.app.unsigned" location="${bin.dir}/Test_unsigned.apk"/>
     <property name="calabashjs.dir" location="calabash-js/src"/>
 
-
     <!-- Windows support -->
     <condition property="bat" value=".bat" else=""><os family="windows" /></condition>
-    <property name="dx" location="${env.ANDROID_HOME}/platform-tools/dx${bat}" />
-    <property name="apkbuilder" location="${env.ANDROID_HOME}/tools/apkbuilder${bat}" />
 
+    <property name="dx" location="${tools.dir}/dx${bat}" />
+    <property name="aapt" location="${tools.dir}/aapt${bat}" />
+    
     <property name="android.lib" location="${env.ANDROID_HOME}/platforms/android-${android.api.level}/android.jar"/>
     <path id="android.antlibs">
+        <pathelement path="${env.ANDROID_HOME}/tools/lib/ant-tasks.jar" />
         <pathelement path="${env.ANDROID_HOME}/tools/lib/anttasks.jar" />
         <pathelement path="${env.ANDROID_HOME}/tools/lib/sdklib.jar" />
         <pathelement path="${env.ANDROID_HOME}/tools/lib/androidprefs.jar" />
     </path>
-    <taskdef name="xpath" classname="com.android.ant.XPathTask" classpathref="android.antlibs"/>
-    <taskdef name="aapt" classname="com.android.ant.AaptExecTask" classpathref="android.antlibs" />
-    <taskdef name="apkbuilder" classname="com.android.ant.ApkBuilderTask" classpathref="android.antlibs" />
-
-
-
 
     <path id="jar.libs.ref">
       <fileset dir="${staging.dir}/libs/" includes="*.jar" />
@@ -103,7 +97,7 @@
     </target>
 
     <target name="-aapt">
-      <exec executable="${env.ANDROID_HOME}/platform-tools/aapt" failonerror="yes">
+      <exec executable="${aapt}" failonerror="yes">
         <arg value="package" />
         <arg value="-f" />
         <arg value="-F" />
@@ -131,12 +125,11 @@
     </target>
 
     <target name="-apk">
-      <exec executable="${apkbuilder}" failonerror="yes">
+      <exec executable="java" failonerror="yes">
+        <arg value="-jar" />
+        <arg value="${staging.dir}/CalabashApkBuilder.jar" />
         <arg file="${test.app.unsigned}" />
-        <arg value="-u" />
-        <arg value="-z" />
         <arg file="${test.app.aapt}" />
-        <arg value="-f" />
         <arg file="${dex.file}" />
       </exec>
     </target>

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

@@ -13,15 +13,20 @@ public class L10nHelper {
    * get the translated value based on the current active locale.
    * 
    * @param l10nKey The l10n key to use
+   * @param pckg Optional package to find the resource, defaults to the application's package if null
    * @return The translated value.
    */
-  public static String getValue(String l10nKey) {
+  public static String getValue(String l10nKey, String pckg) {
+    
+    if(pckg == null){
+        pckg = InstrumentationBackend.solo.getCurrentActivity().getPackageName();
+    }
+      
     int resourceId =
         InstrumentationBackend.solo
             .getCurrentActivity()
             .getResources()
-            .getIdentifier(l10nKey, "string",
-                InstrumentationBackend.solo.getCurrentActivity().getPackageName());
+            .getIdentifier(l10nKey, "string", pckg);
 
     String localizedString =
         InstrumentationBackend.solo.getCurrentActivity().getResources().getString(resourceId);

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

@@ -21,7 +21,9 @@ public class PressElement implements Action {
 	public Result execute(String... args) {
 		String l10nKey = args[0];
 		String elementType = args.length > 1 ? args[1] : null;
-		String myLocalizedString = L10nHelper.getValue(l10nKey);
+		String pckg = (args.length > 2)? args[2] : null;
+		
+		String myLocalizedString = L10nHelper.getValue(l10nKey, pckg);
 		InstrumentationBackend.solo.searchText(myLocalizedString);
 		if (elementType == null) {
 			InstrumentationBackend.solo.clickOnText(myLocalizedString);

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

@@ -28,13 +28,14 @@ public class WaitForElement implements Action {
 	@Override
 	public Result execute(String... args) {
 		String l10nKey = args[0];
+		String pckg = (args.length > 1)? args[1] : null;
 		
-		String myLocalizedString = L10nHelper.getValue(l10nKey);
+		String myLocalizedString = L10nHelper.getValue(l10nKey, pckg);
 		boolean timedOut = !InstrumentationBackend.solo.waitForText(
 				myLocalizedString, 1, 90000);
 		if (timedOut) {
 			return new Result(false, "Time out while waiting for text:"
-					+ args[0]);
+					+ args[0] + ", package: " + pckg);
 		} else {
 			return Result.successResult();
 		}

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

@@ -0,0 +1,24 @@
+package sh.calaba.instrumentationbackend.actions.softkey;
+
+
+import com.jayway.android.robotium.solo.Solo;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+
+public class LeftKey implements Action {
+
+    @Override
+    public Result execute(String... args) {
+        InstrumentationBackend.solo.sendKey(Solo.LEFT);
+        return Result.successResult();
+    }
+
+    @Override
+    public String key() {
+        return "send_key_left";
+    }
+
+}

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

@@ -0,0 +1,24 @@
+package sh.calaba.instrumentationbackend.actions.softkey;
+
+
+import com.jayway.android.robotium.solo.Solo;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+
+public class RightKey implements Action {
+
+    @Override
+    public Result execute(String... args) {
+        InstrumentationBackend.solo.sendKey(Solo.RIGHT);
+        return Result.successResult();
+    }
+
+    @Override
+    public String key() {
+        return "send_key_right";
+    }
+
+}

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

@@ -0,0 +1,24 @@
+package sh.calaba.instrumentationbackend.actions.softkey;
+
+
+import com.jayway.android.robotium.solo.Solo;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+
+public class UpKey implements Action {
+
+    @Override
+    public Result execute(String... args) {
+        InstrumentationBackend.solo.sendKey(Solo.UP);
+        return Result.successResult();
+    }
+
+    @Override
+    public String key() {
+        return "send_key_up";
+    }
+
+}

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

@@ -11,7 +11,10 @@ public class EnterTextById implements Action {
 
 	@Override
 	public Result execute(String... args) {
-        final View view = TestHelpers.getViewById(args[1]);
+        if(args[1] == null) {
+            return Result.failedResult("Input text cannot be null");
+        }
+        View view = TestHelpers.getViewById(args[1]);
         if(view == null) {
             return new Result(false, "No view found with id: '" + args[1] + "'");
         } else if (!(view instanceof EditText)) {

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

@@ -17,7 +17,7 @@ public class WaitForViewById implements Action {
         	if( getViewById(viewId, 60000) != null ) {
         		return Result.successResult();
         	} else {
-        		return new Result(false, "Timed out while waiting for view with id:'" + viewId + "'");
+        		return new Result(false, "Waiting for view with id '" + viewId + "' to be visible timed out");
         	}
         } catch( InterruptedException e ) {
     		return Result.fromThrowable(e);
@@ -25,22 +25,29 @@ public class WaitForViewById implements Action {
     }
     
     protected View getViewById( String viewId, long timeout ) throws InterruptedException {
-    	System.out.println("Waiting for view with id '" + viewId + "'");
+        
+    	System.out.println("Waiting for view with id '" + viewId + "' to appear");
+    	
+    	View view = TestHelpers.getViewById(viewId);
+    	
+    	// no view, quick exit
+    	if(view == null){
+    	    throw new IllegalArgumentException("Could not find view with id '" + viewId + "'");
+    	}
+    	
+    	System.out.println("Waiting for view with id '" + viewId + "' found view " + view);
+    	
         long endTime = System.currentTimeMillis() + timeout;
         while (System.currentTimeMillis() < endTime) {
-            View view = TestHelpers.getViewById(viewId);
-            System.out.println("Waiting for view with id '" + viewId + "' found view " + view);
-
-            if (view != null) {
-                System.out.println("Waiting for view with id '" + viewId + "' Success");
+            if (view.getVisibility() == View.VISIBLE) {
+                System.out.println("View with id '" + viewId + "' is visible, success");
                 return view;
             } else {
-            	System.out.println("Waiting for view with id '" + viewId + "' sleeping...");
+            	System.out.println("View with id '" + viewId + "' is not visible, sleeping...");
             	Thread.sleep(500);
             }
         }
         
-        System.out.println("Waiting for view with id '" + viewId + "' Timed out");
         return null;
     }
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.4
-  prerelease: 
+  version: 0.4.5.pre1
+  prerelease: 6
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -180,10 +180,11 @@ files:
 - test-server/instrumentation-backend/.project
 - test-server/instrumentation-backend/.settings/org.eclipse.jdt.core.prefs
 - test-server/instrumentation-backend/AndroidManifest.xml
+- test-server/instrumentation-backend/CalabashApkBuilder.jar
 - test-server/instrumentation-backend/antlr.sh
 - test-server/instrumentation-backend/antlr/UIQuery.g
 - test-server/instrumentation-backend/antlr/UIQuery.tokens
-- test-server/instrumentation-backend/assets/foo.bar
+- test-server/instrumentation-backend/assets/.gitkeep
 - test-server/instrumentation-backend/build-libs/antlr-3.4-complete.jar
 - test-server/instrumentation-backend/build-libs/junit.jar
 - test-server/instrumentation-backend/build.xml
@@ -341,8 +342,11 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/DownKey.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/EnterKey.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/GoBack.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/LeftKey.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/PressMenu.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/RightKey.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/SelectFromMenuByText.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/UpKey.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/spinner/GetSelectedSpinnerItemText.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/spinner/SelectSpinnerItemByContentDescription.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/AssertGridViewContainsNoDuplicates.java
@@ -845,9 +849,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.23