testautoa 0.4.0 → 0.4.1

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

@@ -3,136 +3,200 @@ 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.query.antlr.UIQueryParser;
+import sh.calaba.instrumentationbackend.actions.webview.QueryHelper;
 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("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);
-					System.out.println(this.value);
-					System.out.println(value);
-					System.out.println(this.value.getClass());
-					System.out.println(this.value.getClass());
-					System.out.println(value.toString().equals(this.value));
-					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 {
-						System.out.println(false);
+						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;
+		}
+		View view = (View) o;
+		String expected = (String) expectedValue;
+		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;
-		
-		String id = InstrumentationBackend.solo.getCurrentActivity()
-				.getResources().getResourceEntryName(view.getId());
-		
-		if (id != null && id.equals(expected))  {
+
+		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());
-				
-		}
-		
+		Object parsedVal = UIQueryUtils.parseValue(val);
+		return new UIQueryASTWith(prop.getText(), parsedVal);
 	}
-	
-	
+
 	@Override
 	public String toString() {
-		return "With["+this.propertyName+":"+this.value+"]";
+		return "With[" + this.propertyName + ":" + this.value + "]";
 	}
-	
+
 }

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

@@ -1,122 +1,72 @@
 package sh.calaba.instrumentationbackend.query.ast;
 
