testautoa 0.4.0 → 0.4.1

data/test-server/instrumentation-backend/antlr/UIQuery.g

@@ -12,23 +12,66 @@ options {
     package sh.calaba.instrumentationbackend.query.antlr;
 }
 
+@lexer::members {
+  public String getErrorMessage(RecognitionException e, String[] tokenNames)
+  {
+    List stack = getRuleInvocationStack(e, this.getClass().getName());
+    String msg = null;
+    if ( e instanceof NoViableAltException ) {
+      NoViableAltException nvae = (NoViableAltException)e;
+      msg = " no viable alt; token="+e.token+" (decision="+nvae.decisionNumber+" state "+nvae.stateNumber+")"+" decision=<<"+nvae.grammarDecisionDescription+">>";
+      throw new RuntimeException(msg, e);
+    }
+    else {
+    msg = super.getErrorMessage(e, tokenNames);
+    }
+    return stack+" "+msg;
+  }
+  public String getTokenErrorDisplay(Token t) {
+    return t.toString();
+  }
+}
 
 query	:	expr (WHITE! expr)*  
 		;
 	
 
-expr	:	(className | filter) 
+expr	:	(className | filter | visibility | predicate | DIRECTION^) 
+		;
+		
+DIRECTION : 'descendant' | 'child' | 'parent' | 'sibling'
 		;
 
-className   :   (NAME^ | QUALIFIED_NAME^);
+className   :   (WILDCARD^ | NAME^ | QUALIFIED_NAME^);
+
+WILDCARD : '*';
 
 QUALIFIED_NAME : NAME ('.' NAME)+;
 
+visibility   :   (ALL^ | VISIBLE^);
+
+ALL : 'all';
+
+VISIBLE : 'visible';
+
+
 filter : NAME FILTER_COLON^ (INT | STRING | BOOL | NIL);
 
 FILTER_COLON  : ':'
 	;
 
+predicate : BEGINPRED^ NAME WHITE! RELATION WHITE! (INT | STRING | BOOL | NIL) ENDPRED!
+	;
+BEGINPRED : '{'
+	;
+ENDPRED	  : '}'
+	;
+	
+RELATION : | '=' | '>' | '>=' | '<' | '<=' | 
+			(( 'BEGINSWITH' | 'ENDSWITH' | 'CONTAINS' | 'LIKE' 
+		       | 'beginswith' | 'endswith' | 'contains' | 'like') ('[' ('a'..'z' | 'A'..'Z')* ']')?)
+		       
+	; 
 
 INT :	'0'..'9'+
     ;
