testability-driver 1.3.1 → 1.3.2

data/lib/tdriver/util/common/numeric.rb

@@ -54,7 +54,7 @@ class Numeric
     if negative?
 
       # replace macros
-      message.gsub!( '$1', self.inspect )
+      message.gsub!( '$1', inspect )
 
       raise exception, message, caller
 
@@ -70,7 +70,7 @@ class Numeric
     if zero?
 
       # replace macros
-      message.gsub!( '$1', self.inspect )
+      message.gsub!( '$1', inspect )
 
       raise exception, message, caller
 
@@ -86,7 +86,7 @@ class Numeric
     if positive?
 
       # replace macros
-      message.gsub!( '$1', self.inspect )
+      message.gsub!( '$1', inspect )
 
       raise exception, message, caller
 
@@ -106,7 +106,7 @@ class Numeric
     raise TypeError, 'wrong argument type #{ message.class } for exception message (expected String)' unless message.kind_of?( String )
 
     # replace macros
-    message.gsub!( '$1', self.inspect )
+    message.gsub!( '$1', inspect )
     
     message.gsub!( '$2', range.inspect )
 
@@ -122,7 +122,7 @@ class Numeric
   def limit( minimum_value, maximum_value )
 
     # limit current value
-    self.min( minimum_value ).max( maximum_value )
+    min( minimum_value ).max( maximum_value )
 
   end
 

data/lib/tdriver/util/common/object.rb

@@ -74,7 +74,7 @@ class Object
 
       raise TypeError, "invalid argument type #{ type } for check_type. Did you mean #{ type.class }?", caller unless type.kind_of?( Class )
 
-      if self.kind_of?( type )
+      if kind_of?( type )
 
         found = true 
 
@@ -91,7 +91,7 @@ class Object
     unless found
 
       # convert macros
-      [ self.class, verbose_type_list.join, self.inspect ].each_with_index{ | param, index | message.gsub!( "$#{ index + 1 }", param.to_s ) }
+      [ self.class, verbose_type_list.join, inspect ].each_with_index{ | param, index | message.gsub!( "$#{ index + 1 }", param.to_s ) }
 
       # raise the exception
       raise TypeError, message, caller
@@ -144,7 +144,7 @@ class Object
     unless found
 
       # convert macros
-      [ self.class, verbose_values_list.join, self.inspect ].each_with_index{ | param, index | message.gsub!( "$#{ index + 1 }", param.to_s ) }
+      [ self.class, verbose_values_list.join, inspect ].each_with_index{ | param, index | message.gsub!( "$#{ index + 1 }", param.to_s ) }
 
       # raise the exception
       raise ArgumentError, message, caller

data/lib/tdriver/util/common/retryable.rb

@@ -42,13 +42,45 @@ module MobyUtil
 
       attempt = 1
 
+
+      # number of block arguments
+      _block_arity = block.arity 
+
+      if _block_arity > 1
+
+        _block_arity = 2
+
+      elsif _block_arity < 1
+
+        _block_arity = 0
+
+      end
+
+      # last exception
+      _exception = nil
+
+      # default
+      _arguments = []
+
       begin
 
+        case _block_arity
+
+          when 1
+          arguments = [ attempt ]
+
+          when 2
+          arguments = [ attempt, _exception ]
+
+        end
+
         # yield given block and pass attempt number as parameter
-        yield( attempt )
+        yield( *arguments )
 
       rescue *options[ :exception ]
 
+        _exception = $!
+
         if ( attempt < options[ :tries ] ) && ![ *options[ :unless ] ].include?( $!.class )
 
           sleep_retry_interval( options[ :interval ] ) if options[ :interval ] > 0
@@ -84,13 +116,44 @@ module MobyUtil
       # attempt number
       attempt = 0
 
+      # number of block arguments
+      _block_arity = block.arity 
+
+      if _block_arity > 1
+
+        _block_arity = 2
+
+      elsif _block_arity < 1
+
+        _block_arity = 0
+
+      end
+
+      # last exception
+      _exception = nil
+
+      # default
+      _arguments = []
+
       begin
 
