calabash-android 0.4.0.pre6 → 0.4.0.pre7

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

@@ -1,11 +1,16 @@
 package sh.calaba.instrumentationbackend.actions.webview;
 
-import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
+import android.os.Looper;
 import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import android.os.Build;
 import android.os.ConditionVariable;
@@ -14,72 +19,167 @@ import android.webkit.JsPromptResult;
 import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 
-
 public class CalabashChromeClient extends WebChromeClient {
-	private final ConditionVariable eventHandled = new ConditionVariable();
-	private final Result result = new Result();
 	private WebChromeClient mWebChromeClient;
 	private final WebView webView;
+	private final WebFuture scriptFuture;
 
-	public CalabashChromeClient(WebView webView) {
+	public CalabashChromeClient(final WebView webView) {
 		this.webView = webView;
-        if (Build.VERSION.SDK_INT < 16) { // jelly bean
-            try {
-                Method methodGetConfiguration = webView.getClass().getMethod("getWebChromeClient");
-                mWebChromeClient = (WebChromeClient)methodGetConfiguration.invoke(webView);
-            } catch(Exception e) {
-                throw new RuntimeException(e);
-            }
+		this.scriptFuture = new WebFuture(webView);
+		if (Build.VERSION.SDK_INT < 16) { // jelly bean
+			try {
+				Method methodGetConfiguration = webView.getClass().getMethod(
+						"getWebChromeClient");
+				mWebChromeClient = (WebChromeClient) methodGetConfiguration
+						.invoke(webView);
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
 		}
-        webView.setWebChromeClient(this);
+
+        if ( Looper.getMainLooper().getThread() == Thread.currentThread()) {
+            webView.setWebChromeClient(this);
+        } else {
+            InstrumentationBackend.instrumentation.runOnMainSync(new Runnable() {
+                @Override
+                public void run() {
+                    webView.setWebChromeClient(CalabashChromeClient.this);
+                }
+            });
+        }
 	}
 
 	@Override
-	public boolean onJsPrompt(WebView view, String url, String message,	String defaultValue, JsPromptResult r) {
+	public boolean onJsPrompt(WebView view, String url, String message,
+			String defaultValue, JsPromptResult r) {
 		if (message != null && message.startsWith("calabash:")) {
 			r.confirm("CALABASH_ACK");
 			System.out.println("onJsPrompt: " + message);
-			result.message = message.replaceFirst("calabash:", "");
-			eventHandled.open();
-
+			String jsonResponse = message.replaceFirst("calabash:", "");
+			try {
+				scriptFuture.setResult(jsonResponse);
+			} catch (Exception e) {
+				e.printStackTrace();
+				scriptFuture.setResult(null);
+			}
 			return true;
 		} else {
 			if (mWebChromeClient == null) {
 				r.confirm("CALABASH_ERROR");
+				scriptFuture.complete();
 				return true;
 			} else {
-				return mWebChromeClient.onJsPrompt(view, url, message, defaultValue, r);
+				// TODO I'm not what this case does...
+				return mWebChromeClient.onJsPrompt(view, url, message,
+						defaultValue, r);
 			}
 		}
 	}
 
-    public WebView getWebView() {
-        return webView;
-    }
-
-	public String getResult() {
-		eventHandled.block(3000);
-		if (result.message == null) {
-			throw new RuntimeException("Timed out waiting for result for JavaScript");
-		}
-		return result.message;
+	public WebView getWebView() {
+		return webView;
 	}
 
-    private class Result {
-		String message;
+	public static CalabashChromeClient prepareWebView(WebView webView) {
+		CalabashChromeClient calabashChromeClient = new CalabashChromeClient(
+				webView);
+		webView.getSettings().setJavaScriptEnabled(true);
+		return calabashChromeClient;
 	}
 
 	public static List<CalabashChromeClient> findAndPrepareWebViews() {
 		List<CalabashChromeClient> webViews = new ArrayList<CalabashChromeClient>();
 		ArrayList<View> views = InstrumentationBackend.solo.getCurrentViews();
 		for (View view : views) {
-			if ( view instanceof WebView) {
-				WebView webView = (WebView)view;
-				webViews.add(new CalabashChromeClient(webView));
-				webView.getSettings().setJavaScriptEnabled(true);
-				System.out.println("Setting CalabashChromeClient");
+			if (view instanceof WebView) {
+				WebView webView = (WebView) view;
+				webViews.add(prepareWebView(webView));
 			}
 		}
 		return webViews;
+
+	}
+
+	public WebFuture getResult() {
+		return scriptFuture;
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static class WebFuture implements Future {
+		private final ConditionVariable eventHandled;
+		private volatile boolean complete;
+		private String result;
+		private final WebView webView;
+
+		public WebView getWebView() {
+			return webView;
+		}
+
+		public void complete() {
+			this.complete = true;
+			this.eventHandled.open();
+		}
+
+		public WebFuture(WebView webView) {
+			this.webView = webView;
+			eventHandled = new ConditionVariable();
+			result = null;
+		}
+
+		public synchronized void setResult(String result) {
+			this.result = result;
+			this.complete();
+		}
+
+		public synchronized String getResult() {
+			return this.result;
+		}
+
+		public boolean cancel(boolean mayInterruptIfRunning) {
+			return false;
+		}
+
+		@Override
+		public Object get() throws InterruptedException, ExecutionException {
+			eventHandled.block();
+			return asMap();
+		}
+
+		@Override
+		public Object get(long timeout, TimeUnit unit)
+				throws InterruptedException, ExecutionException,
+				TimeoutException {
+			eventHandled.block(unit.convert(timeout, TimeUnit.MILLISECONDS));
+			return asMap();
+		}
+
+		@Override
+		public boolean isCancelled() {
+			return false;
+		}
+
+		@Override
+		public boolean isDone() {
+			return complete;
+		}
+
+		public String getAsString() {				
+			try {
+				get(10,TimeUnit.SECONDS);
+				return getResult();
+			} catch (Exception e) {
+				e.printStackTrace();
+				throw new RuntimeException(e);
+			}			
+		}
+		
+		@SuppressWarnings("unchecked")
+		public Map asMap() {			
+			HashMap m = new HashMap();
+			m.put("webView", webView);
+			m.put("result",getResult());			
+			return m;
+		}
 	}
 }

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

@@ -1,31 +1,51 @@
 package sh.calaba.instrumentationbackend.actions.webview;
 
 
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+
 import sh.calaba.instrumentationbackend.Result;
 import sh.calaba.instrumentationbackend.actions.Action;
+import sh.calaba.instrumentationbackend.actions.webview.CalabashChromeClient.WebFuture;
+import sh.calaba.instrumentationbackend.query.ast.UIQueryUtils;
 import android.webkit.WebView;
 
+@Deprecated
 public class DumpBodyHtml implements Action {
 
-    @Override
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+	@Override
     public Result execute(String... args) {
-    	                         
-    	final Result result = Result.successResult();
-    	for (CalabashChromeClient ccc : CalabashChromeClient.findAndPrepareWebViews()) {
-    		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);
-            result.addBonusInformation(r);
-
-            return result;
-
-        }
-        return new Result(false, "No WebView found");
+    	                             	
+    	List<WebFuture> webResults = (List<WebFuture>) UIQueryUtils.evaluateSyncInMainThread(new Callable() {			
+			public Object call() throws Exception {
+				
+				List<WebFuture> webResults = new ArrayList();
+				for (CalabashChromeClient ccc : CalabashChromeClient.findAndPrepareWebViews()) {
+		    		WebView webView = ccc.getWebView();
+		            webView.loadUrl("javascript:(function() {" +
+		                    "prompt('calabash:' + document.body.innerHTML);" +
+		                    "})()");
+		            webResults.add(ccc.getResult());		            
+		        }
+				return webResults;
+				
+			}
+		});
+    	
+    	List<String> allResults = new ArrayList<String>(webResults.size());
+    	for (WebFuture f : webResults) {
+    		allResults.add(f.getAsString());			    		
+    	}
+    		
+    	if (allResults.size() == 0) {
+    		return new Result(false, "No WebView found");	
+    	}
+    	else {
+    		return new Result(true, allResults);
+    	}    	
+        
     }
     public String key() {
         return "dump_body_html";

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

@@ -1,32 +1,54 @@
 package sh.calaba.instrumentationbackend.actions.webview;
 
 
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+
 import sh.calaba.instrumentationbackend.Result;
 import sh.calaba.instrumentationbackend.actions.Action;
+import sh.calaba.instrumentationbackend.actions.webview.CalabashChromeClient.WebFuture;
+import sh.calaba.instrumentationbackend.query.ast.UIQueryUtils;
 import android.webkit.WebView;
 
 public class DumpHtml implements Action {
 
-    @Override
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+	@Override
     public Result execute(String... args) {
-    	                         
-    	Result result = Result.successResult();
-    	for (CalabashChromeClient ccc : CalabashChromeClient.findAndPrepareWebViews()) {
-    		final 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);
-        }
+    	
+    	List<WebFuture> webResults = (List<WebFuture>) UIQueryUtils.evaluateSyncInMainThread(new Callable() {			
+			
+			public Object call() throws Exception {
+				
+				List<WebFuture> webResults = new ArrayList();
+				for (CalabashChromeClient ccc : CalabashChromeClient.findAndPrepareWebViews()) {
+		    		final WebView webView = ccc.getWebView();
+		            webView.loadUrl("javascript:(function() {" +
+		                    "prompt('calabash:' + document.body.parentNode.innerHTML);" +
+		                    "})()");		            
+		            webResults.add(ccc.getResult());
+		        }
+				return webResults;
+				
+			}
+		});
+    	
+    	List<String> allResults = new ArrayList<String>(webResults.size());
+    	for (WebFuture f : webResults) {
+    		allResults.add(f.getAsString());			    		
+    	}
+    		
+    	if (allResults.size() == 0) {
+    		return new Result(false, "No WebView found");	
+    	}
+    	else {
+    		return new Result(true, allResults);
+    	}
 
-        return result;
     }
 
-            @Override
+    @Override
     public String key() {
         return "dump_html";
     }

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

@@ -1,88 +1,116 @@
 package sh.calaba.instrumentationbackend.actions.webview;
 
 
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+
 import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.TestHelpers;
 import sh.calaba.instrumentationbackend.actions.Action;
+import sh.calaba.instrumentationbackend.actions.webview.CalabashChromeClient.WebFuture;
+import sh.calaba.instrumentationbackend.query.ast.UIQueryUtils;
 import android.webkit.WebView;
 
-
+@Deprecated
 public class EnterTextByCssSelector implements Action {
 
-    @Override
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+	@Override
     public Result execute(String... args) {
     	final String cssSelector = args[0];
     	final String value = args[1];
+    	
+    	List<WebFuture> webResults = (List<WebFuture>) UIQueryUtils.evaluateSyncInMainThread(new Callable() {			
+			
+			public Object call() throws Exception {
+				
+				List<WebFuture> webResults = new ArrayList();
+				for (CalabashChromeClient ccc : CalabashChromeClient.findAndPrepareWebViews()) {
+		    		WebView webView = ccc.getWebView();
 
-    	for (CalabashChromeClient ccc : CalabashChromeClient.findAndPrepareWebViews()) {
-    		WebView webView = ccc.getWebView();
-
-            String functions = "        function simulateKeyEvent(elem, character) {\n" +
-                    "            var ch = character.charCodeAt(0);\n" +
-                    "\n" +
-                    "            var evt;\n" +
-                    "\n" +
-                    "            evt = document.createEvent('KeyboardEvent');\n" +
-                    "            evt.initKeyboardEvent('keydown', true, true, window, 0, 0, 0, 0, 0, ch);\n" +
-                    "            elem.dispatchEvent(evt);\n" +
-                    "\n" +
-                    "            evt = document.createEvent('KeyboardEvent');\n" +
-                    "            evt.initKeyboardEvent('keyup', true, true, window, 0, 0, 0, 0, 0, ch);\n" +
-                    "            elem.dispatchEvent(evt);\n" +
-                    "\n" +
-                    "            evt = document.createEvent('KeyboardEvent');\n" +
-                    "            evt.initKeyboardEvent('keypress', true, true, window, 0, 0, 0, 0, 0, ch);\n" +
-                    "            elem.dispatchEvent(evt);\n" +
-                    "        }\n" +
-                    "";
+		            String functions = "        function simulateKeyEvent(elem, character) {\n" +
+		                    "            var ch = character.charCodeAt(0);\n" +
+		                    "\n" +
+		                    "            var evt;\n" +
+		                    "\n" +
+		                    "            evt = document.createEvent('KeyboardEvent');\n" +
+		                    "            evt.initKeyboardEvent('keydown', true, true, window, 0, 0, 0, 0, 0, ch);\n" +
+		                    "            elem.dispatchEvent(evt);\n" +
+		                    "\n" +
+		                    "            evt = document.createEvent('KeyboardEvent');\n" +
+		                    "            evt.initKeyboardEvent('keyup', true, true, window, 0, 0, 0, 0, 0, ch);\n" +
+		                    "            elem.dispatchEvent(evt);\n" +
+		                    "\n" +
+		                    "            evt = document.createEvent('KeyboardEvent');\n" +
+		                    "            evt.initKeyboardEvent('keypress', true, true, window, 0, 0, 0, 0, 0, ch);\n" +
+		                    "            elem.dispatchEvent(evt);\n" +
+		                    "        }\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" +
-                            "                simulateKeyEvent(elem, ch);\n" +
-                            "            }\n" +
-                            "        }\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" +
+		                            "                simulateKeyEvent(elem, ch);\n" +
+		                            "            }\n" +
+		                            "        }\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 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" +
-                            "            elem.click();\n" +
-                            "            elem.focus();\n" +
-                            "        }\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');" +
+		                    "})()");
+		    						
+		            webResults.add(ccc.getResult());
+				}
+			
+				return webResults;
+				
+			}
+		});
+    	
+    	List<String> allResults = new ArrayList<String>(webResults.size());
+    	boolean allSucceed = true;
+    	for (WebFuture f : webResults) {
+    		String result = f.getAsString();
+			allResults.add(result);
+    		if (!"true".equals(result)) {
+				allSucceed = false;
+			}
+    	}
     		
-			String r = ccc.getResult();
-			System.out.println("enterTextIntoInputField: " + r);
-			if ("true".equals(r)) {
-				TestHelpers.wait(0.3);
-				return Result.successResult();
-			}	
-		}
-		return new Result(false, "");
+    	
+    	if (allResults.size() == 0) {
+    		return new Result(false, "No WebView found");	
+    	}
+    	else {
+    		return new Result(allSucceed, allResults);
+    	}
+    	
     }
 
     @Override