calabash-android 0.4.22.pre4 → 0.5.0.pre1

data/lib/calabash-android/steps/search_steps.rb

@@ -1,7 +1,7 @@
 Then /^I enter "([^\"]*)" into search field$/ do |text|
-  performAction('enter_query_into_numbered_field', text, 1)
+  enter_text("android.widget.SearchView index:0", text)
 end
 
 Then /^I enter "([^\"]*)" into search field number (\d+)$/ do |text, number|
-  performAction('enter_query_into_numbered_field', text, number)
+  enter_text("android.widget.SearchView index:#{number.to_i-1}", text)
 end

data/lib/calabash-android/steps/spinner_steps.rb

@@ -1,3 +1,11 @@
-Then /^I select "([^\"]*)" from "([^\"]*)"$/ do |item_text, spinner_content_description|
-  performAction('select_item_from_named_spinner', spinner_content_description, item_text)
+Then /^I select "([^\"]*)" from "([^\"]*)"$/ do |item_text, spinner_identifier|
+  spinner = query("android.widget.Spinner marked:'#{spinner_identifier}'")
+
+  if spinner.empty?
+    tap_when_element_exists("android.widget.Spinner * marked:'#{spinner_identifier}'")
+  else
+    touch(spinner)
+  end
+
+  tap_when_element_exists("android.widget.PopupWindow$PopupViewContainer * marked:'#{item_text}'")
 end

data/lib/calabash-android/steps/time_picker_steps.rb

@@ -1,8 +1,8 @@
 
 Given /^I set the time to "(\d\d:\d\d)" on TimePicker with index "([^\"]*)"$/ do |time, index|
-  performAction('set_time_with_index', time, index)
+  perform_action('set_time_with_index', time, index)
 end
 
 Given /^I set the "([^\"]*)" time to "(\d\d:\d\d)"$/ do |content_description, time|
-  performAction('set_time_with_description', content_description, time)
+  perform_action('set_time_with_description', content_description, time)
 end

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.22.pre4"
+    VERSION = "0.5.0.pre1"
   end
 end

data/lib/calabash-android/wait_helpers.rb

@@ -83,6 +83,11 @@ module Calabash
         end
       end
 
+      #options for wait_for apply
+      def wait_for_element_exists(uiquery, options={})
+        wait_for_elements_exist([uiquery], options)
+      end
+
       #options for wait_for apply
       def wait_for_elements_exist(elements_arr, options={})
         if elements_arr.is_a?(String) || elements_arr.is_a?(Symbol)
@@ -93,6 +98,12 @@ module Calabash
           elements_arr.all? { |q| element_exists(q) }
         end
       end
+
+      #options for wait_for apply
+      def wait_for_element_do_not_exist(uiquery, options={})
+        wait_for_elements_do_not_exist([uiquery], options)
+      end
+
       #options for wait_for apply
       def wait_for_elements_do_not_exist(elements_arr, options={})
         if elements_arr.is_a?(String)
@@ -167,10 +178,27 @@ module Calabash
         action = { :action => lambda { touch uiquery } }
         opts = DEFAULT_OPTS.merge(action).merge(opts)
         wait_for_elements_exist([uiquery], opts)
-        opts[:action].call
+
+        if opts[:action].parameters.length == 0
+          opts[:action].call
+        else
+          opts[:action].call(uiquery)
+        end
+      end
+
+      def wait_for_text(text, options={})
+        wait_for_element_exists("* {text CONTAINS[c] '#{text}'}", options)
       end
 
+      def wait_for_text_to_disappear(text, options={})
+        wait_for_element_do_not_exist("* {text CONTAINS[c] '#{text}'}", options)
+      end
 
+      def wait_for_activity(activity_name, options={})
+        wait_for(options) do
+          perform_action('get_activity_name')['message'] == activity_name
+        end
+      end
     end
   end
 end

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

@@ -32,13 +32,13 @@ options {
   }
 }
 
-query	:	expr (WHITE! expr)*  
+query	:	expr (WHITE! expr)*
 		;
-	
 
-expr	:	(className | filter | visibility | predicate | DIRECTION^) 
+
+expr	:	(className | filter | visibility | predicate | DIRECTION^)
 		;
-		
+
 DIRECTION : 'descendant' | 'child' | 'parent' | 'sibling'
 		;
 
