gametel 0.5 → 0.5.1

data/features/button.feature

@@ -12,6 +12,11 @@ Feature: Interacting with buttons
     Given I'm on the buttons screen
     When I click the on/off button by "id"
     Then I should see the text "ON" on the screen
+    
+  Scenario: Should be able to click a button by id
+    Given I'm on the buttons screen
+    When I click the on/off button by "index"
+    Then I should see the text "ON" on the screen
 
   Scenario: Should be able to click a toggle button
     Given I'm on the buttons screen
@@ -19,3 +24,36 @@ Feature: Interacting with buttons
     Then I should see the text "ON" on the screen
     When I click the on/off button
     Then I should see the text "OFF" on the screen
+
+  Scenario: Determining properties of a button by id
+    When I'm on the controls screen
+    Then the "button" field identified by "id" can determine the following properties:
+      | property  | value |
+      | clickable | true  |
+      | enabled   | true  |
+      | focusable | true  |
+      | focused   | false |
+      | selected  | false |
+      | shown     | true  |
+
+  Scenario: Determining properties of a button by index
+    When I'm on the controls screen
+    Then the "button" field identified by "index" can determine the following properties:
+      | property  | value |
+      | clickable | true  |
+      | enabled   | false |
+      | focusable | true  |
+      | focused   | false |
+      | selected  | false |
+      | shown     | true  |
+
+  Scenario: Determining properties of a button by text
+    When I'm on the controls screen
+    Then the "button" field identified by "text" can determine the following properties:
+      | property  | value |
+      | clickable | true  |
+      | enabled   | false |
+      | focusable | true  |
+      | focused   | false |
+      | selected  | false |
+      | shown     | true  |

data/features/main_screen.feature

@@ -21,3 +21,7 @@ Feature: Interacting with the elements on the main screen
     When I hit the enter key
     Then I should see the "Accessibility Service" list item
 
+  Scenario: Navigating back to a particular activity and knowing where we are at
+    Given I'm on the buttons screen
+    When I go choose to go back to the "ApiDemos" activity
+    Then I should currently be on the "ApiDemos" activity

data/features/progress.feature

@@ -0,0 +1,25 @@
+Feature:  Interacting with progress bars
+
+  Scenario: Getting and setting the progress by id
+    Given I am looking at the progress of a seek bar
+    When I set the progress indicated by "id" to "37"
+    Then I should see the text "37 from touch" on the screen 
+    And the retrieved progress indicated by "id" should be "37" 
+
+  Scenario: Getting and setting the progress by index
+    Given I am looking at the progress of a seek bar
+    When I set the progress indicated by "index" to "11"
+    Then the retrieved progress indicated by "index" should be "11" 
+
+  Scenario: Getting and setting the secondary progress by id
+    Given I am looking at the progress of a seek bar
+    When I set the secondary progress indicated by "id" to "74"
+    And the retrieved secondary progress indicated by "id" should be "74" 
+
+  Scenario: Getting the progress max by id
+    When I am looking at the progress of a seek bar
+    Then the retrieved progress max indicated by "id" should be "100"
+
+  Scenario: Getting the progress max by index
+    When I am looking at the progress of a seek bar
+    Then the retrieved progress max indicated by "index" should be "100"

data/features/radio_button.feature

@@ -3,7 +3,14 @@ Feature:  Interacting with Radio Buttons
   Scenario: Clicking on a radio button by text
     Given I'm on the controls screen
     Then I should be able to click a radio button by "text"
+    And the radio button identified by "text" should be checked
 
   Scenario: Clicking on a radio button by id
     Given I'm on the controls screen
     Then I should be able to click a radio button by "id"
+    And the radio button identified by "id" should be checked
+
+  Scenario: Clicking on a radio button by index
+    Given I'm on the controls screen
+    Then I should be able to click a radio button by "index"
+    And the radio button identified by "index" should be checked

data/features/spinners.feature

@@ -1,5 +1,9 @@
 Feature:  Working with Spinners
 
-  Scenario: Retrieving the selected Spinner text
+  Scenario: Retrieving the selected Spinner text by id
     When I'm on the controls screen
     Then I can see the spinner value referenced by "id" is "Mercury"
+
+  Scenario: Retrieving the selected Spinner text by index
+    When I'm on the controls screen
+    Then I can see the spinner value referenced by "index" is "Mercury"

data/features/step_definitions/checkbox_steps.rb

@@ -1,3 +1,6 @@
 Then /^I should be able to click a checkbox by "(.*?)"$/ do |how|
