testability-driver-qt-sut-plugin 1.1.0 → 1.1.1

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

@@ -52,9 +52,13 @@ module MobyBehaviour
       # == arguments
       # attribute
       #  String
-      #   description: Name of the attribute to be set
+      #   description: Name of the attribute to be set as string
       #   example: "text"
       #
+      #  Symbol
+      #   description: Name of the attribute to be set as symbol
+      #   example: :text
+      #
       # value
       #  String
       #   description: New value of the attribute.
@@ -64,10 +68,26 @@ module MobyBehaviour
       #   description: New value of the attribute.
       #   example: 200
       #
-      #  Boolean
+      #  TrueClass
       #   description: New value of the attribute.
       #   example: true
       #
+      #  FalseClass
+      #   description: New value of the attribute.
+      #   example: false
+      #
+      #  Date
+      #   description: New value of the attribute.
+      #   example: Date.today
+      #
+      #  Time
+      #   description: New value of the attribute.
+      #   example: Time.now
+      #
+      #  DateTime
+      #   description: New value of the attribute.
+      #   example: DateTime.now
+      #  
       # type
       #  String
       #   description: Type of the value. If this argument is not given, the type will be detected based on the class of the value argument. 
@@ -94,13 +114,27 @@ module MobyBehaviour
       #  description: One of the arguments is not valid   
       # RuntimeError
       #  description: Setting of the attribute failed
-			def set_attribute(attribute, value, type = nil)
+			def set_attribute( attribute, value, type = nil )
+
+        # verify attribute argument variable type
+        attribute.check_type [ Symbol, String ], 'wrong argument type $1 for attribute name (expected $2)'
+
+        # verify type argument variable type 
+        type.check_type [ NilClass, String ], 'wrong argument type $1 for attribute type (expected $2)'
+
+        # convert symbol to string
+        attribute = attribute.to_s if attribute.kind_of?( Symbol )
 
-				Kernel::raise ArgumentError.new( "Attribute-name was empty" ) if attribute.empty?
-				Kernel::raise ArgumentError.new( "Argument type must be nil or a non empty String." ) unless type.nil? || ( type.kind_of?( String ) && !type.empty? )
+        # raise exception if attribute name was not given
+        attribute.not_empty 'attribute name cannot be be empty string'
+
+        type.not_empty 'argument type must be either nil or non empty string' if type.kind_of?( String )
+
+        # in qt_behaviour 
+				command = command_params 
 
-				command = command_params #in qt_behaviour 
 				command.transitions_off 
+
 				command.command_name( 'SetAttribute' )
 
 				case type

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