@@ -66,12 +66,12 @@ BEGINPRED : '{'
 	;
 ENDPRED	  : '}'
 	;
-	
-RELATION : | '=' | '>' | '>=' | '<' | '<=' | 
-			(( 'BEGINSWITH' | 'ENDSWITH' | 'CONTAINS' | 'LIKE' 
+
+RELATION : | '=' | '>' | '>=' | '<' | '<=' | '!=' | '<>' |
+			(( 'BEGINSWITH' | 'ENDSWITH' | 'CONTAINS' | 'LIKE'
 		       | 'beginswith' | 'endswith' | 'contains' | 'like') ('[' ('a'..'z' | 'A'..'Z')* ']')?)
-		       
-	; 
+
+	;
 
 INT :	'0'..'9'+
     ;
@@ -86,8 +86,8 @@ NAME  :	('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'0'..'9'|'_'|'$')*
     ;
 
 STRING
-    :  '\'' ( ESC_SEQ | ~('\\'|'\'') )* '\'' 
-    |  '"' ( DOUBLE_ESC_SEQ | ~('\\'|'"') )* '"'    
+    :  '\'' ( ESC_SEQ | ~('\\'|'\'') )* '\''
+    |  '"' ( DOUBLE_ESC_SEQ | ~('\\'|'"') )* '"'
     ;
 
 WHITE   :	' '+ ;

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

@@ -2,8 +2,8 @@ package sh.calaba.instrumentationbackend;
 
 import java.lang.reflect.Method;
 
-import sh.calaba.instrumentationbackend.actions.HttpServer;
 import android.app.Activity;
+import sh.calaba.instrumentationbackend.actions.HttpServer;
 import android.content.Context;
 import android.os.Bundle;
 import android.test.InstrumentationTestRunner;
@@ -17,6 +17,7 @@ public class CalabashInstrumentationTestRunner extends InstrumentationTestRunner
 			Method  method = c.getDeclaredMethod ("LoadApplication", Context.class, String.class, String[].class);
 			method.invoke (null, context, null, new String[]{context.getApplicationInfo ().sourceDir});
 			System.out.println("Calabash loaded Mono");
+            InstrumentationBackend.mainActivity = Class.forName(arguments.getString("main_activity")).asSubclass(Activity.class);
 		} catch (Exception e) {
 			System.out.println("Calabash did not load Mono. This is only a problem if you are trying to test a Mono application");
 		}
@@ -28,7 +29,7 @@ public class CalabashInstrumentationTestRunner extends InstrumentationTestRunner
         InstrumentationBackend.extras = arguments;
 
         try {
-            InstrumentationBackend.mainActivity = arguments.getString("main_activity");
+            InstrumentationBackend.mainActivityName = arguments.getString("main_activity");
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

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

@@ -24,7 +24,8 @@ import java.util.concurrent.atomic.AtomicReference;
 
 public class InstrumentationBackend extends ActivityInstrumentationTestCase2<Activity> {
     public static String testPackage;
-    public static String mainActivity;
+    public static String mainActivityName;
+    public static Class<? extends Activity> mainActivity;
     public static Bundle extras;
     
     private static final String TAG = "InstrumentationBackend";
@@ -35,13 +36,17 @@ public class InstrumentationBackend extends ActivityInstrumentationTestCase2<Act
     public static Actions actions;
 
     public InstrumentationBackend() {
-        super(null);
+        super((Class<Activity>)mainActivity);
     }
 
     @Override
     public Activity getActivity() {
+        if (mainActivity != null) {
+            return super.getActivity();
+        }
+
         try {
-            setMainActivity(Class.forName(mainActivity).asSubclass(Activity.class));
+            setMainActivity(Class.forName(mainActivityName).asSubclass(Activity.class));
             return super.getActivity();
         } catch (ClassNotFoundException e) {
             throw new RuntimeException(e);
@@ -62,7 +67,7 @@ public class InstrumentationBackend extends ActivityInstrumentationTestCase2<Act
     protected void setUp() throws Exception {
         super.setUp();
         Intent i = new Intent(Intent.ACTION_MAIN);
-        i.setClassName(testPackage, mainActivity);
+        i.setClassName(testPackage, mainActivityName);
         i.addCategory("android.intent.category.LAUNCHER");
         i.putExtras(extras);
         setActivityIntent(i);

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

@@ -6,18 +6,18 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class Result {
-	
+
     boolean success;
     String message;
     List<String> bonusInformation = new ArrayList<String>();
-    	
+
     public Result() {
     }
-    
+
     public Result(boolean success) {
 		this(success, "");
     }
-    
+
     public Result(boolean success, String message) {
 		this.success = success;
 		this.message = message;
@@ -32,19 +32,19 @@ public class Result {
     public String getMessage() {
     	return message;
     }
-    
+
     public void setMessage(String message) {
     	this.message = message;
     }
-    
+
     public boolean isSuccess() {
     	return success;
     }
-    
+
     public void setSuccess(boolean success) {
     	this.success = success;
     }
-    
+
     public void addBonusInformation(String information) {
     	bonusInformation.add(information);
 	}
@@ -52,11 +52,11 @@ public class Result {
     public List<String> getBonusInformation() {
 		return bonusInformation;
 	}
-    
+
     public void setExtras(List<String> bonusInformation) {
 		this.bonusInformation = bonusInformation;
     }
-        
+
     public static Result fromThrowable(Throwable t) {
     	Result r = new Result(false, t.getMessage());
     	CharArrayWriter caw = new CharArrayWriter();
@@ -64,11 +64,15 @@ public class Result {
     	r.addBonusInformation("Exception stack trace:\n" + caw.toString());
     	return r;
     }
-    
+
     public static Result successResult() {
     	return new Result(true);
     }
 
+    public static Result successResult(final String message) {
+        return new Result(true, message);
+    }
+
     public static Result failedResult() {
         return new Result(false);
     }
@@ -76,7 +80,7 @@ public class Result {
     public static Result failedResult(final String message) {
         return new Result(false, message);
     }
-    
+
     public String toString() {
         return "Success: " + success + ", message: " + message;
     }

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

@@ -0,0 +1,55 @@
+package sh.calaba.instrumentationbackend.actions.application;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import android.app.Activity;
+import android.app.Application;
+import android.content.Context;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+import sh.calaba.instrumentationbackend.query.Operation;
+import sh.calaba.instrumentationbackend.query.InvocationOperation;
+import sh.calaba.instrumentationbackend.query.QueryResult;
+import sh.calaba.instrumentationbackend.query.UIQueryResultVoid;
+
+
+public class Backdoor implements Action {
+
+	private static final String TAG = "Backdoor";
+
+	@Override
+	public Result execute(String... args) {
+		if (args.length != 2) {
+			return Result.failedResult("You must provide method name and an argument.");
+		}
+
+		String methodName = args[0];
+		List arguments = new ArrayList(1);
+		arguments.add(args[1]);
+		// create invocation operation to call method
+		Operation op = new InvocationOperation(methodName, arguments);
+		// get an application object to call operation on
+		Context app = InstrumentationBackend.solo.getCurrentActivity().getApplication();
+		String backdoorResult = null;
+		try {
+			backdoorResult = (String)op.apply(app);
+		} catch (Exception e) {
+			android.util.Log.e(TAG, android.util.Log.getStackTraceString(e));
+			return Result.failedResult("No such backdoor method found: public String " + op.getName() + "(String arg)");
+		}
+
+		// set backdoor result as bonus
+		Result result = Result.successResult();
+		result.addBonusInformation(backdoorResult);
+		return result;
+	}
+
+	@Override
+	public String key() {
+		return "backdoor";
+	}
+
+}

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

@@ -5,6 +5,19 @@ import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.Result;
 import sh.calaba.instrumentationbackend.actions.Action;
 
+/**
+ * <p>
+ * Action that performs a long press on given coordinates.
+ * </p>
+ * <p>
+ * Parameters:
+ * <ul>
+ * <li>args[0]: x coordinate (float)</li>
+ * <li>args[1]: y coordinate (float)</li>
+ * <li>args[2]: length of the long press in millisecond (optional, integer)</li>
+ * </ul>
+ * </p>
+ */
 public class LongPressCoordinate implements Action {
     @Override
     public Result execute(String... args) {
@@ -12,8 +25,12 @@ public class LongPressCoordinate implements Action {
 
         float x = Float.parseFloat(args[0]);
         float y = Float.parseFloat(args[1]);
-
-        InstrumentationBackend.solo.clickLongOnScreen(x, y);
+		if (args.length > 2) {
+			int time = Integer.parseInt(args[2]);
+			InstrumentationBackend.solo.clickLongOnScreen(x, y, time);
+		} else {
+			InstrumentationBackend.solo.clickLongOnScreen(x, y);
+		}
 
         return Result.successResult();
     }

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

@@ -0,0 +1,105 @@
+package sh.calaba.instrumentationbackend.actions.webview;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import android.os.Build;
+import android.webkit.WebView;
+
+public class JavaScriptExecuter {
+    private WebView webView;
+    private Object provider;
+
+    public JavaScriptExecuter(WebView webView) {
+        this.webView = webView;
+    }
+
+    public void executeJavaScript(String javaScript) {
+        try {
+            provider = getProvider();
+            loadUrlImpl("javascript:" + javaScript);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void callSwitchOutDrawHistory() throws InvocationTargetException, IllegalAccessException, NoSuchMethodException {
+        Method method = provider.getClass().getDeclaredMethod("switchOutDrawHistory");
+        method.setAccessible(true);
+        method.invoke(provider);
+    }
+
+    private void loadUrlImpl(String url) throws NoSuchMethodException, IllegalAccessException, NoSuchFieldException, InstantiationException, InvocationTargetException, ClassNotFoundException {
+        callSwitchOutDrawHistory();
+        sendMessage(url);
+    }
+
+    private void sendMessage(String url) throws NoSuchFieldException, IllegalAccessException, NoSuchMethodException, InstantiationException, InvocationTargetException, ClassNotFoundException {
+        Object arg = getUrlData(url);
+        Object webViewCore = getWebViewCore();
+
+        int messageIdentifier = loadUrlMessage();
+
+        Method sendMessageMethod = webViewCore.getClass().getDeclaredMethod("sendMessage", int.class, Object.class);
+        sendMessageMethod.setAccessible(true);
+        sendMessageMethod.invoke(webViewCore, messageIdentifier, arg);
+    }
+
+    private final String EVENT_HUB_CLASS_NAME = "android.webkit.WebViewCore$EventHub";
+
+    private int loadUrlMessage() throws NoSuchFieldException, ClassNotFoundException, IllegalAccessException {
+        Class<?> eventHubClass = Class.forName(EVENT_HUB_CLASS_NAME);
+        Field loadUrlField = eventHubClass.getDeclaredField("LOAD_URL");
+        loadUrlField.setAccessible(true);
+
+        return loadUrlField.getInt(String.class);
+    }
+
+    private final String GET_URL_DATA_CLASS_NAME = "android.webkit.WebViewCore$GetUrlData";
+
+    private Object getUrlData(String url) throws ClassNotFoundException, NoSuchMethodException, NoSuchFieldException, IllegalAccessException, InvocationTargetException, InstantiationException {
+        // For Android OS pre 2.2 the url was a string
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.FROYO) {
+            return url;
+        } else {
+            Class<?> getUrlDataClass = Class.forName(GET_URL_DATA_CLASS_NAME);
+            Constructor<?> constructor = getUrlDataClass.getDeclaredConstructor();
+            constructor.setAccessible(true);
+
+            Field mUrlField = getUrlDataClass.getDeclaredField("mUrl");
+            mUrlField.setAccessible(true);
+            Field mExtraHeadersField = getUrlDataClass.getDeclaredField("mExtraHeaders");
+            mExtraHeadersField.setAccessible(true);
+
+            Object getUrlDataInstance = constructor.newInstance();
+            mUrlField.set(getUrlDataInstance, url);
+            mExtraHeadersField.set(getUrlDataInstance, null);
+
+            return getUrlDataInstance;
+        }
+    }
+
+    private Object getProvider() throws NoSuchFieldException, IllegalAccessException {
+        // For Android OS pre 4.1 the implementation of loadUrl was within the WebView widget class
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
+            return webView;
+        } else {
+            Field fieldProvider = WebView.class.getDeclaredField("mProvider");
+            fieldProvider.setAccessible(true);
+
+            return fieldProvider.get(webView);
+        }
+    }
+
+    private Object getWebViewCore() throws IllegalStateException, IllegalAccessException, NoSuchFieldException {
+        if (provider == null) throw new IllegalStateException("Provider is null");
+
+        Field fieldCore = provider.getClass().getDeclaredField("mWebViewCore");
+        fieldCore.setAccessible(true);
+        Object webViewCore = fieldCore.get(provider);
+
+        return webViewCore;
+    }
+}