awetestlib 0.1.29pre4-x86-mingw32 → 0.1.29-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 using Watir-webdriver.
+    # @note Still experimental. Works with IE but not fully tested with Firefox or Chrome in Windows.
     #   Not compatible with Mac
     #   Rdoc is work in progress
     module DragAndDrop
@@ -284,9 +284,8 @@ module Awetestlib
         [x, y, w, h]
       end
 
-      def drag_and_drop_div(browser, how, what, delta_x, delta_y, desc = '')
+      def drag_and_drop(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)
@@ -294,7 +293,7 @@ module Awetestlib
         passed_to_log(msg)
         true
       rescue
-        failed_to_log(unable_to)
+        failed_to_log("Unable to #{msg} '#{$!}'")
       end
 
       def drag_and_drop(x1, y1, dx, dy, speed=nil)

data/lib/awetestlib/regression/runner.rb

@@ -14,6 +14,7 @@ require 'awetestlib/html_report'
 require 'ostruct'
 require 'active_support'
 require 'active_support/inflector'
+require 'sys/uname'
 
 module Awetestlib
   module Regression
@@ -21,6 +22,7 @@ module Awetestlib
     class Runner < Awetestlib::Runner
 
     # order matters here
+      include Sys
       include ActiveSupport::Inflector
       include Awetestlib::Logging
       include Awetestlib::Regression::Utilities
@@ -216,9 +218,6 @@ module Awetestlib
 
       def require_gems
 
-        require 'sys/uname'
-        include Sys
-
         case @targetBrowser.abbrev
 
           when 'IE'

data/lib/awetestlib/regression/tables.rb

@@ -112,10 +112,8 @@ 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, after_index = nil)
+      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
           msg = 'No '
@@ -142,13 +140,8 @@ module Awetestlib
           end
           dbg << "\n#{index}. [#{text}]"
           if text =~ /#{strg}/
-            if after_index and index > after_index
-              found = true
-              break
-            else
-              found = true
-              break
-            end
+            found = true
+            break
           end
         end
         debug_to_log(dbg)
@@ -336,18 +329,17 @@ module Awetestlib
         hit
       end
 
-      def fetch_array_for_table_column(table, column_index, start_row = 2)
-        ary       = []
-        row_count = 0
-        table.each do |row|
-          row_count += 1
+      def fetch_array_for_table_column(nc_element, table_index, column_index)
+        ary = []
+        nc_element.tables[table_index].each do |row|
           if get_cell_count(row) >= column_index
-            if row_count >= start_row
+            #TODO this assumes column 1 is a number column
+            if row[1].text =~ /\d+/
               ary << row[column_index].text
             end
           end
         end
-        ary
+        return ary f
       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, valid_value = nil, desc ='')
+      def set_text_field_and_validate(browser, how, what, value, desc, valid_value = nil)
         #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,31 +59,6 @@ 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|
@@ -311,41 +286,14 @@ module Awetestlib
         else
           new_arr = arr
         end
-        "['#{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,")
+        "['#{new_arr.join("','")}']"
       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")
@@ -543,14 +491,14 @@ module Awetestlib
         tables.each do |tbl|
           tbl_cnt += 1
           row_cnt = 0
-          msg <<"\n=================\ntable: #{tbl_cnt}\n=================\n#{tbl}\ntext:\n#{tbl.text}"
+          msg << "\n=================\ntable: #{tbl_cnt}\n=================\n#{tbl}\ntext:\n#{tbl.text}"
           tbl.rows.each do |row|
             row_cnt  += 1
             cell_cnt = 0
-            msg <<"\n=================\ntable: #{tbl_cnt} row: #{row_cnt}\n#{row.inspect}\n#{row}\ntext:'#{row.text}'"
+            msg << "\n=================\ntable: #{tbl_cnt} row: #{row_cnt}\n#{row.inspect}\n#{row}\ntext:'#{row.text}'"
             row.each do |cell|
               cell_cnt += 1