@@ -0,0 +1,300 @@
+############################################################################
+## 
+## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 
+## All rights reserved. 
+## Contact: Nokia Corporation (testabilitydriver@nokia.com) 
+## 
+## This file is part of TDriver. 
+## 
+## If you have questions regarding the use of this file, please contact 
+## Nokia at testabilitydriver@nokia.com . 
+## 
+## This library is free software; you can redistribute it and/or 
+## modify it under the terms of the GNU Lesser General Public 
+## License version 2.1 as published by the Free Software Foundation 
+## and appearing in the file LICENSE.LGPL included in the packaging 
+## of this file. 
+## 
+############################################################################
+
+module MobyBehaviour
+
+  module QT
+
+    # == description
+    #
+    # == behaviour
+    # QtSettings
+    #
+    # == requires
+    # testability-driver-qt-sut-plugin
+    #
+    # == input_type
+    # *
+    #
+    # == sut_type
+    # QT
+    #
+    # == sut_version
+    # *
+    #
+    # == objects
+    # *
+    #
+	module Settings
+
+	  include MobyBehaviour::QT::Behaviour
+
+
+      # == description
+	  # Sets the given settings to the settings storage defined in the setting indentifiers.
+	  # QSettings documentation will give more information on how the settigns are created 
+	  # and accessed.
+	  # 
+      # == arguments
+	  # identifiers
+	  #  Hash
+      #   description: Idenfifiers for the settings. See QSettings documentations for details on how
+	  #                settings are accessed. You can use either direct file name or organization and 
+	  #                application name way to access and edit the settings.
+	  #                See [link="#identifier_params_table1"]file path access [/link] and 
+	  #                [link="#identifier_params_table2"]registry access [/link] on how
+	  #                specify the idenfitication details for the settings to be accessed.
+	  #                
+      #   example:     File name: {:fileName => '/etc/init/settings.ini', :format => 'Ini'}
+	  #                Registry: {:organization => 'Tdriver', :application => 'qttasserver'}
+	  #
+	  # values
+	  #  Hash
+      #   description: Setting values to be edited (key and value)
+      #   example: {:setting => 'value'}
+	  #
+      # == tables
+      # identifier_params_table1
+      #  title: Hash argument when using file path
+      #  description: Valid values when using filepath to access settings.
+      #  |Key|Description|Example|
+      #  |:fileName|Settings file name or path to registry|:fileName => '/etc/init/settings.ini'|
+      #  |:format|Settings storage format. Possible values: Ini, Native, Invalid|:format => 'Ini'|
+	  #
+      # identifier_params_table2
+      #  title: Hash argument when using registry type access to settings
+      #  description: Valid values when using registry type way to access settings.
+      #  |Key|Description|Example|
+      #  |:organization|Organization for the settings|:organization => 'MySoft'|
+      #  |:application|Application using the settings|:application => 'MyApp'|
+      #  |:format|Settings storage format. Possible values: ini, native, invalid. Defaults to Native if not set.|:format => 'native'|
+      #  |:scope|Scope of the settings. User specific or system wide. Possible values: user, system. Defaults to user.|:scope => 'system'|
+	  #
+      # == returns
+      # NilClass
+      #   description: -
+      #   example: -
+      #
+      # == exceptions
+      # ArgumentError
+      #  description:  In case the given parameters are not valid.
+      #    
+	  def set_settings(identifiers, values)
+
+		begin
+		  raise ArgumentError.new("No values to set") unless values
+
+		  params = generate_fixture_params(identifiers, values)
+		  
+		  self.fixture('setting', 'set', params)		  
+
+		rescue Exception => e
+
+		  $logger.log "behaviour" , "FAIL;Failed set settings \"#{identifiers.to_s}\", \"#{values.to_s}\".;set_settings;"
+		  Kernel::raise e
+
+		end
+
+		$logger.log "behaviour" , "PASS;Operation set settings executed successfully \"#{identifiers.to_s}\", \"#{values.to_s}\".;set_settings;"
+
+		nil
+	  end
+  
+
+      # == description
+	  # Remove the settings corresponding to the given keys from the settings idenfitied by 
+	  # the identifiers.
+	  # 
+      # == arguments
+	  # identifiers
+	  #  Hash
+      #   description: Idenfifiers for the settings. See QSettings documentations for details on how
+	  #                settings are accessed. You can use either direct file name or organization and 
+	  #                application name way to access and edit the settings.
+	  #                See [link="#identifier_params_table1"]file path access [/link] and 
+	  #                [link="#identifier_params_table2"]registry access [/link] on how
+	  #                specify the idenfitication details for the settings to be accessed.
+	  #                
+      #   example:     File name: {:fileName => '/etc/init/settings.ini', :format => 'Ini'}
+	  #                Registry: {:organization => 'Tdriver', :application => 'qttasserver'}
+	  #
+	  # setting_keys
+	  #  Array
+      #   description: Array of settings keys which are to be removed.
+      #   example: [setting1, setting2]
+	  #
+      # == returns
+      # NilClass
+      #   description: -
+      #   example: -
+      #
+      # == exceptions
+      # ArgumentError
+      #  description:  In case the given parameters are not valid.
+      #    
+	  def remove_settings(identifiers, setting_keys)
+		begin
+		  raise ArgumentError.new("No settings to remove") unless setting_keys
+		  
+		  params = generate_fixture_params(identifiers, nil)
+		  setting_keys.each{|value| params[value.to_sym] = ''}
+		  
+		  self.fixture('setting', 'remove', params)		  
+
+		rescue Exception => e
+
+		  $logger.log "behaviour" , "FAIL;Failed remove settings \"#{identifiers.to_s}\", \"#{setting_keys.to_s}\".;remove_settings;"
+		  Kernel::raise e
+
+		end
+
+		$logger.log "behaviour" , "PASS;Operation remove settings executed successfully \"#{identifiers.to_s}\", \"#{setting_keys.to_s}\".;remove_settings;"
+
+		nil
+				  
+	  end
+
+      # == description
+	  # Read the setting values corresponding to the given keys from the settings idenfitied by 
+	  # the identifiers.
+	  # 
+      # == arguments
+	  # identifiers
+	  #  Hash
+      #   description: Idenfifiers for the settings. See QSettings documentations for details on how
+	  #                settings are accessed. You can use either direct file name or organization and 
+	  #                application name way to access and edit the settings.
+	  #                See [link="#identifier_params_table1"]file path access [/link] and 
+	  #                [link="#identifier_params_table2"]registry access [/link] on how
+	  #                specify the idenfitication details for the settings to be accessed.
+	  #                
+      #   example:     File name: {:fileName => '/etc/init/settings.ini', :format => 'Ini'}
+	  #                Registry: {:organization => 'Tdriver', :application => 'qttasserver'}
+	  #
+	  # setting_keys
+	  #  Array
+      #   description: Array of settings keys which are to be removed.
+      #   example: [setting1, setting2]
+	  #
+      # == returns
+      # Hash
+      #   description: Hash table with key value pairs for the settings read.
+      #   example: {:setting => 'value'}
+      #
+      # == exceptions
+      # ArgumentError
+      #  description:  In case the given parameters are not valid.
+      #    
+	  def read_settings(identifiers, setting_keys)
+		hash = nil
+		begin
+		  raise ArgumentError.new("No settings to read") unless setting_keys
+
+		  params = generate_fixture_params(identifiers, nil)
+		  setting_keys.each{|value| params[value.to_sym] = ''}
+		  
+		  hash = eval(self.fixture('setting', 'read', params))		  
+		  
+		rescue Exception => e
+
+		  $logger.log "behaviour" , "FAIL;Failed read settings \"#{identifiers.to_s}\", \"#{setting_keys.to_s}\".;read_settings;"
+		  Kernel::raise e
+
+		end
+
+		$logger.log "behaviour" , "PASS;Operation read settings executed successfully \"#{identifiers.to_s}\", \"#{setting_keys.to_s}\".;read_settings;"
+
+		hash
+
+	  end
+
+      # == description
+	  # Read the all the setting values from the settings idenfitied by 
+	  # the identifiers.
+	  # 
+      # == arguments
+	  # identifiers
+	  #  Hash
+      #   description: Idenfifiers for the settings. See QSettings documentations for details on how
+	  #                settings are accessed. You can use either direct file name or organization and 
+	  #                application name way to access and edit the settings.
+	  #                See [link="#identifier_params_table1"]file path access [/link] and 
+	  #                [link="#identifier_params_table2"]registry access [/link] on how
+	  #                specify the idenfitication details for the settings to be accessed.
+	  #                
+      #   example:     File name: {:fileName => '/etc/init/settings.ini', :format => 'Ini'}
+	  #                Registry: {:organization => 'Tdriver', :application => 'qttasserver'}
+	  #
+	  #
+      # == returns
+      # Hash
+      #   description: Hash table with key value pairs for the settings read.
+      #   example: {:setting => 'value'}
+      #
+      # == exceptions
+      # ArgumentError
+      #  description:  In case the given parameters are not valid.
+      #    
+	  def read_all_settings(identifiers)
+		hash = nil
+		begin
+
+		  params = generate_fixture_params(identifiers, nil)
+		  hash = eval(self.fixture('setting', 'readAll', params))		  
+		  
+		rescue Exception => e
+
+		  $logger.log "behaviour" , "FAIL;Failed read all settings \"#{identifiers.to_s}\".;read_all_settings;"
+		  Kernel::raise e
+
+		end
+
+		$logger.log "behaviour" , "PASS;Operation read all settings executed successfully \"#{identifiers.to_s}\".;read_all_settings;"
+
+		hash
+
+	  end
+
+	  private 
+	  
+	  def generate_fixture_params(identifiers, params)
+
+		raise ArgumentError.new("No enough information to access settings. Define filename or organization") unless identifiers[:fileName] or identifiers[:organization]		
+		raise ArgumentError.new("Cannot define both fileName and organization.") if identifiers[:fileName] and identifiers[:organization]
+		
+		fixture_params = Hash.new
+		fixture_params[:settingFileName] = identifiers[:fileName] if identifiers[:fileName]
+		fixture_params[:settingOrganization] = identifiers[:organization] if identifiers[:organization]
+
+		fixture_params[:settingApplication] = identifiers[:application] if identifiers[:application]
+		fixture_params[:settingFormat] = identifiers[:format] if identifiers[:format]
+		fixture_params[:settingScope] = identifiers[:scope] if identifiers[:scope]
+		fixture_params.merge!(params) if params
+		fixture_params
+	  end
+
+	  # enable hooking for performance measurement & debug logging
+	  TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
+
+
+	end # Settings
+
+  end
+
+end # MobyBase

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

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 ############################################################################
 ## 
 ## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 
