calabash-android 0.3.5 → 0.3.6

data/CHANGES.txt

@@ -1,3 +1,14 @@
+0.3.6:
+      Will fail if the keyguard cannot be disabled when starting the app.
+
+      If the app is not running calabash will now die instead of running around
+      like a serverless chicking.
+
+      On-device screenshots are still unstable but will no longer crash the app
+      if they fail.
+
+      Much better Cucumber output if the app is no longer running.
+
 0.3.5:
       No longer takes screenshots when perform_action fails.
       If you want to take screenshots when a scenario fails you can use a hook:

data/bin/calabash-android-console.rb

@@ -10,11 +10,19 @@ def calabash_console(app_path = nil)
   end
 
   unless ENV["PACKAGE_NAME"]
-    ENV["PACKAGE_NAME"] = package_name(app_path)  
+    ENV["PACKAGE_NAME"] = package_name(app_path)
   end
 
   unless ENV["MAIN_ACTIVITY"]
-    ENV["MAIN_ACTIVITY"] = main_activity(app_path)  
+    ENV["MAIN_ACTIVITY"] = main_activity(app_path)
+  end
+
+  unless ENV["APP_PATH"]
+    ENV["APP_PATH"] = app_path
+  end
+
+  unless ENV["TEST_APP_PATH"]
+    ENV["TEST_APP_PATH"] = test_server_path
   end
 
   system "irb"

data/features-skeleton/support/app_life_cycle_hooks.rb

@@ -2,10 +2,6 @@ require 'calabash-android/management/adb'
 require 'calabash-android/operations'
 include Calabash::Android::Operations
 
-AfterConfiguration do |config|
-  wake_up unless config.dry_run?
-end
-
 Before do |scenario|
   start_test_server_in_background
 end

data/irbrc

@@ -18,3 +18,18 @@ include Calabash::Android::Operations
 def embed(*args)
   puts "Embed is a Cucumber method and is not available in this console."
 end
+
+
+
+#Virker det her?
+module Calabash
+  module Android
+    module Operations
+      class Cucumber
+        def self.wants_to_quit
+          false
+        end
+      end
+    end
+  end
+end

data/lib/calabash-android/operations.rb

@@ -151,13 +151,13 @@ module Operations
       cmd = "#{adb_command} install \"#{app_path}\""
       log "Installing: #{app_path}"
       result = `#{cmd}`
-      if result.include? "Success"
-        log "Success"
-      else
-        log "#Failure"
-        log "'#{cmd}' said:"
-        log result.strip
-        raise "Could not install app #{app_path}: #{result.strip}"
+      log result
+      pn = package_name(app_path)
+      succeeded = `#{adb_command} shell pm list packages`.include?("package:#{pn}")
+
+      unless succeeded
+        Cucumber.wants_to_quit = true
+        raise "#{pn} did not get installed. Aborting!"
       end
     end
 
@@ -166,6 +166,16 @@ module Operations
       log `#{adb_command} uninstall #{package_name}`
     end
 
+    def app_running?
+      `#{adb_command} shell ps`.include?(package_name(@app_path))
+    end
+
+    def keyguard_enabled?
+      dumpsys = `#{adb_command} shell dumpsys window windows`
+      #If a line containing mCurrentFocus and Keyguard exists the keyguard is enabled
+      dumpsys.lines.any? { |l| l.include?("mCurrentFocus") and l.include?("Keyguard")}
+    end
+
     def perform_action(action, *arguments)
       log "Action: #{action} - Params: #{arguments.join(', ')}"
 
@@ -173,7 +183,7 @@ module Operations
 
       Timeout.timeout(300) do
         begin
-          result = http("/", params)
+          result = http("/", params, {:read_timeout => 350})
         rescue Exception => e
           log "Error communicating with test server: #{e}"
           raise e
@@ -190,17 +200,19 @@ module Operations
       raise Exception, "Step timed out"
     end
 
-    def http(path, data = {})
-      retries = 0
+    def http(path, data = {}, options = {})
       begin
         http = Net::HTTP.new "127.0.0.1", @server_port
+        http.open_timeout = options[:open_timeout] if options[:open_timeout]
+        http.read_timeout = options[:read_timeout] if options[:read_timeout]
         resp = http.post(path, "#{data.to_json}", {"Content-Type" => "application/json;charset=utf-8"})
         resp.body
       rescue Exception => e
-        raise e if retries > 20
-        sleep 0.5
-        retries += 1
-        retry
+        if app_running?
+          raise e
+        else
+          raise "App no longer running"
+        end
       end
     end
 
@@ -280,19 +292,32 @@ module Operations
       log "Waking up device using:"
       log wake_up_cmd
       raise "Could not wake up the device" unless system(wake_up_cmd)
+
+      retriable :tries => 10, :interval => 1 do
+        raise "Could not remove the keyguard" if keyguard_enabled?
+      end
     end
 
     def start_test_server_in_background