-  on(ControlsScreen).send "checkbox_#{how}"
+  on(ControlsScreen) do |screen|
+    screen.send "checkbox_#{how}"
+    screen.send("checkbox_#{how}_view").should be_checked
+  end
 end

data/features/step_definitions/controls_steps.rb

@@ -32,3 +32,10 @@ Then /^I should have the value "(.*?)" in the text field identified by "(.*?)"$/
     screen.send("text_field_#{how}").should eq(text_value)
   end
 end
+
+Then /^the "(.*?)" field\'s "(.*?)" property is "(.*?)"$/ do |which, what, result|
+  on(ControlsScreen) do |screen|
+    view = screen.send("#{which}_field_id_view")
+    view.send("#{what}?").to_s.should == result
+  end
+end

data/features/step_definitions/main_screen_steps.rb

@@ -25,3 +25,10 @@ When /^I hit the enter key$/ do
   on(MainMenuScreen).enter
 end
 
+When /^I go choose to go back to the "(.*?)" activity$/ do |activity|
+  on(MainMenuScreen).back_to activity
+end
+
+Then /^I should currently be on the "(.*?)" activity$/ do |activity|
+  on(MainMenuScreen).current_activity.should eq(activity)
+end

data/features/step_definitions/progress_steps.rb

@@ -0,0 +1,34 @@
+Given /^I am looking at the progress of a seek bar$/ do
+  on(MainMenuScreen).views
+  on(ViewsMenuScreen).seek_bar
+end
+
+When /^I set the progress indicated by "(.*?)" to "(.*?)"$/ do |how, value|
+  on(SeekBarScreen) do |screen|
+    screen.send "progress_#{how}=", value.to_i
+  end
+end
+
+Then /^the retrieved progress indicated by "(.*?)" should be "(.*?)"$/ do |how, value|
+  on(SeekBarScreen) do |screen|
+    screen.send("progress_#{how}").should eq(value.to_i)
+  end
+end
+
+When /^I set the secondary progress indicated by "(.*?)" to "(.*?)"$/ do |how, value|
+  on(SeekBarScreen) do |screen|
+    screen.send "progress_#{how}_secondary=", value.to_i
+  end
+end
+
+When /^the retrieved secondary progress indicated by "(.*?)" should be "(.*?)"$/ do |how, value|
+  on(SeekBarScreen) do |screen|
+    screen.send("progress_#{how}_secondary").should eq(value.to_i)
+  end
+end
+
+Then /^the retrieved progress max indicated by "(.*?)" should be "(.*?)"$/ do |how, value|
+  on(SeekBarScreen) do |screen|
+    screen.send("progress_#{how}_max").should eq(value.to_i)
+  end
+end

data/features/step_definitions/radio_button_steps.rb

@@ -1,3 +1,8 @@
 Then /^I should be able to click a radio button by "(.*?)"$/ do |how|
   on(ControlsScreen).send "radio_button_#{how}"
 end
+
+Then /^the radio button identified by "(.*?)" should be checked$/ do |how|
+  on(ControlsScreen).send("radio_button_#{how}_view").should be_checked
+end
+

data/features/step_definitions/text_steps.rb

@@ -0,0 +1,19 @@
+When /^I\'m on the search view filter screen$/ do
+  on(MainMenuScreen).views
+  on(ViewsMenuScreen).controls
+  on(ControlsMenuScreen).light_theme
+end
+
+Then /^I am am given the hint "(.*?)" for the "(.*?)" control$/ do |hint, value|
+  on(ControlsScreen) do |screen|
+    view = screen.send("#{value}_view")
+    view.hint.should == hint
+  end
+end
+
+Then /^I am am given the description "(.*?)" for the "(.*?)" control$/ do |description, value|
+  on(ControlsScreen) do |screen|
+    view = screen.send("#{value}_view")
+    view.description.should == description
+  end
+end

data/features/step_definitions/view_steps.rb

@@ -15,6 +15,15 @@ When /^I am observing custom views$/ do
   on(ViewsMenuScreen).custom
 end
 
-Then /^I should see the "(.*?)" custom view$/ do |view_text|
-  on(CustomViewScreen).send view_text
+Then /^I should be able to click a view by "(.*?)"$/ do |how|
+  on(ControlsScreen).send "view_field_#{how}"
+end
+
+Then /^the "(.*?)" field identified by "(.*?)" can determine the following properties:$/ do |what, how, properties|
+  screen = ControlsScreen.new
+  view = screen.send "#{what}_field_#{how}_view"
+  properties.hashes.each do |property|
+    result = view.send("#{property["property"]}?")
+    result.to_s.should eq(property["value"]), "for field #{property["property"]}"
+  end
 end

data/features/support/env.rb

