calabash-android 0.4.9.pre3 → 0.4.9.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7382b7dab96dabda3ddc20acc43dcf35dd064673
-  data.tar.gz: db95474aa5d4d4a16e5226da72c1e961d880666e
+  metadata.gz: 702c76c045cbcad44d7eb7ea4d54ef0f53d655fb
+  data.tar.gz: 99eefccf4f0b8cbb1ffc44235765c9864ee4d5ff
 SHA512:
-  metadata.gz: 066c58155a9d3e3c0a63384340c0e2998fa19fdb75521ccbb0020bfd12acd2e316fb519a0da7400ee024bb150ae1bea0d63f3ab0e4a8d58b7f69e55e9f64d9d0
-  data.tar.gz: fe8ccf72731d38737eadccc1ee3ab10535f3e3c44098e409f49081d092b6d45abff9bf2112a8b5dcb9d5815584f6ffe5df4bab27db03deb1b97df7b5082f48b7
+  metadata.gz: 44cf3bdff8af50d4e7d7cf571188710d9738ceb0a3eb9d43955bf620b7b9f890a94fa246bfd7e52fdff310222a10ebafd77113e0ee7ebe171a3c0cb78814aa26
+  data.tar.gz: faf828a1d13f7cdf9588c1ede14e5405c2f32e327e269c9140bb08734d476629be569de2dad5c2223b87a6404d7260874e53efeb7152a07776b9bb5ea7217552

data/lib/calabash-android/helpers.rb

@@ -89,7 +89,7 @@ def sign_apk(app_path, dest_path)
     jarsigner_path = "jarsigner"
   end
 
-  cmd = "#{jarsigner_path} -sigalg MD5withRSA -digestalg SHA1 -signedjar #{dest_path} -storepass #{keystore["keystore_password"]} -keystore #{keystore["keystore_location"]} #{app_path} #{keystore["keystore_alias"]}"
+  cmd = "#{jarsigner_path} -sigalg MD5withRSA -digestalg SHA1 -signedjar #{dest_path} -storepass #{keystore["keystore_password"]} -keystore #{keystore["keystore_location"]} \"#{app_path}\" #{keystore["keystore_alias"]}"
   log cmd
   unless system(cmd)
     puts "jarsigner command: #{cmd}"
@@ -172,7 +172,7 @@ def fingerprint_from_apk(app_path)
       raise "No RSA file found in META-INF. Cannot proceed." if rsa_files.empty?
       raise "More than one RSA file found in META-INF. Cannot proceed." if rsa_files.length > 1
 
-      cmd = "#{keytool_path} -v -printcert -file #{rsa_files.first}"
+      cmd = "#{keytool_path} -v -printcert -file \"#{rsa_files.first}\""
       log cmd
       fingerprints = `#{cmd}`
       md5_fingerprint = extract_md5_fingerprint(fingerprints)

data/lib/calabash-android/version.rb

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

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

@@ -0,0 +1,63 @@
+package sh.calaba.instrumentationbackend.query.ast;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import sh.calaba.instrumentationbackend.actions.webview.CalabashChromeClient.WebFuture;
+
+@SuppressWarnings("rawtypes")
+public class DoubleFuture implements Future {
+
+	private final WebFuture f1;
+	private final WebFuture f2;
+
+	public DoubleFuture(WebFuture f1, WebFuture f2) {
+		this.f1 = f1;
+		this.f2 = f2;
+	}
+
+	@Override
+	public boolean cancel(boolean mayInterruptIfRunning) {
+		return f1.cancel(mayInterruptIfRunning) && f2.cancel(mayInterruptIfRunning);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	@Override
+	public Object get() throws InterruptedException, ExecutionException {
+		Object o1 = f1.get();
+		Object o2 = f2.get();
+		
+		List res = new ArrayList();
+		res.add(o1);
+		res.add(o2);
+		return res;
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	@Override
+	public Object get(long timeout, TimeUnit unit) throws InterruptedException,
+			ExecutionException, TimeoutException {
+		Object o1 = f1.get(timeout, unit); ///this is actually double timeout
+		Object o2 = f2.get(timeout, unit);
+		
+		List res = new ArrayList();
+		res.add(o1);
+		res.add(o2);
+		return res;
+	}
+
+	@Override
+	public boolean isCancelled() {
+		return f1.isCancelled() || f2.isCancelled();
+	}
+
+	@Override
+	public boolean isDone() {
+		return f1.isDone() && f2.isDone();
+	}
+
+}

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

@@ -7,8 +7,10 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -35,6 +37,14 @@ import android.widget.TextView;
 
 public class UIQueryUtils {
 
+	private static final Set<String> DOM_TEXT_TYPES;
+	static {
+		DOM_TEXT_TYPES = new HashSet<String>();
+		DOM_TEXT_TYPES.add("email");
+		DOM_TEXT_TYPES.add("text");
+		DOM_TEXT_TYPES.add("");
+	}
+
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public static List subviews(Object o) {
 		
@@ -415,33 +425,33 @@ public class UIQueryUtils {
 			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("hit-point", hitPoint);			
 			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);
+			map.put("children", Collections.EMPTY_LIST);
+			String html = (String)map.get("html");
+			String nodeName = (String) map.get("nodeName");			
+			if (nodeName != null && nodeName.toLowerCase().equals("input")) {				
+				String domType = extractDomType(html);
+				if (isDomPasswordType(domType)) {
+					map.put("entry_types", Collections.singletonList("password"));
+				}
+				else if (isDomTextType(domType)) {
+					map.put("entry_types", Collections.singletonList("text"));
+				} 
+				else {
+					map.put("entry_types", Collections.emptyList());	
+				}					
+				map.put("value", extractAttribute(html, "value"));
+				map.put("type", "dom");
+				map.put("name", extractAttribute(html, "name"));
+				map.put("label", extractAttribute(html, "title"));
+			}					
+						
 			return map;	
 			
 		}
@@ -474,8 +484,27 @@ public class UIQueryUtils {
 		
 	}
 
-	public static String extractDomType(String string) {
-		String[] split = string.split("type=");
+	private static boolean isDomTextType(String domType) {
+		if (domType == null) {
+			return true;
+		}
+		return DOM_TEXT_TYPES.contains(domType);
+	}
+
+	private static boolean isDomPasswordType(String domType) {		
+		return "password".equalsIgnoreCase(domType);
+	}
+
+	// naive implementation only works for (valid) input tags
+	public static String extractDomType(String input) {
+		return extractAttribute(input, "type");		
+	}
+	
+	public static String extractAttribute(String input, String attribute) {
+		String[] split = input.split(attribute+"=");
+		if (split.length == 1) {
+			split = input.split(attribute+" =");			
+		}
 		if (split.length > 1) {
 			String lastPart = split[1];
 			if (lastPart == null) {
@@ -500,6 +529,8 @@ public class UIQueryUtils {
 		
 	}
 
+
+
 	public static List<String> elementEntryTypes(View view) {
 		if (view instanceof TextView) {
 			TextView textView = (TextView) view;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.9.pre3
+  version: 0.4.9.pre4
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -422,6 +422,7 @@ files:
 - 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/DoubleFuture.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