@@ -116,11 +117,11 @@ module MobyBehaviour
         begin
           # execute the application control service request
           apps = execute_command( MobyCommand::Application.new( :ListStartedApps ) )
-          MobyUtil::Logger.instance.log "behaviour", "PASS;Successfully listed applications.;#{ id };sut;{};list_started_apps;"
+          $logger.log "behaviour", "PASS;Successfully listed applications.;#{ id };sut;{};list_started_apps;"
 
         rescue Exception => e
 
-          MobyUtil::Logger.instance.log "behaviour", "FAIL;Failed to list applications.;#{ id };sut;{};list_started_apps;"
+          $logger.log "behaviour", "FAIL;Failed to list applications.;#{ id };sut;{};list_started_apps;"
           Kernel::raise RuntimeError.new( "Unable to list started applications: Exception: #{ e.message } (#{ e.class })" )
 
         end
@@ -189,6 +190,7 @@ module MobyBehaviour
       # RuntimeError
       #  description: Timeout of %s seconds reached. %s
       def execute_shell_command(command, param = { :detached => "false"} )      
+
         Kernel::raise ArgumentError.new("The command argument must be a non empty String.") unless ( command.kind_of?( String ) and !command.empty? )
         Kernel::raise ArgumentError.new("The parameters argumet must be a Hash.") unless ( param.kind_of?(Hash) )
 
