testability-driver 1.3.0 → 1.3.1

data/lib/tdriver/base/sut/generic/behaviours/application.rb

@@ -86,13 +86,13 @@ module MobyBehaviour
     #  description: If no application test object is found after close or if this application is still in the foreground after the close.
     #
     # TypeError
-    #  description: Wrong argument type %s for options_hash (expected a Hash, TrueClass or FalseClass)
+    #  description: Wrong argument type <class> for options_hash (expected a Hash, TrueClass or FalseClass)
     #
     # TypeError
-    #  description: Wrong argument type %s for :force_kill (expected NilClass, TrueClass or FalseClass)
+    #  description: Wrong argument type <class> for :force_kill (expected NilClass, TrueClass or FalseClass)
     #
     # TypeError
-    #  description: Wrong argument type %s for :check_process (expected TrueClass or FalseClass)
+    #  description: Wrong argument type <class> for :check_process (expected TrueClass or FalseClass)
     #
     def close( options_hash = {} )
 
@@ -344,9 +344,6 @@ module MobyBehaviour
     #  puts @sut.application.closable #prints foreground application closable status to console (at the moment always true)
     def closable?
 
-      #file, line = caller.first.split(":")
-      #$stderr.puts "%s:%s warning: TestObject#closable? is deprecated" % [ file, line ]
-
       true
 
     end

data/lib/tdriver/base/sut/generic/behaviours/find.rb

@@ -63,7 +63,7 @@ module MobyBehaviour
     #
     # == exceptions
     # TypeError
-    #  description: Wrong argument type %s for attributes (expected Hash)
+    #  description: Wrong argument type <class> for attributes (expected Hash)
     # 
     # ArgumentError
     #  description: Attributes hash must not be empty

data/lib/tdriver/base/sut/generic/behaviours/flash_behaviour.rb

@@ -126,7 +126,7 @@ module MobyBehaviour
 
       begin
         if parameter(:flaxi_flash_attempts)
-          $stderr.puts "%s:%s warning: parameter :flaxi_flash_attempts deprecated use :flash_attempts instead" % [ file, line]
+          $stderr.puts "#{ file.to_s }:#{ line.to_s } warning: parameter :flaxi_flash_attempts deprecated use :flash_attempts instead" 
           parameter[:flash_attempts]=parameter(:flaxi_flash_attempts)
         end
       rescue
@@ -134,7 +134,7 @@ module MobyBehaviour
 
       begin
         if parameter(:flaxi_commands_before_flash)
-          $stderr.puts "%s:%s warning: parameter :flaxi_commands_before_flash deprecated use :commands_before_flash instead" % [ file, line]
+          $stderr.puts "#{ file.to_s }:#{ line.to_s } warning: parameter :flaxi_commands_before_flash deprecated use :commands_before_flash instead" 
           parameter[:commands_before_flash]=parameter(:flaxi_commands_before_flash)
         end
       rescue
@@ -142,7 +142,7 @@ module MobyBehaviour
 
       begin
         if parameter(:flaxi_flash_command)
-          $stderr.puts "%s:%s warning: parameter :flaxi_flash_command deprecated use :flash_command instead" % [ file, line]
+          $stderr.puts "#{ file.to_s }:#{ line.to_s } warning: parameter :flaxi_flash_command deprecated use :flash_command instead" 
           parameter[:flash_command]=parameter(:flaxi_flash_command)
         end
       rescue
@@ -150,7 +150,7 @@ module MobyBehaviour
 
       begin
         if parameter(:flaxi_optional_parameters_after_flashing)
-          $stderr.puts "%s:%s warning: parameter :flaxi_optional_parameters_after_flashing deprecated use :optional_parameters_after_flashing instead" % [ file, line]
+          $stderr.puts "#{ file.to_s }:#{ line.to_s } warning: parameter :flaxi_optional_parameters_after_flashing deprecated use :optional_parameters_after_flashing instead" 
           parameter[:optional_parameters_after_flashing]=parameter(:flaxi_optional_parameters_after_flashing)
         end
       rescue
@@ -158,7 +158,7 @@ module MobyBehaviour
 
       begin
         if parameter(:flaxi_flash_images)
-          $stderr.puts "%s:%s warning: parameter :flaxi_flash_images deprecated use :flash_images instead" % [ file, line]
+          $stderr.puts "#{ file.to_s }:#{ line.to_s } warning: parameter :flaxi_flash_images deprecated use :flash_images instead" 
           parameter[:flash_images]=parameter(:flaxi_flash_images)
         end
       rescue
@@ -166,7 +166,7 @@ module MobyBehaviour
 
       begin
         if parameter(:flaxi_sleep_time_after_flash_command)
-          $stderr.puts "%s:%s warning: parameter :flaxi_sleep_time_after_flash_command deprecated use :sleep_time_after_flash_command instead" % [ file, line]
+          $stderr.puts "#{ file.to_s }:#{ line.to_s } warning: parameter :flaxi_sleep_time_after_flash_command deprecated use :sleep_time_after_flash_command instead" 
           parameter[:sleep_time_after_flash_command]=parameter(:flaxi_sleep_time_after_flash_command)
         end
       rescue
@@ -174,7 +174,7 @@ module MobyBehaviour
 
       begin
         if parameter(:flaxi_command_after_flash)
-          $stderr.puts "%s:%s warning: parameter :flaxi_command_after_flash deprecated use :command_after_flash instead" % [ file, line]
+          $stderr.puts "#{ file.to_s }:#{ line.to_s } warning: parameter :flaxi_command_after_flash deprecated use :command_after_flash instead" 
           parameter[:command_after_flash]=parameter(:flaxi_command_after_flash)
         end
       rescue
@@ -182,7 +182,7 @@ module MobyBehaviour
 
       begin
         if parameter(:flaxi_commands_after_failed_flash)
-          $stderr.puts "%s:%s warning: parameter :flaxi_commands_after_failed_flash deprecated use :commands_after_failed_flash instead" % [ file, line]
+          $stderr.puts "#{ file.to_s }:#{ line.to_s } warning: parameter :flaxi_commands_after_failed_flash deprecated use :commands_after_failed_flash instead" 
           parameter[:commands_after_failed_flash]=parameter(:flaxi_commands_after_failed_flash)
         end
       rescue
@@ -190,7 +190,7 @@ module MobyBehaviour
 
       begin
         if parameter(:flaxi_flash_command_success_string)
-          $stderr.puts "%s:%s warning: parameter :flaxi_flash_command_success_string deprecated use :flash_command_success_string instead" % [ file, line]
+          $stderr.puts "#{ file.to_s }:#{ line.to_s } warning: parameter :flaxi_flash_command_success_string deprecated use :flash_command_success_string instead" 
           parameter[:flash_command_success_string]=parameter(:flaxi_flash_command_success_string)
         end
       rescue
@@ -198,14 +198,14 @@ module MobyBehaviour
         
       if flash_files==nil
         flash_files=parameter(:flash_images)
-        Kernel::raise MobyBase::BehaviourError.new("flash_images", "flash_images not defined for sut in tdriver_parameters.xml") if flash_files == nil
+        raise MobyBase::BehaviourError.new("flash_images", "flash_images not defined for sut in tdriver_parameters.xml") if flash_files == nil
       end
 
       str_flash_command=parameter(:flash_command)
-      Kernel::raise MobyBase::BehaviourError.new("flash_images", "flash_command not defined for sut in tdriver_parameters.xml") if str_flash_command == nil
+      raise MobyBase::BehaviourError.new("flash_images", "flash_command not defined for sut in tdriver_parameters.xml") if str_flash_command == nil
 
       str_optional_parameters=parameter(:optional_parameters_after_flashing,'')
-      Kernel::raise MobyBase::BehaviourError.new("flash_images", "optional_parameters_after_flashing not defined for sut in tdriver_parameters.xml") if str_optional_parameters == nil
+      raise MobyBase::BehaviourError.new("flash_images", "optional_parameters_after_flashing not defined for sut in tdriver_parameters.xml") if str_optional_parameters == nil
 
       #build flash command
       flash_command="#{str_flash_command} #{flash_files} #{str_optional_parameters}"
@@ -213,7 +213,7 @@ module MobyBehaviour
       #start flashing
       result = start_flashing( flash_command )
       
-      Kernel::raise MobyBase::BehaviourError.new("flash_images", "Flashing failed") if result.to_s == 'false'
+      raise MobyBase::BehaviourError.new("flash_images", "Flashing failed") if result.to_s == 'false'
       sleep parameter[:sleep_time_after_flash_command].to_i
     end
 
