calabash-android 0.3.3.pre3 → 0.3.3.pre5

data/bin/calabash-android

@@ -9,6 +9,7 @@ require File.join(File.dirname(__FILE__), "calabash-android-generate")
 require File.join(File.dirname(__FILE__), "calabash-android-build")
 require File.join(File.dirname(__FILE__), "calabash-android-run")
 require File.join(File.dirname(__FILE__), "calabash-android-setup")
+require File.join(File.dirname(__FILE__), "calabash-android-console")
 
 @features_dir = File.join(FileUtils.pwd, "features")
 @support_dir = File.join(@features_dir, "support")
@@ -52,6 +53,17 @@ elsif cmd == 'run'
 elsif cmd == 'gen'
   calabash_scaffold
   exit 0
+elsif cmd == 'console'
+  if ARGV.empty?
+    puts "Please specify an app"
+    exit 1
+  end
+  unless File.exist? ARGV.first
+    puts "No such file #{ARGV.first}"
+    exit 1
+  end
+  calabash_console ARGV.first
+  exit 0
 elsif cmd == 'setup'
   calabash_setup
   exit 0

data/bin/calabash-android-console.rb

@@ -0,0 +1,21 @@
+def calabash_console(app_path = nil)
+  test_server_path = test_server_path(app_path)
+
+  unless ENV["TEST_SERVER_PORT"]
+    ENV["TEST_SERVER_PORT"] = "34777"
+  end
+
+  unless ENV["IRBRC"]
+    ENV["IRBRC"] = File.join(File.dirname(__FILE__), '..', 'irbrc')
+  end
+
+  unless ENV["PACKAGE_NAME"]
+    ENV["PACKAGE_NAME"] = package_name(app_path)  
+  end
+
+  unless ENV["MAIN_ACTIVITY"]
+    ENV["MAIN_ACTIVITY"] = main_activity(app_path)  
+  end
+
+  system "irb"
+end

data/bin/calabash-android-generate.rb

@@ -12,8 +12,6 @@ def calabash_scaffold
   exit 2 unless STDIN.gets.chomp == ''
 
   FileUtils.cp_r(@source_dir, @features_dir)
-  FileUtils.mv "#{@features_dir}/.irbrc", "."
-  FileUtils.mv "#{@features_dir}/irb_android.sh", "."
 
   msg("Info") do
     puts "features subdirectory created. \n"

data/{features-skeleton/.irbrc → irbrc}

@@ -6,7 +6,7 @@ ARGV.concat [ "--readline",
               "--prompt-mode",
               "simple" ]
 
-# 25 entries in the list
+# 50 entries in the list
 IRB.conf[:SAVE_HISTORY] = 50
 
 # Store results in home directory with specified file name
@@ -15,4 +15,6 @@ IRB.conf[:HISTORY_FILE] = ".irb-history"
 require 'calabash-android/operations'
 include Calabash::Android::Operations
 
-start_test_server_in_background
+def embed(*args)
+  puts "Embed is a Cucumber method and is not available in this console."
+end

data/lib/calabash-android/operations.rb

@@ -243,7 +243,8 @@ module Operations
       path = "#{prefix}#{name}_#{@@screenshot_count}.png"
 
       if ENV["SCREENSHOT_VIA_USB"] == "true"
-        screenshot_cmd = "java -jar #{File.join(File.dirname(__FILE__), 'lib', 'screenShotTaker.jar')} #{path}"
+        device_args = "-s #{@serial}" if @serial
+        screenshot_cmd = "java -jar #{File.join(File.dirname(__FILE__), 'lib', 'screenShotTaker.jar')} #{path} #{device_args}"
         log screenshot_cmd
         raise "Could not take screenshot" unless system(screenshot_cmd)
       else

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.3.3.pre3"
+    VERSION = "0.3.3.pre5"
   end
 end

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

@@ -1,7 +1,9 @@
 package sh.calaba.instrumentationbackend;
 
 import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicReference;
 
+import android.os.Looper;
 import sh.calaba.instrumentationbackend.actions.Action;
 
 
