calabash-android 0.4.9.pre2 → 0.4.9.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3fab2a76c6cc2a3bf77ae148335958aff340aee
-  data.tar.gz: 3c226619ad79a99a983804ce4d1beb5493dc2fa4
+  metadata.gz: 7382b7dab96dabda3ddc20acc43dcf35dd064673
+  data.tar.gz: db95474aa5d4d4a16e5226da72c1e961d880666e
 SHA512:
-  metadata.gz: 089f8c510215dd629d917750ba4da0331f6e10581f94e2791552e7736d04eb9b6870f04f40b71afafc5392149c0855db5a4b83b2ff33a5446cdc881516971c31
-  data.tar.gz: 6cf4519e2285e506875f58a72d84c8f05912cb6c2a27f1edda1947bd9d9370f649fb3be8da93a2b2932adda633199723a2a01f8180b4e987aa25e50dc7513a76
+  metadata.gz: 066c58155a9d3e3c0a63384340c0e2998fa19fdb75521ccbb0020bfd12acd2e316fb519a0da7400ee024bb150ae1bea0d63f3ab0e4a8d58b7f69e55e9f64d9d0
+  data.tar.gz: fe8ccf72731d38737eadccc1ee3ab10535f3e3c44098e409f49081d092b6d45abff9bf2112a8b5dcb9d5815584f6ffe5df4bab27db03deb1b97df7b5082f48b7

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.9.pre2"
+    VERSION = "0.4.9.pre3"
   end
 end

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

@@ -1,12 +1,24 @@
 package sh.calaba.instrumentationbackend.actions;
 
+import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicReference;
 
+import sh.calaba.instrumentationbackend.json.JSONUtils;
+import sh.calaba.instrumentationbackend.query.ast.DoubleFuture;
 import sh.calaba.instrumentationbackend.query.ast.UIQueryUtils;
+import sh.calaba.org.codehaus.jackson.JsonParseException;
+import sh.calaba.org.codehaus.jackson.map.JsonMappingException;
+import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
+import android.util.Log;
 
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class ViewDump {
@@ -37,13 +49,51 @@ public class ViewDump {
 	
 	private Map<?, ?> sameTreeWithoutElements(Map<?, ?> dump) {
 		Map node = UIQueryUtils.mapWithElAsNull(dump);
-		List<Map> nodeChildren = (List<Map>) node.get("children");
+		List nodeChildren = (List) node.get("children");
 		List<Map> childrenNoEl = new ArrayList<Map>(nodeChildren.size());
-		for (Map child : nodeChildren) {
-			childrenNoEl.add(sameTreeWithoutElements(child));
+				
+		for (Object child : nodeChildren) {
+			if (child instanceof Map) {
+				childrenNoEl.add(sameTreeWithoutElements((Map)child));	
+			}
+			else {
+				Log.i("Calabash", child.toString());
+				Future webResults = (Future) child;
+				
+				try {
+					Map webResultsMap = (Map) webResults.get(10,TimeUnit.SECONDS);
+					String json = (String) webResultsMap.get("result");
+					ObjectMapper mapper = new ObjectMapper();
+					List jsonResults = mapper.readValue(json, List.class);
+					for(Object m : jsonResults) {						
+						Map domElement = UIQueryUtils.mapWithElAsNull(UIQueryUtils.serializeViewToDump(m));
+						childrenNoEl.add(domElement);	
+					}
+					
+							
+				} catch (InterruptedException e) {
+					
+				} catch (ExecutionException e) {
+					
+				} catch (TimeoutException e) {
+					
+				} catch (JsonParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+					throw new RuntimeException(e);
+				} catch (JsonMappingException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				} catch (IOException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}			
+			}			
 		}
 		node.put("children",childrenNoEl);
 		return node;
+		
+	
 	}
 
 	

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

@@ -11,6 +11,7 @@ import java.util.Map;
 import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.actions.webview.CalabashChromeClient.WebFuture;
 import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
+import android.util.Log;
 import android.webkit.WebView;
 
 public class QueryHelper {
@@ -94,7 +95,7 @@ public class QueryHelper {
 
 		script = script.replaceFirst("%@", selector);
 		script = script.replaceFirst("%@", type);
-
+		
 		CalabashChromeClient chromeClient = CalabashChromeClient.prepareWebView(webView);		
         webView.loadUrl("javascript:calabash_result = " + script + ";prompt('calabash:' + calabash_result);");
 		return chromeClient.getResult();

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

@@ -17,6 +17,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import org.antlr.runtime.tree.CommonTree;
 
 import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.actions.webview.CalabashChromeClient.WebFuture;
 import sh.calaba.instrumentationbackend.actions.webview.QueryHelper;
 import sh.calaba.instrumentationbackend.query.CompletedFuture;
 import sh.calaba.instrumentationbackend.query.Query;
@@ -25,6 +26,7 @@ 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.text.InputType;
+import android.util.Log;
 import android.view.View;
 import android.webkit.WebView;
 import android.widget.Button;
@@ -35,6 +37,7 @@ public class UIQueryUtils {
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public static List subviews(Object o) {
+		
 		try {
 			Method getChild = o.getClass().getMethod("getChildAt", int.class);
 			getChild.setAccessible(true);
@@ -59,6 +62,19 @@ public class UIQueryUtils {
 
 	}
 
+	@SuppressWarnings({ "rawtypes" })
+	public static Future webViewSubViews(WebView o) {
+		
+		Log.i("Calabash", "About to webViewSubViews");
+		
+
+		WebFuture controls = QueryHelper.executeAsyncJavascriptInWebviews(o,
+				"calabash.js", "input,button","css");
+		
+		return controls;
+		
+	}
+
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public static List parents(Object o) {
 		try {
@@ -167,9 +183,11 @@ public class UIQueryUtils {
 		return ViewMapper.getIdForView(view);
 	}
 
-	@SuppressWarnings("rawtypes")
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public static Future evaluateAsyncInMainThread(final Callable callable)
-			throws Exception {
+			throws Exception {		
+		
+				
 		final AtomicReference<Future> result = new AtomicReference<Future>();
 		final AtomicReference<Exception> errorResult = new AtomicReference<Exception>();
 
@@ -300,17 +318,26 @@ public class UIQueryUtils {
 
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	protected static Map<?, ?> dumpRecursively(Map parentView,
-			List<View> children) {
+			List children) {
 		ArrayList childrenArray = new ArrayList(32);
 		for (int i = 0; i < children.size(); i++) {
-			View view = children.get(i);
+			Object view = children.get(i);
 			Map serializedChild = serializeViewToDump(view);
 			List<Integer> childPath = new ArrayList<Integer>(
 					(List) parentView.get("path"));
 			childPath.add(i);
 			serializedChild.put("path", childPath);
-			childrenArray.add(dumpRecursively(serializedChild,
-					UIQueryUtils.subviews(view)));
+			List childrenList = null;
+			if (view instanceof WebView) {
+				Future webViewSubViews = webViewSubViews((WebView) view);
+				childrenArray.add(webViewSubViews);
+			}
+			else {
+				childrenList = UIQueryUtils.subviews(view);
+				childrenArray.add(dumpRecursively(serializedChild,
+						childrenList));
+			}
+			
 		}
 
 		parentView.put("children", childrenArray);
@@ -339,31 +366,138 @@ public class UIQueryUtils {
 		return currentView;
 	}
 
+	/*
+ * 
+                                            "enabled" => true,
+                                            "visible" => true,
+                                           "children" => [],
+                                              "label" => nil,
+                                               "rect" => {
+                                            "center_y" => 158.5,
+                                            "center_x" => 300.0,
+                                              "height" => 25,
+                                                   "y" => 146,
+                                               "width" => 600,
+                                                   "x" => 0
+                                        },
+                                               "type" => "android.widget.TextView",
+                                                 "id" => "FacebookTextView",
+                                                 "el" => nil,
+                                               "name" => "",
+                                             "action" => nil,
+                                              "value" => "",
+                                               "path" => [
+                                            [0] 0,
+                                            [1] 0,
+                                            [2] 2,
+                                            [3] 0,
+                                            [4] 2
+                                        ],
+                                          "hit-point" => {
+                                            "y" => 158.5,
+                                            "x" => 300.0
+                                        },
+                                        "entry_types" => [
+                                            [0] "0"
+                                        ]
+	 */
 	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public static Map<?, ?> serializeViewToDump(View view) {
-		if (view == null) {
+	public static Map<?, ?> serializeViewToDump(Object viewOrMap) {
+		if (viewOrMap == null) {
 			return null;
 		}
+		
+		if (viewOrMap instanceof Map) 
+		{
+			Map map = (Map) viewOrMap;			
+			map.put("el", map);
+
+			Map rect = (Map) map.get("rect");
+			Map hitPoint = extractHitPointFromRect(rect);
+			
+			map.put("hit-point", hitPoint);
+			Map result = new HashMap();
+			result.put("type", "touch");
+			result.put("gesture", "tap");
+			map.put("action", result);
+			map.put("enabled", true);
+			map.put("visible", true);
+			String nodeName = (String) map.get("nodeName");
+			if (nodeName != null && nodeName.toLowerCase().equals("input")) {
+				String domType = extractDomType((String)map.get("html"));
+				map.put("domType", domType);
+				Log.i("Calabash - domtype", domType);
+				if (domType!=null && domType.equals("password")) {
+					map.put("entry_types", Collections.singletonList("password"));		
+				}
+				else {
+					map.put("entry_types", Collections.singletonList("text"));
+				}
+				
+			}
+			
+			
+			
+			map.put("value", null);
+			map.put("type", "dom");
+			map.put("name", null);
+			map.put("label", null);
+			return map;	
+			
+		}
+		else 
+		{
+			Map m = new HashMap();
+			
+			View view = (View) viewOrMap;
+			m.put("id", getId(view));
+			m.put("el", view);
+
+			Map rect = ViewMapper.getRectForView(view);
+			Map hitPoint = extractHitPointFromRect(rect);
+
+			m.put("rect", rect);
+			m.put("hit-point", hitPoint);
+			m.put("action", actionForView(view));
+			m.put("enabled", view.isEnabled());
+			m.put("visible", isVisible(view));
+			m.put("entry_types", elementEntryTypes(view));
+			m.put("value", extractValueFromView(view));
+			m.put("type", ViewMapper.getClassNameForView(view));
+			m.put("name", getNameForView(view));
+			m.put("label", ViewMapper.getContentDescriptionForView(view));
+			return m;	
+		}
+
+		
+
+		
+	}
 
-		Map m = new HashMap();
-
-		m.put("id", getId(view));
-		m.put("el", view);
-
-		Map rect = ViewMapper.getRectForView(view);
-		Map hitPoint = extractHitPointFromRect(rect);
-
-		m.put("rect", rect);
-		m.put("hit-point", hitPoint);
-		m.put("action", actionForView(view));
-		m.put("enabled", view.isEnabled());
-		m.put("visible", isVisible(view));
-		m.put("entry_types", elementEntryTypes(view));
-		m.put("value", extractValueFromView(view));
-		m.put("type", ViewMapper.getClassNameForView(view));
-		m.put("name", getNameForView(view));
-		m.put("label", ViewMapper.getContentDescriptionForView(view));
-		return m;
+	public static String extractDomType(String string) {
+		String[] split = string.split("type=");
+		if (split.length > 1) {
+			String lastPart = split[1];
+			if (lastPart == null) {
+				return null;	
+			}				
+			if (lastPart.charAt(0) == '"' || lastPart.charAt(0) == '\'') {
+				int endIndex = -1;
+				for (int i=1;i<lastPart.length();i++) {
+					if (lastPart.charAt(i) == '\'' || lastPart.charAt(i) == '"') {
+						endIndex = i;
+						break;
+					}
+				}
+				
+				if (endIndex > 0) {
+					return lastPart.substring(1,endIndex);
+				}
+				
+			}			
+		}
+		return null;
+		
 	}
 
 	public static List<String> elementEntryTypes(View view) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.9.pre2
+  version: 0.4.9.pre3
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber