testability-driver 1.0.3 → 1.0.4

data/lib/tdriver/base/sut/generic/behaviours/application.rb

@@ -162,56 +162,66 @@ module MobyBehaviour
         end
 
         # Disable logging
-        MobyUtil::Logger.instance.enabled = false if ( original_logger_state = MobyUtil::Logger.instance.enabled )
+        $logger.enabled = false if ( original_logger_state = $logger.enabled )
 
         # verify close results
         begin
 
+          application_identification_hash = { :type => 'application', :id => @id }
+
           MobyUtil::Retryable.until(
-            :timeout => MobyUtil::Parameter[ self.sut.id ][ :application_synchronization_timeout, '60' ].to_f,
-            :interval => MobyUtil::Parameter[ self.sut.id ][ :application_synchronization_retry_interval, '0.25' ].to_f,
+            :timeout => $parameters[ self.sut.id ][ :application_synchronization_timeout, '60' ].to_f,
+            :interval => $parameters[ self.sut.id ][ :application_synchronization_retry_interval, '0.25' ].to_f,
             :exception => MobyBase::VerificationError,
             :unless => [MobyBase::TestObjectNotFoundError, MobyBase::ApplicationNotAvailableError] ) {
 
+            # raises MobyBase::ApplicationNotAvailableError if application was not found 
+            @sut.refresh( application_identification_hash, [{:className=>"application", :tasId => @id }] )
+
+            # retrieve application object from sut.xml_data
+            matches, unused_rule = TDriver::TestObjectAdapter.get_objects( @sut.xml_data, application_identification_hash, true )
+
             # check if the application is still found or not
-            if ( close_options[ :check_process ] == true and @sut.application( :id => self.uid, :__timeout => 0 ) )
+            if ( close_options[ :check_process ] == true ) 
 
               # the application did not close
-              raise MobyBase::VerificationError.new("Verification of close failed. The application that was to be closed is still running.")
-              
+              raise MobyBase::VerificationError.new, "Verification of close failed. The application that was to be closed is still running." if matches.count > 0
+
             elsif ( close_options[ :check_process ] == false )
 
-                if @sut.application( :__timeout => 0 ).uid == self.uid             
-                # the application was still in the foreground
-                raise MobyBase::VerificationError.new("Verification of close failed. The application that was to be closed was still in the foreground.")
+              if matches.count > 0 
+              
+                if TDriver::TestObjectAdapter.test_object_element_attribute( matches.first, 'id' ) == @id 
 
-              else
+                  # the application was still in the foreground
+                  raise MobyBase::VerificationError, "Verification of close failed. The application that was to be closed was still in the foreground."
 
-                # The foreground application was not the one being closed.
-                raise MobyBase::TestObjectNotFoundError.new( "The foreground application was not the one being closed (id: #{self.uid})." )
+                else
 
-              end 
+                  # The foreground application was not the one being closed.
+                  raise MobyBase::TestObjectNotFoundError, "The foreground application was not the one being closed (id: #{ @id })."
 
-            else
-            
-              # The application could not be found, break
-              break;
+                end 
+
+              end
 
             end
 
-          }
+            # The application could not be found, break
+            break
 
+          }
+          
         rescue MobyBase::TestObjectNotFoundError
 
           # everything ok: application not running anymore
 
-		rescue MobyBase::ApplicationNotAvailableError
+    		rescue MobyBase::ApplicationNotAvailableError
 
           # everything ok: application not running anymore
 
         rescue RuntimeError => e
         
-          
           unless ( e.message =~ /The application with Id \d+ is no longer available/ )
 
             # something unexpected happened during the close, let exception through
@@ -222,20 +232,21 @@ module MobyBehaviour
         ensure
 
           # restore original state
-          MobyUtil::Logger.instance.enabled = original_logger_state
+          $logger.enabled = original_logger_state
 
         end
 
       rescue Exception => exception
 
-        MobyUtil::Logger.instance.log "behaviour", "FAIL;Failed when closing.;#{ identity };close;"
+        $logger.log "behaviour", "FAIL;Failed when closing.;#{ identity };close;"
         Kernel::raise exception
 
       end
 
-      MobyUtil::Logger.instance.log "behaviour", "PASS;Closed successfully.;#{ identity };close;"
+      $logger.log "behaviour", "PASS;Closed successfully.;#{ identity };close;"
 
-      @sut.application
+      #@sut.application
+            
       nil
 
     end
@@ -317,8 +328,41 @@ module MobyBehaviour
 
     end
 
+	    
+	# == description
+	# Bring the application to foreground.\n
+	# \n
+	# [b]NOTE:[/b] Currently this works only for Symbian OS target!
+	# 
+	# == returns
+	# NilClass
+	#   description: -
+	#   example: -
+	#
+	#
+	def bring_to_foreground
+	  @sut.execute_command(MobyCommand::Application.new(:BringToForeground, nil, self.uid, self.sut))
+	end
+
+
+	# == description
+	# Kills the application process
+	# 
+	# == returns
+	# NilClass
+	#   description: -
+	#   example: -
+	#
+	def kill
+
+	  @sut.execute_command( MobyCommand::Application.new( :Kill, self.executable_name, self.uid, self.sut, nil ) )
+
+	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 # ApplicationBehaviour
 

data/lib/tdriver/base/sut/generic/behaviours/controller.rb

@@ -60,7 +60,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 # SutController 
 

data/lib/tdriver/base/sut/generic/behaviours/find.rb

@@ -69,7 +69,7 @@ module MobyBehaviour
 		# 
 		# == info
 		#  Same as calling child method.
-		def find ( attributes = {} )
+		def find( attributes = {} )
 
 			begin
 
@@ -83,19 +83,19 @@ module MobyBehaviour
 
 			rescue Exception => e
 
-				MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed to find test object.;#{id.to_s};sut;{};find;" << ( attributes.kind_of?( Hash ) ? attributes.inspect : attributes.class.to_s )
+				$logger.log "behaviour", "FAIL;Failed to find test object.;#{id.to_s};sut;{};find;" << ( attributes.kind_of?( Hash ) ? attributes.inspect : attributes.class.to_s )
 
 				Kernel::raise e
 
 			end
 
-			MobyUtil::Logger.instance.log "behaviour" , "PASS;Test object found.;#{id.to_s};sut;{};application;" << attributes.inspect 
+			$logger.log "behaviour", "PASS;Test object found.;#{id.to_s};sut;{};application;" << attributes.inspect 
 
 			search_result
 		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 # Find
 

data/lib/tdriver/base/sut/generic/behaviours/flash_behaviour.rb

@@ -214,7 +214,7 @@ module MobyBehaviour
       result = start_flashing( flash_command )
       
       Kernel::raise MobyBase::BehaviourError.new("flash_images", "Flashing failed") if result.to_s == 'false'
-
+      sleep parameter[:sleep_time_after_flash_command].to_i
     end
 
   private
@@ -270,7 +270,7 @@ module MobyBehaviour
         end
         flash_result=system(flash_command)
         if flash_result.to_s=='true'
-          current_flash_attempt==flash_attempts
+          current_flash_attempt=flash_attempts.to_i
         else
           flash_error_recovery
         end
@@ -329,7 +329,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
 

data/lib/tdriver/base/sut/generic/behaviours/sut.rb

@@ -137,8 +137,21 @@ module MobyBehaviour
     #  example: -
     def freeze
 
+=begin
+      if $parameters[ @id ][ :use_find_object, 'false' ] == 'true' && self.respond_to?( 'find_object' )
+
+        warn("warning: SUT##{ __method__ } is not supported when use_find_objects optimization is enabled")
+
+      else
+
+        @frozen = true
+
+      end
+=end
+
       @frozen = true
 
+
       nil
 
     end
@@ -152,24 +165,25 @@ module MobyBehaviour
     #  example: -
     def unfreeze
 
-      @frozen = false
+=begin
+      if $parameters[ @id ][ :use_find_object, 'false' ] == 'true' && self.respond_to?( 'find_object' )
 
-      nil
+        warn("warning: SUT##{ __method__ } is not supported when use_find_objects optimization is enabled")
 
-    end
+      else
+      
+        @frozen = false
 
-    # == nodoc
-    # function to get TestObject
-    # TODO: Still under construction. Should be able to create single descendant of the SUT
-    # Then is Should create path (parent-child-child-child...) until reaching the particular TestObject
-    # TODO: Document me when I'm ready
-    def get_object( object_id )
+      end
+=end
 
-      test_object = @test_object_factory.make( self, MobyBase::TestObjectIdentificator.new( object_id ) )
+      @frozen = false
+  
+      nil
 
     end
 
-    # == nodoc  
+    # == nodoc
     # == description
     # Force to use user defined ui state (e.g. for debugging purposes). Freezes the SUT xml_data, until unfreezed or set to nil. 
     #
@@ -201,16 +215,19 @@ module MobyBehaviour
 
         @xml_data = xml
         @frozen = true
+        @forced_xml = true
 
       elsif xml.kind_of?( String )
 
         @xml_data = MobyUtil::XML.parse_string( xml ).root
         @frozen = true
+        @forced_xml = true
 
       elsif xml.kind_of?( NilClass )
 
         @xml_data = nil
         @frozen = false
+        @forced_xml = false
 
       end
 
@@ -218,69 +235,6 @@ module MobyBehaviour
 
     end
 
