calabash-android 0.4.0.pre15 → 0.4.0.pre16

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

@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
 
+import android.view.View;
+
 public class UIQueryASTClassName implements UIQueryAST {
 	public final String simpleClassName;	
 	@SuppressWarnings("rawtypes")
@@ -45,6 +47,9 @@ public class UIQueryASTClassName implements UIQueryAST {
 						case PARENT:
 							addParentMatchesToResult(o,result);
 							break;
+						case SIBLING:
+							addSiblingMatchesToResult(o,result);
+							break;
 					}
 					
 					
@@ -56,10 +61,28 @@ public class UIQueryASTClassName implements UIQueryAST {
 		
 	}
 
-	@SuppressWarnings("rawtypes")
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	protected void addSiblingMatchesToResult(Object o, List result) {
+		List parents = UIQueryUtils.parents(o);
+		if (parents != null && !parents.isEmpty()) {
+			Object immediateParent = parents.get(0);
+			for (Object v : UIQueryUtils.subviews(immediateParent)) {
+				if (v != o && match(v)) {
+					result.add(v);
+				}
+			}									
+		}		
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	private void addParentMatchesToResult(Object o, List result) {
-		// TODO Auto-generated method stub
-		throw new UnsupportedOperationException();
+		for (Object parent : UIQueryUtils.parents(o))
+		{
+			if (match(parent))
+			{
+				result.add(parent);
+			}
+		}		
 	}
 
 	@SuppressWarnings({ "rawtypes", "unchecked" })

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

@@ -1,5 +1,15 @@
 package sh.calaba.instrumentationbackend.query.ast;
 
-public enum UIQueryDirection {
-	DESCENDANT, CHILD, PARENT, ANCESTOR, SIBLING;
+import java.util.List;
+
+public enum UIQueryDirection implements UIQueryAST {
+	DESCENDANT, CHILD, PARENT, SIBLING;
+
+	@SuppressWarnings("rawtypes")
+	@Override
+	public List evaluateWithViews(List inputViews, UIQueryDirection direction,
+			UIQueryVisibility visibility) {
+		//Never called. Not so pretty, I know.
+		throw new UnsupportedOperationException("This method should never be called");
+	}
 }

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

@@ -77,8 +77,8 @@ public class UIQueryEvaluator {
 		UIQueryVisibility currentVisibility = UIQueryVisibility.VISIBLE;
 		
 		for (UIQueryAST step : queryPath) {			
-			if (isDirection(step)) {
-				currentDirection = directionFromAst(step);
+			if (step instanceof UIQueryDirection) {
+				currentDirection = (UIQueryDirection) step;
 			}
 			else if (step instanceof UIQueryVisibility) {
 				currentVisibility = (UIQueryVisibility) step;
@@ -90,15 +90,10 @@ public class UIQueryEvaluator {
 		}
 		return currentResult;
 	}
-	
-	public static UIQueryDirection directionFromAst(UIQueryAST step) {
-		// TODO Auto-generated method stub
-		return null;
-	}
+		
 
 	public static boolean isDirection(UIQueryAST step) {
-		// TODO Auto-generated method stub
-		return false;
+		return step instanceof UIQueryDirection;
 	}
 			
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre15
+  version: 0.4.0.pre16
   prerelease: 6
 platform: ruby
 authors: