briar 0.0.7 → 0.0.8

data/lib/briar/control/button.rb

@@ -24,7 +24,7 @@ module Briar
       end
 
       def button_is_enabled (name)
-        enabled = query("button marked:'#{name}' isEnabled:1", :accessibilityIdentifier).first
+        enabled = query("button marked:'#{name}' isEnabled:1", AI).first
         enabled.eql? name
       end
 
@@ -40,6 +40,40 @@ module Briar
         touch("button marked:'#{name}'")
         step_pause
       end
+
+      def touch_button_and_wait_for_view (button_id, view_id)
+        touch_transition("button marked:'#{button_id}'",
+                         "view marked:'#{view_id}'",
+                         {:timeout=>TOUCH_TRANSITION_TIMEOUT,
+                          :retry_frequency=>TOUCH_TRANSITION_RETRY_FREQ})
+      end
+
+      def touch_button_and_wait_for_view_to_disappear (button_id, view_id, timeout=1.0)
+        touch_button button_id
+        wait_for_view_to_disappear view_id, timeout
+      end
+
+
+      def wait_for_button (button_id, timeout=1.0)
+        msg = "waited for '#{timeout}' seconds but did not see button '#{button_id}'"
+        wait_for(:timeout => timeout,
+                 :retry_frequency => 0.2,
+                 :post_timeout => 0.1,
+                 :timeout_message => msg ) do
+          button_exists? button_id
+        end
+      end
+
+      def wait_for_button_with_title (button_id, title, timeout=1.0)
+        msg = "waited for '#{timeout}' seconds but did not see button '#{button_id}' with title '#{title}'"
+        wait_for(:timeout => timeout,
+                 :retry_frequency => 0.2,
+                 :post_timeout => 0.1,
+                 :timeout_message => msg ) do
+          button_exists? button_id
+        end
+        should_see_button_with_title(button_id, title)
+      end
     end
   end
 end

data/lib/briar/control/segmented_control.rb

@@ -1,22 +1,83 @@
-require "calabash-cucumber"
-
 module Briar
   module Control
     module Segmented_Control
-      def index_of_control_with_name (control_name)
-        controls = query("segmentedControl", :accessibilityIdentifier)
-        controls.index(control_name)
+
+      def query_str_for_control (control_id=nil)
+        if control_id.nil?
+          'segmentedControl'
+        else
+          "segmentedControl marked:'#{control_id}'"
+        end
+      end
+
+      def index_of_control_with_id (control_id)
+        controls = query('segmentedControl', AI)
+        controls.index(control_id)
       end
 
-      def index_of_segment_with_name_in_control_with_name(segment_name, control_name)
-        control_idx = index_of_control_with_name (control_name)
+      def index_of_segment_with_name_in_control_with_id(segment_id, control_id)
+        control_idx = index_of_control_with_id (control_id)
         if control_idx
           titles = query("segmentedControl index:#{control_idx} child segment child segmentLabel", :text).reverse
-          titles.index(segment_name)
+          titles.index(segment_id)
         else
           nil
         end
       end
+
+      def should_see_segment_with_selected_state (control_id, segment_id, selected_state)
+        @segment_id = segment_id
+        @control_id = control_id
+        control_idx = index_of_control_with_id control_id
+        if control_idx
+          segment_idx = index_of_segment_with_name_in_control_with_id(segment_id, control_id)
+          if segment_idx
+            selected_arr = query("segmentedControl index:#{control_idx} child segment", :isSelected).reverse
+            res = selected_arr[segment_idx]
+            unless res.to_i == selected_state
+              screenshot_and_raise "found segment named #{segment_id} in  #{control_id}, but it was _not_ selected"
+            end
+          else
+            screenshot_and_raise "could not find #{segment_id} in #{control_id}"
+          end
+        else
+          screenshot_and_raise "could not find control named #{control_id}"
+        end
+      end
+
+      def touch_segment(segment_id, control_id)
+        @segment_id = segment_id
+        @control_id = control_id
+        idx = index_of_control_with_id control_id
+        if idx
+          touch("segmentedControl index:#{idx} child segment child segmentLabel marked:'#{segment_id}'")
+          step_pause
+        else
+          screenshot_and_raise "could not find segmented control with name #{control_id}"
+        end
+      end
+
+      def should_see_control_with_segment_titles (control_id, segment_titles)
+        @control_id = control_id
+        should_see_view control_id
+        tokens = segment_titles.split(',')
+        tokens.each do |token|
+          token.strip!
+        end
+        idx = index_of_control_with_id control_id
+        if idx
+          actual_titles = query("segmentedControl index:#{idx} child segment child segmentLabel", :text).reverse
+          counter = 0
+          tokens.zip(actual_titles).each do |expected, actual|
+            unless actual.eql? expected
+              screenshot_and_raise "when inspecting #{control_id} i expected title: #{expected} but found: #{actual} at index #{counter}"
+            end
+            counter = counter + 1
+          end
+        else
+          screenshot_and_raise "could not find segmented control with name #{control_id}"
+        end
+      end
     end
   end
 end

data/lib/briar/control/slider.rb

@@ -1,8 +1,8 @@
-require 'calabash-cucumber'
-
 module Briar
   module Control
     module Slider
+      # WARNING: requires a tap gesture recognizer on the slider
+      # you have been warned
       def change_slider_value_to(slider_id, value)
         target = value.to_f
         if target < 0

data/lib/briar/cucumber.rb

@@ -7,9 +7,11 @@ World(Briar::Bars)
 World(Briar::Control::Button)
 World(Briar::Control::Segmented_Control)
 World(Briar::Control::Slider)
-World(Briar::Picker::Date)
 World(Briar::Picker_Shared)
 World(Briar::Picker)
+World(Briar::Picker::DateCore)
+World(Briar::Picker::DateManipulation)
+World(Briar::Picker::DateSteps)
 World(Briar::Email)
 World(Briar::ImageView)
 World(Briar::Keyboard)

data/lib/briar/email.rb

@@ -12,7 +12,7 @@ module Briar
     end
 
     def email_body_contains? (text)
-      if gestalt.is_ios6?
+      if device.ios6?
         warn 'WARN: iOS6 detected - cannot test for email body text https://groups.google.com/d/topic/calabash-ios/Ff3XFsjp-B0/discussion'
       else
         !query("view:'MFComposeTextContentView' {text LIKE '*#{text}*'}").empty?
@@ -24,7 +24,7 @@ module Briar
     end
 
     def email_subject_is? (text)
-      if gestalt.is_ios6?
+      if device.ios6?
         warn 'WARN: iOS6 detected - cannot test for email subject text https://groups.google.com/d/topic/calabash-ios/Ff3XFsjp-B0/discussion'
       else
         email_subject.eql? text
@@ -32,7 +32,7 @@ module Briar
     end
 
     def email_subject_has_text_like? (text)
-      if gestalt.is_ios6?
+      if device.ios6?
         warn 'WARN: iOS6 detected - cannot test for email subject text https://groups.google.com/d/topic/calabash-ios/Ff3XFsjp-B0/discussion'
       else
         !query("view:'MFComposeSubjectView' {text LIKE '*#{text}*'}").empty?
@@ -44,7 +44,7 @@ module Briar
     end
 
     def email_to_field_is? (text)
-      if gestalt.is_ios6?
+      if device.ios6?
         warn 'WARN: iOS6 detected - cannot test for email to field https://groups.google.com/d/topic/calabash-ios/Ff3XFsjp-B0/discussion'
       else
         email_to.eql? text
@@ -72,27 +72,33 @@ module Briar
     end
 
     def is_ios6_mail_view
-      gestalt.is_ios6?
+      device.ios6?
     end
 
-    def should_see_mail_view (opts={:wait => true})
-      wait = opts[:wait]
-      wait_for_animation if wait || wait == nil
-      unless is_ios5_mail_view || is_ios6_mail_view
-        screenshot_and_raise 'expected to see email view'
+    def should_see_mail_view (timeout=1.0)
+      if device.ios6?
+        screenshot_and_raise 'iOS6 detected - cannot test for email viewhttps://groups.google.com/d/topic/calabash-ios/Ff3XFsjp-B0/discussion'
+      end
+
+      msg = "waited for '#{timeout}' seconds but did not see email compose view"
+      wait_for(:timeout => timeout,
+               :retry_frequency => 0.2,
+               :post_timeout => 0.1,
+               :timeout_message => msg ) do
+        is_ios5_mail_view
       end
     end
 
     def device_can_send_email
-      return true if gestalt.is_simulator?
+      return true if device.simulator?
       backdoor('calabash_backdoor_configured_for_mail:', 'ignorable').eql? 'YES'
     end
 
     def delete_draft_and_wait_for (view_id)
-      if gestalt.is_ios6?
+      if device.ios6?
         warn_about_ios6_email_view
       else