-    # == nodoc
-    # Function asks for fresh xml ui data from the device and stores the result
-    # == returns
-    # MobyUtil::XML::Element:: xml document containing valid xml fragment describing the current state of the device
-    def refresh_ui_dump( refresh_args = {}, creation_attributes = [] )
-
-      current_time = Time.now
-
-      if !@frozen #&& ( @_previous_refresh.nil? || ( current_time - @_previous_refresh ).to_f > @refresh_interval )
-
-        MobyUtil::Retryable.while(
-          :tries => @refresh_tries,
-          :interval => @refresh_interval,
-          :unless => [ MobyBase::ControllerNotFoundError, MobyBase::CommandNotFoundError, MobyBase::ApplicationNotAvailableError ] 
-        ) {
-
-          #use find_object if set on and the method exists
-          if MobyUtil::Parameter[ @id ][ :use_find_object, 'false' ] == 'true' and self.respond_to?('find_object') # self.methods.include?('find_object')
-
-            new_xml_data, crc = find_object( refresh_args.clone, creation_attributes )
-
-          else
-
-            app_command = MobyCommand::Application.new( 
-              :State, 
-              refresh_args[ :FullName ] || refresh_args[ :name ],
-              refresh_args[ :id ], 
-              self 
-            ) 
-
-            #store in case needed
-            app_command.refresh_args( refresh_args )
-
-            new_xml_data, crc = execute_command( app_command )
-
-          end  
-
-          # remove timestamp from the beginning of tasMessage, parse if not same as previous ui state
-          #if ( xml_data_no_timestamp = new_xml_data.split( ">", 2 ).last ) != @last_xml_data
-
-            @xml_data, @childs_updated = MobyUtil::XML.parse_string( new_xml_data ).root, false
-
-            #@last_xml_data = xml_data_no_timestamp
-
-          #end
-
-          #if ( @xml_data_crc == 0 || crc != @xml_data_crc || crc.nil? )          
-          # @xml_data, @xml_data_crc, @childs_updated = MobyUtil::XML.parse_string( new_xml_data ).root, crc, false
-          #end
-
-          @dump_count += 1
-
-          @_previous_refresh = current_time
-
-        } 
-
-      end
-
-      @xml_data = fetch_references( @xml_data )
-
-      @xml_data
-      
-    end
 
     # TODO: merge TestObject#child and SUT#child 
     # == description
@@ -307,7 +261,7 @@ module MobyBehaviour
       #
       #  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)" )
             
@@ -326,7 +280,7 @@ module MobyBehaviour
       ) if identification_directives.has_key?( :__logging )
 
       # disable logging if requested, remove pair from creation_hash
-      MobyUtil::Logger.instance.push_enabled( identification_directives[ :__logging ] || TDriver.logger.enabled )
+      $logger.push_enabled( identification_directives[ :__logging ] || TDriver.logger.enabled )
 
       begin
 
@@ -335,7 +289,7 @@ module MobyBehaviour
 
           # current object as parent, can be either TestObject or SUT
           :parent => self,
- 
+  
           # test object identification hash
           :object_attributes_hash => creation_hash,
           
@@ -345,26 +299,26 @@ module MobyBehaviour
 
       rescue MobyBase::MultipleTestObjectsIdentifiedError => exception
 
-        MobyUtil::Logger.instance.log "behaviour", "FAIL;Multiple child objects matched criteria.;#{ id };sut;{};child;#{ attributes.inspect }"
+        TDriver.logger.behaviour "FAIL;Multiple child objects matched criteria.;#{ id };sut;{};child;#{ attributes.inspect }"
 
         Kernel::raise exception
 
       rescue MobyBase::TestObjectNotFoundError => exception
 
-        MobyUtil::Logger.instance.log "behaviour", "FAIL;The child object could not be found.;#{ id };sut;{};child;#{ attributes.inspect }"
+        TDriver.logger.behaviour "FAIL;The child object could not be found.;#{ id };sut;{};child;#{ attributes.inspect }"
 
         Kernel::raise exception
 
       rescue Exception => exception
 
-        MobyUtil::Logger.instance.log "behaviour", "FAIL;Failed when trying to find child object.;#{ id };sut;{};child;#{ attributes.inspect }"
+        TDriver.logger.behaviour "FAIL;Failed when trying to find child object.;#{ id };sut;{};child;#{ attributes.inspect }"
 
         Kernel::raise exception
 
       ensure
 
         # restore original logger state
-        MobyUtil::Logger.instance.pop_enabled
+        $logger.pop_enabled
 
       end
 
@@ -386,16 +340,11 @@ module MobyBehaviour
     def state
 
       # refresh if xml data is empty