@@ -250,7 +250,7 @@ module MobyBehaviour
     def start_flashing(flash_command)
 
       flash_attempts=parameter(:flash_attempts)
-      Kernel::raise MobyBase::BehaviourError.new("start_flashing", "flash_attempts not defined for sut in tdriver_parameters.xml") if flash_attempts == nil
+      raise MobyBase::BehaviourError.new("start_flashing", "flash_attempts not defined for sut in tdriver_parameters.xml") if flash_attempts == nil
 
       current_flash_attempt=0
       flash_result='false'

data/lib/tdriver/base/sut/generic/behaviours/sut.rb

@@ -253,7 +253,7 @@ module MobyBehaviour
     #
     # == exception
     # TypeError
-    #  description: Wrong argument type %s for XML (expected MobyUtil::XML::Element, String or NilClass)
+    #  description: Wrong argument type <class> for XML (expected MobyUtil::XML::Element, String or NilClass)
     def xml_data=( xml )
 
       xml.check_type( [ MobyUtil::XML::Element, String, NilClass ], "Wrong argument type $1 for XML (expected $2)" )
@@ -552,7 +552,7 @@ module MobyBehaviour
     #
     # == exceptions
     # TypeError
-    #  description: Wrong argument type %s for attributes (expected Hash)
+    #  description: Wrong argument type <class> for attributes (expected Hash)
     #
     def application( attributes = {} )
 
@@ -614,13 +614,13 @@ module MobyBehaviour
     #
     # == exceptions
     # TypeError
-    #   description: Wrong argument type %s (expected Hash)
+    #   description: Wrong argument type <class> (expected Hash)
     #
     # ArgumentError
     #   description: Output filename (:filename) not defined in argument hash
     #
     # ArgumentError
-    #  description: Wrong argument type %s for output filename (expected String)
+    #  description: Wrong argument type <class> for output filename (expected String)
     #
     # ArgumentError
     #   description: Output filename must not be empty string
@@ -707,7 +707,7 @@ module MobyBehaviour
     #
     # == exceptions
     # TypeError
-    #  description: Wrong argument type %s for run method (expected Hash)
+    #  description: Wrong argument type <class> for run method (expected Hash)
     #
     # ArgumentError
     #  description: Required key :uid or :name not found from argument hash

data/lib/tdriver/base/sut/generic/behaviours/switchbox_behaviour.rb

@@ -65,27 +65,27 @@ module MobyBehaviour
     #  description: switchbox_sleep_after_powerup_in_reboot could not be converted to integer
     def reset
       str_sleep_time_before_powerup = parameter(:switchbox_sleep_before_powerup_in_reboot)
-      Kernel::raise BehaviourError.new("reboot", "switchbox_sleep_before_powerup_in_reboot not defined for sut in tdriver_parameters.xml") if str_sleep_time_before_powerup == nil
+      raise BehaviourError.new("reboot", "switchbox_sleep_before_powerup_in_reboot not defined for sut in tdriver_parameters.xml") if str_sleep_time_before_powerup == nil
 
       str_sleep_time_after_powerup = parameter(:switchbox_sleep_after_powerup_in_reboot)
-      Kernel::raise BehaviourError.new("reboot", "switchbox_sleep_after_powerup_in_reboot not defined for sut in tdriver_parameters.xml") if str_sleep_time_after_powerup == nil
+      raise BehaviourError.new("reboot", "switchbox_sleep_after_powerup_in_reboot not defined for sut in tdriver_parameters.xml") if str_sleep_time_after_powerup == nil
 
       str_commands_after_powerup = parameter(:switchbox_commands_after_powerup_in_reboot)
 
       begin
         sleep_time_before_powerup = str_sleep_time_before_powerup.to_i
-        Kernel::raise BehaviourError.new("reboot", "switchbox_sleep_before_powerup_in_reboot need to be non-negative integer smaller than 50 seconds") if sleep_time_before_powerup < 0 or sleep_time_before_powerup > 50
+        raise BehaviourError.new("reboot", "switchbox_sleep_before_powerup_in_reboot need to be non-negative integer smaller than 50 seconds") if sleep_time_before_powerup < 0 or sleep_time_before_powerup > 50
 
       rescue
