testability-driver 1.0.3 → 1.0.4

data/lib/tdriver/base/test_object/behaviours/syncronization.rb

@@ -86,12 +86,6 @@ module MobyBehaviour
 		#
 		def wait_child( attributes = {}, timeout_secs = 10, retry_interval = 0.5 )
 
-			#Kernel::raise ArgumentError.new( "Argument attributes was not a valid. Expected: Hash" ) unless attributes.kind_of?( Hash )
-			#Kernel::raise ArgumentError.new( "Argument type was not a valid. Expected: String" ) unless attributes[ :type ].kind_of?( String ) && attributes[ :type ].length > 0
-			#Kernel::raise ArgumentError.new( "Argument timeout_secs was not a valid. Expected: Integer, Fixnum or Float" ) unless [ Integer, Fixnum, Float ].include? timeout_secs.class
-			#Kernel::raise ArgumentError.new( "Argument retry_interval was not a valid. Expected: Integer, Fixnum or Float" ) unless [ Integer, Fixnum, Float ].include? retry_interval.class
-
-
       # verify that attributes is type of Hash
       attributes.check_type( Hash, "Wrong argument type $1 for attributes (expected $2)" )
   
@@ -108,20 +102,29 @@ module MobyBehaviour
       retry_interval.check_type( [ Integer, Fixnum, Float ], "Wrong argument type $1 for retry interval (expected $2)" )
 
 			begin
+			
+        dynamic_attributes = attributes.strip_dynamic_attributes!
+
+        # try to identify desired child test object
+        @test_object_factory.identify_object(
+          :object_attributes_hash => attributes,
+          :identification_directives => dynamic_attributes.default_values(
+            :__timeout => timeout_secs,
+            :__retry_interval => retry_interval,
+            :__refresh_arguments => self.kind_of?( MobyBase::SUT ) ? attributes : { :id => self.get_application_id }
+          ),
+          :parent => self        
+        )
+
+			rescue MobyBase::TestObjectNotFoundError
 
-				MobyUtil::Retryable.until( :timeout => timeout_secs, :interval => retry_interval ) {
-
-					#self.refresh( attributes )
-
-					self.refresh( self.kind_of?( MobyBase::SUT ) ? attributes : { :id => self.get_application_id } )
+				# the child object was not found in the specified timeout
+				raise MobyBase::SyncTimeoutError, "Synchronization timed out (#{ timeout_secs }) before the defined child object could be found."
 
-					MobyBase::TestObjectIdentificator.new( attributes ).find_object_data( self.xml_data )
+      rescue # unexpected errors
 
-				}
-			rescue
+				raise RuntimeError, "Synchronization failed due to #{ $!.message } (#{ $!.class })"
 
-				# the child object was not found in the specified timeout
-				Kernel::raise MobyBase::SyncTimeoutError.new( "Synchronization timed out (%i) before the defined child object could be found." % timeout_secs )
 			end
 
 			self
@@ -129,7 +132,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 # TDriverSyncronization
 

data/lib/tdriver/base/test_object/behaviours/test_object.rb

@@ -51,6 +51,16 @@ module MobyBehaviour
     #  example: { :name => 'Triangle1', :type => :Triangle }
     attr_accessor :creation_attributes
 
+=begin
+    # == nodoc
+    # == description
+    # attr_reader
+    # == returns
+    # Hash
+    #  description: Parent application test object
+    #  example: <MobyBase::TestObject>
+    attr_reader :parent_application
+=end
 
     # == nodoc
     # == description
@@ -89,12 +99,24 @@ module MobyBehaviour
     # attributes_hash = @test_app.Triangle( :name => 'Triangle1' ).attributes # retrieve all attribute for triangle object
     def attributes
 
+      # retrieve sut parameters
+      sut_parameters = $parameters[ @sut.id ]
+
+      # retrieve sut attribute filter type
+      filter_type = sut_parameters[ :filter_type, 'none' ] 
+
+      # temporarly disable attribute filter to retrieve all test object attributes
+      sut_parameters[ :filter_type ] = 'none'
+
       begin
 
