calabash-android 0.2.9 → 0.2.10

data/CHANGES.txt

@@ -1,3 +1,13 @@
+0.2.10:
+      Various small improvements and bug fixes.
+
+      Default behavior is now to shutdown the test server after scenario.
+      calabash-android now waits for the test server to be ready before sending
+      the first command.
+
+      If the environment variable RESET_BETWEEN_SCENARIOS is "1" the app will
+      be reinstalled between scenarios and not just between features.
+
 0.2.9:
       Moving to the new http screenshot method.
       screenshottaker.jar and the use of ddmlib will be phased out.

data/bin/calabash-android-build.rb

@@ -56,8 +56,4 @@ def read_keystore_info
     "keystore_alias_password" => "android"
     }
   end
-end
-
-def is_windows?
-  ENV["OS"] == "Windows_NT"
 end

data/calabash-android.gemspec

@@ -19,5 +19,6 @@ Gem::Specification.new do |s|
   s.add_dependency( "cucumber" )
   s.add_dependency( "json" )
   s.add_dependency( "slowhandcuke" )
+  s.add_dependency( "retriable" )
 
 end

data/features-skeleton/support/app_installation_hooks.rb

@@ -6,8 +6,13 @@ end
 
 Before do |scenario|
   feature_name = scenario.feature.name
-  if FeatureNameMemory.feature_name != feature_name
-    log "Is first scenario - reinstalling apps"
+  if FeatureNameMemory.feature_name != feature_name \
+      or ENV["RESET_BETWEEN_SCENARIOS"] == "1"
+    if ENV["RESET_BETWEEN_SCENARIOS"] == "1"
+      log "New scenario - reinstalling apps"
+    else
+      log "First scenario in feature - reinstalling apps"
+    end
     
     uninstall_apps
     install_app(ENV["TEST_APP_PATH"])
@@ -16,11 +21,6 @@ Before do |scenario|
 	end
 end
 
-at_exit do
-  require 'net/http'
-  Net::HTTP.get(URI.parse("http://127.0.0.1:34777/kill"))
-end
-
 FeatureNameMemory = Class.new
 class << FeatureNameMemory
   @feature_name = nil

data/features-skeleton/support/app_life_cycle_hooks.rb

@@ -4,4 +4,8 @@ Before do |scenario|
 
   return if scenario.failed? #No need to start the server is anything before this has failed.
   start_test_server_in_background
-end
+end
+
+After do
+    shutdown_test_server
+end

data/lib/calabash-android/canned_steps.md

@@ -159,6 +159,10 @@ Waits for the current dialog to close.
     Then /^I wait to see "([^\"]*)"$/
 Waits for the specified text to appear.
 
+    Then /^I wait up to (\d+) seconds for "([^\"]*)" to appear$/
+    Then /^I wait up to (\d+) seconds to see "([^\"]*)"$/
+Waits for the specified text to appear, with a custom timeout
+
     Then /^I wait for the "([^\"]*)" button to appear$/
 Waits for a button with the specified text to appear.
 
@@ -170,6 +174,7 @@ Waits for a view view that id to appear.
 Note that use the short name and not the fully quantified name. That means if your id
 is 'com.foo.R.id.bar_label' you would use 'I press view with id "bar_label"'.
 
+    Then /^I wait up to (\d+) seconds for the "([^\"]*)" screen to appear$/ 
     Then /^I wait upto (\d+) seconds for the "([^\"]*)" screen to appear$/ 
 Waits for a particular screen (Android Activity) to appear with a timeout.
 

data/lib/calabash-android/helpers.rb

@@ -50,4 +50,9 @@ def test_server_path(apk_file_path)
   "test_servers/#{checksum(apk_file_path)}_#{Calabash::Android::VERSION}.apk"
 end
 
+def is_windows?
+  require 'rbconfig'
+  (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
+end
+
 

data/lib/calabash-android/operations.rb

@@ -6,6 +6,7 @@ require 'json'
 require 'socket'
 require 'timeout'
 require 'calabash-android/helpers'
+require 'retriable'
 
 
 module Calabash module Android
@@ -29,6 +30,10 @@ module Operations
     end
   end
 
+  def shutdown_test_server
+    Device.default_device.shutdown_test_server
+  end
+
   def performAction(action, *arguments)
     Device.default_device.perform_action(action, *arguments)
   end
@@ -76,9 +81,6 @@ module Operations
     raise "Not yet implemented."
   end
 
-  def is_windows?
-     ENV["OS"] == "Windows_NT"
-  end
   ###
 
   ### app life cycle
@@ -144,6 +146,10 @@ module Operations
       log `#{adb_command} uninstall #{package_name}`
     end
 
+    def shutdown_test_server
+      http("/kill")
+    end
+
     def perform_action(action, *arguments)
       log "Action: #{action} - Params: #{arguments.join(', ')}"
 
@@ -222,10 +228,6 @@ module Operations
       end
     end
 
-    def is_windows?
-      ENV["OS"] == "Windows_NT"
-    end
-
     def start_test_server_in_background
       test_server_package = package_name(@test_server_path)
       cmd = "#{adb_command} shell am instrument -w -e class sh.calaba.instrumentationbackend.InstrumentationBackend #{test_server_package}/sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner"
@@ -238,10 +240,19 @@ module Operations
       end
 
       begin
-        Timeout::timeout(15) do
-          puts http("/ping")
+        retriable :tries => 10, :interval => 3 do
+            log "Checking if instrumentation backend is ready"
+            ready = http("/ready")
+
+            if ready != "true"
+              log "Instrumentation backend not yet ready"
+              raise "Not ready"
+            else
+              log "Instrumentation backend is ready!"
+            end
         end
-      rescue Timeout::Error
+
+      rescue
         msg = "Unable to make connection to Calabash Test Server at http://127.0.0.1:#{@server_port}/\n"
         msg << "Please check the logcat output for more info about what happened\n"
         raise msg

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

@@ -28,10 +28,18 @@ Then /^I wait for "([^\"]*)" to appear$/ do |text|
   performAction('wait_for_text', text)
 end
 
+Then /^I wait up to (\d+) seconds for "([^\"]*)" to appear$/ do |timeout, text|
+  performAction('wait_for_text', text, timeout)
+end
+
 Then /^I wait to see "([^\"]*)"$/ do |text|
   performAction('wait_for_text', text)
 end
 
+Then /^I wait up to (\d+) seconds to see "([^\"]*)"$/ do |timeout, text|
+  performAction('wait_for_text', text, timeout)
+end
+
 Then /^I wait for the "([^\"]*)" button to appear$/ do |text|
   performAction('wait_for_button', text)
 end
@@ -40,6 +48,11 @@ Then /^I wait for the view with id "([^\"]*)" to appear$/ do |text|
   performAction('wait_for_view_by_id', text)
 end
 
+Then /^I wait for the "([^\"]*)" view to appear$/ do |text|
+  performAction('wait_for_view', text)
+end
+
+
 Then /^I wait for the "([^\"]*)" screen to appear$/ do |text|
     performAction('wait_for_screen', text)
 end
@@ -47,3 +60,7 @@ end
 Then /^I wait upto (\d+) seconds for the "([^\"]*)" screen to appear$/ do |timeout, text|
     performAction('wait_for_screen', text, timeout)
 end
+
+Then /^I wait up to (\d+) seconds for the "([^\"]*)" screen to appear$/ do |timeout, text|
+    performAction('wait_for_screen', text, timeout)
+end

data/lib/calabash-android/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Android
-    VERSION = "0.2.9"
-    FRAMEWORK_VERSION = "0.2.9"
+    VERSION = "0.2.10"
+    FRAMEWORK_VERSION = "0.2.10"
   end
 end

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

@@ -5,6 +5,7 @@ import java.lang.reflect.Method;
 import android.content.Context;
 import android.os.Bundle;
 import android.test.InstrumentationTestRunner;
+import sh.calaba.instrumentationbackend.actions.HttpServer;
 
 public class CalabashInstrumentationTestRunner extends InstrumentationTestRunner {
 	@Override
@@ -18,6 +19,10 @@ public class CalabashInstrumentationTestRunner extends InstrumentationTestRunner
 		} catch (Exception e) {
 			System.out.println("Calabash could not load Mono");
 		}
+
+        // Start the HttpServer as soon as possible in a not-ready state
+        HttpServer.instantiate();
+
         super.onCreate(arguments);
 	}	
 }

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