@@ -41,8 +43,21 @@ public class Command {
 	}
 
     public Result execute() {
-        Action action = InstrumentationBackend.actions.lookup(getCommand());
-        return action.execute(getArguments());
+        final Action action = InstrumentationBackend.actions.lookup(getCommand());
+
+        if ( Looper.getMainLooper().getThread() != Thread.currentThread()) {
+            return action.execute(getArguments());
+        }
+
+        final AtomicReference<Result> result = new AtomicReference<Result>();
+        InstrumentationBackend.instrumentation.runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                result.set(action.execute(getArguments()));
+            }
+        });
+        return result.get();
+
     }
 
 }

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

@@ -2,8 +2,11 @@ package sh.calaba.instrumentationbackend;
 
 import sh.calaba.instrumentationbackend.actions.Actions;
 import sh.calaba.instrumentationbackend.actions.HttpServer;
+import android.app.Activity;
 import android.app.Instrumentation;
+import android.content.Context;
 import android.test.ActivityInstrumentationTestCase2;
+import android.location.LocationManager;
 import android.util.Log;
 
 import com.jayway.android.robotium.solo.SoloEnhanced;
@@ -53,6 +56,8 @@ public class InstrumentationBackend extends ActivityInstrumentationTestCase2 {
             e.printStackTrace();
         }
 
+        removeTestLocationProviders(this.getActivity());
+
         this.getActivity().finish();
         super.tearDown();
 
@@ -65,4 +70,12 @@ public class InstrumentationBackend extends ActivityInstrumentationTestCase2 {
     public static void logError(String message) {
         Log.e(TAG, message);
     }
+
+    private static void removeTestLocationProviders(Activity activity) {
+        final LocationManager locationService =
+            (LocationManager) activity.getSystemService(Context.LOCATION_SERVICE);
+        for (final String provider : locationService.getAllProviders()) {
+            locationService.removeTestProvider(provider);
+        }
+    }
 }

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

@@ -0,0 +1,85 @@
+package sh.calaba.instrumentationbackend.actions.list;
+
+import java.util.ArrayList;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+import android.widget.ListView;
+
+/**
+ * Provides access to a list through its adapter.
+ * 
+ * args: 
+ * <ul> 
+ *   <li>1-based list index (first list is used if not specified)</li>
+ * </ul>
+ * 
+ * eg: (all items of the 1st list) <code>performAction( 'get_list_data' )</code>
+ * eg: (all items of the 2nd list) <code>performAction( 'get_list_data', 2 )</code>
+ * 
+ * @return <code>bonusInformation</code>: a JSON-formatted Array<String> that is an
+ * Array of objects with a single property "value". The value of this property is generated by calling
+ * <code>list.getAdapter().getItem().toString()</code>, so make sure you implement the toString() method 
+ * on the objects that go to the adapter AND that it returns a value valid for JSON.
+ * 
+ * In ruby we can then parse the response:
+ * <pre>
+ * 		result = performAction('get_list_data')
+ * 		bonusInfo = result['bonusInformation'][0]
+ * 		JSON.parse(bonusInfo).each do |item|
+ * 			puts "#{item["value"]}"
+ * 		end
+ * </pre>
+ * 
+ * @author Juan Delgado (juan@ustwo.co.uk)
+ */
+
+public class GetListData implements Action {
+
+	@Override
+	public Result execute(String... args) {
+		
+		int listIndex;
+
+		if( args.length == 0 ) {
+			listIndex = 0;
+		} else {
+			listIndex = (Integer.parseInt(args[0]) - 1);
+		}
+		
+		ArrayList<ListView> listViews = InstrumentationBackend.solo.getCurrentListViews();
+		
+		if( listViews == null || listViews.size() <= listIndex ) {
+			return new Result(false, "Could not find list #" + (listIndex + 1));
+		}
+		
+		ListView list = listViews.get(listIndex);
+		Result result = new Result(true);
+		
+		StringBuilder json = new StringBuilder("[");
+		
+		int count = list.getAdapter().getCount();
+		for( int i = 0; i < count; i++ ) {
+			json.append("{\"value\": \"");
+			json.append(list.getAdapter().getItem(i).toString());
+			json.append("\"},");
+		}
+		
+		if(count > 0)
+		{
+			json.deleteCharAt( json.length() - 1 ); // remove the last comma
+		}
+		
+		json.append("]");
+		
+		result.addBonusInformation(json.toString());
+		
+		return result;
+	}
+
+	@Override
+	public String key() {
+		return "get_list_data";
+	}
+}

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