+        # raise exception to refresh test object ui state if filter_type was something else than 'none'
+        raise MobyBase::TestObjectNotFoundError unless filter_type == 'none'
+
         # retrieve xml data, performs xpath to sut xml_data
         _xml_data = xml_data
 
-      rescue MobyBase::TestObjectNotFoundError		
+      rescue MobyBase::TestObjectNotFoundError
 
         # attributes used to refresh parent application
         if @creation_attributes[ :type ] == 'application'
@@ -115,6 +137,11 @@ module MobyBehaviour
         # retrieve updated xml data
         _xml_data = xml_data
 
+      ensure
+
+        # restore attributes filter type
+        sut_parameters[ :filter_type ] = filter_type
+
       end
 
       # return hash of test object attributes
@@ -151,8 +178,8 @@ module MobyBehaviour
       # TODO: add behaviour logging?
 
       # raise exception if attribute name variable type is other than string
-      name.check_type( [ String, Symbol ], "Wrong argument type %s for attribute (expected $2)" )
-	  	
+      name.check_type( [ String, Symbol ], "Wrong argument type $1 for attribute (expected $2)" )
+      
       # convert name to string if variable type is symbol
       name = name.to_s if name.kind_of?( Symbol )
 
@@ -214,90 +241,9 @@ module MobyBehaviour
       enable_optimizer
 
       parent
-      
-
-=begin
-
-      # return current test object if it's type of application
-      return self if application?
-
-      @sut.refresh if disable_optimizer
-
-      # find parent id
-      element_set = @sut.xml_data.xpath( "//object/objects/object[@id='#{ @id }']/../.." )
-
-      kid = nil
-
-      if( element_set == nil or element_set.size == 0 )
-      
-        # return self if there is not parent object available
-        kid = self 
-        
-      else
-      
-        element = element_set.first
-
-        #if app set look for the item under the app to make sure app id is available
-
-        if self.get_application_id && element.attribute( "type" ) != 'application'
-
-          kid = @sut.child( 
-            :id => get_application_id, 
-            :type => 'application' 
-          ).child( 
-            :id => element.attribute( "id" ), 
-            :name => element.attribute( "name" ), 
-            :type => element.attribute( "type" ),
-            :__index => 0 # there was a case when the same parent was included twice in the ui dump
-          )
-
-        else
-
-          kid = @sut.child( 
-            :id => element.attribute( "id" ), 
-            :name => element.attribute( "name" ), 
-            :type => element.attribute( "type" ) 
-          )
-
-        end
-
-      end
-
-      enable_optimizer
-
-      kid
-=end
 
     end
     
-    # == nodoc
-    # Updates this test object to match the data in the provided xml document
-    # Propagates updating to all child TestObjects
-    # If TestObject is not identified, then current TO is deactivated, as is all the Child objects, as defined in TestObject#deactivate.
-    # === params
-    # xml_document:: LibXML::XML::Node describing the new state of this test object
-    # === returns 
-    # ?
-    # === raises
-    # nothing
-    def update( xml_document )
-
-      begin
-
-        if !( _xml_data = MobyBase::TestObjectIdentificator.new( :type => @type, :id => @id, :name => @name ).find_object_data( xml_document ) ).eql?( xml_data )
-
-          @_child_objects.each { | test_object | test_object.update( ( xml_data = _xml_data ) ) }
-
-        end
-
-      rescue MobyBase::TestObjectNotFoundError, MobyBase::MultipleTestObjectsIdentifiedError
-
-        deactivate
-
-      end
-
-    end 
-
     # == nodoc
     # Function refreshes test objects to correspond with the current state of the device.
     # 
@@ -309,13 +255,7 @@ module MobyBehaviour
     # TestObjectNotFoundError:: if TestObject is not identified within synch timeout.
     def refresh( refresh_args = {} )
 