@@ -201,29 +203,36 @@ module MobyBehaviour
         # Launch the program execution into the background, wait for it to finish.
         if param[:wait].to_s == "true"
           param[:threaded] = "true"
-          pid = execute_command( MobyCommand::Application.new( :Shell, command, nil, nil, nil, nil, nil, nil, param ) ).to_i
+
+          #pid = execute_command( MobyCommand::Application.new( :Shell, command, nil, nil, nil, nil, nil, nil, param ) ).to_i
+
+          pid = execute_command( MobyCommand::Application.new( :Shell, { :application_name => command, :flags => param } ) ).to_i
+
           data = "" 
           if pid != 0
-          time = Time.new + timeout
-          while true
-            obj = shell_command(pid)
-            sleep 1
-            data += obj['output']
-            if Time.new > time
-            command_params = {:kill => 'true'}
-            command_output = shell_command(pid, command_params)['output']
-            Kernel::raise RuntimeError.new( "Timeout of #{timeout.to_s} seconds reached. #{command_output}")
-            elsif obj['status'] == "RUNNING"
-            next
-            else 
-            break
+            time = Time.new + timeout
+            while true
+              obj = shell_command(pid)
+              sleep 1
+              data += obj['output']
+              if Time.new > time
+              command_params = {:kill => 'true'}
+              command_output = shell_command(pid, command_params)['output']
+              Kernel::raise RuntimeError.new( "Timeout of #{timeout.to_s} seconds reached. #{command_output}")
+              elsif obj['status'] == "RUNNING"
+              next
+              else 
+              break
+              end
             end
           end
-          end
           return data
         end
 
