testability-driver 1.3.0 → 1.3.1

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

@@ -83,8 +83,9 @@ module TDriver
               if @@rcv_raise_errors == 'true' || @@reporter_attached == 'false'
 
                 raise MobyBase::ContinuousVerificationError.new(
-                  "Verification failed as an exception was thrown when the verification block was executed. %s\nDetails: %s\nNested exception:\n%s" % [ verify.source, ( verify.message || "none" ), e.inspect ]
+                  "Verification failed as an exception was thrown when the verification block was executed. #{ verify.source }\nDetails: #{ ( verify.message || "none" ) }\nNested exception:\n#{ e.inspect }"
                 )
+                
               elsif @@reporter_attached == 'true' && @@rcv_raise_errors == 'false'
 
                 TDriverReportAPI::tdriver_report_set_test_case_status('failed') if @@rcv_fail_test_case == 'true'
@@ -99,7 +100,7 @@ module TDriver
                   
                 end
 
-                TDriverReportAPI::tdriver_report_log("Verification failed as an exception was thrown when the verification block was executed. %s\nDetails: %s\nNested exception:\n%s" % [ verify.source, ( verify.message || "none" ), e.inspect ])
+                TDriverReportAPI::tdriver_report_log("Verification failed as an exception was thrown when the verification block was executed. #{ verify.source }\nDetails: #{ ( verify.message || "none" ) }\nNested exception:\n#{ e.inspect }")
 
                 TDriverReportAPI::tdriver_report_log("<hr />")
                 
@@ -115,9 +116,7 @@ module TDriver
               if @@rcv_raise_errors == 'true' || @@reporter_attached == 'false'
               
                 raise MobyBase::ContinuousVerificationError.new(
-                  "Verification failed. %s\nDetails: %s\nThe block did not return %s. It returned: %s" % [ 
-                    verify.source, ( verify.message || "none" ), verify.expected.inspect, result.inspect 
-                  ]
+                  "Verification failed. #{ verify.source }\nDetails: #{ ( verify.message || "none" ) }\nThe block did not return #{ verify.expected.inspect }. It returned: #{ result.inspect }"
                 )
                 
               elsif @@reporter_attached == 'true' && @@rcv_raise_errors == 'false'
@@ -135,9 +134,7 @@ module TDriver
                 end
                 
                 TDriverReportAPI::tdriver_report_log(
-                  "Verification failed. %s\nDetails: %s\nThe block did not return %s. It returned: %s " % [ 
-                    verify.source, ( verify.message || "none" ), verify.expected.inspect, result.inspect
-                  ]
+                  "Verification failed. #{ verify.source }\nDetails: #{ ( verify.message || "none" ) }\nThe block did not return #{ verify.expected.inspect }. It returned: #{ result.inspect } "
                 )
                 
                 TDriverReportAPI::tdriver_report_log("<hr />")
@@ -158,7 +155,7 @@ module TDriver
 
             @@inside_verify = false
 
-            Kernel::raise e
+            raise e
           
           end
 

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

@@ -355,7 +355,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
 
@@ -402,7 +402,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
             
@@ -447,7 +447,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
             
@@ -462,7 +462,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
@@ -622,7 +622,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

data/lib/tdriver/matti.rb

@@ -26,7 +26,7 @@ class MATTI
 
 		file, line = caller.first.split(":")
 
-		$stderr.puts "%s:%s warning: deprecated class %s, use %s#%s instead" % [ file, line, self.name, "TDriver", method_id.to_s ]
+		$stderr.puts "#{ file }:#{ line } warning: deprecated class #{ self.name }, use TDriver##{ method_id.to_s } instead"
 
 		TDriver.respond_to?( method_id ) ? TDriver.method( method_id ).call( *args ) : super
 

data/lib/tdriver/report/error_recovery/tdriver_error_recovery.rb

@@ -32,8 +32,9 @@ module TDriverErrorRecovery
         extend DL::Importable
         dlload "callbackif"
         extern "void restartDatagateway(const char*)"
-        extern "int error()"
+        extern "void restartHardware(const char*)"
         extern "int getBootTimeout(const char*)"
+        extern "int error()"
       end')
     end
 
@@ -73,11 +74,19 @@ module TDriverErrorRecovery
     b_error_recovery_succesful=false
     while current_reconnect_attempt.to_i<attempt_reconnects.to_i
       if @recovery_settings.get_ats4_error_recovery_enabled=='true'
