calabash-android 0.2.17 → 0.2.18

data/CHANGES.txt

@@ -1,3 +1,8 @@
+0.2.18:
+      Various small improvements and bug fixes.
+
+      Screenshots are now embedded into the test report using Cucumbers embed method.
+
 0.2.17:
       Added calabash-android extract-manifest that will print the manifest of any apk file.
 

data/bin/calabash-android-run.rb

@@ -19,11 +19,16 @@ def calabash_run(app_path = nil)
     end
 
     test_server_path = test_server_path(app_path)
+    if ENV["TEST_SERVER_PORT"]
+      test_server_port = ENV["TEST_SERVER_PORT"]
+    else
+      test_server_port = "34777"
+    end
     env = "PACKAGE_NAME=#{package_name(app_path)} "\
           "TEST_PACKAGE_NAME=#{package_name(test_server_path)} "\
           "APP_PATH=\"#{app_path}\" "\
           "TEST_APP_PATH=\"#{test_server_path}\" "\
-          "TEST_SERVER_PORT=34777"
+          "TEST_SERVER_PORT=#{test_server_port}"
   else
     env = ""
   end

data/features-skeleton/support/hooks.rb

@@ -1,34 +0,0 @@
-
-Before do |scenario|
-  # https://groups.google.com/forum/?fromgroups#!topic/calabash-ios/ICA4f24eSsY
-  @scenario_is_outline = (scenario.class == Cucumber::Ast::OutlineTable::ExampleRow) 
-  if @scenario_is_outline 
-    scenario = scenario.scenario_outline 
-  end 
-
-  StepCounter.step_index = 0
-  # https://github.com/calabash/calabash-android/issues/58#issuecomment-6745642
-  if scenario.respond_to? :raw_steps
-    StepCounter.step_line = scenario.raw_steps[StepCounter.step_index].line
-  else
-    StepCounter.step_line = 0
-  end
-end
-
-AfterStep do |scenario|
-  #Handle multiline steps
-  StepCounter.step_index = StepCounter.step_index + 1
-  # https://github.com/calabash/calabash-android/issues/58#issuecomment-6745642
-  if scenario.respond_to? :raw_steps
-    StepCounter.step_line = scenario.raw_steps[StepCounter.step_index].line unless scenario.raw_steps[StepCounter.step_index].nil?
-  else
-    StepCounter.step_line = StepCounter.step_line + 1
-  end
-end
-
-StepCounter = Class.new
-class << StepCounter
-  @step_index = 0
-  @step_line = 0
-  attr_accessor :step_index, :step_line
-end

data/lib/calabash-android/operations.rb

@@ -19,7 +19,7 @@ module Operations
   end
 
   def take_screenshot
-    Device.default_device.take_screenshot
+    default_device.take_screenshot
   end
 
   def macro(txt)
@@ -29,28 +29,38 @@ module Operations
       Then(txt)
     end
   end
+  def default_device
+    Device.default_device(self)
+  end
 
   def shutdown_test_server
-    Device.default_device.shutdown_test_server
+    default_device.shutdown_test_server
   end
 
   def performAction(action, *arguments)
-    Device.default_device.perform_action(action, *arguments)
+    default_device.perform_action(action, *arguments)
   end
 
   def install_app(app_path)
-    Device.default_device.install_app(app_path)
+    default_device.install_app(app_path)
   end
 
   def uninstall_apps
-    Device.default_device.uninstall_app(ENV["TEST_PACKAGE_NAME"])
-    Device.default_device.uninstall_app(ENV["PACKAGE_NAME"])
+    default_device.uninstall_app(ENV["TEST_PACKAGE_NAME"])
+    default_device.uninstall_app(ENV["PACKAGE_NAME"])
   end
 
   def start_test_server_in_background
-    Device.default_device.start_test_server_in_background()
+    default_device.start_test_server_in_background()
   end
 
+  def screenshot_embed(options={:prefix => nil, :name => nil, :label => nil})
+    default_device.screenshot_embed(options)
+  end
+
+  def screenshot(options={:prefix => nil, :name => nil})
+    default_device.screenshot(options)
+  end
 
   def wait_for(timeout, &block)
     begin
@@ -99,9 +109,9 @@ module Operations
   class Device
     @@default_device = nil
 
-    def self.default_device
+    def self.default_device(cucumber_world)
       unless @@default_device
-        @@default_device = Device.new(ENV["ADB_DEVICE_ARG"], ENV["TEST_SERVER_PORT"], ENV["APP_PATH"], ENV["TEST_APP_PATH"])
+        @@default_device = Device.new(cucumber_world, ENV["ADB_DEVICE_ARG"], ENV["TEST_SERVER_PORT"], ENV["APP_PATH"], ENV["TEST_APP_PATH"])
       end
       @@default_device
     end
@@ -110,7 +120,8 @@ module Operations
       @@default_device = self
     end
 
-    def initialize(serial, server_port, app_path, test_server_path)
+    def initialize(cucumber_world, serial, server_port, app_path, test_server_path)
+      @cucumber_world = cucumber_world
       @serial = serial
       @server_port = server_port
       @app_path = app_path
@@ -166,7 +177,7 @@ module Operations
         raise "Empty result from TestServer" if result.chomp.empty?
         result = JSON.parse(result)
         if not result["success"] then
-          take_screenshot
+          screenshot_embed
           if result["bonusInformation"] && result["bonusInformation"].size > 0 && result["bonusInformation"][0].include?("Exception")
             log result["bonusInformation"][0]
           end