+        case _block_arity
+
+          when 1
+          arguments = [ attempt ]
+
+          when 2
+          arguments = [ attempt, _exception ]
+
+        end
+
         # execute block
-        yield( attempt )
+        yield( *arguments )
 
       rescue *options[ :exception ]
 
+        _exception = $!
+
         if (Time.now - start_time) <= options[ :timeout ] && ![ *options[ :unless ] ].include?( $!.class )
 
           sleep_retry_interval( options[ :interval ] ) if options[ :interval ] > 0

data/lib/tdriver/util/common/string.rb

@@ -22,13 +22,13 @@ class String
 
   def true?
 
-    /^true$/i.match( self.to_s ) != nil
+    /^true$/i.match( to_s ) != nil
   
   end
   
   def false?
   
-    /^false$/i.match( self.to_s ) != nil
+    /^false$/i.match( to_s ) != nil
   
   end
 
@@ -37,7 +37,7 @@ class String
     if empty?
   
       # replace macros
-      #message.gsub!( '$1', self.inspect )
+      #message.gsub!( '$1', inspect )
   
       raise exception, message, caller 
 
@@ -83,7 +83,7 @@ class String
   # TrueClass/FalseClass 
   def to_boolean( *default )
 
-    if /^(true|false)$/i.match( self.to_s )
+    if /^(true|false)$/i.match( to_s )
     
       $1.downcase == 'true'
       

data/lib/tdriver/util/database/access.rb

@@ -69,10 +69,8 @@ module MobyUtil
       # Create first instance of this class if it doesn't exist
       self.instance
       
-      #raise ArgumentError.new("Invalid connection object provided.") if dbc.nil? or !dbc.kind_of? MobyUtil::DBConnection
       dbc.check_type( MobyUtil::DBConnection, "Wrong argument type $1 for database connection object (expected $2)" )      
       
-      #raise ArgumentError.new("The query qtring must be provided as a non empty string.") if query_string.nil? or query_string.class != String or query_string.empty?
       query_string.check_type( String, "Wrong variable type $1 for database query string (expected $2)")
       query_string.not_empty( "Database query string must not be empty string" )
 
@@ -84,28 +82,22 @@ module MobyUtil
       
       # Check creation parameters
 
-      #raise DbTypeNotDefinedError.new( "Database type need to be either 'mysql' or 'sqlite'!" ) if db_type == nil
       db_type.check_type( String, "Wrong argument type $1 for database type (expected $2)" )
 
-      #raise DbTypeNotSupportedError.new( "Database type '#{db_type}' not supported! Type need to be either 'mysql' or 'sqlite'!" ) unless  db_type == DB_TYPE_MYSQL or  db_type == DB_TYPE_SQLITE
       db_type.validate( [ DB_TYPE_MYSQL, DB_TYPE_SQLITE ], "Unsupported database type $1 (expected $2)" )
 
       if ( db_type == DB_TYPE_MYSQL )
 
-        # raise ArgumentError.new("Host must be provided as a non empty string.") if host.nil? or host.class != String or host.empty?
         host.check_type( String, "Wrong variable type $1 for host (expected $2)" )
         host.not_empty( "Host must not be empty string" )
 
-        #raise ArgumentError.new("Username must be provided as a non empty string.") if username.nil? or username.class != String or username.empty?
         username.check_type( String, "Wrong variable type $1 for username (expected $2)" )
         username.not_empty( "Username must not be empty string" )
 
-        #raise ArgumentError.new("Password must be provided as a string.") if password.nil? or password.class != String
         password.check_type( String, "Wrong variable type $1 for password (expected $2)")
 
       end
 
-      #raise ArgumentError.new("The database name must be provided as a non empty string.") if database_name.nil? or database_name.class != String or database_name.empty?
       database_name.check_type( String, "Wrong variable type $1 for database name (expected $2)" )
       database_name.not_empty( "Database name must not be empty string" )
             
