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

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

@@ -206,11 +206,11 @@ module MobyBehaviour
 			    begin 
 				  returnValue = @sut.execute_command( command )
 				rescue
-				  MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed when calling method set_attribute with values attribute:#{attribute.to_s} value:#{value.to_s}.;#{identity};set_attribute;"
+				  $logger.log "behaviour" , "FAIL;Failed when calling method set_attribute with values attribute:#{attribute.to_s} value:#{value.to_s}.;#{identity};set_attribute;"
 				  Kernel::raise RuntimeError.new("Setting attribute '%s' to value '%s' failed with error: %s" % [attribute, value, returnValue])
 				end
 			  
-			    MobyUtil::Logger.instance.log "behaviour" , "PASS;The method set_attribute was executed successfully with with values attribute:#{attribute.to_s} value:#{value.to_s}.;#{identity};set_attribute;"
+			    $logger.log "behaviour" , "PASS;The method set_attribute was executed successfully with with values attribute:#{attribute.to_s} value:#{value.to_s}.;#{identity};set_attribute;"
 	  
 			    nil
 
@@ -218,7 +218,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/behaviour.rb

@@ -66,7 +66,7 @@ module MobyBehaviour
           end
         end
 
-        command.set_event_type(MobyUtil::Parameter[ @sut.id ][ :event_type, "0" ])
+        command.set_event_type($parameters[ @sut.id ][ :event_type, "0" ])
 
         #for components with object visible on screen but not actual widgets or graphicsitems
         if self.attribute( 'objectType' ) == 'Embedded'
@@ -86,7 +86,7 @@ module MobyBehaviour
       # == nodoc
       # should this method be private?
       def plugin_command( require_response = false, command = MobyCommand::WidgetCommand.new )
-        command.set_event_type(MobyUtil::Parameter[ @sut.id ][ :event_type, "0" ])
+        command.set_event_type($parameters[ @sut.id ][ :event_type, "0" ])
         command.application_id( get_application_id )
         command.object_id( self.id )
         command.object_type( self.attribute('objectType' ).intern)
@@ -98,8 +98,8 @@ module MobyBehaviour
 
       def do_sleep(time)
 
-        time = time.to_f
-        time = time * 1.3
+        time = time.to_f * 1.3
+
         #for flicks the duration of the gesture is short but animation (scroll etc..) may not
         #so wait at least one second
         time = 1 if time < 1  
@@ -130,7 +130,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/configure_behaviour.rb

@@ -227,12 +227,12 @@ module MobyBehaviour
 
 		    rescue Exception => e
 		      
-		      MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed to enable event logging. With event_list \"#{event_list};log_events"
+		      $logger.log "behaviour" , "FAIL;Failed to enable event logging. With event_list \"#{event_list};log_events"
 		      Kernel::raise e        
 
 		    end      
 
-		    MobyUtil::Logger.instance.log "behaviour" , "PASS;Event logging enabled. With event_list \"#{event_list};log_events"
+		    $logger.log "behaviour" , "PASS;Event logging enabled. With event_list \"#{event_list};log_events"
 
 	    end
 
@@ -252,12 +252,12 @@ module MobyBehaviour
 
 		    rescue Exception => e
 		      
-		      MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed to stop event logging.;stop_event_logging"
+		      $logger.log "behaviour" , "FAIL;Failed to stop event logging.;stop_event_logging"
 		      Kernel::raise e        
 
 		    end      
 
-		    MobyUtil::Logger.instance.log "behaviour" , "PASS;Event logging stopped.;stop_event_logging"
+		    $logger.log "behaviour" , "PASS;Event logging stopped.;stop_event_logging"
 
 	    end
 
@@ -287,12 +287,12 @@ module MobyBehaviour
 		      
 		    rescue Exception => e
 		      
-		      MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed to configure logger. With params \"#{params_hash.to_s};configure_logger"
+		      $logger.log "behaviour" , "FAIL;Failed to configure logger. With params \"#{params_hash.to_s};configure_logger"
 		      Kernel::raise e        
 
 		    end      
 