+      raise "Will not start test server because of previous failures." if Cucumber.wants_to_quit
+
+      if keyguard_enabled?
+        wake_up
+      end
+
       cmd = "#{adb_command} shell am instrument -e target_package #{ENV["PACKAGE_NAME"]} -e main_activity #{ENV["MAIN_ACTIVITY"]} -e class sh.calaba.instrumentationbackend.InstrumentationBackend sh.calaba.android.test/sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner"
       log "Starting test server using:"
       log cmd
       raise "Could not execute command to start test server" unless system("#{cmd} 2>&1")
 
+      raise "App did not start" unless app_running?
+
       begin
         retriable :tries => 10, :interval => 3 do
             log "Checking if instrumentation backend is ready"
-            ready = http("/ready")
 
+            log "Is app running? #{app_running?}"
+            ready = http("/ready", {}, {:read_timeout => 1})
             if ready != "true"
               log "Instrumentation backend not yet ready"
               raise "Not ready"

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.3.5"
+    VERSION = "0.3.6"
   end
 end

data/test-server/instrumentation-backend/project.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=Google Inc.:Google APIs:16
+target=Google Inc.:Google APIs:15

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

@@ -44,6 +44,7 @@ public class InstrumentationBackend extends ActivityInstrumentationTestCase2 {
         httpServer.setReady();
         httpServer.waitUntilShutdown();
         solo.finishOpenedActivities();
+        System.exit(0);
     }
 
     @Override

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

@@ -1,14 +1,16 @@
 package sh.calaba.instrumentationbackend.actions;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
+import java.io.*;
 import java.util.Properties;
 import java.util.List;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
+import android.Manifest;
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.view.View;
 import sh.calaba.instrumentationbackend.Command;
@@ -59,11 +61,11 @@ public class HttpServer extends NanoHTTPD {
 		super(7102, new File("/"));
 	}
 
-	public Response serve( String uri, String method, Properties header, Properties params, Properties files )
-	{
-		System.out.println("URI: " + uri);
-		if (uri.endsWith("/ping")) {
-			return new NanoHTTPD.Response( HTTP_OK, MIME_HTML, "pong");
+    public Response serve( String uri, String method, Properties header, Properties params, Properties files )
+    {
+        System.out.println("URI: " + uri);
+        if (uri.endsWith("/ping")) {
+            return new NanoHTTPD.Response( HTTP_OK, MIME_HTML, "pong");
 
         } else if (uri.endsWith("/kill")) {
             lock.lock();
@@ -83,16 +85,23 @@ public class HttpServer extends NanoHTTPD {
 
 
 		} else if (uri.endsWith("/screenshot")) {
-            Bitmap bitmap;
-            View rootView = getRootView();
-            rootView.setDrawingCacheEnabled(true);
-            rootView.buildDrawingCache(true);
-            bitmap = Bitmap.createBitmap(rootView.getDrawingCache());
-            rootView.setDrawingCacheEnabled(false);
-
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            bitmap.compress(Bitmap.CompressFormat.PNG, 90, out);
-            return new NanoHTTPD.Response( HTTP_OK, "image/png", new ByteArrayInputStream(out.toByteArray()));
+            try {
+                Bitmap bitmap;
+                View rootView = getRootView();
+                rootView.setDrawingCacheEnabled(true);
+                rootView.buildDrawingCache(true);
+                bitmap = Bitmap.createBitmap(rootView.getDrawingCache());
+                rootView.setDrawingCacheEnabled(false);
+
+                ByteArrayOutputStream out = new ByteArrayOutputStream();
+                bitmap.compress(Bitmap.CompressFormat.PNG, 90, out);
+                return new NanoHTTPD.Response( HTTP_OK, "image/png", new ByteArrayInputStream(out.toByteArray()));
+            } catch (Exception e) {
+                StringWriter sw = new StringWriter();
+                PrintWriter pw = new PrintWriter(sw);
+                e.printStackTrace(pw);
+                return new NanoHTTPD.Response( HTTP_INTERNALERROR, null, sw.toString());
+            }
         }
 		
         System.out.println("header: "+ header);
@@ -111,9 +120,12 @@ public class HttpServer extends NanoHTTPD {
     private View getRootView() {
         for ( int i = 0; i < 25; i++) {
             try {
-                View rootView = InstrumentationBackend.solo.getCurrentActivity().getWindow().getDecorView();
-                if (rootView != null) {
-                    return rootView;
+                View decorView = InstrumentationBackend.solo.getCurrentActivity().getWindow().getDecorView();
+                if (decorView != null) {
+                    View rootView = decorView.findViewById(android.R.id.content);
+                    if (rootView != null) {
+                        return rootView;
+                    }
                 }
                 System.out.println("Retry: " + i);
             

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber