awetestlib 0.1.29-x86-mingw32 → 0.1.30pre1-x86-mingw32

data/lib/awetestlib/regression/drag_and_drop.rb

@@ -2,7 +2,7 @@ module Awetestlib
   module Regression
     # Methods for moving and resizing elements, manipulating the mouse, and checking for relative positioning of elements,
     # including overlap, overlay, etc.
-    # @note Still experimental. Works with IE but not fully tested with Firefox or Chrome in Windows.
+    # @note Still experimental. Works with IE but not fully tested with Firefox or Chrome in Windows using Watir-webdriver.
     #   Not compatible with Mac
     #   Rdoc is work in progress
     module DragAndDrop
@@ -284,8 +284,9 @@ module Awetestlib
         [x, y, w, h]
       end
 
-      def drag_and_drop(browser, how, what, delta_x, delta_y, desc = '')
+      def drag_and_drop_div(browser, how, what, delta_x, delta_y, desc = '')
         #TODO: webdriver
+        #TODO: assumes element is div
         msg = "Drag and drop element :#{how}=>#{what} by x=>#{delta_x} y=>#{delta_y}."
         msg << " #{desc}" if desc.length > 0
         drag_me = browser.div(how, what)
@@ -293,7 +294,7 @@ module Awetestlib
         passed_to_log(msg)
         true
       rescue
-        failed_to_log("Unable to #{msg} '#{$!}'")
+        failed_to_log(unable_to)
       end
 
       def drag_and_drop(x1, y1, dx, dy, speed=nil)

data/lib/awetestlib/regression/runner.rb

@@ -1,20 +1,20 @@
-require 'awetestlib/regression/browser'
-require 'awetestlib/regression/find'
-require 'awetestlib/regression/user_input'
-require 'awetestlib/regression/waits'
-require 'awetestlib/regression/tables'
-require 'awetestlib/regression/page_data'
-require 'awetestlib/regression/drag_and_drop'
-require 'awetestlib/regression/utilities'
-require 'awetestlib/regression/legacy'
-require 'awetestlib/logging'
-require 'awetestlib/regression/validations'
-require 'awetestlib/html_report'
-#require 'rbconfig'
-require 'ostruct'
-require 'active_support'
-require 'active_support/inflector'
-require 'sys/uname'
+require 'awetestlib/regression/browser'  #; load_time
+require 'awetestlib/regression/find'  #; load_time
+require 'awetestlib/regression/user_input'  #; load_time
+require 'awetestlib/regression/waits'  #; load_time
+require 'awetestlib/regression/tables'  #; load_time
+require 'awetestlib/regression/page_data'  #; load_time
+require 'awetestlib/regression/drag_and_drop'  #; load_time
+require 'awetestlib/regression/utilities'  #; load_time
+require 'awetestlib/regression/legacy'  #; load_time
+require 'awetestlib/logging'  #; load_time
+require 'awetestlib/regression/validations'  #; load_time
+require 'awetestlib/html_report'  #; load_time
+#require 'rbconfig'  #; load_time
+require 'ostruct'  #; load_time
+require 'active_support'  #; load_time
+require 'active_support/inflector'  #; load_time
+require 'sys/uname'  #; load_time
 
 module Awetestlib
   module Regression
@@ -22,19 +22,19 @@ module Awetestlib
     class Runner < Awetestlib::Runner
 
     # order matters here
-      include Sys
-      include ActiveSupport::Inflector
-      include Awetestlib::Logging
-      include Awetestlib::Regression::Utilities
-      include Awetestlib::Regression::Browser
-      include Awetestlib::Regression::Find
-      include Awetestlib::Regression::UserInput
-      include Awetestlib::Regression::Waits
-      include Awetestlib::Regression::Tables
-      include Awetestlib::Regression::PageData
-      include Awetestlib::Regression::DragAndDrop
-      include Awetestlib::Regression::Validations
-      include Awetestlib::Regression::Legacy
+      include Sys  #; load_time('include Sys')
+      include ActiveSupport::Inflector  #; load_time('include ActiveSupport::Inflector')
+      include Awetestlib::Logging  #; load_time('include Awetestlib::Logging')
+      include Awetestlib::Regression::Utilities  #; load_time('include Awetestlib::Regression::Utilities')
+      include Awetestlib::Regression::Browser  #; load_time('include Awetestlib::Regression::Browser')
+      include Awetestlib::Regression::Find  #; load_time('include Awetestlib::Regression::Find')
+      include Awetestlib::Regression::UserInput  #; load_time('include Awetestlib::Regression::UserInput')
+      include Awetestlib::Regression::Waits  #; load_time('include Awetestlib::Regression::Waits')
+      include Awetestlib::Regression::Tables  #; load_time('include Awetestlib::Regression::Tables')
+      include Awetestlib::Regression::PageData  #; load_time('include Awetestlib::Regression::PageData')
+      include Awetestlib::Regression::DragAndDrop  #; load_time('include Awetestlib::Regression::DragAndDrop')
+      include Awetestlib::Regression::Validations  #; load_time('include Awetestlib::Regression::Validations')
+      include Awetestlib::Regression::Legacy  #; load_time('include Awetestlib::Regression::Legacy')
 
       ::DEBUG   = 0
       ::INFO    = 1
