calabash-android 0.2.3 → 0.2.4

data/CHANGES.txt

@@ -1,3 +1,13 @@
+0.2.4:
+      Added three actions by Sampo Niskanen for interaction with WebViews:
+        * Executing arbitrary javascript in WebView
+        * Get the current url
+        * Detect the page load status
+
+      Fixed bug in features-skeleton/support/app_installation_hooks.rb
+
+      Fixed minor bugs
+      
 0.2.3:
       The 0.2.2 gem was broken :(
       Making a new release

data/bin/calabash-android

@@ -40,7 +40,7 @@ elsif cmd == 'build'
   exit 0
 elsif cmd == 'run'
   if ARGV.empty? or not is_apk_file?(ARGV.first)
-    calabash_run(nil, ARGV)
+    calabash_run()
   else
     calabash_run(relative_to_full_path(ARGV.shift))
   end

data/bin/calabash-android-run.rb

@@ -1,4 +1,4 @@
-def calabash_run(app_path)
+def calabash_run(app_path = nil)
 
   old_runner = "android.test.InstrumentationTestRunner"
   new_rummer = "sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner"
@@ -12,14 +12,12 @@ def calabash_run(app_path)
     exit
   end
 
-
-  unless File.exist?(test_server_path(app_path))
-    puts "No test server found for this combination of app and calabash version. Rebuilding test server."
-    calabash_build(app_path)
-  end
-
-
   if app_path
+    unless File.exist?(test_server_path(app_path))
+      puts "No test server found for this combination of app and calabash version. Rebuilding test server."
+      calabash_build(app_path)
+    end
+
     test_server_path = test_server_path(app_path)
     env = "PACKAGE_NAME=#{package_name(app_path)} "\
           "TEST_PACKAGE_NAME=#{package_name(test_server_path)} "\

data/features-skeleton/support/app_installation_hooks.rb

@@ -8,9 +8,9 @@ Before do |scenario|
   feature_name = scenario.feature.name
   if FeatureNameMemory.feature_name != feature_name
     log "Is first scenario - reinstalling apps"
-    uninstall_app(ENV["TEST_APP_PATH"])
+    
+    uninstall_apps
     install_app(ENV["TEST_APP_PATH"])
-    uninstall_app(ENV["APP_PATH"])
     install_app(ENV["APP_PATH"])
     FeatureNameMemory.feature_name = feature_name
 	end

data/lib/calabash-android/operations.rb

@@ -171,7 +171,10 @@ module Operations
         result = JSON.parse(result)
         if not result["success"] then
           take_screenshot
-          raise result["message"].to_s
+          if result["bonusInformation"] && result["bonusInformation"].size > 0 && result["bonusInformation"][0].include?("Exception")
+            log result["bonusInformation"][0]
+          end
+          raise "Step unsuccessful: #{result["message"]}"
         end
         return result
       end

data/lib/calabash-android/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Android
-    VERSION = "0.2.3"
-    FRAMEWORK_VERSION = "0.2.3"
+    VERSION = "0.2.4"
+    FRAMEWORK_VERSION = "0.2.4"
   end
 end

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

@@ -1,5 +1,8 @@
 package sh.calaba.instrumentationbackend;
 
+import java.io.BufferedWriter;
+import java.io.CharArrayWriter;
+import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -51,7 +54,11 @@ public class Result {
     }
         
     public static Result fromThrowable(Throwable t) {
-    	return new Result(false, t.getMessage());
+    	Result r = new Result(false, t.getMessage());
+    	CharArrayWriter caw = new CharArrayWriter();
+    	t.printStackTrace(new PrintWriter(caw));
+    	r.addBonusInformation("Exception stack trace:\n" + caw.toString());
+    	return r;
     }
     
     public static Result successResult() {

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

@@ -39,7 +39,7 @@ public class CalabashChromeClient extends WebChromeClient {
 		if (message != null && message.startsWith("calabash:")) {
 			r.confirm("CALABASH_ACK");
 			System.out.println("onJsPrompt: " + message);
-			result.message = message.replace("calabash:", "");
+			result.message = message.replaceFirst("calabash:", "");
 			eventHandled.open();
 			
 			return true;

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

@@ -1,6 +1,7 @@
 package sh.calaba.instrumentationbackend.actions.webview;
 
 
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.Result;
 import sh.calaba.instrumentationbackend.actions.Action;
 import android.webkit.WebView;
@@ -10,23 +11,28 @@ public class DumpBodyHtml implements Action {
     @Override
     public Result execute(String... args) {
     	                         
-    	Result result = Result.successResult();
+    	final Result result = Result.successResult();
     	for (CalabashChromeClient ccc : CalabashChromeClient.findAndPrepareWebViews()) {
-    		WebView webView = ccc.getWebView();
-			
-			webView.loadUrl("javascript:(function() {" +
-				"prompt('calabash:' + document.body.innerHTML);" + 
-				"})()");
+    		final WebView webView = ccc.getWebView();
+            InstrumentationBackend.solo.getCurrentActivity().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
 
-			String r = ccc.getResult();
-			System.out.println("Html:");
-			System.out.println("" + r);
-			result.addBonusInformation(r);
-		}
-    	return result;
-    }
+                    webView.loadUrl("javascript:(function() {" +
+                             "prompt('calabash:' + document.body.innerHTML);" +
+                             "})()");
+                 }
+             });
+            String r = ccc.getResult();
+            System.out.println("Html:");
+            System.out.println("" + r);
+            result.addBonusInformation(r);
 
-    @Override
+            return result;
+
+        }
+        return new Result(false, "No WebView found");
+    }
     public String key() {
         return "dump_body_html";
     }

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