@@ -90,7 +90,6 @@ public class GetListItemProperties implements Action {
 			addViewInfo( json, (ViewGroup)row );
 		}
 
-		json.deleteCharAt( json.length() - 1 );		// remove the last comma
 		json.append('}');
 		return json.toString();
 	}
@@ -99,8 +98,8 @@ public class GetListItemProperties implements Action {
 		int resId = view.getId();
 		String resIdName = view.getResources().getResourceEntryName(resId);
 
-		json.append("\"id\":\"").append(resIdName).append("\", \"text:\"").append( ((TextView)view).getText() ).append("\"");
-
+		json.append("\"id\":\"").append(resIdName).append("\", \"text\":\"").append( ((TextView)view).getText() ).append("\"");
+		
 		json.append(", \"color\":").append( view.getCurrentTextColor() );
 		Drawable background = view.getBackground();
 		if( background instanceof ColorDrawable ) {

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

@@ -12,13 +12,7 @@ public class EnterQueryByIndex implements Action {
         final String query = args[0];
         final SearchView view = (SearchView) InstrumentationBackend.solo.getView(
                 SearchView.class, Integer.parseInt(args[1]) - 1);
-
-        InstrumentationBackend.instrumentation.runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                view.setQuery(query, true);
-            }
-        });
+        view.setQuery(query, true);
 
         return Result.successResult();
     }

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

@@ -4,6 +4,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
 
 import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import android.os.Build;
@@ -52,9 +53,9 @@ public class CalabashChromeClient extends WebChromeClient {
 		}
 	}
 
-	public WebView getWebView() {
-		return webView;
-	}
+    public WebView getWebView() {
+        return webView;
+    }
 
 	public String getResult() {
 		eventHandled.block(3000);
@@ -64,7 +65,7 @@ public class CalabashChromeClient extends WebChromeClient {
 		return result.message;
 	}
 
-	private class Result {
+    private class Result {
 		String message;
 	}
 

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

@@ -13,16 +13,10 @@ public class DumpBodyHtml implements Action {
     	                         
     	final Result result = Result.successResult();
     	for (CalabashChromeClient ccc : CalabashChromeClient.findAndPrepareWebViews()) {
-    		final WebView webView = ccc.getWebView();
-            InstrumentationBackend.solo.getCurrentActivity().runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-
-                    webView.loadUrl("javascript:(function() {" +
-                             "prompt('calabash:' + document.body.innerHTML);" +
-                             "})()");
-                 }
-             });
+    		WebView webView = ccc.getWebView();
+            webView.loadUrl("javascript:(function() {" +
+                    "prompt('calabash:' + document.body.innerHTML);" +
+                    "})()");
             String r = ccc.getResult();
             System.out.println("Html:");
             System.out.println("" + r);

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

@@ -14,16 +14,9 @@ public class DumpHtml implements Action {
     	Result result = Result.successResult();
     	for (CalabashChromeClient ccc : CalabashChromeClient.findAndPrepareWebViews()) {
     		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);" +
-                               "})()");
-                }
-            });
+            webView.loadUrl("javascript:(function() {" +
+                    "prompt('calabash:' + document.body.parentNode.innerHTML);" +
+                    "})()");
             String r = ccc.getResult();
             System.out.println("Html:");
             System.out.println("" + r);

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