-		    MobyUtil::Logger.instance.log "behaviour" , "PASS;Succesfully configured logger. With params \"#{params_hash.to_s};configure_logger"
+		    $logger.log "behaviour" , "PASS;Succesfully configured logger. With params \"#{params_hash.to_s};configure_logger"
 
 	    end
 
@@ -308,7 +308,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 # ConfigureBehaviour
 

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

@@ -82,12 +82,12 @@ module MobyBehaviour
 
         rescue Exception => e
 
-          MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed enable_events with refresh \"#{filter_array.to_s}\".;#{ identity };enable_events;"
+          $logger.log "behaviour" , "FAIL;Failed enable_events with refresh \"#{filter_array.to_s}\".;#{ identity };enable_events;"
           Kernel::raise e
 
         end
 
-        MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation enable_events executed successfully with refresh \"#{ filter_array.to_s }\".;#{ identity };enable_events;"
+        $logger.log "behaviour" , "PASS;Operation enable_events executed successfully with refresh \"#{ filter_array.to_s }\".;#{ identity };enable_events;"
         nil
       end
 
@@ -111,11 +111,11 @@ module MobyBehaviour
           command.service( 'collectEvents' )
           @sut.execute_command( command)
         rescue Exception => e
-          MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed disable_events.;#{ identity };disable_events;"
+          $logger.log "behaviour" , "FAIL;Failed disable_events.;#{ identity };disable_events;"
           Kernel::raise e 
         end 
 
-        MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation disable_events executed successfully.;#{ identity };disable_events;"
+        $logger.log "behaviour" , "PASS;Operation disable_events executed successfully.;#{ identity };disable_events;"
         nil
 
       end
@@ -146,19 +146,19 @@ module MobyBehaviour
 
         rescue Exception => e
 
-          MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed get_events.;#{ identity };get_events;"
+          $logger.log "behaviour" , "FAIL;Failed get_events.;#{ identity };get_events;"
           Kernel::raise e
     
         end
 
-        MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation get_events executed successfully.;#{ identity };get_events;"
+        $logger.log "behaviour" , "PASS;Operation get_events executed successfully.;#{ identity };get_events;"
         
         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 # EventsBehaviour
 

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

@@ -323,7 +323,7 @@ module MobyBehaviour
 
 
 				# 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/find.rb

@@ -64,16 +64,16 @@ module MobyBehaviour
 				## flick_to (center)
 				search_result.flick_to(window_x.to_i, window_y.to_i)
 			  rescue Exception => e
-				##MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed to find test object.;#{id.to_s};sut;{};find;" << (find_hash.kind_of?(Hash) ? find_hash.inspect : find_hash.class.to_s)  
+				##$logger.log "behaviour" , "FAIL;Failed to find test object.;#{id.to_s};sut;{};find;" << (find_hash.kind_of?(Hash) ? find_hash.inspect : find_hash.class.to_s)  
 				## Rescue from center and flick
 				Kernel::raise e
 			  end
-			  MobyUtil::Logger.instance.log "behaviour" , "PASS;Test object found and centered.;#{id.to_s};sut;{};application;" << find_hash.inspect  
+			  $logger.log "behaviour" , "PASS;Test object found and centered.;#{id.to_s};sut;{};application;" << find_hash.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 # module Find
 	

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

@@ -97,13 +97,13 @@ module MobyBehaviour
 		  end				  
 		rescue Exception => e
 
-		  MobyUtil::Logger.instance.log "behaviour", 
+		  $logger.log "behaviour", 
 			"FAIL;Failed when calling fixture with name #{fixture_name} method #{fixture_method} parameters #{parameters_hash.inspect}.;#{id.to_s};sut;{};fixture;"
 
 		  Kernel::raise MobyBase::BehaviourError.new("Fixture", "Failed to execute fixture name #{fixture_name} method #{fixture_method}")
 		end
 