@@ -1,6 +1,7 @@
 package sh.calaba.instrumentationbackend.actions.webview;
 
 
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.Result;
 import sh.calaba.instrumentationbackend.actions.Action;
 import android.webkit.WebView;
@@ -12,21 +13,27 @@ public class DumpHtml implements Action {
     	                         
     	Result result = Result.successResult();
     	for (CalabashChromeClient ccc : CalabashChromeClient.findAndPrepareWebViews()) {
-    		WebView webView = ccc.getWebView();
-			
-			webView.loadUrl("javascript:(function() {" +
-				"prompt('calabash:' + document.body.parentNode.innerHTML);" + 
-				"})()");
-
-			String r = ccc.getResult();
-			System.out.println("Html:");
-			System.out.println("" + r);
-			result.addBonusInformation(r);
-		}
-    	return result;
+    		final WebView webView = ccc.getWebView();
+
+            InstrumentationBackend.solo.getCurrentActivity().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+
+                    webView.loadUrl("javascript:(function() {" +
+                               "prompt('calabash:' + document.body.parentNode.innerHTML);" +
+                               "})()");
+                }
+            });
+            String r = ccc.getResult();
+            System.out.println("Html:");
+            System.out.println("" + r);
+            result.addBonusInformation(r);
+        }
+
+        return result;
     }
 
-    @Override
+            @Override
     public String key() {
         return "dump_html";
     }

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

@@ -0,0 +1,41 @@
+package sh.calaba.instrumentationbackend.actions.webview;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+import android.webkit.WebView;
+
+public class ExecuteJavascript implements Action {
+
+	@Override
+	public Result execute(String... args) {
+
+		CalabashChromeClient ccc = CalabashChromeClient.findAndPrepareWebViews().get(0);
+		final WebView webView = ccc.getWebView();
+		final String script = "javascript:(function() {"
+				+ "var result;"
+				+ args[0] + ";"
+				+ "prompt('calabash:'+result);" + "})()";
+
+		System.out.println("execute javascript: " + script);
+		
+		InstrumentationBackend.solo.getCurrentActivity().runOnUiThread(
+				new Runnable() {
+					@Override
+					public void run() {
+						webView.loadUrl(script);
+					}
+				});
+
+		String r = ccc.getResult();
+		System.out.println("javascript result: " + r);
+
+		return new Result(true, r);
+	}
+
+	@Override
+	public String key() {
+		return "execute_javascript";
+	}
+
+}

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

@@ -0,0 +1,22 @@
+package sh.calaba.instrumentationbackend.actions.webview;
+
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+import android.webkit.WebView;
+
+public class GetLoadProgress implements Action {
+
+	@Override
+	public Result execute(String... args) {
+		CalabashChromeClient ccc = CalabashChromeClient.findAndPrepareWebViews().get(0);
+		final WebView webView = ccc.getWebView();
+		int p = webView.getProgress();
+		return new Result(true, "" + p);
+	}
+
+	@Override
+	public String key() {
+		return "get_load_progress";
+	}
+
+}

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

