testability-driver-qt-sut-plugin 1.0.3 → 1.0.4

data/lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/os.rb

@@ -62,10 +62,10 @@ module MobyBehaviour
       # @sut.execute_command(command)
       # self.force_refresh
       # rescue Exception => e
-      # MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed open_file with path \"#{path}\", dialog_name \"#{dialog_name}\", button \"#{button.to_s}\".;#{identity};open_file;"
+      # $logger.log "behaviour" , "FAIL;Failed open_file with path \"#{path}\", dialog_name \"#{dialog_name}\", button \"#{button.to_s}\".;#{identity};open_file;"
       # Kernel::raise e
       # end
-      # MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation file executed successfully with path \"#{path}\", dialog_name \"#{dialog_name}\", button \"#{button.to_s}\".;#{identity};open_file;"
+      # $logger.log "behaviour" , "PASS;Operation file executed successfully with path \"#{path}\", dialog_name \"#{dialog_name}\", button \"#{button.to_s}\".;#{identity};open_file;"
       # nil
       # end			
 			# Press Enter on the keyboard. Useful to accept crash warnings on windows
@@ -85,15 +85,15 @@ module MobyBehaviour
 				  end
 				  self.execute_command( MobyCommand::WidgetCommand.new( nil, nil, nil, 'PressEnter', params, nil, 'uiCommand') )
 				rescue Exception => e
-					MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed to send an Enter keystroke request to the qttas server;press_enter;"
+					$logger.log "behaviour" , "FAIL;Failed to send an Enter keystroke request to the qttas server;press_enter;"
 					Kernel::raise e
 				end
-					MobyUtil::Logger.instance.log "behaviour" , "PASS;Successfuly sent an Enter keystroke request to the qttas server;press_enter;"
+					$logger.log "behaviour" , "PASS;Successfuly sent an Enter keystroke request to the qttas server;press_enter;"
 				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
 	end

data/lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/qt_api_method.rb

@@ -42,7 +42,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
 
@@ -127,7 +127,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
 
@@ -139,7 +139,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/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/record.rb

@@ -62,12 +62,12 @@ module MobyBehaviour
 
 				rescue Exception => e
 
-					MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed start_recording.;#{ identity };start_recording;"
+					$logger.log "behaviour" , "FAIL;Failed start_recording.;#{ identity };start_recording;"
 					Kernel::raise e
 
 				end
 
-				MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation start_recording executed successfully.;#{ identity };start_recording;"
+				$logger.log "behaviour" , "PASS;Operation start_recording executed successfully.;#{ identity };start_recording;"
 
 				nil
 			end
@@ -88,12 +88,12 @@ module MobyBehaviour
 
 				rescue Exception => e
 
-					MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed stop_recording.;#{ identity };stop_recording;"
+					$logger.log "behaviour" , "FAIL;Failed stop_recording.;#{ identity };stop_recording;"
 					Kernel::raise e
 
 				end
 
-				MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation stop_recording executed successfully.;#{ identity };stop_recording;"
+				$logger.log "behaviour" , "PASS;Operation stop_recording executed successfully.;#{ identity };stop_recording;"
 
 				nil
 
@@ -113,19 +113,19 @@ module MobyBehaviour
 
 				rescue Exception => e
 
-					MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed print_recordings.;#{ identity };print_recordings;"
+					$logger.log "behaviour" , "FAIL;Failed print_recordings.;#{ identity };print_recordings;"
 					Kernel::raise e
 
 				end
 
-				MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation print_recordings executed successfully.;#{ identity };print_recordings;"
+				$logger.log "behaviour" , "PASS;Operation print_recordings executed successfully.;#{ identity };print_recordings;"
 
 				return ret
 
 			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 # Record
 

data/lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/screen_capture.rb

@@ -112,16 +112,16 @@ module MobyBehaviour
 
 				rescue Exception => e
 
-					#MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed capture_screen with format \"#{format}\", file_name \"#{file_name}\".;#{ identity };capture_screen;"
+					#$logger.log "behaviour" , "FAIL;Failed capture_screen with format \"#{format}\", file_name \"#{file_name}\".;#{ identity };capture_screen;"
 