-		MobyUtil::Logger.instance.log "behaviour", 
+		$logger.log "behaviour", 
 		  "PASS;The fixture command was executed successfully with name #{fixture_name} method #{fixture_method} parameters #{parameters_hash.inspect}.;#{id.to_s};sut;{};fixture;"
 
 		ret
@@ -162,13 +162,13 @@ module MobyBehaviour
 		  end
 		rescue Exception => e
 
-		  MobyUtil::Logger.instance.log "behaviour" , 
+		  $logger.log "behaviour" , 
 			"FAIL;Failed when calling async_fixture with name #{fixture_name} method #{fixture_method} parameters #{parameters_hash.inspect}.;#{id.to_s};sut;{};fixture;"
 
 		  Kernel::raise MobyBase::BehaviourError.new("Fixture", "Failed to execute async_fixture name #{fixture_name} method #{fixture_method}")
 		end
 
-		MobyUtil::Logger.instance.log "behaviour", 
+		$logger.log "behaviour", 
 		  "PASS;The fixture command was executed successfully with name #{fixture_name} method #{fixture_method} parameters #{parameters_hash.inspect}.;#{id.to_s};sut;{};fixture;"
 
 		ret
@@ -176,7 +176,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/gesture.rb

@@ -84,7 +84,7 @@ module MobyBehaviour
 	    def flick( direction, button = :Left, optional_params = {} )
 
 		  begin
-            use_tap_screen = optional_params[:use_tap_screen].nil? ? MobyUtil::Parameter[ @sut.id][ :use_tap_screen, 'false'] :
+            use_tap_screen = optional_params[:use_tap_screen].nil? ? $parameters[ @sut.id][ :use_tap_screen, 'false'] :
               optional_params[:use_tap_screen].to_s
             optional_params[:useTapScreen] = use_tap_screen
             
@@ -98,13 +98,13 @@ module MobyBehaviour
 		    
 		  rescue Exception => e
 
-		    MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed flick with direction \"#{direction}\", button \"#{button.to_s}\".;#{identity};flick;"
+		    $logger.log "behaviour" , "FAIL;Failed flick with direction \"#{direction}\", button \"#{button.to_s}\".;#{identity};flick;"
 		    Kernel::raise e        
 		  end      
 
-		  MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation flick executed successfully with direction \"#{direction}\", button \"#{button.to_s}\".;#{identity};flick;"
+		  $logger.log "behaviour" , "PASS;Operation flick executed successfully with direction \"#{direction}\", button \"#{button.to_s}\".;#{identity};flick;"
 
-		  nil
+		  self
 	    end
 
 	    # == description
@@ -147,7 +147,7 @@ module MobyBehaviour
 	    def flick_to( x, y, button = :Left, optional_params = {})
 
 		  begin
-            use_tap_screen = optional_params[:use_tap_screen].nil? ? MobyUtil::Parameter[ @sut.id][ :use_tap_screen, 'false'] :
+            use_tap_screen = optional_params[:use_tap_screen].nil? ? $parameters[ @sut.id][ :use_tap_screen, 'false'] :
               optional_params[:use_tap_screen].to_s
             optional_params[:useTapScreen] = use_tap_screen
 
@@ -159,13 +159,13 @@ module MobyBehaviour
 
 		  rescue Exception => e
 
-		    MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed flick_to with x \"#{x}\", y \"#{y}\", button \"#{button.to_s}\".;#{identity};drag;"
+		    $logger.log "behaviour" , "FAIL;Failed flick_to with x \"#{x}\", y \"#{y}\", button \"#{button.to_s}\".;#{identity};drag;"
 		    Kernel::raise e        
 		  end      
 
-		  MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation flick_to executed successfully with x \"#{x}\", y \"#{y}\", button \"#{button.to_s}\".;#{identity};drag;"
+		  $logger.log "behaviour" , "PASS;Operation flick_to executed successfully with x \"#{x}\", y \"#{y}\", button \"#{button.to_s}\".;#{identity};drag;"
 