-      @sut.refresh( 
-      
-        refresh_args, 
-        
-        @test_object_factory.get_parent_params( parent ) <<  @test_object_factory.make_object_search_params( @creation_attributes )
-        
-      )
+      @sut.refresh( refresh_args, @test_object_factory.make_object_search_params( parent, @creation_attributes ) )
 
     end
 
@@ -331,7 +271,7 @@ module MobyBehaviour
     # TestObjectNotFoundError:: if TestObject is not identified within synch timeout.
     def force_refresh( refresh_args = {} )
 
-      refresh(refresh_args)
+      refresh( refresh_args )
 
     end
 
@@ -345,6 +285,10 @@ module MobyBehaviour
     # parent_app = @app.Node( :name => 'Node1' ).get_application() #get application for some test object, this should return @app.
     def get_application
 
+      # test object should have @parent_application always
+      return @parent_application if @parent_application
+
+      # workaround: fetch application from sut, this part of code should not be executed ever
       return self if application?
 
       test_object = @parent
@@ -359,7 +303,6 @@ module MobyBehaviour
 
       # return application object or nil if no parent found
       # Does is make sense to return nil - should  n't all test objects belong to an application? Maybe throw exception if application not found
-
       return @sut.child( :type => 'application' ) rescue nil
 
     end
@@ -373,8 +316,10 @@ module MobyBehaviour
     # puts @app.Node( :name => 'Node1' ).get_application_id() #print the application id, this should print @app.id
     def get_application_id
 
-      return @_application_id if @_application_id
-      #What about the case when get_application returns nil? This line will throw an exception in that case.
+      return @parent_application.id if @parent_application
+
+      # workaround
+      # What about the case when get_application returns nil? This line will throw an exception in that case.
       get_application.id
 
     end
@@ -406,174 +351,6 @@ module MobyBehaviour
 
     end
 
