testability-driver-qt-sut-plugin 1.3.1 → 1.3.2

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

@@ -28,8 +28,8 @@ module MobyBehaviour
 				attr_reader :value, :type
 
 				def initialize( type, value )
-					Kernel::raise ArgumentError.new("Invalid argument type for type. (Actual: %s, Expected: String)" % [ type.class.to_s ] ) unless type.kind_of?( String )
-					Kernel::raise ArgumentError.new("Invalid argument type for value. (Actual: %s, Expected: String)" % [ value.class.to_s ] ) unless value.kind_of?( String )
+					raise ArgumentError.new("Invalid argument type for type. (Actual: %s, Expected: String)" % [ type.class.to_s ] ) unless type.kind_of?( String )
+					raise ArgumentError.new("Invalid argument type for value. (Actual: %s, Expected: String)" % [ value.class.to_s ] ) unless value.kind_of?( String )
 					@type, @value = type, value
 				end
 	
@@ -53,7 +53,7 @@ module MobyBehaviour
 				RETURN_RESULT_AS_XML	= 0x03
 			
 				def initialize( parent, fixture_name )
-					Kernel::raise ArgumentError.new("Invalid argument type for fixture name. (Actual: %s, Expected: String)" % [ fixture_name.class.to_s ] ) unless fixture_name.kind_of?( String )
+					raise ArgumentError.new("Invalid argument type for fixture name. (Actual: %s, Expected: String)" % [ fixture_name.class.to_s ] ) unless fixture_name.kind_of?( String )
 					@parent, @fixture_name = parent, fixture_name
 				end
 
@@ -62,7 +62,7 @@ module MobyBehaviour
 				end
 
 				def list_class_methods( class_name )
-					Kernel::raise ArgumentError.new("Invalid argument type for class name. (Actual: %s, Expected: String)" % [ class_name.class.to_s ]) unless class_name.kind_of?( String )
+					raise ArgumentError.new("Invalid argument type for class name. (Actual: %s, Expected: String)" % [ class_name.class.to_s ]) unless class_name.kind_of?( String )
 					execute( RETURN_RESULT_AS_LIST, 'list_class methods', { :class => class_name } )
 				end
 
@@ -97,7 +97,7 @@ module MobyBehaviour
 									} 
 								}
 
-								Kernel::raise RuntimeError.new("Unable to parse fixture result xml (QtApiAccessor)") if result.nil?
+								raise RuntimeError.new("Unable to parse fixture result xml (QtApiAccessor)") if result.nil?
 
 							when RETURN_RESULT_AS_LIST
 

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

@@ -63,7 +63,7 @@ module MobyBehaviour
 				rescue Exception => e
 
 					$logger.behaviour "FAIL;Failed start_recording.;#{ identity };start_recording;"
-					Kernel::raise e
+					raise e
 
 				end
 
@@ -89,7 +89,7 @@ module MobyBehaviour
 				rescue Exception => e
 
 					$logger.behaviour "FAIL;Failed stop_recording.;#{ identity };stop_recording;"
-					Kernel::raise e
+					raise e
 
 				end
 
@@ -114,7 +114,7 @@ module MobyBehaviour
 				rescue Exception => e
 
 					$logger.behaviour "FAIL;Failed print_recordings.;#{ identity };print_recordings;"
-					Kernel::raise e
+					raise e
 
 				end
 

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

@@ -91,13 +91,13 @@ module MobyBehaviour
 					draw = ( draw.downcase == 'true' ? true : false ) if draw.kind_of?( String )
 
 					# verify that image format is type of string
-					Kernel::raise ArgumentError.new( "Unexpected argument type (%s) for image format, expected %s" % [ format.class, "String" ] ) unless format.kind_of?( String )
+					raise ArgumentError.new( "Unexpected argument type (%s) for image format, expected %s" % [ format.class, "String" ] ) unless format.kind_of?( String )
 
 					# verify that filename is type of string
-					Kernel::raise ArgumentError.new( "Unexpected argument type (%s) for filename, expected %s" % [ file_name.class, "String" ] ) unless file_name.nil? || file_name.kind_of?( String )
+					raise ArgumentError.new( "Unexpected argument type (%s) for filename, expected %s" % [ file_name.class, "String" ] ) unless file_name.nil? || file_name.kind_of?( String )
 
 					# verify that draw flag is type of boolean