@@ -12,13 +12,12 @@ public class InstrumentationBackend extends ActivityInstrumentationTestCase2 {
     public static final String TARGET_PACKAGE = "#ACTIVITY_PACKAGE#"; //Set from Ant at compile time
     private static final String LAUNCHER_ACTIVITY_FULL_CLASSNAME = "#ACTIVITY_QUALIFIED_NAME#"; //Set from Ant at compile time
     
-    private static final String TAG = "IntrumentationBackend";
+    private static final String TAG = "InstrumentationBackend";
     
     public static Instrumentation instrumentation;
     public static Solo solo;
     public static Actions actions;
-	private HttpServer httpServer;
-    
+
     private static Class getActivityClass() {
     	try {
 			return Class.forName(LAUNCHER_ACTIVITY_FULL_CLASSNAME);
@@ -45,18 +44,17 @@ public class InstrumentationBackend extends ActivityInstrumentationTestCase2 {
      * Here to have JUnit3 start the instrumentationBackend
      */
     public void testHook() throws Exception {
-    	 httpServer = new HttpServer();
-         while(httpServer.isRunning()) {
-             Thread.sleep(500);
-         }
+        HttpServer httpServer = HttpServer.getInstance();
+        httpServer.setReady();
+        httpServer.waitUntilShutdown();
+        solo.finishOpenedActivities();
     }
 
     @Override
     public void tearDown() throws Exception {
-    	
-    	if (httpServer != null) {
-    		httpServer.stop();
-    	}
+        HttpServer httpServer = HttpServer.getInstance();
+        httpServer.stop();
+
         System.out.println("Finishing");
         try {
             solo.finalize();

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

@@ -4,6 +4,9 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.util.Properties;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
 import android.graphics.Bitmap;
 import android.view.View;
@@ -15,12 +18,43 @@ import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
 import android.util.Log;
 
 public class HttpServer extends NanoHTTPD {
-	private static final String TAG = "IntrumentationBackend";
-	private boolean running = true;
-	
+	private static final String TAG = "InstrumentationBackend";
+    private boolean running = true;
+    private boolean ready = false;
+
+    private final Lock lock = new ReentrantLock();
+    private final Condition shutdownCondition = lock.newCondition();
+
 	private final ObjectMapper mapper = createJsonMapper();
 
-	public HttpServer() {
+    private static HttpServer instance;
+
+    /**
+     * Creates and returns the singleton instance for HttpServer.
+     *
+     * Can only be called once. Otherwise, you'll get an IllegalStateException.
+     */
+    public synchronized static HttpServer instantiate() {
+        if(instance != null) {
+            throw new IllegalStateException("Can only instantiate once!");
+        }
+        instance = new HttpServer();
+        return instance;
+    }
+
+    /**
+     * Returns the singleton instance for HttpServer.
+     *
+     * If {@link #instantiate()} hasn't already been called, an IllegalStateException is thrown.
+     */
+    public synchronized static HttpServer getInstance() {
+        if(instance == null) {
+            throw new IllegalStateException("Must be initialized!");
+        }
+        return instance;
+    }
+
+	private HttpServer() {
 		super(7102, new File("/"));
 	}
 
@@ -29,11 +63,23 @@ public class HttpServer extends NanoHTTPD {
 		System.out.println("URI: " + uri);
 		if (uri.endsWith("/ping")) {
 			return new NanoHTTPD.Response( HTTP_OK, MIME_HTML, "pong");
-		} else if (uri.endsWith("/kill")) {
-			running = false;
-			System.out.println("Stopping test server");
-			stop();
-			return new NanoHTTPD.Response( HTTP_OK, MIME_HTML, "Affirmative!");
+
+        } else if (uri.endsWith("/kill")) {
+            lock.lock();
+            try {
+                running = false;
+                System.out.println("Stopping test server");
+                stop();
+
+                shutdownCondition.signal();
+                return new NanoHTTPD.Response( HTTP_OK, MIME_HTML, "Affirmative!");
+            } finally {
+                lock.unlock();
+            }
+
+        } else if ("/ready".equals(uri)) {
+            return new Response(HTTP_OK, MIME_HTML, Boolean.toString(ready));
+
 
 		} else if (uri.endsWith("/screenshot")) {
             Bitmap bitmap;
@@ -80,11 +126,22 @@ public class HttpServer extends NanoHTTPD {
 		}
 	}
 
-	public boolean isRunning() {
-		return running;
-	}
+    public void waitUntilShutdown() throws InterruptedException {
+        lock.lock();
+        try {
+            while(running) {
+                shutdownCondition.await();
+            }
+        } finally {
+            lock.unlock();
+        }
+    }
 
 	public static void log(String message) {
 		Log.i(TAG, message);
 	}
+
+    public void setReady() {
+        ready = true;
+    }
 }

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

@@ -0,0 +1,30 @@
+package sh.calaba.instrumentationbackend.actions.text;
+
+import android.view.View;
+import android.widget.EditText;
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.TestHelpers;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+public class ClearTextById implements Action {
+
+	@Override
+	public Result execute(String... args) {
+        final View view = TestHelpers.getViewById(args[0]);
+        if(view == null) {
+            return new Result(false, "No view found with id: '" + args[0] + "'");
+        } else if (!(view instanceof EditText)) {
+            return new Result(false, "Expected EditText found: '" + view.getClass() + "'");
+        } else {
+            InstrumentationBackend.solo.clearEditText((EditText)view);
+            return Result.successResult();
+        }
+	}
+
+	@Override
+	public String key() {
+		return "clear_id_field";
+	}
+
+}

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

@@ -0,0 +1,30 @@
+package sh.calaba.instrumentationbackend.actions.text;
+
+import android.view.View;
+import android.widget.EditText;
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.TestHelpers;
+import sh.calaba.instrumentationbackend.actions.Action;
+
+public class EnterTextById implements Action {
+
+	@Override
+	public Result execute(String... args) {
+        final View view = TestHelpers.getViewById(args[1]);
+        if(view == null) {
+            return new Result(false, "No view found with id: '" + args[1] + "'");
+        } else if (!(view instanceof EditText)) {
+            return new Result(false, "Expected EditText found: '" + view.getClass() + "'");
+        } else {
+            InstrumentationBackend.solo.enterText((EditText)view, args[0]);
+            return Result.successResult();
+        }
+	}
+
+	@Override
+	public String key() {
+		return "enter_text_into_id_field";
+	}
+
+}

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

@@ -0,0 +1,43 @@
+package sh.calaba.instrumentationbackend.actions.view;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.TestHelpers;
+import sh.calaba.instrumentationbackend.actions.Action;
+import android.view.View;
+
+public class WaitForView implements Action {
+
+    @Override
+    public Result execute(String... args) {
+        String text = args[0];
+        long endTime = System.currentTimeMillis() + 60000;
+        while (System.currentTimeMillis() < endTime) {
+            if (InstrumentationBackend.solo.searchButton(text) || searchForViewWithContentDescription(text)) {
+                return Result.successResult();
+            } else {
+                try {
+                    Thread.sleep(500);
+                } catch (InterruptedException e) {
+                    return Result.fromThrowable(e);
+                }
+            }
+        }
+        return new Result(false, "Timed out while waiting for view with text or contentDescription:'" + text + "'");
+    }
+
+    @Override
+    public String key() {
+        return "wait_for_view";
+    }
+
+    private boolean searchForViewWithContentDescription(String description) {
+        View view = TestHelpers.getViewByDescription(description);
+        if (view != null) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+}

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

@@ -25,7 +25,8 @@ public class WaitForScreen implements Action {
             int timeout = DEFAULT_TIMEOUT;
             
             try {
-                timeout = Integer.parseInt(args[1]);
+                // given seconds; want milliseconds
+                timeout = 1000 * Integer.parseInt(args[1]);
             } catch (NumberFormatException e) {
                 return new Result(false, "Invalid timeout supplied. Should be an integer!"); 
             }
@@ -46,4 +47,4 @@ public class WaitForScreen implements Action {
         return "wait_for_screen";
     }
 
-}
+}

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

@@ -10,13 +10,24 @@ public class WaitForText implements Action {
 
     @Override
     public Result execute(String... args) {
-        boolean timedOut = !InstrumentationBackend.solo.waitForText(args[0], 1, 90000);
+        
+        int timeout = 90 * 1000;
+        if (args.length > 1) { // a second argument is a timeout
+            try {
+                // the argument is in seconds but robotium takes milliseconds
+                timeout = 1000 * Integer.parseInt(args[1]);
+            } catch (NumberFormatException e) {
+                return new Result(false, "Invalid timeout supplied. Should be an integer."); 
+            }
+        }
+ 
+        boolean timedOut = !InstrumentationBackend.solo.waitForText(args[0], 1, timeout);
         if(timedOut) {
             return new Result(false, "Time out while waiting for text:" + args[0]);
         } else {
             return Result.successResult();
         }
-            
+
     }
 
     @Override

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: calabash-android
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 2
-  - 9
-  version: 0.2.9
+  - 10
+  version: 0.2.10
 platform: ruby
 authors: 
 - Jonas Maturana Larsen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-09 00:00:00 +02:00
+date: 2012-08-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: retriable
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: "calabash-android drives tests for native  and hybrid Android apps. "
 email: 
 - jonas@lesspainful.com
@@ -171,10 +185,12 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/spinner/SelectSpinnerItemByContentDescription.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/AssertText.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/AssertTextOfSpecificTextViewByContentDescription.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/ClearTextById.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/ClearTextByIndex.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/ClearTextFieldByContentDescription.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/ClickOnText.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/EnterTextByContentDescription.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/EnterTextById.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/EnterTextByIndex.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/time/SetDateByContentDescription.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/time/SetDateByIndex.java
@@ -183,6 +199,7 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/ClickOnViewById.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/LongPressOnViewById.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/Press.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/WaitForView.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/WaitForViewById.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/wait/Wait.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/wait/WaitForDialogClose.java