-import java.io.IOException;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
-import org.antlr.runtime.ANTLRStringStream;
-import org.antlr.runtime.CommonTokenStream;
-import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.tree.CommonTree;
-
-import sh.calaba.instrumentationbackend.query.antlr.UIQueryLexer;
-import sh.calaba.instrumentationbackend.query.antlr.UIQueryParser;
-import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
+import sh.calaba.instrumentationbackend.query.Operation;
+import sh.calaba.instrumentationbackend.query.UIQueryResultVoid;
+import sh.calaba.instrumentationbackend.query.ViewMapper;
 
 public class UIQueryEvaluator {
-
-	private static class UIQueryResultVoid {
-		public static final UIQueryResultVoid instance = new UIQueryResultVoid();
+	
+	@SuppressWarnings({ "rawtypes" })
+	public static List evaluateQueryWithOptions(List<UIQueryAST> query, List inputViews,
+			List<Operation> operations) {
 		
-		private UIQueryResultVoid() {}
-
-		@SuppressWarnings({ "rawtypes", "unchecked" })
-		public String asJSON(String methodName, Object receiver) {
-			ObjectMapper mapper = new ObjectMapper();
-
-			try {
-				Map map = new HashMap();
-				map.put("error","Unable to invoke method");
-				map.put("methodName",methodName);
-				map.put("receiverClass", receiver.getClass().getName());
-				map.put("receiverString",receiver.toString());
-				return mapper.writeValueAsString(map);
-			} catch (IOException e) {
-				throw new RuntimeException("Could not convert result to json",e);
-			}
-		}
+        long before = System.currentTimeMillis();
+        
+        List views = evaluateQueryForPath(query, inputViews);
+        
+        long after = System.currentTimeMillis();              
+        String action = "EvaluateQuery";                               
+        System.out.println(action+ " took: "+ (after-before) + "ms");
+        
+        before = System.currentTimeMillis();
+        
+        List result = applyOperations(views, operations);
+        
+        after = System.currentTimeMillis();              
+        action = "ApplyOperations";                               
+        System.out.println(action+ " took: "+ (after-before) + "ms");
+
+        before = System.currentTimeMillis();
+        
+		List finalResult = mapViews(result);
+        
+		after = System.currentTimeMillis();              
+        action = "MapViews";                               
+        return finalResult;         	
+	}
 
-		@SuppressWarnings({ "rawtypes", "unchecked" })
-		public Object asJSON(String methodName, Object receiver,String errorMessage) {
-			ObjectMapper mapper = new ObjectMapper();
 
-			try {
-				Map map = new HashMap();
-				map.put("error",errorMessage);
-				map.put("methodName",methodName);
-				map.put("receiverClass", receiver.getClass().getName());
-				map.put("receiverString",receiver.toString());
-				return mapper.writeValueAsString(map);
-			} catch (IOException e) {
-				throw new RuntimeException("Could not convert result to json",e);
-			}
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	public static List mapViews(List result) {		
+		List finalResult = new ArrayList(result.size());
+		for (Object o : result) {
+			finalResult.add(ViewMapper.mapView(o));
 		}
+		return finalResult;
 	}
 
-	@SuppressWarnings({ "rawtypes" })
-	public static List evaluateQuery(String query, List inputViews) {
-		return evaluateQueryForPath(parseQuery(query), inputViews);
-	}
 
 	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public static List evaluateQueryWithOptions(String query, List inputViews,
-			List options) {
-		List views = evaluateQueryForPath(parseQuery(query), inputViews);
-
+	public static List applyOperations(List views, List<Operation> operations) {
 		List result = views;
-		for (Object methodNameObj : options) {
-			String propertyName = (String) methodNameObj;
-			List nextResult = new ArrayList(views.size());
-			for (Object o : result) {
+		for(Operation op : operations) {
+			List nextResult = new ArrayList(result.size());
+			for (Object obj : result) {
 				try {
-					Method m = UIQueryUtils.hasProperty(o, propertyName);
-					if (m != null) {
-						nextResult.add(m.invoke(o));	
-					}
-					else 
-					{
-						nextResult.add(UIQueryResultVoid.instance.asJSON(propertyName,o,"NO accessor for "+propertyName));
-					}
-					
+					nextResult.add(op.apply(obj));	
 				} catch (Exception e) {
-					System.out.println(e.getMessage());
-					nextResult.add(UIQueryResultVoid.instance.asJSON(propertyName,o));
-				}
+					e.printStackTrace();
+					nextResult.add(UIQueryResultVoid.instance.asMap(op.getName(), obj, e.getMessage()));
+				}				
 			}
 			result = nextResult;
 		}
 		return result;
-
 	}
 
-	@SuppressWarnings("unchecked")
-	public static List<UIQueryAST> parseQuery(String query) {
-		UIQueryLexer lexer = new UIQueryLexer(new ANTLRStringStream(query));
-		UIQueryParser parser = new UIQueryParser(new CommonTokenStream(lexer));
-
-		UIQueryParser.query_return q;
-		try {
-			q = parser.query();
-		} catch (RecognitionException e) {
-			// TODO Auto-generated catch block
-			throw new InvalidUIQueryException(e.getMessage());
-		}
-		if (q == null) {
-			throw new InvalidUIQueryException(query);
-		}
-		CommonTree rootNode = (CommonTree) q.getTree();
-		List<CommonTree> queryPath = rootNode.getChildren();
-
-		if (queryPath == null || queryPath.isEmpty()) {
-			queryPath = Collections.singletonList(rootNode);
-		}
-
-		return mapUIQueryFromAstNodes(queryPath);
-	}
 
 	@SuppressWarnings("rawtypes")
 	private static List evaluateQueryForPath(List<UIQueryAST> queryPath,
@@ -124,59 +74,26 @@ public class UIQueryEvaluator {
 
 		List currentResult = inputViews;
 		UIQueryDirection currentDirection = UIQueryDirection.DESCENDANT;
+		UIQueryVisibility currentVisibility = UIQueryVisibility.VISIBLE;
+		
 		for (UIQueryAST step : queryPath) {			
-			if (isDirection(step)) {
-				currentDirection = directionFromAst(step);
-			} else {
-				currentResult = step.evaluateWithViewsAndDirection(
-						currentResult, currentDirection);
+			if (step instanceof UIQueryDirection) {
+				currentDirection = (UIQueryDirection) step;
+			}
+			else if (step instanceof UIQueryVisibility) {
+				currentVisibility = (UIQueryVisibility) step;
+			}
+			else {
+				currentResult = step.evaluateWithViews(currentResult, currentDirection,currentVisibility);
 			}
 
 		}
 		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;
-	}
-
-	public static List<UIQueryAST> mapUIQueryFromAstNodes(List<CommonTree> nodes) {
-		List<UIQueryAST> mapped = new ArrayList<UIQueryAST>(nodes.size());
-		for (CommonTree t : nodes) {
-			mapped.add(uiQueryFromAst(t));
-		}
-		return mapped;
+		return step instanceof UIQueryDirection;
 	}
-
-	public static UIQueryAST uiQueryFromAst(CommonTree step) {
-		String stepType = UIQueryParser.tokenNames[step.getType()];
-		switch (step.getType()) {
-		case UIQueryParser.QUALIFIED_NAME:
-			try {
-				return new UIQueryASTClassName(Class.forName(step.getText()));
-			} catch (ClassNotFoundException e) {
-				// TODO Auto-generated catch block
-				throw new InvalidUIQueryException("Qualified class name: "
-						+ step.getText() + " not found. (" + e.getMessage()
-						+ ")");
-			}
-		case UIQueryParser.NAME:
-			return new UIQueryASTClassName(step.getText());
-
-		case UIQueryParser.FILTER_COLON:
-			return UIQueryASTWith.fromAST(step);
-		default:
-			throw new InvalidUIQueryException("Unknown query: " + stepType
-					+ " with text: " + step.getText());
-
-		}
-
-	}
-
+			
 }