@@ -9,13 +9,13 @@ require 'gametel/navigation'
 World(Gametel::Navigation)
 
 keystore = {
-  :path => '~/.android/debug.keystore',
+  :path => 'features/support/debug.keystore',
   :alias => 'androiddebugkey',
   :password => 'android',
   :keystore_password => 'android'
 }
 
-server = Brazenhead::Server.new('ApiDemos/bin/ApiDemos.apk', keystore)
+server = Brazenhead::Server.new('features/support/ApiDemos.apk', keystore)
 
 class Driver
   include Brazenhead

data/features/support/screens/buttons_screen.rb

@@ -4,7 +4,7 @@ class ButtonScreen
   button(:normal_text, :text => 'Normal')
   button(:normal_index, :index => 0)
   button(:small, :text => 'Small')
-  button(:on_off, :index => 2)
+  button(:on_off_index, :index => 2)
   button(:on_off_id, :id => 'button_toggle')
   
 end

data/features/support/screens/controls_screen.rb

@@ -4,12 +4,20 @@ class ControlsScreen
   text(:text_field_index, :index => 0)
   text(:text_field_id, :id => 'edit')
   text(:text_field_name, :content_description => 'Edit Description')
+  view(:view_field_id, :id => 'edit')
+  view(:view_field_text, :text => 'textColorPrimary')
+  text(:button_field_id, :id => 'button')
+  text(:button_disabled_field_id, :id => 'button_disabled')
   button(:enabled_save, :index => 0)
   button(:disabled_save, :index => 1)
+  button(:button_field_index, :index => 1)
+  button(:button_field_text, :text => 'Save')
   checkbox(:checkbox_index, :index => 0)
   checkbox(:checkbox_text, :text => 'Checkbox 2')
   checkbox(:checkbox_id, :id => 'check1')
   radio_button(:radio_button_text, :text => 'RadioButton 1')
   radio_button(:radio_button_id, :id => 'radio2')
+  radio_button(:radio_button_index, :index => 1)
   spinner(:spinner_id, :id => 'spinner1')
+  spinner(:spinner_index, :index => 0)
 end

data/features/support/screens/seek_bar_screen.rb

@@ -0,0 +1,6 @@
+class SeekBarScreen
+  include Gametel
+
+  progress(:progress_id, :id => 'seek')
+  progress(:progress_index, :index => 1)
+end

data/features/text.feature

@@ -24,7 +24,38 @@ Feature: Interacting with the standard text field
     When I clear the text from the text field identified by "id"
     Then I should not have the value "example text" on the control screen
 
+  Scenario: Retrieving the hint text identified by id
+    When I'm on the search view filter screen
+    Then I am am given the hint "Some Hint Text" for the "text_field_id" control
+
+  Scenario: Retrieving the content description text identified by id
+    When I'm on the search view filter screen
+    Then I am am given the description "Edit Description" for the "text_field_id" control
+
   Scenario: Retrieving text identified by index
     Given I'm on the controls screen
     When I enter "example text" into the text field identified by "id"
     Then I should have the value "example text" in the text field identified by "id"
+
+  Scenario: Determining if a text view is enabled
+    When I'm on the controls screen
+    Then the "text" field's "enabled" property is "true"
+
+  Scenario: Determining if a button view is enabled
+    When I'm on the controls screen
+    Then the "button" field's "enabled" property is "true"
+
+  Scenario: Determining if a button view is disabled
+    When I'm on the controls screen
+    Then the "button_disabled" field's "enabled" property is "false"
+
+  Scenario: Determining properties of a text view
+    When I'm on the controls screen
+    Then the "text" field identified by "id" can determine the following properties:
+      | property  | value |
+      | clickable | true  |
+      | enabled   | true  |
+      | focusable | true  |
+      | focused   | true  |
+      | selected  | false |
+      | shown     | true  |

data/features/view.feature

@@ -6,5 +6,16 @@ Feature: Interacting with view elements
     Then I should see the "Command one" list item
 
   Scenario: Clicking on view by their text
-    When I am observing custom views
-    Then I should see the "blue" custom view
+    When I'm on the controls screen
+    Then I should be able to click a view by "text"
+
+  Scenario: Determining properties of a view
+    When I'm on the controls screen
+    Then the "view" field identified by "id" can determine the following properties:
+      | property  | value |
+      | clickable | true  |
+      | enabled   | true  |
+      | focusable | true  |
+      | focused   | true  |
+      | selected  | false |
+      | shown     | true  |

data/lib/gametel.rb

@@ -2,11 +2,15 @@ require 'gametel/accessors'
 require 'gametel/navigation'
 require 'gametel/version'
 require 'gametel/platforms/brazenhead_platform'
+require 'gametel/views'
 
 module Gametel
 
   attr_reader :platform
 
+  ROBOTIUM_LEFT = 21
+  ROBOTIUM_RIGHT = 22
+
   def self.included(cls)
     cls.extend Gametel::Accessors
   end
@@ -43,6 +47,23 @@ module Gametel
     platform.back
   end
 
+  #
+  # Go back to a specific activity
+  #
+  def back_to(activity)
+    platform.go_back_to_activity activity
+  end
+
+  def current_activity
+    platform.chain_calls do |device|
+      device.get_current_activity
+      device.get_class
+      device.get_simple_name
+    end
+
+    platform.last_response.body.gsub('"','')
+  end
+
   #
   # Press the enter key
   #
@@ -63,6 +84,20 @@ module Gametel
   def scroll_up
     platform.scroll_up
   end
+  
+  #
+  # scroll left
+  #
+  def scroll_left
+    platform.scroll_to_side ROBOTIUM_LEFT
+  end
+
+  #
+  # scroll right
+  #
+  def scroll_right
+    platform.scroll_to_side ROBOTIUM_RIGHT
+  end
 
   #
   # Wait for the provided text to appear

data/lib/gametel/accessors.rb

@@ -1,12 +1,12 @@
 module Gametel
   module Accessors
     #
-    # Generates two method to enter text into a text field and to
-    # clear the text field
+    # Generates methods to enter text into a text field, clear the text
+    # field, get the hint as well as the description
     #
     # @example
     #   text(:first_name, :index => 0)
-    #   # will generate 'first_name', 'first_name=' and 'clear_first_name' methods
+    #   # 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  [Hash]  locator for how the text is found  The valid
@@ -22,16 +22,19 @@ module Gametel
         platform.enter_text(value, locator)
       end
       define_method("clear_#{name}") do
-          platform.clear_text(locator)
+        platform.clear_text(locator)
+      end
+      define_method("#{name}_view") do
+        Gametel::Views::Text.new(platform, locator)
       end
     end
 
     #
-    # Generates one method to click a button.
+    # Generates a method to click a button and determine if it is enabled.
     #
     # @example
     #   button(:save, :text => 'Save')
-    #   # will generate 'save' method
+    #   # will generate 'save' and 'save_enabled?' methods
     #
     # @param  [String]  the name used for the generated methods
     # @param  [Hash]  locator for how the button is found  The valid
@@ -44,6 +47,9 @@ module Gametel
       define_method(name) do
         platform.press_button(locator)
       end
+      define_method("#{name}_view") do
+        Gametel::Views::Button.new(platform, locator)
+      end
     end
 
     #
@@ -95,6 +101,9 @@ module Gametel
       define_method(name) do
         platform.click_checkbox(locator)
       end
+      define_method("#{name}_view") do
+        Gametel::Views::CheckBox.new(platform, locator)
+      end
     end
 
     #
@@ -108,12 +117,16 @@ module Gametel
     # @param  [Hash]  locator for how the checkbox is found  The valid
     # keys are:
     #  * :text
+    #  * :index
     #  * :id
     #
     def radio_button(name, locator)
       define_method(name) do
         platform.click_radio_button(locator)
       end
+      define_method("#{name}_view") do
+        Gametel::Views::RadioButton.new(platform, locator)
+      end
     end
 
     #
@@ -131,6 +144,39 @@ module Gametel
       define_method(name) do
         platform.click_view(locator)
       end
+      define_method("#{name}_view") do
+        Gametel::Views::View.new(platform, locator)
+      end
+    end
+
+    #
+    # Generates methods to get an set the progress as well as
+    # the secondary progress
+    # @example
+    #   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  [Hash]  locator indicating an id for how the progress bar is found.
+    # The only valid keys are:
+    #   * :id
+    #
+    def progress(name, locator)
+      define_method("#{name}") do
+        platform.get_progress(locator)
+      end
+      define_method("#{name}_max") do
+        platform.get_progress_max(locator)
+      end
+      define_method("#{name}_secondary") do
+        platform.get_secondary_progress(locator)
+      end
+      define_method("#{name}=") do |value|
+        platform.set_progress(locator, value)
+      end
+      define_method("#{name}_secondary=") do |value|
+        platform.set_secondary_progress(locator, value)
+      end
     end
 
     #
@@ -146,9 +192,9 @@ module Gametel
     #
     def spinner(name, locator)
       define_method(name) do
-        platform.get_spinner_value(locator) if locator[:id]
+        platform.get_spinner_value(locator)
       end
     end
   end
 end
-  
+