calabash-android 0.4.0.pre1 → 0.4.0.pre2

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

@@ -0,0 +1,135 @@
+package sh.calaba.instrumentationbackend.query.ast;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import android.view.View;
+
+public class UIQueryUtils {
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	public static List subviews(Object o)
+	{
+		try {
+			Method getChild = o.getClass().getMethod("getChildAt", int.class);
+			getChild.setAccessible(true);
+			Method getChildCount = o.getClass().getMethod("getChildCount");
+			getChildCount.setAccessible(true);
+			List result = new ArrayList(8);
+			int childCount = (Integer) getChildCount.invoke(o);
+			for (int i=0;i<childCount;i++)
+			{
+				result.add(getChild.invoke(o, i));
+			}
+			return result;
+			
+		} catch (NoSuchMethodException e) {			
+			return Collections.EMPTY_LIST;
+		} catch (IllegalArgumentException e) {			
+			return Collections.EMPTY_LIST;
+		} catch (IllegalAccessException e) {			
+			return Collections.EMPTY_LIST;
+		} catch (InvocationTargetException e) {
+			return Collections.EMPTY_LIST;
+		}
+		
+	}
+	
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	public static List parents(Object o)
+	{
+		try {
+			
+			Method getParent = o.getClass().getMethod("getParent");
+			getParent.setAccessible(true);
+			
+			List result = new ArrayList(8);
+			try {
+				while (true)
+				{
+					Object parent = getParent.invoke(o);
+					if (parent == null)
+					{
+						return result;
+					}
+					else 
+					{
+						result.add(parent);
+					}
+					o = parent;	
+				}											
+			} catch (IllegalArgumentException e) {
+				return result;
+			} catch (IllegalAccessException e) {
+				return result;
+			} catch (InvocationTargetException e) {
+				return result;
+			} 
+			
+			
+		} catch (NoSuchMethodException e) {
+			return Collections.EMPTY_LIST;
+		} 
+		
+	}
+
+	@SuppressWarnings({ "rawtypes" })
+	public static Method hasProperty(Object o, String propertyName) {
+		
+		Class c = o.getClass();		
+		Method method = methodOrNull(c,propertyName);
+		if (method != null) { return method;}
+		method = methodOrNull(c,"get"+captitalize(propertyName));
+		if (method != null) { return method;}
+		method = methodOrNull(c,"is"+captitalize(propertyName));
+		return method;
+				
+/*		
+		for (Method m : methods)
+		{
+			String methodName = m.getName();
+			if (methodName.equals(propertyName) || 
+				methodName.equals("is"+captitalize(propertyName)) ||
+				methodName.equals("get"+captitalize(propertyName)))
+			{
+				return m;
+			}
+		}
+*/
+		
+		
+	}
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	private static Method methodOrNull(Class c, String methodName) {
+		try {
+			return c.getMethod(methodName);
+		} catch (NoSuchMethodException e) {
+			return null;
+		}
+	}
+
+	private static String captitalize(String propertyName) {
+		return propertyName.substring(0,1).toUpperCase() + propertyName.substring(1);
+	}
+
+	public static Object getProperty(Object receiver, Method m) {		
+		try {
+			return m.invoke(receiver);
+		} catch (IllegalArgumentException e) {
+			throw new RuntimeException(e);
+		} catch (IllegalAccessException e) {
+			throw new RuntimeException(e);
+		} catch (InvocationTargetException e) { 
+			throw new RuntimeException(e);
+		}
+	}
+
+	public static boolean isVisible(Object v) {
+		if (!(v instanceof View)) { return true; }
+		return ((View) v).isShown();
+	}
+	
+}

data/test-server/instrumentation-backend/tests/sh/calaba/instrumentationbackend/query/tests/UIQueryTest.java