-        MobyUtil::Logger.instance.log "behaviour" , "WARNING;Restarting ATS4 DataGateway"
-        TDriver_Error_Recovery_ATS4.restartDatagateway(current_sut.id.to_s);
+        MobyUtil::Logger.instance.log "behaviour" , "WARNING;ATS4 Restarting Device #{current_sut.id}"
+        #TDriver_Error_Recovery_ATS4.restartDatagateway(current_sut.id.to_s);
+        current_sut.disconnect
+        TDriver_Error_Recovery_ATS4.restartHardware(current_sut.id.to_s);
         ats_timeout=TDriver_Error_Recovery_ATS4.getBootTimeout(current_sut.id.to_s);
-        sleep ats_timeout.to_i
-        MobyUtil::Logger.instance.log "behaviour" , "WARNING;ATS4 DataGateway restarted"
+        MobyUtil::Logger.instance.log "behaviour" , "WARNING;Waiting for ATS4 error recovery #{ats_timeout}s"
+        if ats_timeout.to_i > 0
+          sleep ats_timeout.to_i
+        else
+          MobyUtil::Logger.instance.log "behaviour" , "WARNING;Waiting ATS4 boot timeout is 0 using wait_time_for_ats4_error_recovery parameter timeout #{@recovery_settings.wait_time_for_ats4_error_recovery}s"
+          sleep @recovery_settings.wait_time_for_ats4_error_recovery.to_i
+        end
+        MobyUtil::Logger.instance.log "behaviour" , "WARNING;ATS4 Restarted Device #{current_sut.id}"
       else
         MobyUtil::Logger.instance.log "behaviour" , "WARNING;Resetting sut: #{current_sut.id.to_s}"
         current_sut.reset
@@ -91,7 +100,7 @@ module TDriverErrorRecovery
         current_reconnect_attempt+=1
       end
     end
-    Kernel::raise MobyBase::BehaviourError.new("Error Recovery", "Error recovery failed after #{attempt_reconnects} recovery attempts") if b_error_recovery_succesful==false
+    raise MobyBase::BehaviourError.new("Error Recovery", "Error recovery failed after #{attempt_reconnects} recovery attempts") if b_error_recovery_succesful==false
   end
 
   # Reconnects the devices without ping
@@ -100,7 +109,7 @@ module TDriverErrorRecovery
   # === raises
   def reconnect_devices()
 
-      MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
+      TDriver::SUTFactory.connected_suts.each do |sut_id, sut_attributes|
         suts=@recovery_settings.get_monitored_sut
         suts.each do |monitored_sut|
           if sut_id.to_s==monitored_sut.to_s
@@ -142,7 +151,7 @@ module TDriverErrorRecovery
   # === raises
   def ping_devices_and_reconnect()
     resetted=false
-    MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
+    TDriver::SUTFactory.connected_suts.each do |sut_id, sut_attributes|
         suts=@recovery_settings.get_monitored_sut
         suts.each do |monitored_sut|
           if sut_id.to_s==monitored_sut.to_s

data/lib/tdriver/report/error_recovery/tdriver_error_recovery_settings.rb

@@ -48,25 +48,25 @@ class TDriverErrorRecoverySettings
   # === raises
   def read_settings()
     @error_recovery_enabled= $parameters[ :error_recovery_enabled ]
-    Kernel::raise MobyBase::BehaviourError.new("error recovery", "error recovery enabled parameter not defined in tdriver_parameters.xml") if @error_recovery_enabled == nil
+    raise MobyBase::BehaviourError.new("error recovery", "error recovery enabled parameter not defined in tdriver_parameters.xml") if @error_recovery_enabled == nil
 
     @ats4_error_recovery_enabled= $parameters[ :ats4_error_recovery_enabled ]
-    Kernel::raise MobyBase::BehaviourError.new("error recovery", "ats4 error recovery enabled parameter not defined in tdriver_parameters.xml") if @ats4_error_recovery_enabled == nil
+    raise MobyBase::BehaviourError.new("error recovery", "ats4 error recovery enabled parameter not defined in tdriver_parameters.xml") if @ats4_error_recovery_enabled == nil
 
     @wait_time_for_ats4_error_recovery= $parameters[ :wait_time_for_ats4_error_recovery ]
-    Kernel::raise MobyBase::BehaviourError.new("error recovery", "ats4 error recovery wait time parameter not defined in tdriver_parameters.xml") if @wait_time_for_ats4_error_recovery == nil
+    raise MobyBase::BehaviourError.new("error recovery", "ats4 error recovery wait time parameter not defined in tdriver_parameters.xml") if @wait_time_for_ats4_error_recovery == nil
 
     @ping_connection= $parameters[ :ping_connection ]
-    Kernel::raise MobyBase::BehaviourError.new("error recovery", "ping connection parameter not defined in tdriver_parameters.xml") if @ping_connection == nil
+    raise MobyBase::BehaviourError.new("error recovery", "ping connection parameter not defined in tdriver_parameters.xml") if @ping_connection == nil
 
     @reconnect_device= $parameters[ :reconnect_device ]
-    Kernel::raise MobyBase::BehaviourError.new("error recovery", "reconnect device patameter not defined in tdriver_parameters.xml") if @reconnect_device == nil
+    raise MobyBase::BehaviourError.new("error recovery", "reconnect device patameter not defined in tdriver_parameters.xml") if @reconnect_device == nil
 
     @reconnect_attempts= $parameters[ :reconnect_attempts ]
-    Kernel::raise MobyBase::BehaviourError.new("error recovery", "reconnect attempts patameter not defined in tdriver_parameters.xml") if @reconnect_attempts == nil
+    raise MobyBase::BehaviourError.new("error recovery", "reconnect attempts patameter not defined in tdriver_parameters.xml") if @reconnect_attempts == nil
 
     str_parameter= $parameters[ :error_recovery_monitored_sut_ids ]
-    Kernel::raise MobyBase::BehaviourError.new("error recovery", "error_recovery_monitored_sut_ids patameter not defined in tdriver_parameters.xml") if str_parameter == nil
+    raise MobyBase::BehaviourError.new("error recovery", "error_recovery_monitored_sut_ids patameter not defined in tdriver_parameters.xml") if str_parameter == nil
     @monitored_suts=str_parameter.split('|')
 
 

data/lib/tdriver/report/report_api.rb

@@ -20,8 +20,15 @@
 
 module TDriverReportAPI
 
+  # This method returns all the current executed test by status
+  #
+  # === params
+  # status_type: tests status
+  # === returns
+  # Array
+  # === raises
   def tdriver_get_current_by_status( status_type )
-    Kernel::raise TypeError.new("Argument to method cannot be nil.") if status_type.nil?
+    raise TypeError.new("Argument to method cannot be nil.") if status_type.nil?
     ret = []
     if $tdriver_reporter!=nil
       ret = $tdriver_reporter.parse_results_for_current_test(status_type)
@@ -29,8 +36,15 @@ module TDriverReportAPI
     return ret
   end
 
+  # This method returns all the tests
+  #
+  # === params
+  # status_type: tests status
+  # === returns
+  # Array
+  # === raises
   def tdriver_get_status(status_type)
-    Kernel::raise TypeError.new("Argument to method cannot be nil.") if status_type.nil?
+    raise TypeError.new("Argument to method cannot be nil.") if status_type.nil?
     ret = []
     if $tdriver_reporter!=nil
       ret = $tdriver_reporter.read_result_storage(status_type)
@@ -38,54 +52,118 @@ module TDriverReportAPI
     return ret
   end
 
+  # This method returns all the sequential fails
+  #
+  # === params
+  # nil
+  # === returns
+  # String
+  # === raises
   def tdriver_get_sequential_fails    
     return $tdriver_reporter.get_sequential_fails if $tdriver_reporter
   end
   
-  
+  # This method updates the sequential fail status
+  #
+  # === params
+  # status: fail status
+  # === returns
+  # nil
+  # === raises
   def tdriver_update_sequential_fails( status )
      $tdriver_reporter.update_sequential_fails( status ) if $tdriver_reporter
   end
-  
+
+  # This method logs data to the test case
+  #
+  # === params
+  # data: the data to be logged
+  # === returns
+  # nil
+  # === raises
   def tdriver_log_data(data)
-    Kernel::raise TypeError.new("Argument to method cannot be nil.") if data.nil?
+    raise TypeError.new("Argument to method cannot be nil.") if data.nil?
     if $tdriver_reporter!=nil
       $tdriver_reporter.set_user_data(data)
     end
   end
 