-      self.refresh({},{}) if @xml_data.empty?
+      self.refresh if @xml_data.empty?
 
-      Kernel::raise RuntimeError.new( "Can not create state object of SUT with id '%s', no XML content or SUT not initialized properly." % @id ) if @xml_data.empty?
+      Kernel::raise RuntimeError, "Can not create state object of SUT with id #{ @id.inspect }, no XML content or SUT not initialized properly." if @xml_data.empty?
 
-      MobyBase::StateObject.new(
-        MobyUtil::XML.parse_string( 
-          "<sut name='sut' type='sut' id='%s'><objects>%s</objects></sut>" % [ @id, xml_data.xpath("tasInfo/object").collect{ | element | element.to_s }.join ]
-        ).root, 
-        self 
-      )
+      MobyBase::StateObject.new( TDriver::TestObjectAdapter.state_object_xml( @xml_data, @id ), self )
 
     end
 
@@ -420,27 +369,37 @@ module MobyBehaviour
     def application( attributes = {} )
 
       begin
-
+      
         attributes.check_type( Hash, "Wrong argument type $1 for attributes (expected $2)" )
 
-        get_default_app = attributes.empty?
-
         attributes[ :type ] = 'application'
 
-        @current_application_id = nil if attributes[ :id ].nil?
+        attributes[ :__parent_application ] = nil
 
-        app_child = child( attributes )
+        @current_application_id = nil if attributes[ :id ].nil?
 
-      rescue Exception => e
+        # create test object and return it as result 
+        test_object = child( attributes )
 
-        MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed to find application.;#{id.to_s};sut;{};application;" << (attributes.kind_of?(Hash) ? attributes.inspect : attributes.class.to_s)
-        Kernel::raise e
+        # store parent application to test object
+        test_object.instance_variable_set( :@parent_application, test_object )
 
-      end
+        test_object
+        
+      rescue
+      
+        TDriver.logger.behaviour(
+          "FAIL;Failed to find application.;#{ id.to_s };sut;{};application;#{ attributes.kind_of?( Hash ) ? attributes.inspect : attributes.class.to_s }"
+        )
 
-      MobyUtil::Logger.instance.log "behaviour" , "PASS;Application found.;#{id.to_s};sut;{};application;" << attributes.inspect
+        # raise same exception
+        Kernel::raise $!
 
-      app_child
+      ensure
+      
+        TDriver.logger.behaviour "PASS;Application found.;#{ id.to_s };sut;{};application;#{ attributes.inspect }" if $!.nil?
+      
+      end
 
     end
 
@@ -509,15 +468,15 @@ module MobyBehaviour
 
         }
 
-      rescue Exception => e
+      rescue 
 
-        MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed to capture screen.;#{id.to_s};sut;{};capture_screen;" << ( arguments.kind_of?( Hash ) ? arguments.inspect : arguments.class.to_s )
+        TDriver.logger.behaviour "FAIL;Failed to capture screen.;#{ id.to_s };sut;{};capture_screen;#{ arguments.kind_of?( Hash ) ? arguments.inspect : arguments.class.to_s }"
 
-        Kernel::raise e
+        Kernel::raise $!
 
       end
 
-      MobyUtil::Logger.instance.log "behaviour" , "PASS;Screen was captured successfully.;#{id.to_s};sut;{};capture_screen;" << arguments.inspect
+      TDriver.logger.behaviour "PASS;Screen was captured successfully.;#{ id.to_s };sut;{};capture_screen;#{ arguments.inspect }"
 
       nil
 
@@ -540,7 +499,13 @@ module MobyBehaviour
     #  |Key|Type|Description|Example|
     #  |:uid|String or Integer|Unique ID of the application|{ :uid => 268458181 }|
     #  |:name|String|Executable name of the application|{ :name => 'calculator' }|
-    #  |:arguments|String|Comma separated list of arguments passed to application when starting|{ :arguments => '--nogui,-v' }|
+    #  |:arguments|String|Comma separated list of arguments passed to the application when it is started|{ :arguments => '--nogui,-v' }|
+    #	|:sleep_time|Integer|Number of seconds to sleep immediately after launching the process|{ :sleep_time => 10 }|
+    #	|:start_command|String|When set, the run method will execute this command and expect the application provided by the :name key to be launched eventually. Note that applications launched this way can't be sent a Kill message and its start up events and signals may not be recorded.|{ :start_command => 'start_app.bat',:name => 'calculator' }|
+    #	|:try_attach|Boolean|If set to true, run will attempt to attach to an existing application with the given name or id. If not found the application will be launched as normal. If more than 1 are found then an exception is thrown|{:try_attach => true,:name => 'calculator'}|
+    #	|:environment|String|Environment variables you want to pass to started process, passed as key value pairs separated by '=' and pairs separated by spaces |{ :environment => 'LC_ALL=en SPECIAL_VAR=value' }|
+    #	|:events_to_listen|String|List of events you want to start listening to when application starts, passed as comma separated string.  You can retrieve a list of events fired by a test object by first enabling event listening and then using the get_events method. See methods enable_events, get_events and disable_events |{ :events_to_listen => 'Paint,Show' }|
+    #	|:signals_to_listen|String|List of signals you want to start listening to when application starts, passed as comma separated string. Check your application class what signals it can emit, or you can use the 'signal' fixture's 'list_signal' method to retrieve an xml string listing all the signals the object can emit.  E.g. xml = @object.fixture('signal', 'list_signals')|{ :signals_to_listen => 'applicationReady()' }|	
     #
     # == returns
     # TestObject
