calabash-android 0.4.7.pre6 → 0.4.7.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f28eb28ec866b329c88e7c787ac91551410ea33b
-  data.tar.gz: 2b85d6336c441215ba145e963b3352229b0dab44
+  metadata.gz: cef60c767cc5d65fbe92b152d074a39110485815
+  data.tar.gz: 2176ececc5a8775c25c273459c7365b72a63e9db
 SHA512:
-  metadata.gz: ac8852103ceea8b6fd8fed633d9b36956360c34eda2066173c51cb6b49ae005bc2fb829f6327998a67138ddb5556f182248d024112808ff223e395a7837f9f9e
-  data.tar.gz: c509f28838e69cec4b4e94e633b42eebfe6cbc7b73c04881fe5d9ff26c7a658594e8cad6122eac785e17455f640c4d5cdbc126fb9a86ec8cdec9e33920ac9c42
+  metadata.gz: 7d2f70bebaf738c050561bf42b9fd0be6853496270b546f9fb326e00de49bcd9dd42f5b0cfc8a9b33e8312c785553d8c1d6001e9eb419849c8fe3ad8a89fa36d
+  data.tar.gz: f819d4a18a951b5264fb7e6a17786a98faed5f07efd0b164f7e8db4b49dc033bc658e75155ae217f62b169f7051e04eea4bf0e1164b18d9bb1f5a497e9446a5a

data/lib/calabash-android/helpers.rb

@@ -28,22 +28,14 @@ end
 def manifest(app)
   out_path = manifest_path(app)
   manifest_file = File.join(out_path, 'AndroidManifest.xml')
-
-  if File.exist?(manifest_file)
-    return File.read(manifest_file)
-  end
-
-  manifest_extractor = File.join(File.expand_path(File.dirname(__FILE__)),'lib', 'apktool-cli-1.5.3-SNAPSHOT.jar')
-  output = `java -jar "#{manifest_extractor}" d -s "#{app}" #{out_path} &> .calabash.extract.out`
-  unless File.size?(manifest_file)
-    f =  File.size?('.calabash.extract.out') ? File.read('.calabash.extract.out') : ''
-    raise ("Unable to extract manifest: #{output}\n#{f}")
-  else
-    output = File.read(manifest_file)
+  unless File.exist?(manifest_file)
+    manifest_extractor = File.join(File.expand_path(File.dirname(__FILE__)),'lib', 'apktool-cli-1.5.3-SNAPSHOT.jar')
+    output = `java -jar "#{manifest_extractor}" d -s "#{app}" #{out_path} 2>&1`
+    raise "Unable to extract manifest: #{output}" unless File.size?(manifest_file)
+    # Tidy up a bit. It would be nice if apktool could just dump the manifest alone.
+    FileUtils.rm_rf(%w{res assets classes.dex}.map {|f| File.join(out_path, f) })
   end
-
-  output
-
+  File.read(manifest_file)
 end
 
 def checksum(file_path)

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.7.pre6"
+    VERSION = "0.4.7.pre7"
   end
 end

data/test-server/build.xml

@@ -76,10 +76,10 @@
          source="1.6"
          target="1.6"
          debug="true"
+         includeantruntime="false"
 	       bootclasspathref="android.target.classpath"
 	       classpath="${extensible.classpath}"
-	       classpathref="jar.libs.ref">
-      </javac>
+	       classpathref="jar.libs.ref" />
     </target>
 
 

data/test-server/instrumentation-backend/.classpath

@@ -7,8 +7,5 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="lib" path="libs/robotium-solo-4.1.jar"/>
-	<classpathentry kind="lib" path="libs/jackson-core-2.2.0-rc2-20130420.041001-2.jar"/>
-	<classpathentry kind="lib" path="libs/jackson-databind-2.2.0-rc2-20130422.041053-3.jar"/>
-	<classpathentry kind="lib" path="libs/jackson-annotations-2.2.0-rc2-20130418.042013-1.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

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

@@ -20,12 +20,11 @@ import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.Result;
 import sh.calaba.instrumentationbackend.json.JSONUtils;
 import sh.calaba.instrumentationbackend.query.Query;
