gametel 0.5.7 → 0.5.8

data/features/image.feature

@@ -0,0 +1,20 @@
+Feature: Interacting with Images
+
+  Scenario: Should be able to click an image
+    Given I'm on the image screen
+    Then I should be able to click on the first image
+
+  Scenario: Should be able to get the images view
+    Given I'm on the image screen
+    Then the first image should have the following properties:
+      | property  | value |
+      | clickable | false |
+      | enabled   | true  |
+      | focusable | false |
+      | focused   | false |
+      | selected  | false |
+      | shown     | true  |
+
+  Scenario: Waiting for the drawable to load
+    Given I'm on the image screen
+    Then I should be able to wait until the images drawable has loaded

data/features/step_definitions/image_steps.rb

@@ -0,0 +1,22 @@
+Given /^I\'m on the image screen$/  do
+  on(MainMenuScreen).views
+  on(ViewsMenuScreen).image_view
+end
+
+Then /^I should be able to click on the first image$/  do
+  on(ImageViewScreen).click_first
+end
+
+Then /^the first image should have the following properties:$/  do |properties|
+   on(ImageViewScreen) do |screen|
+    view = screen.first_view
+    properties.hashes.each do |property|
+      result = view.send("#{property["property"]}?")
+      result.to_s.should eq(property["value"]), "for field #{property["property"]}"
+    end
+  end
+end
+
+Then /^I should be able to wait until the images drawable has loaded$/  do
+  on(ImageViewScreen).wait_for_first
+end

data/features/support/screens/image_view_screen.rb

@@ -0,0 +1,6 @@
+class ImageViewScreen
+  include Gametel
+
+  image(:first, :index => 0)
+  
+end

data/lib/gametel.rb

@@ -6,6 +6,7 @@ require 'gametel/platforms/brazenhead_platform'
 require 'gametel/views'
 
 module Gametel
+  include Gametel::Waiter
 
   attr_reader :platform
 
@@ -13,7 +14,7 @@ module Gametel
   ROBOTIUM_RIGHT = 22
 
   def self.included(cls)
-    cls.extend Gametel::Accessors, Gametel::Waiter
+    cls.extend Gametel::Accessors
   end
 
   def initialize(pform = :brazenhead)

data/lib/gametel/accessors.rb

@@ -1,5 +1,19 @@
 module Gametel
   module Accessors
+
+    #
+    # Generates a method named active? which will wait for the
+    # activity to become active
+    #
+    # returns true when successful
+    #
+    def activity(activity_name)
+      define_method("active?") do
+        platform.wait_for_activity activity_name
+        platform.last_json
+      end 
+    end
+
     #
     # Generates methods to enter text into a text field, clear the text
     # field, get the hint as well as the description
@@ -8,7 +22,7 @@ module Gametel
     #   text(:first_name, :index => 0)
     #   # will generate 'first_name', 'first_name=', 'clear_first_name', 'first_name_hint' and 'first_name_description' methods
     #
-    # @param  [String]  the name used for the generated methods
+    # @param  [Symbol]  the name used for the generated methods
     # @param  [Hash]  locator for how the text is found  The valid
     # keys are:
     #  * :id
@@ -36,7 +50,7 @@ module Gametel
     #   button(:save, :text => 'Save')
     #   # will generate 'save' and 'save_enabled?' methods
     #
-    # @param  [String]  the name used for the generated methods
+    # @param  [Symbol]  the name used for the generated methods
     # @param  [Hash]  locator for how the button is found  The valid
     # keys are:
     #  * :text
@@ -69,7 +83,7 @@ module Gametel
     #   # will generate 'details' method to select third item in the
     #   # first list
     #
-    # @param  [String]  the name used for the generated methods
+    # @param  [Symbol]  the name used for the generated methods
     # @param  [Hash]  locator for how the list item is found  The valid
     # keys are:
     #  * :text
@@ -93,7 +107,7 @@ module Gametel
     #   checkbox(:enable, :text => 'Enable')
     #   # will generate 'enable' method
     #
-    # @param  [String]  the name used for the generated methods
+    # @param  [Symbol]  the name used for the generated methods
     # @param  [Hash]  locator for how the checkbox is found  The valid
     # keys are:
     #  * :text
@@ -116,7 +130,7 @@ module Gametel
     #   radio_button(:circle, :text => 'Circle')
     #   # will generate 'circle' method
     #
-    # @param  [String]  the name used for the generated methods
+    # @param  [Symbol]  the name used for the generated methods
     # @param  [Hash]  locator for how the checkbox is found  The valid
     # keys are:
     #  * :text