-					Kernel::raise ArgumentError.new( "Unexpected argument type (%s) for draw flag, expected %s" % [ draw.class, "boolean (TrueClass or FalseClass)" ] ) unless [ TrueClass, FalseClass ].include?( draw.class )
+					raise ArgumentError.new( "Unexpected argument type (%s) for draw flag, expected %s" % [ draw.class, "boolean (TrueClass or FalseClass)" ] ) unless [ TrueClass, FalseClass ].include?( draw.class )
 
 					command = command_params #in qt_behaviour
 					command.command_name( 'Screenshot' )
@@ -116,7 +116,7 @@ module MobyBehaviour
 
 					$logger.behaviour "FAIL;Failed capture_screen with format \"%s\", file_name \"%s\".;%s;capture_screen;" % [ format, file_name, identity ]
 
-					Kernel::raise e
+					raise e
 
 				end
 
@@ -169,7 +169,7 @@ module MobyBehaviour
 
 					require 'RMagick'
 
-					Kernel::raise ArgumentError.new("The tolerance argument was not an Integer in the [0,100] range.") unless tolerance.kind_of? Integer and tolerance >= 0 and tolerance <= 100
+					raise ArgumentError.new("The tolerance argument was not an Integer in the [0,100] range.") unless tolerance.kind_of? Integer and tolerance >= 0 and tolerance <= 100
 
 					target = nil
 
@@ -179,7 +179,7 @@ module MobyBehaviour
 
 					elsif image_or_path.kind_of? Magick::ImageList
 
-						Kernel::raise ArgumentError.new("The supplied ImageList argument did not contain any images.") unless image_or_path.length > 0
+						raise ArgumentError.new("The supplied ImageList argument did not contain any images.") unless image_or_path.length > 0
 						target = image_or_path
 
 					elsif image_or_path.kind_of? String and !image_or_path.empty?
@@ -187,18 +187,18 @@ module MobyBehaviour
 						begin
 							target = Magick::ImageList.new(image_or_path)
 						rescue        
-							Kernel::raise RuntimeError.new("Could not load target for image comparison from path: \"#{image_or_path.to_s}\".")
+							raise RuntimeError.new("Could not load target for image comparison from path: \"#{image_or_path.to_s}\".")
 						end
 
 					else
-						Kernel::raise ArgumentError.new("The image_or_path argument was not of one of the allowed image types or a non empty String.")
+						raise ArgumentError.new("The image_or_path argument was not of one of the allowed image types or a non empty String.")
 					end
 
 					begin      
 						screen = Magick::Image.from_blob(capture_screen){ self.format = "PNG" }.first
 						screen.fuzz = tolerance.to_s + "%"
 					rescue
-						Kernel::raise RuntimeError.new("Failed to capture SUT screen for comparison. Details:\n" << $!.message)  
+						raise RuntimeError.new("Failed to capture SUT screen for comparison. Details:\n" << $!.message)  
 					end
 
 					result = screen.find_similar_region( target )
@@ -207,7 +207,7 @@ module MobyBehaviour
 
 					$logger.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
+					raise e
 
 				end
 
@@ -258,7 +258,7 @@ module MobyBehaviour
 
 					$logger.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
+					raise exc
 
 
 				end      

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

@@ -102,12 +102,12 @@ module MobyBehaviour
 
 		  params = generate_fixture_params(identifiers, values)
 		  
-		  self.fixture('setting', 'set', params)		  
+		  fixture('setting', 'set', params)		  
 
 		rescue Exception => e
 
 		  $logger.behaviour "FAIL;Failed set settings \"#{identifiers.to_s}\", \"#{values.to_s}\".;set_settings;"
-		  Kernel::raise e
+		  raise e
 
 		end
 
@@ -155,12 +155,12 @@ module MobyBehaviour
 		  params = generate_fixture_params(identifiers, nil)
 		  setting_keys.each{|value| params[value.to_sym] = ''}
 		  
-		  self.fixture('setting', 'remove', params)		  
+		  fixture('setting', 'remove', params)		  
 
 		rescue Exception => e
 
 		  $logger.behaviour "FAIL;Failed remove settings \"#{identifiers.to_s}\", \"#{setting_keys.to_s}\".;remove_settings;"
-		  Kernel::raise e
+		  raise e
 
 		end
 
@@ -209,12 +209,12 @@ module MobyBehaviour
 		  params = generate_fixture_params(identifiers, nil)
 		  setting_keys.each{|value| params[value.to_sym] = ''}
 		  
-		  hash = eval(self.fixture('setting', 'read', params))		  
+		  hash = eval(fixture('setting', 'read', params))		  
 		  
 		rescue Exception => e
 
 		  $logger.behaviour "FAIL;Failed read settings \"#{identifiers.to_s}\", \"#{setting_keys.to_s}\".;read_settings;"
-		  Kernel::raise e
+		  raise e
 
 		end
 
@@ -256,12 +256,12 @@ module MobyBehaviour
 		begin
 
 		  params = generate_fixture_params(identifiers, nil)
-		  hash = eval(self.fixture('setting', 'readAll', params))		  
+		  hash = eval(fixture('setting', 'readAll', params))		  
 		  
 		rescue Exception => e
 
 		  $logger.behaviour "FAIL;Failed read all settings \"#{identifiers.to_s}\".;read_all_settings;"
-		  Kernel::raise e
+		  raise e
 
 		end
 

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

@@ -122,7 +122,7 @@ module MobyBehaviour
         rescue Exception => e
 
           $logger.behaviour "FAIL;Failed to list processes.;#{ id };sut;{};list_processes;"
-          Kernel::raise RuntimeError.new( "Unable to list processes: Exception: #{ e.message } (#{ e.class })" )
+          raise RuntimeError.new( "Unable to list processes: Exception: #{ e.message } (#{ e.class })" )
 
         end
 
@@ -424,7 +424,7 @@ module MobyBehaviour
       #   example: 7376896
       # == exceptions
       def agent_mem_usage
-        info = self.system_information
+        info = system_information
         begin 
           info.MemoryStatus.attribute('qttasMemUsage').to_i
         rescue Exception => e
@@ -441,7 +441,7 @@ module MobyBehaviour
       #   example: 2147483647
       # == exceptions
       def system_total_mem
-        info = self.system_information
+        info = system_information
         begin 
           info.MemoryStatus.attribute('total').to_i
         rescue Exception => e
@@ -458,7 +458,7 @@ module MobyBehaviour
       #   example: 1214980096
       # == exceptions
       def system_available_mem
-        info = self.system_information
+        info = system_information
         begin 
           info.MemoryStatus.attribute('available').to_i
         rescue Exception => e
@@ -737,21 +737,21 @@ 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 
+          find_object_state = parameter[ :use_find_object, false ]
+          parameter[ :use_find_object] = false 
 
           app.force_refresh({:id => get_application_id})
-          self.freeze
+          freeze
 
           #disable sleep to avoid unnecessary sleeping
-          self.parameter[ :sleep_disabled ] = true
+          parameter[ :sleep_disabled ] = true
 
           ret = execute_command( MobyCommand::Group.new(interval_millis.to_i, app, block ) )
 
-          self.parameter[ :sleep_disabled ] = false
-          self.parameter[ :use_find_object] = find_object_state
+          parameter[ :sleep_disabled ] = false
+          parameter[ :use_find_object] = find_object_state
 
-          self.unfreeze
+          unfreeze
 
           # the behaviour returns the amout of behaviours
           # sleep to avoid sending messages to the app until the 
@@ -788,7 +788,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)
-        $parameters[ self.id ][ :event_type] = @@_event_type_map[new_type]
+        $parameters[ id ][ :event_type] = @@_event_type_map[new_type]
         nil
       end
 

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

@@ -112,7 +112,7 @@ module MobyBehaviour
         params.check_type [ Hash, NilClass ], 'wrong argument type $1 for signal parameters (expected $2)'
 
         # enable signal listening 
-        self.fixture( 'signal', 'enable_signal', :signal => signal_name )
+        fixture( 'signal', 'enable_signal', :signal => signal_name )
 
         # execute code block if any given     
         begin
@@ -134,7 +134,7 @@ module MobyBehaviour
         ensure
 
           begin
-            self.fixture( "signal", "remove_signals" )
+            fixture( "signal", "remove_signals" )
           rescue Exception => e  
             $logger.warning "Fixture removal failed. Message received: #{e.message}"
           end
@@ -187,7 +187,7 @@ module MobyBehaviour
       def ensure_event(params = nil, &block)
       
         raise EventsEnabledException.new("enable_events is used - ensure_events can not be Used at the same time.") if @@_events_enabled
