testautoa 0.4.0 → 0.4.1

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

@@ -1,14 +1,33 @@
 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 org.antlr.runtime.tree.CommonTree;
 
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.actions.webview.QueryHelper;
+import sh.calaba.instrumentationbackend.query.CompletedFuture;
+import sh.calaba.instrumentationbackend.query.antlr.UIQueryParser;
+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 {
+public class UIQueryUtils {	
+	
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public static List subviews(Object o)
 	{
@@ -78,9 +97,15 @@ public class UIQueryUtils {
 	@SuppressWarnings({ "rawtypes" })
 	public static Method hasProperty(Object o, String propertyName) {
 		
-		Class c = o.getClass();
-		Method[] methods = c.getMethods();
-		
+		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();
@@ -91,11 +116,19 @@ public class UIQueryUtils {
 				return m;
 			}
 		}
+*/
 		
-		return null;
 		
 	}
 
+	@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);
@@ -114,8 +147,130 @@ 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;
+
+        if (view.getWidth() == 0 || view.getWidth() == 0) {
+            return false;
+        }
+
+		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 igored) {
+					try {
+						Map resultAsMap = new ObjectMapper().readValue(
+											jsonResponse,
+											new TypeReference<HashMap>() {});
+						//This usually happens in case of error
+						//check this case
+						System.out.println(resultAsMap);
+						String errorMsg = (String) resultAsMap.get("error");
+						System.out.println(errorMsg);
+						return Collections.singletonList(resultAsMap);
+					} catch (Exception e) {
+						e.printStackTrace();
+						throw new RuntimeException(e);		
+					}
+					
+					
+				}		
+			}
+		});
+		
+	}
+
+	public static Object parseValue(CommonTree val) {
+		switch (val.getType()) {
+		case UIQueryParser.STRING: {
+			String textWithPings = val.getText();
+			String text = textWithPings
+					.substring(1, textWithPings.length() - 1);
+			return text;
+		}
+		case UIQueryParser.INT:
+			return Integer.parseInt(val.getText(), 10);
+		case UIQueryParser.BOOL: {
+			String text = val.getText();
+			return Boolean.parseBoolean(text);
+		}
+		case UIQueryParser.NIL:
+			return null;
+
+		default:
+			throw new IllegalArgumentException("Unable to parse value type:"
+					+ val.getType() + " text " + val.getText());
+
+		}
+
+	}
+
 }

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,101 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: testautoa
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 0.4.1
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
 platform: ruby
-authors: 
-- jamestsay
+authors:
+- jimtsay
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: cucumber
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: retriable
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: retriable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: slowhandcuke
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: slowhandcuke
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !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 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Description
 email: 
-executables: 
+executables:
 - calabash-android
+- testautoa
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .calabash_settings
 - CHANGES.txt
 - Gemfile
@@ -108,6 +127,7 @@ files:
 - bin/calabash-android-helpers.rb
 - bin/calabash-android-run.rb
 - bin/calabash-android-setup.rb
+- bin/testautoa
 - calabash-android.gemspec
 - doc/calabash-android-help.txt
 - epl-v10.html
@@ -127,6 +147,7 @@ files:
 - lib/calabash-android/lib/AXMLPrinter2.jar
 - lib/calabash-android/lib/manifest_extractor.jar
 - lib/calabash-android/lib/screenShotTaker.jar
+- lib/calabash-android/lib/unsign.jar
 - lib/calabash-android/management/adb.rb
 - lib/calabash-android/management/app_installation.rb
 - lib/calabash-android/operations.rb
@@ -149,7 +170,9 @@ files:
 - lib/calabash-android/steps/search_steps.rb
 - lib/calabash-android/steps/spinner_steps.rb
 - lib/calabash-android/steps/time_picker_steps.rb
+- lib/calabash-android/touch_helpers.rb
 - lib/calabash-android/version.rb
+- lib/calabash-android/wait_helpers.rb
 - test-server/AndroidManifest.xml
 - test-server/build.xml
 - test-server/instrumentation-backend/.classpath
@@ -262,6 +285,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
@@ -271,6 +295,9 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/HttpServer.java
 - 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/FinishOpenedActivities.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/activity/GetOpenedActivities.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/activity/GoBackToActivity.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/activity/SetActivityOrientation.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
@@ -284,6 +311,7 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/contextmenu/LongPressTextAndSelectFromMenuByText.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/ClickOnScreen.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/Drag.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/DragCoordinates.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/Swipe.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/gestures/TouchCoordinates.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/helpers/InspectCurrentDialog.java
@@ -313,8 +341,11 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/DownKey.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/EnterKey.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/GoBack.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/LeftKey.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/PressMenu.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/RightKey.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/SelectFromMenuByText.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/softkey/UpKey.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/spinner/GetSelectedSpinnerItemText.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/spinner/SelectSpinnerItemByContentDescription.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/AssertGridViewContainsNoDuplicates.java
@@ -332,6 +363,7 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/time/SetDateByIndex.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/time/SetTimeByContentDescription.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/time/SetTimeByIndex.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/version/Version.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/AssertViewProperty.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/ClickOnViewByDescription.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/ClickOnViewById.java
@@ -359,27 +391,39 @@ 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/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/BeginsWithRelation.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/ComparisonOperator.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/ContainsRelation.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/EndsWithRelation.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/InvalidUIQueryException.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/LikeRelation.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/UIQueryASTPredicate.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/UIQueryASTPredicateRelation.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
@@ -786,43 +830,32 @@ 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
 homepage: 
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Summary
 test_files: []
-
 has_rdoc: 

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

@@ -1,24 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.webview;
-
-
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-
-
-public class Query implements Action {
-
-    @Override
-    public Result execute(String... args) {
-    	    	
-    	String result = QueryHelper.executeJavascriptInWebview("calabash.js", args[1], args[0]);
-    	return new Result(true, result);
-    }
-
-    @Override
-    public String key() {
-        return "query";
-    }
-    
-    
-
-}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/Touch.java

@@ -1,44 +0,0 @@
-package sh.calaba.instrumentationbackend.actions.webview;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import sh.calaba.instrumentationbackend.InstrumentationBackend;
-import sh.calaba.instrumentationbackend.Result;
-import sh.calaba.instrumentationbackend.actions.Action;
-import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
-import sh.calaba.org.codehaus.jackson.type.TypeReference;
-
-
-public class Touch implements Action {
-
-    @Override
-    public Result execute(String... args) {
-
-        try {
-            String queryResult = QueryHelper.executeJavascriptInWebview("calabash.js", args[1], args[0]);
-            List<HashMap<String,Object>> p = new ObjectMapper().readValue(queryResult, new TypeReference<List<HashMap<String,Object>>>(){});
-
-            if (p.isEmpty()) {
-                throw new RuntimeException("No element found");
-            }
-
-            Map<String, Object> firstRect = QueryHelper.findFirstVisibleRectangle(p);
-
-            float[] screenCoordinates = QueryHelper.getScreenCoordinatesForCenter(firstRect);
-
-            InstrumentationBackend.solo.clickOnScreen(screenCoordinates[0], screenCoordinates[1]);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-
-        return new Result(true, "");
-    }
-
-    @Override
-    public String key() {
-        return "touch";
-    }
-}