awetestlib 0.1.22 → 0.1.23

data/lib/awetestlib/regression/runner.rb

@@ -17,9 +17,11 @@ require 'active_support/inflector'
 
 module Awetestlib
   module Regression
+    # Collects all the components needed to run the script and executes it.
     class Runner < Awetestlib::Runner
 
     # order matters here
+      include ActiveSupport::Inflector
       include Awetestlib::Logging
       include Awetestlib::Regression::Utilities
       include Awetestlib::Regression::Browser
@@ -97,12 +99,15 @@ module Awetestlib
         @myName         = File.basename(options[:script_file]).sub(/\.rb$/, '')
 
         if options[:output_to_log]
-          log_path = "#{@myRoot}/"
-          log_path << "#{options[:log_path_subdir]}/" if options[:log_path_subdir]
-          log_spec = File.join log_path, "#{@myName}_#{Time.now.strftime("%Y%m%d%H%M%S")}.log"
+          log_name = "#{@myName}_#{Time.now.strftime("%Y%m%d%H%M%S")}.log"
+          if options[:log_path_subdir]
+            FileUtils.mkdir options[:log_path_subdir] unless File.directory? options[:log_path_subdir]
+            log_path = options[:log_path_subdir]
+            log_spec = File.join(log_path, log_name)
+          else
+            log_spec = log_name
+          end
           @myLog = init_logger(log_spec, @myName)
-          #@start_timestamp   = Time.now
-          #start_to_log(@start_timestamp)
         end
 
         if options[:xls_path]
@@ -280,7 +285,6 @@ module Awetestlib
         finish_run
         @report_class.finish_report(@html_report_file)
         open_report_file
-        #finish_run
         @myLog.close if @myLog
       end
 

data/lib/awetestlib/regression/tables.rb

@@ -5,18 +5,14 @@ module Awetestlib
     module Tables
 
 
-      # Groups: Columns, Rows, Sorting
-
       def get_index_for_column_head(panel, table_index, strg, desc = '')
         table = panel.tables[table_index]
         get_column_index(table, strg, desc, true)
       end
 
       def get_column_index(table, strg, desc = '', header = false)
-        msg = "Get index of "
-        msg << " header" if header
-        msg << " column containing #{strg}. "
-        msg << " #{desc}" if desc.length > 0
+        msg1 = " header" if header
+        msg = build_message("Get index of ", msg1, " column containing #{strg}. ", desc)
         rgx = Regexp.new(strg)
         row_idx = 0
         index   = -1
@@ -47,6 +43,13 @@ module Awetestlib
         failed_to_log("Unable to #{msg} '#{$!}'")
       end
 
+      # Return the index of the last row of the specified table.
+      # @param [Watir::Table] table A reference to the table in question.
+      # @param [Fixnum] pad The number of zeroes to prefix the index to allow correct sorting.
+      # @param [Fixnum] every A number indicating which rows in the table actually carry data if
+      #   the table is padded with empty rows.  1 = every row, 2 = every other row, 3 = every third
+      #   row, and etc.
+      # @return [Fixnum]
       def get_index_of_last_row(table, pad = 2, every = 1)
         index = calc_index(table.row_count, every)
         index = index.to_s.rjust(pad, '0')
@@ -56,12 +59,17 @@ module Awetestlib
 
       alias get_index_for_last_row get_index_of_last_row
 
+      # Return the index of the last row of the specified table containing *strg*
+      # @param [Watir::Table] table A reference to the table in question.
+      # @param [String, Regexp] strg A string or regular expression to search for in the table..
+      # @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*.
+      # @return [Fixnum]
       def get_index_of_last_row_with_text(table, strg, column_index = nil)
         debug_to_log("#{__method__}: #{get_callers(5)}")
-        msg = "Find last row in table :id=#{table.id} with text '#{strg}'"
-        msg << " in column #{column_index}" if column_index
-        dbg = "#{__method__}: #{table.id} text by row "
-        dbg << "in column #{column_index}" if column_index
+        msg1 = " in column #{column_index}" if column_index
+        msg = build_message("Find last row in table :id=#{table.id} with text '#{strg}'", msg1)
+        dbg = build_message("#{__method__}: #{table.id} text by row", msg1)
         index    = 0
         found    = false
         at_index = 0
@@ -98,6 +106,13 @@ module Awetestlib
 
       alias get_index_for_last_row_with_text get_index_of_last_row_with_text
 
+      # Return the index of the _first_ row of the specified table containing *strg*
+      # @param [Watir::Table] table A reference to the table in question.
+      # @param [String, Regexp] strg A string or regular expression to search for in the table..
+      # @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.
+      # @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)
         debug_to_log("#{__method__}: #{get_callers(5)}")
         if fail_if_found
@@ -149,6 +164,17 @@ module Awetestlib
         failed_to_log("Unable to #{msg}. '#{$!}'")
       end
 
+      # Return the index of the _first_ row of the specified table containing *strg* in a text field
+      # identified by *how* and *what*.
+      # @param [Watir::Table] table A reference to the table in question.
+      # @param [String, Regexp] strg A string or regular expression to search for in the table..
+      # @param [Symbol] how The element attribute used to identify the specific element.
+      #   Valid values depend on the kind of element.
+      #   Common values: :text, :id, :title, :name, :class, :href (:link only)
+      # @param [String, Regexp] what A string or a regular expression to be found in the *how* attribute that uniquely identifies the element.
+      # @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*.
+      # @return [Fixnum] the index of the row containing *strg*
       def get_index_of_row_with_textfield_value(table, strg, how, what, column_index = nil)
         msg = "Find row in table :id=#{table.id} with value '#{strg}' in text_field #{how}=>'#{what} "
         msg << " in column #{column_index}" if column_index
@@ -186,6 +212,12 @@ module Awetestlib
         failed_to_log("Unable to #{msg}. '#{$!}'")
       end
 
+      # Return the index of a table in *browser* containing *strg*.  *ordinal* indicates
+      # whether it is the first, second, third, etc. table found with the matching text in *strg*
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [String, Regexp] strg A string or regular expression to search for in the table..
+      # @param [Fixnum] ordinal A number indicating which matching table will have its index returned.
+      # @return [Fixnum] the index of the table containing *strg*
       def get_index_for_table_containing_text(browser, strg, ordinal = 1)
         msg   = "Get index for table containing text '#{strg}'"
         index = 0
@@ -210,6 +242,12 @@ module Awetestlib
         failed_to_log("Unable to find index of table containing text '#{strg}' '#{$!}' ")
       end
 
+      # Return a reference to a table in *browser* containing *strg*.  *ordinal* indicates
+      # whether it is the first, second, third, etc. table found with the matching text in *strg*
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      # @param [String, Regexp] strg A string or regular expression to search for in the table..
+      # @param [Fixnum] ordinal A number indicating which matching table will have its index returned.
+      # @return [Watir::Table] the table containing *strg*
       def get_table_containing_text(browser, strg, ordinal = 1)
         msg   = "Get table #{ordinal} containing text '#{strg}'"
         index = get_index_for_table_containing_text(browser, strg, ordinal)