-					MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed capture_screen with format \"%s\", file_name \"%s\".;%s;capture_screen;" % [ format, file_name, identity ]
+					$logger.log "behaviour" , "FAIL;Failed capture_screen with format \"%s\", file_name \"%s\".;%s;capture_screen;" % [ format, file_name, identity ]
 
 					Kernel::raise e
 
 				end
 
-				#MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation capture_screen executed successfully with format \"#{format}\", file_name \"#{file_name}\".;#{ identity };capture_screen;"
-				MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation capture_screen executed successfully with format \"%s\", file_name \"%s\".;%s;capture_screen;" % [ format, file_name, identity ]
+				#$logger.log "behaviour" , "PASS;Operation capture_screen executed successfully with format \"#{format}\", file_name \"#{file_name}\".;#{ identity };capture_screen;"
+				$logger.log "behaviour" , "PASS;Operation capture_screen executed successfully with format \"%s\", file_name \"%s\".;%s;capture_screen;" % [ format, file_name, identity ]
 
 				image_binary
 
@@ -205,14 +205,14 @@ module MobyBehaviour
 
 				rescue Exception => e
 
-					MobyUtil::Logger.instance.log "behaviour", 
+					$logger.log "behaviour", 
 						"FAIL;Failed when searching for image on the screen.;#{ identity };find_on_screen;#{(image_or_path.respond_to?(:filename) ? image_or_path.filename : image_or_path.to_s)},#{tolerance.to_s}"  
 
 					Kernel::raise e
 
 				end
 
-				MobyUtil::Logger.instance.log "behaviour", 
+				$logger.log "behaviour", 
 					"PASS;Image search completed successfully.;#{ identity };find_on_screen;#{(image_or_path.respond_to?(:filename) ? image_or_path.filename : image_or_path.to_s)},#{tolerance.to_s}"
 
 				result
@@ -258,7 +258,7 @@ module MobyBehaviour
 					result = !find_on_screen(image_or_path, tolerance).nil?
 				rescue Exception => exc
 
-					MobyUtil::Logger.instance.log "behaviour", 
+					$logger.log "behaviour", 
 						"FAIL;Failed when searching for image on the screen.;#{ identity };screen_contains?;#{(image_or_path.respond_to?(:filename) ? image_or_path.filename : image_or_path.to_s)},#{tolerance.to_s}"
 
 					Kernel::raise exc
@@ -266,7 +266,7 @@ module MobyBehaviour
 
 				end      
 
-				MobyUtil::Logger.instance.log "behaviour", 
+				$logger.log "behaviour", 
 					"PASS;Image search completed successfully.;#{ identity };screen_contains?;#{(image_or_path.respond_to?(:filename) ? image_or_path.filename : image_or_path.to_s)},#{tolerance.to_s}"
 
 				result
@@ -274,7 +274,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/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/sut.rb

@@ -83,11 +83,11 @@ module MobyBehaviour
         begin
           # execute the application control service request
           apps = execute_command( MobyCommand::Application.new( :ListApps ) )
-          MobyUtil::Logger.instance.log "behaviour", "PASS;Successfully listed applications.;#{ id };sut;{};list_apps;"
+          $logger.log "behaviour", "PASS;Successfully listed applications.;#{ id };sut;{};list_apps;"
 
         rescue Exception => e
 
-          MobyUtil::Logger.instance.log "behaviour", "FAIL;Failed to list applications.;#{ id };sut;{};list_apps;"
+          $logger.log "behaviour", "FAIL;Failed to list applications.;#{ id };sut;{};list_apps;"
           Kernel::raise RuntimeError.new( "Unable to list applications: Exception: #{ e.message } (#{ e.class })" )
 
         end
@@ -142,9 +142,9 @@ module MobyBehaviour
         begin
           # execute the application control service request
           apps = execute_command( MobyCommand::Application.new( :ListCrashedApps ) )
-          MobyUtil::Logger.instance.log "behaviour", "PASS;Successfully listed crashed applications.;#{ id };sut;{};list_crashed_apps;"
+          $logger.log "behaviour", "PASS;Successfully listed crashed applications.;#{ id };sut;{};list_crashed_apps;"
         rescue Exception => e
-          MobyUtil::Logger.instance.log "behaviour", "FAIL;Failed to list crashed applications.;#{ id };sut;{};list_crashed_apps;"
+          $logger.log "behaviour", "FAIL;Failed to list crashed applications.;#{ id };sut;{};list_crashed_apps;"
           Kernel::raise RuntimeError.new( "Unable to list crashed applications: Exception: #{ e.message } (#{ e.class })" )
         end
 