-        Kernel::raise BehaviourError.new("reboot", "switchbox_sleep_in_reboot could not be converted to integer")
+        raise BehaviourError.new("reboot", "switchbox_sleep_in_reboot could not be converted to integer")
       end
 
       begin
         sleep_time_after_powerup = str_sleep_time_after_powerup.to_i
-        Kernel::raise BehaviourError.new("reboot", "switchbox_sleep_after_powerup_in_reboot need to be non-negative integer smaller than 500 seconds") if sleep_time_after_powerup < 0 or sleep_time_after_powerup > 500
+        raise BehaviourError.new("reboot", "switchbox_sleep_after_powerup_in_reboot need to be non-negative integer smaller than 500 seconds") if sleep_time_after_powerup < 0 or sleep_time_after_powerup > 500
 
       rescue
-        Kernel::raise BehaviourError.new("reboot", "switchbox_sleep_after_powerup_in_reboot could not be converted to integer")
+        raise BehaviourError.new("reboot", "switchbox_sleep_after_powerup_in_reboot could not be converted to integer")
       end
       
       power_down
@@ -126,12 +126,12 @@ module MobyBehaviour
 
       switchbox_sequence_timeout = parameter(:switchbox_timeout_between_command_sequence)
 
-      Kernel::raise BehaviourError.new("power_down", "switchbox_timeout_between_command_sequence not defined for sut in tdriver_parameters.xml") if switchbox_sequence_timeout == nil
+      raise BehaviourError.new("power_down", "switchbox_timeout_between_command_sequence not defined for sut in tdriver_parameters.xml") if switchbox_sequence_timeout == nil
 
-      Kernel::raise BehaviourError.new("power_down", "switchbox_powerdown_command not defined for sut in tdriver_parameters.xml") if str_command == nil
+      raise BehaviourError.new("power_down", "switchbox_powerdown_command not defined for sut in tdriver_parameters.xml") if str_command == nil
 
       str_result = parameter(:switchbox_powerdown_command_success_string)
-      Kernel::raise BehaviourError.new("power_down", "switchbox_powerdown_command_success string not defined for sut in tdriver_parameters.xml") if str_result == nil
+      raise BehaviourError.new("power_down", "switchbox_powerdown_command_success string not defined for sut in tdriver_parameters.xml") if str_result == nil
 
       #generate the sequence
       str_command_arr = str_command.split('|')
@@ -142,7 +142,7 @@ module MobyBehaviour
         std_out = system(foobox_command)
         $logger.behaviour "PASS;Powerdown command #{foobox_command} executed"
         sleep switchbox_sequence_timeout.to_i
-        Kernel::raise BehaviourError.new("power_down", "Failed to power down") unless std_out.to_s.downcase.include?(str_result.to_s.downcase)
+        raise BehaviourError.new("power_down", "Failed to power down") unless std_out.to_s.downcase.include?(str_result.to_s.downcase)
       end
       @switch_box_power_status = false
     end
@@ -162,13 +162,13 @@ module MobyBehaviour
 
       switchbox_sequence_timeout = parameter(:switchbox_timeout_between_command_sequence)
 
-      Kernel::raise BehaviourError.new("power_down", "switchbox_timeout_between_command_sequence not defined for sut in tdriver_parameters.xml") if switchbox_sequence_timeout == nil
+      raise BehaviourError.new("power_down", "switchbox_timeout_between_command_sequence not defined for sut in tdriver_parameters.xml") if switchbox_sequence_timeout == nil
 
       str_command = parameter(:switchbox_powerup_command_sequence)
-      Kernel::raise BehaviourError.new("power_up", "switchbox_powerup_command not defined for sut in tdriver_parameters.xml") if str_command == nil
+      raise BehaviourError.new("power_up", "switchbox_powerup_command not defined for sut in tdriver_parameters.xml") if str_command == nil
 
       str_result = parameter(:switchbox_powerup_command_success_string)
-      Kernel::raise BehaviourError.new("power_up", "switchbox_powerup_command_success string not defined for sut in tdriver_parameters.xml") if str_result == nil
+      raise BehaviourError.new("power_up", "switchbox_powerup_command_success string not defined for sut in tdriver_parameters.xml") if str_result == nil
 
       #generate the sequence
       str_command_arr = str_command.split('|')
@@ -179,7 +179,7 @@ module MobyBehaviour
         std_out = system(foobox_command)
         $logger.behaviour "PASS;Ppowerup command #{foobox_command} executed"
         sleep switchbox_sequence_timeout.to_i