@@ -59,7 +59,7 @@ module Awetestlib
                     :environment, :environment_name, :environment_url, :environment_nodename,
                     :cycle, :browser_sequence,
                     :output_to_log, :log_path_subdir, :report_all_test_refs,
-                    :timeout
+                    :timeout, :classic_watir, :capture_load_times
 
       #def self.build(options)
       #  #build_class = "Awetestlib::#{script_module_for options[:script_type]}::Runner".constantize
@@ -222,31 +222,31 @@ module Awetestlib
 
           when 'IE'
             if $watir_script
-              require 'watir/ie'
-              require 'watir'
-              require 'watir/process'
-              require 'watirloo'
-              require 'patches/watir'
+              require 'watir/ie'  #; load_time
+              require 'watir'  #; load_time
+              require 'watir/process'  #; load_time
+              require 'watirloo'  #; load_time
+              require 'patches/watir'  #; load_time
               Watir::IE.visible = true
             else
-              require 'watir-webdriver'
+              require 'watir-webdriver'  #; load_time
             end
           when 'FF'
-            require 'watir-webdriver'
+            require 'watir-webdriver'  #; load_time
           when 'S'
-            require 'watir-webdriver'
+            require 'watir-webdriver'  #; load_time
 
           when 'C', 'GC'
-            require 'watir-webdriver'
+            require 'watir-webdriver'  #; load_time
 
           # when 'CL'
-          #   require 'celerity'
-          #   require 'watir-webdriver'
+          #   require 'celerity'  #; load_time
+          #   require 'watir-webdriver'  #; load_timerequi
 
         end
 
         if USING_WINDOWS
-          require 'watir/win32ole'
+          require 'watir/win32ole'  #; load_time
           @ai = ::WIN32OLE.new('AutoItX3.Control')
         else
           # TODO: Need alternative for Mac?
@@ -254,7 +254,7 @@ module Awetestlib
         end
 
         if @xls_path
-          require 'roo'
+          require 'roo'  #; load_time
         end
 
       end

data/lib/awetestlib/regression/tables.rb

@@ -112,8 +112,10 @@ module Awetestlib
       # @param [Fixnum] column_index A number indicating which rows the column to focus the search in.
       # When not supplied, the entire row is searched for *strg*.
       # @param [Boolean] fail_if_found If true log a failure if *strg* _is_ found.
+      # @param [Fixnum] after_index Forces method to accept hit on *strg* only if it occurs
+      # after the row indicated by this argument. When omitted, the first hit is accepted.
       # @return [Fixnum] the index of the row containing *strg*
-      def get_index_of_row_with_text(table, strg, column_index = nil, fail_if_found = false)
+      def get_index_of_row_with_text(table, strg, column_index = nil, fail_if_found = false, after_index = nil)
         debug_to_log("#{__method__}: #{get_callers(5)}")
         if fail_if_found
           msg = 'No '
@@ -140,8 +142,13 @@ module Awetestlib
           end
           dbg << "\n#{index}. [#{text}]"
           if text =~ /#{strg}/
-            found = true
-            break
+            if after_index and index > after_index
+              found = true
+              break
+            else
+              found = true
+              break
+            end
           end
         end
         debug_to_log(dbg)
@@ -329,17 +336,18 @@ module Awetestlib
         hit
       end
 
-      def fetch_array_for_table_column(nc_element, table_index, column_index)
-        ary = []
-        nc_element.tables[table_index].each do |row|
+      def fetch_array_for_table_column(table, column_index, start_row = 2)
+        ary       = []
+        row_count = 0
+        table.each do |row|
+          row_count += 1
           if get_cell_count(row) >= column_index