@@ -16,17 +16,13 @@ public class EnterTextByCssSelector implements Action {
     	final String value = args[1];
 
     	for (CalabashChromeClient ccc : CalabashChromeClient.findAndPrepareWebViews()) {
-    		final WebView webView = ccc.getWebView();
-			
-    		
-            InstrumentationBackend.solo.getCurrentActivity().runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                	String functions = "        function simulateKeyEvent(elem, character) {\n" +
+    		WebView webView = ccc.getWebView();
+
+            String functions = "        function simulateKeyEvent(elem, character) {\n" +
                     "            var ch = character.charCodeAt(0);\n" +
                     "\n" +
                     "            var evt;\n" +
-                            "\n" +
+                    "\n" +
                     "            evt = document.createEvent('KeyboardEvent');\n" +
                     "            evt.initKeyboardEvent('keydown', true, true, window, 0, 0, 0, 0, 0, ch);\n" +
                     "            elem.dispatchEvent(evt);\n" +
@@ -41,8 +37,8 @@ public class EnterTextByCssSelector implements Action {
                     "        }\n" +
                     "";
 
-                    functions +=
-                            "        function enterTextIntoInputField(elem, text) {\n" +
+            functions +=
+                    "        function enterTextIntoInputField(elem, text) {\n" +
                             "            for (var i = 0; i < text.length; i++) {\n" +
                             "                var ch = text.charAt(i);\n" +
                             "                elem.value += ch;\n" +
@@ -51,35 +47,33 @@ public class EnterTextByCssSelector implements Action {
                             "        }\n" +
                             "";
 
-                    functions +=
-                            "        function fireHTMLEvent(elem, eventName) {\n" +
+            functions +=
+                    "        function fireHTMLEvent(elem, eventName) {\n" +
                             "            var evt = document.createEvent(\"HTMLEvents\");\n" +
                             "            evt.initEvent(eventName, true, true );\n" +
                             "            return !elem.dispatchEvent(evt);\n" +
                             "        }\n" +
                             "";
 
-                    functions +=
-                            "        function selectInputField(elem) {\n" +
+            functions +=
+                    "        function selectInputField(elem) {\n" +
                             "            elem.click();\n" +
                             "            elem.focus();\n" +
                             "        }\n" +
                             "";
 
-                    functions +=
-                            "        function deselectInputField(elem) {\n" +
-                                    "            fireHTMLEvent(elem, 'change');\n" +
-                                    "            fireHTMLEvent(elem, 'blur');\n" +
-                                    "        }\n" +
-                                    "";
+            functions +=
+                    "        function deselectInputField(elem) {\n" +
+                            "            fireHTMLEvent(elem, 'change');\n" +
+                            "            fireHTMLEvent(elem, 'blur');\n" +
+                            "        }\n" +
+                            "";
 
-                    webView.loadUrl("javascript:(function() {" +
-                    		functions +
-                    		"var elem = document.querySelector(\"" + cssSelector + "\"); selectInputField(elem); enterTextIntoInputField(elem, '" + value + "'); deselectInputField(elem); " +
-                            "prompt('calabash:true');" +
-                            "})()");
-                }
-            });
+            webView.loadUrl("javascript:(function() {" +
+                    functions +
+                    "var elem = document.querySelector(\"" + cssSelector + "\"); selectInputField(elem); enterTextIntoInputField(elem, '" + value + "'); deselectInputField(elem); " +
+                    "prompt('calabash:true');" +
+                    "})()");
     		
 			String r = ccc.getResult();
 			System.out.println("enterTextIntoInputField: " + r);

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

@@ -18,7 +18,7 @@ public class ExecuteAsyncJavascript implements Action {
 		}
 		
 		CalabashChromeClient ccc = list.get(0);
-		final WebView webView = ccc.getWebView();
+		WebView webView = ccc.getWebView();
 		final String script = "javascript:(function() {"
 				+ " function cb(ret) {"
 				+ "  prompt('calabash:'+ret);"
@@ -33,14 +33,8 @@ public class ExecuteAsyncJavascript implements Action {
 				+ "}())";
 
 		System.out.println("execute javascript: " + script);
-		
-		InstrumentationBackend.solo.getCurrentActivity().runOnUiThread(
-				new Runnable() {
-					@Override
-					public void run() {
-						webView.loadUrl(script);
-					}
-				});
+
+        webView.loadUrl(script);
 
 		String r = ccc.getResult();
 		System.out.println("javascript result: " + r);

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

@@ -18,28 +18,21 @@ public class ExecuteJavascript implements Action {
 		}
 		
 		CalabashChromeClient ccc = list.get(0);
-		final WebView webView = ccc.getWebView();
-		final String script = "javascript:(function() {"
-				+ " var r;"
-				+ " try {"
-				+ "  r = (function() {"
-				+ args[0] + ";"
-				+ "  }());"
-				+ " } catch (e) {"
-				+ "  r = 'Exception: ' + e;"
-				+ " }"
-				+ " prompt('calabash:'+r);" 
-				+ "}())";
+		WebView webView = ccc.getWebView();
+		String script = "javascript:(function() {"
+            + " var r;"
+            + " try {"
+            + "  r = (function() {"
+            + args[0] + ";"
+            + "  }());"
+            + " } catch (e) {"
+            + "  r = 'Exception: ' + e;"
+            + " }"
+            + " prompt('calabash:'+r);"
+            + "}())";
 
 		System.out.println("execute javascript: " + script);
-		
-		InstrumentationBackend.solo.getCurrentActivity().runOnUiThread(
-				new Runnable() {
-					@Override
-					public void run() {
-						webView.loadUrl(script);
-					}
-				});
+        webView.loadUrl(script);
 
 		String r = ccc.getResult();
 		System.out.println("javascript result: " + r);

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

@@ -9,9 +9,8 @@ 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);
+		WebView webView = ccc.getWebView();
+		return new Result(true, "" + webView.getProgress());
 	}
 
 	@Override

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