@@ -562,8 +527,8 @@ module MobyBehaviour
       begin
 
         # set the refresh interval to zero while the application is launched
-        #orig_interval = MobyUtil::Parameter[ @id ][ :refresh_interval ]
-        #MobyUtil::Parameter[ @id ][ :refresh_interval ] = '0'
+        #orig_interval = $parameters[ @id ][ :refresh_interval ]
+        #$parameters[ @id ][ :refresh_interval ] = '0'
 
         # raise exception if argument type other than hash
         target.check_type( Hash, "Wrong argument type $1 for run method (expected $2)" )
@@ -576,7 +541,7 @@ module MobyBehaviour
 
         sleep_time = target[ :sleep_after_launch ].to_i
 
-        Kernel::raise ArgumentError.new( "Sleep time need to be >= 0" ) unless sleep_time >= 0
+        Kernel::raise ArgumentError, "Sleep time need to be >= 0" unless sleep_time >= 0
 
         # try to find an existing app with the current arguments
         if target[ :try_attach ]
@@ -589,6 +554,7 @@ module MobyBehaviour
 
           app_info = find_app(app_list, {:id => target[ :uid ]}) if target[ :uid ] != nil
           app_info = find_app(app_list, {:name => target[ :name ]}) unless app_info
+
           app = self.application(:id => app_info.id) if app_info
 
           if app
@@ -599,7 +565,7 @@ module MobyBehaviour
 
             rescue Exception => e
 
-              MobyUtil::Logger.instance.log "WARNING", "Could not bring app to foreground"
+              TDriver.logger.warning "Could not bring app to foreground"
 
             end
 
@@ -678,32 +644,65 @@ module MobyBehaviour
 
         begin
 
+          # verify that application is launched and application test object is found from xml
           self.wait_child(
+
+            # attributes to identify application object
             expected_attributes,
-            MobyUtil::Parameter[ @id ][ :application_synchronization_timeout, '5' ].to_f,
-            MobyUtil::Parameter[ @id ][ :application_synchronization_retry_interval, '0.5' ].to_f
+
+            # timeout to for application synchronization
+            $parameters[ @id ][ :application_synchronization_timeout, '5' ].to_f,
+
+            # wait retry interval and try again if application was not found
+            $parameters[ @id ][ :application_synchronization_retry_interval, '0.5' ].to_f
+
           )
 
-        rescue MobyBase::SyncTimeoutError
+          # retrieve application object element from sut.xml_data
+          matches, unused_rule = TDriver::TestObjectAdapter.get_objects( xml_data, expected_attributes, true )
 
-          Kernel::raise MobyBase::VerificationError.new("The application (#{ error_details }) was not found on the sut after being launched.")
+          # raise exception if application element was not found; this shouldn't ever happen?
+          #raise MobyBase::TestObjectNotFoundError if matches.count == 0
 
-        end
+          # create application test object
+          foreground_app = @test_object_factory.make_test_object( 
+        
+            :parent => self,
+            
+            :parent_application => nil,
+            
+            :object_attributes_hash => expected_attributes,
+            
+            :xml_object => matches.first
         
-        # verify run results
-        foreground_app = self.application( expected_attributes )
+          )
+
+          # store application reference to test application; this will be passed to it's child test object(s)
+          foreground_app.instance_variable_set( :@parent_application, foreground_app )
 
-        Kernel::raise MobyBase::VerificationError.new("No application type test object was found on the device after starting the application.") unless foreground_app.kind_of?( MobyBehaviour::Application )
+          # application was not found; this scenario shouldn't ever happen?
+          #raise MobyBase::TestObjectNotFoundError unless foreground_app.kind_of?( MobyBehaviour::Application )
 
-      rescue Exception => e
+        rescue MobyBase::TestObjectNotFoundError
 