@@ -117,7 +109,14 @@ module MobyUtil
       
       if db_type == DB_TYPE_MYSQL
 
-        query_result = @@_connections[ host + db_type + database_name ].dbh.query( query_string ) # identical?
+        begin
+          query_result = @@_connections[ host + db_type + database_name ].dbh.query( query_string ) # identical?
+        rescue
+          #Possible timeout in query attempt to recreate the connection and redo the query
+          dbc.dbh = connect_db( db_type, host, username, password, database_name )
+          @@_connections[ host + db_type + database_name ] = dbc
+          query_result = @@_connections[ host + db_type + database_name ].dbh.query( query_string ) # identical?
+        end
 
       elsif dbc.db_type == DB_TYPE_SQLITE
 
@@ -172,7 +171,6 @@ module MobyUtil
     #
     def self.affected_rows(dbc)
 
-      #raise ArgumentError.new("Invalid connection object provided.") if dbc.nil? or !dbc.kind_of? MobyUtil::DBConnection
       dbc.check_type( MobyUtil::DBConnection, "Wrong argument type $1 for database connection object (expected $2)" )
       
       # Check for exsting connection for that host and create it if needed
@@ -209,7 +207,7 @@ module MobyUtil
         dbh.query 'SET NAMES utf8' if db_type == DB_TYPE_MYSQL # set the utf8 encoding
         dbh = SQLite3::Database.new( database_name ) if db_type == DB_TYPE_SQLITE        
       rescue
-        raise SqlConnectError.new( $!.message )
+        raise SqlConnectError, $!.message
       end
       
       return dbh

data/lib/tdriver/util/fixture/service.rb

@@ -101,6 +101,57 @@ module TDriver
 
   end # FixturePluginService
 
+  module FixtureSetupFunctions
+  
+    def []( name )
+    
+      name.check_type [ String, Symbol ], 'wrong argument type $1 for fixture name (expected $2)'
+
+      @target.parameter[ :fixtures ].fetch( name.to_sym ){ | name | 
+
+        raise MobyBase::BehaviourError.new( "Fixture", "Failed to execute fixture due to #{ name.to_s.inspect } not found for #{ @target.sut.id.inspect }" )
+      
+      }
+          
+    end
+  
+    def []=( name, plugin )
+    
+      name.check_type [ String, Symbol ], 'wrong argument type $1 for fixture name (expected $2)'
+    
+      plugin.check_type [ String ], 'wrong argument type $1 for fixture pluin name (expected $2)'
+    
+      name = name.to_sym
+      
+      plugin = plugin.to_s
+    
+      # create fixtures configuration hash unless already exists
+      @target.parameter[ :fixtures ] = {} unless @target.parameter.has_key?( :fixtures )
+    
+      if @target.parameter[ :fixtures ].has_key?( name )
+        
+        # retrieve existing fixture configuration
+        fixture_hash = @target.parameter[ :fixtures ][ name ]
+      
+      else
+
+        # fixture was not found from hash, add sut environment to hash
+        fixture_hash = { :env => @target.instance_variable_get(:@environment) }
+              
+      end
+      
+      # store plugin name to hash
+      fixture_hash[ :plugin ] = plugin
+    
+      # store fixture settings to fixtures configuration hash
+      @target.parameter[ :fixtures ][ name ] = fixture_hash
+
+      self
+    
+    end
+  
+  end
+
   class FixtureService
 
     # remove all public methods
@@ -128,6 +179,9 @@ module TDriver
       # store caller backtrace
       @caller = caller
 
+      # extend with fixture setup functions if self is kind of sut 
+      extend FixtureSetupFunctions if @target.sut?
+      
       self
 
     end      

data/lib/tdriver/util/localisation/localisation.rb

@@ -231,9 +231,10 @@ module MobyUtil
       # "Luo" => ["", "227"], 
       # "Sukuma" => ["", "228"], 
       # "Aceh" => ["", "229"], 