-    # == nodoc
-    # == description
-	  # Translates all symbol values in hash using SUT's translate method.
-    #
-	  # == arguments
-	  # hash
-    #  Hash
-    #   description: containing key and value pairs. The hash will get modified if symbols are found from values
-    #   example: {:text=>:translate_me}
-    #
-    # == returns
-    # Hash
-    #  description: Translated hash
-    #  example: {:text=>'translated_text'}
-	  # == exceptions
-	  # LanguageNotFoundError
-    #   description: In case of language is not found
-    #
-	  # LogicalNameNotFoundError
-    #  description: In case of logical name is not found for current language
-    #
-	  # MySqlConnectError
-    #  description: In case problems with the db connectivity
-    #
-	  def translate!( hash, file_name = nil, plurality = nil, numerus = nil, lengthvariant = nil )
-
-      hash.each_pair do | _key, _value |
-
-        next if [ :name, :type, :id ].include?( _key )
-
-        hash[ _key ] = sut.translate( _value, file_name, plurality, numerus, lengthvariant ) if _value.kind_of?( Symbol )  
-
-      end if !hash.nil?
-
-    end
-
-=begin
-    # == description
-    # Creates a child test object of this test object. Caller object will be associated as child test objects parent.\n
-    # \n
-    # [b]NOTE:[/b] Subsequent calls to TestObject#child( rule ) always returns reference to same Testobject:\n
-    # [code]a = to.child( :type => 'Button', :text => '1' )
-    # b = to.child( :type => 'Button', :text => '1' )
-    # a.eql?( b ) # => true[/code]
-    # == arguments
-    # attributes
-    #  Hash
-    #   description: Hash object holding information for identifying which child to create
-    #   example: { :type => :slider }
-    #
-    # == returns
-    # MobyBase::TestObject
-    #  description: new child test object or reference to existing child
-    #  example: -
-    #
-    # == exceptions
-    # TypeError
-    #  description: Wrong argument type %s for attributes (expected Hash)
-    #
-    # MultipleTestObjectsIdentifiedError
-    #  description:  raised if multiple objects found that match the given attributes
-    #
-    # TestObjectNotFoundError
-    #  description:  raised if the child object could not be found
-    #
-    # TestObjectNotVisibleError
-    #  description: rasied if the parent test object is no longer visible
-    def child( attributes )
-
-      # verify attributes argument format
-      #raise TypeError.new( 'Unexpected argument type (%s) for attributes, expecting %s' % [ attributes.class, "Hash" ] ) unless attributes.kind_of?( Hash ) 
-      attributes.check_type( Hash, "Wrong argument type $1 for attributes (expected $2)" )
-  
-      
-      # retrieve child object
-      get_child_objects( attributes )
-
-    end
-    
-    def child( attributes )
-
-      ###############################################################################################################
-      #
-      #  NOTICE: Please do not add anything unnessecery to this method, it might cause a major performance impact
-      #
-
-      # verify attributes argument format
-      attributes.check_type( Hash, "Wrong argument type $1 for attributes (expected $2)" )
-            
-      # store original hash
-      creation_hash = attributes.clone
-
-      dynamic_attributes = creation_hash.strip_dynamic_attributes!
-
-      # raise exception if wrong value type given for ;__logging 
-      dynamic_attributes[ :__logging ].check_type( 
-
-        [ TrueClass, FalseClass ], 
-
-        "Wrong value type $1 for :__logging test object creation directive (expected $2)" 
-
-      ) if dynamic_attributes.has_key?( :__logging )
-
-      # disable logging if requested, remove pair from creation_hash
-      MobyUtil::Logger.instance.push_enabled( dynamic_attributes[ :__logging ] || TDriver.logger.enabled )
-
-	    # check if the hash contains symbols as values and translate those into strings
-	    translate!( creation_hash, attributes[ :__fname ], attributes[ :__plurality ], attributes[ :__numerus ], attributes[ :__lengthvariant ] )
-
-      begin
-
-        # TODO: refactor me
-        child_test_object = @test_object_factory.make_object(
-
-          # current object as parent, can be either TestObject or SUT
-          :parent => self,
- 
-          # test object identification hash
-          :object_attributes_hash => creation_hash, 
-          
-          :identification_directives => dynamic_attributes
-
-        )
-
-
-      rescue Exception => exception
-
-        if exception.kind_of?( MobyBase::MultipleTestObjectsIdentifiedError )
-
-          description = "Multiple child objects matched criteria."
-
-        elsif exception.kind_of?( MobyBase::TestObjectNotFoundError )
-
-          description = "The child object(s) could not be found."
-
-        elsif exception.kind_of?( MobyBase::TestObjectNotVisibleError )
-
-          description = "Parent test object no longer visible."
-
-        else
-
-          description = "Failed when trying to find child object(s)."
-
-        end
-
-        TDriver.logger.behaviour(
-
-          "%s;%s;%s;%s;%s" % [ "FAIL", description, identity, dynamic_attributes[ :__multiple_objects ] ? "children" : "child", attributes.inspect ]
-
-        )
-
-        Kernel::raise exception
-
-
-      ensure
-
-        # restore original logger state
-        MobyUtil::Logger.instance.pop_enabled
-
-      end
-
-      # return child test object
-      child_test_object
-
-    end
-   
-=end
-
     # == description
     # Creates a child test object of this test object. Caller object will be associated as child test objects parent.\n
     # \n
@@ -652,150 +429,166 @@ module MobyBehaviour
       # verify find_all_children argument format
       find_all_children.check_type( [ TrueClass, FalseClass ], "Wrong argument type $1 for find_all_children (expected $2)" )
 
-      # If empty or only special attributes then add :type => "any" to search all
-      attributes.merge!( :type => "any" ) if attributes.select{ | key, value | key.to_s !~ /^__/ ? true : false }.empty?
+      # If empty or only special attributes then add :type => '*' to search all
+      attributes[ :type ] = '*' if attributes.select{ | key, value | key.to_s !~ /^__/ ? true : false }.empty?
 
       # children method specific settings
       attributes.merge!( :__multiple_objects => true, :__find_all_children => find_all_children )
 
       # disable optimizer state if enabled
-	    disable_optimizer
+      disable_optimizer
 
       # retrieve child objects
       result = get_child_objects( attributes )
 
       # restore optimizer state if it was enabled