-        MobyUtil::Logger.instance.log "behaviour", "FAIL;Failed to launch application.;#{id.to_s};sut;{};run;" << ( target.kind_of?( Hash ) ? target.inspect : target.class.to_s )
+          Kernel::raise MobyBase::VerificationError, "No application type test object was found on the device after starting the application."
+
+        rescue MobyBase::SyncTimeoutError
+
+          Kernel::raise MobyBase::VerificationError, "The application (#{ error_details }) was not found on the sut after being launched."
+
+        end
+
+      # raise behaviour error if any exception is raised
+      rescue # Exception => e
+
+        TDriver.logger.behaviour "FAIL;Failed to launch application.;#{ id.to_s };sut;{};run;#{ target.kind_of?( Hash ) ? target.inspect : target.class.to_s }"
 
         Kernel::raise MobyBase::BehaviourError.new("Run", "Failed to launch application")
 
       end
 
-      MobyUtil::Logger.instance.log "behaviour" , "PASS;The application was launched successfully.;#{id.to_s};sut;{};run;" << target.inspect
+      TDriver.logger.behaviour "PASS;The application was launched successfully.;#{ id.to_s };sut;{};run;#{ target.inspect }"
 
       foreground_app
 
@@ -763,14 +762,15 @@ module MobyBehaviour
 
         execute_command( sequence )
 
-      rescue Exception => e
+      rescue 
+
+        TDriver.logger.behaviour "FAIL;Failed to press key(s).;#{id.to_s};sut;{};press_key;#{ value }"
 
-        MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed to press key(s).;#{id.to_s};sut;{};press_key;#{ value }"
-        Kernel::raise e
+        Kernel::raise $!
 
       end
 
-      MobyUtil::Logger.instance.log "behaviour" , "PASS;Successfully pressed key(s).;#{id.to_s};sut;{};press_key;#{ value }"
+      TDriver.logger.behaviour "PASS;Successfully pressed key(s).;#{ id.to_s };sut;{};press_key;#{ value }"
 
       nil
 
@@ -782,7 +782,7 @@ module MobyBehaviour
     #
     # == arguments
     # *arguments
-    #   String
+    #  String
     #   description: Optional argument which is the name of parameter.
     #   example: 'new_parameter'
     #  Symbol
@@ -812,13 +812,13 @@ module MobyBehaviour
 
       if ( arguments.count == 0 )
 
-        MobyUtil::ParameterUserAPI.instance[ @id ]
+        MobyUtil::ParameterUserAPI[ @id ]
 
       else
 
         #$stderr.puts "%s:%s warning: deprecated method usage convention, please use sut#parameter[] instead of sut#parameter()" % ( caller.first || "%s:%s" % [ __FILE__, __LINE__ ] ).split(":")[ 0..1 ]
 
-        MobyUtil::ParameterUserAPI.instance[ @id ][ *arguments ]
+        MobyUtil::ParameterUserAPI[ @id ][ *arguments ]
 
       end
 
@@ -885,62 +885,144 @@ module MobyBehaviour
   #  description: In case there are problems with the database connectivity
   #
   def translate( logical_name, file_name = nil, plurality = nil, numerus = nil, lengthvariant = nil )
-    Kernel::raise LogicalNameNotFoundError.new("Logical name is nil") if logical_name.nil?
+
+    Kernel::raise LogicalNameNotFoundError, "Logical name is nil" if logical_name.nil?
+
     translation_type = "localisation"
     
     # Check for User Information prefix( "uif_...")
-    MobyUtil::Parameter[ :user_data_logical_string_identifier, 'uif_' ].split('|').each do |identifier|
+    $parameters[ :user_data_logical_string_identifier, 'uif_' ].split('|').each do |identifier|
+
       if logical_name.to_s.index(identifier)==0
+
         translation_type="user_data"
+
       end
+
     end
     
     # Check for Operator Data prefix( "operator_...")
-    MobyUtil::Parameter[ :operator_data_logical_string_identifier, 'operator_' ].split('|').each do |identifier|
+    $parameters[ :operator_data_logical_string_identifier, 'operator_' ].split('|').each do |identifier|
+
       if logical_name.to_s.index(identifier)==0
+
         translation_type="operator_data"
+
       end
+
     end
     
     case translation_type
+
       when "user_data"
+
         get_user_information( logical_name )
     
       when "operator_data"
+
         get_operator_data( logical_name )
     
       when "localisation"
+
         language=nil
-        if ( MobyUtil::Parameter[ self.id ][:read_lang_from_app]=='true')
+        
+        if ( $parameters[ self.id ][:read_lang_from_app]=='true')
+
           #read localeName app
           language=self.application.attribute("localeName")
+
           #determine the language from the locale
           language=language.split('_')[0].to_s if (language!=nil && !language.empty?)
+
         else
-          language=MobyUtil::Parameter[ self.id ][ :language ]
+
+          language=$parameters[ self.id ][ :language ]
+
         end
