testability-driver 1.1.1 → 1.2.1

data/lib/tdriver/report/report_cucumber_reporter.rb

@@ -38,6 +38,7 @@ module TDriverReport
       @current_feature = nil
       @tc_status=nil
       @current_feature_group=nil
+      @current_feature_element_file=''
     end
     def after_features(features)
         end_test_case(@current_feature_element,@tc_status)
@@ -92,9 +93,8 @@ module TDriverReport
     def scenario_name(keyword, name, file_colon_line, source_indent)
       visit_feature_element_name(keyword, name, file_colon_line, source_indent)
     end
-    def feature_name(keyword,name)
-      @current_feature_group=keyword + " " + name.gsub(/[:]/,' ')
-      add_report_group('Features:'+@current_feature_group+'|')
+    def feature_name(keyword,name)     
+      @current_feature_group=keyword + " " + name.gsub(/[:]/,' ')      
     end
     #This method determines when new test case needs to be started
     #based on the scenario name info if scenario name is different then a new test case
@@ -104,6 +104,8 @@ module TDriverReport
     # === returns
     # === raises
     def visit_feature_element_name(keyword, name, file_colon_line, source_indent)
+      add_report_group(File.basename(file_colon_line)+':'+@current_feature_group+'|')
+      @current_feature_element_file=file_colon_line
       line = %Q("#{name}")
       @current_feature_element=line if @current_feature_element.nil?
       unless line == @current_feature_element
@@ -112,6 +114,7 @@ module TDriverReport
       end
       start_test_case(@current_feature_element)
       add_test_case_group(@current_feature_group)
+      update_test_case(file_colon_line)
       @tc_status=nil
     end
     #This method records the cucumber outline table results in to one test case
@@ -161,7 +164,7 @@ module TDriverReport
     end
     def py_string(string)
     end
-    def print_feature_element_name(keyword, name, file_colon_line, source_indent)
+    def print_feature_element_name(keyword, name, file_colon_line, source_indent)     
     end
     def before_table_row(table_row)
         return unless @table
@@ -173,163 +176,6 @@ module TDriverReport
       end
   end
 end
-
-module MattiReport
-  #Class for formatting cucumber report
-  class CucumberReporter
-    include TDriverReportCreator
-    #This method initializes new test run
-    #
-    # === params
-    # === returns
-    # === raises
-    def initialize(step_mother, io, options)
-      file, line = caller.first.split(":")
-      $stderr.puts "%s:%s warning: MattiReport deprecated, use TDriverReport instead" % [ file, line]
-      #super(step_mother, io, options)
-      start_run()
-      @options = options
-      @current_feature_element = nil
-      @current_feature = nil
-      @tc_status=nil
-      @current_feature_group=nil
-    end
-    def after_features(features)
-        end_test_case(@current_feature_element,@tc_status)
-    end
-    #This method visits the executed cucumber step and updates the results in to TDriver report
-    #
-    # === params
-    # === returns
-    # === raises
-    def step_name(keyword, step_match, status, source_indent, background)
-      if status == :passed
-        step_name = step_match.format_args(lambda{|param| "*#{param}*"})
-        update_test_case("#{step_name} PASSED")
-        @tc_status='passed'
-      end
-      if status == :failed
-        step_name = step_match.format_args(lambda{|param| "*#{param}*"})
-        update_test_case("#{step_name} FAILED")
-        @tc_status='failed'
-      end
-      if status == :skipped
-        step_name = step_match.format_args(lambda{|param| "*#{param}*"})
-        update_test_case("#{step_name} SKIPPED")
-      end
-      if status == :undefined
-        step_name = step_match.format_args(lambda{|param| "*#{param}*"})
-        update_test_case("#{step_name} NOT RUN")
-        @tc_status='not run'
-      end
-    end
-    #This method visits the exception caused by a failed step
-    #and updates the result in to TDriver report
-    #
-    # === params
-    # === returns
-    # === raises
-    def exception(exception, status)
-      if status == :failed
-        capture_screen_test_case()
-        update_test_case(exception.message)
-        update_test_case(exception.backtrace)
-      end
-      update_test_case('-') if status == :passed
-    end
-    #This method visits cucumber scenario name and starts a new test case when
-    #new scenario is executed
-    #and updates the result in to TDriver report
-    #
-    # === params
-    # === returns
-    # === raises
-    def scenario_name(keyword, name, file_colon_line, source_indent)
-      visit_feature_element_name(keyword, name, file_colon_line, source_indent)
-    end
-    def feature_name(keyword, name)
-      @current_feature_group=keyword + " " + name      
-      add_report_group('Features:'+@current_feature_group+'|')
-    end
-    #This method determines when new test case needs to be started
-    #based on the scenario name info if scenario name is different then a new test case
-    #is started
-    #
-    # === params
-    # === returns
-    # === raises
-    def visit_feature_element_name(keyword, name, file_colon_line, source_indent)
-      line = %Q("#{name}")
-      @current_feature_element=line if @current_feature_element.nil?
-      unless line == @current_feature_element
-        end_test_case(@current_feature_element,@tc_status)
-        @current_feature_element=line
-      end
-      start_test_case(@current_feature_element)
-      add_test_case_group(@current_feature_group)
-      @tc_status=nil
-    end
-    #This method records the cucumber outline table results in to one test case
-    #
-    # === params
-    # === returns
-    # === raises
-    def before_outline_table(outline_table)
-     update_test_case("running outline: ")
-    end
-    #This method records the cucumber outline table results in to one test case
-    #
-    # === params
-    # === returns
-    # === raises
-    def after_table_row(table_row)
-      if table_row.exception
-        @tc_status='failed'
-        capture_screen_test_case()
-        update_test_case("#{format_table_row(table_row)} FAILED")
-        update_test_case(table_row.exception)
-      else
-        @tc_status='passed' if @tc_status==nil
-        update_test_case("#{format_table_row(table_row)} PASSED")
-      end
-    end
-    def format_table_row(row)
-      begin
-        [row.name, row.line]
-      rescue Exception => e
-        row
-      end
-    end
-    def tag_name(tag_name)
-    end
-    def comment_line(comment_line)
-    end
-    def after_tags(tags)
-    end
-    def after_feature_element(feature_element)
-    end
-    def after_background(background)
-    end
-    def before_examples_array(examples_array)
-    end
-    def examples_name(keyword, name)
-    end
-    def py_string(string)
-    end
-    def print_feature_element_name(keyword, name, file_colon_line, source_indent)
-    end
-    def before_table_row(table_row)
-        return unless @table
-        @col_index = 0
-      end
-    def table_cell_value(value, status)
-        return unless @table
-        status ||= @status || :passed
-      end
-  end
-end
-
-
 rescue LoadError
 
 end

data/lib/tdriver/report/report_execution_statistics.rb

@@ -22,10 +22,10 @@ class ReportingStatistics
   def initialize(test_cases_array, summary=nil)
     @all_statuses=Array.new
     @group_test_case_arr=Array.new(test_cases_array)
-    @pass_statuses=MobyUtil::Parameter[ :report_passed_statuses, "passed" ].split('|')
-    @fail_statuses=MobyUtil::Parameter[ :report_failed_statuses, "failed" ].split('|')
-    @not_run_statuses=MobyUtil::Parameter[ :report_not_run_statuses, "not run" ].split('|')
-    @test_results_per_page=MobyUtil::Parameter[ :report_results_per_page, 50]
+    @pass_statuses= $parameters[ :report_passed_statuses, "passed" ].split('|')
+    @fail_statuses= $parameters[ :report_failed_statuses, "failed" ].split('|')
+    @not_run_statuses= $parameters[ :report_not_run_statuses, "not run" ].split('|')
+    @test_results_per_page= $parameters[ :report_results_per_page, 50]
     @statistics_arr=Array.new
     @total_statistics_arr=Array.new
     @summary=summary

data/lib/tdriver/report/report_file_capture.rb

@@ -37,11 +37,11 @@ module TDriverReportFileCapture
   end
 
   def read_file_monitor_settings()