-        raise ArgumentError.new("Must be called to TestObject" ) unless self.kind_of? MobyBase::TestObject
+        raise ArgumentError.new("Must be called to TestObject" ) unless kind_of? MobyBase::TestObject
 
         retry_timeout = (params.nil? || params[:retry_timeout].nil?) ? 30 : params[:retry_timeout]
         retry_interval = (params.nil? || params[:retry_interval].nil?) ? 1 : params[:retry_interval]
@@ -197,9 +197,9 @@ module MobyBehaviour
         if params && params[:events]
           events = params[:events]
         end
-        app = self.get_application        
+        app = get_application        
         begin
-          app.enable_events(events, {"track_id" => self.id.to_s})
+          app.enable_events(events, {"track_id" => id.to_s})
 
           MobyUtil::Retryable.until(:timeout => retry_timeout,:interval => retry_interval, :exception => EventNotReceivedException) {
             block.call if block_given?
@@ -208,7 +208,7 @@ module MobyBehaviour
             begin
               @sut.state_object(ev).events.attribute('trackedFound')
             rescue MobyBase::AttributeNotFoundError
-              $stderr.puts "Warning: Operation not received by object #{self.id} : #{self.name}. Retrying"
+              $stderr.puts "Warning: Operation not received by object #{id} : #{self.name}. Retrying"
               raise EventNotReceivedException.new("No event received during call") 
             end
           }
@@ -231,7 +231,7 @@ module MobyBehaviour
 
           begin
             
-            result = self.fixture( 'signal', 'get_signal' )
+            result = fixture( 'signal', 'get_signal' )
             
             signals_xml = MobyUtil::XML.parse_string( result )
             

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

@@ -100,7 +100,7 @@ module MobyBehaviour
 		    rescue Exception => e      
 
 		      $logger.behaviour "FAIL;Failed select"#{identity};drag;"
-		      Kernel::raise e        
+		      raise e        
 
 		    end      
 

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

@@ -78,7 +78,7 @@ module MobyBehaviour
 				rescue Exception => e
 
 					$logger.behaviour "FAIL;Failed type_text with text \"#{text}\".;#{identity};type_text;"
-					Kernel::raise e
+					raise e
 
 				end      
 

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

@@ -79,7 +79,7 @@ module MobyBehaviour
 		    rescue Exception => e      
 
 		      $logger.behaviour "FAIL;Failed select"#{identity};drag;"
-		      Kernel::raise e        
+		      raise e        
 
 		    end      
 

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

@@ -19,7 +19,7 @@
 
 module MobyBehaviour
 
-	module QT
+  module QT
 
     # == description
     # Webkit specific behaviours
@@ -42,88 +42,88 @@ module MobyBehaviour
     # == objects
     # *
     #
-		module Webkit
+    module Webkit
 
-			include MobyBehaviour::QT::Behaviour
+      include MobyBehaviour::QT::Behaviour
 
-            # == nodoc
-            # == description
-            # Send javascript to target object on the screen
-            # == params
-            # java_script::( )java script to be executed to target object
-            # == returns  
-            # == raises
-            # TestObjectNotFoundError:: If a graphics item is not visible on screen
-            # ArgumentError:: If an invalid button type is given
-            # ArgumentError:: If coordinates are outside of the object
-            # === examples
-            #  @object.execute_javascript_query
-            def execute_javascript_query(java_script, locator_query = nil, index = -1, webframe_id = 0)   
+      # == nodoc
+      # == description
+      # Send javascript to target object on the screen
+      # == params
+      # java_script::( )java script to be executed to target object
+      # == returns  
+      # == raises
+      # TestObjectNotFoundError:: If a graphics item is not visible on screen
+      # ArgumentError:: If an invalid button type is given
+      # ArgumentError:: If coordinates are outside of the object
+      # === examples
+      #  @object.execute_javascript_query
+      def execute_javascript_query(java_script, locator_query = nil, index = -1, webframe_id = 0)   
 
-              returnValue = ""
-              
-                begin   
-                  
-                  command = command_params #in qt_behaviour           
+        returnValue = ""
+        
+        begin   
+          
+          command = command_params #in qt_behaviour           
 =begin
