testability-driver 1.3.0 → 1.3.1

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

@@ -23,8 +23,8 @@ module MobyUtil
 
     def self.rindex_regexp( array, pattern )
 
-      Kernel::raise TypeError.new("Unexpected variable type '%s' for array (Expected: %s)" % [ array.class, 'Array'] ) unless array.kind_of?( Array )
-      Kernel::raise TypeError.new("Unexpected variable type '%s' for regular expression pattern (Expected: %s)" % [ pattern.class, 'Regexp'] ) unless pattern.kind_of?( Regexp )  
+      array.check_type Array, 'wrong argument type $1 for array (expected $2)'
+      pattern.check_type Regexp, 'wrong argument type $1 for regular expression pattern (expected $2)'
 
       # return nil if no matches found, otherwise return index of value
       return nil if ( array.reverse.each_index{ | index | return @rindex if array[ ( @rindex = ( ( array.size-1 ) - index ) ) ] =~ pattern; } )

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

@@ -65,7 +65,7 @@ module MobyUtil
 
         require_files = Dir.glob( MobyUtil::FileHelper.fix_path( path ) )
 
-        Kernel::raise RuntimeError, "File not found #{ path }" if !File.directory?( path ) && !File.file?( path ) && require_files.empty?
+        raise RuntimeError, "File not found #{ path }" if !File.directory?( path ) && !File.file?( path ) && require_files.empty?
 
         # load each module found from given folder
         require_files.each { | module_name | 
@@ -86,7 +86,6 @@ module MobyUtil
     # String:: String presentation of fixed path
     def self.fix_path( path )      
 
-      #Kernel::raise ArgumentError.new( "Invalid argument format %s (Expected: %s)" % [ path.class, "String" ] ) unless path.kind_of?( String )      
       path.check_type( String, "Wrong argument type $1 for file path (expected $2)" )
 
       # replace back-/slashes to File::SEPARATOR
@@ -115,14 +114,13 @@ module MobyUtil
     # === returns
     # String:: String containing expanded file path
     # === raises
-    # ArgumentError:: Unexpected argument type '%s' for path (Expected: %s)
+    # TypeError:: Wrong argument type <class> for file path (expected <class>)
     # ArgumentError:: Given path is empty
     def self.is_relative_path?( path )  
 
-      #Kernel::raise ArgumentError.new("Unexpected argument type '%s' for path (Expected: %s)" % [ path.class, 'String' ] ) unless path.kind_of?( String )
       path.check_type( String, "Wrong argument type $1 for file path (expected $2)" )
 
-      #Kernel::raise ArgumentError.new("Given path is empty") if path.empty?
+      #raise ArgumentError.new("Given path is empty") if path.empty?
       path.not_empty( "Filepath must not be empty string" )
 
       dirname =  File.dirname( path )
@@ -175,22 +173,22 @@ module MobyUtil
       #file_path.check_type( String, "wrong argument type $1 for get_file method (expected $2)")
 
       # raise exception if file name is empty or nil
-      Kernel::raise EmptyFilenameError, "File name is empty or not defined" if file_path.nil? || file_path.to_s.empty?
+      raise EmptyFilenameError, "File name is empty or not defined" if file_path.nil? || file_path.to_s.empty?
 
       # raise exception if file name is file_path variable format other than string
-      Kernel::raise UnexpectedVariableTypeError.new( "Invalid filename format %s (Expected: %s)" % [ file_path.class, "String"] )  if !file_path.kind_of?( String )
+      raise UnexpectedVariableTypeError.new( "Invalid filename format #{ file_path.class } (expected: String)")  if !file_path.kind_of?( String )
 
       file_path = MobyUtil::FileHelper.expand_path( file_path )
 
       # raise exception if file not found
-      Kernel::raise FileNotFoundError.new( "File not found: #{ file_path }" ) unless File.exist?( file_path )
+      raise FileNotFoundError.new( "File not found: #{ file_path }" ) unless File.exist?( file_path )
 
       begin
         # read all content of file
         file_content = IO.read( file_path )
       rescue => ex
         # raise exception if error occured during reading the file
-        Kernel::raise IOError.new("Error occured while reading file #{ file_path }\nDescription: #{ ex.message }")
+        raise IOError.new("Error occured while reading file #{ file_path }\nDescription: #{ ex.message }")
       end
 
       # return file content
@@ -229,7 +227,7 @@ module MobyUtil
 
       rescue => exception
 
-        Kernel::raise IOError.new("Error occured while creating folder #{ current_path } (#{ exception.message })")
+        raise IOError.new("Error occured while creating folder #{ current_path } (#{ exception.message })")
 
       end
 
@@ -288,7 +286,7 @@ module MobyUtil
         # create destination folder if it doesn't exist and create_folders flag is enabled
         MobyUtil::FileHelper.mkdir_path( destination_folder ) if create_folders
 
-        Kernel::raise RuntimeError.new( "Unable to copy %s to %s due to source file does not exist" % [ source, destination ] ) unless File.exist?( source )
+        raise RuntimeError.new( "Unable to copy #{ source } to #{ destination } due to source file does not exist" ) unless File.exist?( source )
 
         ::FileUtils.copy( 
 

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

@@ -91,7 +91,7 @@ module MobyUtil
     # TODO: document
     def self.install( *parameters, &block )
 
-      Kernel::raise ArgumentError.new( "Target folder must be specified as first argument" ) if parameters.empty?
+      raise ArgumentError.new( "Target folder must be specified as first argument" ) if parameters.empty?
 
       yield( *parameters )
 

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

@@ -132,7 +132,7 @@ module MobyUtil
 
       rescue 
 
-        Kernel::raise NameError.new( "Invalid constant %s" % constant_name )
+        raise NameError, "invalid constant #{ constant_name }"
 
       end
 
@@ -195,7 +195,7 @@ module MobyUtil
           # TODO: document me      
           ( call_stack.size - 2 ).times do | index |
           
-            file_path << "%s:" % call_stack[ index ]
+            file_path << "#{ call_stack[ index ].to_s }:"
             
           end
           
@@ -222,9 +222,9 @@ module MobyUtil
           lines = source.readlines
           
           # raise exception if line number is larger than total number of lines
-          Kernel::raise RuntimeError.new(
+          raise RuntimeError.new(
           
-            "Unable to fetch line %s from source file %s due to it is out of range (total lines: %s)" %  [ start_line, filename, lines.size ]
+            "Unable to fetch line #{ start_line.to_s } from source file #{ filename } due to it is out of range (total lines: #{ lines.size })"
             
           ) if start_line > lines.size
 

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

@@ -60,7 +60,7 @@ module MobyUtil
         end
 
         # raise exception with correct exception backtrace
-        Kernel::raise $!
+        raise $!
 
       end
       
@@ -102,7 +102,7 @@ module MobyUtil
         end
 
         # raise exception with correct exception backtrace
-        Kernel::raise $!
+        raise $!
 
       end
 

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

@@ -126,7 +126,6 @@ module MobyUtil
     def self.boolean?( string )
 
       # raise exception if argument type other than String
-      #Kernel::raise ArgumentError.new("Invalid argument format %s (Expected: %s)" % [ string.class, "String" ]) unless string.kind_of?( String )
       string.check_type( String, "Wrong argument type $1 (Expected $2)" )
 
       /^(true|false)$/i.match( string ).kind_of?( MatchData )
@@ -142,7 +141,7 @@ module MobyUtil
 
       # raise exception if argument type other than String
 
-      Kernel::raise ArgumentError.new("Invalid argument format %s (Expected: %s)" % [ string.class, "String" ]) unless string.kind_of?( String )
+      string.check_type String, 'Wrong argument type $1 (expected: $2)'
 
       /^[0-9]+$/.match( string ).kind_of?( MatchData )
 
@@ -161,7 +160,7 @@ module MobyUtil
 
       else
 
-        Kernel::raise ArgumentError.new("Invalid value '%s' for boolean (Expected: %s)" % [ string, "'true', 'false'" ] )
+        raise ArgumentError.new("Invalid value #{ string.inspect } for boolean (expected: \"true\" or \"false\")" )
 
       end      
 

data/lib/tdriver/util/hooking/hooking.rb

@@ -405,7 +405,7 @@ module TDriver
 
         else
 
-          Kernel::raise ArgumentError.new("Invalid sorting rule, valid rules are :name, :times_called, :total_time, :total_time_no_subs, :percentage or :average_time")
+          raise ArgumentError.new("Invalid sorting rule, valid rules are :name, :times_called, :total_time, :total_time_no_subs, :percentage or :average_time")
 
         end
 
@@ -421,7 +421,7 @@ module TDriver
 
       else
 
-        Kernel::raise ArgumentError.new("Invalid sort order rule, valid rules are :ascending, :descending")  
+        raise ArgumentError.new("Invalid sort order rule, valid rules are :ascending, :descending")  
 
       end
 

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

@@ -301,9 +301,9 @@ module MobyUtil
 		#
 		def self.translation( logical_name, language, table_name, file_name = nil , plurality = nil, lengthvariant = nil )
 		
-			Kernel::raise LogicalNameNotFoundError.new( "Logical name cannot be nil" ) if logical_name == nil
-			Kernel::raise LanguageNotFoundError.new( "Language cannot be nil" ) if language == nil
-			Kernel::raise TableNotFoundError.new( "Table name cannot be nil" ) if table_name == nil
+			raise LogicalNameNotFoundError.new( "Logical name cannot be nil" ) if logical_name == nil
+			raise LanguageNotFoundError.new( "Language cannot be nil" ) if language == nil
+			raise TableNotFoundError.new( "Table name cannot be nil" ) if table_name == nil
 			
 			# Avoid system column names for language columns and user only downcase
 			language = language.to_s.downcase
@@ -329,13 +329,13 @@ module MobyUtil
 				# Returns a uniform set of results as an array of rows, rows beeing an array of values ( Array<Array<String>> )
 				result = MobyUtil::DBAccess.query( db_connection, query_string )
 			rescue
-				# if column referring to language is not found then Kernel::raise error for language not found
-				Kernel::raise LanguageNotFoundError.new( "No language '#{ language }' found" ) unless $!.message.index( "Unknown column" ) == nil
-				Kernel::raise SqlError.new( $!.message )
+				# if column referring to language is not found then raise error for language not found
+				raise LanguageNotFoundError.new( "No language '#{ language }' found" ) unless $!.message.index( "Unknown column" ) == nil
+				raise SqlError.new( $!.message )
 			end
 
 			# Return only the first column of the row or and array of the values of the first column if multiple rows have been found
-			Kernel::raise LogicalNameNotFoundError.new( "No translation found for logical name '#{ logical_name }' in language '#{ language }' with given plurality and lengthvariant." ) if ( result.empty?)
+			raise LogicalNameNotFoundError.new( "No translation found for logical name '#{ logical_name }' in language '#{ language }' with given plurality and lengthvariant." ) if ( result.empty?)
 			if result.length > 1
 				# Result is an Array of rows (Array<String>)! We want the first column of each row.
 				result_array = Array.new
@@ -389,8 +389,8 @@ module MobyUtil
 		#  description: When its not possible to parse the file provided
 		#
 		def self.upload_translation_file( file, table_name, db_connection = nil, column_names_map = {}, record_sql = false)	
-			Kernel::raise ArgumentError.new("") if file.nil? or file.empty?
-			Kernel::raise ArgumentError.new("") if table_name.nil? or table_name.empty?
+			raise ArgumentError.new("") if file.nil? or file.empty?
+			raise ArgumentError.new("") if table_name.nil? or table_name.empty?
 
 			# Get a connection to the DB
 			if db_connection.nil? or !db_connection.kind_of? MobyUtil::DBConnection
@@ -405,13 +405,13 @@ module MobyUtil
       if file.match(/.*\.ts/) or file.match(/.*\.qm/)
         # Check File and convert to TS File if needed
         tsFile = MobyUtil::Localisation.convert_to_ts( file )
-        Kernel::raise Exception.new("Failed to convert #{file} to .ts") if tsFile == nil	
+        raise Exception.new("Failed to convert #{file} to .ts") if tsFile == nil	
         # Collect data for INSERT query from TS File
         language, data = MobyUtil::Localisation.parse_ts_file( tsFile, column_names_map )
-        Kernel::raise Exception.new("Error while parsing #{file}.") if language == nil or data == ""
+        raise Exception.new("Error while parsing #{file}.") if language == nil or data == ""
 			elsif file.match(/.*\.loc/)
         language, data = MobyUtil::Localisation.parse_loc_file( file, column_names_map )
-        Kernel::raise Exception.new("Error while parsing #{file}. The file might have no translations.") if language.nil? or language.empty? or data.nil? or data.empty?
+        raise Exception.new("Error while parsing #{file}. The file might have no translations.") if language.nil? or language.empty? or data.nil? or data.empty?
       end
       # Upload language data to DB for current language file
 			MobyUtil::Localisation.upload_data( language, data, table_name, db_connection, record_sql )

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

@@ -146,7 +146,7 @@ module MobyUtil
 
       rescue
 
-        Kernel::raise ArgumentError, "Logger #{ logger_name.inspect } not found"
+        raise ArgumentError, "Logger #{ logger_name.inspect } not found"
 
       end
 
@@ -179,7 +179,7 @@ module MobyUtil
       if @logger_engine_loaded
 
         # Allow only FileOutputter instances
-        Kernel::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
@@ -260,7 +260,7 @@ module MobyUtil
     def enable_raise_hooking
 
       # hook Kernel.raise
-      def Kernel::raise( *exception )
+      def raise( *exception )
 
         begin
 
@@ -286,20 +286,6 @@ module MobyUtil
 
         ARGV.delete('--debug_exceptions')
 
-        # for debugging to see every occured exception
-        def Kernel.raise( *args )
-          #begin
-          # raise and catch exception  
-          super( *args )
-          #rescue
-          # remove wrapper call from backtrace 
-          # $!.backtrace.shift
-          #puts "%s: %s\nBacktrace: \n%s\n\n" % [ $!.class, $!.message, $!.backtrace.collect{ | line | "  %s" % line }.join("\n") ]
-          # raise exception again
-          # super $!          
-          #end
-        end
-
         # hook Object(Kernel)#raise
         ::Object.class_exec{ 
 
@@ -323,11 +309,7 @@ module MobyUtil
                 
                 end
                 
-                puts "[debug] %s: %s\n[debug] Backtrace: \n[debug] %s\n\n" % [ 
-                  $!.class, 
-                  $!.message, 
-                  $!.backtrace.collect{ | line | "  ... from %s" % line }.join("\n[debug] ") 
-                ]
+                puts "[debug] #{ $!.class }: #{ $!.message }\n[debug] Backtrace: \n[debug] #{ $!.backtrace.collect{ | line | "  ... from #{ line }" }.join("\n[debug] ") }\n\n"
                 
                 # raise exception again
                 original_raise $!
@@ -355,13 +337,13 @@ module MobyUtil
       return nil if logging_level.nil?
 
       # raise exception if wrong format for logging level
-      Kernel::raise RuntimeError, "Wrong logging level format '#{ logging_level }' defined in TDriver parameter/template XML (expected numeric string)" unless logging_level.numeric?
+      raise RuntimeError, "Wrong logging level format '#{ logging_level }' defined in TDriver parameter/template XML (expected numeric string)" unless logging_level.numeric?
 
       # convert to integer
       logging_level = logging_level.to_i
 
       # raise exception if unsupported logging level
-      Kernel::raise RuntimeError, "Unsupported logging level '#{ logging_level }' defined in TDriver parameter/template XML (expected 0..5)" unless ( 0..5 ).include?( logging_level )
+      raise RuntimeError, "Unsupported logging level '#{ logging_level }' defined in TDriver parameter/template XML (expected 0..5)" unless ( 0..5 ).include?( logging_level )
 
       @include_behaviour_info = $parameters[ :logging_include_behaviour_info, 'false' ].to_s.to_boolean
 
@@ -559,7 +541,7 @@ module MobyUtil
 
           else
 
-            exit_status = ['error', '', "Execution terminated with exception: %s: %s" % [ caller.first, $!.message.split("\n") ], '' ]
+            exit_status = ['error', '', "Execution terminated with exception: #{ caller.first.to_s }: #{ $!.message.split("\n") }", '' ]
 
           end
 

data/lib/tdriver/util/operator_data/operator_data.rb

@@ -58,7 +58,7 @@ module MobyUtil
 		#
 		def self.retrieve( operator_data_lname, operator, table_name )
 			
-		    Kernel::raise OperatorDataNotFoundError.new( "Search string parameter cannot be nil" ) if operator_data_lname == nil
+		    raise OperatorDataNotFoundError.new( "Search string parameter cannot be nil" ) if operator_data_lname == nil
 
 			# Get Localization parameters for DB Connection
 			db_type =  $parameters[ :operator_data_db_type, nil ].to_s.downcase
@@ -75,13 +75,13 @@ module MobyUtil
 			begin
 				result = MobyUtil::DBAccess.query( db_connection, query_string )
 			rescue
-			    # if data column to be searched is not found then Kernel::raise error for search column not found
-			    Kernel::raise OperatorDataColumnNotFoundError.new( "Search column 'Value' not found in database" ) unless $!.message.index( "Unknown column" ) == nil
-			    Kernel::raise SqlError.new( $!.message )
+			    # if data column to be searched is not found then raise error for search column not found
+			    raise OperatorDataColumnNotFoundError.new( "Search column 'Value' not found in database" ) unless $!.message.index( "Unknown column" ) == nil
+			    raise SqlError.new( $!.message )
 		    end
 
 			# Return always the first column of the row
-			Kernel::raise OperatorDataNotFoundError.new("No matches found for search string '#{ operator_data_lname }' in search column 'LogicalName' for opreator #{ operator }" ) if ( result.empty?)
+			raise OperatorDataNotFoundError.new("No matches found for search string '#{ operator_data_lname }' in search column 'LogicalName' for opreator #{ operator }" ) if ( result.empty?)
 			# Result is an Array of rows (Array<String>)! We want the first column of the first row.
 			return result[0][0]
 			

data/lib/tdriver/util/parameter/parameter.rb

@@ -1055,7 +1055,7 @@ module MobyUtil
   
     class << self
 
-      undef :inspect
+      undef :inspect if respond_to?( :inspect )
             
       def new
       
@@ -1090,7 +1090,7 @@ module MobyUtil
   
     class << self
 
-      undef :inspect
+      undef :inspect if respond_to?( :inspect )
 
       def new
       

data/lib/tdriver/util/plugin/abstract.rb

@@ -25,18 +25,19 @@ module MobyUtil
     ## plugin configuration, constructor and deconstructor methods
     def self.plugin_name
 
-      Kernel::raise PluginError.new( "Plugin name not defined in implementation (%s)" % [ self.name ] ) 
+      raise PluginError, "Plugin name not defined in implementation (#{ self.name })"
+
     end
 
     def self.plugin_type
 
-      Kernel::raise PluginError.new( "Plugin type not defined in implementation (%s)" % [ self.name ] ) 
+      raise PluginError, "Plugin type not defined in implementation (#{ self.name })"
 
     end
 
     def self.plugin_required_tdriver_version
 
-      Kernel::raise PluginError.new( "Required TDriver version not defined in plugin implementation (%s)" % [ self.name ] ) 
+      raise PluginError, "Required TDriver version not defined in plugin implementation (#{ self.name })" 
 
     end
 

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

@@ -42,6 +42,8 @@ module TDriver
         # list of enabled plugins
         @enabled_plugins = []
 
+        @plugin_order = []
+
       end
 
       # TODO: document me
@@ -74,6 +76,18 @@ module TDriver
 
       end
 
+      def update_enabled_plugins_list
+      
+        @enabled_plugins = @plugin_order.inject([]){ | result, name | 
+                  
+          result << name if @registered_plugins.fetch( name, {} )[ :enabled ].true?
+                
+          result
+        
+        }
+      
+      end
+
     end # self
 
     # TODO: document me
@@ -127,7 +141,9 @@ module TDriver
         @registered_plugins[ plugin_name ][ :enabled ] = true
 
         # add name to enabled plugins list
-        @enabled_plugins << plugin_name unless @enabled_plugins.include?( plugin_name )
+        #@enabled_plugins << plugin_name unless @enabled_plugins.include?( plugin_name )
+
+        update_enabled_plugins_list
 
       rescue 
 
@@ -146,7 +162,9 @@ module TDriver
         @registered_plugins[ plugin_name ][ :enabled ] = false
 
         # remove name from enabled plugins list
-        @enabled_plugins.delete( plugin_name )
+        #@enabled_plugins.delete( plugin_name )
+
+        update_enabled_plugins_list
 
       rescue 
 
@@ -184,13 +202,17 @@ module TDriver
         # set plugin to enabled state
         :enabled => true 
 
-      } 
+      }
+      
+      @plugin_order << plugin_name
 
       # register plugin
       plugin_module.register_plugin
 
       # add name to enabled plugins list
-      @enabled_plugins << plugin_name unless @enabled_plugins.include?( plugin_name )
+      #@enabled_plugins << plugin_name unless @enabled_plugins.include?( plugin_name )
+
+      update_enabled_plugins_list
 
     end
 
@@ -208,6 +230,11 @@ module TDriver
         # remove from the plugins hash
         @enabled_plugins.delete( plugin_name )
 
+        update_enabled_plugins_list
+
+        # remove from plugins list (registration order)
+        @plugin_order.delete( plugin_name )
+
       rescue
 
         raise ArgumentError, "Failed to unregister plugin due to plugin #{ plugin_name.inspect } is not registered"