testability-driver-qt-sut-plugin 1.0.0 → 1.0.1

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

@@ -231,10 +231,18 @@ module MobyBehaviour
             use_tap_screen = optional_params[:use_tap_screen].nil? ? MobyUtil::Parameter[ @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' ]
+
 
 
 		    #do_gesture(direction, speed, distance, isDrag, button)
-		    params = {:gesture_type => :MouseGesture, :direction => direction, :speed => speed, :distance => distance}
+		    params = {
+		    	:gesture_type => :MouseGesture,
+		    	:direction => direction,
+		    	:speed => speed,
+		    	:distance => distance
+		    }
 		    params.merge!(optional_params)
 		    do_gesture(params)
 		    do_sleep(speed)

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

@@ -223,7 +223,8 @@ module MobyBehaviour
           # puts "tap: " + (Time.now - tapMeasure).to_s + " s - before 2 webs"
 
           if(attribute('objectType') == 'Web')
-            if type != "QWebFrame"
+            #check that type is not QWebFrame and that QWebFrame is found for object
+            if type != "QWebFrame" and self.attributes.key?('webFrame')
              # puts "tap: " + (Time.now - tapMeasure).to_s + " s - Not q webframe"
 
               x_absolute = (@sut.xml_data.xpath( "//object[@id='%s']/attributes/attribute[@name ='x_absolute']/value/text()" % self.attribute('webFrame') )[0]).to_s.to_i

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

@@ -33,7 +33,7 @@ module MobyController
 			def execute
 				Kernel::raise ArgumentError.new( "Fixture '%s' not found for sut id '%s'" % [ @name, @sut_adapter.sut_id ] ) if ( plugin_params =  MobyUtil::Parameter[ @sut_adapter.sut_id.to_sym ][ :fixtures ][ @params[:name].to_sym, nil ] ).nil?
 
-     		    fixture_plugin = plugin_params[:plugin]
+        fixture_plugin = plugin_params.kind_of?(String) ? plugin_params : plugin_params[:plugin] 
 				@sut_adapter.send_service_request(Comms::MessageGenerator.generate(make_fixture_message(fixture_plugin, @params)))
 
 			end

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: testability-driver-qt-sut-plugin
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - TDriver team
@@ -15,25 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 +02:00
+date: 2011-01-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: testability-driver
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 8
-        - 3
         version: 0.8.3
-  type: :runtime
-  version_requirements: *id001
+    version: 
 description: 
 email: testabilitydriver@nokia.com
 executables: []
@@ -45,65 +33,64 @@ extra_rdoc_files: []
 files: 
 - env.rb
 - lib/testability-driver-qt-sut-plugin.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/plugin.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/group.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/action.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/find_object.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/infologger_command.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/configure_command.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/widget.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/qt.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/drag.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/tap.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/sut/communication.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/sut/adapter.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/sut/controller.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/infologger.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/qt_api_method.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/action.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/configure_behaviour.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/method.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/treewidgetitemcolumn.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/locale_db.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/multitouch.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/events.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/os.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/widget.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/gesture.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/view_item.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/attribute.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/type_text.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/qt_api_method.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/treewidgetitemcolumn.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/find.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/events.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/infologger.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/file_transfer.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/screen_capture.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/widget.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/record.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/key_press.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/sut.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/behaviour.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/type_text.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/configure_behaviour.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/fixture.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/attribute.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/application.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/synchronization.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/file_transfer.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/behaviour.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/action.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/gesture.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/method.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/webkit.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/key_press.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/record.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/synchronization.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/locale_db.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/multitouch.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/sut/communication.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/sut/controller.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/sut/adapter.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/util/find_object_generator.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/util/widget.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/util/fixture_parameter.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/util/message_composer.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/util/find_object_generator.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/controllers/group.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/controllers/find_object.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/controllers/group.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/controllers/screen_capture.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/controllers/tap.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/controllers/widget.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/controllers/infologger_command.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/controllers/configure_command.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/controllers/widget.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/controllers/screen_capture.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/controllers/fixture.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/controllers/key_sequence.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/controllers/application.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/controllers/tap.rb
-- lib/testability-driver-plugins/testability-driver-qt-sut-plugin.rb
-- xml/template/qt.xml
-- xml/behaviour/qt.xml
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/controllers/key_sequence.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/plugin.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/find_object.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/group.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/tap.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/widget.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/infologger_command.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/qt.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/configure_command.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/action.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/drag.rb
 - xml/defaults/sut_qt.xml
+- xml/behaviour/qt.xml
 - xml/keymap/qt.xml
-- installer/extconf.rb
+- xml/template/qt.xml
 has_rdoc: true
 homepage: http://gitorious.org/tdriver
 licenses: []
@@ -114,27 +101,21 @@ rdoc_options: []
 require_paths: 
 - lib/testability-driver-plugins/
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Testability Driver - Testability Driver Interface Qt SUT plugin