@@ -193,6 +204,7 @@ module Operations
     end
 
     def take_screenshot
+      puts "take_screenshot is deprecated. Use screenshot_embed instead."
       path = ENV["SCREENSHOT_PATH_PREFIX"] || "results"
       FileUtils.mkdir_p path unless File.exist? path
       filename_prefix = FeatureNameMemory.feature_name.gsub(/\s+/, '_').downcase
@@ -203,13 +215,41 @@ module Operations
           open(file_name ,"wb") { |file|
             file.write(image)
           }
-          log "Screenshot stored in: #{file_name}"
+          log "Screenshot stored in: #{file_name}!!!"
         end
       rescue Timeout::Error
         raise Exception, "take_screenshot timed out"
       end
     end
 
+    def screenshot_embed(options={:prefix => nil, :name => nil, :label => nil})
+      path = screenshot(options)
+      @cucumber_world.embed(path, "image/png", options[:label] || File.basename(path))
+    end
+
+    def screenshot(options={:prefix => nil, :name => nil})
+      prefix = options[:prefix] || ENV['SCREENSHOT_PATH'] || ""
+      name = options[:name]
+
+      if name.nil?
+        name = "screenshot"
+      else
+        if File.extname(name).downcase == ".png"
+          name = name.split(".png")[0]
+        end
+      end
+
+      @@screenshot_count ||= 0
+      res = http("/screenshot")
+
+      path = "#{prefix}#{name}_#{@@screenshot_count}.png"
+      File.open(path, 'wb') do |f|
+        f.write res
+      end
+      @@screenshot_count += 1
+      path
+    end
+
     def adb_command
       if is_windows?
         %Q("#{ENV["ANDROID_HOME"]}\\platform-tools\\adb.exe" #{device_args})
@@ -283,7 +323,7 @@ module Operations
   end
 
   def screenshot_and_raise(msg)
-    take_screenshot
+    screenshot_embed
     sleep 5
     raise(msg)
   end
@@ -394,10 +434,6 @@ module Operations
   def backdoor(sel, arg)
     ni
   end
-
-  def screenshot
-    ni
-  end
   
   def map( query, method_name, *method_args )
     ni

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

@@ -1,11 +1,11 @@
 Then /^take picture$/ do
-	take_screenshot
+  screenshot_embed
 end
 
 Then /^I take a picture$/ do
-	take_screenshot
+  screenshot_embed
 end
 
 Then /^I take a screenshot$/ do
-	take_screenshot
+  screenshot_embed
 end

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.2.17"
+    VERSION = "0.2.18"
   end
 end

data/test-server/build.xml

@@ -46,18 +46,7 @@
     <path id="android.target.classpath">
       <fileset dir="${env.ANDROID_HOME}/platforms/android-${android.api.level}/" includes="*.jar"/>
     </path>
-
-    <target name="test" description="Run test features" depends="package">
-	      <exec executable="cucumber${bat}">
-          <env key="PACKAGE_NAME" value="${tested.package_name}" />
-          <env key="TEST_PACKAGE_NAME" value="${tested.package_name}.test" />
-          <env key="APP_PATH" value="${tested.project.apk}" />
-          <env key="TEST_APP_PATH" value="bin/Test.apk" />
-          <env key="TEST_SERVER_PORT" value="34777" />
-          <env key="ADB_DEVICE_ARG" value="${adb.device.arg}" />
-          <arg value="features" />
-       </exec>
-    </target>
+    
     <target name="-check.preconditions">
       <available file="${tested.project.apk}" property="tested.apk.found" />
       <fail unless="tested.apk.found" message="Tested apk: '${tested.project.apk}' could not be found"/>

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

@@ -4,6 +4,7 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 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;
@@ -83,10 +84,10 @@ public class HttpServer extends NanoHTTPD {
 
 		} else if (uri.endsWith("/screenshot")) {
             Bitmap bitmap;
-            View v1 = InstrumentationBackend.solo.getViews().get(0).getRootView();
-            v1.setDrawingCacheEnabled(true);
-            bitmap = Bitmap.createBitmap(v1.getDrawingCache());
-            v1.setDrawingCacheEnabled(false);
+            View rootView = getRootView();
+            rootView.setDrawingCacheEnabled(true);
+            bitmap = Bitmap.createBitmap(rootView.getDrawingCache());
+            rootView.setDrawingCacheEnabled(false);
 
             ByteArrayOutputStream out = new ByteArrayOutputStream();
             bitmap.compress(Bitmap.CompressFormat.PNG, 90, out);
@@ -106,6 +107,23 @@ public class HttpServer extends NanoHTTPD {
 		return new NanoHTTPD.Response( HTTP_OK, MIME_HTML, result);
 	}
 
+    private View getRootView() {
+        for ( int i = 0; i < 25; i++) {
+            try {
+                View rootView = InstrumentationBackend.solo.getCurrentActivity().getWindow().getDecorView();
+                if (rootView != null) {
+                    return rootView;
+                }
+                System.out.println("Retry: " + i);
+            
+                Thread.sleep(200);
+            } catch (Exception e) {
+            }
+        }
+        
+        throw new RuntimeException("Could not find any views");
+    }
+
 	private ObjectMapper createJsonMapper() {
 		ObjectMapper mapper = new ObjectMapper();
 		mapper.configure(Feature.FAIL_ON_UNKNOWN_PROPERTIES, true);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber