testability-driver 1.0.3 → 1.0.4

data/lib/tdriver-devtools/behaviour/xml/rdoc_behaviour_xml_generator.rb

@@ -604,7 +604,7 @@ EXAMPLE
 
       params_array.each{ | param |
 
-        if ( item = result.select{ | arg | arg.keys.include?( param.first ) }).empty?
+        if ( item = result.select{ | arg | arg.keys.include?( param.first ) }.to_a).empty? # Array conversion for ruby 1.9 compatibility
 
           raise_error("Error: Argument '#{ param.first }' is implemented but not documented in '#{ @current_method.name }' ($MODULE).\nNote that documented argument and variable name must be identical.", [ 'writer', 'accessor' ].include?( @processing ) ? 'attr_argument' : 'arguments' ) unless param.first.to_s.include?("#")
 
@@ -678,7 +678,7 @@ EXAMPLE
             # always add block parameters
             unimplemented_arguments.include?( documented_argument.to_a.flatten.first ) == false || documented_argument.to_a.flatten.first.include?("#")
 
-          }
+          }.to_a # Array conversion for ruby 1.9 compatiblity
 
         end
 

data/lib/tdriver-devtools/tdriver-devtools.rb

@@ -55,7 +55,7 @@ safe_require('tdriver/version.rb',  File.expand_path( File.join( File.dirname( _
 safe_require('tdriver/util/common/loader.rb',  File.expand_path( File.join( File.dirname( __FILE__ ), '../tdriver/util/common/loader.rb' ) ) )
 
 require 'tmpdir'
-require 'fileutils'
+require "fileutils" unless defined?( ::FileUtils )
 
 # default options
 @options = { 

data/lib/tdriver-devtools/tests/feature_tests/lib/custom_rdoc_generator.rb

@@ -179,7 +179,7 @@ module Generators
         # first scenario with all required arguments
         if mode.to_s =~ /method/
 
-          required_arguments = arguments_table.select{ | argument | argument.last == false }.collect{ | scenario | scenario.first }
+          required_arguments = arguments_table.select{ | argument | argument.last == false }.to_a.collect{ | scenario | scenario.first } # Array conversion for ruby 1.9 compatibility
 
           results << $templates[ mode ] % [ @current_method.name, "required", "(s)", @current_method.name, required_arguments.join(", ") ]
 
@@ -196,8 +196,8 @@ module Generators
         unless arguments_table.nil?
 
           # scenarios with one of each optional argument.. and eventually with all arguments
-          arguments_table.select{ | argument | argument.last == true }.collect{ | scenario | scenario 
-
+          arguments_table.select{ | argument | argument.last == true }.to_a.collect{ | scenario | scenario 
+            # Array conversion for ruby 1.9 compatibility
             scenario = required_arguments << scenario.first
 
             results << $templates[ mode ] % [ @current_method.name, "optional", " '%s'" % scenario.last.first, @current_method.name, scenario.join(", ") ]

data/lib/tdriver/base/behaviour/behaviours/object_behaviour_composition.rb

@@ -17,6 +17,9 @@
 ## 
 ############################################################################
 
+# deprecated: use MobyUtil::BehaviourFactory instead
+
+=begin
 module MobyBehaviour
 
   # == description
@@ -86,9 +89,11 @@ module MobyBehaviour
 			}
 
 		end
+
 		# enable hooking for performance measurement & debug logging
-		MobyUtil::Hooking.instance.hook_methods( self ) if defined?( MobyUtil::Hooking )
+		TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
 	
 	end # ObjectBehaviourComposition
 
 end # MobyBehaviour
+=end

data/lib/tdriver/base/behaviour/behaviours/object_behaviour_description.rb

@@ -239,8 +239,10 @@ module MobyBehaviour
 					value = result_hash[ key ]
 					result << "\n#{ key.to_s.capitalize }:\n"
 					case value.class.to_s
-						when "Array": result << "\t" << value.join("\n\t") << "\n"
-						when "Hash": result << value.collect{ | key, value | "\t#{ key } => #{ value }" }.join("\n") << "\n"
+						when "Array"
+              result << "\t" << value.join("\n\t") << "\n"
+						when "Hash"
+              result << value.collect{ | key, value | "\t#{ key } => #{ value }" }.join("\n") << "\n"
 					#else
 						#result << "\t#{ value }\n"
 					end
@@ -259,7 +261,7 @@ module MobyBehaviour
 		end
 
 		# enable hooking for performance measurement & debug logging
-		MobyUtil::Hooking.instance.hook_methods( self ) if defined?( MobyUtil::Hooking )
+		TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
 	
 	end # ObjectBehaviourDescription
 

data/lib/tdriver/base/behaviour/behaviours/object_composition.rb

@@ -112,7 +112,7 @@ module MobyBehaviour
 		end
 
 		# enable hooking for performance measurement & debug logging
-		MobyUtil::Hooking.instance.hook_methods( self ) if defined?( MobyUtil::Hooking )
+		TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
 
 	end # ObjectComposition
 

data/lib/tdriver/base/behaviour/factory.rb

@@ -22,318 +22,318 @@ module MobyBase
   # TODO: document BehaviourFactory class
   class BehaviourFactory
 
-	include Singleton
-	
-	def initialize
+  include Singleton
+  
+  def initialize
 
-	  @@behaviours = []
-	  @@behaviours_cache = {}
-	  @@modules_cache = {}
-	  
-	  # behaviour xml files path
-	  @@path = File.join( MobyUtil::FileHelper.tdriver_home, '/behaviours/*.xml' )
+    @@behaviours = []
+    @@behaviours_cache = {}
+    @@modules_cache = {}
+    
+    # behaviour xml files path
+    @@path = File.join( MobyUtil::FileHelper.tdriver_home, '/behaviours/*.xml' )
 
-	  parse_behaviour_files( 
+    parse_behaviour_files( 
 
-							load_behaviours( @@path ) 
+      load_behaviours( @@path ) 
 
-							)
+    )
 
-	end
+  end
 
-	public
+  public
 
-	def to_xml( rules = {} ) 
+  def to_xml( rules = {} ) 
 
-	  @_method_index = nil
+    @_method_index = nil
 
-	  rules.default = [ '*' ]
+    rules.default = [ '*' ]
 
-	  rules.each_pair{ | key, value |
+    rules.each_pair{ | key, value |
 
-		rules[ key ] = [ value ] if value.kind_of?( String )
+    rules[ key ] = [ value ] if value.kind_of?( String )
 
-	  }
+    }
 
-	  MobyUtil::XML.build{
+    MobyUtil::XML.build{
 
-		behaviours{
+    behaviours{
 
-		  @@behaviours.each_index{ | index |
+      @@behaviours.each_index{ | index |
 
-			@_method_index = index
+      @_method_index = index
 
-			behaviour = @@behaviours[ @_method_index ]
+      behaviour = @@behaviours[ @_method_index ]
 
-			if ( ( rules[ :name ] == behaviour[ :name ] ) ||  
+      if ( ( rules[ :name ] == behaviour[ :name ] ) ||  
 
-				( rules[ :name ] == [ '*' ] ) &&
+        ( rules[ :name ] == [ '*' ] ) &&
 
-#				( !( rules[ :sut_type ] & behaviour[ :sut_type ] ).empty? ) && 
-				( !( rules[ :input_type ] & behaviour[ :input_type ] ).empty? ) && 
-				( !( rules[ :object_type ] & behaviour[ :object_type ] ).empty? ) && 
-				( !( rules[ :version ] & behaviour[ :version ] ).empty? )
+#        ( !( rules[ :sut_type ] & behaviour[ :sut_type ] ).empty? ) && 
+        ( !( rules[ :input_type ] & behaviour[ :input_type ] ).empty? ) && 
+        ( !( rules[ :object_type ] & behaviour[ :object_type ] ).empty? ) && 
+        ( !( rules[ :version ] & behaviour[ :version ] ).empty? )
 
-				) 
+        ) 
 
-			  behaviour( :name => @@behaviours[ @_method_index ][ :name ], :object_type => @@behaviours[ @_method_index ][ :object_type ].join(";") ){ 
-				object_methods{
-				  @@behaviours[ @_method_index ][ :methods ].each { | key, value |
-					object_method( :name => key.to_s ) {	
-					  description( value[:description] )
-					  example( value[:example] )
-					}
-				  }
-				}
-			  }
+        behaviour( :name => @@behaviours[ @_method_index ][ :name ], :object_type => @@behaviours[ @_method_index ][ :object_type ].join(";") ){ 
+        object_methods{
+          @@behaviours[ @_method_index ][ :methods ].each { | key, value |
+          object_method( :name => key.to_s ) {  
+            description( value[:description] )
+            example( value[:example] )
+          }
+          }
+        }
+        }
 
-			end
+      end
 
-		  }
+      }
 
-		}
+    }
 
-	  }.to_xml
+    }.to_xml
 
-	end
+  end
 
-	def get_behaviour_at_index( index )
+  def get_behaviour_at_index( index )
 
-	  result = @@behaviours[ index ]
+    result = @@behaviours[ index ]
 
-	  if result.nil? 
+    if result.nil? 
 
-		Kernel::raise RuntimeError.new( "No behaviour at index #{ index }" )
+    Kernel::raise RuntimeError.new( "No behaviour at index #{ index }" )
 
-	  else
+    else
 
-		result
+    result
 
-	  end
+    end
 
-	end
+  end
 
-	def apply_behaviour!( rules = {} )
+  def apply_behaviour!( rules = {} )
 
-	  # merge user-defined rules on top of default rules set
-	  #rules = { :sut_type => ['*'], :object_type => ['*'], :input_type => ['*'], :version => ['*'] }.merge!( rules )
+    # merge user-defined rules on top of default rules set
+    #rules = { :sut_type => ['*'], :object_type => ['*'], :input_type => ['*'], :version => ['*'] }.merge!( rules )
 
     rules.default = ['*']
 
-	  Kernel::raise ArgumentError.new( "Target object not defined in rules hash" ) if rules[ :object ].nil?			
+    Kernel::raise ArgumentError.new( "Target object not defined in rules hash" ) if rules[ :object ].nil?      
 
-	  # apply behaviours to target object
-	  ( get_object_behaviours( rules ) ).each{ | behaviour_index |
+    # apply behaviours to target object
+    ( get_object_behaviours( rules ) ).each{ | behaviour_index |
 
-		behaviour_data = @@behaviours[ behaviour_index ]
+      behaviour_data = @@behaviours[ behaviour_index ]
 
-		# skip if required plugin is not registered or enabled
-		next if behaviour_data[ :requires ].collect{ | plugin | 
+      # skip if required plugin is not registered or enabled
+      next if behaviour_data[ :requires ].collect{ | plugin | 
 
-		  #MobyUtil::PluginService.instance.plugin_registered?( plugin ) && MobyUtil::PluginService.instance.plugin_enabled?( plugin )
+        #MobyUtil::PluginService.instance.plugin_registered?( plugin ) && MobyUtil::PluginService.instance.plugin_enabled?( plugin )
 
-          # verify if plugin is enabled -- exception will be catched if plugin is not registered 
-		  MobyUtil::PluginService.instance.plugin_enabled?( plugin ) rescue false
+        # verify if plugin is enabled -- exception will be catched if plugin is not registered 
+        MobyUtil::PluginService.instance.plugin_enabled?( plugin ) rescue false
 
-		}.include?( false )
+      }.include?( false )
 
-		begin
+      begin
 
-		  #behaviour_module = MobyUtil::KernelHelper.get_constant( behaviour_data[ :module ][ :name ] )
+        #behaviour_module = MobyUtil::KernelHelper.get_constant( behaviour_data[ :module ][ :name ] )
 
-		  # retrieve behaviour module from cache and extend target object
-		  rules[ :object ].extend( 
-								  @@modules_cache.fetch( behaviour_data[ :module ][ :name ] ){ | name |									
-									# ... or store to cache for the next time if not found 
-									@@modules_cache[ name ] = MobyUtil::KernelHelper.get_constant( name )
-								  } 
-								  )
+        # retrieve behaviour module from cache and extend target object
+        rules[ :object ].extend( 
+          @@modules_cache.fetch( behaviour_data[ :module ][ :name ] ){ | name |                  
+            # ... or store to cache for the next time if not found 
+            @@modules_cache[ name ] = MobyUtil::KernelHelper.get_constant( name )
+          } 
+        )
 
-		rescue NameError => exception
+      rescue NameError => exception
 
-		  Kernel::raise exception.class.new( 
-											"Implementation for behaviour %s does not exist. (%s)" % [ behaviour_data[ :name ], behaviour_data[ :module ][ :name ] ]
-											)
+        Kernel::raise exception.class.new( 
+                        "Implementation for behaviour %s does not exist. (%s)" % [ behaviour_data[ :name ], behaviour_data[ :module ][ :name ] ]
+                        )
 
-		rescue Exception => exception
+      rescue Exception => exception
 
-		  Kernel::raise RuntimeError.new( 
-										 "Error while applying %s (%s) behaviour to target object. Reason: %s (%s)" % [
-										   behaviour_data[ :name ],
-										   behaviour_data[ :module ][ :name ],	
-										   exception.message,
-										   exception.class
-										 ]
-										 )
+        Kernel::raise RuntimeError.new( 
+                       "Error while applying %s (%s) behaviour to target object. Reason: %s (%s)" % [
+                         behaviour_data[ :name ],
+                         behaviour_data[ :module ][ :name ],  
+                         exception.message,
+                         exception.class
+                       ]
+                       )
 
-		end
+      end
 
-		# add behaviour information to test object
-		rules[ :object ].instance_exec{ 
+      # add behaviour information to test object
+      rules[ :object ].instance_exec{ 
 
-		  @object_behaviours.push( behaviour_index ) unless @object_behaviours.include? behaviour_index 
+        @object_behaviours.push( behaviour_index ) unless @object_behaviours.include? behaviour_index 
 
-		}
+      }
 
-	  }
+    }
 
-	end
+  end
 
-	private
+  private
 
-	def load_behaviours( behaviour_files )
+  def load_behaviours( behaviour_files )
 
-	  behaviours_data = []
+    behaviours_data = []
 
-	  @file_name = ""
+    @file_name = ""
 
-	  begin
+    begin
 
-		Dir.glob( behaviour_files ).each { | behaviour | 
+    Dir.glob( behaviour_files ).each { | behaviour | 
 
-		  @file_name = behaviour
+      @file_name = behaviour
 
-		  behaviours_data << { :filename => @file_name, :xml => MobyUtil::FileHelper.get_file( @file_name ) }
+      behaviours_data << { :filename => @file_name, :xml => MobyUtil::FileHelper.get_file( @file_name ) }
 
-		}
+    }
 
-	  rescue MobyUtil::EmptyFilenameError
+    rescue MobyUtil::EmptyFilenameError
 
-		Kernel::raise EmptyFilenameError.new( "Unable to load behaviours xml file due to filename is empty or nil" )
+    Kernel::raise EmptyFilenameError.new( "Unable to load behaviours xml file due to filename is empty or nil" )
 
-	  rescue MobyUtil::FileNotFoundError => ex
+    rescue MobyUtil::FileNotFoundError => ex
 
-		Kernel::raise ex
+    Kernel::raise ex
 
-	  rescue IOError => ex
+    rescue IOError => ex
 
-		Kernel::raise IOError.new("Error occured while loading behaviours xml file %s. Reason: %s" % [ @file_name, ex.message ] )
+    Kernel::raise IOError.new("Error occured while loading behaviours xml file %s. Reason: %s" % [ @file_name, ex.message ] )
 
-	  rescue => ex
+    rescue => ex
 
-		Kernel::raise RuntimeError.new( "Error occured while parsing behaviours xml file %s. Reason: %s (%s)" % [ @file_name, ex.message, ex.class ] )
+    Kernel::raise RuntimeError.new( "Error occured while parsing behaviours xml file %s. Reason: %s (%s)" % [ @file_name, ex.message, ex.class ] )
 
-	  end
+    end
 
-	  behaviours_data
+    behaviours_data
 
-	end
+  end
 
-	def parse_behaviour_files( behaviour_files )
+  def parse_behaviour_files( behaviour_files )
 
-	  behaviour_files.each{ | behaviours | 
+    behaviour_files.each{ | behaviours | 
 
-		begin
+    begin
 
       # skip parsing the xml if string is empty
       next if behaviours[ :xml ].empty?
 
-		  # parse behaviour xml
-		  document = MobyUtil::XML.parse_string( behaviours[ :xml ] )
+      # parse behaviour xml
+      document = MobyUtil::XML.parse_string( behaviours[ :xml ] )
 
-		rescue => exception
+    rescue => exception
 
-		  Kernel::raise MobyUtil::XML::ParseError.new( 
-													  "Error occured while parsing behaviour XML file %s. Error: %s " % [ behaviours[ :filename ], exception.message ] 
-													  ) 
+      Kernel::raise MobyUtil::XML::ParseError.new( 
+                            "Error occured while parsing behaviour XML file %s. Error: %s " % [ behaviours[ :filename ], exception.message ] 
+                            ) 
 
-		end
+    end
 
-		# retrieve root attributes
-		root_attributes = document.root.xpath( "/behaviours" ).first.attributes
+    # retrieve root attributes
+    root_attributes = document.root.xpath( "/behaviours" ).first.attributes
 
-		# parse retrieve behaviour definitions
-		document.root.xpath( "/behaviours/behaviour" ).each{ | node |
+    # parse retrieve behaviour definitions
+    document.root.xpath( "/behaviours/behaviour" ).each{ | node |
 
-		  # retrieve behaviour attributes & module node
-		  attributes = node.attributes
+      # retrieve behaviour attributes & module node
+      attributes = node.attributes
 
-		  name = attributes[ "name" ].to_s
-		  object_type = attributes[ "object_type" ].to_s
-		  input_type = attributes[ "input_type" ].to_s
-		  sut_type = attributes[ "sut_type" ].to_s
-		  version = attributes[ "version" ].to_s
+      name = attributes[ "name" ].to_s
+      object_type = attributes[ "object_type" ].to_s
+      input_type = attributes[ "input_type" ].to_s
+      sut_type = attributes[ "sut_type" ].to_s
+      version = attributes[ "version" ].to_s
 
-		  env = ( attributes[ "env" ] || '*' ).to_s 
+      env = ( attributes[ "env" ] || '*' ).to_s 
 
-		  module_node = node.xpath( 'module' ).first
-		  
-		  name = attributes[ "name" ].to_s
-		  object_type = attributes[ "object_type" ].to_s
-		  input_type = attributes[ "input_type" ].to_s
-		  sut_type = attributes[ "sut_type" ].to_s
-		  version = attributes[ "version" ].to_s
-		  
-		  # verify that all required attributes and nodes are found in behaviour xml node
-		  #Kernel::raise RuntimeError.new("Behaviour does not have a name, please see behaviour XML files") if name.empty?
-		  name.not_empty("Behaviour element does not have name (name) attribute defined, please see behaviour XML files", RuntimeError)
-		  
-		  #Kernel::raise RuntimeError.new("Behaviour target object type not defined for #{ name } in XML") if object_type.empty?
-		  object_type.not_empty("Behaviour element does not have target object type (object_type) attribute defined, please see #{ name } in behaviour XML files", RuntimeError)
+      module_node = node.xpath( 'module' ).first
+      
+      name = attributes[ "name" ].to_s
+      object_type = attributes[ "object_type" ].to_s
+      input_type = attributes[ "input_type" ].to_s
+      sut_type = attributes[ "sut_type" ].to_s
+      version = attributes[ "version" ].to_s
+      
+      # verify that all required attributes and nodes are found in behaviour xml node
+      #Kernel::raise RuntimeError.new("Behaviour does not have a name, please see behaviour XML files") if name.empty?
+      name.not_empty("Behaviour element does not have name (name) attribute defined, please see behaviour XML files", RuntimeError)
+      
+      #Kernel::raise RuntimeError.new("Behaviour target object type not defined for #{ name } in XML") if object_type.empty?
+      object_type.not_empty("Behaviour element does not have target object type (object_type) attribute defined, please see #{ name } in behaviour XML files", RuntimeError)
 
-		  #Kernel::raise RuntimeError.new("Behaviour target object input type not defined for #{ name } in XML") if input_type.empty?
-		  input_type.not_empty("Behaviour element does not have target object input type (input_type) attribute defined, please see #{ name } in behaviour XML files", RuntimeError)
+      #Kernel::raise RuntimeError.new("Behaviour target object input type not defined for #{ name } in XML") if input_type.empty?
+      input_type.not_empty("Behaviour element does not have target object input type (input_type) attribute defined, please see #{ name } in behaviour XML files", RuntimeError)
 
-		  #Kernel::raise RuntimeError.new("Behaviour target object sut type not defined for #{ name } in XML") if sut_type.empty?
-		  sut_type.not_empty("Behaviour element does not have target object sut type (sut_type) attribute defined, please see #{ name } in behaviour XML files", RuntimeError)
+      #Kernel::raise RuntimeError.new("Behaviour target object sut type not defined for #{ name } in XML") if sut_type.empty?
+      sut_type.not_empty("Behaviour element does not have target object sut type (sut_type) attribute defined, please see #{ name } in behaviour XML files", RuntimeError)
 
-		  #Kernel::raise RuntimeError.new("Behaviour target object sut version not defined for #{ name } in XML") if version.empty?
-		  version.not_empty("Behaviour element does not have target object SUT version (version) attribute defined, please see #{ name } in behaviour XML files", RuntimeError)
+      #Kernel::raise RuntimeError.new("Behaviour target object sut version not defined for #{ name } in XML") if version.empty?
+      version.not_empty("Behaviour element does not have target object SUT version (version) attribute defined, please see #{ name } in behaviour XML files", RuntimeError)
 
-		  #Kernel::raise RuntimeError.new("Behaviour implementation module not defined for #{ name } in XML") if module_node.nil?
-		  module_node.not_nil("Behaviour does not have implementation module element defined, please see #{ name } in behaviour XML files", RuntimeError)
-		  
-		  # retrieve module name & implementation filename
-		  module_attributes = module_node.attributes
-		  module_file = module_attributes[ "file" ].to_s # optional
-		  module_name = module_attributes[ "name" ].to_s 
-		  
-		  #Kernel::raise RuntimeError.new( "Behaviour implementation module name not defined for #{ name } in XML") if module_name.empty?
-          module_name.not_empty("Behaviour does not have implementation module name defined, please see #{ name } in behaviour XML files", RuntimeError)
+      #Kernel::raise RuntimeError.new("Behaviour implementation module not defined for #{ name } in XML") if module_node.nil?
+      module_node.not_nil("Behaviour does not have implementation module element defined, please see #{ name } in behaviour XML files", RuntimeError)
+      
+      # retrieve module name & implementation filename
+      module_attributes = module_node.attributes
+      module_file = module_attributes[ "file" ].to_s # optional
+      module_name = module_attributes[ "name" ].to_s 
+      
+      #Kernel::raise RuntimeError.new( "Behaviour implementation module name not defined for #{ name } in XML") if module_name.empty?
+      module_name.not_empty("Behaviour does not have implementation module name defined, please see #{ name } in behaviour XML files", RuntimeError)
 
-		  methods_hash = {}
+      methods_hash = {}
 
-		  # create hash of methods
-		  node.xpath( 'methods/method' ).each{ | method |
+      # create hash of methods
+      node.xpath( 'methods/method' ).each{ | method |
 
-			  # retrieve method description & example and store to methods hash
-			  methods_hash[ method.attribute( "name" ).to_s.to_sym ] = {
+        # retrieve method description & example and store to methods hash
+        methods_hash[ method.attribute( "name" ).to_s.to_sym ] = {
 
-			    :description => method.at_xpath( 'description/text()' ).to_s, 
+          :description => method.at_xpath( 'description/text()' ).to_s, 
 
-			    :example     => method.at_xpath( 'example/text()' ).to_s
+          :example     => method.at_xpath( 'example/text()' ).to_s
 
-  			}
+        }
 
-		  }
+      }
 
-		  # create and store beahaviour hash
-		  @@behaviours << {
+      # create and store beahaviour hash
+      @@behaviours << {
 
-			:name => name,
-			:requires => root_attributes[ "plugin" ].to_s.split(";"),
-			:object_type => object_type.split(";"),
-			:input_type => input_type.split(";"),
-#			:sut_type => sut_type.split(";"),
-			:version => version.split(";"),
-			:env => env.split(";"),
+      :name => name,
+      :requires => root_attributes[ "plugin" ].to_s.split(";"),
+      :object_type => object_type.split(";"),
+      :input_type => input_type.split(";"),
+#      :sut_type => sut_type.split(";"),
+      :version => version.split(";"),
+      :env => env.split(";"),
 
-			:module => { 
-			  :file => module_file, 
-			  :name => module_name 
-			},
+      :module => { 
+        :file => module_file, 
+        :name => module_name 
+      },
 
-			:methods => methods_hash
+      :methods => methods_hash
 
-		  }
+      }
 
-		}
+    }
 
-	  }
+    }
 
-	end
+  end
 
-	def get_object_behaviours( rules )
+  def get_object_behaviours( rules )
 
       # calculate hash for behaviour rules / hash value will be used to identify similar objects
       behaviour_hash = Hash[ rules.select{ | key, value | key != :object  } ].hash
@@ -345,55 +345,55 @@ module MobyBase
 
       else
 
-		rules.default = [ '*' ]
+    rules.default = [ '*' ]
 
-		extended_modules = []
+    extended_modules = []
 
-		@@behaviours.each_with_index{ | behaviour, index |
+    @@behaviours.each_with_index{ | behaviour, index |
 
-		  if ( 	( rules[ :name ] == behaviour[ :name ] ) || 
+      if (   ( rules[ :name ] == behaviour[ :name ] ) || 
 
-			  ( rules[ :name ] == [ '*' ] && 
+        ( rules[ :name ] == [ '*' ] && 
 
-#			   ( !( rules[ :sut_type ] & behaviour[ :sut_type ] ).empty? ) && 
-			   ( !( rules[ :object_type ] & behaviour[ :object_type ] ).empty? ) &&
-			   ( !( rules[ :input_type ] & behaviour[ :input_type ] ).empty? ) &&
-			   ( !( rules[ :env ] & behaviour[ :env ] ).empty? ) &&
-			   ( !( rules[ :version ] & behaviour[ :version ] ).empty? ) ) )
+#         ( !( rules[ :sut_type ] & behaviour[ :sut_type ] ).empty? ) && 
+         ( !( rules[ :object_type ] & behaviour[ :object_type ] ).empty? ) &&
+         ( !( rules[ :input_type ] & behaviour[ :input_type ] ).empty? ) &&
+         ( !( rules[ :env ] & behaviour[ :env ] ).empty? ) &&
+         ( !( rules[ :version ] & behaviour[ :version ] ).empty? ) ) )
 
-			# retrieve list of extended modules
-			extended_modules << index
+      # retrieve list of extended modules
+      extended_modules << index
 
-		  end
+      end
 
-		}
+    }
 
         # store behaviour module indexes to cache
         @@behaviours_cache[ behaviour_hash ] = extended_modules
 
       end
 
-	end
+  end
 
-	def get_behaviour_from_cache( target, sut_type, object_type, sut_version, input_type )
+  def get_behaviour_from_cache( target, sut_type, object_type, sut_version, input_type )
 
-	  if @_behaviour_cache.has_key?( object_type )
+    if @_behaviour_cache.has_key?( object_type )
 
-		# apply modules to target object
-		@_behaviour_cache[ object_type ].each{ | module_name | target.instance_eval( "self.extend(#{ module_name })" ) }
+    # apply modules to target object
+    @_behaviour_cache[ object_type ].each{ | module_name | target.instance_eval( "self.extend(#{ module_name })" ) }
 
-		# return true
-		true
+    # return true
+    true
 
-	  else
-		# return false
-		false
-	  end
+    else
+    # return false
+    false
+    end
 
-	end
+  end
 
-	# enable hooking for performance measurement & debug logging
-	MobyUtil::Hooking.instance.hook_methods( self ) if defined?( MobyUtil::Hooking )
+  # enable hooking for performance measurement & debug logging
+  TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
 
   end # BehaviourGenerator