@@ -264,12 +264,13 @@ module MobyBehaviour
         if param[:kill].nil?
           xml = Nokogiri::XML(xml_source)
           data = {}
-          xml.xpath("//object[@type = 'Response']/attributes/attribute").each { |attr|
-          data[attr[:name]] = attr.children[0].content
-          }
-          return data
-        else
-          # Killed processes have no relevant data.
+		  object_xml_data, unused_rule = TDriver::TestObjectAdapter.get_objects( xml, { :type => 'Response'}, true )
+		  object_xml_data.collect{ |element|
+			data.merge!(TDriver::TestObjectAdapter.test_object_attributes(element))
+		  }
+		  return data
+		else
+		  # Killed processes have no relevant data.
           data = {
           :status => "KILLED",
           :output => xml_source
@@ -277,6 +278,53 @@ module MobyBehaviour
         end
       end
 
+
+  # == description
+  # launches application in symbian device based on UID and return launched application if succesfull.
+  #
+  # == arguments
+  # hash_application
+  #  Hash
+  #   description: Hash defining required expected attributes of the application
+  #   example: { :UID => '' }
+  #
+  # == returns
+  # MobyBase::Application
+  #  description: launched application that matched the uid
+  #  example: -
+  #
+  # == exceptions
+  # TypeError
+  #  description: Wrong argument type %s for attributes (expected Hash)
+  #
+  def launch_with_uid( hash_uid = {} )
+
+    begin
+
+      raise TypeError.new( "Input parameter not of Type: Hash.\nIt is: #{ hash_uid.class }" ) unless hash_uid.kind_of?( Hash )
+      the_uid =  "failed with uid:" + hash_uid[:UID].to_s
+      fullname = @sut.fixture("launch","launch_with_uid",hash_uid)
+      
+      if(fullname == the_uid)
+        raise fullname
+      end
+      full_shortname = fullname.rpartition('\\')[-1]
+      shortname = full_shortname.rpartition('.')[0]
+      app_child = @sut.application(:name=>shortname)
+
+    rescue Exception => e
+
+      MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed to find application.;#{id.to_s};sut;{};application;" << (hash_uid.kind_of?(Hash) ? hash_uid.inspect : hash_uid.class.to_s)
+      Kernel::raise e
+
+    end
+
+    MobyUtil::Logger.instance.log "behaviour" , "PASS;Application found.;#{id.to_s};sut;{};application;" << hash_uid.inspect
+
+    app_child
+
+  end
+
       # == description
       # Returns details about the tested target. The data is platform/device specific which will make your scripts platform dependant. For devices with mobility apis the data available from them is returned and could be somewhat similar across platforms. Memory details are returned in a fixed format so they can be used and still maintain compatibility cross platforms. However it should be noted that platforms which do not support memory details will return -1 (scripts will not break but data will not be usable).
       # == arguments
@@ -375,7 +423,7 @@ module MobyBehaviour
           nil
         rescue Exception => e      
           
-          MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed tap_screen on coords \"#{x}:#{y}\";"
+          $logger.log "behaviour" , "FAIL;Failed tap_screen on coords \"#{x}:#{y}\";"
           Kernel::raise e        
           
         end      
@@ -396,9 +444,9 @@ module MobyBehaviour
         begin
           # execute the application control service request
           execute_command( MobyCommand::Application.new( :CloseQttas ) )
-          MobyUtil::Logger.instance.log "behaviour", "PASS;Successfully closed qttas.;#{ id };sut;{};close_qttas;"
+          $logger.log "behaviour", "PASS;Successfully closed qttas.;#{ id };sut;{};close_qttas;"
         rescue Exception => e
-          MobyUtil::Logger.instance.log "behaviour", "FAIL;Failed to close qttas.;#{ id };sut;{};close_qttas;"
+          $logger.log "behaviour", "FAIL;Failed to close qttas.;#{ id };sut;{};close_qttas;"
           Kernel::raise RuntimeError.new( "Unable to close qttas: Exception: #{ e.message } (#{ e.class })" )
         end
         nil
@@ -449,9 +497,9 @@ module MobyBehaviour
                                     thread_name,
                                     nil, nil, nil, nil, nil, nil,
                                     {:file_name => file_name, :timestamp => timestamp_type, :interval_s => interval_s} ) )