@@ -0,0 +1,21 @@
+package sh.calaba.instrumentationbackend.actions.webview;
+
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+import android.webkit.WebView;
+
+public class GetUrl implements Action {
+
+	@Override
+	public Result execute(String... args) {
+		CalabashChromeClient ccc = CalabashChromeClient.findAndPrepareWebViews().get(0);
+		WebView webView = ccc.getWebView();
+		return new Result(true, webView.getUrl());
+	}
+
+	@Override
+	public String key() {
+		return "get_url";
+	}
+
+}

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

@@ -1,6 +1,7 @@
 package sh.calaba.instrumentationbackend.actions.webview;
 
 
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.Result;
 import sh.calaba.instrumentationbackend.TestHelpers;
 import sh.calaba.instrumentationbackend.actions.Action;
@@ -10,32 +11,39 @@ import android.webkit.WebView;
 public class PressByCssSelector implements Action {
 
     @Override
-    public Result execute(String... args) {
+    public Result execute(final String... args) {
     	for (CalabashChromeClient ccc : CalabashChromeClient.findAndPrepareWebViews()) {
-    		WebView webView = ccc.getWebView();
-			
-			webView.loadUrl("javascript:(function() {" +
-				"var element = document.querySelector(\"" + args[0] + "\");" +
-				"if (element != null) {" +
-				"	var oEvent = document.createEvent ('MouseEvent');" + 
-				"	oEvent.initMouseEvent('click', true, true,window, 1, 1, 1, 1, 1, false, false, false, false, 0, element);" +
-				"	element.dispatchEvent( oEvent );" +
-				"	prompt('calabash:true');" +
-				"}" +
-				"prompt('calabash:false');" + 
-				"})()");
-
-			String r = ccc.getResult();
-			System.out.println("clickOnSelector: " + r);
-			if ("true".equals(r)) {
-				TestHelpers.wait(0.3);
-				return Result.successResult();
-			}	
-		}
-		return new Result(false, "");
-    }
-
-    @Override
+    		final WebView webView = ccc.getWebView();
+            InstrumentationBackend.solo.getCurrentActivity().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+
+
+                    webView.loadUrl("javascript:(function() {" +
+                           "var element = document.querySelector(\"" + args[0] + "\");" +
+                           "if (element != null) {" +
+                           "	var oEvent = document.createEvent ('MouseEvent');" +
+                           "	oEvent.initMouseEvent('click', true, true,window, 1, 1, 1, 1, 1, false, false, false, false, 0, element);" +
+                           "	element.dispatchEvent( oEvent );" +
+                           "	prompt('calabash:true');" +
+                           "}" +
+                           "prompt('calabash:false');" +
+                           "})()");
+                }
+            });
+
+           String r = ccc.getResult();
+           System.out.println("clickOnSelector: " + r);
+           if ("true".equals(r)) {
+               TestHelpers.wait(0.3);
+               return Result.successResult();
+           }
+        }
+
+        return new Result(false,"No WebView Found");
+      }
+
+            @Override
     public String key() {
         return "click_by_selector";
     }

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

@@ -1,6 +1,7 @@
 package sh.calaba.instrumentationbackend.actions.webview;
 
 
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.Result;
 import sh.calaba.instrumentationbackend.TestHelpers;
 import sh.calaba.instrumentationbackend.actions.Action;
@@ -16,26 +17,34 @@ public class SetPropertyByCssSelector implements Action {
     	String value = args[2];
     	                         
     	for (CalabashChromeClient ccc : CalabashChromeClient.findAndPrepareWebViews()) {
-    		WebView webView = ccc.getWebView();
+    		final WebView webView = ccc.getWebView();
 			
-    		String assignment = "document.querySelector(\"" + cssSelector + "\")." + propertyName + " = " + value + ";";
+    		final String assignment = "document.querySelector(\"" + cssSelector + "\")." + propertyName + " = " + value + ";";
     		System.out.println(assignment);
-			webView.loadUrl("javascript:(function() {" +
-				assignment +
-				"prompt('calabash:true');" + 
-				"})()");
-
-			String r = ccc.getResult();
-			System.out.println("setPropertyByCssSelector: " + r);
-			if ("true".equals(r)) {
-				TestHelpers.wait(0.3);
-				return Result.successResult();
-			}	
-		}
-		return new Result(false, "");
-    }
 