-	    enable_optimizer
+      enable_optimizer
 
       # return results
       result
     
     end
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-=begin
-    # == description
-    # Function similar to child, but returns an array of children test objects that meet the given criteria
-    #
-    # == arguments
-    # attributes
-    #  Hash
-    #   description: object holding information for identifying which child to create
-    #   example: { :type => :slider }
-    #  
-    # find_all_children
-    #  TrueClass
-    #   description: Boolean specifying whether all children under the test node or just immediate children should be retreived
-    #   example: true
-    #  FalseClass
-    #   description: Boolean specifying whether all children under the test node or just immediate children should be retreived
-    #   example: false
-    #   
-    # == returns
-    # Array
-    #   description: An array of test objects
-    #   example: [ MobyBase::TestObject, MobyBase::TestObject, MobyBase::TestObject, ... ]
-    #
-    # == exceptions
-    # TypeError
-    #  description: raised if agument is not a Hash
-    #
-    # TestObjectNotFoundError
-    #  description: raised if the child object could not be found
-    #
-    # TestObjectNotVisibleError
-    #  description: rasied if the parent test object is no longer visible
-	  def children( attributes, find_all_children = true )
+  private
 
-      # verify attributes argument format
-      #raise TypeError.new( 'Unexpected argument type (%s) for attributes, expecting %s' % [ attributes.class, "Hash" ] ) unless attributes.kind_of?( Hash ) 
-      attributes.check_type( Hash, "Wrong argument type $1 for attributes (expected $2)" )
+    # == nodoc
+    # Updates this test object to match the data in the provided xml document
+    # Propagates updating to all child TestObjects
+    # If TestObject is not identified, then current TO is deactivated, as is all the Child objects, as defined in TestObject#deactivate.
+    # === params
+    # xml_document:: MobyUtil::XML::Node describing the new state of this test object
+    # === returns 
+    # ?
+    # === raises
+    # nothing
+    def update( xml_document )
 
-      # verify attributes argument format
+      begin
 
-      # respect the original attributes variable value
-      creation_attributes = attributes.clone
+        # find object from new xml data
+        _xml_data, unused_rule = TDriver::TestObjectAdapter.get_objects( xml_document, { :type => @type, :id => @id, :name => @name }, true )
+                        
+        # deactivate if test object not found or multiple matches found
+        raise unless _xml_data.count == 1 
 
-      # If empty or only special attributes then add :type => "any" to search all
-      creation_attributes.merge!( :type => "any" ) if creation_attributes.select{ | key, value | key.to_s !~ /^__/ ? true : false }.empty?
+        # get first matching element
+        _xml_data = _xml_data.first
 
-      # children method specific settings
-      creation_attributes.merge!( :__multiple_objects => true, :__find_all_children => find_all_children )
+        #unless _xml_data.eql?( xml_data )
 
-	    disable_optimizer
+          # store previous object environment value 
+          previous_environment = @env
 
-      # retrieve child objects
-      kids = get_child_objects( creation_attributes )
+          # update current test objects xml_data 
+          __send__( :xml_data=, _xml_data )
 
-	    enable_optimizer
+          # compare new environment value with previous 
+          if @env != previous_environment
 
-	    kids
+            # reapply behaviours to test object if environment value has changed
+            MobyBase::BehaviourFactory.instance.apply_behaviour!(
 
-    end
-=end
+              :object => self,
+              :object_type => [ '*', @type ], 
+              :input_type => [ '*', @sut.input.to_s ],
+              :env => [ '*', *@env.to_s.split(";") ],
+              :version => [ '*', @sut.ui_version.to_s ]
 
-  private
+            )
+            
+          end
+
+          # update child objects
+          @child_object_cache.each_object{ | test_object | 
+          
+            # update test object with new xml_data
+            #test_object.update( _xml_data ) 
+            test_object.send( :update, _xml_data ) 
+            
+          }
+        
+        #end
+                
+      rescue
+
+        # deactivate test object
+        deactivate
+                      
+      end
+
+    end 
 
     # TODO: document me
