calabash-android 0.4.0.pre6 → 0.4.0.pre7

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

@@ -1,137 +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();
+        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");
 
-			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);
-			}
-		}
+        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) {
-		
-        long before = System.currentTimeMillis();
-        List views = evaluateQueryForPath(parseQuery(query), inputViews);
-        long after = System.currentTimeMillis();
-        String action = "EvaluateQueryNoOptions";
-        System.out.println(action+ " took: "+ (after-before) + "ms");
-
-		
-
+	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 {
-					
-					before = System.currentTimeMillis();
-					
-					Method m = UIQueryUtils.hasProperty(o, propertyName);
-					after = System.currentTimeMillis();
-			        action = "HasProperty";
-			        System.out.println(action+ " took: "+ (after-before) + "ms");
-
-
-					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,
@@ -139,26 +74,23 @@ 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 {
-				System.out.println(step);
-		        long before = System.currentTimeMillis();
-		        		        
-
-				currentResult = step.evaluateWithViewsAndDirection(
-						currentResult, currentDirection);
-				long after = System.currentTimeMillis();
-		        String action = "EvaluateQueryNoOptions" + step.toString();
-		        System.out.println(action+ " took: "+ (after-before) + "ms");
-
+			}
+			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;
@@ -168,38 +100,5 @@ public class UIQueryEvaluator {
 		// 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;
-	}
-
-	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());
-
-		}
-
-	}
-
+			
 }

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

@@ -1,12 +1,27 @@
 package sh.calaba.instrumentationbackend.query.ast;
 
+import static sh.calaba.instrumentationbackend.InstrumentationBackend.viewFetcher;
+
 import java.lang.reflect.InvocationTargetException;
 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 java.util.concurrent.Callable;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
 
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.actions.webview.QueryHelper;
+import sh.calaba.instrumentationbackend.query.CompletedFuture;
+import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
+import sh.calaba.org.codehaus.jackson.type.TypeReference;
+import android.content.res.Resources.NotFoundException;
 import android.view.View;
+import android.webkit.WebView;
 
 public class UIQueryUtils {
 	@SuppressWarnings({ "unchecked", "rawtypes" })
@@ -128,8 +143,88 @@ public class UIQueryUtils {
 	}
 
 	public static boolean isVisible(Object v) {
-		if (!(v instanceof View)) { return true; }
-		return ((View) v).isShown();
+		if (!(v instanceof View)) { return true; }		
+		View view = (View) v;
+		return view.isShown() && viewFetcher.isViewSufficientlyShown(view);
 	}
+
+	public static String getId(View view) {
+		try {
+			return InstrumentationBackend.solo.getCurrentActivity()
+					.getResources().getResourceEntryName(view.getId());			
 	
+		}
+		catch (NotFoundException e) {}
+		return null;
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static Future evaluateAsyncInMainThread(final Callable callable) throws Exception {
+		final AtomicReference<Future> result = new AtomicReference<Future>();
+		final AtomicReference<Exception> errorResult = new AtomicReference<Exception>();
+		
+		InstrumentationBackend.instrumentation.runOnMainSync(new Runnable() {			
+			@SuppressWarnings("unchecked")
+			public void run() {
+				try {
+					Object res = callable.call();
+					if (res instanceof Future) {
+						result.set((Future) res);
+					}
+					else {
+						result.set(new CompletedFuture(res));
+					}
+				} catch (Exception e) {
+					errorResult.set(e);
+				}			
+			}			
+		});
+		if (result.get() == null) {
+			throw errorResult.get();
+		}
+		return result.get();
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static Object evaluateSyncInMainThread(Callable callable) {
+		try {
+			return evaluateAsyncInMainThread(callable).get(10, TimeUnit.SECONDS);
+		} catch (RuntimeException e) {
+			throw e;
+		}
+		catch (Exception e) {
+			e.printStackTrace();
+			throw new RuntimeException(e);
+		} 
+	}
+	
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	public static List<Map<String, Object>> mapWebViewJsonResponse(final String jsonResponse, final WebView webView) {
+		return (List<Map<String, Object>>) evaluateSyncInMainThread(new Callable() {
+
+			@Override
+			public Object call() throws Exception {
+				List<Map<String, Object>> parsedResult;
+				try {
+					parsedResult = new ObjectMapper()
+					.readValue(
+							jsonResponse,
+							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);
+						data.put("rect", updatedRect);
+						data.put("webView", webView);
+					}
+					return parsedResult;
+				} catch (Exception e) {
+					e.printStackTrace();
+					throw new RuntimeException(e);		
+				}		
+			}
+		});
+		
+	}
+
 }

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

@@ -0,0 +1,32 @@
+package sh.calaba.instrumentationbackend.query.ast;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public enum UIQueryVisibility implements UIQueryAST {
+	ALL {		
+		@Override
+		@SuppressWarnings("rawtypes")
+		public List evaluateWithViews(List inputViews,
+				UIQueryDirection direction, UIQueryVisibility self) {			
+			return inputViews;
+		} 
+	},
+	
+	
+	VISIBLE {
+		@Override
+		@SuppressWarnings({ "rawtypes", "unchecked" })
+		public List evaluateWithViews(List inputViews,
+				UIQueryDirection direction, UIQueryVisibility self) {
+			List filtered = new ArrayList(inputViews.size());
+			for (Object o : inputViews) {
+				if (UIQueryUtils.isVisible(o)) {
+				    filtered.add(o);					
+				}				
+			}			
+			return filtered;
+		} 
+	};
+	
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre6
+  version: 0.4.0.pre7
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'calabash-android drives tests for native  and hybrid Android apps. '
 email:
 - jonas@lesspainful.com
@@ -266,6 +282,7 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/CalabashInstrumentationTestRunner.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/ClearAppData.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/Command.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/FranklyResult.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/InstrumentationBackend.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/Result.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/TestHelpers.java
@@ -363,26 +380,32 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/ExecuteJavascript.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/GetLoadProgress.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/GetUrl.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/JavaScriptOperation.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/PressByCssSelector.java
-- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/Query.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/QueryHelper.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/ScrollTo.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/SetPropertyByCssSelector.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/SetText.java
-- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/Touch.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/CompletedFuture.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/InvocationOperation.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/Operation.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/PropertyOperation.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/Query.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/QueryResult.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/UIQuery.tokens
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/UIQueryResultVoid.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ViewMapper.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/antlr/UIQueryLexer.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/antlr/UIQueryParser.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/InvalidUIQueryException.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/PartialFutureList.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/UIQueryAST.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/UIQueryASTClassName.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/UIQueryASTWith.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/UIQueryDirection.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/UIQueryEvaluator.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/UIQueryUtils.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/UIQueryVisibility.java
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/Base64Variant.java
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/Base64Variants.java
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/FormatSchema.java
@@ -789,7 +812,6 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/util/TokenBuffer.java
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/util/VersionUtil.java
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/util/package-info.java
-- test-server/instrumentation-backend/tests/sh/calaba/instrumentationbackend/query/tests/UIQueryTest.java
 - test-server/calabash-js/src/calabash.js
 - test-server/calabash-js/src/set_text.js
 - lib/calabash-android/lib/TestServer.apk