-        should_see_mail_view({:wait => false})
+        should_see_mail_view
         touch_navbar_item 'Cancel'
         wait_for_animation
         touch_transition("button marked:'Delete Draft'",

data/lib/briar/keyboard.rb

@@ -1,7 +1,9 @@
-require 'calabash-cucumber'
+
+
 
 module Briar
   module Keyboard
+    # these are not ready for prime time# the methods for setting auto correct, spell check, etc. are not ready
     UITextAutocapitalizationTypeNone = 0
     UITextAutocapitalizationTypeWords = 1
     UITextAutocapitalizationTypeSentences = 2
@@ -13,21 +15,51 @@ module Briar
     UITextSpellCheckingTypeNo = 1
     UITextSpellCheckingTypeYes = 2
 
+    @text_entered_by_keyboard = ''
 
-    def should_see_keyboard
-      res = element_exists('keyboardAutomatic')
-      unless res
-        screenshot_and_raise 'Expected keyboard to be visible.'
+    def should_see_keyboard (timeout=1.0)
+      msg = "waited for '#{timeout}' seconds but did not see keyboard"
+      wait_for(:timeout => timeout,
+               :retry_frequency => 0.2,
+               :post_timeout => 0.1,
+               :timeout_message => msg ) do
+        element_exists('keyboardAutomatic')
       end
     end
 
-    def should_not_see_keyboard
-      res = element_exists('keyboardAutomatic')
-      if res
-        screenshot_and_raise 'Expected keyboard to not be visible.'
+    def should_not_see_keyboard (timeout=1.0)
+      msg = "waited for '#{timeout}' seconds but keyboard did not disappear"
+      wait_for(:timeout => timeout,
+               :retry_frequency => 0.2,
+               :post_timeout => 0.1,
+               :timeout_message => msg ) do
+        element_does_not_exist 'keyboardAutomatic'
       end
     end
 
+    def briar_keyboard_enter_text (text)
+      if device.ios7?
+        pending('keyboard playback is not available on iOS 7')
+      end
+      @text_entered_by_keyboard = keyboard_enter_text text
+    end
+
+    def briar_keyboard_set_text (text, view_id, &do_for_each_char)
+      unless device.ios7?
+        warn 'this is hack for iOS 7 (playback not available yet) - use briar_keyboard_enter_text'
+      end
+
+      query_str = "view marked:'#{view_id}'"
+      accum = ''
+      text.chars.to_a.each { |char|
+        accum << char
+        query(query_str, {setText:accum})
+        do_for_each_char.call(view_id, accum)
+        @text_entered_by_keyboard = accum
+        sleep(0.05)
+      }
+    end
+
     # is it possible to find what view the keyboard is responding to?
     def autocapitalization_type ()
       if !query('textView index:0').empty?
@@ -55,7 +87,7 @@ module Briar
 
     def set_autocorrect (type)
       if !query('textView index:0').empty?
-        query('textView index:0', [{setAutocorrectionType:type}])
+        query('textView index:0',  [{setAutocorrectionType:type}])
       elsif !query('textField index:0').empty?
         query('textField index:0', [{setAutocorrectionType:type}])
       else
@@ -77,6 +109,14 @@ module Briar
       end
     end
 
+
+
+    def clear_text(uiquery)
+      text_fields_modified = map(uiquery, :setText, '')
+      screenshot_and_raise "could not find text field #{uiquery}" if text_fields_modified.empty?
+      text_fields_modified
+    end
+
     #def is_capitalize_none (cap_type)
     #  cap_type == UITextAutocapitalizationTypeNone
     #end

data/lib/briar/label.rb

@@ -30,5 +30,25 @@ module Briar
         screenshot_and_raise "i expected that i would not see '#{text}' in label named '#{name}'"
       end
     end
+
+    def wait_for_label (label_id, timeout=1.0)
+      msg = "waited for '#{timeout}' seconds but did not see label '#{label_id}'"
+      wait_for(:timeout => timeout,
+               :retry_frequency => 0.2,
+               :post_timeout => 0.1,
+               :timeout_message => msg ) do
+        label_exists? label_id
+      end
+    end
+
+    def touch_label (label_id, wait_for_view_id=nil)
+      wait_for_label label_id
+      touch("label marked:'#{label_id}'")
+      if wait_for_view_id != nil
+        wait_for_view wait_for_view_id
+      else
+        step_pause
+      end
+    end
   end
 end

data/lib/briar/picker/date_picker.rb

@@ -1,64 +1,5 @@
-require 'date'
-require 'calabash-cucumber'
-
-# 0.2 is too fast because the picker does not pause at the date long enough for
-# the date to change.  0.3 seems to work, but 0.4 is best i think.
-PICKER_STEP_PAUSE = 0.4.to_f
-PICKER_AM = 'AM'
-PICKER_PM = 'PM'
-
-# most locales and situations prefer _not_ to have leading zeros on hours in 24h
-# see usage below to find out when and if the zeros are stripped
-PICKER_24H_TIME_FMT = '%H:%M'
-PICKER_12H_TIME_FMT = '%l:%M %p'
-PICKER_ISO8601_TIME_FMT = '%H:%M'
-
-PICKER_REMOVE_LEADING_ZERO_REGEX = /\A^0/
-
-# 24h locales - Fri 16 Nov - 24h locales
-PICKER_24H_DATE_FMT = '%a %e %b'
-# common format for US Fri Nov 16
-PICKER_12H_DATE_FMT = '%a %b %e'
-
-# our canonical format for testing if two dates are the same
-PICKER_ISO8601_DATE_FMT = '%Y-%m-%d'
-PICKER_ISO8601_DATE_TIME_FMT = '%Y-%m-%d %H:%M'
-
-# when we are using the date picker category, this is the format of the string
-# we will send to setDateWithString:animated:
-#
-# ex. 2012_11_18_16_45
-PICKER__RUBY___SET_PICKER_DATE__DATE_AND_TIME_FMT_ZONED = '%Y_%m_%d_%H_%M_%z'
-PICKER__OBJC___SET_PICKER_DATE__DATE_AND_TIME_FMT_ZONED = 'yyyy_MM_dd_HH_mm_Z'
-PICKER__RUBY___SET_PICKER_DATE__DATE_AND_TIME_FMT = '%Y_%m_%d_%H_%M'
-PICKER__OBJC___SET_PICKER_DATE__DATE_AND_TIME_FMT = 'yyyy_MM_dd_HH_mm'
-
-
-# iOS 5
-PICKER_VIEW_CLASS_IOS5 = 'datePickerView'
-PICKER_VIEW_CLASS_IOS6 = "view:'_UIDatePickerView'"
-
-UIDatePickerModeTime = 0
-UIDatePickerModeDate = 1
-UIDatePickerModeDateAndTime = 2
-UIDatePickerModeCountDownTimer = 3
-
-
-module Briar
-  module Picker
-    module Date
-      include Briar::Picker_Shared
-=begin
- TODO use minute interval modes 5,10,15 etc. to test if date is reachable
- TODO use the max/min dates to determine if a date is reachable
- TODO when manually moving the picker wheels - speed things up by figuring out which direction to scroll the hour/minutes
-=end
-
-
 =begin
 
-requires: picker_common_step.rb
-
 examples
 
     Then I should see that the date picker is in time mode
@@ -76,567 +17,130 @@ examples
     Then I change the picker to 2 days ago at "9:30 PM"
     Then I should see that the "checkin" row has the time I just entered in the "status" label
 
-
-this file provides 2 ways to manipulate a date picker:
-
-1. AUTOMATIC <== setting the date directly using a UIDatePicker category method
-2. MANUAL <== setting the date by manipulating the picker wheels
-
-there are pros and cons for each approach.
-
-AUTOMATIC pros
-1. the date selection happens almost instantly
-2. there is very little parsing of date and time strings <== fewer errors
-3. it is accomplished in a small number of lines of code <== fewer errors
-
-AUTOMATIC cons
-1. it does not really simulate the user interaction with the picker wheels.
-
-   this is actually very hard to do because there are cases where changing
-   one column will cause another column to change.  for example: when in 12h
-   mode, if the user rotates the hour to 12, then the period column will change.
-   this change cannot be detected on the calabash side so either it has to be
-   guarded against (don't rotate past 12) or the AM/PM must be changed last.
-
-2. requires a category on UIDatePicker <== pollutes the application environment
-3. uses the query language to make changes to application state <== doesn't seem kosher
-
-   in my mind this is a little like the keyboard_enter_text because that method
-   enters text in a way that no user can (i.e. so fast)
-
-MANUAL pros
-1. it directly simulates what a user does
-
-
-MANUAL cons
-1. it is very slow <== long tests are a drag
-2. there is a lot of string <==> date parsing <== more errors
-3. lots of special case handling <== more errors
-
-
-to use the automatic mode, include this category in your CALABASH target
-
-=== BEGIN ===
-@interface UIDatePicker (CALABASH_ADDITIONS)
-- (NSString *) hasCalabashAdditions:(NSString *) aSuccessIndicator;
-- (BOOL) setDateWithString:(NSString *)aString
-                    format:(NSString *) aFormat
-                  animated:(BOOL) aAnimated;
-@end
-
-
-@implementation UIDatePicker (CALABASH_ADDITIONS)
-- (NSString *) hasCalabashAdditions:(NSString *) aSuccessIndicator {
-  return aSuccessIndicator;
-}
-
-- (BOOL) setDateWithString:(NSString *)aString
-                    format:(NSString *) aFormat
-                  animated:(BOOL) aAnimated {
-  NSDateFormatter *df = [[NSDateFormatter alloc] init];
-  [df setDateFormat:aFormat];
-  NSDate *date = [df dateFromString:aString];
-  if (date == nil) return NO;
-  [self setDate:date animated:aAnimated];
-  return YES;
-}
-@end
-=== END ===
-
 =end
 
-## 0.2 is too fast because the picker does not pause at the date long enough for
-## the date to change.  0.3 seems to work, but 0.4 is best i think.
-#      PICKER_STEP_PAUSE = 0.4.to_f
-#      PICKER_AM = 'AM'
-#      PICKER_PM = 'PM'
-#
-## most locales and situations prefer _not_ to have leading zeros on hours in 24h
-## see usage below to find out when and if the zeros are stripped
-#      PICKER_24H_TIME_FMT = '%H:%M'
-#      PICKER_12H_TIME_FMT = '%l:%M %p'
-#      PICKER_ISO8601_TIME_FMT = '%H:%M'
-#
-#      PICKER_REMOVE_LEADING_ZERO_REGEX = /\A^0/
-#
-## 24h locales - Fri 16 Nov - 24h locales
-#      PICKER_24H_DATE_FMT = '%a %e %b'
-## common format for US Fri Nov 16
-#      PICKER_12H_DATE_FMT = '%a %b %e'
-#
-## our canonical format for testing if two dates are the same
-#      PICKER_ISO8601_DATE_FMT = '%Y-%m-%d'
-#      PICKER_ISO8601_DATE_TIME_FMT = '%Y-%m-%d %H:%M'
-#
-## when we are using the date picker category, this is the format of the string
-## we will send to setDateWithString:animated:
-##
-## ex. 2012_11_18_16_45
-#      PICKER__RUBY___SET_PICKER_DATE__DATE_AND_TIME_FMT = '%Y_%m_%d_%H_%M_%z'
-#      PICKER__OBJC___SET_PICKER_DATE__DATE_AND_TIME_FMT = 'yyyy_MM_dd_HH_mm_Z'
-#
-## iOS 5
-#      PICKER_VIEW_CLASS_IOS5 = 'datePickerView'
-#      PICKER_VIEW_CLASS_IOS6 = "view:'_UIDatePickerView'"
-
-# testing for existence
-      def should_see_date_picker (picker_id)
-        res = !query("datePicker marked:'#{picker_id}'").empty?
-        unless res
-          screenshot_and_raise "could not find date picker #{picker_id}"
-        end
-      end
-
-# getting dates from the picker
-
-      def picker_date_time
-        res = query('datePicker', :date)
-        screenshot_and_raise 'expected to see a date picker' if res.empty?
-        DateTime.parse(res.first)
-      end
-
-# appledoc ==> The property is an NSDate object or nil (the default), which
-# means no maximum date.
-      def picker_maximum_date_time
-        res = query('datePicker', :maximumDate)
-        screenshot_and_raise 'expected to see a date picker' if res.empty?
-        res.first != nil ? DateTime.parse(res.first) : nil
-      end
-
-# appledoc ==> The property is an NSDate object or nil (the default), which
-# means no minimum date.
-      def picker_minimum_date_time
-        res = query('datePicker', :minimumDate)
-        screenshot_and_raise 'expected to see a date picker' if res.empty?
-        res.first != nil ? DateTime.parse(res.first) : nil
-      end
-
-# automatic date setting
-
-# checking to see if the picker is visible and has the calabash category
-# additions
-      def picker_has_calabash_additions
-        success_value = '1'
-        res = query('datePicker', [{hasCalabashAdditions:success_value}])
-        screenshot_and_raise 'picker is not visible' if res.empty?
-        res.first.eql? success_value
-      end
-
-
-      def date_time_or_time_str_is_in_24h (date_time_or_time_str)
-        date_time_or_time_str[-1, 1].scan(/^[a-zA-Z]/).empty?
-      end
-
-      def date_str_is_in_24h (date_str)
-        !date_str[-1, 1].scan(/^[a-zA-Z]/).empty?
-      end
-
-      def date_str_to_send_to_picker_from_time_str (time_str, format=PICKER__RUBY___SET_PICKER_DATE__DATE_AND_TIME_FMT)
-        time_in_24h = date_time_or_time_str_is_in_24h time_str
-        time_fmt = time_in_24h ? PICKER_24H_TIME_FMT : PICKER_12H_TIME_FMT
-        date_fmt = time_in_24h ? PICKER_24H_DATE_FMT : PICKER_12H_DATE_FMT
-        date_str = picker_date_time.strftime(date_fmt).squeeze(' ').strip
-
-        date_time_str = "#{date_str} #{time_str}"
-        date_time_fmt = "#{date_fmt} #{time_fmt}"
-
-        date_time = DateTime.strptime(date_time_str, date_time_fmt)
-        date_time.strftime(format).squeeze(' ').strip
-      end
-
-
-      def date_str_to_send_to_picker_from_date_str (date_str, format=PICKER__RUBY___SET_PICKER_DATE__DATE_AND_TIME_FMT)
-        date_in_24h = date_str_is_in_24h (date_str)
-        time_fmt = date_in_24h ? PICKER_24H_TIME_FMT : PICKER_12H_TIME_FMT
-        date_fmt = date_in_24h ? PICKER_24H_DATE_FMT : PICKER_12H_DATE_FMT
-        time_str = picker_date_time.strftime(time_fmt).squeeze(' ').strip
-        date_time_str = "#{date_str} #{time_str}"
-        date_time_fmt = "#{date_fmt} #{time_fmt}"
-
-        date_time = DateTime.strptime(date_time_str, date_time_fmt)
-
-        date_time.strftime(format).squeeze(' ').strip
-      end
-
+module Briar
+  module Picker
+    module DateSteps
+      include Briar::Picker::DateCore
+      include Briar::Picker::DateManipulation
 
-      def set_picker_date_with_date_time_str (date_time_str, opts={:animated => 1,
-                                                                   :objc_format => PICKER__OBJC___SET_PICKER_DATE__DATE_AND_TIME_FMT})
+      # requires a time or date change.  picker does not need to be visible
 
-        res = query('datePicker', [{setDateWithString:date_time_str},
-                                   {format:"#{opts[:objc_format]}"},
-                                   {animated:opts[:animated]}])
+      def should_see_row_has_time_i_just_entered (row_id, label_id, table_id=nil)
+        query_str = query_str_for_row row_id, table_id
+        arr = query("#{query_str} descendant label marked:'#{label_id}'", :text)
+        screenshot_and_raise "could not find '#{label_id}' in the '#{row_id}' row" if arr.empty?
+        actual_text = arr.first
 
-        screenshot_and_raise 'could not find a date picker to query' if res.empty?
-        if res.first.to_i == 0
-          screenshot_and_raise "could not set the picker date with '#{date_time_str}' and '#{PICKER__RUBY___SET_PICKER_DATE__DATE_AND_TIME_FMT}'"
+        unless (actual_text.eql? @date_picker_time_12h) or (actual_text.eql? @date_picker_time_24h)
+          screenshot_and_raise "expected to see '#{@date_picker_time_12h}' or '#{@date_picker_time_24h}' in '#{label_id}' but found '#{actual_text}'"
         end
-
-        # REQUIRED
-        sleep(PICKER_STEP_PAUSE)
-
-        # the query does not create a UIControlEventValueChanged event, so we have to
-        # to a touch event
-
-        # not true :(
-        # if the picker is in time mode, then we dont need to worry about min/max
-
-        # if the picker is date or date time mode, i think the first column is
-        # always scrollable up _and_ it sends an event even if the date is beyond
-        # the maximum date
-        #
-        #picker_max_date = picker_maximum_date_time
-        #picker_min_date = picker_minimum_date_time
-        #target_date = DateTime.strptime(date_time_str, PICKER__RUBY___SET_PICKER_DATE__DATE_AND_TIME_FMT)
-        #
-        #column_one_index = picker_current_index_for_column 0
-        #query('pickerTableView index:0', [{selectRow:column_one_index}, {animated:1}, {notify:1}])
-
-        picker_scroll_down_on_column 0
-        sleep(PICKER_STEP_PAUSE)
-        picker_scroll_up_on_column 0
-        sleep(PICKER_STEP_PAUSE)
-        #if (target_date + 1) > picker_max_date
-        #  picker_scroll_down_on_column 0
-        #  sleep(PICKER_STEP_PAUSE)
-        #  picker_scroll_up_on_column 0
-        #elsif (target_date - 1) < picker_min_date
-        #  picker_scroll_up_on_column 0
-        #  sleep(PICKER_STEP_PAUSE)
-        #  picker_scroll_down_on_column 0
-        #else
-        #  screenshot_and_raise "could not figure out which way to rotate the day column to trigger an event"
-        #end
-
       end
 
-# apple docs
-# You can use this property to set the interval displayed by the minutes wheel
-# (for example, 15 minutes). The interval value must be evenly divided into 60;
-# if it is not, the default value is used. The default and minimum values are 1;
-# the maximum value is 30.
-      def picker_minute_interval
-        screenshot_and_raise 'there is no minute in date mode' if picker_is_in_date_mode
-        screenshot_and_raise 'nyi' if picker_is_in_countdown_mode
-        res = query('datePicker', :minuteInterval)
-        screenshot_and_raise 'expected to see a date picker' if res.empty?
-        @picker_minute_interval = res.first
-      end
-
-      def time_hash_by_add_minutes_until_at_closest_interval (time_str, interval=picker_minute_interval())
-        screenshot_and_raise "interval '#{interval}' is not on (0, 59) which is not allowed" unless (0..59).member?(interval)
-        time = Time.parse(time_str)
-        # normalize to zero
-        time = time - time.sec
-        minute = time.min
-        count = 0
-        unless (minute % interval) == 0
-          begin
-            minute = (minute > 59) ? 0 : minute + 1
-            count = count + 1
-          end
-        end while ((minute % interval) != 0)
-        time = time + (count * 60)
-
-        {:h12 => time.strftime(PICKER_12H_TIME_FMT).squeeze(' ').strip,
-         :h24 => time.strftime(PICKER_24H_TIME_FMT).squeeze(' ').strip.sub(PICKER_REMOVE_LEADING_ZERO_REGEX, ''),
-         :time => time}
-      end
-
-# picker modes
-
-
-
-      def picker_mode
-        res = query('datePicker', :datePickerMode)
-        screenshot_and_raise 'expected to see a date picker' if res.empty?
-        res.first
-      end
-
-      def picker_is_in_time_mode
-        picker_mode == UIDatePickerModeTime
-      end
-
-      def picker_is_in_date_mode
-        picker_mode == UIDatePickerModeDate
-      end
-
-      def picker_is_in_date_and_time_mode
-        picker_mode == UIDatePickerModeDateAndTime
-      end
-
-      def picker_is_in_countdown_mode
-        picker_mode == UIDatePickerModeCountDownTimer
-      end
-
-# columns for different modes
-
-      def picker_column_for_hour
-        screenshot_and_raise 'there is no hour column in date mode' if picker_is_in_date_mode
-        screenshot_and_raise 'nyi' if picker_is_in_countdown_mode
-        picker_is_in_time_mode ? 0 : 1
-      end
-
-      def picker_column_for_minute
-        screenshot_and_raise 'there is no minute column in date mode' if picker_is_in_date_mode
-        screenshot_and_raise 'nyi' if picker_is_in_countdown_mode
-        picker_is_in_time_mode ? 1 : 2
-      end
-
-      def picker_column_for_period
-        screenshot_and_raise 'there is no period column in date mode' if picker_is_in_date_mode
-        screenshot_and_raise 'nyi' if picker_is_in_countdown_mode
-        picker_is_in_time_mode ? 2 : 3
-      end
-
-# 12h or 24h locale
-
-      def picker_is_in_12h_locale
-        screenshot_and_raise '12h/24h mode is not applicable to this mode' if picker_is_in_date_mode or picker_is_in_countdown_mode
-        column = picker_column_for_period
-        !query("pickerTableView index:#{column}").empty?
-      end
-
-      def picker_is_in_24h_locale
-        !picker_is_in_12h_locale
-      end
-
-# dealing with the period (aka meridian) column
-
-# this will cause problems with localizations - for example:
-# pt (lisbon) - a.m./p.m.
-# de - nach/vor
-      def picker_period
-        screenshot_and_raise 'picker is not in 12h mode' if picker_is_in_24h_locale
-        date = picker_date_time
-        date_str = date.strftime(PICKER_12H_TIME_FMT)
-        tokens = date_str.split(' ')
-        tokens.last
-      end
-
-      def picker_period_is_am?
-        picker_period.eql?('AM')
-      end
-
-      def picker_period_is_pm?
-        picker_period.eql?('PM')
-      end
-
-# weekday, month, day, etc
-
-      def picker_weekday
-        screenshot_and_raise 'weekday is not applicable to this mode' if picker_is_in_time_mode or picker_is_in_countdown_mode
-        res = query('datePickerWeekMonthDayView', :weekdayLabel, :text)[2]
-        # need to guard against Today showing
-        res == nil ? Date.today.strftime('%a') : res
-      end
-
-      def picker_month_day
-        screenshot_and_raise 'month/day is not applicable to this mode' if picker_is_in_time_mode or picker_is_in_countdown_mode
-        res = query('datePickerWeekMonthDayView', :dateLabel, :text)[2]
-        picker_iso = picker_date_time.strftime(PICKER_ISO8601_DATE_FMT).squeeze(' ').strip
-        today = Date.today
-        today_iso = today.strftime(PICKER_ISO8601_DATE_FMT).squeeze(' ').strip
-        fmt = picker_is_in_24h_locale ? '%e %b' : '%b %e'
-        (picker_iso.eql? today_iso) ? today.strftime(fmt) : res
-      end
-
-      def picker_date_str
-        "#{picker_weekday} #{picker_month_day}".strip.squeeze(' ')
-      end
-
-      def picker_weekday_month_day_is (weekday_month_day)
-        weekday_month_day.eql? picker_date_str
-      end
-
-# dealing with time
-
-      def picker_hour_24h
-        screenshot_and_raise 'hour is not applicable to this mode' if picker_is_in_countdown_mode or picker_is_in_date_mode
-        #  query always returns as 24h
-        res_ios5 = query(PICKER_VIEW_CLASS_IOS5, :hour).first
-        res_ios6 = query(PICKER_VIEW_CLASS_IOS6, :hour).first
-        return res_ios5 != nil ? res_ios5 : res_ios6
-        #query("datePickerView", :hour).first
-      end
-
-      def picker_hour_24h_str
-        screenshot_and_raise 'hour is not applicable to this mode' if picker_is_in_countdown_mode or picker_is_in_date_mode
-        '%02d' % picker_hour_24h
-      end
-
-      def picker_hour_12h
-        screenshot_and_raise 'hour is not applicable to this mode' if picker_is_in_countdown_mode or picker_is_in_date_mode
-        hour_24h = picker_hour_24h
-        return 12 if hour_24h == 0
-        hour_24h > 12 ? hour_24h - 12 : hour_24h
-      end
-
-      def picker_hour_12h_str
-        screenshot_and_raise 'hour is not applicable to this mode' if picker_is_in_countdown_mode or picker_is_in_date_mode
-        "#{picker_hour_12h}"
-      end
-
-      def picker_hour_24h_is (target_hour)
-        target_hour == picker_hour_24h
+      def change_minute_interval_on_picker (target_interval, picker_id=nil)
+        query_str = should_see_date_picker picker_id
+        res = query(query_str, [{setMinuteInterval: target_interval.to_i}])
+        if res.empty?
+          screenshot_and_raise "could not change the minute interval with query '#{query_str}'"
+        end
+        step_pause
+        @picker_minute_interval = target_interval.to_i
       end
 
-      def picker_hour_12h_is (target_hour)
-        target_hour == picker_hour_12h
-      end
+      # does not require a time or date change. picker needs to be visible
+      def should_see_row_has_label_with_time_on_picker(row_id, label_id, options={:picker_id => nil,
+                                                                                  :table_id => nil})
+        picker_id = options != nil ? options[:picker_id] : nil
+        should_see_date_picker picker_id
+        table_id = options != nil ? options[:table_id] : nil
+        query_str = query_str_for_row_content row_id, table_id
+        arr = query("#{query_str} label marked:'#{label_id}'", :text)
 
-      def picker_hour_is (target_hour)
-        picker_is_in_24h_locale ? picker_hour_24h_is(target_hour) : picker_hour_12h_is(target_hour)
-      end
-
-      def picker_minute
-        screenshot_and_raise 'hour is not applicable to this mode' if picker_is_in_countdown_mode or picker_is_in_date_mode
-        res_ios5 = query(PICKER_VIEW_CLASS_IOS5, :minute).first
-        res_ios6 = query(PICKER_VIEW_CLASS_IOS6, :minute).first
-        return res_ios5 != nil ? res_ios5 : res_ios6
-        #query("datePickerView", :minute).first
-      end
+        if arr.empty?
+          screenshot_and_raise "could not find '#{label_id}' in the '#{row_id}'"
+        end
 
-      def picker_minute_str
-        screenshot_and_raise 'hour is not applicable to this mode' if picker_is_in_countdown_mode or picker_is_in_date_mode
-        '%02d' % picker_minute
-        #"%02d" % query("datePickerView", :minute).first
+        hash = picker_time_strs_hash picker_id
+        time_str_12h = hash[:h12]
+        time_str_24h = hash[:h24]
+        actual_text = arr.first
+        unless (actual_text.eql? time_str_12h) or (actual_text.eql? time_str_24h)
+          screenshot_and_raise "expected to see '#{time_str_12h}' or '#{time_str_24h}' in '#{label_id}' but found '#{actual_text}'"
+        end
       end
 
-      def picker_minute_is (target_minute)
-        target_minute == picker_minute
-      end
+      # requires picker is visible
+      #noinspection SpellCheckingInspection
+      def should_see_time_on_picker_is_now (options = {:picker_id => nil,
+                                                       :convert_time_to_utc => false})
+        picker_time = ruby_time_from_picker options
+        now_time = Time.now
 
-      def picker_time_24h_str
-        screenshot_and_raise 'the time is not applicable for this mode' if picker_is_in_date_mode or picker_is_in_countdown_mode
-        "#{picker_hour_24h_str}:#{picker_minute_str}".strip.sub(PICKER_REMOVE_LEADING_ZERO_REGEX, '')
-      end
+        convert = convert_to_utc_from_options options
+        if convert
+          now_time = Time.now.utc + now_time.gmt_offset
+        end
 
-      def picker_time_12h_str
-        screenshot_and_raise 'the time is not applicable for this mode' if picker_is_in_date_mode or picker_is_in_countdown_mode
-        "#{picker_hour_12h_str}:#{picker_minute_str} #{picker_period}"
-      end
+        # normalize
+        picker_time = picker_time - picker_time.sec
 
-      def picker_time_str
-        screenshot_and_raise 'the time is not applicable for this mode' if picker_is_in_date_mode or picker_is_in_countdown_mode
-        picker_is_in_24h_locale ? picker_time_24h_str : picker_time_12h_str
-      end
 
-      def picker_time_for_other_locale
-        time_str = picker_is_in_24h_locale ? picker_time_24h_str : picker_time_12h_str
-        fmt_str = picker_is_in_24h_locale ? PICKER_12H_TIME_FMT : PICKER_24H_TIME_FMT
-        Time.parse(time_str).strftime(fmt_str).squeeze(' ').strip.sub(PICKER_REMOVE_LEADING_ZERO_REGEX, '')
-      end
+        now_time = now_time - now_time.sec
 
-# date and time
+        picker_id = picker_id_from_options options
+        minute_interval = picker_minute_interval picker_id
 
-      def picker_date_and_time_str_24h
-        screenshot_and_raise 'the time is not applicable for this mode' if picker_is_in_date_mode or picker_is_in_countdown_mode
-        "#{picker_date_str} #{picker_time_24h_str}"
-      end
+        if minute_interval == 1 and not (picker_time == now_time)
+          screenshot_and_raise "should see picker with time '#{now_time}' but found '#{picker_time}'"
+        end
 
-      def picker_date_and_time_str_12h
-        screenshot_and_raise 'the time is not applicable for this mode' if picker_is_in_date_mode or picker_is_in_countdown_mode
-        "#{picker_date_str} #{picker_time_12h_str}"
-      end
+        max_time = now_time + (minute_interval * 60)
+        min_time = now_time - (minute_interval * 60)
 
-      def picker_date_and_time_str
-        "#{picker_date_str} #{picker_time_str}"
+        unless picker_time >= min_time && picker_time <= max_time
+          p "   min: '#{min_time}'"
+          p "target: '#{picker_time}'"
+          p "   max: '#{max_time}'"
+          screenshot_and_raise "should see picker with time between '#{min_time}' and '#{max_time}' but found '#{picker_time}'"
+        end
       end
 
-      def picker_date_and_time_str_for_other_locale
-        "#{picker_date_str} #{picker_time_for_other_locale}"
-      end
+      def change_time_on_picker_to_minutes_from_now (target_minutes, options={:picker_id => nil,
+                                                                              :convert_time_to_utc => false})
 
-# useful
+        picker_id = picker_id_from_options options
+        convert = convert_to_utc_from_options options
 
-      def now_times_map
-        now = Time.new
-        {:h12 => now.strftime(PICKER_12H_TIME_FMT).squeeze(' ').strip,
-         :h24 => now.strftime(PICKER_24H_TIME_FMT).squeeze(' ').strip.sub(PICKER_REMOVE_LEADING_ZERO_REGEX, ''),
-         :time => now}
-      end
+        if convert
+          future = Time.now.gmtime + Time.now.gmtoff + (target_minutes.to_i * 60)
+        else
+          future = Time.new + (60 * target_minutes.to_i)
+        end
 
-      def now_time_24h_locale
-        now_times_map[:h24]
-      end
+        opts = {:picker_id => picker_id,
+                :convert_time_to_utc => convert}
 
-      def now_time_12h_locale
-        now_times_map[:h12]
+        change_time_on_picker_with_time future, opts
       end
 
-# scrolling picker
-
-      def picker_scroll_to_hour (target_hour_int_24h_notation)
-        screenshot_and_raise 'nyi' if picker_is_in_countdown_mode
-        column = picker_column_for_hour
-        limit = 25
-        count = 0
-        unless picker_hour_24h_is target_hour_int_24h_notation
-          begin
-            picker_scroll_up_on_column(column)
-            sleep(PICKER_STEP_PAUSE)
-            count = count + 1
-          end while (not picker_hour_24h_is target_hour_int_24h_notation) and count < limit
-        end
-        unless picker_hour_24h_is target_hour_int_24h_notation
-          screenshot_and_raise "scrolled '#{limit}' but could not change hour to '#{target_hour_int_24h_notation}'"
-        end
-      end
+      def change_time_on_picker_to_minutes_before_now (target_minutes, options={:picker_id => nil,
+                                                                                :convert_time_to_utc => false})
 
-      def picker_scroll_to_minute (target_minute_int)
-        screenshot_and_raise 'nyi' if picker_is_in_countdown_mode
-        column = picker_column_for_minute
-        limit = 61
-        count = 0
-        unless picker_minute_is target_minute_int
-          begin
-            picker_scroll_up_on_column(column)
-            sleep(PICKER_STEP_PAUSE)
-            count = count + 1
-          end while (not picker_minute_is target_minute_int) and count < limit
-        end
-        unless picker_minute_is target_minute_int
-          screenshot_and_raise "scrolled '#{limit}' but could not change minute to '#{target_minute_int}'"
-        end
-      end
+        picker_id = options != nil ? options[:picker_id] : nil
+        convert = options != nil ? options[:convert_time_to_utc] : false
 
-      def picker_scroll_to_period(target_period_str)
-        screenshot_and_raise 'nyi' if picker_is_in_countdown_mode
-        screenshot_and_raise 'period is not applicable to 24h locale' if picker_is_in_24h_locale
-        column = picker_column_for_period
-        limit = 3
-        count = 0
-        unless picker_period.eql? target_period_str
-          begin
-            if picker_period_is_am?
-              scroll_to_row("pickerTableView index:#{column}", 1)
-            else
-              scroll_to_row("pickerTableView index:#{column}", 0)
-            end
-            sleep(PICKER_STEP_PAUSE)
-            count = count + 1
-          end while (not picker_period.eql? target_period_str) and count < limit
+        if convert
+          past = Time.now.gmtime + Time.now.gmtoff - (target_minutes.to_i * 60)
+        else
+          past = Time.new - (60 * target_minutes.to_i)
         end
-        unless picker_period.eql? target_period_str
-          screenshot_and_raise "scrolled '#{limit}' but could not change period to '#{target_period_str}'"
-        end
-      end
 
+        opts = {:picker_id => picker_id,
+                :convert_time_to_utc => convert}
 
-# utility
-
-      def time_strings_are_equivalent (a, b)
-        a_iso_str = Time.parse(a).strftime(PICKER_ISO8601_TIME_FMT)
-        b_iso_str = Time.parse(b).strftime(PICKER_ISO8601_TIME_FMT)
-        a_iso_str.eql? b_iso_str
-      end
-
-      def date_time_strings_are_equivalent (a, b)
-        a_iso_str = Date.parse(a).strftime(PICKER_ISO8601_DATE_TIME_FMT)
-        b_iso_str = Date.parse(b).strftime(PICKER_ISO8601_DATE_TIME_FMT)
-        a_iso_str.eql? b_iso_str
+        change_time_on_picker_with_time past, opts
       end
-
     end
   end
 end