@@ -138,7 +152,7 @@ module Gametel
     #   view(:clickable_text, :id => 'id_name_of_your_control')
     #   # will generate 'clickable_text' method
     #
-    # @param  [String]  the name used for the generated methods
+    # @param  [Symbol]  the name used for the generated methods
     # @param  [Hash]  locator indicating an id for how the view is found.
     # The only valid keys are:
     #   * :id
@@ -160,7 +174,7 @@ module Gametel
     #   spinner(:progress_item, :id => 'id_name_of_your_control')
     #   # will generate progress_item, progress_item=, progress_item_secondary, progress_item_secondary=
     #
-    # @param  [String]  the name used for the generated methods
+    # @param  [Symbol]  the name used for the generated methods
     # @param  [Hash]  locator indicating an id for how the progress bar is found.
     # The only valid keys are:
     #   * :id
@@ -188,12 +202,15 @@ module Gametel
     end
 
     #
-    # Generates one method to get the selected item text.
+    # Generates three method to interact with a spinner
     # @example
     #   spinner(:spinner_item, :id => 'id_name_of_your_control')
-    #   # will generate 'spinner_item' method
+    #   # will generate 'spinner_item' method to return the spinner
+    #   # value, 'select_spinner_item(value) to set the spinner value
+    #   # and 'spinner_view' to return the view
+    
     #
-    # @param  [String]  the name used for the generated methods
+    # @param  [Symbol]  the name used for the generated methods
     # @param  [Hash]  locator indicating an id for how the spinner is found.
     # The only valid keys are:
     #   * :id
@@ -210,6 +227,34 @@ module Gametel
         Gametel::Views::Spinner.new(platform, locator)
       end
     end
+
+    #
+    # Generaes method to interact with an image.
+    #
+    # @example
+    #   image(:headshot, :id => 'headshot')
+    #   # will generate 'click_headshot' method to click the image,
+    #   # 'wait_for_headshot' which will wait until the image has
+    #   # loaded a drawable and 'headshot_view' to return the view
+    #
+    # @param  [Symbol]  the name used for the generated methods
+    # @param  [Hash]  locator indicating an id for how the image is found.
+    # The only valid keys are:
+    #   * :index
+    #
+    def image(name, locator)
+      define_method("click_#{name}") do
+        platform.click_image(locator)
+      end
+      define_method("wait_for_#{name}") do
+        wait_until do
+          platform.has_drawable?(locator)
+        end
+      end
+      define_method("#{name}_view") do
+        Gametel::Views::Image.new(platform, locator)
+      end
+    end
   end
 end
 

data/lib/gametel/platforms/brazenhead_platform.rb

@@ -89,6 +89,14 @@ module Gametel
         result = click_on_radio_button(locator[:index]) if locator[:index]
       end
 
+      #
+      # click an image
+      #
+      def click_image(locator)
+        result = click_on_image(locator[:index]) if locator[:index]
+        result = click_on_view_by_id(locator[:id]) if locator[:id]
+      end
+
       #
       # get the selected spinner value
       #
@@ -130,6 +138,15 @@ module Gametel
         result.body.include? 'windowLocation'
       end
 
+      #
+      # return if a view has a drawable
+      #
+      def has_drawable?(locator)
+        view = get_view_by_id(locator) if locator[:id]
+        view = get_image(locator[:index]) if locator[:index]
+        last_json['hasDrawable']
+      end
+
       #
       # determine if a view is enabled
       #

data/lib/gametel/version.rb

@@ -1,3 +1,3 @@
 module Gametel
-  VERSION = "0.5.7"
+  VERSION = "0.5.8"
 end

data/lib/gametel/views.rb

@@ -6,3 +6,4 @@ require 'gametel/views/checkbox'
 require 'gametel/views/progress'
 require 'gametel/views/spinner'
 require 'gametel/views/list_item'
+require 'gametel/views/image'

data/lib/gametel/views/image.rb

@@ -0,0 +1,27 @@
+module Gametel
+  module Views
+    class Image < View
+      IMAGE_VIEW_CLASS = 'android.widget.ImageView'
+
+      protected
+
+      def build_property_methods
+        metaclass = class << self; self; end
+        properties.each do |property|
+          metaclass.send(:define_method, "#{property}?".to_sym) do
+            
+            platform.get_view_by_id(locator[:id]) do |device|
+              device.send "is_#{property}"
+            end if locator[:id]
+            
+            platform.get_view_by_index(IMAGE_VIEW_CLASS, locator[:index]) do |device|
+              device.send "is_#{property}"
+            end if locator[:index]
+
+            platform.last_response.body == "true"
+          end
+        end
+      end
+    end
+  end
+end

