calabash-android 0.4.22.pre4 → 0.5.0.pre1

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

@@ -11,58 +11,55 @@ import java.util.Map;
 import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.actions.webview.CalabashChromeClient.WebFuture;
 import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
+
+import android.os.Build;
 import android.util.Log;
 import android.webkit.ValueCallback;
 import android.webkit.WebView;
 
 public class QueryHelper {
 
-	
+
 	@SuppressWarnings("unchecked")
 	public static Map<String, Object> findFirstVisibleRectangle(List<HashMap<String,Object>> elements) {
-		return (Map<String, Object>)findFirstVisibleElement(elements).get("rect");	
+		return (Map<String, Object>)findFirstVisibleElement(elements).get("rect");
 	}
-	
+
 	public static Map<String, Object> findFirstVisibleElement(List<HashMap<String,Object>> elements) {
 		//TODO: Should do something more intelligent
-		return (Map<String, Object>)elements.get(0);	
+		return (Map<String, Object>)elements.get(0);
 	}
-	
+
 	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) {
+
+	public static Map<String, Integer> translateRectToScreenCoordinates(WebView webView, Map<String, Integer> rectangle) {
 		try {
-			
             float scale = webView.getScale();
 
 			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);
-			
-			result.put("x",x);
-			result.put("y",y);
-			result.put("center_x",center_x);
-			result.put("center_y",center_y);
-			
+			int center_x = (int)translateCoordToScreen(webviewLocation[0], scale, rectangle.get("center_x"));
+			int center_y = (int)translateCoordToScreen(webviewLocation[1], scale, rectangle.get("center_y"));
+
+			int x = (int)translateCoordToScreen(webviewLocation[0], scale, rectangle.get("left"));
+			int y = (int)translateCoordToScreen(webviewLocation[0], scale, rectangle.get("top"));
+			Map<String,Integer> result = new HashMap<String, Integer>(rectangle);
+
+			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);
 		}
 	}
-	
+
 	public static String toJsonString(Object o) {
 		//http://www.mkyong.com/java/how-to-convert-java-map-to-from-json-jackson/
 		try {
@@ -71,7 +68,7 @@ public class QueryHelper {
 			throw new RuntimeException(e);
 		}
 	}
-	
+
 
     private static String readJavascriptFromAsset(String scriptPath) {
     	StringBuffer script = new StringBuffer();
@@ -88,7 +85,7 @@ public class QueryHelper {
 		}
 		return script.toString();
     }
-	
+
 	public static WebFuture executeAsyncJavascriptInWebviews(WebView webView,
 		String scriptPath, String selector, String type) {
 
@@ -99,12 +96,12 @@ public class QueryHelper {
 
         CalabashChromeClient chromeClient = CalabashChromeClient.prepareWebView(webView);
 
-        if (android.os.Build.VERSION.SDK_INT < 19) { // Android 4.4
-            webView.loadUrl("javascript:calabash_result = " + script + ";prompt('calabash:' + calabash_result);");
+        if (Build.VERSION.SDK_INT < 19) { // Android 4.4
+            JavaScriptExecuter javaScriptExecuter = new JavaScriptExecuter(webView);
+            javaScriptExecuter.executeJavaScript("calabash_result = " + script + ";prompt('calabash:' + calabash_result);");
         } else {
             chromeClient.evaluateCalabashScript(script);
         }
-
         return chromeClient.getResult();
 	}
 }

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

@@ -15,17 +15,18 @@ import android.widget.TextView;
 public class ViewMapper {
 
 	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public static Object extractDataFromView(View v) {		
-		
+	public static Object extractDataFromView(View v) {
+
 		Map data = new HashMap();
-		data.put("class", getClassNameForView(v));		
+		data.put("class", getClassNameForView(v));
 		data.put("description", v.toString());
 		data.put("contentDescription", getContentDescriptionForView(v));
 		data.put("enabled", v.isEnabled());
-		
+
 		data.put("id", getIdForView(v));
+		data.put("tag", getTagForView(v));
 
-		Map rect = getRectForView(v);
+		Map<String,Integer> rect = getRectForView(v);
 
 		data.put("rect", rect);
 
@@ -45,19 +46,20 @@ public class ViewMapper {
 
 	}
 
-	public static Map getRectForView(View v) {
-		Map rect = new HashMap();
+    public static Map<String, Integer> getRectForView(View v) {
+        Map<String,Integer> rect = new HashMap<String,Integer>();
 		int[] location = new int[2];
 		v.getLocationOnScreen(location);
 
 		rect.put("x", location[0]);
 		rect.put("y", location[1]);
-		
-		rect.put("center_x", location[0] + v.getWidth()/2.0);
-		rect.put("center_y", location[1] + v.getHeight()/2.0);
-		
+        
+		rect.put("center_x", (int)(location[0] + v.getWidth()/2.0));
+		rect.put("center_y", (int)(location[1] + v.getHeight()/2.0));
+
 		rect.put("width", v.getWidth());
 		rect.put("height", v.getHeight());
+
 		return rect;
 	}
 
@@ -82,26 +84,33 @@ public class ViewMapper {
 		return id;
 	}
 
+	public static String getTagForView(View v) {
+		if (v.getTag() instanceof String || v.getTag() instanceof Integer) {
+			return v.getTag().toString();
+		}
+		return null;
+	}
+
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public static Object mapView(Object o) {
 		if (o instanceof View) {
 			return extractDataFromView((View) o);
-		} 
-		else if (o instanceof Map) {			
-			Map copy = new HashMap();			
+		}
+		else if (o instanceof Map) {
+			Map copy = new HashMap();
 			for (Object e : ((Map) o).entrySet()) {
 				Map.Entry entry = (Entry) e;
 				Object value = entry.getValue();
 				if (value instanceof View) {
 					copy.put(entry.getKey(), UIQueryUtils.getId((View) value));
-				}				
+				}
 				else {
 					copy.put(entry.getKey(),entry.getValue());
-				}			
+				}
 			}
-			
+
 			return copy;
-		} 
+		}
 		else if (o instanceof CharSequence) {
 			return o.toString();
 		}

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

@@ -25,7 +25,13 @@ public enum ComparisonOperator implements UIQueryASTPredicateRelation {
 			if (firstValue == secondValue) {
 				return true;
 			}
-			return (firstValue != null) && firstValue.equals(secondValue);					
+			return (firstValue != null) && firstValue.equals(secondValue);
+		}
+	},
+
+	NOTEQUAL {
+		public boolean areRelated(Object firstValue, Object secondValue) {
+			return !EQUAL.areRelated(firstValue, secondValue);
 		}
 	},
 

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

@@ -80,6 +80,16 @@ public class UIQueryASTPredicate implements UIQueryAST {
 			}
 		}
 
+		// there's no tag property for non Views, handle them all here
+		if (this.propertyName.equals("tag")) {
+			String tag = (o instanceof View ? UIQueryUtils.getTag((View) o) : null);
+			if (this.relation.areRelated(tag, this.valueToMatch)) {
+				return o;
+			} else {
+				return null;
+			}
+		}
+
 		Method propertyAccessor = UIQueryUtils
 				.hasProperty(o, this.propertyName);
 		if (propertyAccessor == null) {
@@ -90,8 +100,8 @@ public class UIQueryASTPredicate implements UIQueryAST {
 		if (this.relation.areRelated(value, this.valueToMatch)) {
 			return o;
 		} else if (this.valueToMatch instanceof String
-				&& this.relation
-						.areRelated(value.toString(), this.valueToMatch)) {
+                    && value != null
+                    && this.relation.areRelated(value.toString(), this.valueToMatch)) {
 			return o;
 		} else {
 			return null;
@@ -109,7 +119,7 @@ public class UIQueryASTPredicate implements UIQueryAST {
 		return new UIQueryASTPredicate(prop.getText(),
 				UIQueryASTPredicate.parseRelation(rel),
 				UIQueryUtils.parseValue(val));
-			
+
 	}
 
 	private static UIQueryASTPredicateRelation parseRelation(CommonTree rel) {
@@ -120,7 +130,7 @@ public class UIQueryASTPredicate implements UIQueryAST {
 			caseSensitive = false;
 			relText = relText.substring(0,relText.length() - CASE_INSENSITIVE_SPEC.length());
 		}
-		
+
 		if ("BEGINSWITH".equals(relText)) {
 			return new BeginsWithRelation(caseSensitive);
 		} else if ("ENDSWITH".equals(relText)) {
@@ -139,6 +149,8 @@ public class UIQueryASTPredicate implements UIQueryAST {
 			return ComparisonOperator.GREATERTHAN;
 		} else if (">=".equals(relText)) {
 			return ComparisonOperator.GREATERTHANOREQUAL;
+		} else if ("!=".equals(relText) || "<>".equals(relText)) {
+			return ComparisonOperator.NOTEQUAL;
 		} else {
 			throw new IllegalStateException("Unsupported Relation: " + relText);
 		}

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

@@ -63,13 +63,13 @@ public class UIQueryASTWith implements UIQueryAST {
 					}
 
 				}
-				List visibilityFilteredResults = visibility.evaluateWithViews(futureResult, direction,
-						visibility);
-				return new PartialFutureList(visibilityFilteredResults);
+
+				return new PartialFutureList(futureResult);
 			}
 		});
 		
-		List processedResult = new ArrayList(queryResult.size());
+		final List processedResult = new ArrayList(queryResult.size());
+
 		for (Object o : queryResult) {
 			if (o instanceof Map) {
 				Map m = (Map) o;
@@ -85,9 +85,16 @@ public class UIQueryASTWith implements UIQueryAST {
 				processedResult.add(o);
 			}
 		}
-		return processedResult;
-		
 
+        List visibilityFilteredResults = (List) UIQueryUtils.evaluateSyncInMainThread(new Callable() {
+
+            @Override
+            public Object call() throws Exception {
+                return visibility.evaluateWithViews(processedResult, direction, visibility);
+            }
+        });
+
+		return visibilityFilteredResults;
 	}
 
     private boolean isDomQuery() {

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

@@ -30,6 +30,7 @@ import sh.calaba.org.codehaus.jackson.type.TypeReference;
 import android.text.InputType;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewParent;
 import android.webkit.WebView;
 import android.widget.Button;
 import android.widget.CheckBox;
@@ -47,7 +48,7 @@ public class UIQueryUtils {
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public static List subviews(Object o) {
-		
+
 		try {
 			Method getChild = o.getClass().getMethod("getChildAt", int.class);
 			getChild.setAccessible(true);
@@ -74,15 +75,15 @@ public class UIQueryUtils {
 
 	@SuppressWarnings({ "rawtypes" })
 	public static Future webViewSubViews(WebView o) {
-		
+
 		Log.i("Calabash", "About to webViewSubViews");
-		
+
 
 		WebFuture controls = QueryHelper.executeAsyncJavascriptInWebviews(o,
 				"calabash.js", "input,button","css");
-		
+
 		return controls;
-		
+
 	}
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
@@ -168,18 +169,44 @@ public class UIQueryUtils {
 	}
 
 	public static boolean isVisible(Object v) {
-		if (!(v instanceof View)) {
-			return true;
-		}
-		View view = (View) v;
+        if (v instanceof Map) {
+            Map map = (Map)v;
+            Map<String,Integer> viewRect = (Map<String,Integer>)map.get("rect");
+            Map<String,Integer> parentViewRec = ViewMapper.getRectForView((WebView)map.get("webView"));
 
-		if (view.getHeight() == 0 || view.getWidth() == 0) {
-			return false;
-		}
+            return isViewSufficientlyShown(viewRect, parentViewRec);
+        } else if (v instanceof View) {
+            View view = (View) v;
 
-		return view.isShown() && viewFetcher.isViewSufficientlyShown(view);
+            if (view.getHeight() == 0 || view.getWidth() == 0) {
+                return false;
+            }
+
+            return view.isShown() && isViewSufficientlyShown(view);
+        } else {
+            return true;
+        }
 	}
 
+    public static boolean isViewSufficientlyShown(Map<String,Integer> viewRect, Map<String,Integer> parentViewRect) {
+        int centerX = viewRect.get("center_x");
+        int centerY = viewRect.get("center_y");
+
+        int parentX = parentViewRect.get("x");
+        int parentY = parentViewRect.get("y");
+        int parentWidth = parentViewRect.get("width");
+        int parentHeight = parentViewRect.get("height");
+        int windowWidth = parentX + parentWidth;
+        int windowHeight = parentY + parentHeight;
+
+        return (windowWidth > centerX && parentX < centerX &&
+                windowHeight > centerY && parentY < centerY);
+    }
+
+    public static boolean isViewSufficientlyShown(View view) {
+        return isViewSufficientlyShown(view, view.getParent());
+    }
+
 	public static boolean isClickable(Object v) {
 		if (!(v instanceof View)) {
 			return true;
@@ -193,6 +220,10 @@ public class UIQueryUtils {
 		return ViewMapper.getIdForView(view);
 	}
 
+	public static String getTag(View view) {
+		return ViewMapper.getTagForView(view);
+	}
+
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public static Future evaluateAsyncInMainThread(final Callable callable) throws Exception {
 
@@ -246,8 +277,8 @@ public class UIQueryUtils {
 							new TypeReference<List<HashMap<String, Object>>>() {
 							});
 					for (Map<String, Object> data : parsedResult) {
-						Map<String, Object> rect = (Map<String, Object>) data.get("rect");
-						Map<String, Object> updatedRect = QueryHelper.translateRectToScreenCoordinates(webView, rect);
+						Map<String, Integer> rect = (Map<String, Integer>) data.get("rect");
+						Map<String, Integer> updatedRect = QueryHelper.translateRectToScreenCoordinates(webView, rect);
 						data.put("rect", updatedRect);
 						data.put("webView", webView);
 					}
@@ -301,7 +332,7 @@ public class UIQueryUtils {
 	}
 
 	/*
-	 * 
+	 *
 	 * {"rect"=>{"x"=>0, "y"=>0, "width"=>768, "height"=>1024},
 	 * "hit-point"=>{"x"=>384, "y"=>512}, "id"=>"", "action"=>false,
 	 * "enabled"=>1, "visible"=>1, "value"=>nil, "type"=>"[object UIAWindow]",
@@ -343,7 +374,7 @@ public class UIQueryUtils {
 				childrenArray.add(dumpRecursively(serializedChild,
 						childrenList));
 			}
-			
+
 		}
 
 		parentView.put("children", childrenArray);
@@ -373,7 +404,7 @@ public class UIQueryUtils {
 	}
 
 	/*
- * 
+ *
                                             "enabled" => true,
                                             "visible" => true,
                                            "children" => [],
@@ -412,16 +443,16 @@ public class UIQueryUtils {
 		if (viewOrMap == null) {
 			return null;
 		}
-		
-		if (viewOrMap instanceof Map) 
+
+		if (viewOrMap instanceof Map)
 		{
-			Map map = (Map) viewOrMap;			
+			Map map = (Map) viewOrMap;
 			map.put("el", map);
 
 			Map rect = (Map) map.get("rect");
 			Map hitPoint = extractHitPointFromRect(rect);
-			
-			map.put("hit-point", hitPoint);			
+
+			map.put("hit-point", hitPoint);
 			map.put("enabled", true);
 			map.put("visible", true);
 			map.put("value", null);
@@ -430,36 +461,36 @@ public class UIQueryUtils {
 			map.put("label", null);
 			map.put("children", Collections.EMPTY_LIST);
 			String html = (String)map.get("html");
-			String nodeName = (String) map.get("nodeName");			
-			if (nodeName != null && nodeName.toLowerCase().equals("input")) {				
+			String nodeName = (String) map.get("nodeName");
+			if (nodeName != null && nodeName.toLowerCase().equals("input")) {
 				String domType = extractDomType(html);
 				if (isDomPasswordType(domType)) {
 					map.put("entry_types", Collections.singletonList("password"));
 				}
 				else if (isDomTextType(domType)) {
 					map.put("entry_types", Collections.singletonList("text"));
-				} 
+				}
 				else {
-					map.put("entry_types", Collections.emptyList());	
-				}					
+					map.put("entry_types", Collections.emptyList());
+				}
 				map.put("value", extractAttribute(html, "value"));
 				map.put("type", "dom");
 				map.put("name", extractAttribute(html, "name"));
 				map.put("label", extractAttribute(html, "title"));
-			}					
-						
-			return map;	
-			
+			}
+
+			return map;
+
 		}
-		else 
+		else
 		{
 			Map m = new HashMap();
-			
+
 			View view = (View) viewOrMap;
 			m.put("id", getId(view));
 			m.put("el", view);
 
-			Map rect = ViewMapper.getRectForView(view);
+			Map<String,Integer> rect = ViewMapper.getRectForView(view);
 			Map hitPoint = extractHitPointFromRect(rect);
 
 			m.put("rect", rect);
@@ -472,14 +503,29 @@ public class UIQueryUtils {
 			m.put("type", ViewMapper.getClassNameForView(view));
 			m.put("name", getNameForView(view));
 			m.put("label", ViewMapper.getContentDescriptionForView(view));
-			return m;	
+			return m;
 		}
 
-		
 
-		
+
+
 	}
 
+    private static boolean isViewSufficientlyShown(View view, ViewParent viewParent) {
+        if (!(viewParent instanceof View)) return true;
+
+        View parent = (View)viewParent;
+
+        if (view.equals(parent) || parent == null) {
+            return true;
+        }
+
+        Map<String,Integer> viewRect = ViewMapper.getRectForView(view);
+        Map<String,Integer> parentRect = ViewMapper.getRectForView(parent);
+
+        return isViewSufficientlyShown(viewRect, parentRect) && isViewSufficientlyShown(view, parent.getParent());
+    }
+
 	private static boolean isDomTextType(String domType) {
 		if (domType == null) {
 			return true;
@@ -487,25 +533,25 @@ public class UIQueryUtils {
 		return DOM_TEXT_TYPES.contains(domType);
 	}
 
-	private static boolean isDomPasswordType(String domType) {		
+	private static boolean isDomPasswordType(String domType) {
 		return "password".equalsIgnoreCase(domType);
 	}
 
 	// naive implementation only works for (valid) input tags
 	public static String extractDomType(String input) {
-		return extractAttribute(input, "type");		
+		return extractAttribute(input, "type");
 	}
-	
+
 	public static String extractAttribute(String input, String attribute) {
 		String[] split = input.split(attribute+"=");
 		if (split.length == 1) {
-			split = input.split(attribute+" =");			
+			split = input.split(attribute+" =");
 		}
 		if (split.length > 1) {
 			String lastPart = split[1];
 			if (lastPart == null) {
-				return null;	
-			}				
+				return null;
+			}
 			if (lastPart.charAt(0) == '"' || lastPart.charAt(0) == '\'') {
 				int endIndex = -1;
 				for (int i=1;i<lastPart.length();i++) {
@@ -514,15 +560,15 @@ public class UIQueryUtils {
 						break;
 					}
 				}
-				
+
 				if (endIndex > 0) {
 					return lastPart.substring(1,endIndex);
 				}
-				
-			}			
+
+			}
 		}
 		return null;
-		
+
 	}