@@ -43,16 +86,16 @@ NAME  :	('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'0'..'9'|'_')*
     ;
 
 STRING
-    :  '\'' ( ESC_SEQ | ~('\\'|'"') )* '\''
+    :  '\'' ( ESC_SEQ | ~('\\'|'\'') )* '\''
     ;
 
-WHITE   :	' '* ;
+WHITE   :	' '+ ;
 fragment
 HEX_DIGIT : ('0'..'9'|'a'..'f'|'A'..'F') ;
 
 fragment
 ESC_SEQ
-    :   '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\')
+    :   '\\' ('b'|'t'|'n'|'f'|'r'|'\''|'\\')
     |   UNICODE_ESC
     |   OCTAL_ESC
     ;

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

@@ -44,8 +44,9 @@ public class Command {
 
     public Result execute() {
         final Action action = InstrumentationBackend.actions.lookup(getCommand());
-
-        if ( Looper.getMainLooper().getThread() != Thread.currentThread()) {
+        return action.execute(getArguments());
+        /*
+        if ( Looper.getMainLooper().getThread() == Thread.currentThread()) {
             return action.execute(getArguments());
         }
 
@@ -57,7 +58,7 @@ public class Command {
             }
         });
         return result.get();
-
+*/
     }
 
 }

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

@@ -0,0 +1,95 @@
+package sh.calaba.instrumentationbackend;
+
+import java.io.CharArrayWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
+
+/**
+ * Represents a response in the Frankly protocol.
+ * This protocol is a JSON over HTTP protocol which is
+ * used across Calabash iOS, Calabash Android and Frank.
+ * @author krukow
+ * @see https://github.com/moredip/Frank/blob/master/doc/frankly.md
+ *
+ */
+public class FranklyResult {
+	
+    final boolean success;
+    final String reason;
+    final String detail;
+    @SuppressWarnings("rawtypes")
+	final List results;
+        
+
+	@SuppressWarnings({ "rawtypes" })
+	public FranklyResult(boolean success, List results, String reason,
+			String detail) {
+		super();
+		this.success = success;
+		this.results = results;		
+		this.reason = reason;
+		this.detail = detail;
+	}
+
+	public static FranklyResult fromThrowable(Throwable t) {
+    	CharArrayWriter caw = new CharArrayWriter();
+    	t.printStackTrace(new PrintWriter(caw));		
+		return new FranklyResult(false,Collections.EMPTY_LIST,t.getMessage(),caw.toString());
+    }
+    
+    public static FranklyResult emptyResult() {
+    	return new FranklyResult(true,Collections.EMPTY_LIST,null,null);
+    }
+
+    public static FranklyResult failedResult(String message,String detail) {
+        return new FranklyResult(false,Collections.EMPTY_LIST,message,detail);
+    }
+    
+    public String asJson() {
+        ObjectMapper mapper = new ObjectMapper();
+
+        try {        	
+            return mapper.writeValueAsString(asMap());
+        } catch (IOException e) {
+            throw new RuntimeException("Could not convert result to json", e);
+        }
+    }
+
+	public Map<String,Object> asMap() 
+	{
+		Map<String,Object> result = new HashMap<String, Object>();
+		result.put("outcome", this.success ? "SUCCESS" : "ERROR");
+		
+		if (this.success) 
+		{
+			result.put("results",this.results);	
+		}
+		else 
+		{
+			result.put("reason", this.reason);
+			if (this.detail != null)
+			{
+				result.put("detail", this.detail);
+			}						
+		}
+		return result;
+	}
+
+	@Override
+	public String toString() 
+	{
+		return "FranklyResult [success=" + success + ", reason=" + reason
+				+ ", details=" + detail + ", results=" + results + "]";
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static FranklyResult successResult(List result) {
+		return new FranklyResult(true, result, null,null);
+	}    
+}

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

@@ -22,7 +22,13 @@ public class Result {
 		this.success = success;
 		this.message = message;
     }
-    
+
+    public Result(boolean success, List<String> messages) {
+		this.success = success;
+		this.message = null;
+		this.bonusInformation = messages;
+    }
+
     public String getMessage() {
     	return message;
     }

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

@@ -14,13 +14,13 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import sh.calaba.instrumentationbackend.Command;
+import sh.calaba.instrumentationbackend.FranklyResult;
 import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.Result;
 import sh.calaba.instrumentationbackend.query.Query;
 import sh.calaba.instrumentationbackend.query.QueryResult;
 import sh.calaba.org.codehaus.jackson.map.DeserializationConfig.Feature;
 import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
-import sh.calaba.org.codehaus.jackson.type.TypeReference;
 import android.graphics.Bitmap;
 import android.util.Log;
 import android.view.View;
@@ -75,6 +75,7 @@ public class HttpServer extends NanoHTTPD {
 			return new NanoHTTPD.Response(HTTP_OK, MIME_HTML, "pong");
 
 		} else if (uri.endsWith("/map")) {
+			FranklyResult errorResult = null;
 			try {
 				String commandString = params.getProperty("json");
 				ObjectMapper mapper = new ObjectMapper();
@@ -85,39 +86,23 @@ public class HttpServer extends NanoHTTPD {
 				String methodName = (String) op.get("method_name");
 				List arguments = (List) op.get("arguments");
 				
+				//For now we only support query and query_all
+				//query_all includes also invisible views, while query filters them
+				boolean includeInVisible = "query_all".equals(methodName);
 				
 				
-				
-
-				System.out.println(methodName);
-				System.out.println(uiQuery);
-				System.out.println(arguments);
-				
-				QueryResult queryResult = new Query(uiQuery,arguments).execute();
-				
+				List queryResult = new Query(uiQuery,arguments).executeQuery();
 
-				return new NanoHTTPD.Response(HTTP_OK, "application/json;charset=utf-8",
-						queryResult.asJson());
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
+				return new NanoHTTPD.Response(HTTP_OK, "application/json;charset=utf-8", 
+						FranklyResult.successResult(queryResult).asJson());
+			} catch (Exception e ) {
 				e.printStackTrace();
-			}
-
+                errorResult = FranklyResult.fromThrowable(e);
+            }
+            return new NanoHTTPD.Response(HTTP_OK, "application/json;charset=utf-8", errorResult.asJson());
 		} else if (uri.endsWith("/query")) {
-			try {
-				String commandString = params.getProperty("json");
-				ObjectMapper mapper = new ObjectMapper();
-				Map<String, String> command = mapper.readValue(commandString,
-						new TypeReference<Map<String, String>>() {
-						});
-				QueryResult result = new Query(command.get("query")).execute();
-				return new NanoHTTPD.Response(HTTP_OK, MIME_HTML,
-						result.asJson());
-			} catch (IOException e) {
-				e.printStackTrace();
-				return new Response(HTTP_INTERNALERROR, MIME_PLAINTEXT,
-						"Could not parse arguments as JSON");
-			}
+			return new Response(HTTP_BADREQUEST, MIME_PLAINTEXT,
+					"/query endpoint is discontinued - use /map with operation query");
 		} else if (uri.endsWith("/kill")) {
 			lock.lock();
 			try {

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

@@ -0,0 +1,19 @@
+package sh.calaba.instrumentationbackend.actions.activity;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+public class FinishOpenedActivities implements Action {
+
+    @Override
+    public Result execute(String... args) {
+        InstrumentationBackend.solo.finishOpenedActivities();
+        return Result.successResult();
+    }
+
+    @Override
+    public String key() {
+        return "finish_opened_activities";
+    }
+}

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

@@ -0,0 +1,31 @@
+package sh.calaba.instrumentationbackend.actions.activity;
+
+import java.util.ArrayList;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+import android.app.Activity;
+
+public class GetOpenedActivities implements Action {
+
+    @Override
+    public Result execute(String... args) {
+        final ArrayList<Activity> activities = InstrumentationBackend.solo
+                .getAllOpenedActivities();
+        final ArrayList<String> opened = new ArrayList<String>(
+                activities.size());
+
+        for (final Activity activity : activities) {
+            opened.add(activity.getClass().getSimpleName());
+        }
+
+        // opened is attached to bonusInformation
+        return new Result(true, opened);
+    }
+
+    @Override
+    public String key() {
+        return "get_opened_activities";
+    }
+}

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

@@ -0,0 +1,67 @@
+package sh.calaba.instrumentationbackend.actions.activity;
+
+import java.util.ArrayList;
+
+import android.app.Activity;
+import android.view.KeyEvent;
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+import sh.calaba.instrumentationbackend.actions.Actions;
+
+public class GoBackToActivity implements Action {
+
+    @Override
+    public Result execute(String... args) {
+
+        if (args == null) {
+            return Result
+                    .failedResult("Target activity name must not be null.");
+        }
+
+        if (args.length != 1) {
+            return Result.failedResult("Must pass exactly one argument.");
+        }
+
+        if (args[0].trim().length() == 0) {
+            return Result.failedResult("Argument must not be whitespace.");
+        }
+
+        final String targetActivityName = args[0];
+
+        final ArrayList<Activity> activities = InstrumentationBackend.solo
+                .getAllOpenedActivities();
+        boolean success = false;
+
+        final ArrayList<String> opened = new ArrayList<String>(
+                activities.size());
+
+        for (final Activity activity : activities) {
+            final String name = activity.getClass().getSimpleName();
+            if (name.contentEquals(targetActivityName)) {
+                success = true;
+            }
+            opened.add(name);
+        }
+
+        if (!success) {
+            return new Result(false, opened);
+        }
+
+        while (!InstrumentationBackend.solo.getCurrentActivity().getClass()
+                .getSimpleName().contentEquals(targetActivityName)) {
+            try {
+                Actions.parentInstrumentation
+                        .sendKeyDownUpSync(KeyEvent.KEYCODE_BACK);
+            } catch (Exception exception) {
+            }
+        }
+
+        return new Result(true, opened);
+    }
+
+    @Override
+    public String key() {
+        return "go_back_to_activity";
+    }
+}

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

@@ -0,0 +1,28 @@
+package sh.calaba.instrumentationbackend.actions.gestures;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+public class DragCoordinates implements Action {
+
+	@Override
+	public Result execute(String... args) {
+
+		Float fromX = new Float(args[0]);
+		Float fromY = new Float(args[1]);
+		Float toX = new Float(args[2]);
+		Float toY = new Float(args[3]);
+		Integer stepCount = 40;
+
+		InstrumentationBackend.solo.drag(fromX,	toX, fromY,	toY, stepCount);
+
+		return Result.successResult();
+	}
+
+	@Override
+	public String key() {
+		return "drag_coordinates";
+	}
+
+}

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

@@ -1,5 +1,6 @@
 package sh.calaba.instrumentationbackend.actions.gestures;
 
+import android.util.DisplayMetrics;
 import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.Result;
 import sh.calaba.instrumentationbackend.actions.Action;
@@ -11,13 +12,18 @@ public class Swipe implements Action {
     @Override
     public Result execute(String... args) {
         String direction = args[0];
-        if(direction.equalsIgnoreCase("left")) {
-            InstrumentationBackend.solo.scrollToSide(Solo.LEFT);
-        } else {
-            InstrumentationBackend.solo.scrollToSide(Solo.RIGHT);
 
+        if (args.length == 1) {
+            if(direction.equalsIgnoreCase("left")) {
+                InstrumentationBackend.solo.scrollToSide(Solo.LEFT);
+                return Result.successResult();
+            } else if(direction.equalsIgnoreCase("right")) {
+                InstrumentationBackend.solo.scrollToSide(Solo.RIGHT);
+                return Result.successResult();
+            }
+            return Result.failedResult("Invalid direction to swipe: " + direction);
         }
-        return Result.successResult();
+        return Result.failedResult("You must provide a direction. Either 'left' or 'right'");
     }
 
     @Override

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

@@ -10,6 +10,8 @@ import android.location.Location;
 import android.location.LocationManager;
 import android.location.LocationProvider;
 
+import java.lang.reflect.Method;
+
 
 public class FakeGPSLocation implements Action {
 	
@@ -73,15 +75,22 @@ public class FakeGPSLocation implements Action {
     	
     	private void setLocation(LocationManager locationManager, String locationProvider, double latitude, double longitude) {
 
-    		//locationManager.clearTestProviderLocation(locationProvider);
-
     		Location location = new Location(locationProvider);
     		location.setLatitude(latitude);
     		location.setLongitude(longitude);
     		location.setAccuracy(1);
     		location.setTime(System.currentTimeMillis());
 
-    		locationManager.setTestProviderLocation(locationProvider, location);        
+            try {
+                Method makeComplete = Location.class.getMethod("makeComplete");
+                if (makeComplete != null) {
+                    makeComplete.invoke(location);
+                }
+            } catch (Exception e) {
+                //Method only available in Jelly Bean
+            }
+
+            locationManager.setTestProviderLocation(locationProvider, location);
     	}
 
     	public void finish() {
@@ -93,13 +102,7 @@ public class FakeGPSLocation implements Action {
     public String key() {
         return "set_gps_coordinates";
     }
-    
-    /**
-     * Causes error if Device does not support given provider
-     * 
-     * @param provider
-     * @return 
-     */
+
     private boolean doesDeviceProvideGPS() {
     LocationManager locationManager = (LocationManager) InstrumentationBackend.solo.getCurrentActivity().getSystemService(Context.LOCATION_SERVICE);
     if (locationManager.getProvider(LocationManager.GPS_PROVIDER) == null) {

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

@@ -0,0 +1,24 @@
+package sh.calaba.instrumentationbackend.actions.softkey;
+
+
+import com.jayway.android.robotium.solo.Solo;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+
+public class LeftKey implements Action {
+
+    @Override
+    public Result execute(String... args) {
+        InstrumentationBackend.solo.sendKey(Solo.LEFT);
+        return Result.successResult();
+    }
+
+    @Override
+    public String key() {
+        return "send_key_left";
+    }
+
+}

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

@@ -0,0 +1,24 @@
+package sh.calaba.instrumentationbackend.actions.softkey;
+
+
+import com.jayway.android.robotium.solo.Solo;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+
+public class RightKey implements Action {
+
+    @Override
+    public Result execute(String... args) {
+        InstrumentationBackend.solo.sendKey(Solo.RIGHT);
+        return Result.successResult();
+    }
+
+    @Override
+    public String key() {
+        return "send_key_right";
+    }
+
+}

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

@@ -0,0 +1,24 @@
+package sh.calaba.instrumentationbackend.actions.softkey;
+
+
+import com.jayway.android.robotium.solo.Solo;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+
+public class UpKey implements Action {
+
+    @Override
+    public Result execute(String... args) {
+        InstrumentationBackend.solo.sendKey(Solo.UP);
+        return Result.successResult();
+    }
+
+    @Override
+    public String key() {
+        return "send_key_up";
+    }
+
+}

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

@@ -0,0 +1,31 @@
+package sh.calaba.instrumentationbackend.actions.version;
+
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+
+/**
+ * Generated Code.
+ * Do not edit.
+ *
+ */
+public class Version implements Action {
+
+	/******
+	 * Generate Version Number
+	 * DO NOT EDIT
+	 *
+	 */
+	public static final String VERSION="####VERSION####";
+
+	@Override
+    public Result execute(String... args) {
+        return new Result(true,VERSION);
+    }
+
+    @Override
+    public String key() {
+        return "version";
+    }
+
+}