+  # This method captures sut state to test case
+  #
+  # === params
+  # capture_screen_shot: include screenshot to the capture
+  # === returns
+  # nil
+  # === raises
   def tdriver_capture_state(capture_screen_shot=true)
     if $tdriver_reporter
       $new_test_case.capture_dump(capture_screen_shot) if $new_test_case
     end
   end
 
+  # This method captures sut state to test case with comments
+  #
+  # === params
+  # arguments: optional aguments
+  # === returns
+  # nil
+  # === raises
   def tdriver_capture_screen(arguments=Hash.new)
     if $tdriver_reporter
       $new_test_case.capture_dump(true,arguments) if $new_test_case
     end
   end
 
+  # This method logs data to the total run table
+  #
+  # === params
+  # column_name: name of the column
+  # value: value for the entry
+  # === returns
+  # nil
+  # === raises
   def tdriver_log_data_in_total_run_table(column_name,value)
-    Kernel::raise TypeError.new("Argument to method cannot be nil.") if column_name.nil? || value.nil?
+    raise TypeError.new("Argument to method cannot be nil.") if column_name.nil? || value.nil?
     if $tdriver_reporter!=nil
       $tdriver_reporter.set_user_table_data(column_name,value)
     end
   end
 
+  # This method logs data test case details
+  #
+  # === params
+  # message: message to be logged in to details(Supports html for formatting the entry)
+  # === returns
+  # nil
+  # === raises
   def tdriver_report_log(message)
-  	Kernel::raise TypeError.new("Argument message was not a String.") unless message.nil? or message.kind_of?(String)
+  	raise TypeError.new("Argument message was not a String.") unless message.nil? or message.kind_of?(String)
     if $tdriver_reporter
       $new_test_case.set_test_case_execution_log(message) if $new_test_case
     end
   end
 
+  # This method changes the test case result
+  #
+  # === params
+  # status: new test case status
+  # === returns
+  # nil
+  # === raises
   def tdriver_report_set_test_case_status(status)
-  	Kernel::raise TypeError.new("Argument status was not a String.") unless status.nil? or status.kind_of?(String)
+  	raise TypeError.new("Argument status was not a String.") unless status.nil? or status.kind_of?(String)
     if $tdriver_reporter!=nil
       $tdriver_reporter.set_test_case_user_defined_status(status)
     end
   end
+
+  # This method returns how many tests has been executed
+  #
+  # === params
+  # nil
+  # === returns
+  # Integer
+  # === raises
   def tdriver_report_total_tests_run()
     total=0
     if $tdriver_reporter!=nil
@@ -93,6 +171,14 @@ module TDriverReportAPI
     end
     return total.to_i
   end
+
+  # This method returns how many tests has passed
+  #
+  # === params
+  # nil
+  # === returns
+  # Integer
+  # === raises
   def tdriver_report_total_passed_tests()
     total=0
     if $tdriver_reporter!=nil
@@ -100,6 +186,14 @@ module TDriverReportAPI
     end
     return total.to_i
   end
+
+  # This method returns how many tests has failed
+  #
+  # === params
+  # nil
+  # === returns
+  # Integer
+  # === raises
   def tdriver_report_total_failed_tests()
     total=0
     if $tdriver_reporter!=nil
@@ -107,6 +201,14 @@ module TDriverReportAPI
     end
     return total.to_i
   end
+
+  # This method returns how many tests were not run
+  #
+  # === params
+  # nil
+  # === returns
+  # Integer
+  # === raises
   def tdriver_report_total_not_run_tests()
     total=0
     if $tdriver_reporter!=nil
@@ -114,6 +216,14 @@ module TDriverReportAPI
     end
     return total.to_i
   end
+
+  # This method returns current report folder
+  #
+  # === params
+  # nil
+  # === returns
+  # String
+  # === raises
   def tdriver_report_folder()
     folder=nil
     if $tdriver_reporter!=nil
@@ -121,6 +231,14 @@ module TDriverReportAPI
     end
     return folder.to_s
   end
+
+  # This method returns test case start time
+  #
+  # === params
+  # nil
+  # === returns
+  # String
+  # === raises
   def tdriver_report_start_time()
     start_time=nil
     if $tdriver_reporter!=nil
@@ -128,6 +246,14 @@ module TDriverReportAPI
     end
     return start_time.to_s
   end
+
+  # This method current execution time
+  #
+  # === params
+  # nil
+  # === returns
+  # String
+  # === raises
   def tdriver_report_run_time()
     run_time=nil
     if $tdriver_reporter!=nil