-		  nil
+		  self
 
 	    end
 
@@ -228,11 +228,11 @@ module MobyBehaviour
 
 		  begin
             # change the format for api consitency
-            use_tap_screen = optional_params[:use_tap_screen].nil? ? MobyUtil::Parameter[ @sut.id][ :use_tap_screen, 'false'] :
+            use_tap_screen = optional_params[:use_tap_screen].nil? ? $parameters[ @sut.id][ :use_tap_screen, 'false'] :
               optional_params[:use_tap_screen].to_s
             optional_params[:useTapScreen] = use_tap_screen
-            optional_params['x_off'] = MobyUtil::Parameter[ @sut.id ][:tap_x_offset , '0' ],
-            optional_params['y_off'] = MobyUtil::Parameter[ @sut.id ][:tap_y_offset , '0' ]
+            optional_params['x_off'] = $parameters[ @sut.id ][:tap_x_offset , '0' ],
+            optional_params['y_off'] = $parameters[ @sut.id ][:tap_y_offset , '0' ]
 
 
 
@@ -249,15 +249,15 @@ module MobyBehaviour
 
 		  rescue Exception => e
 
-		    MobyUtil::Logger.instance.log "behaviour", 
+		    $logger.log "behaviour", 
 			  "FAIL;Failed gesture with direction \"#{direction}\", speed \"#{speed.to_s}\", distance \"#{distance.to_s}\".;#{identity};gesture;"
 		    Kernel::raise e        
 		  end      
 
-		  MobyUtil::Logger.instance.log "behaviour", 
+		  $logger.log "behaviour", 
 		    "PASS;Operation gesture executed successfully with direction \"#{direction}\", speed \"#{speed.to_s}\", distance \"#{distance.to_s}\".;#{identity};gesture;"
 
-		  nil
+		  self
 	    end
 
 	    # == description
@@ -297,14 +297,17 @@ module MobyBehaviour
 
           begin      
             # change the format for api consitency
-            use_tap_screen = optional_params[:use_tap_screen].nil? ? MobyUtil::Parameter[ @sut.id][ :use_tap_screen, 'false'] :
+            use_tap_screen = optional_params[:use_tap_screen].nil? ? $parameters[ @sut.id][ :use_tap_screen, 'false'] :
               optional_params[:use_tap_screen].to_s
             optional_params[:useTapScreen] = use_tap_screen
 
             params = {:gesture_type => :MouseGestureToCoordinates, :speed => speed}
             if attribute('objectType') == 'Web'
-              frame_x_absolute = (@sut.xml_data.xpath( "//object[@id='%s']/attributes/attribute[@name ='x_absolute']/value/text()" % self.attribute('webFrame') )[0]).to_s.to_i
-              frame_y_absolute = (@sut.xml_data.xpath( "//object[@id='%s']/attributes/attribute[@name ='y_absolute']/value/text()" % self.attribute('webFrame') )[0]).to_s.to_i
+              elemens_xml_data, unused_rule = TDriver::TestObjectAdapter.get_objects( @sut.xml_data, { :id => self.attribute('webFrame')}, true )
+              object_xml_data = elemens_xml_data[0]
+              object_attributes = TDriver::TestObjectAdapter.test_object_attributes(object_xml_data, ['x_absolute', 'y_absolute'])
+              frame_x_absolute = object_attributes['x_absolute'].to_i
+              frame_y_absolute = object_attributes['y_absolute'].to_i
               new_params = {:x=>(frame_x_absolute + x.to_i + (attribute('width' ).to_i/2)),
                             :y=>(frame_y_absolute + y.to_i + (attribute('height').to_i/2))}
               params.merge!(new_params)
@@ -320,12 +323,12 @@ module MobyBehaviour
 
           rescue Exception => e
 
-            MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed gesture_to with x \"#{x}\", y \"#{y}\", speed \"#{speed.to_s}\", button \".;#{identity};gesture;"
+            $logger.log "behaviour" , "FAIL;Failed gesture_to with x \"#{x}\", y \"#{y}\", speed \"#{speed.to_s}\", button \".;#{identity};gesture;"
             Kernel::raise e        
           end
 
