Merge commit 'origin/master'

debian/control

@@ -61,7 +61,7 @@ Description: applauncherd unit tests
 Package: applauncherd-testscripts
 Section: extra
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, applauncherd-testapps, testrunner, applauncherd, ci-testing, matti, libcreds2 [arm armel], libcreds2-tools [arm armel], meego-env, mcetools (>= 1.10.40) 
+Depends: ${shlibs:Depends}, ${misc:Depends}, applauncherd-testapps, testrunner, applauncherd, ci-testing, testability-driver, libcreds2 [arm armel], libcreds2-tools [arm armel], meego-env, mcetools (>= 1.10.40), rdoc
 XB-Maemo-CI-Packages: applauncherd
 XB-Maemo-CI-Stage: fast, staging, acceptance, validation
 Description: applauncherd testscripts

tests/TestScripts/tc_theming.rb

@@ -39,7 +39,7 @@ graphics:
   * verify that (1) and (2) are equal
 """
 
-require 'matti'
+require 'tdriver'
 require 'date'
 require 'test/unit'
 include MattiVerify
@@ -70,7 +70,7 @@ class TC_Theming < Test::Unit::TestCase
 
     def setup
         system('mcetool --set-tklock-mode=unlocked')
-        @sut = MATTI.sut(:Id => ARGV[0] || 'sut_qt_maemo') 
+        @sut = TDriver.sut(:Id => ARGV[0] || 'sut_qt_maemo') 
     end
 
     def test_global_theming

tests/TestScripts/ts_prestartapp.rb

@@ -21,7 +21,7 @@
 #  * Objectives: Test that a prestarted application can be 
 #    launched as well    
 
-require 'matti'
+require 'tdriver'
 require 'date'
 require 'test/unit'
 include MattiVerify
@@ -37,7 +37,7 @@ class TC_PRESTARTLAUNCHTESTS < Test::Unit::TestCase
     # method called before any test case
     def setup
         system "mcetool --set-tklock-mode=unlocked"
-        @sut = MATTI.sut(:Id=>ARGV[0] || 'sut_qt_maemo')    
+        @sut = TDriver.sut(:Id=>ARGV[0] || 'sut_qt_maemo')    
     end
     
     # method called after any test case for cleanup purposes