-        Kernel::raise LanguageNotFoundError.new("Language cannot be determind to perform translation") if (language==nil || language.empty?)
-        translation = MobyUtil::Localisation.translation( logical_name, language,
-        MobyUtil::Parameter[ self.id ][ :localisation_server_database_tablename ], file_name, plurality, lengthvariant )        
+        
+        Kernel::raise LanguageNotFoundError, "Language cannot be determind to perform translation" if ( language.nil? || language.empty? )
+
+        translation = MobyUtil::Localisation.translation( 
+          logical_name, 
+          language,
+          $parameters[ self.id ][ :localisation_server_database_tablename ], 
+          file_name, 
+          plurality, 
+          lengthvariant 
+        )        
+
         if translation.kind_of? String and !numerus.nil?
+
           if numerus.kind_of? Array
+
             translation.gsub!(/%[L]?(\d)/){|s| numerus[($1.to_i) -1] }
+
           elsif numerus.kind_of? String or numerus.kind_of? Integer
+
             translation.gsub!(/%(Ln|1)/){|s| numerus.to_s} 
+
           end
+
         elsif translation.kind_of? Array and !numerus.nil?
+
           translation.each do |trans|
+
             if numerus.kind_of? Array
+
               trans.gsub!(/%[L]?(\d)/){|s| numerus[($1.to_i) -1] }
+
             elsif numerus.kind_of? String or numerus.kind_of? Integer
+
               trans.gsub!(/%(Ln|1)/){|s| numerus.to_s} 
+
             end
+
           end
+
         end
+
         translation
+
     end
+
   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_values!( 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 ] = translate( _value, file_name, plurality, numerus, lengthvariant ) if _value.kind_of?( Symbol )  
+
+    end unless hash.nil?
+
+  end
+    
   # == description
   # Wrapper function to retrieve user information for this SUT from the user information database.
   #
@@ -972,9 +1054,19 @@ module MobyBehaviour
   #  description: In case there are problems with the database connectivity
   #
   def get_user_information( user_data_lname )
-    language = MobyUtil::Parameter[ self.id ][ :language ]
-    table_name = MobyUtil::Parameter[ self.id ][ :user_data_server_database_tablename ] 
-    MobyUtil::UserData.retrieve( user_data_lname, language, table_name )
+
+    MobyUtil::UserData.retrieve( 
+      
+      user_data_lname, 
+      
+      # language
+      $parameters[ self.id ][ :language ],
+        
+      # table name
+      $parameters[ self.id ][ :user_data_server_database_tablename ] 
+      
+    )
+
   end
   
   # == description
@@ -1005,9 +1097,19 @@ module MobyBehaviour
   #  description: In case there are problems with the database connectivity
   #
   def get_operator_data( operator_data_lname )
-    operator = MobyUtil::Parameter[ self.id ][ :operator_selected ]
-    table_name = MobyUtil::Parameter[ self.id ][ :operator_data_server_database_tablename]
-    MobyUtil::OperatorData.retrieve( operator_data_lname, operator, table_name )
+
+    MobyUtil::OperatorData.retrieve( 
+
+      operator_data_lname, 
+
+      # operator 
+      $parameters[ self.id ][ :operator_selected ],
+
+      # table name 
+      $parameters[ self.id ][ :operator_data_server_database_tablename ]
+      
+    )
+
   end
 
     # == nodoc
@@ -1025,7 +1127,9 @@ module MobyBehaviour
 
         @child_object_cache.each_object{ | test_object | 
 
-          test_object.update( @xml_data ) 
+          test_object.send( :update, @xml_data )
+
+          #test_object.update( @xml_data ) 
 
         }
 
@@ -1036,12 +1140,12 @@ module MobyBehaviour
     end
     
     # == nodoc
-    def refresh( refresh_args = {}, creation_attributes = {})
-      
-      refresh_ui_dump refresh_args, creation_attributes
+    def refresh( refresh_args = {}, creation_attributes = {} )
+            
+      refresh_ui_dump( refresh_args, creation_attributes )
 
       # update childs only if ui state is new
-      update if !@childs_updated
+      update_childs
 
     end
 
@@ -1103,33 +1207,102 @@ module MobyBehaviour
 
     # == nodoc
     def get_application_id
+     
+      # retrieve application object from sut.xml_data
+      matches, unused_rule = TDriver::TestObjectAdapter.get_objects( xml_data, { :type => 'application' }, true )
+
+      # retrieve id attribute if application test object found      
+      if matches.count > 0
+
+        # return id attribute value
+        TDriver::TestObjectAdapter.test_object_element_attribute( matches.first, 'id' )
+      
+      else
       