-    @file_locations=return_settings_value_array(MobyUtil::Parameter[ :report_file_locations, nil ])
-    @file_suts=return_settings_value_array(MobyUtil::Parameter[ :report_file_monitored_sut_ids, nil ])
-    @file_names=return_settings_value_array(MobyUtil::Parameter[ :report_file_names, nil ])
-    @clean_files=MobyUtil::Parameter[ :report_clean_files_from_sut_after_capture, 'true' ]
-    @monitor_files = MobyUtil::Parameter[ :report_file_monitor, 'false' ]
+    @file_locations=return_settings_value_array($parameters[ :report_file_locations, nil ])
+    @file_suts=return_settings_value_array($parameters[ :report_file_monitored_sut_ids, nil ])
+    @file_names=return_settings_value_array($parameters[ :report_file_names, nil ])
+    @clean_files=$parameters[ :report_clean_files_from_sut_after_capture, 'true' ]
+    @monitor_files = $parameters[ :report_file_monitor, 'false' ]
   end
 
   def clean_files_from_sut()

data/lib/tdriver/report/report_grouping.rb

@@ -39,9 +39,9 @@ class ReportingGroups
     @main_not_run=0
     @group_test_case_arr=Array.new(test_cases_array)
     @grouping=grouping
-    @pass_statuses=MobyUtil::Parameter[ :report_passed_statuses, "passed" ].split('|')
-    @fail_statuses=MobyUtil::Parameter[ :report_failed_statuses, "failed" ].split('|')
-    @not_run_statuses=MobyUtil::Parameter[ :report_not_run_statuses, "not run" ].split('|')
+    @pass_statuses= $parameters[ :report_passed_statuses, "passed" ].split('|')
+    @fail_statuses= $parameters[ :report_failed_statuses, "failed" ].split('|')
+    @not_run_statuses= $parameters[ :report_not_run_statuses, "not run" ].split('|')
   end
   def clean_reporting_groups(report_group_string)
     cleaned_group_string=''
@@ -453,15 +453,16 @@ class ReportingGroups
     table_body
   end
   def generate_report(status)
-    html_body=Array.new
+    html_body=Array.new    
     if @grouping==true
       @main_groups.each do |group|
         @main_total=0
         @main_passed=0
         @main_failed=0
         @main_not_run=0
-        html_body << tog_list_begin(group,@group_test_case_arr,status,'main')
-        html_body << generate_test_results_table(status,@group_test_case_arr,[group,group])
+        group_body=Array.new
+        group_body << tog_list_begin(group,@group_test_case_arr,status,'main')
+        group_body << generate_test_results_table(status,@group_test_case_arr,[group,group])
         tog_list1=0
         tog_list2=0
         tog_list3=0
@@ -472,61 +473,62 @@ class ReportingGroups
           if group.to_s == item1.at(0).to_s && @reporting_groups.include?(group.to_s+':'+item1.at(1).to_s)
             tog_list1=tog_list_begin(item1.at(1).to_s,@group_test_case_arr,status)
             if tog_list1 != 0
-              html_body << tog_list1
-              html_body << generate_test_results_table(status,@group_test_case_arr,item1)
+              group_body << tog_list1
+              group_body << generate_test_results_table(status,@group_test_case_arr,item1)
             end
             @main_groups_sub_level_two.each do |item2|
               if group.to_s == item2.at(0).to_s && @reporting_groups.include?(item1.at(1).to_s+':'+item2.at(1).to_s)
                 tog_list2=tog_list_begin(item2.at(1).to_s,@group_test_case_arr,status)
                 if tog_list2 != 0
-                  html_body << tog_list2
-                  html_body << generate_test_results_table(status,@group_test_case_arr,item2)
+                  group_body << tog_list2
+                  group_body << generate_test_results_table(status,@group_test_case_arr,item2)
                 end
                 @main_groups_sub_level_three.each do |item3|
                   if group.to_s == item3.at(0).to_s && @reporting_groups.include?(item2.at(1).to_s+':'+item3.at(1).to_s)
                     tog_list3=tog_list_begin(item3.at(1).to_s,@group_test_case_arr,status)
                     if tog_list3 != 0
