calabash-android 0.5.2 → 0.5.3

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

@@ -1,7 +0,0 @@
-package sh.calaba.instrumentationbackend.query;
-
-public interface Operation {
-
-	public Object apply(Object o) throws Exception;
-	public String getName();
-}

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

@@ -1,56 +0,0 @@
-package sh.calaba.instrumentationbackend.query;
-
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import sh.calaba.instrumentationbackend.query.ast.UIQueryUtils;
-import android.view.View;
-
-public class PropertyOperation implements Operation {
-
-	public final String propertyName;	
-	
-	public PropertyOperation(String propertyName) {
-		super();
-		this.propertyName = propertyName;
-	}
-
-
-	@SuppressWarnings({ "rawtypes" })
-	@Override
-	public Object apply(Object o) throws Exception {
-		if (o instanceof Map) {
-			Map objAsMap = (Map) o;
-			if (objAsMap.containsKey(propertyName)) {											
-				return objAsMap.get(propertyName);
-			} else {
-				return UIQueryResultVoid.instance.asMap(
-						propertyName, o, "No key for "
-								+ propertyName + ". Keys: "
-								+ (objAsMap.keySet().toString()));
-			}
-		} else {
-			if (o instanceof View && "id".equals(propertyName)) {
-				return UIQueryUtils.getId((View) o);
-			} else {
-				Method m = UIQueryUtils
-						.hasProperty(o, propertyName);
-				if (m != null) {
-					return m.invoke(o);					
-				} else {
-					return UIQueryResultVoid.instance
-							.asMap(propertyName, o,
-									"NO accessor for "
-											+ propertyName);
-				}
-			}
-		}
-
-	}
-
-	@Override
-	public String getName() {
-		return "Property["+this.propertyName+"]";
-	}
-
-}

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

@@ -1,172 +0,0 @@
-package sh.calaba.instrumentationbackend.query;
-
-import static sh.calaba.instrumentationbackend.InstrumentationBackend.viewFetcher;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-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.instrumentationbackend.query.ast.InvalidUIQueryException;
-import sh.calaba.instrumentationbackend.query.ast.UIQueryAST;
-import sh.calaba.instrumentationbackend.query.ast.UIQueryASTClassName;
-import sh.calaba.instrumentationbackend.query.ast.UIQueryASTPredicate;
-import sh.calaba.instrumentationbackend.query.ast.UIQueryASTWith;
-import sh.calaba.instrumentationbackend.query.ast.UIQueryDirection;
-import sh.calaba.instrumentationbackend.query.ast.UIQueryEvaluator;
-import sh.calaba.instrumentationbackend.query.ast.UIQueryVisibility;
-import android.view.View;
-
-public class Query {
-
-	private String queryString;
-	@SuppressWarnings("rawtypes")
-	private List operations;
-
-	public Query(String queryString) {
-		this.queryString = queryString;
-		this.operations = Collections.EMPTY_LIST;
-		if (this.queryString == null || this.queryString.trim().equals("")) {
-			throw new IllegalArgumentException("Illegal query: "
-					+ this.queryString);
-		}
-	}
-
-	@SuppressWarnings("rawtypes")
-	public Query(String queryString, List args) {
-		this(queryString);
-		this.operations = args;
-	}
-
-	public QueryResult executeQuery() {
-		return UIQueryEvaluator.evaluateQueryWithOptions(parseQuery(this.queryString), rootViews(), parseOperations(this.operations));		
-	}
-
-	@SuppressWarnings("rawtypes")
-	public static List<Operation> parseOperations(List ops) {
-		List<Operation> result = new ArrayList<Operation>(ops.size());
-		for (Object o : ops) {
-			Operation op = null;
-			if (o instanceof Operation) {
-				op = (Operation) o;												
-			}
-			else if (o instanceof String) {
-				op = new PropertyOperation((String) o);	
-			}
-			else if (o instanceof Map) {
-				Map mapOp = (Map) o;				
-				String methodName = (String) mapOp.get("method_name");
-				if (methodName == null) {
-					throw new IllegalArgumentException("Trying to convert a Map without method_name to an operation. " + mapOp.toString());
-				}
-				List arguments = (List) mapOp.get("arguments");
-				if (arguments == null) {
-					throw new IllegalArgumentException("Trying to convert a Map without arguments to an operation. " + mapOp.toString());
-				}
-				op = new InvocationOperation(methodName, arguments);
-			}
-			result.add(op);								
-		}
-		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) {
-			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);
-	}
-
-
-	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) {
-				return new UIQueryASTClassName((String)null);
-			}
-		case UIQueryParser.NAME:
-			return new UIQueryASTClassName(step.getText());
-		
-		case UIQueryParser.WILDCARD:
-			try {
-				return new UIQueryASTClassName(Class.forName("android.view.View"));
-			} catch (ClassNotFoundException e) {
-				//Cannot happen
-				throw new IllegalStateException(e);
-			}
-			
-
-			
-		case UIQueryParser.FILTER_COLON:
-			return UIQueryASTWith.fromAST(step);
-			
-		case UIQueryParser.ALL:
-			return UIQueryVisibility.ALL;	
-			
-		case UIQueryParser.VISIBLE:
-			return UIQueryVisibility.VISIBLE;
-			
-		case UIQueryParser.BEGINPRED:
-			return UIQueryASTPredicate.newPredicateFromAST(step);
-		case UIQueryParser.DIRECTION:
-			return UIQueryDirection.valueOf(step.getText().toUpperCase());			
-			
-		default:
-			throw new InvalidUIQueryException("Unknown query: " + stepType
-					+ " with text: " + step.getText());
-
-		}
-
-	}
-
-    public List<View> rootViews() {
-        Set<View> parents = new HashSet<View>();
-        for (View v : viewFetcher.getAllViews(false))
-        {
-            View parent = viewFetcher.getTopParent(v);            
-            parents.add(parent);
-        }
-        List<View> results = new ArrayList<View>();
-        results.addAll(parents);
-        return results;
-    }
-
-
-}

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

