calabash-android 0.4.0.pre6 → 0.4.0.pre7

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

@@ -1,50 +1,72 @@
 package sh.calaba.instrumentationbackend.actions.webview;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.Callable;
 
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
 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 ExecuteAsyncJavascript implements Action {
 
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
 	public Result execute(String... args) {
+		final String scriptCode = args[0]; 
+		List<WebFuture> webResults = (List<WebFuture>) UIQueryUtils.evaluateSyncInMainThread(new Callable() {			
+			
+			public Object call() throws Exception {
+				
+				List<WebFuture> webResults = new ArrayList();
+				List<CalabashChromeClient> list = CalabashChromeClient.findAndPrepareWebViews();
+				if (list.isEmpty()) {
+					return webResults;
+				}
+				
+				CalabashChromeClient ccc = list.get(0);
+				WebView webView = ccc.getWebView();
+				final String script = "javascript:(function() {"
+						+ " function cb(ret) {"
+						+ "  prompt('calabash:'+ret);"
+						+ " }"
+						+ " try {"
+						+ "  (function(returnValue) {"
+						+ scriptCode + ";"
+						+ "  }(cb));"
+						+ " } catch (e) {"
+						+ "  prompt('calabash:Exception: ' + e);"
+						+ " }"
+						+ "}())";
 
-		List<CalabashChromeClient> list = CalabashChromeClient.findAndPrepareWebViews();
-		if (list.isEmpty()) {
-			return new Result(false, "No WebView component found");
-		}
+				System.out.println("execute javascript: " + script);
+
+		        webView.loadUrl(script);
+		        webResults.add(ccc.getResult());				
+				return webResults;
+				
+			}
+		});
+    	
+    	List<String> allResults = new ArrayList<String>(webResults.size());
+    	boolean success = true;
+    	for (WebFuture f : webResults) {
+    		String result = f.getAsString();
+			allResults.add(result);    		
+			if (result.startsWith("Exception:")) {
+				success = false;
+			}			
+    	}
+    		
+    	if (allResults.size() == 0) {
+    		return new Result(false, "No WebView found");	
+    	}
+    	else {
+    		return new Result(success, allResults);
+    	}
 		
-		CalabashChromeClient ccc = list.get(0);
-		WebView webView = ccc.getWebView();
-		final String script = "javascript:(function() {"
-				+ " function cb(ret) {"
-				+ "  prompt('calabash:'+ret);"
-				+ " }"
-				+ " try {"
-				+ "  (function(returnValue) {"
-				+ args[0] + ";"
-				+ "  }(cb));"
-				+ " } catch (e) {"
-				+ "  prompt('calabash:Exception: ' + e);"
-				+ " }"
-				+ "}())";
-
-		System.out.println("execute javascript: " + script);
-
-        webView.loadUrl(script);
-
-		String r = ccc.getResult();
-		System.out.println("javascript result: " + r);
-
-		boolean success = true;
-		if (r.startsWith("Exception:")) {
-			success = false;
-		}
-
-		return new Result(success, r);
 	}
 
 	@Override

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

@@ -1,48 +1,71 @@
 package sh.calaba.instrumentationbackend.actions.webview;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.Callable;
 
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
 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 ExecuteJavascript implements Action {
 
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
 	public Result execute(String... args) {
+		final String scriptCode = args[0]; 
+		List<WebFuture> webResults = (List<WebFuture>) UIQueryUtils.evaluateSyncInMainThread(new Callable() {			
+			
+			public Object call() throws Exception {
+				
+				List<WebFuture> webResults = new ArrayList();
+				List<CalabashChromeClient> list = CalabashChromeClient.findAndPrepareWebViews();
+				if (list.isEmpty()) {
+					return webResults;
+				}
+				
+				CalabashChromeClient ccc = list.get(0);
+				WebView webView = ccc.getWebView();
+				final String script = "javascript:(function() {"
+						+ " function cb(ret) {"
+						+ "  prompt('calabash:'+ret);"
+						+ " }"
+						+ " try {"
+						+ "  (function(returnValue) {"
+						+ scriptCode + ";"
+						+ "  }(cb));"
+						+ " } catch (e) {"
+						+ "  prompt('calabash:Exception: ' + e);"
+						+ " }"
+						+ "}())";
 
-		List<CalabashChromeClient> list = CalabashChromeClient.findAndPrepareWebViews();
-		if (list.isEmpty()) {
-			return new Result(false, "No WebView component found");
-		}
-		
-		CalabashChromeClient ccc = list.get(0);
-		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);
-        webView.loadUrl(script);
-
-		String r = ccc.getResult();
-		System.out.println("javascript result: " + r);
-
-		boolean success = true;
-		if (r.startsWith("Exception:")) {
-			success = false;
-		}
+				System.out.println("execute javascript: " + script);
 
-		return new Result(success, r);
+		        webView.loadUrl(script);
+		        webResults.add(ccc.getResult());				
+				return webResults;
+				
+			}
+		});
+    	
+    	List<String> allResults = new ArrayList<String>(webResults.size());
+    	boolean success = true;
+    	for (WebFuture f : webResults) {
+    		String result = f.getAsString();
+			allResults.add(result);    		
+			if (result.startsWith("Exception:")) {
+				success = false;
+			}			
+    	}
+    		
+    	if (allResults.size() == 0) {
+    		return new Result(false, "No WebView found");	
+    	}
+    	else {
+			return new Result(success, allResults);
+		}
 	}
 
 	@Override

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

@@ -0,0 +1,44 @@
+package sh.calaba.instrumentationbackend.actions.webview;
+
+import sh.calaba.instrumentationbackend.query.Operation;
+
+public class JavaScriptOperation implements Operation {
+
+	public final String script;
+	public final String arg;	
+
+	public JavaScriptOperation(String script, String args) {		
+		this.script = script;
+		this.arg = args;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Object apply(Object o) {	
+		throw new UnsupportedOperationException("asd");
+		/*
+		Map<String, Object> domEl = (Map<String, Object>) o;
+		
+		WebView webView = (WebView) domEl.get("webView");
+		
+		domEl.remove("class");
+		domEl.remove("html");
+		domEl.remove("webView");
+		
+		String elJson = QueryHelper.toJsonString(domEl);
+
+		
+		WebFuture asyncRes = QueryHelper.executeAsyncJavascriptInWebviews(webView, this.script,
+						elJson, this.arg);		
+		return asyncRes.getAsString();		
+		*/
+	}
+
+	@Override
+	public String getName() {
+		return "JSOp[script="+this.script+"]";
+	}
+	
+	
+
+}

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

@@ -1,40 +1,65 @@
 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 PressByCssSelector implements Action {
 
-    @Override
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+	@Override
     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,"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() {" +
+		                    "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');" +
+                            "   return;" +
+		                    "}" +
+		                    "prompt('calabash:false');" +
+		                    "})()");
+
+		           webResults.add(ccc.getResult());		           		          
+		        }
+				return webResults;
+				
+			}
+		});
+    	
+    	List<String> allResults = new ArrayList<String>(webResults.size());
+    	boolean success = false;
+    	for (WebFuture f : webResults) {
+    		String result = f.getAsString();
+			allResults.add(result);
+    		if ("true".equals(result)) {	               
+               success = true;
+            }
+    	}
+    		
+    	if (allResults.size() == 0) {
+    		return new Result(false, "No WebView found");	
+    	}
+    	else {
+    		return new Result(success, allResults);
+    	}
       }
 
             @Override

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