+import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
 import android.graphics.Bitmap;
 import android.util.Log;
 import android.view.View;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 public class HttpServer extends NanoHTTPD {
 	private static final String TAG = "InstrumentationBackend";
 	private boolean running = true;

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

@@ -36,7 +36,7 @@ public class WaitForProgress implements Action {
     private int numberOfVisibleProgressBars() {
         int visibleProgressBars = 0;
         for (ProgressBar v : InstrumentationBackend.solo.getCurrentViews(ProgressBar.class)) {
-            if (v != null & v.getVisibility() != View.GONE && v.getVisibility() != View.INVISIBLE) {
+            if (v != null & v.getVisibility() != View.GONE && v.getVisibility() != View.INVISIBLE && v.isShown()) {
                 visibleProgressBars++;
                 System.out.println("Found visible progressbar number:" + visibleProgressBars);
             }

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

@@ -10,10 +10,9 @@ 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.webkit.WebView;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 public class QueryHelper {
 
 	

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/json/JSONUtils.java

@@ -3,7 +3,7 @@ package sh.calaba.instrumentationbackend.json;
 import java.io.IOException;
 import java.util.Map;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
 
 public class JSONUtils {
 

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

@@ -3,7 +3,7 @@ package sh.calaba.instrumentationbackend.query;
 import java.io.IOException;
 import java.util.List;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
 
 public class QueryResult {
 

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

@@ -22,6 +22,8 @@ import sh.calaba.instrumentationbackend.query.CompletedFuture;
 import sh.calaba.instrumentationbackend.query.Query;
 import sh.calaba.instrumentationbackend.query.ViewMapper;
 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.view.View;
 import android.webkit.WebView;
@@ -29,14 +31,10 @@ import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.TextView;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
+public class UIQueryUtils {
 
-public class UIQueryUtils {	
-	
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public static List subviews(Object o)
-	{
+	public static List subviews(Object o) {
 		try {
 			Method getChild = o.getClass().getMethod("getChildAt", int.class);
 			getChild.setAccessible(true);
@@ -44,87 +42,77 @@ public class UIQueryUtils {
 			getChildCount.setAccessible(true);
 			List result = new ArrayList(8);
 			int childCount = (Integer) getChildCount.invoke(o);
-			for (int i=0;i<childCount;i++)
-			{
+			for (int i = 0; i < childCount; i++) {
 				result.add(getChild.invoke(o, i));
 			}
 			return result;
-			
-		} catch (NoSuchMethodException e) {			
+
+		} catch (NoSuchMethodException e) {
 			return Collections.EMPTY_LIST;
-		} catch (IllegalArgumentException e) {			
+		} catch (IllegalArgumentException e) {
 			return Collections.EMPTY_LIST;
-		} catch (IllegalAccessException e) {			
+		} catch (IllegalAccessException e) {
 			return Collections.EMPTY_LIST;
 		} catch (InvocationTargetException e) {
 			return Collections.EMPTY_LIST;
 		}
-		
+
 	}
-	
+
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public static List parents(Object o)
-	{
+	public static List parents(Object o) {
 		try {
-			
+
 			Method getParent = o.getClass().getMethod("getParent");
 			getParent.setAccessible(true);
-			
+
 			List result = new ArrayList(8);
 			try {
-				while (true)
-				{
+				while (true) {
 					Object parent = getParent.invoke(o);
-					if (parent == null)
-					{
+					if (parent == null) {
 						return result;
-					}
-					else 
-					{
+					} else {
 						result.add(parent);
 					}
-					o = 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;
-			}
+
+		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" })
@@ -137,56 +125,68 @@ public class UIQueryUtils {
 	}
 
 	private static String captitalize(String propertyName) {
-		return propertyName.substring(0,1).toUpperCase() + propertyName.substring(1);
+		return propertyName.substring(0, 1).toUpperCase()
+				+ propertyName.substring(1);
 	}
 
-	public static Object getProperty(Object receiver, Method m) {		
+	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) { 
+		} catch (InvocationTargetException e) {
 			throw new RuntimeException(e);
 		}
 	}
 
 	public static boolean isVisible(Object v) {
-		if (!(v instanceof View)) { return true; }		
+		if (!(v instanceof View)) {
+			return true;
+		}
 		View view = (View) v;
 
-        if (view.getHeight() == 0 || view.getWidth() == 0) {
-            return false;
-        }
+		if (view.getHeight() == 0 || view.getWidth() == 0) {
+			return false;
+		}
 
 		return view.isShown() && viewFetcher.isViewSufficientlyShown(view);
 	}
 
+	public static boolean isClickable(Object v) {
+		if (!(v instanceof View)) {
+			return true;
+		}
+		View view = (View) v;
+
+		return view.isClickable();
+	}
+
 	public static String getId(View view) {
 		return ViewMapper.getIdForView(view);
 	}
 
 	@SuppressWarnings("rawtypes")
-	public static Future evaluateAsyncInMainThread(final Callable callable) throws Exception {
+	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() {			
+
+		InstrumentationBackend.instrumentation.runOnMainSync(new Runnable() {
 			@SuppressWarnings("unchecked")
 			public void run() {
 				try {
 					Object res = callable.call();
 					if (res instanceof Future) {
 						result.set((Future) res);
-					}
-					else {
+					} else {
 						result.set(new CompletedFuture(res));
 					}
 				} catch (Exception e) {
 					errorResult.set(e);
-				}			
-			}			
+				}
+			}
 		});
 		if (result.get() == null) {
 			throw errorResult.get();
@@ -197,30 +197,33 @@ public class UIQueryUtils {
 	@SuppressWarnings("rawtypes")
 	public static Object evaluateSyncInMainThread(Callable callable) {
 		try {
-			return evaluateAsyncInMainThread(callable).get(10, TimeUnit.SECONDS);
+			return evaluateAsyncInMainThread(callable)
+					.get(10, TimeUnit.SECONDS);
 		} catch (RuntimeException e) {
 			throw e;
-		}
-		catch (Exception 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) {
+	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);
+					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);
 					}
@@ -228,24 +231,23 @@ public class UIQueryUtils {
 				} catch (Exception igored) {
 					try {
 						Map resultAsMap = new ObjectMapper().readValue(
-											jsonResponse,
-											new TypeReference<HashMap>() {});
-						//This usually happens in case of error
-						//check this case
+								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);		
+						throw new RuntimeException(e);
 					}
-					
-					
-				}		
+
+				}
 			}
 		});
-		
+
 	}
 
 	public static Object parseValue(CommonTree val) {
@@ -254,7 +256,7 @@ public class UIQueryUtils {
 			String textWithPings = val.getText();
 			String text = textWithPings
 					.substring(1, textWithPings.length() - 1);
-            text = text.replaceAll("\\\\'", "'");
+			text = text.replaceAll("\\\\'", "'");
 			return text;
 		}
 		case UIQueryParser.INT:
@@ -274,147 +276,141 @@ public class UIQueryUtils {
 
 	}
 
-/*
- * 
-{"rect"=>{"x"=>0, "y"=>0, "width"=>768, "height"=>1024},
- "hit-point"=>{"x"=>384, "y"=>512},
- "id"=>"",
- "action"=>false,
- "enabled"=>1,
- "visible"=>1,
- "value"=>nil,
- "type"=>"[object UIAWindow]",
- "name"=>nil,
- "label"=>nil,
- "children"=> [(samestructure)*]
-  
- */
-	public static Map<?,?> dump() 
-	{
-		Query dummyQuery = new Query("not_used");	
-				
+	/*
+	 * 
+	 * {"rect"=>{"x"=>0, "y"=>0, "width"=>768, "height"=>1024},
+	 * "hit-point"=>{"x"=>384, "y"=>512}, "id"=>"", "action"=>false,
+	 * "enabled"=>1, "visible"=>1, "value"=>nil, "type"=>"[object UIAWindow]",
+	 * "name"=>nil, "label"=>nil, "children"=> [(samestructure)*]
+	 */
+	public static Map<?, ?> dump() {
+		Query dummyQuery = new Query("not_used");
+
 		return dumpRecursively(emptyRootView(), dummyQuery.rootViews());
 	}
-	
+
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public static Map<?,?> mapWithElAsNull(Map<?,?> dump) {
-		if (dump == null) return null;
+	public static Map<?, ?> mapWithElAsNull(Map<?, ?> dump) {
+		if (dump == null)
+			return null;
 		HashMap result = new HashMap(dump);
-		result.put("el",null);
+		result.put("el", null);
 		return result;
 	}
 
-	
-		
 	@SuppressWarnings({ "rawtypes", "unchecked" })
-	protected static Map<?,?> dumpRecursively(Map parentView,List<View> children)
-	{
+	protected static Map<?, ?> dumpRecursively(Map parentView,
+			List<View> children) {
 		ArrayList childrenArray = new ArrayList(32);
-		for (int i=0;i<children.size();i++) {
+		for (int i = 0; i < children.size(); i++) {
 			View view = children.get(i);
 			Map serializedChild = serializeViewToDump(view);
-			List<Integer> childPath = new ArrayList<Integer>((List) parentView.get("path"));
+			List<Integer> childPath = new ArrayList<Integer>(
+					(List) parentView.get("path"));
 			childPath.add(i);
-			serializedChild.put("path", childPath);			
-			childrenArray.add(dumpRecursively(serializedChild, UIQueryUtils.subviews(view)));
+			serializedChild.put("path", childPath);
+			childrenArray.add(dumpRecursively(serializedChild,
+					UIQueryUtils.subviews(view)));
 		}
-			
+
 		parentView.put("children", childrenArray);
-		
+
 		return parentView;
 	}
 
 	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public static Map<?,?> dumpByPath(List<Integer> path) {
+	public static Map<?, ?> dumpByPath(List<Integer> path) {
 		Query dummyQuery = new Query("not_used");
-		
+
 		Map currentView = emptyRootView();
-		List<View> currentChildren = dummyQuery.rootViews(); 
-				
-		for (Integer i:path) {
+		List<View> currentChildren = dummyQuery.rootViews();
+
+		for (Integer i : path) {
 			if (i < currentChildren.size()) {
-				View child = currentChildren.get(i);		
+				View child = currentChildren.get(i);
 				currentView = serializeViewToDump(child);
-				currentChildren = UIQueryUtils.subviews(child);	
-			}
-			else {
-				return null;				
+				currentChildren = UIQueryUtils.subviews(child);
+			} else {
+				return null;
 			}
-									
+
 		}
-		
+
 		return currentView;
 	}
-	
+
 	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public static Map<?,?> serializeViewToDump(View view) {
-		if (view == null) {return null;}
-		
+	public static Map<?, ?> serializeViewToDump(View view) {
+		if (view == null) {
+			return null;
+		}
+
 		Map m = new HashMap();
-		
-		m.put("id",getId(view));
-		m.put("el",view);
-		
+
+		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("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));									
+		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 List<String> elementEntryTypes(View view) {
-		if (view instanceof TextView)
-		{
-			TextView textView = (TextView) view;				
-			return mapTextViewInputTypes(textView.getInputType());	
+		if (view instanceof TextView) {
+			TextView textView = (TextView) view;
+			return mapTextViewInputTypes(textView.getInputType());
 		}
 		return null;
-		
+
 	}
 
 	public static List<String> mapTextViewInputTypes(int inputType) {
 		List<String> inputTypes = new ArrayList<String>();
-		if (inputTypeHasTrait(inputType, InputType.TYPE_TEXT_VARIATION_PASSWORD) || inputTypeHasTrait(inputType, InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD)) {
+		if (inputTypeHasTrait(inputType, InputType.TYPE_TEXT_VARIATION_PASSWORD)
+				|| inputTypeHasTrait(inputType,
+						InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD)) {
 			inputTypes.add("password");
 		}
 		if (inputTypeHasTrait(inputType, InputType.TYPE_CLASS_NUMBER)) {
 			inputTypes.add("numeric");
 		}
 		inputTypes.add(String.valueOf(inputType));
-		
-		return inputTypes;	
+
+		return inputTypes;
 	}
 
-	private static boolean inputTypeHasTrait(int inputType,
-			int inputTypeTrait) {
+	private static boolean inputTypeHasTrait(int inputType, int inputTypeTrait) {
 		return (inputType & inputTypeTrait) != 0;
 	}
 
-	private static Object getNameForView(View view) 
-	{
+	private static Object getNameForView(View view) {
 		Object result = null;
-		Method hintMethod = hasProperty(view,"hint");
-		if (hintMethod!=null)
-		{
-			result = getProperty(view, hintMethod);			
+		Method hintMethod = hasProperty(view, "hint");
+		if (hintMethod != null) {
+			result = getProperty(view, hintMethod);
+		}
+		if (result != null) {
+			return result.toString();
+		}
+		Method textMethod = hasProperty(view, "text");
+		if (textMethod != null) {
+			result = getProperty(view, textMethod);
 		}
-		if (result != null) {return result.toString();}
-		Method textMethod = hasProperty(view,"text");
-		if (textMethod!=null)
-		{
-			result = getProperty(view, textMethod);			
+		if (result != null) {
+			return result.toString();
 		}
-		if (result != null) {return result.toString();}
-		
+
 		return null;
 	}
 
@@ -422,12 +418,10 @@ public class UIQueryUtils {
 		if (view instanceof Button) {
 			Button b = (Button) view;
 			return b.getText().toString();
-		}
-		else if (view instanceof CheckBox) {
+		} else if (view instanceof CheckBox) {
 			CheckBox c = (CheckBox) view;
 			return c.isChecked();
-		}
-		else if (view instanceof TextView) {
+		} else if (view instanceof TextView) {
 			TextView t = (TextView) view;
 			return t.getText().toString();
 		}
@@ -435,36 +429,23 @@ public class UIQueryUtils {
 	}
 
 	/*
-	 * function action(el)
-    {
-        var normalized = normalize(el);
-        if (!normalized) {
-            return false;
-        }
-        if (normalized instanceof UIAButton) {
-            return {
-                "type":'touch',
-                "gesture":'tap'
-            };
-        }
-        //TODO MORE
-        return false;
-    }
+	 * function action(el) { var normalized = normalize(el); if (!normalized) {
+	 * return false; } if (normalized instanceof UIAButton) { return {
+	 * "type":'touch', "gesture":'tap' }; } //TODO MORE return false; }
 	 */
 	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public static Map<?,?> actionForView(View view) 
-	{
+	public static Map<?, ?> actionForView(View view) {
 		Map result = null;
-		if (view instanceof android.widget.Button || view instanceof android.widget.ImageButton) {
+		if (view instanceof android.widget.Button
+				|| view instanceof android.widget.ImageButton) {
 			result = new HashMap();
-			result.put("type","touch");
-			result.put("gesture","tap");
+			result.put("type", "touch");
+			result.put("gesture", "tap");
 		}
-		
-		//TODO: obviously many more!
+
+		// TODO: obviously many more!
 		return result;
-		
-		
+
 	}
 
 	@SuppressWarnings({ "rawtypes", "unchecked" })
@@ -475,24 +456,24 @@ public class UIQueryUtils {
 		return hitPoint;
 	}
 
-	@SuppressWarnings({"unchecked", "rawtypes", "serial"})
-	private static Map<?,?> emptyRootView() {		
-		return new HashMap() {{				
-			put("id",null);
-			put("el",null);			
-			put("rect",null);
-			put("hit-point",null);
-			put("action",false);
-			put("enabled",false);
-			put("visible",true);
-			put("value",null);
-			put("path",new ArrayList<Integer>());			
-			put("type","[object CalabashRootView]");
-			put("name",null);
-			put("label",null);									
-		}};
+	@SuppressWarnings({ "unchecked", "rawtypes", "serial" })
+	private static Map<?, ?> emptyRootView() {
+		return new HashMap() {
+			{
+				put("id", null);
+				put("el", null);
+				put("rect", null);
+				put("hit-point", null);
+				put("action", false);
+				put("enabled", false);
+				put("visible", true);
+				put("value", null);
+				put("path", new ArrayList<Integer>());
+				put("type", "[object CalabashRootView]");
+				put("name", null);
+				put("label", null);
+			}
+		};
 	}
 
-	
-
 }