@@ -1,45 +0,0 @@
-package sh.calaba.instrumentationbackend.query;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
-
-public class QueryResult {
-
-    private List result;
-
-    public QueryResult(List result) {
-
-        this.result = result;
-    }
-
-    public boolean isEmpty() {
-        return result.isEmpty();
-    }
-
-    public String asJson() {
-        ObjectMapper mapper = new ObjectMapper();
-
-        try {
-            return mapper.writeValueAsString(result);
-        } catch (IOException e) {
-            throw new RuntimeException("Could not convert result to json", e);
-        }
-    }
-
-    public List getResult() {
-        return result;
-    }
-
-
-    public List asList() {
-        List<Object> finalResult = new ArrayList(result.size());
-        for (Object o : result) {
-            finalResult.add(ViewMapper.mapView(o));
-        }
-        return finalResult;
-    }
-
-}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/UIQuery.tokens

@@ -1,20 +0,0 @@
-ALL=4
-BEGINPRED=5
-BOOL=6
-DIRECTION=7
-DOUBLE_ESC_SEQ=8
-ENDPRED=9
-ESC_SEQ=10
-FILTER_COLON=11
-HEX_DIGIT=12
-INT=13
-NAME=14
-NIL=15
-OCTAL_ESC=16
-QUALIFIED_NAME=17
-RELATION=18
-STRING=19
-UNICODE_ESC=20
-VISIBLE=21
-WHITE=22
-WILDCARD=23

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

@@ -1,22 +0,0 @@
-package sh.calaba.instrumentationbackend.query;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-public class UIQueryResultVoid {
-	public static final UIQueryResultVoid instance = new UIQueryResultVoid();
-
-	private UIQueryResultVoid() {}
-
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public Object asMap(String methodName, Object receiver,
-			String errorMessage) {
-		Map map = new HashMap();
-		map.put("error", errorMessage);
-		map.put("methodName", methodName);
-		map.put("receiverClass", receiver.getClass().getName());
-		map.put("receiverString", receiver.toString());
-		return map;
-	}
-}

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

@@ -1,120 +0,0 @@
-package sh.calaba.instrumentationbackend.query;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.query.ast.UIQueryUtils;
-import android.content.res.Resources;
-import android.view.View;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.TextView;
-
-public class ViewMapper {
-
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public static Object extractDataFromView(View v) {
-
-		Map data = new HashMap();
-		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<String,Integer> rect = getRectForView(v);
-
-		data.put("rect", rect);
-
-		if (v instanceof Button) {
-			Button b = (Button) v;
-			data.put("text", b.getText().toString());
-		}
-		if (v instanceof CheckBox) {
-			CheckBox c = (CheckBox) v;
-			data.put("checked", c.isChecked());
-		}
-		if (v instanceof TextView) {
-			TextView t = (TextView) v;
-			data.put("text", t.getText().toString());
-		}
-		return data;
-
-	}
-
-    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", (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;
-	}
-
-	public static String getContentDescriptionForView(View v) {
-		CharSequence description = v.getContentDescription();
-		return description != null ? description.toString() : null;
-	}
-
-	public static String getClassNameForView(View v) {
-		return v.getClass().getName();
-	}
-
-	public static String getIdForView(View v) {
-		String id = null;
-		try {
-			id = InstrumentationBackend.solo.getCurrentActivity()
-					.getResources().getResourceEntryName(v.getId());
-		} catch (Resources.NotFoundException e) {
-			System.out.println("Resource not found for " + v.getId()
-					+ ". Moving on.");
-		}
-		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();
-			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();
-		}
-		return o;
-	}
-
-}