-              msg <<"\ncell: #{cell_cnt}\n#{cell.inspect}\n#{row}\ntext: '#{cell.text}'"
+              msg << " \ncell: #{cell_cnt}\n#{cell.inspect}\n#{row}\ntext: '#{cell.text}'"
             end
           end
         end
@@ -579,14 +527,14 @@ module Awetestlib
       def dump_table_rows_and_cells(tbl)
         msg     = ''
         row_cnt = 0
-        msg <<"\n=================\ntable: #{tbl.inspect}\n=================\n#{tbl}\ntext:\n#{tbl.text}"
+        msg << "\n=================\ntable: #{tbl.inspect}\n=================\n#{tbl}\ntext:\n#{tbl.text}"
         tbl.rows.each do |row|
           row_cnt  += 1
           cell_cnt = 0
-          msg <<"\n=================\nrow: #{row_cnt}\n#{row.inspect}\n#{row}\ntext:'#{row.text}'"
+          msg << "\n=================\nrow: #{row_cnt}\n#{row.inspect}\n#{row}\ntext:'#{row.text}'"
           row.each do |cell|
             cell_cnt += 1
-            msg <<"\ncell: #{cell_cnt}\n#{cell.inspect}\n#{row}\ntext: '#{cell.text}'"
+            msg << "\ncell: #{cell_cnt}\n#{cell.inspect}\n#{row}\ntext: '#{cell.text}'"
           end
         end
         debug_to_log(msg)
@@ -597,10 +545,10 @@ module Awetestlib
       def dump_row_cells(row)
         msg      = ''
         cell_cnt = 0
-        msg <<"\n=================\nrow: #{row.inspect}\n#{row}\ntext:'#{row.text}'"
+        msg << "\n=================\nrow: #{row.inspect}\n#{row}\ntext:'#{row.text}'"
         row.each do |cell|
           cell_cnt += 1
-          msg <<"\ncell: #{cell_cnt}\n#{cell.inspect}\n#{row}\ntext: '#{cell.text}'"
+          msg << "\ncell: #{cell_cnt}\n#{cell.inspect}\n#{row}\ntext: '#{cell.text}'"
         end
         debug_to_log(msg)
       end
@@ -886,10 +834,14 @@ 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', text = '', button = '&Open',
-          control = 'Edit1', side = 'primary')
-        title = translate_popup_title(title)
-        msg   = "Window title=#{title} button='#{button}' text='#{text}' side='#{side}':"
+      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}':"
         begin
           if @ai.WinWait(title, text, WAIT)
             passed_to_log("#{msg} found.")
@@ -900,10 +852,7 @@ 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
@@ -989,12 +938,10 @@ module Awetestlib
         debug_to_log("#{__method__}: #{method} #{$!}")
       end
 
-      def unable_to(message = '', no_dolbang = false, verify_that = false)
+      def unable_to(message = '', no_dolbang = false)
         call_arr                          = get_call_array()
         call_script, call_line, call_meth = parse_caller(call_arr[1])
-        strg                              = "Unable to"
-        strg << " verify" if verify_that
-        strg << " #{call_meth.titleize}:"
+        strg                              = "Unable to #{call_meth.titleize}:"
         strg << " #{message}" if message.length > 0
         strg << " '#{$!}'" unless no_dolbang
         strg
@@ -1035,19 +982,14 @@ module Awetestlib
         [arr.length, arr]
       end
 
-      def awetestlib?
-        not Awetestlib::Runner.nil?
-      rescue
-        return false
-      end
 
       def get_os
         @os = OpenStruct.new(
-          :name     => Uname.sysname,
-          :version  => Uname.version,
-          :release  => Uname.release,
-          :nodename => Uname.nodename,
-          :machine  => Uname.machine
+          :name     => Sys::Uname.sysname,
+          :version  => Sys::Uname.version,
+          :release  => Sys::Uname.release,
+          :nodename => Sys::Uname.nodename,
+          :machine  => Sys::Uname.machine
         )
       end