calabash-android 0.4.0.pre6 → 0.4.0.pre7

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

@@ -0,0 +1,100 @@
+package sh.calaba.instrumentationbackend.query.ast;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * Represents a List where at most one result is a Future.
+ * This class is itself a Future which is realized if the list contains no future,
+ * and if the list does contain a Future, this object is realized once that Future is.
+ * 
+ * We can think of it as a way to "lift" a list containing a Future into the set of Futures.
+ * @author krukow
+ *
+ */
+@SuppressWarnings("rawtypes")
+public class PartialFutureList implements Future {
+	
+	
+	private final Future theFutureResult;	
+	private final List originalList;	
+	
+	public PartialFutureList(List listWithOneFuture) {
+		this.theFutureResult = extractFuture(listWithOneFuture);
+		this.originalList = listWithOneFuture;
+	}
+
+	
+	@Override
+	public boolean cancel(boolean mayInterruptIfRunning) {
+		if (theFutureResult == null) {
+			return false;
+		}
+		else {
+			return theFutureResult.cancel(mayInterruptIfRunning);
+		}
+	}
+	
+	@Override
+	public Object get() throws InterruptedException, ExecutionException {
+		if (theFutureResult == null) {
+			return originalList;
+		}		
+		return fillListWithResult(theFutureResult.get());
+	}
+
+	
+	@Override
+	public Object get(long timeout, TimeUnit unit) throws InterruptedException,
+			ExecutionException, TimeoutException {
+		if (theFutureResult == null) {
+			return originalList;
+		}		
+		return fillListWithResult(theFutureResult.get(timeout,unit));
+	}
+
+	@Override
+	public boolean isCancelled() {
+		if (theFutureResult == null) {
+			return false;
+		}		
+		return theFutureResult.isCancelled();
+	}
+
+	@Override
+	public boolean isDone() {
+		if (theFutureResult == null) {
+			return false;
+		}		
+		return theFutureResult.isDone();
+	}
+	
+	@SuppressWarnings({ "unchecked" })
+	private Object fillListWithResult(Object futureResultObject) {
+		List result = new ArrayList(this.originalList.size());
+		for (Object o : this.originalList) {
+			if (o instanceof Future) {//Assume only one future
+				result.add(futureResultObject);
+			} else {
+				result.add(o);
+			}
+		}
+		return result;
+	}
+	
+	private Future extractFuture(List evaluateWithViews) {
+		for (Object o : evaluateWithViews) {
+			if (o instanceof Future) {
+				return (Future) o;
+			}
+		}
+		return null;
+	}
+
+
+
+}

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

@@ -4,5 +4,5 @@ import java.util.List;
 
 public interface UIQueryAST {
 	@SuppressWarnings("rawtypes")
-	public List evaluateWithViewsAndDirection(List inputViews, UIQueryDirection direction);
+	public List evaluateWithViews(List inputViews, UIQueryDirection direction, UIQueryVisibility visibility);
 }

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

