calabash-android 0.4.7.pre3 → 0.4.7.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 079fd75ffa1a41cf381a4f8cd72b1cadbee2e04d
-  data.tar.gz: a183f3c9dc459adef3d13f067c868e2c6016dda5
+  metadata.gz: 38ea0a7d4c70d2f1e51351ce4cd390af26710880
+  data.tar.gz: 715c679a7e4cd6dc255ca1f5028c11b60f808151
 SHA512:
-  metadata.gz: 2f7d86ad6876dc8c317385069746046d591d55730aabe3a919ef95e1287405c2c0bf34f81b9a77e18fadc0a60bd16fc3c21486a304302a2b8c5497142a0ee5c1
-  data.tar.gz: f6e8a2bae10aa4af04f535d4cd7a140ca6c8f83fd55cf5dd4c6e12501f4fcfc1c454615c5c2ef5261008a410cf632519c20b4c3a77a4d3938a0362d2b5178f34
+  metadata.gz: 1ae14e2aec7bb5685c387a5a48ab73eadb0f86ac1d2c64b95bcba962bc5037720585b2cec0538958d0799be4cd6303422a4f72fb2f999c7955d2f8817ce0182a
+  data.tar.gz: 40b134d72e179604291e76e15274cc81966cb03c95b1f1d8a4f99a71c15d6a83668425baa147f060665717f31a913579d0dcefa435be6aa755925d33de913b68

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.7.pre3"
+    VERSION = "0.4.7.pre4"
   end
 end

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

@@ -93,7 +93,14 @@ public class HttpServer extends NanoHTTPD {
 						return new NanoHTTPD.Response(HTTP_OK, "application/json;charset=utf-8", JSONUtils.asJson(dumpTree));					
 					}
 					Map<?,?> dumpTree = new ViewDump().dumpPathWithoutElements(path);
-					return new NanoHTTPD.Response(HTTP_OK, "application/json;charset=utf-8", JSONUtils.asJson(dumpTree));
+					if (dumpTree == null) {
+						return new NanoHTTPD.Response(HTTP_NOTFOUND, "application/json;charset=utf-8", "{}");	
+					}
+					else {
+						return new NanoHTTPD.Response(HTTP_OK, "application/json;charset=utf-8", JSONUtils.asJson(dumpTree));	
+					}
+					
+					
 				}
 
 				

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

@@ -297,6 +297,7 @@ public class UIQueryUtils {
 	
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public static Map<?,?> mapWithElAsNull(Map<?,?> dump) {
+		if (dump == null) return null;
 		HashMap result = new HashMap(dump);
 		result.put("el",null);
 		return result;
@@ -330,9 +331,15 @@ public class UIQueryUtils {
 		List<View> currentChildren = dummyQuery.rootViews(); 
 				
 		for (Integer i:path) {
-			View child = currentChildren.get(i);		
-			currentView = serializeViewToDump(child);
-			currentChildren = UIQueryUtils.subviews(child);						
+			if (i < currentChildren.size()) {
+				View child = currentChildren.get(i);		
+				currentView = serializeViewToDump(child);
+				currentChildren = UIQueryUtils.subviews(child);	
+			}
+			else {
+				return null;				
+			}
+									
 		}
 		
 		return currentView;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.7.pre3
+  version: 0.4.7.pre4
 platform: ruby
 authors:
 - Jonas Maturana Larsen