-            #TODO this assumes column 1 is a number column
-            if row[1].text =~ /\d+/
+            if row_count >= start_row
               ary << row[column_index].text
             end
           end
         end
-        return ary f
+        ary
       end
 
       def fetch_hash_for_table_column(table, column_index, start_row = 2)

data/lib/awetestlib/regression/user_input.rb

@@ -487,7 +487,7 @@ module Awetestlib
       # @param [String] desc Contains a message or description intended to appear in the log and/or report output. Required in this method.
       # @param [String] valid_value The expected value of the text field, e.g., following reformatting.
       # @return (see #click)
-      def set_text_field_and_validate(browser, how, what, value, desc, valid_value = nil)
+      def set_text_field_and_validate(browser, how, what, value, valid_value = nil, desc ='')
         #NOTE: use when value and valid_value differ as with dollar reformatting
         if set_text_field(browser, how, what, value, desc, true)
           expected = valid_value ? valid_value : value

data/lib/awetestlib/regression/utilities.rb

@@ -59,6 +59,31 @@ module Awetestlib
         msg
       end
 
+      def get_date_names(date = Date.today)
+        this_month = date.month
+        if this_month == 12
+          next_month = 1
+        else
+          next_month = this_month + 1
+        end
+        if this_month == 1
+          prev_month = 12
+        else
+          prev_month = this_month - 1
+        end
+
+        month_arr = ['', 'January', 'February', 'March', 'April', 'May', 'June',
+                     'July', 'August', 'September', 'October', 'November', 'December']
+
+        this_month_name = month_arr[this_month]
+        next_month_name = month_arr[next_month]
+        prev_month_name = month_arr[prev_month]
+
+        arr = [date.year, date.day, this_month_name, next_month_name, prev_month_name]
+        debug_to_log("#{__method__} #{nice_array(arr)}")
+        arr
+      end
+
       def get_trace(lnbr)
         callertrace = "\nCaller trace: (#{lnbr})\n"
         Kernel.caller.each_index do |x|
@@ -286,14 +311,41 @@ module Awetestlib
         else
           new_arr = arr
         end
-        "['#{new_arr.join("','")}']"
+        "['#{new_arr.join("', '")}']"
+      end
+
+      def nice_number(number, decimals = 0, dollars = false)
+        number.to_s.gsub!(/[,\$]/, '')
+        ptrn = "%0.#{decimals}f"
+        ptrn = '$' + ptrn if dollars
+        sprintf(ptrn, number).gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1,")
       end
 
+      def pad_date(dt)
+       if dt and dt.length > 0
+         a, d1, b, d2, c = dt.split(/([\/\.-])/)
+         a = a.rjust(2, '0') unless a and a.length > 1
+         b = b.rjust(2, '0') unless b and b.length > 1
+         c = c.rjust(2, '0') unless c and c.length > 1
+         a + d1 + b + d2 + c
+       else
+         ''
+       end
+     end
+
       def string_count_in_string(strg, substrg)
         count = strg.scan(substrg).length
         count
       end
 
+      def strip_regex_mix(strg)
+        rslt = strg.dup
+        while match = rslt.match(/(\(\?-mix:(.+)\))/)
+          rslt.sub!(match[1], "/#{match[2]}/")
+        end
+        rslt
+      end
+
       def rescue_me(e, me = nil, what = nil, where = nil, who = nil)
         #TODO: these are rescues from exceptions raised in Watir/Firewatir
         debug_to_log("#{__method__}: Begin rescue")
@@ -834,14 +886,10 @@ module Awetestlib
       #method for handling file upload dialog
       #use click_no_wait on the action that triggers the save dialog
       # TODO need version for Firefox
-      def file_upload(filepath)
-        title   = 'Choose File'
-        title   = translate_popup_title(title)
-        text    = ''
-        button  = "&Open"
-        control = "Edit1"
-        side    = 'primary'
-        msg     = "Window title=#{title} button='#{button}' text='#{text}' side='#{side}':"
+      def file_upload(filepath, title = 'Choose File', text = '', button = '&Open',
+          control = 'Edit1', side = 'primary')
+        title = translate_popup_title(title)
+        msg   = "Window title=#{title} button='#{button}' text='#{text}' side='#{side}':"
         begin
           if @ai.WinWait(title, text, WAIT)
             passed_to_log("#{msg} found.")