-                      html_body << tog_list3
-                      html_body << generate_test_results_table(status,@group_test_case_arr,item3)
+                      group_body << tog_list3
+                      group_body << generate_test_results_table(status,@group_test_case_arr,item3)
                     end
                     @main_groups_sub_level_four.each do |item4|
                       if group.to_s == item4.at(0).to_s && @reporting_groups.include?(item3.at(1).to_s+':'+item4.at(1).to_s)
                         tog_list4=tog_list_begin(item4.at(1).to_s,@group_test_case_arr,status)
                         if tog_list4 != 0
-                          html_body << tog_list4
-                          html_body << generate_test_results_table(status,@group_test_case_arr,item4)
+                          group_body << tog_list4
+                          group_body << generate_test_results_table(status,@group_test_case_arr,item4)
                         end
                         @main_groups_sub_level_five.each do |item5|
                           if group.to_s == item5.at(0).to_s && @reporting_groups.include?(item4.at(1).to_s+':'+item5.at(1).to_s)
                             tog_list5=tog_list_begin(item5.at(1).to_s,@group_test_case_arr,status)
                             if tog_list5 != 0
-                              html_body << tog_list5
-                              html_body << generate_test_results_table(status,@group_test_case_arr,item5)
-                              html_body << tog_list_end()
+                              group_body << tog_list5
+                              group_body << generate_test_results_table(status,@group_test_case_arr,item5)
+                              group_body << tog_list_end()
                             end
                           end
                         end
                         if tog_list4 != 0
-                          html_body << tog_list_end()
+                          group_body << tog_list_end()
                         end
                       end
                     end
                     if tog_list3 != 0
-                      html_body << tog_list_end()
+                      group_body << tog_list_end()
                     end
                   end
                 end
                 if tog_list2 != 0
-                  html_body << tog_list_end()
+                  group_body << tog_list_end()
                 end
               end
             end
             if tog_list1 != 0
-              html_body << tog_list_end()
+              group_body << tog_list_end()
             end
           end
         end
-        html_body << tog_list_end('main')
+        group_body << tog_list_end('main')
+        html_body << group_body if @main_total > 0
       end
       html_body << generate_test_results_table(status,@group_test_case_arr,['not_in_any_user_defined_group','not_in_any_user_defined_group'])
     else

data/lib/tdriver/report/report_junit_xml.rb

@@ -26,8 +26,8 @@ class ReportJUnitXml
     @test_case_arr=Array.new
     @test_run_properties_arr=Array.new
     
-    @test_set_name=MobyUtil::Parameter[ :quality_center_testset_name, "TestSetName" ]
-    @test_set_path =MobyUtil::Parameter[ :quality_center_testset_path, "TestSetPath" ]
+    @test_set_name=$parameters[ :quality_center_testset_name, "TestSetName" ]
+    @test_set_path =$parameters[ :quality_center_testset_path, "TestSetPath" ]
     @test_class_name=nil
     @junit_xml_filename = convert_to_file_name('tdriver_junit_xml')
     @failures = 0
@@ -37,9 +37,9 @@ class ReportJUnitXml
     @tests_start_time = Time.now
     @tc_start_time = nil
     @tc_end_time = nil
-    @pass_statuses=MobyUtil::Parameter[ :report_passed_statuses, "passed" ].split('|')
-    @fail_statuses=MobyUtil::Parameter[ :report_failed_statuses, "failed" ].split('|')
-    @not_run_statuses=MobyUtil::Parameter[ :report_not_run_statuses, "not run" ].split('|')
+    @pass_statuses=$parameters[ :report_passed_statuses, "passed" ].split('|')
+    @fail_statuses=$parameters[ :report_failed_statuses, "failed" ].split('|')
+    @not_run_statuses=$parameters[ :report_not_run_statuses, "not run" ].split('|')
   end
   def convert_to_file_name(value)
     "TEST-"+value.gsub(/[^\w_\.]/, '_') + ".xml"

data/lib/tdriver/report/report_test_case_run.rb

@@ -107,15 +107,15 @@ module TDriverReportCreator
       @test_case_data_sent_at_end=Hash.new
       @test_case_data_received_at_start=Hash.new
       @test_case_data_received_at_end=Hash.new