-        Kernel::raise BehaviourError.new("power_up", "Failed to power up") unless std_out.to_s.downcase.include?(str_result.to_s.downcase)
+        raise BehaviourError.new("power_up", "Failed to power up") unless std_out.to_s.downcase.include?(str_result.to_s.downcase)
       end
 
       @switch_box_power_status = true

data/lib/tdriver/base/sut/generic/behaviours/verification.rb

@@ -64,7 +64,7 @@ module MobyBehaviour
     #
     # == exceptions
     # TypeError
-    #  description: Wrong argument type %s for test object type (expected String)
+    #  description: Wrong argument type <class> for test object type (expected String)
     #
     # ArgumentError
     #  description: The test object type argument must not be empty
@@ -73,7 +73,7 @@ module MobyBehaviour
     #  description: Test object attributes hash argument must not be empty
     #
     # TypeError
-    #  description: Wrong argument type %s for test object attributes (expected Hash)
+    #  description: Wrong argument type <class> for test object attributes (expected Hash)
     def test_object_exists?( *attributes )
 
       begin
@@ -198,22 +198,7 @@ module MobyBehaviour
         $logger.enabled = ( attributes[ :__logging ] == 'true' ? true : false )
 
         # behaviour logging
-        $logger.behaviour(
-        
-          "%s;%s;%s;test_object_exists?;" % [
-          
-            # status
-            ( result == true ? 'PASS' : 'FAIL' ),
-            
-            # description
-            description,
-            
-            # sut id 
-            ( self.kind_of?( MobyBase::SUT ) ? self.id.to_s : '' )
-          
-          ]
-        
-        )
+        $logger.behaviour "#{ ( result == true ? 'PASS' : 'FAIL' ) };#{ description };#{ ( self.sut? ? self.id.to_s : '' ) };test_object_exists?;" 
         
         # raise exception if neccessery
         raise result if result.kind_of?( Exception )

data/lib/tdriver/base/sut/generic/commands/key_sequence.rb

@@ -53,21 +53,21 @@ module MobyCommand
 		# == returns
 		# self
 		# == raises
-		# TypeError:: Wrong argument type %s for times count (expected Fixnum)
-		# ArgumentError:: Positive value expected for times count (got %i)
+		# TypeError:: Wrong argument type <class> for times count (expected Fixnum)
+		# ArgumentError:: Positive value expected for times count (got <value>)
 		# IndexError:: Unable to multiply last given key due to key sequence is empty
 		def times!( count = 1 )
 
       # verify count argument type
-			#Kernel::raise ArgumentError.new("Fixnum expected as argument") if count.class != Fixnum
+			#raise ArgumentError.new("Fixnum expected as argument") if count.class != Fixnum
       count.check_type( Fixnum, "Wrong argument type $1 for times count (expected $2)" )
 
       # verify that count is positive number
-			Kernel::raise ArgumentError.new( "Positive value expected for times count (got #{ count })" ) if count.negative?
+			raise ArgumentError.new( "Positive value expected for times count (got #{ count })" ) if count.negative?
 
       # verify that @sequence is not empty
-			#Kernel::raise IndexError.new( "Not allowed when empty key sequence" ) if @sequence.size == 0
-			Kernel::raise IndexError.new( "Unable to multiply last given key due to key sequence is empty" ) if @sequence.empty?
+			#raise IndexError.new( "Not allowed when empty key sequence" ) if @sequence.size == 0
+			raise IndexError.new( "Unable to multiply last given key due to key sequence is empty" ) if @sequence.empty?
 
 			count.times do | iteration |
 			

data/lib/tdriver/base/sut/generic/plugin.rb

@@ -18,7 +18,7 @@
 ############################################################################
 
 # verify that plugin engine and modules is loaded
-Kernel::raise RuntimeError.new( "This SUT plugin requires Testability Driver and cannot be launched in standalone mode" ) unless defined?( MobyUtil::Plugin )
+raise RuntimeError.new( "This SUT plugin requires Testability Driver and cannot be launched in standalone mode" ) unless defined?( MobyUtil::Plugin )
 
 module MobyPlugin
 
@@ -30,7 +30,8 @@ module MobyPlugin
 			def self.plugin_name
 
 				# return plugin name as string