-          MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation gesture_to executed successfully with x \"#{x}\", y \"#{y}\", speed \"#{speed.to_s}\".;#{identity};gesture;"
-          nil
+          $logger.log "behaviour" , "PASS;Operation gesture_to executed successfully with x \"#{x}\", y \"#{y}\", speed \"#{speed.to_s}\".;#{identity};gesture;"
+          self
         end
 
     	# == description
@@ -392,11 +395,11 @@ module MobyBehaviour
 
 
 		  rescue Exception => e      
-		    MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed gesture_from with x \"#{x}\", y \"#{y}\", speed \"#{speed.to_s}\", distance \"#{distance.to_s}\", button \".;#{identity};gesture;"
+		    $logger.log "behaviour" , "FAIL;Failed gesture_from with x \"#{x}\", y \"#{y}\", speed \"#{speed.to_s}\", distance \"#{distance.to_s}\", button \".;#{identity};gesture;"
 		    Kernel::raise e        
 		  end
-		  MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation gesture_from executed successfully with x \"#{x}\", y \"#{y}\", speed \"#{speed.to_s}\", distance \"#{distance.to_s}\".;#{identity};gesture;"
-		  nil
+		  $logger.log "behaviour" , "PASS;Operation gesture_from executed successfully with x \"#{x}\", y \"#{y}\", speed \"#{speed.to_s}\", distance \"#{distance.to_s}\".;#{identity};gesture;"
+		  self
 	    end
 
 	    # == description
@@ -429,8 +432,16 @@ module MobyBehaviour
       #  description: One of the arguments is not valid  
 	    def gesture_to_object(target_object, duration, optional_params = {:button => :Left, :isDrag => false})    
             if attribute('objectType') == 'Web'