-      @pass_statuses=MobyUtil::Parameter[ :report_passed_statuses, "passed" ].split('|')
-      @fail_statuses=MobyUtil::Parameter[ :report_failed_statuses, "failed" ].split('|')
-      @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']
+      @pass_statuses= $parameters[ :report_passed_statuses, "passed" ].split('|')
+      @fail_statuses= $parameters[ :report_failed_statuses, "failed" ].split('|')
+      @not_run_statuses= $parameters[ :report_not_run_statuses, "not run" ].split('|')
+      @test_case_logging_level =  $parameters[ :logging_level, nil ]
+      @trace_directory= $parameters[ :report_trace_folder, nil]
+      @report_short_folders= $parameters[ :report_short_folders, 'false']
       $tdriver_report_log_output = StringIO.new ""
       begin
-        if MobyUtil::Parameter[:behaviour_logging] == 'true'
+        if  $parameters[:behaviour_logging] == 'true'
           if @test_case_logging_level.to_i > 0
             logger_instance = MobyUtil::Logger.instance.get_logger( 'TDriver' )
             begin
@@ -281,7 +281,16 @@ module TDriverReportCreator
     # === returns
     # nil
     # === raises
-    def set_test_case_execution_log(value)
+    def repalce_chars_to_html_format(value)
+      
+      formatted_line=value.to_s.gsub('<','&#60;')
+      formatted_line=formatted_line.gsub('>','&#62;')
+
+      formatted_line
+    end
+
+    def set_test_case_execution_log(value,format=false)
+      value=repalce_chars_to_html_format(value) if format==true
       @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
@@ -331,17 +340,17 @@ module TDriverReportCreator
       tc_video_fps = 30
 
       begin
-        tc_video_width = MobyUtil::Parameter[ :report_video_width ].to_i
+        tc_video_width =  $parameters[ :report_video_width ].to_i
       rescue
         # parameter not loaded, do nothing
       end
       begin
-        tc_video_height = MobyUtil::Parameter[ :report_video_height ].to_i
+        tc_video_height =  $parameters[ :report_video_height ].to_i
       rescue
         # parameter not loaded, do nothing
       end
       begin
-        tc_video_fps = MobyUtil::Parameter[ :report_video_fps ].to_i
+        tc_video_fps =  $parameters[ :report_video_fps ].to_i
       rescue
         # parameter not loaded, do nothing
       end
@@ -376,9 +385,9 @@ module TDriverReportCreator
       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']
+        check_fps =  $parameters[:report_activity_fps, '3']
+        check_frame_min =  $parameters[:report_activity_frame_treshold, '8']
+        check_video_min =  $parameters[: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
 
@@ -547,10 +556,10 @@ module TDriverReportCreator
                 '" target="_blank"><img alt="" src="state_xml/'<<
                 time_stamp+'_'+sut_id.to_s+'_state.png'<<
                 '" width="10%" height="10%" /></a>'
-                if arguments[:text]
-                  image_html << "<div class=\"desc\">#{arguments[:text]}</div>"
-                end
-                image_html << '</div>'
+              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
               @capture_screen_error="Unable to capture sceen image #{sut_id}: " + e.message
@@ -574,7 +583,7 @@ module TDriverReportCreator
         @capture_screen_error="Unable to capture state: " + e.message
         self.set_test_case_execution_log(@capture_screen_error.to_s)
       ensure
-        if MobyUtil::Parameter[ :logging_level, 0 ].to_i > 0
+        if  $parameters[ :logging_level, 0 ].to_i > 0
           MobyUtil::Logger.instance.enabled=true
         else
           MobyUtil::Logger.instance.enabled=false
@@ -590,8 +599,8 @@ module TDriverReportCreator
     # nil
     # === raises
     def capture_trace_files()
-      if MobyUtil::Parameter[ :report_trace_capture, false]=="true"
-        trace_folder=MobyUtil::Parameter[ :report_trace_folder, nil]
+      if  $parameters[ :report_trace_capture, false]=="true"
+        trace_folder= $parameters[ :report_trace_folder, nil]
         if trace_folder!=nil
           if File::directory?(trace_folder)==true
             dump_folder=@test_case_folder+'/trace_files'
@@ -659,4 +668,4 @@ module TDriverReportCreator
       @tc_video_recording
     end
   end
-end
+end