-				"tdriver-generic-sut-plugin"
+				"testability-driver-generic-sut-plugin"
+				
 			end
 
 			def self.plugin_type
@@ -71,15 +72,9 @@ module MobyPlugin
 
 			end
 
-			# returns SUT object - this method will be called from MobyBase::SUTFactory
+			# returns SUT object - this method will be called from TDriver::SUTFactory
 			def self.make_sut( sut_id )
 
-#				MobyBase::SUT.new( 
-#					MobyBase::SutController.new( "", MobyController::SutAdapter.new() ), 
-#					MobyBase::TestObjectFactory.instance,
-#					sut_id
-#				)
-
 				MobyBase::SUT.new( 
 					MobyBase::SutController.new( "", MobyController::SutAdapter.new() ), 
 					TDriver.TestObjectFactory.new( TDriver::TestObjectAdapter ),

data/lib/tdriver/base/sut/sut.rb

@@ -43,19 +43,15 @@ module MobyBase
     def initialize( sut_controller, test_object_factory, sut_id, test_object_adapter = nil )
 
       @sut_controller = sut_controller
-      
-      #@sut_controller.test_object_factory = test_object_factory
-
-      #@sut_controller.test_object_adapter = test_object_adapter || TDriver::TestObjectAdapter
 
       # remove this line when possible
       @_sutController = sut_controller
 
       # remove this line when possible
-      @test_object_factory = test_object_factory # @sut_controller.test_object_factory
+      @test_object_factory = test_object_factory
       
       # remove this line when possible
-      @test_object_adapter = test_object_adapter || TDriver::TestObjectAdapter #@sut_controller.test_object_adapter
+      @test_object_adapter = test_object_adapter || TDriver::TestObjectAdapter
       
       @id = sut_id
 

data/lib/tdriver/base/test_object/abstract.rb

@@ -175,7 +175,7 @@ module MobyBase
 
       rescue MobyBase::TestObjectNotFoundError
       
-        Kernel::raise MobyBase::TestObjectNotFoundError.new( 
+        raise MobyBase::TestObjectNotFoundError.new( 
 
           "The test object (id: #{ @id.inspect }, type: #{ @type.inspect }, name: #{ @name.inspect }) does not exist on #{ @sut.id.inspect } anymore" 
         

data/lib/tdriver/base/test_object/adapter.rb

@@ -343,7 +343,7 @@ module TDriver
         else
 
           # raise exception if layout direction it not supported 
-          Kernel::raise ArgumentError, "Unsupported layout direction #{ layout_direction.inspect }"
+          raise ArgumentError, "Unsupported layout direction #{ layout_direction.inspect }"
 
         end
 
@@ -388,7 +388,7 @@ module TDriver
           if default.empty?
         
             # raise exception if no such attribute found
-            Kernel::raise MobyBase::AttributeNotFoundError, "Could not find test object element attribute #{ attribute_name.inspect }"
+            raise MobyBase::AttributeNotFoundError, "Could not find test object element attribute #{ attribute_name.inspect }"
 
           else
           
@@ -433,7 +433,7 @@ module TDriver
           if default.empty?
           
             # raise exception if no such attribute found
-            Kernel::raise MobyBase::AttributeNotFoundError, "Could not find attribute #{ attribute_name.inspect }" # for test object of type #{ type.to_s }"
+            raise MobyBase::AttributeNotFoundError, "Could not find attribute #{ attribute_name.inspect }" # for test object of type #{ type.to_s }"
 
           else
           
@@ -448,7 +448,7 @@ module TDriver
       
         # attribute(s) found
         # Need to disable this for now 
-        # Kernel::raise MobyBase::MultipleAttributesFoundError.new( "Multiple attributes found with name '%s'" % name ) if nodeset.count > 1
+        # raise MobyBase::MultipleAttributesFoundError.new( "Multiple attributes found with name '#{ name }'" ) if nodeset.count > 1
 
         # return found attribute
         nodeset.first.content
@@ -605,7 +605,7 @@ module TDriver
       nodeset = test_object.instance_variable_get( :@sut ).xml_data.xpath( test_object.instance_variable_get( :@x_path ) )
 
       # raise exception if no test objects found 
-			Kernel::raise MobyBase::TestObjectNotFoundError if nodeset.empty?
+			raise MobyBase::TestObjectNotFoundError if nodeset.empty?
 			
       # return first test object from the nodeset
 			nodeset.first