testability-driver 1.1.0 → 1.1.1

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

@@ -571,7 +571,8 @@ module MobyBehaviour
       rescue MobyBase::TestObjectNotFoundError, MobyBase::TestObjectNotVisibleError
 
         rules_hash_clone = rules_hash.clone
-        
+
+        # remove type attribute from hash        
         rules_hash_clone.delete(:type)
 
         # string representation of used rule hash, remove curly braces
@@ -589,10 +590,19 @@ module MobyBehaviour
 
         end
 
+        # raise slightly different exception message when receiver test object is type of application
+        if application? 
+
+          message = "The application (id: #{ @id }, name: #{ @name.inspect }) has no child object with type or behaviour method with name #{ method_id.to_s.inspect }#{ attributes_string } on #{ @sut.id.inspect }" 
+
+        else
+
+          message = "The test object (id: #{ @id }, type: #{ @type.inspect }, name: #{ @name.inspect }) has no child object with type or behaviour method with name #{ method_id.to_s.inspect }#{ attributes_string } on #{ @sut.id.inspect }" 
+
+        end
+
         # raise exception
-        Kernel::raise MobyBase::TestObjectNotFoundError.new(
-          "The test object (id: #{ @id }, type: #{ @type.inspect }, name: #{ @name.inspect }) has no child object with type or behaviour method with name #{ method_id.to_s.inspect }#{ attributes_string } on #{ @sut.id.inspect }" 
-        )
+        raise MobyBase::TestObjectNotFoundError, message
 
       end
 

data/lib/tdriver/loader.rb

@@ -39,9 +39,7 @@ require File.expand_path( File.join( File.dirname( __FILE__ ), 'util/loader.rb'
 # base modules
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'base/loader.rb' ) )
 
-# reporting modules
-require File.expand_path( File.join( File.dirname( __FILE__ ), 'report/report.rb' ) )
-
 # verify module
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'verify/verify.rb' ) )
 
+

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

@@ -33,6 +33,7 @@ module TDriverErrorRecovery
         dlload "callbackif"
         extern "void restartDatagateway(const char*)"
         extern "int error()"
+        extern "int getBootTimeout(const char*)"
       end')
     end
 
@@ -73,7 +74,8 @@ module TDriverErrorRecovery
       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);
-        sleep @recovery_settings.get_wait_time_for_ats4_error_recovery.to_i
+        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"
       else
         MobyUtil::Logger.instance.log "behaviour" , "WARNING;Resetting sut: #{current_sut.id.to_s}"
@@ -88,7 +90,7 @@ module TDriverErrorRecovery
         current_reconnect_attempt+=1
       end
     end
-    Kernel::raise BehaviourError.new("Error Recovery", "Error recovery failed after #{attempt_reconnects} recovery attempts") if b_error_recovery_succesful==false
+    Kernel::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
@@ -116,9 +118,8 @@ module TDriverErrorRecovery
   # false for failed ping
   # === raises
   def ping_device(current_sut)
-    begin
-      xml_state=current_sut.get_ui_dump()
-      if xml_state.to_s.include?("tasMessage")==false
+    begin     
+      if current_sut.refresh()==false
         MobyUtil::Logger.instance.log "behaviour" , "WARNING;Device ping failed"
         false
       else

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

@@ -91,7 +91,15 @@ class TDriverErrorRecoverySettings
   end
   def get_monitored_sut
     str_parameter=MobyUtil::Parameter[ :error_recovery_monitored_sut_ids ]
-    @monitored_suts=str_parameter.split('|')
+
+    if str_parameter.include?('|')
+      @monitored_suts=str_parameter.split('|')
+    elsif str_parameter.include?(',')
+      @monitored_suts=str_parameter.split(',')
+    else
+      @monitored_suts=str_parameter
+    end
+    
     @monitored_suts
   end
 

data/lib/tdriver/report/report.rb