@@ -4,36 +4,17 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-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.instrumentationbackend.actions.webview.CalabashChromeClient.WebFuture;
 import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
 import android.webkit.WebView;
 
 public class QueryHelper {
 
-    public static String executeJavascriptInWebview(String scriptPath, String... args) {
-		
-		String script = readJavascriptFromAsset(scriptPath);
-
-		for (String arg : args) {
-			script = script.replaceFirst("%@", arg);
-		}
-
-		final String myScript = script;
-    	List<CalabashChromeClient> webViews = CalabashChromeClient.findAndPrepareWebViews();
-
-    	for (CalabashChromeClient ccc : webViews) {
-    	    WebView webView = ccc.getWebView();
-            webView.loadUrl("javascript:calabash_result = " + myScript + ";prompt('calabash:' + calabash_result);");
-			return ccc.getResult();
-		}
-    	throw new RuntimeException("No webviews found");
-	}
 	
 	@SuppressWarnings("unchecked")
 	public static Map<String, Object> findFirstVisibleRectangle(List<HashMap<String,Object>> elements) {
@@ -45,25 +26,36 @@ public class QueryHelper {
 		return (Map<String, Object>)elements.get(0);	
 	}
 	
-	public static float[] getScreenCoordinatesForCenter(Map<String, Object> rectangle) {
+	public static float translateCoordToScreen(int offset, float scale, Object point) {
+		return offset + ((Number)point).floatValue() *scale;
+	}
+	
+	public static Map<String, Object> translateRectToScreenCoordinates(WebView webView, Map<String, Object> rectangle) {
 		try {
 			
-			CalabashChromeClient calabashChromeClient = CalabashChromeClient.findAndPrepareWebViews().get(0);
-		
-			WebView webView = calabashChromeClient.getWebView();
-
-
             float scale = webView.getScale();
 
-
-			System.out.println("scale: " + scale);
 			int[] webviewLocation = new int[2];
 			webView.getLocationOnScreen(webviewLocation);
+			//center_x, center_y
+			//left, top, width, height
+			float center_x = translateCoordToScreen(webviewLocation[0], scale,
+					rectangle.get("center_x"));
+			float center_y = translateCoordToScreen(webviewLocation[1], scale,
+					rectangle.get("center_y"));
+									
+			float x = translateCoordToScreen(webviewLocation[0], scale, rectangle.get("left"));
+			float y = translateCoordToScreen(webviewLocation[0], scale, rectangle.get("top"));
+			Map<String,Object> result = new HashMap<String, Object>(rectangle);
 			
-			//TODO: Exception if center_x or center_y are not numbers
-			float x = webviewLocation[0] + ((Number)rectangle.get("center_x")).floatValue() * scale;
-			float y = webviewLocation[1] + ((Number)rectangle.get("center_y")).floatValue() * scale;
-			return new float[]{x, y};
+			result.put("x",x);
+			result.put("y",y);
+			result.put("center_x",center_x);
+			result.put("center_y",center_y);
+			
+			return result;
+			
+	
 		} catch (Exception e) {
 			throw new RuntimeException(e);
 		}
@@ -94,4 +86,19 @@ public class QueryHelper {
 		}
 		return script.toString();
     }
+	
+	public static WebFuture executeAsyncJavascriptInWebviews(WebView webView,
+			String scriptPath, String selector, String type) {
+
+		String script = readJavascriptFromAsset(scriptPath);
+
+		script = script.replaceFirst("%@", selector);
+		script = script.replaceFirst("%@", type);
+
+		CalabashChromeClient chromeClient = CalabashChromeClient.prepareWebView(webView);		
+        webView.loadUrl("javascript:calabash_result = " + script + ";prompt('calabash:' + calabash_result);");
+		return chromeClient.getResult();
+	}
+
+
 }