-        return execute_command( MobyCommand::Application.new( :Shell, command, nil, nil, nil, nil, nil, nil, param ) ).to_s
+        #return execute_command( MobyCommand::Application.new( :Shell, command, nil, nil, nil, nil, nil, nil, nil, param ) ).to_s
+
+        return execute_command( MobyCommand::Application.new( :Shell, { :application_name => command, :flags => param } ) ).to_s
+
       end
 
       # == description
@@ -260,7 +269,11 @@ module MobyBehaviour
       def shell_command(pid, param = {} )
         Kernel::raise ArgumentError.new("pid argument should be positive integer.") unless pid.to_i > 0
         param[ :status ] = 'true'
-        xml_source = execute_command( MobyCommand::Application.new( :Shell, pid.to_s, nil, nil, nil, nil, nil, nil, param ) ).to_s
+
+        #xml_source = execute_command( MobyCommand::Application.new( :Shell, pid.to_s, nil, nil, nil, nil, nil, nil, nil, param ) ).to_s
+        
+        xml_source = execute_command( MobyCommand::Application.new( :Shell, { :application_name => pid.to_s, :flags => param } ) ).to_s
+
         if param[:kill].nil?
           xml = Nokogiri::XML(xml_source)
           data = {}
@@ -314,12 +327,12 @@ module MobyBehaviour
 
     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)
+      $logger.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
+    $logger.log "behaviour" , "PASS;Application found.;#{id.to_s};sut;{};application;" << hash_uid.inspect
 
     app_child
 
@@ -334,8 +347,13 @@ module MobyBehaviour
       #   example: -
       # == exceptions
       def system_information
-        xml_source = execute_command( MobyCommand::Application.new( :SystemInfo, nil) )
+
+        # xml_source = execute_command( MobyCommand::Application.new( :SystemInfo, nil) )
+
+        xml_source = execute_command( MobyCommand::Application.new( :SystemInfo ) )
+
         MobyBase::StateObject.new( xml_source )            
+
       end
 
       # == description
@@ -492,18 +510,34 @@ module MobyBehaviour
       def log_process_mem_start(thread_name, file_name = nil, timestamp_type = nil, interval_s = nil)
         status = nil
         begin
+
+=begin
           status = execute_command(
                        MobyCommand::Application.new(
                                     :ProcessMemLoggingStart,
                                     thread_name,
                                     nil, nil, nil, nil, nil, nil,
                                     {:file_name => file_name, :timestamp => timestamp_type, :interval_s => interval_s} ) )
+=end
+
+          status = execute_command(
+            MobyCommand::Application.new(
+              :ProcessMemLoggingStart,
+              { :application_name => thread_name, :flags => { :file_name => file_name, :timestamp => timestamp_type, :interval_s => interval_s } }
+            ) 
+          )
+
           $logger.log "behaviour", "PASS;Successfully started process memory logging.;#{ id };sut;{};log_process_mem_start;"
+
         rescue Exception => e
+
           $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
+
       end
 
       # == nodoc
@@ -533,12 +567,23 @@ module MobyBehaviour
       def log_process_mem_stop(thread_name, return_data = nil)
         log = nil
         begin
+
+=begin
           log = execute_command(
                     MobyCommand::Application.new(
                                    :ProcessMemLoggingStop,
                                    thread_name,
                                    nil, nil, nil, nil, nil, nil,
                                    {:return_data => return_data} ) )
+=end
+
+          log = execute_command(
+            MobyCommand::Application.new(
+              :ProcessMemLoggingStop,
+              { :application_name => thread_name, :flags => { :return_data => return_data } } 
+            ) 
+          )
+
           $logger.log "behaviour", "PASS;Successfully stopped process memory logging.;#{ id };sut;{};log_process_mem_stop;"
         rescue Exception => e
           $logger.log "behaviour", "FAIL;Failed to stop process memory logging.;#{ id };sut;{};log_process_mem_stop;"
@@ -564,18 +609,34 @@ module MobyBehaviour
       #   description: -
       #   example: -
       #
-      def cpu_load_start(load)
+      def cpu_load_start( cpu_load )
         begin