-                  if(locator_query == nil)
-                     command.command_name('ExecuteJavaScriptOnQWebFrame')
-                     locator_query=""
-                  else  
-                     command.command_name('ExecuteJavaScriptOnWebElement')
-                  end
+             if(locator_query == nil)
+               command.command_name('ExecuteJavaScriptOnQWebFrame')
+               locator_query=""
+             else  
+               command.command_name('ExecuteJavaScriptOnWebElement')
+             end
 =end                  
 
-                  if type != "QWebFrame"
-                  command.command_name('ExecuteJavaScriptOnWebElement')
-                  webframe_id = attribute('webFrame') if webframe_id.to_s == "0"				  
-                  else
-                  command.command_name('ExecuteJavaScriptOnQWebFrame')
-                  end
+          if type != "QWebFrame"
+            command.command_name('ExecuteJavaScriptOnWebElement')
+            webframe_id = attribute('webFrame') if webframe_id.to_s == "0"				  
+          else
+            command.command_name('ExecuteJavaScriptOnQWebFrame')
+          end
 
-                  command.service( 'webkitCommand' )
-                  params = {
-                    'java_script'   => java_script,
-                    'locator_query' => locator_query,
-                    'index'         => index.to_s,
-                    'elementId'     => @id.to_s, 
-                    'webframe_id'   => webframe_id.to_s
-                  }
-                  
-                  command.command_params( params )
-                  
-                  returnValue = @sut.execute_command( command )
+          command.service( 'webkitCommand' )
+          params = {
+            'java_script'   => java_script,
+            'locator_query' => locator_query,
+            'index'         => index.to_s,
+            'elementId'     => @id.to_s, 
+            'webframe_id'   => webframe_id.to_s
+          }
           
-                rescue Exception => e      
+          command.command_params( params )
+          
+          returnValue = @sut.execute_command( command )
+          
+        rescue Exception => e      
 
-                    $logger.behaviour "FAIL;Failed send javascript with execute_javascript \"#{java_script}\""
-                    Kernel::raise e        
+          $logger.behaviour "FAIL;Failed send javascript with execute_javascript \"#{java_script}\""
+          raise e        
 
-                end      
+        end      
 
-                $logger.behaviour "PASS;Operation send javascript executed successfully with execute_javascript \"#{java_script}\""
+        $logger.behaviour "PASS;Operation send javascript executed successfully with execute_javascript \"#{java_script}\""
 
-              returnValue
+        returnValue
 
-            end
-            
+      end
+      
       # == description
-			# Executes java script on the target test object			
-			#
-			# == arguments
-			# java_script
-			#  String
-			#   description: Script to be executed to target object
-			#   example: "this.onclick();"
-			#
-			# == returns
-			# MobyBase::TestObject
-			#  description: Target test object 
-			#  example: -
-			#
-			# == raises
-			# RuntimeError
-			#  description: When executing JavaScript to QWebFrame: QWebPage not found.
+      # Executes java script on the target test object			
+      #
+      # == arguments
+      # java_script
+      #  String
+      #   description: Script to be executed to target object
+      #   example: "this.onclick();"
+      #
+      # == returns
+      # MobyBase::TestObject
+      #  description: Target test object 
+      #  example: -
+      #
+      # == raises
+      # RuntimeError
+      #  description: When executing JavaScript to QWebFrame: QWebPage not found.
       #
       # RuntimeError
       #  description: When executing JavaScript to QWebFrame: QWebFrame not found.
@@ -134,63 +134,63 @@ module MobyBehaviour
       # RuntimeError
       #  description: When executing JavaScript to WebElement: QWebElement not found.
       #
-			def execute_javascript( java_script )   
-                
-              webframe_id = 0
-              query = ""
-              index = -1
-			  if type == "QWebFrame"
-			      query = nil
-              else
-                  query << self.type.to_s 
-    			  creation_attributes.each {|param, value|
-    			    if param.to_s == "__index"
-    			      index=value.to_i
-    			      next
-    			    end 
-                    query << "[" << param.to_s << "='" << value.to_s << "'" << "]"
-    			  }
-    		  end
-    		  
-    		  if type != "QWebFrame" #&& parent_object.type == "QWebFrame")
-    		    #webframe_id = parent_object.id
-				webframe_id = attribute('webFrame')
-    		  end
+      def execute_javascript( java_script )   
+        
+        webframe_id = 0
+        query = ""
+        index = -1
+        if type == "QWebFrame"
+          query = nil
+        else
+          query << self.type.to_s 
+          creation_attributes.each {|param, value|
+            if param.to_s == "__index"
+              index=value.to_i
+              next
+            end 
+            query << "[" << param.to_s << "='" << value.to_s << "'" << "]"
+          }
+        end
+        
+        if type != "QWebFrame" #&& parent_object.type == "QWebFrame")
+          #webframe_id = parent_object.id
+          webframe_id = attribute('webFrame')
+        end
 