-	  def disable_optimizer
+    def disable_optimizer
 
-      sut_parameters = MobyUtil::Parameter[ @sut.id ]
+      sut_parameters = $parameters[ @sut.id ]
 
-	    # disable optimizer for this call since it will not work
-	    @_enable_optimizer = false
+      # disable optimizer for this call since it will not work
+      @_enable_optimizer = false
 
-	    if sut_parameters[ :use_find_object, 'false' ] == 'true' and @sut.respond_to?( 'find_object' )
+      if sut_parameters[ :use_find_object, 'false' ] == 'true' and @sut.respond_to?( 'find_object' )
 
-  		  sut_parameters[ :use_find_object ] = 'false'
+        sut_parameters[ :use_find_object ] = 'false'
 
-  		  @_enable_optimizer = true
+        @_enable_optimizer = true
 
-	    end
+      end
 
-	    @_enable_optimizer
+      @_enable_optimizer
 
-	  end
+    end
 
     # TODO: document me
-	  def enable_optimizer
+    def enable_optimizer
 
-	    MobyUtil::Parameter[ @sut.id ][ :use_find_object ] = 'true' if @_enable_optimizer
+      $parameters[ @sut.id ][ :use_find_object ] = 'true' if @_enable_optimizer
 
-	    @_enable_optimizer = false
+      @_enable_optimizer = false
 
-	  end
+    end
 
     # TODO: document me
     # Tries to use the missing method id as a child object type and find an object based on it
     def method_missing( method_id, *method_arguments )
 
-      # method mapping/aliases - this should be configured in xml file
-      #case method_id
-      #  when :Button;  method_id = [ :Button, :QToolButton, :DuiButton, :HbPushButton, :softkey ]
-      #  when :List;  method_id = [ :QList, :HbListWidgetView, :DuiList ]
-      #end
+      # create rules hash
+      rules_hash = method_arguments.first
 
-      hash_rule = ( method_arguments.first.kind_of?( Hash ) ? method_arguments.first : {} ).merge( :type => method_id )
+      # set rules hash to empty Hash if rules hash is not type of Hash
+      rules_hash = {} unless rules_hash.kind_of?( Hash ) 
 
+      # set test object type
+      rules_hash[ :type ] = method_id #.to_s
+  
       begin
 
-        child( hash_rule )
+        # return created child object
+        child( rules_hash )
 
       rescue MobyBase::TestObjectNotFoundError, MobyBase::TestObjectNotVisibleError
 
-        #hash_rule.delete( :type )
+        rules_hash_clone = rules_hash.clone
+        
+        rules_hash_clone.delete(:type)
 
+        # string representation of used rule hash, remove curly braces
+        attributes_string = rules_hash_clone.inspect[ 1 .. -2 ]
+        
+        if attributes_string.empty?
+        
+          # do not show any attribute details if none given                
+          attributes_string = ""
+          
+        else
+  
+          # show used attributes      
+          attributes_string = " (attributes #{ attributes_string })"
+
+        end
+
+        # raise exception
         Kernel::raise MobyBase::TestObjectNotFoundError.new(
-          'The test object (id: "%s", type: "%s", name: "%s") has no child object with type or behaviour method with name "%s" (%s) on sut "%s".' % 
-          [ @id, @type, @name, method_id.inspect, ( hash_rule.empty? ? "" : "attributes: #{ hash_rule.inspect }" ), @sut.id ]
+          "The test object (id: #{ @id }, type: #{ @type.inspect }, name: #{ @name.inspect }) has no child object with type or behaviour method with name #{ method_id.to_s.inspect }#{ attributes_string } on #{ @sut.id.inspect }" 
         )
 
       end
@@ -825,22 +618,26 @@ module MobyBehaviour
       ) if dynamic_attributes.has_key?( :__logging )
 
       # disable logging if requested, remove pair from creation_hash
-      MobyUtil::Logger.instance.push_enabled( dynamic_attributes[ :__logging ] || TDriver.logger.enabled )
+      $logger.push_enabled( dynamic_attributes[ :__logging ] || TDriver.logger.enabled )
 