-      orig_frozen = @frozen;
+        # application not found
+        '-1'
+      
+      end
 
-      begin
+    end
 
-        freeze unless @frozen
+  private
 
-        ret = self.application.id
+    # TODO: document me
+    def update_childs
+        
+      # update childs only if ui state is new
+      update if !@childs_updated
+    
+    end
+  
+    # == nodoc
+    # Function asks for fresh xml ui data from the device and stores the result
+    # == returns
+    # MobyUtil::XML::Element:: xml document containing valid xml fragment describing the current state of the device
+    def refresh_ui_dump( refresh_args = {}, creation_attributes = [] )
 
-        unfreeze unless orig_frozen
+      current_time = Time.now
+
+      if !@frozen #&& ( @_previous_refresh.nil? || ( current_time - @_previous_refresh ).to_f >= @refresh_interval )
+
+        use_find_objects = $parameters[ @id ][ :use_find_object, 'false' ] == 'true' and self.respond_to?( 'find_object' )
         
-        return ret
+        refresh_arguments = refresh_args.clone
 
-      rescue
+        MobyUtil::Retryable.while(
+          :tries => @refresh_tries,
+          :interval => @refresh_interval,
+          :unless => [ MobyBase::ControllerNotFoundError, MobyBase::CommandNotFoundError, MobyBase::ApplicationNotAvailableError ] 
+        ) {
 
-      ensure
+          #use find_object if set on and the method exists
+          if use_find_objects
 
-        unfreeze unless orig_frozen
+            new_xml_data, crc = find_object( refresh_arguments, creation_attributes )
+
+          else
+
+            app_command = MobyCommand::Application.new( 
+              :State, 
+              refresh_args[ :FullName ] || refresh_args[ :name ],
+              refresh_args[ :id ], 
+              self 
+            ) 
+
+            # store in case needed
+            app_command.refresh_args( refresh_args )
+
+            new_xml_data, crc = execute_command( app_command )
+
+          end  
+
+          @dump_count += 1
+
+          @childs_updated = false
+          
+          @xml_data = MobyUtil::XML.parse_string( new_xml_data ).root
+
+          @_previous_refresh = Time.now
+
+          # remove timestamp from the beginning of tasMessage, parse if not same as previous ui state
+          #if ( xml_data_no_timestamp = new_xml_data.split( ">", 2 ).last ) != @last_xml_data          
+          # @xml_data = MobyUtil::XML.parse_string( new_xml_data ).root
+          # @last_xml_data = xml_data_no_timestamp
+          #end
+
+          #if ( @xml_data_crc == 0 || crc != @xml_data_crc || crc.nil? )          
+          # @xml_data, @xml_data_crc, @childs_updated = MobyUtil::XML.parse_string( new_xml_data ).root, crc, false
+          #end
+
+        } 
 
       end
-      
-      '-1'
 
+      fetch_references( @xml_data )
+      
     end
 
-  private
-
     # TODO: document me
     def fetch_references( xml )
 
@@ -1289,19 +1462,19 @@ module MobyBehaviour
       @childs_updated = false
 
       # id not found from parameters
-      if MobyUtil::Parameter[ @id, nil ] != nil
+      if $parameters[ @id, nil ] != nil
 
-        @input = MobyUtil::Parameter[ @id ][ :input_type, "key" ].to_sym
+        @input = $parameters[ @id ][ :input_type, "key" ].to_sym
 
-        @refresh_tries = MobyUtil::Parameter[ @id ][ :ui_state_refresh_tries, @refresh_tries ].to_f
+        @refresh_tries = $parameters[ @id ][ :ui_state_refresh_tries, @refresh_tries ].to_f
 
-        @refresh_interval = MobyUtil::Parameter[ @id ][ :refresh_interval, @refresh_interval ].to_f
+        @refresh_interval = $parameters[ @id ][ :refresh_interval, @refresh_interval ].to_f
 
       end
     
       @last_xml_data = nil
     
-      ruby_file = MobyUtil::Parameter[ @id ][ :verify_blocks ] 
+      ruby_file = $parameters[ @id ][ :verify_blocks ] 
 
       @verify_blocks = []
 
@@ -1322,6 +1495,18 @@ module MobyBehaviour
 
   public # deprecated
 
+    # == nodoc
+    # function to get TestObject
+    # TODO: Still under construction. Should be able to create single descendant of the SUT
+    # Then is Should create path (parent-child-child-child...) until reaching the particular TestObject
+    # TODO: Document me when I'm ready
+    def get_object( object_id )
+
+      warn("deprecated: use SUT#child instead of SUT#get_object in order to retrieve child test objects")
+
+      child( object_id )
+
+    end
     
     # == nodoc
     #TODO: Update documentation
@@ -1341,7 +1526,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 # SUT