+
+=begin
           status = execute_command(
                       MobyCommand::Application.new(
                                  :CpuLoadStart,
                                  nil, nil, nil, nil, nil, nil, nil,
-                                 {:cpu_load => load} ) )
+                                 {:cpu_load => cpu_load} ) )
+=end
+
+          status = execute_command(
+            MobyCommand::Application.new(
+              :CpuLoadStart,
+              { :flags => { :cpu_load => cpu_load } } 
+            ) 
+          )
+
           $logger.log "behaviour", "PASS;Successfully started generating CPU load.;#{ id };sut;{};cpu_load_start;"
+
         rescue Exception => e
+
           $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
 
       # == description
@@ -644,7 +705,7 @@ module MobyBehaviour
           # the behaviour returns the amout of behaviours
           # sleep to avoid sending messages to the app untill the 
           # commands have been executed
-          sleep (ret*interval)
+          sleep ( ret * interval )
 
           $logger.log "behaviour", "PASS;Successfully executed grouped behaviours.;#{ id };sut;{};group_behaviours;"
         rescue Exception => e
@@ -688,7 +749,6 @@ module MobyBehaviour
 
       # enable hooking for performance measurement & debug logging
       TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
-
     end 
 
   end

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

@@ -34,9 +34,10 @@ module MobyPlugin
 			## plugin configuration, constructor and deconstructor methods
 			def self.plugin_name
 
+				#File.basename( __FILE__, '.rb' ).downcase # => "tdriver-qt-sut-plugin" 
+
 				# return plugin name as string
 				"testability-driver-qt-sut-plugin"
-				#File.basename( __FILE__, '.rb' ).downcase # => "tdriver-qt-sut-plugin" 
 
 			end
 