@@ -13,24 +13,18 @@ public class PressByCssSelector implements Action {
     @Override
     public Result execute(final String... args) {
     	for (CalabashChromeClient ccc : CalabashChromeClient.findAndPrepareWebViews()) {
-    		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');" +
-                           "})()");
-                }
-            });
+    		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);

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

@@ -8,6 +8,7 @@ import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
 
 import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
@@ -15,10 +16,10 @@ import android.webkit.WebView;
 
 public class QueryHelper {
 
-	public static String executeJavascriptInWebview(String scriptPath, String... args) {
+    public static String executeJavascriptInWebview(String scriptPath, String... args) {
 		
 		String script = readJavascriptFromAsset(scriptPath);
-		
+
 		for (String arg : args) {
 			script = script.replaceFirst("%@", arg);
 		}
@@ -27,14 +28,8 @@ public class QueryHelper {
     	List<CalabashChromeClient> webViews = CalabashChromeClient.findAndPrepareWebViews();
 
     	for (CalabashChromeClient ccc : webViews) {
-    		final WebView webView = ccc.getWebView();
-    		InstrumentationBackend.solo.getCurrentActivity().runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                	webView.loadUrl("javascript:calabash_result = " + myScript + ";prompt('calabash:' + calabash_result);");
-                }
-    		});
-    		
+    	    WebView webView = ccc.getWebView();
+            webView.loadUrl("javascript:calabash_result = " + myScript + ";prompt('calabash:' + calabash_result);");
 			return ccc.getResult();
 		}
     	throw new RuntimeException("No webviews found");
@@ -56,8 +51,11 @@ public class QueryHelper {
 			CalabashChromeClient calabashChromeClient = CalabashChromeClient.findAndPrepareWebViews().get(0);
 		
 			WebView webView = calabashChromeClient.getWebView();
-			float scale = calabashChromeClient.getWebView().getScale();
-			
+
+
+            float scale = webView.getScale();
+
+
 			System.out.println("scale: " + scale);
 			int[] webviewLocation = new int[2];
 			webView.getLocationOnScreen(webviewLocation);

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

@@ -60,7 +60,7 @@ public class ScrollTo implements Action {
     	WebView webView = calabashChromeClient.getWebView();
     	int windowTop = webView.getScrollY();
     	int windowBottom = webView.getScrollY() + webView.getHeight();
-    	int centerY = (int) ((Integer)rectangle.get("center_y") * calabashChromeClient.getWebView().getScale());
+    	int centerY = (int) ((Integer)rectangle.get("center_y") * webView.getScale());
 
     	return windowTop < centerY && centerY < windowBottom;  	
     }

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

@@ -17,22 +17,14 @@ public class SetPropertyByCssSelector implements Action {
     	String value = args[2];
     	                         
     	for (CalabashChromeClient ccc : CalabashChromeClient.findAndPrepareWebViews()) {
-    		final WebView webView = ccc.getWebView();
+    		WebView webView = ccc.getWebView();
 			
     		final String assignment = "document.querySelector(\"" + cssSelector + "\")." + propertyName + " = " + value + ";";
     		System.out.println(assignment);
-
-            InstrumentationBackend.solo.getCurrentActivity().runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-
-                    webView.loadUrl("javascript:(function() {" +
-                               assignment +
-                               "prompt('calabash:true');" +
-                               "})()");
-
-                }
-            });
+            webView.loadUrl("javascript:(function() {" +
+                    assignment +
+                    "prompt('calabash:true');" +
+                    "})()");
             String r = ccc.getResult();
             System.out.println("setPropertyByCssSelector: " + r);
             if ("true".equals(r)) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.3.3.pre3
+  version: 0.3.3.pre5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2012-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -106,6 +106,7 @@ files:
 - Rakefile
 - bin/calabash-android
 - bin/calabash-android-build.rb
+- bin/calabash-android-console.rb
 - bin/calabash-android-generate.rb
 - bin/calabash-android-helpers.rb
 - bin/calabash-android-run.rb
@@ -113,14 +114,13 @@ files:
 - calabash-android.gemspec
 - doc/calabash-android-help.txt
 - epl-v10.html
-- features-skeleton/.irbrc
-- features-skeleton/irb_android.sh
 - features-skeleton/my_first.feature
 - features-skeleton/step_definitions/calabash_steps.rb
 - features-skeleton/support/app_installation_hooks.rb
 - features-skeleton/support/app_life_cycle_hooks.rb
 - features-skeleton/support/env.rb
 - features-skeleton/support/hooks.rb
+- irbrc
 - lib/calabash-android.rb
 - lib/calabash-android/calabash_steps.rb
 - lib/calabash-android/canned_steps.md
@@ -199,6 +199,7 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/l10n/L10nHelper.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/l10n/PressElement.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/l10n/WaitForElement.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/list/GetListData.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/list/GetListItemProperties.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/list/GetListItemText.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/list/LongPressListItems.java

data/features-skeleton/irb_android.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-TEST_SERVER_PORT=34777 
-PACKAGE_NAME=$1
-MAIN_ACTIVITY=$2
-if [ -z "$PACKAGE_NAME" ]; then
-   echo 'The parameter about your mobile app package is missing: e.g. com.springsource.greenhouse.test'
-   exit 1
-fi
-
-if [ -z "$MAIN_ACTIVITY" ]; then
-   echo 'The parameter about your mobile app main activity is missing: e.g. com.springsource.greenhouse.MainActivity'
-   exit 1
-fi
-
-   # use this line for calabash version 0.1
-   # adb shell am instrument -e class sh.calaba.instrumentationbackend.InstrumentationBackend -w $PACKAGE_NAME/android.test.InstrumentationTestRunner &
-   # use this for calabash-version 0.2
-   # adb shell am instrument -e class sh.calaba.instrumentationbackend.InstrumentationBackend -w $PACKAGE_NAME/sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner &
-   #use this for calabash version 0.3
-   #adb shell am instrument -e target_package $PACKAGE_NAME -e main_activity $MAIN_ACTIVITY -e class sh.calaba.instrumentationbackend.InstrumentationBackend sh.calaba.android.test/sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner
-   #sleep 7
-   IRBRC=.irbrc TEST_SERVER_PORT=$TEST_SERVER_PORT PACKAGE_NAME=$PACKAGE_NAME MAIN_ACTIVITY=$MAIN_ACTIVITY irb