calabash-android 0.4.0.pre6 → 0.4.0.pre7

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

@@ -1,7 +1,6 @@
 package sh.calaba.instrumentationbackend.actions.webview;
 
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -9,60 +8,76 @@ import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.Result;
 import sh.calaba.instrumentationbackend.actions.Action;
 import sh.calaba.instrumentationbackend.actions.Actions;
-import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
-import sh.calaba.org.codehaus.jackson.type.TypeReference;
 import android.test.TouchUtils;
 import android.webkit.WebView;
 
 
 public class ScrollTo implements Action {
-
-    @Override
+    
+	@Override
     public Result execute(String... args) {
     	//TODO: Should do horizontal scrolling if needed
-    	String queryResult = QueryHelper.executeJavascriptInWebview("calabash.js", args[1], args[0]);
-		CalabashChromeClient calabashChromeClient = CalabashChromeClient.findAndPrepareWebViews().get(0);
-		final WebView webView = calabashChromeClient.getWebView();
-		webView.scrollTo(0, 0);
-		QueryHelper.getScreenCoordinatesForCenter(findFirstRect(queryResult));
-		int scrolledTo = webView.getScrollY();
-		while (!isVisible(findFirstRect(queryResult), calabashChromeClient)) {
-			TouchUtils.dragQuarterScreenUp(Actions.parentTestCase, InstrumentationBackend.solo.getCurrentActivity());
-			if (scrolledTo != webView.getScrollY()) {
-				scrolledTo = webView.getScrollY();
-			} else {
-				return new Result(false, "Tried scrolling but the center of the element never became visible.");
-			}
-		}
-	
-		return new Result(true, "");
+    	final String uiQuery = "webView " + args[0] + ":'"+ args[1] + "'";
+
+        CalabashChromeClient calabashChromeClient = CalabashChromeClient.findAndPrepareWebViews().get(0);
+        WebView webView = calabashChromeClient.getWebView();
+
+        scrollToTop(webView);
+
+        while (keepScrolling(uiQuery, webView)) {
+            TouchUtils.dragQuarterScreenUp(Actions.parentTestCase, InstrumentationBackend.solo.getCurrentActivity());
+        }
+
+		return new Result(isVisible(uiQuery, webView), "");
     }
 
+    private void scrollToTop(final WebView webView) {
+        InstrumentationBackend.instrumentation.runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                webView.scrollTo(0, 0);
+            }
+        });
+    }
 