-          MobyUtil::Logger.instance.log "behaviour", "PASS;Successfully started process memory logging.;#{ id };sut;{};log_process_mem_start;"
+          $logger.log "behaviour", "PASS;Successfully started process memory logging.;#{ id };sut;{};log_process_mem_start;"
         rescue Exception => e
-          MobyUtil::Logger.instance.log "behaviour", "FAIL;Failed to start process memory logging.;#{ id };sut;{};log_process_mem_start;"
+          $logger.log "behaviour", "FAIL;Failed to start process memory logging.;#{ id };sut;{};log_process_mem_start;"
           Kernel::raise RuntimeError.new( "Unable to start process memory logging: Exception: #{ e.message } (#{ e.class })" )
         end
         status
@@ -489,9 +537,9 @@ module MobyBehaviour
                                    thread_name,
                                    nil, nil, nil, nil, nil, nil,
                                    {:return_data => return_data} ) )
-          MobyUtil::Logger.instance.log "behaviour", "PASS;Successfully stopped process memory logging.;#{ id };sut;{};log_process_mem_stop;"
+          $logger.log "behaviour", "PASS;Successfully stopped process memory logging.;#{ id };sut;{};log_process_mem_stop;"
         rescue Exception => e
-          MobyUtil::Logger.instance.log "behaviour", "FAIL;Failed to stop process memory logging.;#{ id };sut;{};log_process_mem_stop;"
+          $logger.log "behaviour", "FAIL;Failed to stop process memory logging.;#{ id };sut;{};log_process_mem_stop;"
           Kernel::raise RuntimeError.new( "Unable to stop process memory logging: Exception: #{ e.message } (#{ e.class })" )
         end
         log
@@ -521,9 +569,9 @@ module MobyBehaviour
                                  :CpuLoadStart,
                                  nil, nil, nil, nil, nil, nil, nil,
                                  {:cpu_load => load} ) )
-          MobyUtil::Logger.instance.log "behaviour", "PASS;Successfully started generating CPU load.;#{ id };sut;{};cpu_load_start;"
+          $logger.log "behaviour", "PASS;Successfully started generating CPU load.;#{ id };sut;{};cpu_load_start;"
         rescue Exception => e
-          MobyUtil::Logger.instance.log "behaviour", "FAIL;Failed to start generating CPU load.;#{ id };sut;{};cpu_load_start;"
+          $logger.log "behaviour", "FAIL;Failed to start generating CPU load.;#{ id };sut;{};cpu_load_start;"
           Kernel::raise RuntimeError.new( "Unable to start generating CPU load: Exception: #{ e.message } (#{ e.class })" )
         end
       end
@@ -541,9 +589,9 @@ module MobyBehaviour
       def cpu_load_stop
         begin
           status = execute_command(MobyCommand::Application.new(:CpuLoadStop) )
-          MobyUtil::Logger.instance.log "behaviour", "PASS;Successfully started generating CPU load.;#{ id };sut;{};cpu_load_start;"
+          $logger.log "behaviour", "PASS;Successfully started generating CPU load.;#{ id };sut;{};cpu_load_start;"
         rescue Exception => e
-          MobyUtil::Logger.instance.log "behaviour", "FAIL;Failed to start generating CPU load.;#{ id };sut;{};cpu_load_start;"
+          $logger.log "behaviour", "FAIL;Failed to start generating CPU load.;#{ id };sut;{};cpu_load_start;"
           Kernel::raise RuntimeError.new( "Unable to start generating CPU load: Exception: #{ e.message } (#{ e.class })" )
         end
       end
@@ -575,15 +623,19 @@ module MobyBehaviour
           interval_millis = interval*1000 # to millis
 
           # make one refresh before execution then freeze
+		  find_object_state = self.parameter[ :use_find_object, false ]
+		  self.parameter[ :use_find_object] = false 
+
           app.force_refresh({:id => get_application_id})
           self.freeze
 
           #disable sleep to avoid unnecessary sleeping
-          MobyUtil::Parameter[ id ][ :sleep_disabled] = 'true'
+		  self.parameter[ :sleep_disabled ] = true
 
           ret = execute_command( MobyCommand::Group.new(interval_millis.to_i, app, block ) )
 
-          MobyUtil::Parameter[ id ][ :sleep_disabled] = 'false'
+		  self.parameter[ :sleep_disabled ] = false
+		  self.parameter[ :use_find_object] = find_object_state
 
           self.unfreeze
 
@@ -592,9 +644,9 @@ module MobyBehaviour
           # commands have been executed
           sleep (ret*interval)
 
-          MobyUtil::Logger.instance.log "behaviour", "PASS;Successfully executed grouped behaviours.;#{ id };sut;{};group_behaviours;"
+          $logger.log "behaviour", "PASS;Successfully executed grouped behaviours.;#{ id };sut;{};group_behaviours;"
         rescue Exception => e
-          MobyUtil::Logger.instance.log "behaviour", "FAIL;Failed to execute grouped behaviours.;#{ id };sut;{};group_behaviours;"
+          $logger.log "behaviour", "FAIL;Failed to execute grouped behaviours.;#{ id };sut;{};group_behaviours;"
           Kernel::raise RuntimeError.new( "Unable to execute grouped behaviours: Exception: #{ e.message } (#{ e.class })" )
         end
         nil
@@ -622,7 +674,7 @@ module MobyBehaviour
       #
       def set_event_type(new_type)
          raise ArgumentError.new("Invalid event type. Accepted values :" << @@_event_type_map.keys.join(", :") ) unless @@_event_type_map.include?(new_type)
-        MobyUtil::Parameter[ self.id ][ :event_type] = @@_event_type_map[new_type]
+        $parameters[ self.id ][ :event_type] = @@_event_type_map[new_type]
         nil
       end
 
@@ -633,7 +685,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/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/synchronization.rb

@@ -108,8 +108,8 @@ module MobyBehaviour
           begin
 
             signals_xml = MobyUtil::XML.parse_string( self.fixture( 'signal', 'get_signal' ) )
-      
-            signal_found = ( signals_xml.xpath( '//object[@type="QtSignal" and @name="%s"]' % signal_name ).count > 0 )
+			_signal_found_xml, unused_rule = TDriver::TestObjectAdapter.get_objects( signals_xml, { :type => 'QtSignal', :name => signal_name}, true )
+			signal_found = true unless _signal_found_xml.empty? 
 
           end # begin
 
@@ -125,7 +125,7 @@ module MobyBehaviour
       end # wait_for_signal
     
       # 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  # Synchronization
 

data/lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/treewidgetitemcolumn.rb

@@ -85,28 +85,28 @@ module MobyBehaviour
 		      command.application_id(get_application_id)    
 		      command.object_type(:Standard)                          
 		      command.command_name('CheckState')    
-		      command.set_event_type(MobyUtil::Parameter[ @sut.id ][ :event_type, "0" ])
+		      command.set_event_type($parameters[ @sut.id ][ :event_type, "0" ])
 		      params = {:state => new_state, :column => self.attribute('column'), :item => self.attribute('parentItem')}      
 
-              command.set_event_type(MobyUtil::Parameter[ @sut.id ][ :event_type, "0" ])
+              command.set_event_type($parameters[ @sut.id ][ :event_type, "0" ])
 
 		      command.command_params(params)
 		      @sut.execute_command(command)
 
 		    rescue Exception => e      
 
-		      MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed select"#{identity};drag;"
+		      $logger.log "behaviour" , "FAIL;Failed select"#{identity};drag;"
 		      Kernel::raise e        
 
 		    end      
 
-		    MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation select executed successfully"#{identity};drag;"
+		    $logger.log "behaviour" , "PASS;Operation select executed successfully"#{identity};drag;"
 		    ret
 
 	    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
 
   end

data/lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/type_text.rb

@@ -77,19 +77,19 @@ module MobyBehaviour
 
 				rescue Exception => e
 
-					MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed type_text with text \"#{text}\".;#{identity};type_text;"
+					$logger.log "behaviour" , "FAIL;Failed type_text with text \"#{text}\".;#{identity};type_text;"
 					Kernel::raise e
 
 				end      
 
-				MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation type_text executed successfully with text \"#{text}\".;#{identity};type_text;"
+				$logger.log "behaviour" , "PASS;Operation type_text executed successfully with text \"#{text}\".;#{identity};type_text;"
 
 				ret
 
 			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