@@ -2,6 +2,7 @@ package sh.calaba.instrumentationbackend.query.ast;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.Callable;
 
 public class UIQueryASTClassName implements UIQueryAST {
 	public final String simpleClassName;	
@@ -20,36 +21,39 @@ public class UIQueryASTClassName implements UIQueryAST {
 	{
 		if (qualifiedClassName == null) {throw new IllegalArgumentException("Cannot instantiate with null class");}
 		this.qualifiedClassName = qualifiedClassName;
-		this.simpleClassName = null;
-		
+		this.simpleClassName = null;		
 	}
 
 	@SuppressWarnings({ "rawtypes"})
 	@Override
-	public List evaluateWithViewsAndDirection(List inputViews,
-			UIQueryDirection direction) {
-		// TODO Auto-generated method stub
+	public List evaluateWithViews(final List inputViews,
+			final UIQueryDirection direction, final UIQueryVisibility visibility) {
 		
-		List result = new ArrayList(8);
-		for (Object o : inputViews) 
-		{			
-			switch(direction) {
-				case DESCENDANT:
-					addDecendantMatchesToResult(o,result);
-					break;
-				case CHILD:
-					addChildMatchesToResult(o,result);
-					break;
-				case PARENT:
-					addParentMatchesToResult(o,result);
-					break;
-			}
+		return (List) UIQueryUtils.evaluateSyncInMainThread(new Callable() {		
 			
-			
-		}
+			public Object call() throws Exception {
+				List result = new ArrayList(8);				
+				for (Object o : inputViews) 
+				{			
+					switch(direction) {
+						case DESCENDANT:
+							addDecendantMatchesToResult(o,result);
+							break;
+						case CHILD:
+							addChildMatchesToResult(o,result);
+							break;
+						case PARENT:
+							addParentMatchesToResult(o,result);
+							break;
+					}
+					
+					
+				}					
+				return result;
+			}
+		});
 		
 		
-		return result;
 	}
 
 	@SuppressWarnings("rawtypes")

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

@@ -3,155 +3,223 @@ package sh.calaba.instrumentationbackend.query.ast;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
 
 import org.antlr.runtime.tree.CommonTree;
 
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.actions.webview.QueryHelper;
 import sh.calaba.instrumentationbackend.query.antlr.UIQueryParser;
-import android.content.res.Resources.NotFoundException;
 import android.view.View;
+import android.webkit.WebView;
 
 public class UIQueryASTWith implements UIQueryAST {
-	public final String propertyName;	
+	public final String propertyName;
 	public final Object value;
-	
-	public UIQueryASTWith(String property, Object value) 
-	{
-		if (property == null) {throw new IllegalArgumentException("Cannot instantiate Filter with null property name");}
+
+	public UIQueryASTWith(String property, Object value) {
+		if (property == null) {
+			throw new IllegalArgumentException(
+					"Cannot instantiate Filter with null property name");
+		}
 		this.propertyName = property;
 		this.value = value;
 	}
 
-	@SuppressWarnings({ "rawtypes", "unchecked"})
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@Override
-	public List evaluateWithViewsAndDirection(List inputViews,
-			UIQueryDirection direction) {
-		List result = new ArrayList(8);
-					
-		for (int i=0;i<inputViews.size();i++)
-		{
-			Object o = inputViews.get(i);
-			if (this.propertyName.equals("id") && hasId(o,this.value))
-			{
-				result.add(o);
-			}
-			else if (this.propertyName.equals("marked") && isMarked(o,this.value))
-			{
-				result.add(o);
-			}
-			else if (this.propertyName.equals("index") && this.value.equals(i))
-			{
-				result.add(o);
-			}
-			else 
-			{
-								
-				Method propertyAccessor = UIQueryUtils.hasProperty(o, this.propertyName);
-				if (propertyAccessor != null)
-				{				
-					Object value = UIQueryUtils.getProperty(o, propertyAccessor);
-
-					if (value == this.value || (value != null && value.equals(this.value))) 
-					{
-						result.add(o);
-					} 
-					else if (this.value instanceof String && this.value.equals(value.toString())) 
-					{
-						result.add(o);
+	public List evaluateWithViews(final List inputViews, final UIQueryDirection direction,
+			final UIQueryVisibility visibility) {
+		
+		List queryResult = (List) UIQueryUtils.evaluateSyncInMainThread(new Callable() {
+			
+			@Override
+			public Object call() throws Exception {
+				List futureResult = new ArrayList(8);
+
+				for (int i = 0; i < inputViews.size(); i++) {
+					Object o = inputViews.get(i);
+
+					if (o instanceof WebView) {
+						Future webResult = evaluateForWebView((WebView) o);
+						if (webResult != null) {
+							futureResult.add(webResult);
+						}
 					}
-					
-					
+					else if (o instanceof Map) {
+						Map result = evaluateForMap((Map) o);
+						if (result != null) {
+							futureResult.add(result);
+						}
+						
+					}
+					else {
+						Object result = evaluateForObject(o, i);
+						if (result != null) {
+							futureResult.add(result);
+						}
+					}
+
+				}
+				List visibilityFilteredResults = visibility.evaluateWithViews(futureResult, direction,
+						visibility);
+				return new PartialFutureList(visibilityFilteredResults);
+			}
+		});
+		
+		List processedResult = new ArrayList(queryResult.size());
+		for (Object o : queryResult) {
+			if (o instanceof Map) {
+				Map m = (Map) o;
+				if (m.containsKey("result")) {
+					processedResult.addAll(UIQueryUtils.mapWebViewJsonResponse((String) m.get("result"),(WebView) m.get("webView")));	
+				}
+				else {
+					processedResult.add(m);
 				}
 				
 			}
-	
+			else {
+				processedResult.add(o);
+			}
 		}
+		return processedResult;
 		
-		
-		return result;
+
+	}
+
+	
+	@SuppressWarnings("rawtypes")
+	private Map evaluateForMap(Map map) {		
+		if (map.containsKey(this.propertyName)) {											
+			Object value = map.get(this.propertyName);
+			if (value == this.value || (value != null && value.equals(this.value))) {
+				return map;
+			}			
+		} 
+		return null;
+	}
+
+	private Object evaluateForObject(Object o, int index) {
+		if (this.propertyName.equals("id") && hasId(o, this.value)) {
+			return o;
+		} else if (this.propertyName.equals("marked")
+				&& isMarked(o, this.value)) {
+			return o;
+		} else if (this.propertyName.equals("index")
+				&& this.value.equals(index)) {
+			return o;
+		} else {
+
+			Method propertyAccessor = UIQueryUtils.hasProperty(o,
+					this.propertyName);
+			if (propertyAccessor != null) {
+				Object value = UIQueryUtils.getProperty(o, propertyAccessor);
+
+				if (value == this.value
+						|| (value != null && value.equals(this.value))) {
+					return o;
+				} else if (this.value instanceof String
+						&& this.value.equals(value.toString())) {
+					return o;
+				}
+			}
+		}
+		return null;
+
+	}
+
+	@SuppressWarnings({ "rawtypes" })
+	private Future evaluateForWebView(WebView o) {
+		if (!(this.value instanceof String)) {
+			return null;
+		}
+		return QueryHelper.executeAsyncJavascriptInWebviews(o,
+				"calabash.js", (String) this.value,this.propertyName);
+				
 	}
 
 	private boolean hasId(Object o, Object expectedValue) {
-		if (! (o instanceof View)) { return false; }
-		if (! (expectedValue instanceof String)) { return false; }
+		if (!(o instanceof View)) {
+			return false;
+		}
+		if (!(expectedValue instanceof String)) {
+			return false;
+		}
 		View view = (View) o;
 		String expected = (String) expectedValue;
-		
-		try {
-			String id = InstrumentationBackend.solo.getCurrentActivity()
-					.getResources().getResourceEntryName(view.getId());
-			
-			if (id != null && id.equals(expected))  {
-				return true;
-			}
-		}
-		catch (NotFoundException e) {}
-		return false;
+		String id = UIQueryUtils.getId(view);
+		return (id != null && id.equals(expected));
 	}
 
 	private boolean isMarked(Object o, Object expectedValue) {
-		if (! (o instanceof View)) { return false; }
-		if (! (expectedValue instanceof String)) { return false; }
+		if (!(o instanceof View)) {
+			return false;
+		}
+		if (!(expectedValue instanceof String)) {
+			return false;
+		}
 		View view = (View) o;
 		String expected = (String) expectedValue;
-		
-		if (hasId(o, expectedValue))
-		{
+
+		if (hasId(o, expectedValue)) {
 			return true;
 		}
-		
-			
-		CharSequence contentDescription = view.getContentDescription();		
-		if (contentDescription != null && contentDescription.toString().equals(expected))
-		{
+
+		CharSequence contentDescription = view.getContentDescription();
+		if (contentDescription != null
+				&& contentDescription.toString().equals(expected)) {
 			return true;
 		}
-		
+
 		try {
 			Method getTextM = view.getClass().getMethod("getText");
 			Object text = getTextM.invoke(view);
-			if (text != null && text.toString().equals(expected))
-			{
+			if (text != null && text.toString().equals(expected)) {
 				return true;
 			}
-			
-		} catch (Exception e) {}
-		
+
+		} catch (Exception e) {
+		}
+
 		return false;
-		
+
 	}
 
 	public static UIQueryASTWith fromAST(CommonTree step) {
 		CommonTree prop = (CommonTree) step.getChild(0);
 		CommonTree val = (CommonTree) step.getChild(1);
-		
-		switch(val.getType())
-		{
-			case UIQueryParser.STRING: {
-				String textWithPings = val.getText();
-				String text = textWithPings.substring(1, textWithPings.length()-1);				
-				return new UIQueryASTWith(prop.getText(), text);
-			}								
-			case UIQueryParser.INT:
-				return new UIQueryASTWith(prop.getText(), Integer.parseInt(val.getText(), 10));
-			case UIQueryParser.BOOL:{
-				String text = val.getText();				
-				return new UIQueryASTWith(prop.getText(), Boolean.parseBoolean(text));
-			}
-			case UIQueryParser.NIL:
-				return new UIQueryASTWith(prop.getText(), null);
-				
-			default:
-				throw new IllegalArgumentException("Unable to parse value type:" + val.getType()+ " text "+val.getText());
-				
+
+		switch (val.getType()) {
+		case UIQueryParser.STRING: {
+			String textWithPings = val.getText();
+			String text = textWithPings
+					.substring(1, textWithPings.length() - 1);
+			return new UIQueryASTWith(prop.getText(), text);
 		}
-		
+		case UIQueryParser.INT:
+			return new UIQueryASTWith(prop.getText(), Integer.parseInt(
+					val.getText(), 10));
+		case UIQueryParser.BOOL: {
+			String text = val.getText();
+			return new UIQueryASTWith(prop.getText(),
+					Boolean.parseBoolean(text));
+		}
+		case UIQueryParser.NIL:
+			return new UIQueryASTWith(prop.getText(), null);
+
+		default:
+			throw new IllegalArgumentException("Unable to parse value type:"
+					+ val.getType() + " text " + val.getText());
+
+		}
+
 	}
-	
-	
+
 	@Override
 	public String toString() {
-		return "With["+this.propertyName+":"+this.value+"]";
+		return "With[" + this.propertyName + ":" + this.value + "]";
 	}
-	
+
 }