-    @Override
+            InstrumentationBackend.solo.getCurrentActivity().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+
+                    webView.loadUrl("javascript:(function() {" +
+                               assignment +
+                               "prompt('calabash:true');" +
+                               "})()");
+
+                }
+            });
+            String r = ccc.getResult();
+            System.out.println("setPropertyByCssSelector: " + r);
+            if ("true".equals(r)) {
+                TestHelpers.wait(0.3);
+                return Result.successResult();
+            }
+        }
+
+       return new Result(false,"No WebView found");
+   }
+
+            @Override
     public String key() {
         return "set_property_by_css_selector";
     }

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

@@ -31,9 +31,9 @@ public class SetText implements Action {
 			//TODO: Hack! Should be serialized instead of removed
 			firstElement.remove("class");
 			firstElement.remove("html");
-			String firstElemntJson = QueryHelper.toJsonString(firstElement);
+			String firstElementJson = QueryHelper.toJsonString(firstElement);
 			
-			String result = QueryHelper.executeJavascriptInWebview("set_text.js", firstElemntJson, args[2]);
+			String result = QueryHelper.executeJavascriptInWebview("set_text.js", firstElementJson, args[2]);
 	    	return new Result(true, result);
     	} catch (Exception e) {
     		throw new RuntimeException(e);

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

@@ -16,25 +16,25 @@ public class Touch implements Action {
 
     @Override
     public Result execute(String... args) {
-    	
-    	try {
-    		String queryResult = QueryHelper.executeJavascriptInWebview("calabash.js", args[1], args[0]);
-    		List<HashMap<String,Object>> p = new ObjectMapper().readValue(queryResult, new TypeReference<List<HashMap<String,Object>>>(){});
-    		
-    		if (p.isEmpty()) {
-    			throw new RuntimeException("No element found");
-    		}
-    		
-    		Map<String, Object> firstRect = QueryHelper.findFirstVisibleRectangle(p);
-    		
-    		float[] screenCoordinates = QueryHelper.getScreenCoordinatesForCenter(firstRect);
-    		
-    		InstrumentationBackend.solo.clickOnScreen(screenCoordinates[0], screenCoordinates[1]);
-    	} catch (Exception e) {
-    		throw new RuntimeException(e);
-    	}
-
-		return new Result(true, "");
+
+        try {
+            String queryResult = QueryHelper.executeJavascriptInWebview("calabash.js", args[1], args[0]);
+            List<HashMap<String,Object>> p = new ObjectMapper().readValue(queryResult, new TypeReference<List<HashMap<String,Object>>>(){});
+
+            if (p.isEmpty()) {
+                throw new RuntimeException("No element found");
+            }
+
+            Map<String, Object> firstRect = QueryHelper.findFirstVisibleRectangle(p);
+
+            float[] screenCoordinates = QueryHelper.getScreenCoordinatesForCenter(firstRect);
+
+            InstrumentationBackend.solo.clickOnScreen(screenCoordinates[0], screenCoordinates[1]);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        return new Result(true, "");
     }
 
     @Override

metadata

@@ -1,72 +1,75 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: calabash-android
-version: !ruby/object:Gem::Version
-  version: 0.2.3
+version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 4
+  version: 0.2.4
 platform: ruby
-authors:
+authors: 
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-08-03 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: slowhandcuke
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: slowhandcuke
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! 'calabash-android drives tests for native  and hybrid Android apps. '
-email:
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+description: "calabash-android drives tests for native  and hybrid Android apps. "
+email: 
 - jonas@lesspainful.com
-executables:
+executables: 
 - calabash-android
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .calabash_settings
 - CHANGES.txt
 - Gemfile
@@ -190,6 +193,9 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/DumpBodyHtml.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/DumpHtml.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/EnterTextByCssSelector.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/ExecuteJavascript.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/GetLoadProgress.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/GetUrl.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/PressByCssSelector.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/Query.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/QueryHelper.java
@@ -605,28 +611,39 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/util/package-info.java
 - test-server/calabash-js/src/calabash.js
 - test-server/calabash-js/src/set_text.js
+has_rdoc: true
 homepage: http://github.com/calabash
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Client for calabash-android for automated functional testing on Android
 test_files: []
+