oats 0.0.1 → 0.0.2

data/lib/oats/driver.rb

@@ -45,13 +45,12 @@ module Oats
     # Returns oats_info object containing execution results
     def Driver.run(args)
       unless ENV['HOSTNAME']
-        if ENV['OS'] == 'Windows_NT'
+        if RUBY_PLATFORM =~ /mswin32/
           ENV['HOSTNAME'] = ENV['COMPUTERNAME']
         else
           ENV['HOSTNAME'] = `hostname`.chomp
         end
       end
-      ENV['OS'] ||= `uname`.chomp
 
       Log4r::Logger.root.level = Log4r::DEBUG
       Log4r::StdoutOutputter.new('console', :level=>1,

data/lib/oats/keywords.rb

@@ -49,10 +49,30 @@ module Oats
       def process
         # Class name comes from Oats.data oats_keywords_cleass, or in the case of XL files from TestCase ID
         class_name = Oats.data('keywords.class') || File.basename(File.dirname(File.dirname(Oats.test.id)))
+        class_file = nil
         begin
           keywords_class = Kernel.const_get class_name
         rescue NameError
-          raise OatsTestError, "Can not find class: " + class_name
+          class_file = Oats.data('keywords.class_file')
+          unless class_file # Try standard ruby conventions
+            class_file = class_name.dup
+            class_file.gsub!(/::/, '/')
+            class_file.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+            class_file.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+            class_file.tr!("-", "_")
+            class_file.downcase!
+          end
+          begin
+            Oats.info "Loading: '#{class_file}' for #{class_name}"
+            require class_file
+            begin
+              keywords_class = Kernel.const_get class_name
+            rescue NameError
+              raise OatsTestError, "Can not find class '#{class_name}' in class file: '#{class_file}'"
+            end
+          rescue LoadError
+            Oats.assert class_file.nil?, "Could not load Oats.data keywords.class_file '#{class_file}' for class '#{class_name}'."
+          end
         end
         oats_data('keywords',keywords_class).each do |action|
           Oats.assert keywords_class.respond_to?(action),

data/lib/oats/mysql.rb

@@ -35,7 +35,7 @@ module Oats
       sql_out_name = name + '.txt' unless sql_out_name
       sql_out = File.join(test.result, sql_out_name) if sql_out_name
       err_file = sql_out + '.err'
-      command = (ENV['OS'] != 'Darwin' ? 'mysql' : '/usr/local/mysql/bin/mysql') +
+      command = (RUBY_PLATFORM =~ /darwin'/ ? '/usr/local/mysql/bin/mysql' : 'mysql') +
         " #{parameters(connect)} < #{mysql_input_file} > #{sql_out} 2> #{err_file}"
       #    $log.debug "Executing: #{command}"
       $log.info "SQL: #{sql_input}" if sql_input

data/lib/oats/oats.rb

@@ -109,7 +109,7 @@ module Oats
   # Returns captured file name if successful, or nil.
   def Oats.system_capture
     return if $selenium.nil? or # Snapshots are not supported on Ubuntu/Chrome
-    ($oats['selenium']['browser_type'] == 'chrome' and ENV['OS'] == 'Linux')
+    ($oats['selenium']['browser_type'] == 'chrome' and RUBY_PLATFORM =~ /linux/)
     ct = TestData.current_test
     file = Util.file_unique(fn="page_screenshot.png", ct.result)
     Oats.info "Will attempt to capture #{fn}."

data/lib/oats/oats_lock.rb

@@ -1,5 +1,5 @@
 # Manages a lock file indicating a OATS session is in process
-require 'win32ole' if ENV['OS'] == 'Windows_NT'
+require 'win32ole' if RUBY_PLATFORM =~ /mswin32/
 module Oats
 
   module OatsLock
@@ -14,7 +14,7 @@ module Oats
         @@file_handle = File.open(in_progress_file, 'w')
         my_pid = Process.pid.to_s
         @@file_handle.puts my_pid
-        if ENV['OS'] != 'Windows_NT' or ENV['TEMP'] =~ /^\/cygdrive/
+        if RUBY_PLATFORM !~ /mswin32/ or ENV['TEMP'] =~ /^\/cygdrive/
           # Leave file handle open for windows to detect and kill associated java, etc.
           # processes using file handles.
           @@file_handle.close
@@ -30,7 +30,7 @@ module Oats
     def OatsLock.locked?(verify = nil)
       return @@is_locked unless verify
       @@is_locked = false
-      if ENV['OS'] != 'Windows_NT' or ENV['TEMP'] =~ /^\/cygdrive/
+      if RUBY_PLATFORM !~ /mswin32/ or ENV['TEMP'] =~ /^\/cygdrive/
         if File.exist?(in_progress_file)
           pids = IO.readlines(in_progress_file)
           ruby_pid = pids.shift
@@ -140,7 +140,7 @@ module Oats
 
     def OatsLock.find_matching_processes(proc_names)
       matched = []
-      if ENV['OS'] == 'Windows_NT'
+      if RUBY_PLATFORM =~ /mswin32/
         processes = WIN32OLE.connect("winmgmts://").ExecQuery("select * from win32_process")
         #      for process in processes do
         #        for property in process.Properties_ do
@@ -154,22 +154,22 @@ module Oats
           end
         end
       else
-        pscom = ENV['OS'] == 'Linux' ? 'ps lxww' : 'ps -ef'
+        pscom = RUBY_PLATFORM =~ /linux/ ? 'ps lxww' : 'ps -ef'
         `#{pscom}`.split("\n").each do |lvar|
           line = lvar.chomp
-          case ENV['OS']
-          when 'Darwin' #  ps -ef output
+          case RUBY_PLATFORM
+          when /darwin/ #  ps -ef output
             pid = line[5..11]
             next if pid.to_i == 0
             ppid = line[12..16]
             proc_name = line[50..-1]
-          when 'Linux' #  ps ww output
+          when /linux/ #  ps ww output
             pid = line[7..12]
             next if pid.to_i == 0
             ppid = line[13..18]
             proc_name = line[69..-1]
           else
-            raise OatError, "Do not know how to parse ps output from #{ENV['OS']}"
+            raise OatError, "Do not know how to parse ps output from #{RUBY_PLATFORM}"
           end
           next unless pid
           matched.push [pid.strip, proc_name.strip, ppid.strip, line.strip] if proc_name =~ proc_names
@@ -189,7 +189,7 @@ module Oats
 
       # Kill all selenium automation chrome jobs on MacOS. Assumes MacOS is for development only, not OCC.
       # Will cause problems if multiple agents are run on MacOS
-      if ENV['OS'] == 'Darwin'
+      if RUBY_PLATFORM =~ /darwin/
         chrome_automation_procs = OatsLock.find_matching_processes(/ Chrome .* --dom-automation/)
         chrome_automation_procs.each do |pid,proc_name,ppid|
           OatsLock.kill_pid pid
@@ -222,7 +222,7 @@ module Oats
         @@file_handle = nil
         @@is_locked = true
       else # Doesn't return status properly for non-windows, just resets the lock
-        if $oats_execution['agent'].nil? and ENV['OS'] != 'Windows_NT' and File.exist?(in_progress_file)
+        if $oats_execution['agent'].nil? and RUBY_PLATFORM !~ /mswin32/ and File.exist?(in_progress_file)
           pids = IO.readlines(in_progress_file)
           current_pid = pids.shift
           pids.each { |pid| OatsLock.kill_pid(pid.chomp) } # Legacy firefox

data/lib/oats/oselenium.rb

@@ -45,13 +45,13 @@ module Oats
         if browser_type == 'firefox'
           $oats_global['download_dir'] = $oats['execution']['dir_results'] + '/downloads'
         elsif Oats.data("selenium.default_downloads")
-          $oats_global['download_dir'] = File.join(ENV[ ENV['OS'] == 'Windows_NT' ? 'USERPROFILE' : 'HOME'], 'Downloads')
-          $oats_global['download_dir'].gsub!('\\','/') if ENV['OS'] == 'Windows_NT'
+          $oats_global['download_dir'] = File.join(ENV[ RUBY_PLATFORM =~ /mswin32/ ? 'USERPROFILE' : 'HOME'], 'Downloads')
+          $oats_global['download_dir'].gsub!('\\','/') if RUBY_PLATFORM =~ /mswin32/
         end
       end
 
       download_dir = $oats_global['download_dir'].gsub('/','\\\\') if $oats_global['download_dir'] and
-        ENV['OS'] == 'Windows_NT'
+        RUBY_PLATFORM =~ /mswin32/
       download_dir ||= $oats_global['download_dir']
       case browser_type
       when 'firefox'
@@ -69,10 +69,10 @@ module Oats
         profile = Selenium::WebDriver::Chrome::Profile.new
         profile['download.prompt_for_download'] = false
         profile['download.default_directory'] = download_dir
-        unless $oats_global['browser_path']
-          vpath = File.join($oats['_']['vendor'], ENV['OS'], 'chromedriver' + (ENV['OS'] == 'Windows_NT' ? '.exe' : '') )
-          $oats_global['browser_path'] = vpath if File.exist?(vpath)
-        end
+#        unless $oats_global['browser_path']
+#          vpath = File.join($oats['_']['vendor'], ENV['OS'], 'chromedriver' + (RUBY_PLATFORM =~ /mswin32/ ? '.exe' : '') )
+#          $oats_global['browser_path'] = vpath if File.exist?(vpath)
+#        end
       end
       FileUtils.rm_f Dir.glob(File.join($oats_global['download_dir'],'*')) if $oats_global['download_dir']
       Oats.info "Browser type: #{browser_type.inspect}, profile: #{profile.inspect}, path: #{$oats_global["browser_path"].inspect}"
@@ -127,9 +127,9 @@ module Oats
         file.sub!(ENV['OATS_HOME'], $oats['selenium']['remote_webdriver']['oats_dir'])
         file_os = $oats['selenium']['remote_webdriver']['os']
       else
-        file_os = ENV['OS']
+        file_os = RUBY_PLATFORM
       end
-      file_os == 'Windows_NT' ? file.gsub('/','\\') : file
+      file_os =~ /mswin32/ ? file.gsub('/','\\') : file
     end
 
     def Oselenium.reset

data/lib/oats/test_case.rb

@@ -432,7 +432,7 @@ module Oats
           out_contents = IO.read(file_out).gsub(/\s/,'')
           unless ok_contents == out_contents
             err = "File in out folder did not match out folder in: #{file_ok}"
-            diff_lines =  `diff -b '#{file_ok}' '#{file_out}'` unless ENV['OS'] == 'Windows_NT'
+            diff_lines =  `diff -b '#{file_ok}' '#{file_out}'` unless RUBY_PLATFORM =~ /mswin32/
           end
         else
           err = "Extra output [#{file}] missing from: #{test_ok_out}"

data/lib/oats/test_data.rb

@@ -62,7 +62,7 @@ module Oats
       extn = File.extname(test_file)
       extn = nil if extn == ''
       found_file = catch :found_file do
-        if  ENV['OS'] == 'Windows_NT' ? test_file[1] == ?: : test_file[0] == ?/ # absolute path
+        if  RUBY_PLATFORM =~ /mswin32/ ? test_file[1] == ?: : test_file[0] == ?/ # absolute path
           # Try exact match
           throw(:found_file, test_file) if File.exist?(test_file) and (is_dir or not FileTest.directory?(test_file))
 

data/lib/oats/version.rb

@@ -1,3 +1,3 @@
 module Oats
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/oats.gemspec

@@ -16,25 +16,25 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   #  s.test_files = ["test/test_cgi_wrapper.rb" ]
-  s.executables   = %w{oats}
+  s.executables   = %w{oats occ}
   s.require_paths = ["lib"]
 
-  #   s.extra_rdoc_files = ["CHANGELOG", "COPYING", "lib/mongrel/camping.rb", "LICENSE", "README"]
+  #   s.extra_rdoc_files = ["CHANGELOG", "COPYING", "lib/oats/oats.rb", "LICENSE", "README"]
   #  s.has_rdoc = true
-  #  s.homepage = %q{http://mongrel.rubyforge.org}
-  #  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Mongrel", "--main", "README"
+  #  s.homepage = %q{http://oats .org}
+  #  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Oats", "--main", "README"
   s.date = %q{2012-05-22}
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
 
   s.add_dependency 'log4r'
-  s.add_dependency 'net-http-persistent' unless RUBY_VERSION !~ /^1.9/ # Speed up 1.8 connections
+  s.add_dependency 'net-http-persistent' unless RUBY_VERSION =~ /^1.9/ # Speed up 1.8 connections
 
-  if ENV['OS'] == 'Windows_NT' or ENV['OATS_AGENT'] # Triggers possible intent to use agent
+  if RUBY_PLATFORM =~ /mswin32/ # Assume won't use the agent
     s.add_dependency 'win32-process'
   else
     s.add_dependency 'json'
     s.add_dependency 'em-http-request'
-    if ENV['OS'] == 'Linux' # Seems to be needed by Ubuntu
+    if RUBY_PLATFORM =~ /linux/ # Seems to be needed by Ubuntu
       s.add_dependency 'execjs'
       s.add_dependency 'therubyracer'
     end

data/oats_ini.yml

@@ -242,6 +242,7 @@ sql:
 #    <oats_data>
 #<class>:
 keywords:
+  class_file: # File name of the class so it can be 'require'd if using a non-standard name
   class: # Class file containing methods for each keyword
   list: # Optional list name under which to find the keywords and data in Oats.data
 

data/oats_tests/Gemfile

@@ -1,15 +1,13 @@
-#source "http://rubygems.org"
+source "http://rubygems.org"
 
 # OATS Framework
 gem 'oats' unless defined?(OATS_GEM_IS_ALREADY_INCLUDED)
-# OATS_GEM_IS_ALREADY_INCLUDED
+gem 'spreadsheet' # If you want to run XL based tests
 
-## List GEMs needed by the AUT goes here
-##
-## To run XL based tests
-gem 'spreadsheet'
-#require 'sample_xl_lists' # Include XL based classes to be used.
 #
+# List GEMs needed by the AUT here, and require them in your test classes
+#
+
 gem 'selenium-webdriver' # To run WebDriver tests
 gem 'json' # To run WebDriver tests w/o ok_json to improve performance
 #

data/oats_tests/aut_ini.yml

@@ -1,7 +1,7 @@
 # For full documentation on OATS, please refer to https://github.com/latasoy/oats
 
 keywords:
-  class: # Class file containing methods for each keyword
+  class: # Class name containing methods for each keyword
   list: # List name under which to find the keywords and data in Oats.data
 
 SampleXlLists:

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oats
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Levent Atasoy
@@ -32,7 +32,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: net-http-persistent
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -46,7 +46,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: em-http-request
+  name: json
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -59,11 +59,26 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: em-http-request
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: A flexible automated system integration regression test framework.
 email: 
 - levent.atasoy@gmail.com
 executables: 
 - oats
+- occ
 extensions: []
 
 extra_rdoc_files: []
@@ -243,7 +258,6 @@ files:
 - oats_tests/examples/testFileLocationUnitTests/testDir2/t1.yml
 - oats_tests/examples/testFileLocationUnitTests/unitTestList.yml
 - oats_tests/examples/testFileLocationUnitTests/yml_driver.rb
-- oats_tests/lib/business.rb
 - oats_tests/lib/sample_xl_lists.rb
 - test/common_test_unit_setup.rb
 - test/test_basic.rb

data/oats_tests/lib/business.rb

@@ -1,28 +0,0 @@
-require 'oats_x'
-class Business < OatsX
-
-  def self.common(c)
-    Oats.info "Executing #{c} " + Oats.xl.inspect
-  end
-
-  def self.component1
-    self.common 'component1'
-
-  end
-
-  def self.component2
-    self.common 'component2'
-    #    selenium = Oats.browser('http://google.com')
-    #    selenium.type("id=gbqfq", 'xxxx')
-    #    selenium.click("id=gbqfb")
-    #
-    #    selenium.find_element(:id, "gbqfq").clear
-    #    selenium.find_element(:id, "gbqfq").send_keys "xxxx"
-    #    selenium.find_element(:id, "gbqfb").click
-  end
-
-  def self.component3
-    self.common 'component3'
-  end
-
-end