@@ -272,9 +310,10 @@ module Awetestlib
         failed_to_log("Unable to get content headers. '#{$!}'")
       end
 
-      def count_rows_with_string(container, table_index, strg)
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      def count_rows_with_string(browser, table_index, strg)
         hit = 0
-        container.tables[table_index].each do |row|
+        browser.tables[table_index].each do |row|
           if get_cell_count(row) >= 1
             #        debug_to_log("#{__method__}: #{row.text}")
             #TODO this assumes column 1 is a number column
@@ -345,11 +384,11 @@ module Awetestlib
       end
 
       def get_cell_count(row)
-        #    if @browserAbbrev == 'IE' or $use_firewatir
-        row.cells.length
-        #    else
-        #      row.cell_count
-        #    end
+        if $watir_script
+          row.column_count
+        else
+          row.cells.length
+        end
       end
 
       def exercise_sorting(browser, columnList, desc = '')
@@ -438,7 +477,8 @@ module Awetestlib
         failed_to_log("Unable to verify sort on column '#{strg}'. #{$!}")
       end
 
-      #TODO unstub
+      # @todo unstub
+      # @private
       def verify_column_hidden(browser, panel, table_index, column_name)
         passed_to_log("TEST STUBBED: Column '#{column_name}' is hidden.")
         return true
@@ -469,7 +509,8 @@ module Awetestlib
         #    failed_to_log("Unable to verify column '#{column_name}' is hidden: '#{$!}' (#{__LINE__})")
       end
 
-      #TODO unstub
+      # @todo unstub
+      # @private
       def verify_column_hidden_temp_ff(browser, data_index, row_index, column_name)
         passed_to_log("TEST STUBBED: Column '#{column_name}' is hidden.")
         return true
@@ -486,7 +527,8 @@ module Awetestlib
         end
       end
 
-      #TODO unstub
+      # @todo unstub
+      # @private
       def verify_column_visible_temp_ff(browser, data_index, row_index, column_name)
         passed_to_log("TEST STUBBED: Column '#{column_name}' is visible.")
         return true
@@ -502,7 +544,8 @@ module Awetestlib
         end
       end
 
-      #TODO unstub
+      # @todo unstub
+      # @private
       def verify_column_visible(browser, panel, table_index, column_name)
 
         passed_to_log("TEST STUBBED: Column '#{column_name}' is visible.")
@@ -528,9 +571,12 @@ module Awetestlib
         failed_to_log("Unable to verify column '#{column_name} is visible': '#{$!}' (#{__LINE__})")
       end
 
-      def verify_column_order(browser, table_index, row_index, exp_ary)
-        mark_testlevel("Verify Column Order", 2)
-        row     = browser.tables[table_index][row_index]
+      # Verify that a table's columns are in the expected order by header names. The table is identified by its *index*
+      # within the container *browser*.
+      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
+      def verify_column_order(browser, table_index, header_index, exp_ary)
+        mark_testlevel("Begin #{__method__.to_s.titleize}", 0)
+        row     = browser.tables[table_index][header_index]
         act_ary = get_row_cells_text_as_array(row)
 
         if exp_ary == act_ary
@@ -538,7 +584,7 @@ module Awetestlib
         else
           failed_to_log("Column order [#{act_ary.join(', ')}] not as expected [#{exp_ary.join(', ')}].")
         end
-        sleep_for(1)
+        mark_testlevel("End #{__method__.to_s.titleize}", 0)
       end
 
       def text_in_table?(browser, how, what, expected, desc = '')

data/lib/awetestlib/regression/user_input.rb

@@ -2,16 +2,9 @@ module Awetestlib
   # Awetest DSL for browser based testing.
   module Regression
     # Methods covering user interactions with the browser.
-    #
-    #
-    # All of the methods in groups other than Core call Core methods.
-    # The methods in the other groups, along with aliases, exist for backward compatibility with earlier versions
-    # of the Awetest DSL.
     module UserInput
 
-      # @!group Core
-
-      # Click a specific DOM element identified by one of its attributes and that attribute's value.
+      # Click a specific DOM element identified by one of its attributes (*how*) and that attribute's value (*what*).
       #
       # @example
       #  # html for a link element:
@@ -31,219 +24,40 @@ module Awetestlib
       #
       def click(browser, element, how, what, desc = '')
         #debug_to_log("#{__method__}: #{element}, #{how}, #{what}")
-        msg = build_message("Click #{element} :#{how}=>'#{what}'", desc)
-        msg1 = "#{element}(#{how}, '#{what}')"
-        begin
-          case element
-            when :link
-              browser.link(how, what).click
-            when :button
-              browser.button(how, what).click
-            when :image
-              browser.image(how, what).click
-            when :radio
-              case how
-                when :index
-                  set_radio_by_index(browser, what, desc)
-                else
-                  browser.radio(how, what).set
-              end
-            when :span
-              browser.span(how, what).click
-            when :div
-              browser.div(how, what).click
-            when :cell
-              browser.cell(how, what).click
-            else
-              browser.element(how, what).click
-          end
+        msg = build_message("#{__method__.to_s.humanize} :#{element} :#{how}=>'#{what}'", desc)
+        case element
+          when :link
+            browser.link(how, what).click
+          when :button
+            browser.button(how, what).click
+          when :image
+            browser.image(how, what).click
+          when :radio
+            case how
+              when :index
+                set_radio_by_index(browser, what, desc)
+              else
+                browser.radio(how, what).set
+            end
+          when :span
+            browser.span(how, what).click
+          when :div
+            browser.div(how, what).click
+          when :cell
+            browser.cell(how, what).click
+          else
+            browser.element(how, what).click
         end
-          passed_to_log(msg)
-          true
+        passed_to_log(msg)
+        true
       rescue
         failed_to_log("Unable to #{msg}. '#{$!}'")
       end
 