@@ -52,19 +53,19 @@ module MobyPlugin
 				# load plugin specific implementation or other initialization etc.
 				MobyUtil::FileHelper.load_modules( 
 
-					# load utility module(s)
+					# load utility modules
 					'util/*.rb', 
 
-					# sut adapter
+					# sut communication class
 					'sut/communication.rb', 
 
-					# sut adapter
+					# sut adapter class
 					'sut/adapter.rb', 
 
 					# sut controller
 					'sut/controller.rb', 
 
-					# qt behaviour abstract
+					# qt behaviour abstraction class
 					'behaviours/behaviour.rb', 
 
 					# load behaviour(s)
@@ -99,13 +100,34 @@ module MobyPlugin
 			# returns SUT object - this method will be called from MobyBase::SUTFactory
 			def self.make_sut( sut_id )
 
-				# tcp/ip read/write timeouts, default: 15 (seconds)
-				socket_read_timeout  = $parameters[ sut_id ][ :socket_read_timeout,  "15" ].to_i
-				socket_write_timeout = $parameters[ sut_id ][ :socket_write_timeout, "15" ].to_i
-
+        # create sut object
 				MobyBase::SUT.new(
-					MobyBase::SutController.new( "QT", MobyController::QT::SutAdapter.new( sut_id, socket_read_timeout, socket_write_timeout ) ), 
-					MobyBase::TestObjectFactory.instance, 
+
+          # create controller for sut
+					MobyBase::SutController.new( 
+
+            # controller id
+            "QT", 
+
+            # create sut adapter
+            MobyController::QT::SutAdapter.new( 
+
+              # sut id
+              sut_id,
+
+      				# tcp/ip read timeouts, default: 15 (seconds) 
+              $parameters[ sut_id ][ :socket_read_timeout,  "15" ].to_i,
+
+      				# tcp/ip write timeouts, default: 15 (seconds)
+              $parameters[ sut_id ][ :socket_write_timeout, "15" ].to_i
+            )
+
+          ), 
+
+          # pass test object factory class
+					MobyBase::TestObjectFactory.instance,
+
+          # pass sut id
 					sut_id 
 				)
 
@@ -115,7 +137,7 @@ module MobyPlugin
 			TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
 
 			# register plugin
-			MobyUtil::PluginService.instance.register_plugin( self ) # Note: self is MobyPlugin::QT::SUT
+			TDriver::PluginService.register_plugin( self )
 
 		end # SUT
 

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

@@ -203,10 +203,14 @@ module MobyController
         # inflate the message body if compressed
         if ( header[ 3 ] == 2 )
 
-          # remove leading 4 bytes
-          body = body[ 4 .. -1 ]
-
-          body = Zlib::Inflate.inflate( body ) unless body.empty?
+		  if $parameters[ @sut_id ][ :win_native, false ] == "true"
+			zstream = Zlib::Inflate.new(-Zlib::MAX_WBITS)			
+			body = zstream.inflate(body) unless body.empty?
+		  else
+			# remove leading 4 bytes		  
+			body = body[ 4 .. -1 ] 
+			body = Zlib::Inflate.inflate( body ) unless body.empty?
+		  end
 
         end
 

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

@@ -167,6 +167,7 @@ module MobyUtil
 		    'application_path' => @_application_name, 
 		    'arguments' => arguments, 
 		    'environment' => @_environment, 
+		    'directory' => @_working_directory,
 		    'events_to_listen' => @_events_to_listen, 
 		    'signals_to_listen' => @_signals_to_listen, 
 		    'start_command' => @_start_command 

data/xml/behaviour/qt.xml

@@ -676,6 +676,32 @@
 
     </behaviour>
 
+
+    <behaviour name="Settings" object_type="sut" sut_type="QT" env="qt" input_type="*" version="*">
+
+		<module name="MobyBehaviour::QT::Settings" />
+
+        <methods>
+            <method name="set_settings">
+                <description>Set settintgs</description>
+                <example>set_settins</example>
+            </method>
+            <method name="remove_settings">
+                <description>Remove settings.</description>
+                <example>remove_settings</example>
+            </method>
+            <method name="read_settings">
+                <description>Read settings</description>
+                <example>read_settings</example>
+            </method>
+            <method name="read_all_settings">
+                <description>Read all settings</description>
+                <example>read_all_settings</example>
+            </method>
+        </methods>
+
+    </behaviour>
+
     <behaviour name="QtInfoLoggerBehaviour" object_type="sut;application" sut_type="QT" env="qt" input_type="*" version="*">
 
         <module name="MobyBehaviour::QT::InfoLoggerBehaviour" />

data/xml/keymap/qt.xml

@@ -317,5 +317,5 @@
 	<parameter name="kPlay" value="0x01020005"/>
 	<parameter name="kSleep" value="0x01020004"/>
 	<parameter name="kZoom" value="0x01020006"/>
-	<parameter name="kCancel" valu="0x01020001"/>
-</keymap>
+	<parameter name="kCancel" value="0x01020001"/>
+</keymap>

data/xml/template/qt.xml

@@ -17,7 +17,7 @@
 		<parameter name="input_type" value="touch" /> <!-- overwrites default value -->
 
 		<!-- keymap definitions -->
-		<keymap xml_file="keymaps/qt.xml" />
+		<keymap xml_file="keymaps/qt.xml" env="qt" />
 
 		<!-- gesture defaults -->
 		<parameter name="gesture_flick_distance" value="150" />
@@ -83,6 +83,7 @@
           		<fixture name="mobilitysysinfo" plugin="mobilitysysinfofixture" env="qt"/>
           		<fixture name="contact" plugin="contactfixture" env="qt"/>
                 <fixture name="launch" plugin="launchfixture" env="qt"/>
+                <fixture name="setting" plugin="settingfixture" env="qt"/>
         	</fixtures>
 	</template>
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testability-driver-qt-sut-plugin
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  hash: 17
+  prerelease: 
+  segments: 
+  - 1
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - TDriver team
@@ -9,19 +15,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 +02:00
-default_executable: 
+date: 2011-04-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: testability-driver
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 0
+        - 8
+        - 3
         version: 0.8.3
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: testabilitydriver@nokia.com
 executables: []
@@ -52,6 +63,7 @@ files:
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/qt_api_method.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/record.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/screen_capture.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/settings.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/sut.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/synchronization.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/treewidgetitemcolumn.rb
@@ -92,7 +104,7 @@ files:
 - xml/defaults/sut_qt.xml
 - xml/keymap/qt.xml
 - xml/template/qt.xml
-has_rdoc: true
+- installer/extconf.rb
 homepage: http://gitorious.org/tdriver
 licenses: []
 
@@ -102,21 +114,27 @@ 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.5
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Testability Driver - Testability Driver Interface Qt SUT plugin