@@ -852,7 +900,10 @@ module Awetestlib
                 passed_to_log("#{msg} #{control} command sent.")
                 sleep_for 1
                 if @ai.ControlClick(title, text, button, "primary")
+
                   passed_to_log("#{msg} Upload of #{filepath} succeeded.")
+
+
                 else
                   failed_to_log("#{msg} Upload of #{filepath} failed. (#{__LINE__})")
                 end
@@ -938,10 +989,12 @@ module Awetestlib
         debug_to_log("#{__method__}: #{method} #{$!}")
       end
 
-      def unable_to(message = '', no_dolbang = false)
+      def unable_to(message = '', no_dolbang = false, verify_that = false)
         call_arr                          = get_call_array()
         call_script, call_line, call_meth = parse_caller(call_arr[1])
-        strg                              = "Unable to #{call_meth.titleize}:"
+        strg                              = "Unable to"
+        strg << " verify" if verify_that
+        strg << " #{call_meth.titleize}:"
         strg << " #{message}" if message.length > 0
         strg << " '#{$!}'" unless no_dolbang
         strg
@@ -982,6 +1035,11 @@ module Awetestlib
         [arr.length, arr]
       end
 
+      def awetestlib?
+        not Awetestlib::Runner.nil?
+      rescue
+        return false
+      end
 
       def get_os
         @os = OpenStruct.new(

data/lib/awetestlib/regression/validations.rb

@@ -23,18 +23,18 @@ module Awetestlib
         msg = build_message("Expected Style #{type} value '#{expected}' in #{element} with #{how} = #{what}", desc)
         case element
           when :link
-            actual = browser.link(how => what).style type
+            actual = browser.link(how, what).style type
           when :button
-            actual = browser.button(how => what).style type
+            actual = browser.button(how, what).style type
           when :image
-            actual = browser.image(how => what).style type
+            actual = browser.image(how, what).style type
           when :span
-            actual = browser.span(how => what).style type
+            actual = browser.span(how, what).style type
           when :div
-            actual = browser.div(how => what).style type
+            actual = browser.div(how, what).style type
           else
-            if browser.element(how => what).responds_to?("style")
-              actual = browser.element(how => what).style type
+            if browser.element(how, what).responds_to?("style")
+              actual = browser.element(how, what).style type
             else
               failed_to_log("#{msg}: Element #{element} does not repond to style command.")
             end
@@ -46,23 +46,23 @@ module Awetestlib
           failed_to_log(msg)
         end
       rescue
-        failed_to_log("Unable to verify that #{msg} '#{$!}'")
+        failed_to_log(unable_to(msg, false, true))
       end
 
       def validate_style_greater_than_value(browser, element, how, what, type, value, desc = '')
         case element
           when :link
-            actual_value = browser.link(how => what).style type
+            actual_value = browser.link(how, what).style type
           when :button
-            actual_value = browser.button(how => what).style type
+            actual_value = browser.button(how, what).style type
           when :image
-            actual_value = browser.image(how => what).style type
+            actual_value = browser.image(how, what).style type
           when :span
-            actual_value = browser.span(how => what).style type
+            actual_value = browser.span(how, what).style type
           when :div
-            actual_value = browser.div(how => what).style type
+            actual_value = browser.div(how, what).style type
           else
-            actual_value = browser.element(how => what).style type
+            actual_value = browser.element(how, what).style type
         end
         msg = build_message("The CSS value for style #{type} in #{element} :#{how}=>#{what}: '#{actual_value}' is greater than #{value}.", desc)
 
@@ -74,7 +74,7 @@ module Awetestlib
           failed_to_log(msg)
         end
       rescue
-        fail_to_log("Unable to verify #{msg}  '#{$!}'")
+        failed_to_log(unable_to(msg, false, true))
         # sleep_for(1)
       end
 
@@ -83,17 +83,17 @@ module Awetestlib
       def validate_style_less_than_value(browser, element, how, what, type, value, desc = '')
         case element
           when :link
-            actual_value = browser.link(how => what).style type
+            actual_value = browser.link(how, what).style type
           when :button
-            actual_value = browser.button(how => what).style type
+            actual_value = browser.button(how, what).style type
           when :image
-            actual_value = browser.image(how => what).style type
+            actual_value = browser.image(how, what).style type
           when :span
-            actual_value = browser.span(how => what).style type
+            actual_value = browser.span(how, what).style type
           when :div
-            actual_value = browser.div(how => what).style type
+            actual_value = browser.div(how, what).style type
           else
-            actual_value = browser.element(how => what).style type
+            actual_value = browser.element(how, what).style type
         end
         msg = build_message("The CSS value for style #{type} in #{element} :#{how}=>#{what}: '#{actual_value}' is greater than #{value}.", desc)
 
@@ -105,7 +105,7 @@ module Awetestlib
           failed_to_log(msg)
         end
       rescue
-        fail_to_log("Unable to verify #{msg}  '#{$!}'")
+        failed_to_log(unable_to(msg, false, true))
         # sleep_for(1)
       end
 
@@ -155,7 +155,7 @@ module Awetestlib
         end
         rtrn
       rescue
-        failed_to_log("#Unable to verify that #{msg}': '#{$!}")
+        failed_to_log(unable_to(msg, false, true))
       end
 
       alias validate_enabled enabled?
@@ -189,7 +189,7 @@ module Awetestlib
         end
         rtrn
       rescue
-        failed_to_log("#Unable to verify that #{msg}: '#{$!}'")
+        failed_to_log(unable_to(msg, false, true))
       end
 
       alias validate_not_enabled disabled?
@@ -220,7 +220,7 @@ module Awetestlib
         end
         rtrn
       rescue
-        failed_to_log("Unable to verify that #{msg}': '#{$!}'")
+        failed_to_log(unable_to(msg, false, true))
       end
 
       alias validate_visible visible?
@@ -250,7 +250,7 @@ module Awetestlib
         end
         rtrn
       rescue
-        failed_to_log("Unable to verify that #{msg}': '#{$!}' #{desc}")
+        failed_to_log(unable_to(msg, false, true))
       end
 
       alias validate_not_visible not_visible?
@@ -273,7 +273,7 @@ module Awetestlib
           failed_to_log(msg)
         end
       rescue
-        failed_to_log("Unable to verify that #{msg}: '#{$!}'")
+        failed_to_log(unable_to(msg, false, true))
       end
 
       alias checkbox_checked? checked?
@@ -292,7 +292,7 @@ module Awetestlib
           failed_to_log(msg)
         end
       rescue
-        failed_to_log("Unable to verify that #{msg}: '#{$!}'")
+        failed_to_log(unable_to(msg, false, true))
       end
 
       alias checkbox_checked? checked?
@@ -323,7 +323,7 @@ module Awetestlib
           failed_to_log("#{msg}? #{desc} [#{get_callers(1)}]")
         end
       rescue
-        failed_to_log("Unable to verify that #{msg}. #{desc} '#{$!}' [#{get_callers(1)}]")
+        failed_to_log(unable_to(msg, false, true))
       end
 
       # Verify that a DOM element does not exist on the page.
@@ -345,7 +345,7 @@ module Awetestlib
           true
         end
       rescue
-        failed_to_log("Unable to verify that #{msg}': '#{$!}' #{desc}")
+        failed_to_log(unable_to(msg, false, true))
       end
 
       alias not_exist? does_not_exist?
@@ -355,19 +355,19 @@ module Awetestlib
       # @return [Boolean] Returns true if the radio button is set.
       def set?(browser, how, what, desc = '', no_fail = false)
         #TODO: handle identification of element with value as well as other attribute. see radio_with_value_set?
-        msg = build_message("Radio #{how}=>#{what} is selected.", desc)
+        msg = build_message("Radio #{how}=>#{what} is set.", desc)
         if browser.radio(how, what).set?
           passed_to_log(msg)
           true
         else
           if no_fail
-            passed_to_log("Radio #{how}=>#{what} is not selected.")
+            passed_to_log("#{msg}.  (Fail suppressed)")
           else
             failed_to_log(msg)
           end
         end
       rescue
-        failed_to_log("Unable to verify taht #{msg}: '#{$!}'")
+        failed_to_log(unable_to(msg, false, true))
       end
 
       alias radio_set? set?
@@ -379,19 +379,19 @@ module Awetestlib
       # @return [Boolean] Returns true if the radio button is not set.
       def not_set?(browser, how, what, desc = '', no_fail = false)
         #TODO: handle identification of element with value as well as other attribute. see radio_with_value_set?
-        msg = build_message("Radio #{how}=>#{what} is not selected.", desc)
+        msg = build_message("Radio #{how}=>#{what} is not set.", desc)
         if not browser.radio(how, what).set?
           passed_to_log(msg)
           true
         else
           if no_fail
-            passed_to_log("Radio #{how}=>#{what} is not selected.")
+            passed_to_log("#{msg} (Fail suppressed")
           else
             failed_to_log(msg)
           end
         end
       rescue
-        failed_to_log("Unable to verify that #{msg}: '#{$!}'")
+        failed_to_log(unable_to(msg, false, true))
       end
 
       alias radio_not_set? not_set?
@@ -491,7 +491,7 @@ module Awetestlib
           failed_to_log("#{msg}")
         end
       rescue
-        failed_to_log("Unable to #{msg}. #{$!}")
+        failed_to_log("Unable to verify #{msg}. #{$!}")
       end
 
       alias validate_string_equal string_equals?
@@ -585,6 +585,7 @@ module Awetestlib
       # Verify that a DOM element is ready, i.e., both exists and is enabled.
       # @param (see #exists?)
       # @return [Boolean] Returns true if the element is ready.
+      #TODO: Watir-webdriver support
       def ready?(browser, element, how, what, value = '', desc = '')
         msg2 = "and value=>'#{value}' " if value
         msg = build_message("#{element.to_s.titlecase} with #{how}=>'#{what}' ", msg2, 'exists and is enabled.', desc)
@@ -633,7 +634,7 @@ module Awetestlib
           end
         end
       rescue
-        failed_to_log("Unable to verify that #{msg}: '#{$!}")
+        failed_to_log(unable_to)
       end
 
       alias validate_textfield_value textfield_equals?
@@ -658,7 +659,7 @@ module Awetestlib
           failed_to_log("#{msg} Contents: '#{contents}'")
         end
       rescue
-        failed_to_log("Unable to verify that #{msg}  '#{$!}'")
+        failed_to_log(unable_to)
       end
 
       # Verify that a text field (also text area), identified by *how* and *what*, is empty.
@@ -680,7 +681,7 @@ module Awetestlib
           failed_to_log("#{msg} Contents: '#{contents}'")
         end
       rescue
-        failed_to_log("Unable to verify that #{msg}  '#{$!}'")
+        failed_to_log(unable_to)
       end
 
       alias validate_textfield_empty textfield_empty?
@@ -722,7 +723,7 @@ module Awetestlib
           failed_to_log("#{msg} Actual: #{browser.url}")
         end
       rescue
-        failed_to_log("Unable to validate that #{msg} '#{$!}'")
+        failed_to_log(unable_to)
       end
 
       # @!endgroup Core
@@ -767,7 +768,7 @@ module Awetestlib
           failed_to_log(msg)
         end
       rescue
-        failed_to_log("Unable to verify that #{msg}: '#{$!}'. (#{__LINE__})")
+        failed_to_log(unable_to)
       end
 
       alias popup_exist popup_is_browser?
@@ -820,19 +821,18 @@ module Awetestlib
           myText = browser.text
         end
         if myText.match(target)
-          #if myText.match(ptrn)
           passed_to_log("#{msg}")
           true
         else
           if skip_fail
-            debug_to_log("#{cls}  text does not contain the text: '#{ptrn}'.  #{desc}")
+            debug_to_log("#{cls} text does not contain the text: '#{ptrn}'.  #{desc} (Fail suppressed)")
           else
             failed_to_log("#{msg}")
           end
           #debug_to_log("\n#{myText}")
         end
       rescue
-        failed_to_log("Unable to verify that #{msg} '#{$!}'")
+        failed_to_log(unable_to)
       end
 
       alias validate_link validate_text
@@ -853,16 +853,16 @@ module Awetestlib
           end
         end
       rescue
-        failed_to_log("Unable to verify #{msg} '#{$!}'")
+        failed_to_log(unable_to)
       end
 
       def element_contains_text?(browser, element, how, what, expected, desc = '')
         msg = build_message("Element #{element} :{how}=>#{what} contains text '#{expected}'.", desc)
         case how
           when :href
-            who = browser.element(how, what)
-          else
             who = browser.link(how, what)
+          else
+            who = browser.element(how, what)
         end
         if who
           text = who.text
@@ -888,22 +888,26 @@ module Awetestlib
           end
         end
       rescue
-        failed_to_log("Unable to verify #{msg} '#{$!}'")
+        failed_to_log(unable_to)
       end
 
-      def validate_select_list(browser, how, what, opt_type, list = nil, multiple = false, ignore = ['Select One'], limit = 5)
-        mark_testlevel("#{__method__.to_s.titleize} (#{how}=>#{what})", 0)
+      def validate_select_list(browser, how, what, opt_type, list = nil, desc= '',  multiple = false, ignore = ['Select One'], limit = 5)
+        mark_testlevel("(#{how}=>#{what})")
+        msg  = "Select list #{how}=>#{what}"
         ok          = true
         select_list = browser.select_list(how, what)
         options     = select_list.options
         if list
           if options == list
-            passed_to_log("Select list options list equals expected list #{list}")
+            passed_to_log(build_message(msg, ": options list equals expected list #{list}"))
           else
             debug_to_report("actual:\n#{nice_array(options, true)}")
             debug_to_report("expected:\n#{nice_array(list, true)}")
-            failed_to_log("Select list options list #{nice_array(options, true)} "+
+            failed_to_log(build_message(
+                              msg,
+                              ": options list #{nice_array(options, true)}",
                               "does not equal expected list #{nice_array(list, true)}")
+                                       )
           end
         end
 
@@ -927,34 +931,36 @@ module Awetestlib
             select_option(select_list, opt_type, options[1])
             select_option(select_list, opt_type, options[2])
             selected = select_list.selected_options
+            msg1 = "#{msg}: selected options equals expected #{nice_array(targets)}."
             if selected == targets
-              passed_to_log("Select list selected options equals expected #{targets}")
+              passed_to_log(msg1)
             else
-              failed_to_log("Select list selected options #{selected} does not equal expected list #{targets.to_a}")
+              failed_to_log("#{msg} Found #{nice_array(selected)}")
             end
           else
-            debug_to_log("Too few options to test multiple selection (need 2 or more): '#{options}", __LINE__)
+            debug_to_log("#{msg}: Too few options to test multiple selection (need 2 or more): '#{options}")
           end
         end
       rescue
-        failed_to_log("Unable to validate select_list: '#{$!}'", __LINE__)
+        failed_to_log(unable_to)
       end
 
-      def validate_select_list_contents(browser, how, what, list)
-        mark_testlevel("#{__method__.to_s.titleize} (#{what})", 2)
+      def validate_select_list_contents(browser, how, what, list, desc = '')
+        mark_testlevel("#{how}=>#{what}", 2)
+        msg  = build_message("Select list #{how}=>#{what} options list equals", nice_array(list), desc)
         select_list = browser.select_list(how, what)
         options     = select_list.options
         if list
           if options == list
-            passed_to_log("Select list options list equals expected list #{list}")
+            passed_to_log(msg)
             options
           else
-            failed_to_log("Select list options list #{options} does not equal expected list #{list}")
+            failed_to_log("#{msg}. Found #{nice_array(options)}")
             nil
           end
         end
       rescue
-        failed_to_log("Unable to validate select_list contents: '#{$!}'", __LINE__)
+        failed_to_log(unable_to)
       end
 
       def validate_selected_options(browser, how, what, list, desc = '')
@@ -985,7 +991,7 @@ module Awetestlib
         end
 
       rescue
-        failed_to_log("Unable to validate selected option(s): '#{$!}' #{desc}", __LINE__)
+        failed_to_log(unable_to)
       end
 
       alias validate_selections validate_selected_options
@@ -1037,7 +1043,7 @@ module Awetestlib
           true
         end
       rescue
-        failed_to_log("Unable to verify that #{msg}: '#{$!}'")
+        failed_to_log(unable_to)
       end
 
       def textfield_does_not_equal?(browser, how, what, expected, desc = '')
@@ -1049,11 +1055,24 @@ module Awetestlib
           failed_to_log(msg)
         end
       rescue
-        failed_to_log("Unable to validate that #{msg}: '#{$!}'")
+        failed_to_log(unable_to)
       end
 
       alias validate_textfield_not_value textfield_does_not_equal?
 
+      def verify_class(browser, element, how, what, strg, desc = '')
+        msg = build_message("#{element} :#{how}=>#{what} :class contains '#{strg}'", desc)
+        class_strg = browser.element(how, what).class_name
+        if class_strg =~ /#{strg}/
+          passed_to_log(msg)
+          true
+        else
+          failed_to_log(msg)
+        end
+      rescue
+        failed_to_log(unable_to)
+      end
+
       # @!endgroup Core
 
       # @!group Deprecated