-      #"English_India" => ["", "230"],           # In e32long.h, Pearl script, but not in Nokia Language Codes Standard
+      "English_India" => ["en_in", "230"],           # In e32long.h, Pearl script, but not in Nokia Language Codes Standard
       "Malay Apac" => ["MA", "326"],            # In e32long.h, Pearl script, but not in Nokia Language Codes Standard
-      # "Indonesian Apac" =>["", "327"],
+      "Indonesian Apac" =>["id_ap", "327"],
+      "English Bangladesh" =>["en_ba", "328"],
       # "Bengali IN" => ["bn_IN", ""],
       # "Bosnian" => ["bs", ""],
     }

data/lib/tdriver/util/logger/logger.rb

@@ -1,20 +1,20 @@
 ############################################################################
-## 
-## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 
-## All rights reserved. 
-## Contact: Nokia Corporation (testabilitydriver@nokia.com) 
-## 
-## This file is part of Testability Driver. 
-## 
-## If you have questions regarding the use of this file, please contact 
-## Nokia at testabilitydriver@nokia.com . 
-## 
-## This library is free software; you can redistribute it and/or 
-## modify it under the terms of the GNU Lesser General Public 
-## License version 2.1 as published by the Free Software Foundation 
-## and appearing in the file LICENSE.LGPL included in the packaging 
-## of this file. 
-## 
+##
+## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+## All rights reserved.
+## Contact: Nokia Corporation (testabilitydriver@nokia.com)
+##
+## This file is part of Testability Driver.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at testabilitydriver@nokia.com .
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License version 2.1 as published by the Free Software Foundation
+## and appearing in the file LICENSE.LGPL included in the packaging
+## of this file.
+##
 ############################################################################
 
 module MobyUtil
@@ -179,7 +179,7 @@ module MobyUtil
       if @logger_engine_loaded
 
         # Allow only FileOutputter instances
-        raise ArgumentError, 'Outputter pattern not valid, %M required by minimum' if !/\%M/.match( pattern ) 
+        raise ArgumentError, 'Outputter pattern not valid, %M required by minimum' if !/\%M/.match( pattern )
 
         # create pattern for outputter
         outputter_instance.formatter = Log4r::PatternFormatter.new :pattern => pattern
@@ -203,7 +203,7 @@ module MobyUtil
 
         Log4r::Logger.global
 
-      else 
+      else
 
         nil
 
@@ -211,6 +211,19 @@ module MobyUtil
 
     end
 
+    # TODO: add documentation
+    def log_to_report_details(script_call)        
+      script_call.each do |call|
+        if call.include?('testability-driver')==false and call.include?('ruby')==false and call.include?('.rb')==true and call!=@previous_call
+            if $tdriver_reporter
+              $new_test_case.capture_dump(true,:text=> call) if $new_test_case
+            end            
+          break
+        end        
+      end
+      @previous_call=script_call
+    end
+
     # TODO: add documentation
     def log( level, *text_array )
 
@@ -219,7 +232,7 @@ module MobyUtil
         # convert to lowercase string
         level = level.to_s.downcase
 
-        include_behaviour_info = @include_behaviour_info 
+        include_behaviour_info = @include_behaviour_info
 
         # debug log entries and logging by using TDriver.logging.info or MobyUtil::Logging.instance.info etc
         if caller.first =~ /method_missing/
@@ -253,6 +266,7 @@ module MobyUtil
 
         }
 
+        log_to_report_details(caller) if $parameters[:report_script_steps_to_details, nil ]=='true'
       end
 
     end
@@ -287,7 +301,7 @@ module MobyUtil
         ARGV.delete('--debug_exceptions')
 
         # hook Object(Kernel)#raise