@@ -135,6 +261,14 @@ module TDriverReportAPI
     end
     return run_time.to_s
   end
+
+  # This method returns the amount of crash files
+  #
+  # === params
+  # nil
+  # === returns
+  # Integer
+  # === raises
   def tdriver_report_total_crash_files()
     crash_files=0
     if $tdriver_reporter!=nil
@@ -142,6 +276,14 @@ module TDriverReportAPI
     end
     return crash_files.to_i
   end
+
+  # This method returns the amount of device resets
+  #
+  # === params
+  # nil
+  # === returns
+  # Integer
+  # === raises
   def tdriver_report_total_device_resets()
     device_resets=0
     if $tdriver_reporter!=nil
@@ -149,6 +291,14 @@ module TDriverReportAPI
     end
     return device_resets.to_i
   end
+
+  # This method can combine previous results to the current execution
+  #
+  # === params
+  # nil
+  # === returns
+  # Integer
+  # === raises
   def tdriver_report_combine_reports(reports)
     if $tdriver_reporter!=nil
       $tdriver_reporter.combine_results(reports)
@@ -160,81 +310,24 @@ module TDriverReportAPI
     end
   end
 
-  #old api methods
-
-  def matti_log_data(data)
-    file, line = caller.first.split(":")
-    $stderr.puts "%s:%s warning: method deprecated" % [ file, line]
-    tdriver_log_data(data)
-  end
-  def matti_report_log(message)
-    file, line = caller.first.split(":")
-    $stderr.puts "%s:%s warning: method deprecated" % [ file, line]
-  	tdriver_report_log(message)
-  end
-  def matti_report_set_test_case_status(status)
-    file, line = caller.first.split(":")
-    $stderr.puts "%s:%s warning: method deprecated" % [ file, line]
-  	tdriver_report_set_test_case_status(status)
-  end
-  def matti_report_total_tests_run()
-    file, line = caller.first.split(":")
-    $stderr.puts "%s:%s warning: method deprecated" % [ file, line]
-    tdriver_report_total_tests_run()
-  end
-  def matti_report_total_passed_tests()
-    file, line = caller.first.split(":")
-    $stderr.puts "%s:%s warning: method deprecated" % [ file, line]
-    tdriver_report_total_passed_tests()
-  end
-  def matti_report_total_failed_tests()
-    file, line = caller.first.split(":")
-    $stderr.puts "%s:%s warning: method deprecated" % [ file, line]
-    tdriver_report_total_failed_tests()
-  end
-  def matti_report_total_not_run_tests()
-    file, line = caller.first.split(":")
-    $stderr.puts "%s:%s warning: method deprecated" % [ file, line]
-    tdriver_report_total_not_run_tests()
-  end
-  def matti_report_folder()
-    file, line = caller.first.split(":")
-    $stderr.puts "%s:%s warning: method deprecated" % [ file, line]
-    tdriver_report_folder()
-  end
-  def matti_report_start_time()
-    file, line = caller.first.split(":")
-    $stderr.puts "%s:%s warning: method deprecated" % [ file, line]
-    tdriver_report_start_time()
-  end
-  def matti_report_run_time()
-    file, line = caller.first.split(":")
-    $stderr.puts "%s:%s warning: method deprecated" % [ file, line]
-    tdriver_report_run_time()
-  end
-  def matti_report_total_crash_files()
-    file, line = caller.first.split(":")
-    $stderr.puts "%s:%s warning: method deprecated" % [ file, line]
-    tdriver_report_total_crash_files()
-  end
-  def matti_report_total_device_resets()
-    file, line = caller.first.split(":")
-    $stderr.puts "%s:%s warning: method deprecated" % [ file, line]
-    tdriver_report_total_device_resets()
-  end
-  def matti_report_combine_reports(reports)
-    file, line = caller.first.split(":")
-    $stderr.puts "%s:%s warning: method deprecated" % [ file, line]
-    tdriver_report_combine_reports(reports)
+  # This method returns the amount of device resets
+  #
+  # === params
+  # nil
+  # === returns
+  # Integer
+  # === raises
+  def tdriver_report_current_test_case_dir()
+    test_case_path=''
+    if $new_test_case!=nil
+      test_case_path=$new_test_case.test_case_folder
+    end
+    return test_case_path.to_s
   end
-
+  
 
 end #TDriverReportAPI
 
-module MattiReportAPI
-
-  include TDriverReportAPI
 
-end