@@ -0,0 +1,134 @@
+package sh.calaba.instrumentationbackend.query.tests;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import junit.framework.TestCase;
+import sh.calaba.instrumentationbackend.query.ast.UIQueryAST;
+import sh.calaba.instrumentationbackend.query.ast.UIQueryASTClassName;
+import sh.calaba.instrumentationbackend.query.ast.UIQueryEvaluator;
+
+public class UIQueryTest extends TestCase {
+
+	@SuppressWarnings("rawtypes")
+	public void testEvaluateQueryOnEmpty() {
+		String query = "button";
+		List res = UIQueryEvaluator.evaluateQuery(query, Collections.EMPTY_LIST);		
+		assertEquals(0, res.size());
+	}
+
+	public void testConvertSimpleQueryToUIQueryAst() throws Exception {
+		List<UIQueryAST> parsedQuery = UIQueryEvaluator.parseQuery("button");
+		assertEquals(1, parsedQuery.size());
+		
+		UIQueryAST uiQueryAST = parsedQuery.get(0);
+		
+		assertTrue(uiQueryAST instanceof UIQueryASTClassName);
+		assertEquals("button", ((UIQueryASTClassName)uiQueryAST).simpleClassName);
+		
+	}
+
+	public void testConvertQualifiedQueryToUIQueryAst() throws Exception {
+		List<UIQueryAST> parsedQuery = UIQueryEvaluator.parseQuery("junit.framework.TestCase");
+		assertEquals(1, parsedQuery.size());
+		
+		UIQueryAST uiQueryAST = parsedQuery.get(0);
+		
+		assertTrue(uiQueryAST instanceof UIQueryASTClassName);				
+		assertEquals(junit.framework.TestCase.class, ((UIQueryASTClassName)uiQueryAST).qualifiedClassName);
+	}
+	
+	public void testConvertComposedQueryToUIQueryAst() throws Exception {
+		List<UIQueryAST> parsedQuery = UIQueryEvaluator.parseQuery("view button");
+		assertEquals(2, parsedQuery.size());
+		
+		UIQueryAST uiQueryASTFirst = parsedQuery.get(0);
+		UIQueryAST uiQueryASTSecond = parsedQuery.get(1);
+		
+		assertTrue(uiQueryASTFirst instanceof UIQueryASTClassName);
+		assertTrue(uiQueryASTSecond instanceof UIQueryASTClassName);
+		
+		assertEquals("view", ((UIQueryASTClassName)uiQueryASTFirst).simpleClassName);
+		assertEquals("button", ((UIQueryASTClassName)uiQueryASTSecond).simpleClassName);
+		
+	}
+
+	
+	private static class View {
+		@SuppressWarnings("rawtypes")
+		List views;
+
+		@SuppressWarnings("rawtypes")
+		public View(List views) {
+			super();
+			this.views = views;
+		}
+		public Object getChildAt(int idx)
+		{			
+			return this.views.get(idx);
+		}
+		@SuppressWarnings("unused")
+		public Object getChildCount() {return this.views.size();}
+		
+	}
+	private static class SubView extends View {
+
+		@SuppressWarnings("rawtypes")
+		public SubView(List views) {
+			super(views);
+		}
+		
+	}
+	private static class Button extends View {
+
+		@SuppressWarnings("rawtypes")
+		public Button(List views) {
+			super(views);
+			// TODO Auto-generated constructor stub
+		}
+		
+	}
+	
+	@SuppressWarnings("rawtypes")
+	public void testEvaluateSimpleQuery() throws Exception {
+		List<View> views = setupViews();
+		
+		List evaluateQuery = UIQueryEvaluator.evaluateQuery("subview", views);
+		assertEquals(1, evaluateQuery.size());
+		assertTrue(evaluateQuery.get(0) instanceof SubView);
+		
+		List evaluateQueryButtons = UIQueryEvaluator.evaluateQuery("button", views);
+		assertEquals(3, evaluateQueryButtons.size());
+		assertTrue(evaluateQueryButtons.get(0) instanceof Button);
+		assertTrue(evaluateQueryButtons.get(1) instanceof Button);
+		assertTrue(evaluateQueryButtons.get(2) instanceof Button);
+		
+	}
+	
+
+	@SuppressWarnings("rawtypes")
+	public void testEvaluateComposedQuery() throws Exception {
+		List<View> views = setupViews();
+		SubView vv = (SubView) views.get(1);
+		Button b = (Button) vv.getChildAt(0);
+		
+		List evaluateQuery = UIQueryEvaluator.evaluateQuery("subview button", views);
+		assertEquals(1, evaluateQuery.size());
+		assertTrue(evaluateQuery.get(0) instanceof Button);
+		assertEquals(evaluateQuery.get(0), b);
+		
+		
+	}
+
+	private List<View> setupViews() {
+		return Arrays.asList(new View[]{
+			new Button(Collections.EMPTY_LIST),
+			new SubView(Arrays.asList(new View[]{
+					new Button(Collections.EMPTY_LIST)
+			})),
+			new Button(Collections.EMPTY_LIST)
+		});
+	}
+
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre1
+  version: 0.4.0.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -160,7 +160,13 @@ files:
 - test-server/instrumentation-backend/.project
 - test-server/instrumentation-backend/.settings/org.eclipse.jdt.core.prefs
 - test-server/instrumentation-backend/AndroidManifest.xml
+- test-server/instrumentation-backend/antlr.sh
+- test-server/instrumentation-backend/antlr/UIQuery.g
+- test-server/instrumentation-backend/antlr/UIQuery.tokens
 - test-server/instrumentation-backend/assets/foo.bar
+- test-server/instrumentation-backend/build-libs/antlr-3.4-complete.jar
+- test-server/instrumentation-backend/build-libs/junit.jar
+- test-server/instrumentation-backend/build.xml
 - test-server/instrumentation-backend/libs/robotium-solo-3.6.jar
 - test-server/instrumentation-backend/project.properties
 - test-server/instrumentation-backend/res/drawable-hdpi/ic_launcher.png
@@ -171,6 +177,91 @@ files:
 - test-server/instrumentation-backend/src/com/jayway/android/robotium/solo/MapViewUtils.java
 - test-server/instrumentation-backend/src/com/jayway/android/robotium/solo/PublicViewFetcher.java
 - test-server/instrumentation-backend/src/com/jayway/android/robotium/solo/SoloEnhanced.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/ANTLRFileStream.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/ANTLRInputStream.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/ANTLRReaderStream.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/ANTLRStringStream.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/BaseRecognizer.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/BitSet.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/BufferedTokenStream.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/CharStream.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/CharStreamState.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/ClassicToken.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/CommonToken.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/CommonTokenStream.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/DFA.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/EarlyExitException.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/FailedPredicateException.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/IntStream.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/LegacyCommonTokenStream.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/Lexer.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/MismatchedNotSetException.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/MismatchedRangeException.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/MismatchedSetException.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/MismatchedTokenException.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/MismatchedTreeNodeException.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/MissingTokenException.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/NoViableAltException.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/Parser.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/ParserRuleReturnScope.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/RecognitionException.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/RecognizerSharedState.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/RuleReturnScope.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/SerializedGrammar.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/Token.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/TokenRewriteStream.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/TokenSource.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/TokenStream.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/UnbufferedTokenStream.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/UnwantedTokenException.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/debug/BlankDebugEventListener.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/debug/DebugEventHub.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/debug/DebugEventListener.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/debug/DebugEventRepeater.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/debug/DebugEventSocketProxy.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/debug/DebugParser.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/debug/DebugTokenStream.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/debug/DebugTreeAdaptor.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/debug/DebugTreeNodeStream.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/debug/DebugTreeParser.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/debug/ParseTreeBuilder.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/debug/Profiler.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/debug/RemoteDebugEventSocketListener.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/debug/TraceDebugEventListener.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/debug/Tracer.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/misc/DoubleKeyMap.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/misc/FastQueue.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/misc/IntArray.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/misc/LookaheadStream.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/misc/Stats.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/BaseTree.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/BaseTreeAdaptor.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/BufferedTreeNodeStream.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/CommonErrorNode.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/CommonTree.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/CommonTreeAdaptor.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/CommonTreeNodeStream.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/ParseTree.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/RewriteCardinalityException.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/RewriteEarlyExitException.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/RewriteEmptyStreamException.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/RewriteRuleElementStream.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/RewriteRuleNodeStream.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/RewriteRuleSubtreeStream.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/RewriteRuleTokenStream.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/Tree.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/TreeAdaptor.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/TreeFilter.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/TreeIterator.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/TreeNodeStream.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/TreeParser.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/TreePatternLexer.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/TreePatternParser.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/TreeRewriter.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/TreeRuleReturnScope.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/TreeVisitor.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/TreeVisitorAction.java
+- test-server/instrumentation-backend/src/org/antlr/runtime/tree/TreeWizard.java
 - 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
@@ -184,7 +275,6 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/NanoHTTPD.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/NullAction.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/activity/SetActivityOrientation.java
-- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/activity/SetOrientation.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/button/PressButtonNumber.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/button/PressButtonText.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/button/PressImageButtonDescription.java
@@ -281,6 +371,18 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/Touch.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/ViewMapper.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/antlr/UIQuery.tokens
+- 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/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/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
@@ -687,6 +789,7 @@ 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

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/activity/SetOrientation.java

@@ -1,39 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.map;
-
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-
-public class SetOrientation implements Action {
-
-    @Override
-    public Result execute(String... args) {
-        String orientation = "";
-        if (args != null && args.length >= 1) {
-            orientation = args[0].toLowerCase();
-        }
-
-        int changed = -1;
-
-        if( "landscape".contentEquals(orientation) ) {
-            changed = 0;
-        } else if( "portrait".contentEquals(orientation) ) {
-            changed = 1;
-        }
-
-        if (changed != -1) {
-            InstrumentationBackend.solo.setActivityOrientation(changed);
-            // Wait 100ms for orientation to happen.
-            try { Thread.sleep(100); } catch (Exception e) {}
-            // setActivityOrientation returns void so assume success.
-            return Result.successResult();
-        }
-
-        return new Result(false, "Requested invalid orientation: '" + orientation + "' Expected 'landscape' or 'portrait'.");
-    }
-
-    @Override
-    public String key() {
-        return "set_orientation";
-    }
-}