-        ::Object.class_exec{ 
+        ::Object.class_exec{
 
           ::Kernel.module_exec{
 
@@ -297,27 +311,27 @@ module MobyUtil
 
               begin
 
-                # raise and catch exception  
+                # raise and catch exception
                 original_raise( *args )
 
               rescue
 
                 # remove wrapper calls from backtrace
                 while $!.backtrace.first =~ /(logger\.rb).*(raise)/
-                
+
                   $!.backtrace.shift
-                
+
                 end
-                
+
                 puts "[debug] #{ $!.class }: #{ $!.message }\n[debug] Backtrace: \n[debug] #{ $!.backtrace.collect{ | line | "  ... from #{ line }" }.join("\n[debug] ") }\n\n"
-                
+
                 # raise exception again
                 original_raise $!
 
-              end            
+              end
 
             end
-            
+
           }
         }
 
@@ -354,7 +368,7 @@ module MobyUtil
 
           if $parameters[ :logging_xml_parse_error_dump_path, nil ].nil?
 
-            warn("warning: Configuration parameter :logging_xml_parse_error_dump_path missing, disabling the feature...") 
+            warn("warning: Configuration parameter :logging_xml_parse_error_dump_path missing, disabling the feature...")
 
             # disable feature
             raise ArgumentError
@@ -401,11 +415,11 @@ module MobyUtil
 
       else
 
-        warn("warning: Configuration parameter :logging_xml_parse_error_dump missing, disabling the feature...") 
+        warn("warning: Configuration parameter :logging_xml_parse_error_dump missing, disabling the feature...")
         $parameters[ :logging_xml_parse_error_dump ] = 'false'
 
       end
-      
+
       unless logging_level.zero?
 
         # logger output path
@@ -421,7 +435,7 @@ module MobyUtil
 
         @logger_engine_loaded = true
 
-        # disable logging if exception is raised during 
+        # disable logging if exception is raised during
         begin
 
           # create outputter folder if not exist
@@ -441,27 +455,27 @@ module MobyUtil
           end
 
           # check if outputter is enabled
-          if $parameters[ :logging_outputter_enabled, false ].true? 
+          if $parameters[ :logging_outputter_enabled, false ].true?
 
             # create new outputter instance type of FileOutputter
             outputter = create_outputter(
 
               # outputter type
-              Log4r::FileOutputter, 
+              Log4r::FileOutputter,
 
               # outputter name
               "TDriver_LOG",
 
-              # outputter filename 
-              :filename => File.join( outputter_path, filename ), 
+              # outputter filename
+              :filename => File.join( outputter_path, filename ),
 
               # append to or truncate file
-              :trunc => $parameters[ :logging_outputter_append, false ].false?, 
+              :trunc => $parameters[ :logging_outputter_append, false ].false?,
 
               # logging level
               :level => logging_level
 
-            ) 
+            )
 
             # set outputter log event write pattern
             set_outputter_pattern( outputter, $parameters[ :logging_outputter_pattern, '%d [%c] [%l] %M' ] )
@@ -470,14 +484,14 @@ module MobyUtil
             add_outputter( @logger_instance, outputter )
 
           end
-		  
+
           # Add stdout outputter if set on configuration parameters
           if $parameters[ :logging_stdout_outputter_enabled, false ].true?
             stdout_outputter = create_outputter(
               Log4r::StdoutOutputter, # outputter type
               "TDriver_LOG_stdout",	# outputter name
               :level => logging_level # logging level
-            ) 
+            )
             set_outputter_pattern( stdout_outputter, $parameters[ :logging_outputter_pattern, '%d [%c] [%l] %M' ] )
 
             add_outputter( @logger_instance, stdout_outputter )
@@ -507,7 +521,7 @@ module MobyUtil
           # pass logger instance to hooking module
           TDriver::Hooking.logger_instance = MobyUtil::Logger.instance
 
-        end  
+        end
 
         # enable logging
         @enabled_stack = [ true ]
@@ -563,7 +577,7 @@ module MobyUtil
     end
 
   end # Logger
-  
+
 end # MobyUtil
 
 # set global variable pointing to parameter class