data/spec/lib/gametel/accessors_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 class AccessorsSampleScreen
   include Gametel
 
+  activity "SomeActivity"
+
   list_item(:first_list_item_text, :text => 'first item')
   list_item(:first_list_item_index, :index => 0)
   list_item(:first_list_item_index_list, :index => 0, :list => 1)
@@ -24,6 +26,8 @@ class AccessorsSampleScreen
   spinner(:spinner_index, :index => 1)
   progress(:progress_id, :id => 'progress_id')
   progress(:progress_index, :index => 1)
+  image(:image_index, :index => 0)
+  image(:image_id, :id => 'image_id')
 end
 
 describe Gametel::Accessors do
@@ -43,6 +47,18 @@ describe Gametel::Accessors do
       device.stub(:send).and_return(result)
     end
 
+    context "defining the activity on a screen" do
+      it "should define the active? method" do
+        screen.should respond_to :active?
+      end
+
+      it "should wait for the activity to become active" do
+        platform.should_receive(:wait_for_activity).with("SomeActivity")
+        platform.should_receive(:last_json)
+        screen.active?
+      end
+    end
+
     context "list items" do
       it "should know how to be chosen by text" do
         platform.should_receive(:click_on_text)
@@ -738,5 +754,29 @@ describe Gametel::Accessors do
         end
       end
     end
+    
+    context "images" do
+      it "should click an image using the index" do
+        platform.should_receive(:click_on_image).with(0)
+        screen.click_image_index
+      end
+
+      it "should click an image by id" do
+        platform.should_receive(:click_on_view_by_id).with('image_id')
+        screen.click_image_id
+      end
+
+      it "should wait for a drawable when using index" do
+        platform.should_receive(:get_image).with(0)
+        platform.should_receive(:last_json).and_return({'hasDrawable' => 'true'})
+        screen.wait_for_image_index
+      end
+
+      it "should wait for a drawable when using index" do
+        platform.should_receive(:get_view_by_id).with(:id => 'image_id')
+        platform.should_receive(:last_json).and_return({'hasDrawable' => 'true'})
+        screen.wait_for_image_id
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gametel
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brazenhead
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,7 +91,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +119,7 @@ files:
 - features/button.feature
 - features/checkbox.feature
 - features/has_view.feature
+- features/image.feature
 - features/is_enabled.feature
 - features/list_item.feature
 - features/main_screen.feature
@@ -130,6 +131,7 @@ files:
 - features/step_definitions/checkbox_steps.rb
 - features/step_definitions/controls_steps.rb
 - features/step_definitions/has_view_steps.rb
+- features/step_definitions/image_steps.rb
 - features/step_definitions/is_enabled_steps.rb
 - features/step_definitions/list_item_steps.rb
 - features/step_definitions/main_screen_steps.rb
@@ -153,6 +155,7 @@ files:
 - features/support/screens/controls_screen.rb
 - features/support/screens/custom_items_screen.rb
 - features/support/screens/efficient_adapter_screen.rb
+- features/support/screens/image_view_screen.rb
 - features/support/screens/lists_menu_screen.rb
 - features/support/screens/main_menu_screen.rb
 - features/support/screens/never_will_exist.rb
@@ -175,6 +178,7 @@ files:
 - lib/gametel/views.rb
 - lib/gametel/views/button.rb
 - lib/gametel/views/checkbox.rb
+- lib/gametel/views/image.rb
 - lib/gametel/views/list_item.rb
 - lib/gametel/views/progress.rb
 - lib/gametel/views/radio_button.rb
@@ -199,18 +203,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1788323344300920655
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1788323344300920655
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -221,6 +219,7 @@ test_files:
 - features/button.feature
 - features/checkbox.feature
 - features/has_view.feature
+- features/image.feature
 - features/is_enabled.feature
 - features/list_item.feature
 - features/main_screen.feature
@@ -232,6 +231,7 @@ test_files:
 - features/step_definitions/checkbox_steps.rb
 - features/step_definitions/controls_steps.rb
 - features/step_definitions/has_view_steps.rb
+- features/step_definitions/image_steps.rb
 - features/step_definitions/is_enabled_steps.rb
 - features/step_definitions/list_item_steps.rb
 - features/step_definitions/main_screen_steps.rb
@@ -255,6 +255,7 @@ test_files:
 - features/support/screens/controls_screen.rb
 - features/support/screens/custom_items_screen.rb
 - features/support/screens/efficient_adapter_screen.rb
+- features/support/screens/image_view_screen.rb
 - features/support/screens/lists_menu_screen.rb
 - features/support/screens/main_menu_screen.rb
 - features/support/screens/never_will_exist.rb