-              gesture_to(target_object.attribute('x').to_i + (target_object.attribute('width' ).to_i/2) - (attribute('width' ).to_i/2),
-                         target_object.attribute('y').to_i + (target_object.attribute('height').to_i/2) - (attribute('height').to_i/2),
+              elemens_xml_data, unused_rule = TDriver::TestObjectAdapter.get_objects( @sut.xml_data, { :id => self.attribute('webFrame')}, true )
+              object_xml_data = elemens_xml_data[0]
+              object_attributes = TDriver::TestObjectAdapter.test_object_attributes(object_xml_data, ['x', 'y'])
+              frame_x = object_attributes['x'].to_i
+              frame_y = object_attributes['y'].to_i
+							puts "x "  + frame_x.to_s + " y " + frame_y.to_s
+
+
+              gesture_to(target_object.attribute('x').to_i + (target_object.attribute('width' ).to_i/2) - (attribute('width' ).to_i/2 ) - frame_x,
+                         target_object.attribute('y').to_i + (target_object.attribute('height').to_i/2) - (attribute('height').to_i/2 ) - frame_y,
                          duration, optional_params)
               nil
               return 
@@ -438,7 +449,7 @@ module MobyBehaviour
 
 		  begin
             # change the format for api consitency
-            use_tap_screen = optional_params[:use_tap_screen].nil? ? MobyUtil::Parameter[ @sut.id][ :use_tap_screen, 'false'] :
+            use_tap_screen = optional_params[:use_tap_screen].nil? ? $parameters[ @sut.id][ :use_tap_screen, 'false'] :
               optional_params[:use_tap_screen].to_s
             optional_params[:useTapScreen] = use_tap_screen
 
@@ -453,14 +464,14 @@ module MobyBehaviour
 
 		  rescue Exception => e      
 
-		    MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed gesture_to_object with button.;#{identity};drag;"
+		    $logger.log "behaviour" , "FAIL;Failed gesture_to_object with button.;#{identity};drag;"
 		    Kernel::raise e        
 
 		  end      
 
-		  MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation gesture_to_object executed successfully with button.;#{identity};drag;"
+		  $logger.log "behaviour" , "PASS;Operation gesture_to_object executed successfully with button.;#{identity};drag;"
 
-		  nil
+		  self
 
 	    end
 
@@ -502,7 +513,7 @@ module MobyBehaviour
 
 		    begin
 
-          use_tap_screen = optional_params[:use_tap_screen].nil? ? MobyUtil::Parameter[ @sut.id][ :use_tap_screen, 'false'] :
+          use_tap_screen = optional_params[:use_tap_screen].nil? ? $parameters[ @sut.id][ :use_tap_screen, 'false'] :
           optional_params[:use_tap_screen].to_s
           optional_params[:useTapScreen] = use_tap_screen
 
@@ -539,16 +550,16 @@ module MobyBehaviour
 
 		    rescue Exception => e
 
-		      MobyUtil::Logger.instance.log "behaviour", 
+		      $logger.log "behaviour", 
 			    "FAIL;Failed drag_to_object with points \"#{points.to_s}\", duration \"#{duration.to_s}\", mouse_details \"#{mouse_details.to_s}\".;#{identity};gesture_points;"
 		      Kernel::raise e        
 
 		    end      
 
-		    MobyUtil::Logger.instance.log "behaviour", 
+		    $logger.log "behaviour", 
 		      "PASS;Operation drag_to_object executed successfully with points \"#{points.to_s}\", duration \"#{duration.to_s}\", mouse_details \"#{mouse_details.to_s}\".;#{identity};gesture_points;"
 
-		    nil
+		    self
 	    end
 
 	    # == description
@@ -593,7 +604,7 @@ module MobyBehaviour
 	    def drag(direction, distance, button = :Left, optional_params = {})
 
 		  begin
-            use_tap_screen = optional_params[:use_tap_screen].nil? ? MobyUtil::Parameter[ @sut.id][ :use_tap_screen, 'false'] :
+            use_tap_screen = optional_params[:use_tap_screen].nil? ? $parameters[ @sut.id][ :use_tap_screen, 'false'] :
               optional_params[:use_tap_screen].to_s
             optional_params[:useTapScreen] = use_tap_screen
 
@@ -605,14 +616,14 @@ module MobyBehaviour
 
 		  rescue Exception => e      
 		    
-		    MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed drag with direction \"#{direction}\", distance \"#{distance}\", button \"#{button.to_s}\".;#{identity};drag;"
+		    $logger.log "behaviour" , "FAIL;Failed drag with direction \"#{direction}\", distance \"#{distance}\", button \"#{button.to_s}\".;#{identity};drag;"
 		    Kernel::raise e        
 
 		  end      
 
-		  MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation drag executed successfully with direction \"#{direction}\", distance \"#{distance}\", button \"#{button.to_s}\".;#{identity};drag;"
+		  $logger.log "behaviour" , "PASS;Operation drag executed successfully with direction \"#{direction}\", distance \"#{distance}\", button \"#{button.to_s}\".;#{identity};drag;"
 
-		  nil
+		  self
 	    end
       
       # == description
@@ -659,13 +670,13 @@ module MobyBehaviour
           gesture_to(x, y, speed, optional_params )
 
         rescue Exception => e      
-          MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed drag_to with x \"#{x}\", y \"#{y}\", button \"#{button.to_s}\".;#{identity};drag;"
+          $logger.log "behaviour" , "FAIL;Failed drag_to with x \"#{x}\", y \"#{y}\", button \"#{button.to_s}\".;#{identity};drag;"
           Kernel::raise e        
         end      
 
-        MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation drag_to executed successfully with x \"#{x}\", y \"#{y}\", button \"#{button.to_s}\".;#{identity};drag;"
+        $logger.log "behaviour" , "PASS;Operation drag_to executed successfully with x \"#{x}\", y \"#{y}\", button \"#{button.to_s}\".;#{identity};drag;"
 
-        nil
+        self
 
       end
 
@@ -703,7 +714,7 @@ module MobyBehaviour
 
 		    begin
 
-          use_tap_screen = optional_params[:use_tap_screen].nil? ? MobyUtil::Parameter[ @sut.id][ :use_tap_screen, 'false'] :
+          use_tap_screen = optional_params[:use_tap_screen].nil? ? $parameters[ @sut.id][ :use_tap_screen, 'false'] :
           optional_params[:use_tap_screen].to_s
           optional_params[:useTapScreen] = use_tap_screen
 
@@ -721,14 +732,14 @@ module MobyBehaviour
 
 		    rescue Exception => e      
 
-		      MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed drag_to_object with button \"#{button.to_s}\".;#{identity};drag;"
+		      $logger.log "behaviour" , "FAIL;Failed drag_to_object with button \"#{button.to_s}\".;#{identity};drag;"
 		      Kernel::raise e        
 
 		    end      
 
-		    MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation drag_to_object executed successfully with button \"#{button.to_s}\".;#{identity};drag;"
+		    $logger.log "behaviour" , "PASS;Operation drag_to_object executed successfully with button \"#{button.to_s}\".;#{identity};drag;"
 
-		    nil
+		    self
 
 	    end
       
@@ -774,7 +785,7 @@ module MobyBehaviour
 
 		    begin
 
-          use_tap_screen = optional_params[:use_tap_screen].nil? ? MobyUtil::Parameter[ @sut.id][ :use_tap_screen, 'false'] :
+          use_tap_screen = optional_params[:use_tap_screen].nil? ? $parameters[ @sut.id][ :use_tap_screen, 'false'] :
           optional_params[:use_tap_screen].to_s
           optional_params[:useTapScreen] = use_tap_screen
 
@@ -786,14 +797,15 @@ module MobyBehaviour
 
 		    rescue Exception => e      
 
-		      MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed move with direction \"#{direction}\", distance \"#{distance}\",.;#{identity};move;"
+		      $logger.log "behaviour" , "FAIL;Failed move with direction \"#{direction}\", distance \"#{distance}\",.;#{identity};move;"
 		      Kernel::raise e        
 
 		    end      
 
-		    MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation move executed successfully with direction \"#{direction}\", distance \"#{distance}\",.;#{identity};move;"
+		    $logger.log "behaviour" , "PASS;Operation move executed successfully with direction \"#{direction}\", distance \"#{distance}\",.;#{identity};move;"
+
+		    self
 
-		    nil
 	    end
        
 
@@ -809,10 +821,7 @@ module MobyBehaviour
   		  center_y
 	    end  
 
-	    
-
-
-	    private
+    private
 
 	    # Performs the actual gesture operation. 
 	    # Verifies that the parameters are correct and send the command
@@ -873,19 +882,23 @@ module MobyBehaviour
 
 	    end
 
-
 	    def do_sleep(time)
 
-		    if MobyUtil::Parameter[ @sut.id ][ :sleep_disabled, nil ] != 'true'
-		      time = time.to_f
-		      time = time * 1.3
+		    if $parameters[ @sut.id ][ :sleep_disabled, nil ] != true
+
+		      time = time.to_f * 1.3
+
 		      #for flicks the duration of the gesture is short but animation (scroll etc..) may not
 		      #so wait at least one second
-		      time = 1 if time < 1	
+		      time = 1 if time < 1
+
 		      sleep time
+
 		    else
-		      #store the biggest value which will then be used in multitouch situations to sleep
-		      MobyUtil::Parameter[ @sut.id ][ :skipped_sleep_time ] = time if time > MobyUtil::Parameter[ @sut.id ][ :skipped_sleep_time, 0]
+
+		      # store the biggest value which will then be used in multitouch situations to sleep
+		      $parameters[ @sut.id ][ :skipped_sleep_time ] = time if time > $parameters[ @sut.id ][ :skipped_sleep_time, 0 ]
+
 		    end
 
 	    end
@@ -913,7 +926,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