@@ -17,6 +17,7 @@
 ##
 ############################################################################
 
+
 require 'fileutils'
 require 'date'
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'error_recovery/tdriver_error_recovery_settings' ) )
@@ -56,6 +57,8 @@ if MobyUtil::Parameter[ :custom_error_recovery_module, nil ]!=nil
   require MobyUtil::Parameter[ :custom_error_recovery_module ]
 
 end
+include TDriverReportAPI
+
 
 
  

data/lib/tdriver/report/report_api.rb

@@ -1,20 +1,20 @@
 ############################################################################
-## 
-## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 
-## All rights reserved. 
-## Contact: Nokia Corporation (testabilitydriver@nokia.com) 
-## 
-## This file is part of Testability Driver. 
-## 
-## 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. 
-## 
+##
+## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+## All rights reserved.
+## Contact: Nokia Corporation (testabilitydriver@nokia.com)
+##
+## This file is part of Testability Driver.
+##
+## 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.
+##
 ############################################################################
 
 
@@ -37,7 +37,7 @@ module TDriverReportAPI
     end
     return ret
   end
-  
+
   def tdriver_log_data(data)
     Kernel::raise TypeError.new("Argument to method cannot be nil.") if data.nil?
     if $tdriver_reporter!=nil
@@ -45,19 +45,25 @@ module TDriverReportAPI
     end
   end
 
-  def tdriver_capture_state(capture_screen_shot=true)    
+  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
-  
+
+  def tdriver_capture_screen(arguments=Hash.new)
+    if $tdriver_reporter
+      $new_test_case.capture_dump(true,arguments) if $new_test_case
+    end
+  end
+
   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?
     if $tdriver_reporter!=nil
       $tdriver_reporter.set_user_table_data(column_name,value)
     end
   end
-  
+
   def tdriver_report_log(message)
   	Kernel::raise TypeError.new("Argument message was not a String.") unless message.nil? or message.kind_of?(String)
     if $tdriver_reporter
@@ -212,8 +218,8 @@ module TDriverReportAPI
     $stderr.puts "%s:%s warning: method deprecated" % [ file, line]
     tdriver_report_combine_reports(reports)
   end
-  
-  
+
+
 end #TDriverReportAPI
 
 module MattiReportAPI
@@ -222,4 +228,4 @@ module MattiReportAPI
 
 end
 
- 
+

data/lib/tdriver/report/report_crash_file_capture.rb

@@ -140,7 +140,9 @@ class TDriverReportCrashFileCapture
               sut_crash_files=list_sut_crash_files(sut_attributes[:sut])
               sut_crash_files.each do |crash_file|
                 download_crash_file(sut_attributes[:sut],crash_file[0],download_folder.gsub("/",'\\')+'\\',crash_file[1])
+                delete_crash_file(sut_attributes[:sut],crash_file[0])
               end
+              sut_attributes[:sut].clear_crash_notes(5)
             end
           end
         end

data/lib/tdriver/report/report_creator.rb

@@ -35,6 +35,7 @@ module TDriverReportCreator
 
     @_video_file_name = "failed_test.avi"
     @_previous_video_file_name = "previous_test.avi"
+    @_stored_details=[]
     clean_video_files
 
     if $tdriver_reporter == nil
@@ -147,7 +148,12 @@ module TDriverReportCreator
       $tdriver_reporter.set_total_not_run(1)
     end
 