-	    # check if the hash contains symbols as values and translate those into strings
-	    translate!( creation_hash, attributes[ :__fname ], attributes[ :__plurality ], attributes[ :__numerus ], attributes[ :__lengthvariant ] )
+      # check if the hash contains symbols as values and translate those into strings
+      @sut.translate_values!( creation_hash, attributes[ :__fname ], attributes[ :__plurality ], attributes[ :__numerus ], attributes[ :__lengthvariant ] )
 
       begin
 
         # TODO: refactor me
         child_test_object = @test_object_factory.get_test_objects(
 
-          # current object as parent, can be either TestObject or SUT
+          # current objec  t as parent, can be either TestObject or SUT
           :parent => self,
  
+          # pass parent application
+          :parent_application => @parent_application,
+ 
           # test object identification hash
           :object_attributes_hash => creation_hash, 
-          
+
+          # pass test object identification directives, e.g. :__index          
           :identification_directives => dynamic_attributes
 
         )
@@ -865,7 +662,7 @@ module MobyBehaviour
 
         end
 
-        TDriver.logger.behaviour(
+        $logger.behaviour(
 
           "%s;%s;%s;%s;%s" % [ 
             "FAIL", 
@@ -882,7 +679,7 @@ module MobyBehaviour
       ensure
 
         # restore original logger state
-        MobyUtil::Logger.instance.pop_enabled
+        $logger.pop_enabled
 
       end
 
@@ -923,7 +720,6 @@ module MobyBehaviour
 
     end
 
-
     # TODO: refactor logging_enabled 
     # try to reactivate test object if currently not active
     def reactivate_test_object( attributes )
@@ -944,181 +740,12 @@ module MobyBehaviour
 
     end
 
-=begin
-    # Strip dynamic attributes (such as :__timeout, :__logging) from hash and return those as hash
-    # == returns
-    # Hash:: Hash of dynamic attributes
-    def strip_dynamic_attributes!( attributes, exceptions = [] )
-
-      Hash[ attributes.select{ | key, value | 
-
-        if /^__/.match( key.to_s ) and !exceptions.include?( key )
-
-          attributes.delete( key )
-
-          true
-
-        else
-
-          false
-
-        end
-
-      }]
-
-    end
-
-    def get_cached_test_object!( object )
-
-      if @child_object_cache.has_object?( object ) 
-
-        object = @child_object_cache[ object ]
-
-        true
-
-      else
-
-        false
-
-      end
-
-    end
-=end
-
-
-=begin
-    def get_child_objects( attributes )
-
-      # create copy of attributes hash
-      creation_data = attributes.clone
-
-      # strip all dynamic attributes such as :__timeout, :__logging etc.
-      dynamic_attributes = strip_dynamic_attributes!( creation_data )
-
-      # store and set logger state if given, use default value if none given
-      TDriver.logger.push_enabled( MobyUtil::KernelHelper.to_boolean( dynamic_attributes[ :__logging ], TDriver.logger.enabled ) )
-
-      # determine if multiple matches is allowed, default value is false
-      multiple_objects = MobyUtil::KernelHelper.to_boolean( dynamic_attributes[ :__multiple_objects ], false )
-
-      find_all_children = MobyUtil::KernelHelper.to_boolean( dynamic_attributes[ :__find_all_children ], true )
-
-	    # check if the hash contains symbols as values and translate those into strings
-	    file_name = dynamic_attributes[ :__fname ]
-	    plurality = dynamic_attributes[ :__plurality ]
-	    numerus = dynamic_attributes[ :__numerus ]
-	    lengthvariant = dynamic_attributes[ :__lengthvariant ]
-
-	    translate!( creation_data, file_name, plurality, numerus, lengthvariant )
-
-      # use custom timeout if defined
-      timeout = ( dynamic_attributes[ :__timeout ] || @test_object_factory.timeout ).to_i
-
-      # determine which application to refresh
-      #application_id_hash = ( creation_data[ :type ] == 'application' ? { :name => creation_data[ :name ], :id => creation_data[ :id ] } : { :id => get_application_id } )
-            
-      if creation_data[ :type ] == 'application'
-      
-        application_id_hash = { :name => creation_data[ :name ], :id => creation_data[ :id ] }
-      
-      else
-      
-        application_id_hash = { :id => get_application_id }
-      
-      end
-
-      # add symbols to dynamic attributes list -- to avoid IRB bug
-      MobyUtil::DynamicAttributeFilter.instance.add_attributes( creation_data.keys )
-
-      begin
-
-        # try to reactivate test object if currently not active
-        #reactivate_test_object( creation_data ) unless @_active
-
-        # retrieve test objects from xml
-        child_objects = @test_object_factory.make_child_objects( 
-
-          :attributes => creation_data,
-          :dynamic_attributes => dynamic_attributes, 
-
-          :parent => self,
-          :sut => @sut,
-          :application => application_id_hash,
-
-          :timeout => timeout,
-          :multiple_objects => multiple_objects,
-          :find_all_children => find_all_children
-
-        )
-
-        # Type information is stored in a separate member, not in the Hash
-        #creation_data.delete( :type )
-
-        child_objects.each do | child_object |
-
-          # use cached test object if once already retrieved
-          get_cached_test_object!( child_object ).tap{ | found_in_cache |
-
-            # Store/update the attributes that were used to create the child object.
-            child_object.creation_attributes = creation_data
-
-            # add child to objects cache 
-            #add_child( child_object ) unless found_in_cache
-
-            @child_object_cache.add_object( child_object ) unless found_in_cache
-
-          }
-
-        end
-
-        # return test object(s)
-        multiple_objects ? child_objects : child_objects.first
-
-      rescue Exception => exception
-
-        if exception.kind_of?( MobyBase::MultipleTestObjectsIdentifiedError )
-
-          description = "Multiple child objects matched criteria."
-
-        elsif exception.kind_of?( MobyBase::TestObjectNotFoundError )
-
-          description = "The child object(s) could not be found."
-
-        elsif exception.kind_of?( MobyBase::TestObjectNotVisibleError )
-
-          description = "Parent test object no longer visible."
-
-        else
-
-          description = "Failed when trying to find child object(s)."
-
-        end
-
-        TDriver.logger.behaviour(
-
-          "%s;%s;%s;%s;%s" % [ "FAIL", description, identity, multiple_objects ? "children" : "child", creation_data.inspect ]
-
-        )
-
-        Kernel::raise exception
-
-      ensure
-
-        # restore logger state
-        MobyUtil::Logger.instance.pop_enabled
-
-      end
-
-    end
-=end
-
     # Creates a string identifying this test object: sut, type, attributes used when created
     #
     # === returns
     # String:: String identifying this test object
     def identity
 
-      #"%s;%s;%s" % [ @sut.id, @type, @creation_attributes.inspect ]
       "#{ @sut.id };#{ @type };#{ @creation_attributes.inspect }"
 
     end
@@ -1140,7 +767,7 @@ module MobyBehaviour
             # retrieve xml data, performs xpath to sut xml_data
             _xml_data = xml_data
 
-          rescue MobyBase::TestObjectNotFoundError		
+          rescue MobyBase::TestObjectNotFoundError    
 
             # attributes used to refresh parent application
             if @creation_attributes[ :type ] == 'application'
@@ -1174,9 +801,7 @@ module MobyBehaviour
           rescue MobyBase::AttributeNotFoundError
           
             Kernel::raise MobyBase::AttributeNotFoundError.new(
-            
               "Could not find attribute #{ name.inspect } for test object of type #{ @type.to_s }"
-              
             )
 
           end
@@ -1211,6 +836,8 @@ module MobyBehaviour
         # initialize cache object 
         @child_object_cache = TDriver::TestObjectCache.new
       
+        @parent_application = nil
+      
         # defaults
         @_application_id = nil
         @creation_attributes = nil
@@ -1246,7 +873,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 # TestObject