-      # @!endgroup Core
-
-      # @!group Click
-
-      # Click a button element identified by the value of its *:id* attribute. A button is an HTML element with tag 'input' and type 'submit' or 'button'.
-      # @param [Watir::Browser, Watir::Container] browser A reference to the browser window or container element to be tested.
-      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @return (see #click)
-      def click_button_by_id(browser, what, desc = '')
-        click(browser, :button, :id, what, desc)
-      end
-
-      # Click a button element identified by the value of its index within the container referred to by <b>*browser*</b>.
-      # @param [Watir::Browser, Watir::Container] browser A reference to the browser window or container element to be tested.
-      # @param [Fixnum] what An integer that indicates the index of the element within the container.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @return (see #click)
-      def click_link_by_index(browser, what, desc = '')
-        click(browser, :link, :index, what, desc)
-      end
-
-      # Click a link element identified by the value of its *:href* attribute. Take care to escape characters in the url that are reserved by Regexp.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_link_by_href(browser, what, desc = '')
-        click(browser, :link, :href, what, desc)
-      end
-
-      alias click_href click_link_by_href
-
-      # Click a link element identified by the value of its *:href* attribute and do not wait for the browser to reach ready state.
-      # Take care to escape characters in the url that are reserved by Regexp.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_link_no_wait_by_href(browser, what, desc = '')
-        click_no_wait(browser, :link, :href, what, desc)
-      end
-
-      # Click a button element identified by the value of its index within the container referred to by <b>*browser*</b>.
-      # @param (see #click_link_by_index)
-      # @return (see #click)
-      def click_button_by_index(browser, what, desc = '')
-        click(browser, :button, :index, what, desc)
-      end
-
-      # Click a button element identified by the value of its *:name* attribute. A button is an HTML element with tag 'input' and type 'submit' or 'button'.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_button_by_name(browser, what, desc = '')
-        click(browser, :button, :name, what, desc)
-      end
-
-      # Click a button element identified by the value of its *:text* attribute. A button is an HTML element with tag 'input' and type 'submit' or 'button'.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_button_by_text(browser, what, desc = '')
-        click(browser, :button, :text, what, desc)
-      end
-
-      # Click a button element identified by the value of its *:class* attribute. A button is an HTML element with tag 'input' and type 'submit' or 'button'.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_button_by_class(browser, what, desc = '')
-        click(browser, :button, :class, what, desc)
-      end
-
-      # Click a button element identified by the value of its *:value* attribute. A button is an HTML element with tag 'input' and type 'submit' or 'button'.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_button_by_value(browser, what, desc = '')
-        click(browser, :button, :value, what, desc)
-      end
-
-      # Click a button element identified by the value of its *:title* attribute. A button is an HTML element with tag 'input' and type 'submit' or 'button'.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_button_by_title(browser, what, desc = '')
-        click(browser, :button, :title, what, desc)
-      end
-
-      # Click a link element identified by the value of its *:id* attribute.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_link_by_id(browser, what, desc = '')
-        click(browser, :link, :id, what, desc)
-      end
-
-      alias click_id click_link_by_id
-
-      # Click a link element identified by the value of its *:name* attribute.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_link_by_name(browser, what, desc = '')
-        click(browser, :link, :name, what, desc)
-      end
-
-      alias click_name click_link_by_name
-
-      # Click a file_field element identified by the value of its *:id* attribute.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_file_field_by_id(browser, what, desc = '')
-        click(browser, :file_field, :id, what, desc)
-      end
-
-      # Click an image element identified by the value of its *:id* attribute.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_img_by_alt(browser, what, desc = '')
-        click(browser, :image, :alt, what, desc)
-      end
-
-      # Click an image element identified by the value of its *:title* attribute.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_img_by_title(browser, what, desc = '')
-        click(browser, :image, :title, what, desc)
-      end
-
-      # Click an image element identified by the value of its *:src* attribute.
-      # Take care to escape characters in the source url that are reserved by Regexp.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_img_by_src(browser, what, desc = '')
-        click(browser, :image, :src, what, desc)
-      end
-
-      # Click a link element identified by the value of its *:value* attribute.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_link_by_value(browser, what, desc = '')
-        click(browser, :link, :value, what, desc)
-      end
-
-      # Click a link element identified by the value in its text (innerHTML).
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_link_by_text(browser, what, desc = '')
-        click(browser, :link, :text, what, desc)
-      end
-
-      alias click_link click_link_by_text
-      alias click_text click_link_by_text
-      alias click_js_button click_link_by_text
-
-      # Click a link element identified by the value of its *:class* attribute.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_link_by_class(browser, what, desc = '')
-        click(browser, :link, :class, what, desc)
-      end
-
-      alias click_class click_link_by_class
-
-      # Click a span element identified by the value in its text (innerHTML).
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_span_by_text(browser, what, desc = '')
-        click(browser, :span, :text, what)
-      end
-
-      alias click_span_with_text click_span_by_text
-
-      # Click a link element identified by the value of its *:title* attribute.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_link_by_title(browser, what, desc = '')
-        click(browser, :link, :title, what, desc)
-      end
-
-      alias click_title click_link_by_title
-
-      # @!endgroup Click
-
-      # @!group Core
-
-      # Click a specific DOM element by one of its attributes and that attribute's value and
+      # Click a specific DOM element by one of its attributes (*how) and that attribute's value (*what) and
       # do not wait for the browser to finish reloading.  Used when a modal popup or alert is expected. Allows the script
       # to keep running so the popup can be handled.
+      # @todo handle using Watir Webdriver which does not need no_wait.
       #
       # @example
       #  # html for a link element:
@@ -257,9 +71,7 @@ module Awetestlib
       # @return (see #click)
       #
       def click_no_wait(browser, element, how, what, desc = '')
-        debug_to_log("#{__method__}: #{element}, #{how}, #{what}")
-        msg = build_message("Click no wait #{element} :#{how}=>'#{what}'", desc)
-        msg1 = "#{element}(#{how}, '#{what}'"
+        msg = build_message("#{__method__.to_s.humanize} :#{element} :#{how}=>'#{what}'", desc)
         begin
           case element
             when :link
@@ -287,161 +99,17 @@ module Awetestlib
               browser.element(how, what).click_no_wait
           end
         rescue => e
-          if not rescue_me(e, __method__, "browser(#{msg1}').click_no_wait", "#{browser.class}")
+          unless rescue_me(e, __method__, rescue_me_command(element, how, what, :click_no_wait), "#{browser.class}")
             raise e
           end
         end
-          passed_to_log(msg)
-          true
+        passed_to_log(msg)
+        true
       rescue
         failed_to_log("Unable to #{msg}  '#{$!}'")
         sleep_for(1)
       end
 
-      # @!endgroup Core
-
-      alias click_href_no_wait click_link_no_wait_by_href
-
-      # @!group Click No Wait
-
-      # Click a button element identified by the value of its *:id* attribute
-      # and do not wait for the browser to reach ready state.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_button_no_wait_by_id(browser, what, desc = '')
-        click_no_wait(browser, :button, :id, what, desc)
-      end
-
-      alias click_button_by_id_no_wait click_button_no_wait_by_id
-
-      # Click a button element identified by the value of its *:name* attribute
-      # and do not wait for the browser to reach ready state.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_button_no_wait_by_name(browser, what, desc = '')
-        click_no_wait(browser, :button, :name, what, desc)
-      end
-
-      # Click a button element identified by the value of its *:class* attribute
-      # and do not wait for the browser to reach ready state.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_button_no_wait_by_class(browser, what, desc = '')
-        click_no_wait(browser, :button, :class, what, desc)
-      end
-
-      alias click_button_by_class_no_wait click_button_no_wait_by_class
-
-      # Click a link element identified by the value of its *:id* attribute
-      # and do not wait for the browser to reach ready state.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_link_no_wait_by_id(browser, what, desc = '')
-        click_no_wait(browser, :link, :id, what, desc)
-      end
-
-      alias click_no_wait_id click_link_no_wait_by_id
-      alias click_no_wait_by_id click_link_no_wait_by_id
-      alias click_id_no_wait click_link_no_wait_by_id
-      alias click_no_wait_link_by_id click_link_no_wait_by_id
-
-      # Click an image element identified by the value of its *:alt* attribute
-      # and do not wait for the browser to reach ready state.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_img_no_wait_by_alt(browser, what, desc = '')
-        click_no_wait(browser, :image, :alt, what, desc)
-      end
-
-      alias click_img_by_alt_no_wait click_img_no_wait_by_alt
-
-      # Click a button element identified by the value in its text (innerHTML)
-      # and do not wait for the browser to reach ready state.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_button_no_wait_by_text(browser, what, desc = '')
-        click_no_wait(browser, :button, :text, what, desc)
-      end
-
-      # Click a button element identified by the value of its *:value* attribute
-      # and do not wait for the browser to reach ready state.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_button_no_wait_by_value(browser, what, desc = '')
-        click_no_wait(browser, :button, :value, what, desc)
-      end
-
-      # Click a button element identified by the value of its *:name* attribute
-      # and do not wait for the browser to reach ready state.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_link_by_name_no_wait(browser, what, desc = '')
-        click_no_wait(browser, :link, :name, what, desc)
-      end
-
-      alias click_no_wait_name click_link_by_name_no_wait
-      alias click_name_no_wait click_link_by_name_no_wait
-
-      # Click a link element identified by the value in its text (innerHTML)
-      # and do not wait for the browser to reach ready state.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_link_by_text_no_wait(browser, what, desc = '')
-        click_no_wait(browser, :link, :text, what, desc)
-      end
-
-      alias click_no_wait_text click_link_by_text_no_wait
-      alias click_text_no_wait click_link_by_text_no_wait
-
-      # Click a link element identified by the value of its *:title* attribute
-      # and do not wait for the browser to reach ready state.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_title_no_wait(browser, what, desc = '')
-        click_no_wait(browser, :link, :title, what, desc)
-      end
-
-      # @!endgroup Click No Wait
-
-      # @!group Xpath
-
-      # Click a button element identified by the value of its *:id* attribute using the xpath functionality in Watir.
-      # A button is an HTML element with tag 'input' and type 'submit' or 'button'.
-      # @note Normally used only when the element is not located by other methods.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_button_by_xpath_and_id(browser, what, desc = '')
-        click(browser, :button, :xpath, "//a[@id = '#{what}']", desc)
-      end
-
-      alias click_button_by_xpath click_button_by_xpath_and_id
-
-      # Click a link element identified by the value of its *:id* attribute using the xpath functionality in Watir.
-      # @note Normally used only when the element is not located by other methods.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_link_by_xpath_and_id(browser, what, desc = '')
-        click(browser, :link, :xpath, "//a[@id = '#{what}']", desc)
-      end
-
-      alias click_link_by_xpath click_link_by_xpath_and_id
-
-      # Click an image element identified by the value of its *:name* attribute using the xpath functionality in Watir.
-      # @note Normally used only when the element is not located by other methods.
-      # @param (see #click_button_by_id)
-      # @return (see #click)
-      def click_img_by_xpath_and_name(browser, what, desc = '')
-        click(browser, :image, :xpath, "//a[@id = '#{what}']", desc)
-      end
-
-      alias click_img_by_xpath click_img_by_xpath_and_name
-      alias click_image_by_xpath click_img_by_xpath_and_name
-      alias click_image_by_xpath_and_name click_img_by_xpath_and_name
-
-      # @!endgroup Xpath
-
-      # @!group Core
-
       # Click an image element identified by the value of its *:src* attribute and its index
       # within the array of image elements with src containing <b>*what*</b> and
       # within the container referred to by <b>*browser*</b>.
@@ -454,8 +122,8 @@ module Awetestlib
         msg = "Click image by src='#{what}' and index=#{index}"
         msg << " #{desc}" if desc.length > 0
         browser.image(:src => what, :index => index).click
-          passed_to_log(msg)
-          true
+        passed_to_log(msg)
+        true
       rescue
         failed_to_log("Unable to #{msg} '#{$!}'")
       end
@@ -474,14 +142,14 @@ module Awetestlib
       # @return (see #click)
       #
       def click_table_row_with_text(browser, how, what, text, desc = '', column = nil)
-        msg = build_message("Click row with text #{text} in table :#{how}=>'#{what}.", desc)
+        msg   = build_message("Click row with text #{text} in table :#{how}=>'#{what}.", desc)
         table = get_table(browser, how, what, desc)
         if table
           index = get_index_of_row_with_text(table, text, column)
           if index
             table[index].click
-              passed_to_log(msg)
-              index
+            passed_to_log(msg)
+            index
           else
             failed_to_log("#{msg} Row not found.")
           end
@@ -499,14 +167,14 @@ module Awetestlib
       # @return (see #click)
       #
       def double_click_table_row_with_text(browser, how, what, text, desc = '', column = nil)
-        msg = build_message("Double click row with text #{text} in table :#{how}=>'#{what}.", desc)
+        msg   = build_message("Double click row with text #{text} in table :#{how}=>'#{what}.", desc)
         table = get_table(browser, how, what, desc)
         if table
           index = get_index_of_row_with_text(table, text, column)
           if index
             table[index].fire_event('ondblclick')
-              passed_to_log(msg)
-              index
+            passed_to_log(msg)
+            index
           else
             failed_to_log("#{msg} Row not found.")
           end
@@ -517,59 +185,6 @@ module Awetestlib
         failed_to_log("Unable to #{msg}: '#{$!}'")
       end
 
-      # @!endgroup Core
-
-      # @!group Tables
-
-      # Click the first row which contains a particular string in a table identified by the value in its *:id* attribute.
-      #
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [String, Regexp] what A string or a regular expression to be found in the *how* attribute that uniquely identifies the element.
-      # @param [String] text Full text string to be found in the table row.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @param [Fixnum] column Integer indicating the column to search for the text string.
-      # If not supplied all columns will be checked.
-      # @return (see #click)
-      #
-      def click_table_row_with_text_by_id(browser, what, text, desc = '', column = nil)
-        click_table_row_with_text(browser, :id, what, text, desc, column)
-      end
-
-      # Click the first row which contains a particular string in a table identified by its index
-      # in the array of tables contained in <b>*browser*</b>.
-      # A specific column in the table can also be specified.
-      #
-      # @param (see #click_table_row_with_text_by_id)
-      # @return (see #click)
-      #
-      def click_table_row_with_text_by_index(browser, what, text, desc = '', column = nil)
-        click_table_row_with_text(browser, :id, what, text, desc, column)
-      end
-
-      # Double click the first row which contains a particular string in a table identified by the value in its *:id* attribute.
-      # A specific column in the table can also be specified.
-      #
-      # @param (see #click_table_row_with_text_by_id)
-      # @return (see #click)
-      #
-      def double_click_table_row_with_text_by_id(browser, what, text, desc = '', column = nil)
-        double_click_table_row_with_text(browser, :id, what, text, desc, column)
-      end
-
-      # Double click the first row which contains a particular string in a table identified by its index
-      # in the array of tables contained in <b>*browser*</b>.
-      # A specific column in the table can also be specified.
-      # @param (see #click_table_row_with_text_by_id)
-      # @return (see #click)
-      #
-      def double_click_table_row_with_text_by_index(browser, idx, what, column = nil)
-        double_click_table_row_with_text(browser, :index, what, text, desc, column)
-      end
-
-      # @!endgroup Tables
-
-      # @!group Core
-
       # Click a specifific button on a popup window.
       # (Windows only)
       # @param [String] title A string starting at the beginning of the title which uniquely identifies the popup window.
@@ -611,7 +226,7 @@ module Awetestlib
       # @param [Boolean] nofail If true do not log a failed message if the option is not found in the select list.
       # @return (see #click)
       def select_option_from_list(list, how, what, desc = '', nofail = false)
-        msg = build_message("Select :#{how}=>'#{what}", desc)
+        msg = build_message("Select :#{how}=>'#{what}'", desc)
         ok  = true
         if list
           case how
@@ -656,97 +271,10 @@ module Awetestlib
       # @return (see #click)
       def select_option(browser, how, what, which, option, desc = '', nofail = false)
         list = browser.select_list(how, what)
-        msg = build_message(" from list with :#{how}=>'#{what}", desc)
+        msg  = build_message("from list with :#{how}=>'#{what}", desc)
         select_option_from_list(list, which, option, msg, nofail)
       end
 
-      # @!endgroup Core
-
-      # @!group Select
-
-      # Select option from select list (dropdown) identified by the value in its *:id* attribute. Option is identified by *which* and *value*
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
-      # @param [String/Rexexp] option A string or regular expression that will uniquely identify the option to select.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @param [Boolean] nofail If true do not log a failed message if the option is not found in the select list.
-      # @return (see #click)
-      def select_option_by_id_and_option_text(browser, what, option, nofail = false, desc = '')
-        select_option(browser, :id, what, :text, option, desc, nofail)
-      end
-
-      alias select_option_by_id select_option_by_id_and_option_text
-      alias select_option_by_id_and_text select_option_by_id_and_option_text
-
-      # Select option from select list (dropdown) identified by the value in its *:name* attribute. Option is selected by its *:text* attribute.
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
-      # @param [String/Rexexp] option A string or regular expression that will uniquely identify the option to select.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @return (see #click)
-      def select_option_by_name_and_option_text(browser, what, option, desc = '')
-        select_option(browser, :name, what, :text, option, desc)
-      end
-
-      alias select_option_by_name select_option_by_name_and_option_text
-
-      # Select option from select list (dropdown) identified by the value in its *:name* attribute. Option is selected by its *:text* attribute.
-      # @param (see #select_option_by_name_and_option_text)
-      # @return (see #click)
-      def select_option_by_title_and_option_text(browser, what, option, desc = '')
-        select_option(browser, :title, what, :text, option, desc)
-      end
-
-      # Select option from select list (dropdown) identified by the value in its *:class* attribute. Option is selected by its *:text* attribute.
-      # @param (see #select_option_by_name_and_option_text)
-      # @return (see #click)
-      def select_option_by_class_and_option_text(browser, what, option, desc = '')
-        select_option(browser, :class, what, :text, option, desc)
-      end
-
-      # Select option from select list (dropdown) identified by the value in its *:name* attribute. Option is selected by its *:value* attribute.
-      # @param (see #select_option_by_name_and_option_text)
-      # @return (see #click)
-      def select_option_by_name_and_option_value(browser, what, option, desc = '')
-        select_option(browser, :name, what, :value, option, desc)
-      end
-
-      # Select option from select list (dropdown) identified by the value in its *:id* attribute. Option is selected by its *:value* attribute.
-      # @param (see #select_option_by_name_and_option_text)
-      # @return (see #click)
-      def select_option_by_id_and_option_value(browser, what, option, desc = '')
-        select_option(browser, :id, what, :value, option, desc)
-      end
-
-      # Select option from select list (dropdown) identified by the value in its *:id* attribute.
-      # Option is selected by its index withing the select list's array of options.
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
-      # @param [Fixnum] index An integer that indicates the index of the element within the array of options.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @return (see #click)
-      def select_option_by_id_and_index(browser, what, index, desc = '')
-        select_option(browser, :id, what, :index, index, desc)
-      end
-
-      # Select option from select list (dropdown) identified by the value in its *:name* attribute. Option is selected by its *:index* attribute.
-      # @param (see #select_option_by_id_and_index)
-      # @return (see #click)
-      def select_option_by_name_and_index(browser, what, option, desc = '')
-        select_option(browser, :name, what, :index, option, desc)
-      end
-
-      # Select option from select list (dropdown) identified by the xpath command supplied in *what*. Option is selected by its *:index* attribute.
-      # @param (see #select_option_by_id_and_index)
-      # @return (see #click)
-      def select_option_by_xpath_and_index(browser, what, option, desc = '')
-        select_option(browser, :xpath, what, :index, option, desc)
-      end
-
-      # @!endgroup Select
-
-      # @!group Core
-
       # Set radio button or checkbox to selected.
       # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
       # @param [Symbol] element The kind of element to click. Must be either :radio or :checkbox.
@@ -769,13 +297,13 @@ module Awetestlib
           else
             failed_to_log("#{__method__}: #{element} not supported")
         end
-          passed_to_log(msg)
-          true
+        passed_to_log(msg)
+        true
       rescue
-          failed_to_log("#{msg} '#{$!}'")
-        end
+        failed_to_log("#{msg} '#{$!}'")
+      end
 
-      # Set file field element, identified by *how* and +what, to a specified file path and name.
+      # Set file field element, identified by *how* and *what*, to a specified file path and name.
       # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
       # @param [Symbol] how The element attribute used to identify the specific element.
       #   Valid values depend on the kind of element.
@@ -785,13 +313,13 @@ module Awetestlib
       # @param [String] desc Contains a message or description intended to appear in the log and/or report output
       # @return (see #click)
       def set_file_field(browser, how, what, filespec, desc = '')
-        msg = build_message("Set file field #{how}=>#{what} to '#{filespec}.", desc)
-        ff = browser.file_field(how, what)
+        msg = build_message("#{__method__.to_s.humanize} #{how}=>#{what} to '#{filespec}.", desc)
+        ff  = browser.file_field(how, what)
         if ff
           ff.set filespec
           sleep_for(8)
-            passed_to_log(msg)
-            true
+          passed_to_log(msg)
+          true
         else
           failed_to_log("#{msg} File field not found.")
         end
@@ -812,8 +340,8 @@ module Awetestlib
       def set_radio_two_attributes(browser, how1, what1, how2, what2, desc = '')
         msg = build_message("Set radio #{how1}='#{what1}', #{how2}= #{what2}", desc)
         browser.radio(how1 => what1, how2 => what2).set
-          passed_to_log(msg)
-          true
+        passed_to_log(msg)
+        true
       rescue
         failed_to_log("#{msg} '#{$!}'")
       end
@@ -834,188 +362,6 @@ module Awetestlib
       #  failed_to_log("#{msg} (#{__LINE__})")
       #end
 
-      # @!endgroup Core
-
-      # @!group Set
-
-      # Set checkbox as checked. Checkbox is identified by the attribute specified in *how* with value *what*. It's *:value* attribute can also be used
-      # when needed by specifying *value*.
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [Symbol] how The element attribute used to identify the specific checkbox.
-      #   Valid values depend on the kind of element.
-      #   Common values: :text, :id, :title, :name, :class, :href (:link only)
-      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the checkbox.
-      # @param [String, Regexp] value A string or a regular expression to be found in the *:value* attribute of the checkbox.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @return (see #click)
-      def set_checkbox(browser, how, what, value = nil, desc = '')
-        set(browser, :checkbox, how, what, value, desc)
-      end
-
-      # Set checkbox as checked identified by its *:class* attribute with the value in *what*. It's *:value* attribute can also be used
-      # when needed by specifying *value*.
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the checkbox.
-      # @param [String, Regexp] value A string or a regular expression to be found in the *:value* attribute of the checkbox.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @return (see #click)
-      def set_checkbox_by_class(browser, what, value = nil, desc = '')
-        set(browser, :checkbox, :class, what, value, desc)
-      end
-
-      # Set checkbox as checked identified by its *:class* attribute with the value in *what*. It's *:value* attribute can also be used
-      # when needed by specifying *value*.
-      # @param (see #set_checkbox_by_class)
-      # @return (see #click)
-      def set_checkbox_by_id(browser, what, value = nil, desc = '')
-        set(browser, :checkbox, :id, what, value, desc)
-      end
-
-      # Set checkbox as checked identified by its *:name* attribute with the value in *what*. It's *:value* attribute can also be used
-      # when needed by specifying *value*.
-      # @param (see #set_checkbox_by_class)
-      # @return (see #click)
-      def set_checkbox_by_name(browser, what, value = nil, desc = '')
-        set(browser, :checkbox, :name, what, value, desc)
-      end
-
-      # Set checkbox as checked identified by its *:title* attribute with the value in *what*. It's *:value* attribute can also be used
-      # when needed by specifying *value*.
-      # @param (see #set_checkbox_by_class)
-      # @return (see #click)
-      def set_checkbox_by_title(browser, what, value = nil, desc = '')
-        set(browser, :checkbox, :title, what, value, desc)
-      end
-
-      # Set checkbox as checked identified by its *:value* attribute with the value in *what*.
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the checkbox.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @return (see #click)
-      def set_checkbox_by_value(browser, what, desc = '')
-        set(browser, :checkbox, :value, what, nil, desc)
-      end
-
-      # Set radio button as set. Radio is identified by the attribute specified in *how* with value *what*. It's *:value* attribute can also be used
-      # when needed by specifying *value*.
-      # @param (see #set_checkbox)
-      # @return (see #click)
-      def set_radio(browser, how, what, value = nil, desc = '')
-        set(browser, :radio, how, what, value, desc)
-      end
-
-      # Set radio button as set identified by its *:class* attribute with the value in *what*. It's *:value* attribute can also be used
-      # when needed by specifying *value*.
-      # @param (see #set_checkbox_by_class)
-      def set_radio_by_class(browser, what, value = nil, desc = '')
-        set(browser, :radio, :class, what, value, desc)
-      end
-
-      # Set radio button as set identified by its *:id* attribute with the value in *what*. It's *:value* attribute can also be used
-      # when needed by specifying *value*.
-      # @param (see #set_checkbox_by_class)
-      # @return (see #click)
-      def set_radio_by_id(browser, what, value = nil, desc = '')
-        set(browser, :radio, :id, what, value, desc)
-        end
-
-      # Set radio button as set identified by its index within the array of radio buttons found in the container specified by *browser*.
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [Fixnum] index An integer that indicates the index of the element within *browser*.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @return (see #click)
-      def set_radio_by_index(browser, index, desc = '')
-        set(browser, :radio, :index, index, nil, desc)
-      end
-
-      # Set radio button as set identified by its *:name* attribute with the value in *what*. It's *:value* attribute can also be used
-      # when needed by specifying *value*.
-      # @param (see #set_checkbox_by_class)
-      # @return (see #click)
-      def set_radio_by_name(browser, what, value = nil, desc = '')
-        set(browser, :radio, :name, what, value, desc)
-      end
-
-      # Set radio button as set identified by its *:title* attribute with the value in *what*. It's *:value* attribute can also be used
-      # when needed by specifying *value*.
-      # @param (see #set_checkbox_by_class)
-      # @return (see #click)
-      def set_radio_by_title(browser, what, value = nil, desc = '')
-        set(browser, :radio, :title, what, value, desc)
-      end
-
-      # Set radio button as set identified by its *:value* attribute with the value in *what*.
-      # @param (see #set_checkbox_by_value)
-      # @return (see #click)
-      def set_radio_by_value(browser, what, desc = '')
-        set(browser, :radio, :value, what, nil, desc)
-      end
-
-      # Set radio button as set identified by its *:name* attribute with the value in *what*
-      # and its index within the array of radio buttons with that :name
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [String, Regexp] what A string or a regular expression to be found in the *:name* attribute that identifies the group of radio buttons.
-      # @param [Fixnum] index An integer that indicates the index of the radio button to be set.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @return (see #click)
-      def set_radio_by_name_and_index(browser, what, index, desc = '')
-        set_radio_two_attributes(browser, :name, what, :index, index, desc)
-      end
-
-      # Set radio button as set identified by its *:name* attribute with the value in *what*
-      # and its index within the array of radio buttons with that :name
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [String, Regexp] what A string or a regular expression to be found in the *:name* attribute that identifies the group of radio buttons.
-      # @param [String, Regexp] text A string or a regular expression to be found in the *:text* attribute that uniquely identifies the the radio button to be set.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @return (see #click)
-      def set_radio_by_name_and_text(browser, what, text, desc = '')
-        set_radio_two_attributes(browser, :name, what, :text, text, desc)
-      end
-
-      # Set radio button as set identified by its *:value* attribute with the value in *what*
-      # and its index within the array of radio buttons with that :name
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [String, Regexp] value A string or a regular expression to be found in the *:value* attribute that identifies the group of radio buttons.
-      # @param [Fixnum] index An integer that indicates the index of the radio button to be set.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @return (see #click)
-      def set_radio_by_value_and_index(browser, value, index, desc = '')
-        set_radio_two_attributes(browser, :value, value, :index, index, desc)
-      end
-
-      # Set radio button as set identified by its *:name* attribute with the value in *what*
-      # and the *:value* attribute with the value in *value*.
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [String, Regexp] what A string or a regular expression to be found in the *:name* attribute that identifies the group of radio buttons.
-      # @param [String, Regexp] value A string or a regular expression to be found in the *:value* attribute that uniquely identifies the the radio button to be set.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @return (see #click)
-      def set_radio_by_name_and_value(browser, what, value, desc = '')
-        set_radio(browser, :name, what, value, desc)
-      end
-
-      # Set file field element, identified by its *:name* attribute with the value in *what*.
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
-      # @param [String] filespec The full path and name of the target file.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @return (see #click)
-      def set_file_field_by_name(browser, what, filespec, desc = '')
-        set_file_field(browser, :name, what, filespec, desc)
-      end
-
-      # Set file field element, identified by its *:id* attribute with the value in *what*.
-      # @param (see #set_file_field_by_name)
-      # @return (see #click)
-      def set_file_field_by_id(browser, what, filespec, desc = '')
-        set_file_field(browser, :id, what, filespec, desc)
-      end
-
-      # @!endgroup Set
-
-      # @!group Core
-
       # Clear (unset) radio, checkbox or text field as identified by the attribute specified in *how* with value *what*.
       # It's *:value* attribute can also be used when needed by specifying *value* (Ignored for text_field).
       # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
@@ -1042,68 +388,12 @@ module Awetestlib
           else
             failed_to_log("#{__method__}: #{element} not supported")
         end
-          passed_to_log(msg)
-          true
+        passed_to_log(msg)
+        true
       rescue
         failed_to_log("#{msg} '#{$!}'")
       end
 
-      # @!endgroup Core
-
-      # @!group Clear
-
-      # Clear (uncheck) checkbox identified by the attribute specified in *how* with value *what*.
-      # It's *:value* attribute can also be used when needed by specifying *value*.
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [Symbol] how The element attribute used to identify the specific checkbox.
-      #   Valid values depend on the kind of element.
-      #   Common values: :text, :id, :title, :name, :class.
-      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
-      # @param [String, Regexp] value A string or a regular expression to be found in the *:value* attribute of the element.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @return (see #click)
-      def clear_checkbox(browser, how, what, value = nil, desc = '')
-        clear(browser, :checkbox, how, what, value, desc)
-      end
-
-      # Clear (uncheck) checkbox identified by its *:name* attribute with value *what*.
-      # It's *:value* attribute can also be used when needed by specifying *value*.
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
-      # @param [String, Regexp] value A string or a regular expression to be found in the *:value* attribute of the element.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @return (see #click)
-      def clear_checkbox_by_name(browser, what, value = nil, desc = '')
-        clear(browser, :checkbox, :name, what, value, desc)
-      end
-
-      # Clear (uncheck) checkbox identified by its *:id* attribute with value *what*.
-      # It's *:value* attribute can also be used when needed by specifying *value*.
-      # @param (see #set_file_field_by_name)
-      # @return (see #click)
-      def clear_checkbox_by_name(browser, what, value = nil, desc = '')
-        clear(browser, :checkbox, :id, what, value, desc)
-      end
-
-      # Clear (unset) radio button identified by the attribute specified in *how* with value *what*.
-      # It's *:value* attribute can also be used when needed by specifying *value*.
-      # This clears the specified radio without setting any other radio buttons on.
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [Symbol] how The element attribute used to identify the specific checkbox.
-      #   Valid values depend on the kind of element.
-      #   Common values: :text, :id, :title, :name, :class.
-      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
-      # @param [String, Regexp] value A string or a regular expression to be found in the *:value* attribute of the element.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @return (see #click)
-      def clear_radio(browser, how, what, value = nil, desc = '')
-        clear(browser, :radio, how, what, value, desc)
-      end
-
-      # @!endgroup Clear
-
-      # @!group Core
-
       # Set text field as identified by the attribute specified in *how* with value in *what* to the string specified in *value*.
       # This method differs from set() in that it validates that the text field has been set to the specified value.
       # The value verification can be turned off by setting *skip_value_check* to true.
@@ -1119,23 +409,24 @@ module Awetestlib
       # @return (see #click)
       def set_text_field(browser, how, what, value, desc = '', skip_value_check = false)
         #TODO: fix this to handle Safari password field
-        msg = build_message("Set textfield #{how}='#{what}' to '#{value}'", desc)
+        msg = build_message("#{__method__.to_s.humanize} #{how}='#{what}' to '#{value}'", desc)
         msg << " (Skip value check)" if skip_value_check
         if browser.text_field(how, what).exists?
           tf = browser.text_field(how, what)
-          #debug_to_log("#{tf.inspect}")
-            tf.set(value)
-              if tf.value == value
-                passed_to_log(msg)
-                true
-              elsif skip_value_check
-                passed_to_log(msg)
-                true
-              else
-                failed_to_log("#{msg}: Found:'#{tf.value}'.")
-              end
+          tf.set(value)
+          if skip_value_check
+            passed_to_log(msg)
+            true
+          else
+            if tf.value == value
+              passed_to_log(msg)
+              true
+            else
+              failed_to_log("#{msg}: Found:'#{tf.value}'.")
+            end
+          end
         else
-          failed_to_log("#{msg}: Textfield #{how}='#{what}' not found")
+          failed_to_log("#{msg}: Textfield not found")
         end
       rescue
         failed_to_log("Unable to '#{msg}': '#{$!}'")
@@ -1156,23 +447,25 @@ module Awetestlib
       # @param [Boolean] skip_value_check Forces verification of value in text field to pass.
       # @return (see #click)
       def clear_textfield(browser, how, what, skip_value_check = false)
+        msg1 = "Skip value check." if skip_value_check
+        msg = build_message("#{__method__.to_s.humanize}  #{how}='#{what}'.", msg1)
         if browser.text_field(how, what).exists?
           tf = browser.text_field(how, what)
-            tf.clear
-              if tf.value == ''
-                passed_to_log("Textfield #{how}='#{what}' cleared.")
-                true
-              elsif skip_value_check
-                passed_to_log("Textfield  #{how}='#{what}' cleared. (skip value check)")
-                true
-              else
-                failed_to_log("Textfield  #{how}='#{what}' not cleared: Found:'#{tf.value}'. (#{__LINE__})")
-              end
+          tf.clear
+          if tf.value == ''
+            passed_to_log(msg)
+            true
+          elsif skip_value_check
+            passed_to_log(msg)
+            true
+          else
+            failed_to_log("#{msg} Found:'#{tf.value}'.")
+          end
         else
-          failed_to_log("Textfield id='#{id}' to clear. (#{__LINE__})")
+          failed_to_log("#{msg} Textfield not found.")
         end
       rescue
-        failed_to_log("Textfield id='#{id}' could not be cleared: '#{$!}'. (#{__LINE__})")
+        failed_to_log("Unable to #{msg} '#{$!}'.")
       end
 
       #Enter a string into a text field element identified by an attribute type and a value.
@@ -1198,7 +491,7 @@ module Awetestlib
         #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
-          validate_textfield_value(browser, how, what, expected)
+          validate_textfield_value(browser, how, what, expected, desc)
         end
       rescue
         failed_to_log("Unable to '#{msg}': '#{$!}'")
@@ -1230,53 +523,6 @@ module Awetestlib
       #  failed_to_log("Textfield name='#{name}' could not be set to '#{value}': '#{$!}'. #{desc} (#{__LINE__})")
       #end
 
-      # @!endgroup Core
-
-      # @!group Set
-
-      # Set text field as identified by its *:name* attribute with value in *what* to the string specified in *value*.
-      # This method validates that the text field has been set to the specified value.
-      # The value verification can be turned off by setting *skip_value_check* to true.
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [String, Regexp] what A string or a regular expression to be found in the specified attribute that uniquely identifies the element.
-      # @param [String] value A string to enter into the text field.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output.
-      # Required if *skip_value_check* is set to true.
-      # @param [Boolean] skip_value_check Forces verification of value in text field to pass.
-      # @return (see #click)
-      def set_textfield_by_name(browser, what, value, desc = '', skip_value_check = false)
-        set_text_field(browser, :name, what, value, desc, skip_value_check)
-      end
-
-      # Set text field as identified by its *:id* attribute with value in *what* to the string specified in *value*.
-      # This method validates that the text field has been set to the specified value.
-      # The value verification can be turned off by setting *skip_value_check* to true.
-      # @param (see #set_textfield_by_name)
-      # @return (see #click)
-      def set_textfield_by_id(browser, what, value, desc = '', skip_value_check = false)
-        set_text_field(browser, :id, what, value, desc, skip_value_check)
-      end
-
-      # Set text field as identified by its *:class* attribute with value in *what* to the string specified in *value*.
-      # This method validates that the text field has been set to the specified value.
-      # The value verification can be turned off by setting *skip_value_check* to true.
-      # @param (see #set_textfield_by_name)
-      # @return (see #click)
-      def set_textfield_by_title(browser, what, value, desc = '', skip_value_check = false)
-        set_text_field(browser, :title, what, value, desc, skip_value_check)
-      end
-
-      # Set text field as identified by its *:class* attribute with value in *what* to the string specified in *value*.
-      # This method validates that the text field has been set to the specified value.
-      # The value verification can be turned off by setting *skip_value_check* to true.
-      # @param (see #set_textfield_by_name)
-      def set_textfield_by_class(browser, what, value, desc = '', skip_value_check = false)
-        set_text_field(browser, :class, what, value, desc, skip_value_check)
-      end
-
-      # @!endgroup Set
-      # @!group Core
-
       # Fire an event on a specific DOM element identified by one of its attributes and that attribute's value.
       #
       # @example
@@ -1297,8 +543,7 @@ module Awetestlib
       # @return (see #click)
       #
       def fire_event(browser, element, how, what, event, desc = '')
-        msg  = "#{element.to_s.titlecase}: #{how}=>'#{what}' event:'#{event}'"
-        msg1 = "#{element.to_s.titlecase}(#{how}, '#{what}')"
+        msg = build_message("#{element.to_s.titlecase}: #{how}=>'#{what}' event:'#{event}'", desc)
         begin
           case element
             when :link
@@ -1315,73 +560,16 @@ module Awetestlib
               browser.element(how, what).fire_event(event)
           end
         rescue => e
-          if not rescue_me(e, __method__, "browser(#{msg1}).fire_event('#{event}')", "#{browser.class}")
+          unless rescue_me(e, __method__, rescue_me_command(element, how, what, __method__.to_s, event), "#{browser.class}")
             raise e
           end
         end
-          passed_to_log("Fire event: #{msg}. #{desc}")
-          true
+        passed_to_log("Fire event: #{msg}. #{desc}")
+        true
       rescue
         failed_to_log("Unable to fire event: #{msg}. '#{$!}' #{desc}")
       end
 
-      # @!endgroup Core
-      
-      # @!group Fire Event
-
-      # Fire an event on a link element identified by the value in its text (innerHTML)
-      #
-      # @example
-      #  # html for a link element:
-      #  # <a href="http://pragmaticprogrammer.com/titles/ruby/" id="one" name="book">Pickaxe</a>
-      #
-      #  fire_event_on_link_by_text(browser, 'Pickaxe', 'onMouseOver')
-      #
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [String, Regexp] what A string or a regular expression to be found in the *how* attribute that uniquely identifies the element.
-      # @param [String] event A string identifying the event to be fired.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @return (see #click)
-      #
-      def fire_event_on_link_by_text(browser, what, event, desc = '')
-        fire_event(browser, :link, :text, what, event, desc)
-      end
-
-      alias fire_event_text fire_event_on_link_by_text
-      alias fire_event_by_text fire_event_on_link_by_text
-
-      # Fire an event on a link element identified by the value in its *:id* attribute.
-      #
-      # @example
-      #  # html for a link element:
-      #  # <a href="http://pragmaticprogrammer.com/titles/ruby/" id="one" name="book">Pickaxe</a>
-      #
-      #  fire_event_on_link_by_id(browser, 'one', 'onMouseOver')
-      #
-      # @param (see #fire_event_on_link_by_text)
-      # @return (see #click)
-      #
-      def fire_event_on_link_by_id(browser, what, event, desc = '')
-        fire_event(browser, :link, :id, what, event, desc)
-      end
-
-      alias fire_event_id fire_event_on_link_by_id
-      alias fire_event_by_id fire_event_on_link_by_id
-
-      # Fire an event on a image element identified by the value in its *:src* attribute.
-      # Take care to escape characters in the source url that are reserved by Regexp.
-      # @param (see #fire_event_on_link_by_text)
-      # @return (see #click)
-      #
-      def fire_event_on_image_by_src(browser, what, event, desc = '')
-        fire_event(browser, :img, :src, what, event, desc)
-      end
-
-      alias fire_event_src fire_event_on_image_by_src
-      alias fire_event_image_by_src fire_event_on_image_by_src
-
-      # @!endgroup Fire Event
-
     end
   end
 end