-    $tdriver_reporter.write_to_result_storage(current_status,test_case_name,group,reboots,crashes,
+    $tdriver_reporter.write_to_result_storage(
+      current_status,
+      test_case_name,
+      group,
+      reboots,
+      crashes,
       $new_test_case.test_case_start_time,
       $new_test_case.test_case_chronological_view_data,
       $new_test_case.test_case_run_time,
@@ -158,10 +164,12 @@ module TDriverReportCreator
       '',
       $new_test_case.test_case_total_dump_count,
       $new_test_case.test_case_total_data_sent,
-      $new_test_case.test_case_total_data_received
+      $new_test_case.test_case_total_data_received,
+      $new_test_case.test_case_user_data,
+      $new_test_case.test_case_user_data_columns
     )
-    
-    
+
+
     $tdriver_reporter.set_end_time(Time.now)
     $tdriver_reporter.set_total_run(1)
     $tdriver_reporter.update_summary_page('inprogress')
@@ -171,7 +179,7 @@ module TDriverReportCreator
         $run_status_thread_active=true
         Thread.new do
           begin
-            #Update test case summary pages            
+            #Update test case summary pages
             $tdriver_reporter.update_test_case_summary_pages('all')
             $tdriver_reporter.update_test_case_summary_pages('passed')
             $tdriver_reporter.update_test_case_summary_pages('failed')
@@ -246,10 +254,14 @@ module TDriverReportCreator
       exit(1)
     end
     $new_test_case.read_crash_monitor_settings()
+
     $new_test_case.read_file_monitor_settings()
+    
+    $new_test_case.clean_crash_files_from_sut() if $test_case_run_index==1 && MobyUtil::Parameter[ :report_crash_file_monitor_crash_file_cleanup, false ]=='true'
 
     amount_of_crash_files=$new_test_case.check_if_crash_files_exist()
-    if amount_of_crash_files.to_i > 0      
+    
+    if amount_of_crash_files.to_i > 0
       $new_test_case.capture_crash_files()
       $new_test_case.clean_crash_files_from_sut()
       $tdriver_reporter.set_total_crash_files(amount_of_crash_files.to_i)
@@ -257,7 +269,7 @@ module TDriverReportCreator
     end
 
     amount_of_files=$new_test_case.check_if_files_exist()
-    if amount_of_files.to_i > 0      
+    if amount_of_files.to_i > 0
       $new_test_case.capture_files()
       $new_test_case.clean_files_from_sut()
       $tdriver_reporter.set_total_crash_files(amount_of_files.to_i)
@@ -311,19 +323,31 @@ module TDriverReportCreator
   # nil
   # === raises
   def update_test_case(details)
-    $new_test_case.set_test_case_execution_log(details)
-    updating_test_case_details(details) if MobyUtil::Parameter[ :custom_error_recovery_module, nil ]!=nil
-    if  MobyUtil::Parameter[ :report_monitor_memory, 'false']=='true'
-      begin
-        start_memory=$new_test_case.tc_memory_amount_start()
-        if start_memory=='-'
-          MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
-            memory=$tdriver_reporter.get_sut_used_memory(sut_id,sut_attributes)
-            $new_test_case.set_tc_memory_amount_start(memory)
+    if $new_test_case==nil
+      @_stored_details<<details
+    else
+      if @_stored_details!=[]
+        @_stored_details.each do |detail|
+          $new_test_case.set_test_case_execution_log(detail)
+        end
+        $new_test_case.set_test_case_execution_log(details)
+        @_stored_details=[]
+      else
+        $new_test_case.set_test_case_execution_log(details)
+      end
+      updating_test_case_details(details) if MobyUtil::Parameter[ :custom_error_recovery_module, nil ]!=nil
+      if  MobyUtil::Parameter[ :report_monitor_memory, 'false']=='true'
+        begin
+          start_memory=$new_test_case.tc_memory_amount_start()
+          if start_memory=='-'
+            MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
+              memory=$tdriver_reporter.get_sut_used_memory(sut_id,sut_attributes)
+              $new_test_case.set_tc_memory_amount_start(memory)
+            end
           end
+        rescue
+          $new_test_case.set_tc_memory_amount_start(0)
         end
-      rescue
-        $new_test_case.set_tc_memory_amount_start(0)
       end
     end
   end
@@ -354,20 +378,25 @@ module TDriverReportCreator
   # nil
   # === raises
   def capture_screen_test_case()
-    create_test_case_folder($tdriver_reporter.fail_statuses.first)
-    $new_test_case.capture_dump()
-    if $new_test_case.video_recording?
-      $new_test_case.copy_video_capture()
-    end
-    error_in_test_case(MobyBase::SUTFactory.instance.connected_suts) if MobyUtil::Parameter[ :custom_error_recovery_module, nil ]!=nil
     begin
-      if start_error_recovery()==true
-        error_in_connection_detected
+      create_test_case_folder($tdriver_reporter.fail_statuses.first)
+      $new_test_case.capture_dump()
+      if $new_test_case.video_recording?
+        $new_test_case.copy_video_capture()
       end
-    rescue Exception => e
-      update_test_case("Error recovery failed Exception: #{e.message} Backtrace: #{e.backtrace}")
-      end_test_case($new_test_case.test_case_name,'failed')
-      exit(1)      
+      error_in_test_case(MobyBase::SUTFactory.instance.connected_suts) if MobyUtil::Parameter[ :custom_error_recovery_module, nil ]!=nil
+      begin
+        if start_error_recovery()==true
+          error_in_connection_detected
+        end
+      rescue Exception => e
+        update_test_case("Error recovery failed Exception: #{e.message} Backtrace: #{e.backtrace}")
+        end_test_case($new_test_case.test_case_name,'failed')
+        exit(1)
+      end
+    rescue => ex
+      puts ex.message
+      puts ex.backtrace
     end
   end
   #This updates the test case behaviour log
@@ -479,9 +508,9 @@ module TDriverReportCreator
           status='failed' if MobyUtil::Parameter[:report_fail_test_if_files_found]=='true'
         end
       end
-      
+
       temp_rec = $new_test_case.video_recording?
-      
+
       if temp_rec
         $new_test_case.stop_video_recording
       end
@@ -497,31 +526,31 @@ module TDriverReportCreator
         end
       end
       if(status=='passed')
-  
+
         no_activity_videos = ""
-        if MobyUtil::Parameter[:report_check_device_active, 'false']=='true'          
-          if temp_rec            
-            no_activity_videos = $new_test_case.target_video_alive                                  
-          end                    
-        end        
-        
-        if no_activity_videos == "" 
+        if MobyUtil::Parameter[:report_check_device_active, 'false']=='true'
+          if temp_rec
+            no_activity_videos = $new_test_case.target_video_alive
+          end
+        end
+
+        if no_activity_videos == ""
           $new_test_case.set_test_case_status($tdriver_reporter.pass_statuses.first)
           create_test_case_folder($tdriver_reporter.pass_statuses.first)
         else
           # switch case to failed status
-          status='failed'         
+          status='failed'
           $new_test_case.copy_video_capture
           $new_test_case.update_test_case "The case failed due to video analysis (#{no_activity_videos}) indicating that the target is no longer responding."
-         
+
           $new_test_case.set_test_case_status($tdriver_reporter.fail_statuses.first)
           create_test_case_folder($tdriver_reporter.fail_statuses.first)
           if found_crash_files.to_i > 0
             $new_test_case.capture_crash_files()
           end
-          
+
         end
-        
+
       end
       if(status!='passed' && status!='failed')
         $new_test_case.set_test_case_status($tdriver_reporter.not_run_statuses.first)
@@ -542,7 +571,6 @@ module TDriverReportCreator
         $new_test_case.capture_files()
       end
       $new_test_case.update_test_case_page()
-      $new_test_case.clean_crash_files_from_sut()
       $new_test_case.clean_files_from_sut()
 
       update_run($new_test_case.test_case_name.to_s,status,$new_test_case.test_case_reboots,$new_test_case.test_case_crash_files,execution_log)
@@ -598,4 +626,4 @@ end #TDriverReportCreator
 
 
 
- 
+

data/lib/tdriver/report/report_test_case_run.rb

@@ -1,20 +1,20 @@
 ############################################################################
-## 
-## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 
-## All rights reserved. 
-## Contact: Nokia Corporation (testabilitydriver@nokia.com) 
-## 
-## This file is part of Testability Driver. 
-## 
-## 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. 
-## 
+##
+## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+## All rights reserved.
+## Contact: Nokia Corporation (testabilitydriver@nokia.com)
+##
+## This file is part of Testability Driver.
+##
+## 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.
+##
 ############################################################################
 
 
@@ -61,7 +61,7 @@ module TDriverReportCreator
       :tc_video_recorders,
       :tc_memory_amount_start,
       :tc_memory_amount_end,
-      :tc_memory_amount_start,      
+      :tc_memory_amount_start,
       :tc_memory_amount_total,
       :pass_statuses,
       :fail_statuses,
@@ -112,6 +112,7 @@ module TDriverReportCreator
       @not_run_statuses=MobyUtil::Parameter[ :report_not_run_statuses, "not run" ].split('|')
       @test_case_logging_level = MobyUtil::Parameter[ :logging_level, nil ]
       @trace_directory=MobyUtil::Parameter[ :report_trace_folder, nil]
+      @report_short_folders=MobyUtil::Parameter[ :report_short_folders, 'false']
       $tdriver_report_log_output = StringIO.new ""
       begin
         if MobyUtil::Parameter[:behaviour_logging] == 'true'
@@ -208,11 +209,11 @@ module TDriverReportCreator
     def set_test_case_name(value)
       @test_case_name_full=value
       #Clean the test case name for unwanted chars
-      stripped=value.gsub(/[<\/?*>!)(}{\{@%"'.,:;~-]/,'').squeeze(" ")
+      stripped=value.gsub(/[<\/?*>!)(}{\\\#{@%"'.,:;~-]/,'').squeeze(" ")
       if stripped==nil then
         stripped=value.squeeze(" ")
       end
-      stripped1 = stripped.to_s.gsub(' ','_')      
+      stripped1 = stripped.to_s.gsub(' ','_')
       if stripped1==nil
         stripped1=stripped
       end
@@ -280,7 +281,7 @@ module TDriverReportCreator
     # === returns
     # nil
     # === raises
-    def set_test_case_execution_log(value)     
+    def set_test_case_execution_log(value)
       @test_case_execution_log=@test_case_execution_log.to_s + '<br />' + value.to_s.gsub(/\n/,'<br />')
     end
     #This method sets the test case user data
@@ -292,7 +293,7 @@ module TDriverReportCreator
     # === raises
     def set_test_case_user_data(data,columns)
       @test_case_user_data=data
-      @test_case_user_data_columns=columns    
+      @test_case_user_data_columns=columns
     end
     #This method sets the users data to display in chronological table
     #
@@ -303,7 +304,7 @@ module TDriverReportCreator
     # === raises
     def set_test_case_chronological_view_data(data)
       @test_case_chronological_view_data=data
-    end    
+    end
     #This method sets the test case behaviour log
     #
     # === params
@@ -318,17 +319,17 @@ module TDriverReportCreator
     #
     # === params
     # rec_name: String, name of video file to create
-    # previous_name: String, name of video file of previous test case	
+    # previous_name: String, name of video file of previous test case
     # === returns
     # nil
     def start_video_recording( rec_name, previous_name )
-		
+
       @tc_video_filename = rec_name
       @tc_previous_video_filename = previous_name
       tc_video_width = 640
       tc_video_height = 480
       tc_video_fps = 30
-		
+
       begin
         tc_video_width = MobyUtil::Parameter[ :report_video_width ].to_i
       rescue
@@ -344,20 +345,20 @@ module TDriverReportCreator
       rescue
         # parameter not loaded, do nothing
       end
-		
+
 
       @tc_video_recorders = []
-      	  
+
       begin
         each_video_device do | video_device, device_index |
-	  	    
+
           rec_options = { :width => tc_video_width, :height => tc_video_height, :fps => tc_video_fps }
           rec_options[ :device ] = video_device unless video_device == "true" # use default device if "true"
           video_recorder = MobyUtil::TDriverCam.new_cam( "cam_" + device_index + "_" + @tc_video_filename, rec_options )
           video_recorder.start_recording
           @tc_video_recorders << video_recorder
           @tc_video_recording = true
-		  
+
         end
       rescue Exception => e
         # make sure to stop any started cams if startup fails
@@ -365,42 +366,42 @@ module TDriverReportCreator
         raise e
 
       end
-	  
+
       nil
-		
+
     end
-	  
+
     def target_video_alive
-   
+
       ret = ""
       each_video_device do | video_device, device_index |
-     
+
         check_fps = MobyUtil::Parameter[:report_activity_fps, '3']
         check_frame_min = MobyUtil::Parameter[:report_activity_frame_treshold, '8']
         check_video_min = MobyUtil::Parameter[:report_activity_video_treshold, '29']
-        
+
         ret_n = MobyUtil.video_alive? "cam_" + device_index + "_" + @tc_video_filename, check_fps.to_f, check_frame_min.to_f, check_video_min.to_f, false
-        
+
         if !ret_n
           ret += ", " if !ret.empty?
           ret += "cam_" + device_index + "_" + @tc_video_filename
         end
-                
-      end   
-      
+
+      end
+
       return ret
-    
+
     end
-    
+
     def stop_video_recording()
-	
+
 
       @tc_video_recorders.each do | video_recorder |
         video_recorder.stop_recording
       end
 
       @tc_video_recording = false
-	  
+
     end
     #This method sets the tdriver test case memory at start
     #
@@ -432,7 +433,7 @@ module TDriverReportCreator
     def set_tc_memory_amount_total(value)
       @tc_memory_amount_total=value
     end
-        
+
     #This method updates the tdrivertest case details page
     #
     # === params
@@ -467,50 +468,50 @@ module TDriverReportCreator
           @test_case_total_data_received
         )
         write_page_end(@test_case_folder+'/index.html')
-                
+
       rescue Exception => e
         Kernel::raise e
       end
       return nil
     end
-    
+
     #This method makes a copy of the video recording of this test case
     def copy_video_capture()
-	
+
       stop_video_recording
-	  
+
       logging_enabled = MobyUtil::Logger.instance.enabled
       MobyUtil::Logger.instance.enabled=false
       begin
-	  
+
         video_folder=@test_case_folder+'/video'
         if File::directory?(video_folder)==false
           FileUtils.mkdir_p video_folder
-        end        
-		
+        end
+
 
         each_video_device do | video_device, device_index |
-                    
-          begin		
+
+          begin
             FileUtils.copy("cam_" + device_index + "_" + @tc_video_filename, video_folder)
           rescue
             # Copy failed, do nothing
           end
-          
+
           begin
             FileUtils.copy("cam_" + device_index + "_" + @tc_previous_video_filename, video_folder)
           rescue
             # Copy failed, do nothing
           end
-		
+
         end
 
-       
-		
+
+
       rescue Exception => e
         @test_case_execution_log=@test_case_execution_log.to_s + '<br />' + "Unable to store video file: " + e.message
       end
-	  
+
       MobyUtil::Logger.instance.enabled=logging_enabled
       return nil
     end
@@ -521,7 +522,7 @@ module TDriverReportCreator
     # === returns
     # nil
     # === raises
-    def capture_dump(take_screenshot=true)      
+    def capture_dump(take_screenshot=true,arguments=Hash.new)
       MobyUtil::Logger.instance.enabled=false
       image_html=Array.new
       state_html=Array.new
@@ -532,24 +533,31 @@ module TDriverReportCreator
           FileUtils.mkdir_p dump_folder
         end
         MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
-          
+
           t = Time.now
           time_stamp=t.strftime( "%Y%m%d%H%M%S" )
           if take_screenshot==true
             begin
               sut_attributes[:sut].capture_screen( :Filename => dump_folder+'/'+time_stamp+'_'+sut_id.to_s+'_state.png', :Redraw => true ) if sut_attributes[:is_connected]
-              image_html='<a href="state_xml/'<<
+              if arguments[:file]
+                sut_attributes[:sut].capture_screen( :Filename => arguments[:file], :Redraw => true ) if sut_attributes[:is_connected]
+              end
+              image_html='<div class="img"><a href="state_xml/'<<
                 time_stamp+'_'+sut_id.to_s+'_state.png'<<
-                '"><img alt="" src="state_xml/'<<
+                '" target="_blank"><img alt="" src="state_xml/'<<
                 time_stamp+'_'+sut_id.to_s+'_state.png'<<
-                '" width=20% height=20% /></a>'
+                '" width="10%" height="10%" /></a>'
+                if arguments[:text]
+                  image_html << "<div class=\"desc\">#{arguments[:text]}</div>"
+                end
+                image_html << '</div>'
               self.set_test_case_execution_log(image_html.to_s)
-            rescue Exception=>e             
+            rescue Exception=>e
               @capture_screen_error="Unable to capture sceen image #{sut_id}: " + e.message
               self.set_test_case_execution_log(@capture_screen_error.to_s)
             end
           end
-        
+
           begin
             failed_xml_state=sut_attributes[:sut].xml_data() if sut_attributes[:is_connected]
             File.open(dump_folder+'/'+time_stamp+'_'+sut_id.to_s+'_state.xml', 'w') { |file| file.write(failed_xml_state) }
@@ -557,7 +565,7 @@ module TDriverReportCreator
               time_stamp+'_'+sut_id.to_s+'_state.xml'<<
               '">'+time_stamp+'_'+sut_id.to_s+'_state.xml'+'</a>'
             self.set_test_case_execution_log(state_html.to_s)
-          rescue Exception=>e           
+          rescue Exception=>e
             @failed_dump_error="Unable to capture state xml #{sut_id}: " + e.message
             self.set_test_case_execution_log(@failed_dump_error.to_s)
           end
@@ -605,7 +613,12 @@ module TDriverReportCreator
     def  create_test_case_folder(status)
       begin
         #check if report directory exists
-        @test_case_folder=@test_cases_folder+'/'+status+'_'+@test_case_index.to_s+'_'+@test_case_name
+        if @report_short_folders == 'true'
+          @test_case_folder=@test_cases_folder+'/'+status+'_'+@test_case_index.to_s
+        else
+          @test_case_folder=@test_cases_folder+'/'+status+'_'+@test_case_index.to_s+'_'+@test_case_name
+        end
+        
         if File::directory?(@test_case_folder)==false
           FileUtils.mkdir_p @test_case_folder
         end
@@ -626,7 +639,12 @@ module TDriverReportCreator
       begin
         #check if report directory exists
         old_test_case_folder=@test_case_folder
-        new_test_case_folder=@test_case_folder.sub('result'+'_'+@test_case_index.to_s+'_'+@test_case_name,status+'_'+@test_case_index.to_s+'_'+@test_case_name)
+        if @report_short_folders == 'true'
+          new_test_case_folder=@test_case_folder.sub('result'+'_'+@test_case_index.to_s,status+'_'+@test_case_index.to_s)
+        else
+          new_test_case_folder=@test_case_folder.sub('result'+'_'+@test_case_index.to_s+'_'+@test_case_name,status+'_'+@test_case_index.to_s+'_'+@test_case_name)
+        end
+        
         if File::directory?(new_test_case_folder)==false
           FileUtils.mv old_test_case_folder, new_test_case_folder , :force => true  # no error
           @test_case_folder=new_test_case_folder