-              execute_javascript_query( java_script, nil, index, webframe_id)
-			end
+        execute_javascript_query( java_script, nil, index, webframe_id)
+      end
 
       # == description
-			# Scroll QWebFrame to correct position. Valid target object types are: QWebFrame, all QWebElements.
-			#
-			# == arguments
-			# dx
-			#  Fixnum
-			#   description: Delta x in pixels, positive value to right negative to left. Ignored for QWebElements. 
-			#   example: 313
+      # Scroll QWebFrame to correct position. Valid target object types are: QWebFrame, all QWebElements.
+      #
+      # == arguments
+      # dx
+      #  Fixnum
+      #   description: Delta x in pixels, positive value to right negative to left. Ignored for QWebElements. 
+      #   example: 313
       #
-			# dy
-			#  Fixnum
-			#   description: Delta y in pixels, positive value to down negative to up. Ignored for QWebElements.
-			#   example: 313
-			#
-			# center 
-			#  Fixnum
-			#   description: Value 1 means that scroll is done only to reveal the center position of the element. Value 0 means that element is tried to bring fully visible. Ignored for QWebFrame.
-			#   example: 1
-			#
-			# == returns
+      # dy
+      #  Fixnum
+      #   description: Delta y in pixels, positive value to down negative to up. Ignored for QWebElements.
+      #   example: 313
+      #
+      # center 
+      #  Fixnum
+      #   description: Value 1 means that scroll is done only to reveal the center position of the element. Value 0 means that element is tried to bring fully visible. Ignored for QWebFrame.
+      #   example: 1
+      #
+      # == returns
       # NilClass
       #  description: -
       #  example: -
       #
-			# == exceptions
-			# RuntimeError
-			#  description: Scrollign webframe failed with error: %s
-			#
-			# === examples
-			#  @QwebFrame.scroll(0, 10)
-			#  @app.a.scroll()
+      # == exceptions
+      # RuntimeError
+      #  description: Scrollign webframe failed with error: %s
+      #
+      # === examples
+      #  @QwebFrame.scroll(0, 10)
+      #  @app.a.scroll()
       def scroll( dx = 0, dy = 0, center = 0 )   
         temp_id = ""
 
@@ -217,9 +217,9 @@ module MobyBehaviour
             
             #adjust image to be visible for tap
             if(center_y.to_i > frame_down_border)
-              dy = center_y.to_i - frame_down_border + 1
+              dy = center_y.to_i - frame_down_border + 5
             elsif (center_y.to_i < y_absolute) 
-              dy = center_y.to_i - y_absolute - 1
+              dy = center_y.to_i - y_absolute - 5
             end
             
             if(center_x.to_i > frame_right_border)
@@ -234,7 +234,7 @@ module MobyBehaviour
             elsif (center_y.to_i < y_absolute)
               dy = attribute("y_absolute").to_i - y_absolute
             end
-          
+            
             if(center_x.to_i > frame_right_border)
               dx = attribute("x_absolute").to_i + attribute("width").to_i - x_absolute - width + verticalScrollBarWidth
             elsif (center_x.to_i < x_absolute)
@@ -256,17 +256,17 @@ module MobyBehaviour
         command.command_params( params )
 
         returnValue = @sut.execute_command( command )
-        Kernel::raise RuntimeError.new( "Scrollign webframe failed with error: %s" % [ returnValue ] ) if ( returnValue != "OK" )
+        raise RuntimeError.new( "Scrollign webframe failed with error: %s" % [ returnValue ] ) if ( returnValue != "OK" )
 
       end
 
 
-			# enable hooking for performance measurement & debug logging
-			TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
+      # enable hooking for performance measurement & debug logging
+      TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
 
 
-		end # Webkit
+    end # Webkit
 
-	end # QT
+  end # QT
 
 end # MobyBehaviour