+    private boolean keepScrolling(String uiQuery, WebView webView) {
+        int centerY = getCenterY(uiQuery, webView);
+        System.out.println("Keep scrolling centerY: "+  centerY);
 
-	private Map<String, Object> findFirstRect(String queryResult) {
-		try {
-			List<HashMap<String,Object>> p = new ObjectMapper().readValue(queryResult, new TypeReference<List<HashMap<String,Object>>>(){});
-			
-			if (p.isEmpty()) {
-				throw new RuntimeException("No element found");
-			}
-			System.out.println(p);
-			final Map<String, Object> firstRect = QueryHelper.findFirstVisibleRectangle(p);
-			return firstRect;
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
+        int[] location = new int[2];
+        webView.getLocationOnScreen(location);
+        int top = location[1];
+        int bottom = top + webView.getHeight();
 
-	}
+        System.out.println("isVisible top: "+  top);
+        System.out.println("isVisible bottom: "+  bottom);
+
+        return centerY > bottom;
+    }
+
+    private boolean isVisible(String uiQuery, WebView webView) {
+        int centerY = getCenterY(uiQuery, webView);
+        System.out.println("isVisible centerY: "+  centerY);
+
+        int[] location = new int[2];
+        webView.getLocationOnScreen(location);
+        int top = location[1];
+        int bottom = top + webView.getHeight();
+        System.out.println("isVisible top: "+  top);
+        System.out.println("isVisible bottom: "+  bottom);
+
+        return top < centerY && centerY < bottom;
+    }
 
-    private boolean isVisible(Map<String, Object> rectangle, CalabashChromeClient calabashChromeClient) {
-    	WebView webView = calabashChromeClient.getWebView();
-    	int windowTop = webView.getScrollY();
-    	int windowBottom = webView.getScrollY() + webView.getHeight();
-    	int centerY = (int) ((Integer)rectangle.get("center_y") * webView.getScale());
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+	private int getCenterY(String uiQuery, WebView webView) {
+        List queryResult = new sh.calaba.instrumentationbackend.query.Query(uiQuery).executeQuery();
+        if (queryResult.isEmpty()) {
+            throw new RuntimeException("Query found no elements");
+        }
+        final Map<String, Object> firstVisibleRectangle = QueryHelper.findFirstVisibleRectangle(queryResult);
 
-    	return windowTop < centerY && centerY < windowBottom;  	
+        return Math.round((Float)firstVisibleRectangle.get("center_y"));
     }
 
     @Override

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

@@ -1,42 +1,67 @@
 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;
 
 
 public class SetPropertyByCssSelector implements Action {
 
-    @Override
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+	@Override
     public Result execute(String... args) {
-    	String cssSelector = args[0];
-    	String propertyName = args[1];
-    	String value = args[2];
-    	                         
-    	for (CalabashChromeClient ccc : CalabashChromeClient.findAndPrepareWebViews()) {
-    		WebView webView = ccc.getWebView();
+    	final String cssSelector = args[0];
+    	final String propertyName = args[1];
+    	final String value = args[2];
+    	      
+    	List<WebFuture> webResults = (List<WebFuture>) UIQueryUtils.evaluateSyncInMainThread(new Callable() {			
 			
-    		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();
-            }
-        }
+			public Object call() throws Exception {
+				
+				List<WebFuture> webResults = new ArrayList();
+		    	for (CalabashChromeClient ccc : CalabashChromeClient.findAndPrepareWebViews()) {
+		    		WebView webView = ccc.getWebView();
+					
+		    		final String assignment = "document.querySelector(\"" + cssSelector + "\")." + propertyName + " = " + value + ";";
+		    		System.out.println(assignment);
+		            webView.loadUrl("javascript:(function() {" +
+		                    assignment +
+		                    "prompt('calabash:true');" +
+		                    "})()");
+		            webResults.add(ccc.getResult());		            		            
+		        }
 
-       return new Result(false,"No WebView found");
-   }
+				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
+    @Override
     public String key() {
         return "set_property_by_css_selector";
     }

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

@@ -1,14 +1,12 @@
 package sh.calaba.instrumentationbackend.actions.webview;
 
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import sh.calaba.instrumentationbackend.Result;
 import sh.calaba.instrumentationbackend.actions.Action;
-import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
-import sh.calaba.org.codehaus.jackson.type.TypeReference;
+import sh.calaba.instrumentationbackend.actions.webview.CalabashChromeClient.WebFuture;
 
 
 public class SetText implements Action {
@@ -18,26 +16,25 @@ public class SetText implements Action {
 	 * args[1]: xpath or css selector
 	 * args[2]: text to enter into the first selected element 
 	 */
-    @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> firstElement = QueryHelper.findFirstVisibleElement(p);
-			//TODO: Hack! Should be serialized instead of removed
-			firstElement.remove("class");
-			firstElement.remove("html");
-			String firstElementJson = QueryHelper.toJsonString(firstElement);
-			
-			String result = QueryHelper.executeJavascriptInWebview("set_text.js", firstElementJson, args[2]);
-	    	return new Result(true, result);
-    	} catch (Exception e) {
-    		throw new RuntimeException(e);
+	@SuppressWarnings({ "rawtypes", "unchecked"})
+	@Override
+    public Result execute(final String... args) {
+		final String uiQuery = "webView " + args[0] + ":'"+ args[1] + "'";
+		List queryResult = new sh.calaba.instrumentationbackend.query.Query(uiQuery).executeQuery();
+		if (queryResult.isEmpty()) {
+			throw new RuntimeException("No element found");
 		}
+		Map<String, Object> firstElement = QueryHelper.findFirstVisibleElement(queryResult);
+		//TODO: Hack! Should be serialized instead of removed
+		CalabashChromeClient client = CalabashChromeClient.findAndPrepareWebViews().get(0);
+		firstElement.remove("class");
+		firstElement.remove("webView");
+		firstElement.remove("html");
+		String firstElementJson = QueryHelper.toJsonString(firstElement);
+
+		WebFuture result = QueryHelper.executeAsyncJavascriptInWebviews(client.getWebView(),"set_text.js", firstElementJson, args[2]);
+		
+		return new Result(true,result.getAsString());    			    
     }
 
     @Override

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

@@ -0,0 +1,40 @@
+package sh.calaba.instrumentationbackend.query;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+public class CompletedFuture<T> implements Future<T> {
+    private final T result;
+
+    public CompletedFuture(final T result) {
+        this.result = result;
+    }
+
+    @Override
+    public boolean cancel(final boolean b) {
+        return false;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return false;
+    }
+
+    @Override
+    public boolean isDone() {
+        return true;
+    }
+
+    @Override
+    public T get() throws InterruptedException, ExecutionException {
+        return this.result;
+    }
+
+	@Override
+	public T get(long timeout, TimeUnit unit) throws InterruptedException,
+			ExecutionException, TimeoutException {
+		return get();
+	}
+}

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

@@ -0,0 +1,201 @@
+package sh.calaba.instrumentationbackend.query;
+
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+
+public class InvocationOperation implements Operation {
+
+	private final String methodName;
+	@SuppressWarnings("rawtypes")
+	private final List arguments;
+	private final Class<?>[] classes;
+	private final Class<?>[] classesWithCharseq;
+
+	@SuppressWarnings("rawtypes")
+	public InvocationOperation(String methodName, List arguments) {
+		this.methodName = methodName;
+		this.arguments = arguments;
+		this.classes = extractArgumentTypes(false);
+		this.classesWithCharseq = extractArgumentTypes(true);
+	}	
+
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object apply(final Object o) throws Exception {
+		final AtomicReference ref = new AtomicReference();
+		final AtomicReference<Exception> refEx = new AtomicReference<Exception>();
+		
+		InstrumentationBackend.instrumentation.runOnMainSync(new Runnable() {
+
+			@SuppressWarnings("unchecked")
+			@Override
+			public void run() {
+				try {
+					Method method = o.getClass().getMethod(InvocationOperation.this.methodName, InvocationOperation.this.classes);
+					method.setAccessible(true);
+					try {
+						Object result;
+						if( method.getReturnType().equals(Void.TYPE)){
+							invokeMethod(o, method);
+							result = "<VOID>";
+			            }
+						else {
+							result = invokeMethod(o, method);							
+						}
+						ref.set(result);
+						return;
+					} catch (Exception e) {
+						refEx.set(e);
+						return;
+					}
+				} catch (NoSuchMethodException e) {
+					try {
+						Method method = o.getClass().getMethod(InvocationOperation.this.methodName, InvocationOperation.this.classesWithCharseq);
+						method.setAccessible(true);
+						try {
+							Object result;
+							if( method.getReturnType().equals(Void.TYPE)){
+								invokeMethod(o, method);
+								result = "<VOID>";
+				            }
+							else {
+								result = invokeMethod(o, method);							
+							}
+							ref.set(result);
+							return;						
+						} catch (Exception ee) {
+							refEx.set(e);
+							return;
+						}
+					} catch (NoSuchMethodException ee) {
+						System.out.println("Method not found with correct argument types. Trying to type convert.");
+					}
+				}
+				//Warning: Slow path
+				Method[] methods = o.getClass().getMethods();
+				for (Method m : methods) {
+					if (m.getName().equals(InvocationOperation.this.methodName)) {
+						Class<?>[] parameterTypes = m.getParameterTypes();
+						if (parameterTypes.length == InvocationOperation.this.classes.length && areArgumentsConvertibleTo(parameterTypes)) {
+							try {
+								Object result;
+								if( m.getReturnType().equals(Void.TYPE)){
+									invokeMethod(o, m);
+									result = "<VOID>";
+					            }
+								else {
+									result = invokeMethod(o, m);							
+								}
+								ref.set(result);
+								return;
+							} catch (Exception e) {
+								refEx.set(e);
+								return;
+							}
+							
+						}							
+					}
+				}
+		
+			}
+			 
+		 });
+				
+		 if (refEx.get() != null) {
+			 throw refEx.get();
+		 }
+		 return ref.get();				
+	}
+	
+	@SuppressWarnings("rawtypes")
+	private Class[] extractArgumentTypes(boolean convertStringCharSeq) {
+		Class[] types = new Class[arguments.size()];
+		for (int i=0;i<arguments.size(); i++) {
+			Object o = arguments.get(i);
+			if (o != null) {
+				Class<?> c = o.getClass();
+				if (convertStringCharSeq && c.equals(String.class)) {
+					c = CharSequence.class;//Android API specific optimization
+				} 				
+				types[i] = c; 	
+			}
+			else {
+				types[i] = null;
+			}			
+		}
+		return types;
+	}
+	
+	//parameterType.length == this.classes.length
+	//Note: right now we don't do any clever mapping, we 
+	//only use Java's sub type relation: isAssigableFrom
+	private boolean areArgumentsConvertibleTo(Class<?>[] parameterTypes) {		
+		for (int i=0; i < parameterTypes.length; i++) {
+			Class<?> typei = parameterTypes[i];			
+			if (this.classes[i] == null) {
+				if (typei.isPrimitive()) {
+					//Can't pass null as primitive
+					return false;
+				}
+				continue; //can always pass null (unless primitive)
+			}
+			if (!typei.isAssignableFrom(this.classes[i])) {
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	private Object invokeMethod(Object o, Method m) throws Exception {
+		List<?> a = this.arguments;
+		int size = a.size();
+		switch(size) {
+			case 0:
+				return m.invoke(o);
+			case 1:
+				return m.invoke(o,a.get(0));
+			case 2:
+				return m.invoke(o,a.get(0),a.get(1));
+			case 3:
+				return m.invoke(o,a.get(0),a.get(1),a.get(2));
+			case 4:
+				return m.invoke(o,a.get(0),a.get(1),a.get(2),a.get(3));
+			case 5:
+				return m.invoke(o,a.get(0),a.get(1),a.get(2),a.get(3),a.get(4));
+			case 6:
+				return m.invoke(o,a.get(0),a.get(1),a.get(2),a.get(3),a.get(4),a.get(5));
+			case 7:
+				return m.invoke(o,a.get(0),a.get(1),a.get(2),a.get(3),a.get(4),a.get(5),a.get(6));
+			case 8:
+				return m.invoke(o,a.get(0),a.get(1),a.get(2),a.get(3),a.get(4),a.get(5),a.get(6),a.get(7));
+			case 9:
+				return m.invoke(o,a.get(0),a.get(1),a.get(2),a.get(3),a.get(4),a.get(5),a.get(6),a.get(7),a.get(8));
+			case 10:
+				return m.invoke(o,a.get(0),a.get(1),a.get(2),a.get(3),a.get(4),a.get(5),a.get(6),a.get(7),a.get(8),a.get(9));
+			case 11:
+				return m.invoke(o,a.get(0),a.get(1),a.get(2),a.get(3),a.get(4),a.get(5),a.get(6),a.get(7),a.get(8),a.get(9),a.get(10));
+			case 12:
+				return m.invoke(o,a.get(0),a.get(1),a.get(2),a.get(3),a.get(4),a.get(5),a.get(6),a.get(7),a.get(8),a.get(9),a.get(10),a.get(11));
+			case 13:
+				return m.invoke(o,a.get(0),a.get(1),a.get(2),a.get(3),a.get(4),a.get(5),a.get(6),a.get(7),a.get(8),a.get(9),a.get(10),a.get(11),a.get(12));
+			case 14:
+				return m.invoke(o,a.get(0),a.get(1),a.get(2),a.get(3),a.get(4),a.get(5),a.get(6),a.get(7),a.get(8),a.get(9),a.get(10),a.get(11),a.get(12),a.get(13));				
+			case 15:
+				return m.invoke(o,a.get(0),a.get(1),a.get(2),a.get(3),a.get(4),a.get(5),a.get(6),a.get(7),a.get(8),a.get(9),a.get(10),a.get(11),a.get(12),a.get(13),a.get(14));				
+			case 16:
+				return m.invoke(o,a.get(0),a.get(1),a.get(2),a.get(3),a.get(4),a.get(5),a.get(6),a.get(7),a.get(8),a.get(9),a.get(10),a.get(11),a.get(12),a.get(13),a.get(14),a.get(15));				
+		}
+		throw new UnsupportedOperationException("Method with more than 16 arguments are not supported");
+		
+	}
+
+
+	@Override
+	public String getName() {
+		return "InvocationOp["+this.methodName+", arguments = " + this.arguments + "]";
+	}
+
+}