testability-driver-runner 1.1.1 → 1.2.0

data/lib/tdrunner.rb

@@ -72,7 +72,7 @@ module TDRunner
 
         elsif args[0]=='--version'
           args.shift
-          puts '1.1.1'
+          puts '1.2.0'
 
         else
           break
@@ -190,6 +190,7 @@ module TDRunner
       end
 
       write_failed_sip_file($tdrunner_parameters)
+      write_recorded_sip_file($tdrunner_parameters)
     end
 
     #Method for displaying tdrunner help in commandline
@@ -290,6 +291,9 @@ module TDRunner
       puts "-t execution_profile"
       puts "\t\tCreate execution profile of failed Test::Unit tests"
 
+      puts "-r execution_profile"
+      puts "\t\tCreate execution profile recording of executed tests"
+      
       puts "--teardown\tRun test unit teardown only when the testcase is failed."
 
       puts "--ordered\tUse with execution profile to run tests as they are ordered"

data/lib/tdrunner_command_tool.rb

@@ -100,7 +100,7 @@ module TDRunner
           begin
             #paramfile = File.new(paramfilename)
             #sutlist = paramfile.readlines.join.scan(/<sut +id *= *"([^"]+)"/).map{|i| i[0]}.join(' ')
-            sutlist = MobyUtil::ParameterXml.instance.sut_list.reject { |item| item.to_s == 'sut_generic' }.join(' ')
+            sutlist = TDriver.suts.reject { |item| item.to_s == 'sut_generic' }.join(' ')
           rescue
             #sutlist = "Failed to read '#{paramfilename}': #{$!.to_s.gsub(/\s+/, ' ')}"
             sutlist = "ERROR (#{$!.to_s.gsub(/\s+/, ' ')})"

data/lib/tdrunner_cucumber.rb

@@ -45,6 +45,7 @@ module TDRunner
           remove_excluded_files_from(potential_feature_files)
           lpt_feature_files = potential_feature_files.sort         
           lpt_feature_files,content_arr=randomize_features(lpt_feature_files,$tdrunner_parameters)
+          record_test_to_recorder_profile('cucumber',lpt_feature_files)
           lpt_feature_files
         end
       end

data/lib/tdrunner_monitor.rb

@@ -89,6 +89,15 @@ module TDRunner
       end
     end
 
+    def write_recorded_sip_file(tdrunner_parameters)
+      if($recorded_tests!=nil && tdrunner_parameters.recorded_execution_profile != nil && !$recorded_tests.empty?)
+        file = File.open(tdrunner_parameters.recorded_execution_profile.to_s,'w')
+        $recorded_tests.flatten.each { |x| file.write(x.to_s+"\n")}
+        file.close
+        puts 'Recorded execution profile created: '+ tdrunner_parameters.recorded_execution_profile
+      end
+    end
+
     def trap_pause
       puts "\nExecution paused...\n"
       puts "\nStop execution Yes or No?:"
@@ -539,6 +548,20 @@ module TDRunner
       "#{m}m#{'%.3f' % s}s"
     end
 
+    def record_test_to_recorder_profile(framework,record)
+      if $tdrunner_parameters.recorded_execution_profile
+        $recorded_tests ||= Array.new
+        case framework
+        when 'cucumber'
+          record.each do |feature|
+            $recorded_tests << "#{feature}=1"
+          end
+        when 'test_unit'
+          $recorded_tests << "#{record}=1"
+        end
+      end
+    end
+
     def wait_for_starttime(tdrunner_parameters)
       #If the start time is defined then only start execution at this time
       if tdrunner_parameters.start_time!=nil

data/lib/tdrunner_profile.rb

@@ -125,6 +125,7 @@ module TDRunner
       @tdrunner_combine_report=nil
       @start_time=nil
       @failed_execution_profile=nil
+      @recorded_execution_profile=nil
       parse_tdrunner_parameters(args)
     end
 
@@ -194,6 +195,7 @@ module TDRunner
       make_execution_profile=false
       combine_report_defined=false
       make_failed_execution_profile_defined=false
+      make_recorded_execution_profile_defined=false
       parameters_contains_framework_command=check_if_parameters_contain_a_framework_command(args)
 
       args.each do |value|
@@ -248,6 +250,10 @@ module TDRunner
           make_failed_execution_profile_defined=false
           @failed_execution_profile=value
         end
+        if make_recorded_execution_profile_defined==true
+          make_recorded_execution_profile_defined=false
+          @recorded_execution_profile=value
+        end
 
         if value.to_s == '--teardown'
           @tdrunner_teardown=true
@@ -279,6 +285,9 @@ module TDRunner
         if value.to_s == '-t'
           make_failed_execution_profile_defined=true
         end
+        if value.to_s == '-r'
+          make_recorded_execution_profile_defined=true
+        end
 
       end
 
@@ -316,6 +325,10 @@ module TDRunner
         failed_profile_location=create_failed_sip(@failed_execution_profile)
         @failed_execution_profile=failed_profile_location
       end
+      if @recorded_execution_profile!=nil
+        recorded_profile_location=create_failed_sip(@recorded_execution_profile)
+        @recorded_execution_profile=recorded_profile_location        
+      end
     end
     def create_failed_sip(failed_sip_profile)
       sip_file=nil
@@ -406,6 +419,9 @@ module TDRunner
     def failed_execution_profile()
       @failed_execution_profile
     end
+    def recorded_execution_profile()
+      @recorded_execution_profile
+    end
     def tdrunner_ordered()
       @tdrunner_ordered
     end

data/lib/tdrunner_test_unit.rb

@@ -174,6 +174,7 @@ begin
           current_run_time=Time.now-run_start_time
           puts 'Run time: '+ format_duration(current_run_time)
           #end SIERRA runner
+          
 
           result.remove_listener(Test::Unit::TestResult::FAULT, fault_listener)
           result.remove_listener(Test::Unit::TestResult::CHANGED, result_listener)
@@ -267,6 +268,129 @@ begin
   module Test
     module Unit
       class TestCase
+
+        DESCENDANTS = []
+        
+        class << self
+          def inherited(sub_class)
+            DESCENDANTS << sub_class
+          end
+
+          # Rolls up all of the test* methods in the fixture into
+          # one suite, creating a new instance of the fixture for
+          # each method.
+          def suite            
+            method_names = public_instance_methods(true).collect {|name| name.to_s}
+            tests = method_names.delete_if {|method_name| method_name !~ /^test./}
+            suite = TestSuite.new(name, self)            
+            tests.sort.each do |test|
+              catch(:invalid_test) do
+                suite << new(test)
+              end
+            end
+            if suite.empty?
+              catch(:invalid_test) do
+                suite << new("default_test")
+              end
+            end
+            suite
+          end
+
+          # Called before every test case runs. Can be used
+          # to set up fixture information used in test case
+          # scope.
+          #
+          # Here is an example test case:
+          #   class TestMyClass < Test::Unit::TestCase
+          #     class << self
+          #       def startup
+          #         ...
+          #       end
+          #     end
+          #
+          #     def setup
+          #       ...
+          #     end
+          #
+          #     def test_my_class1
+          #       ...
+          #     end
+          #
+          #     def test_my_class2
+          #       ...
+          #     end
+          #   end
+          #
+          # Here is a call order:
+          #   * startup
+          #   * setup
+          #   * test_my_class1 (or test_my_class2)
+          #   * setup
+          #   * test_my_class2 (or test_my_class1)
+          #
+          # Note that you should not assume test order. Tests
+          # should be worked in any order.
+          def startup
+           
+          end
+
+          # Called after every test case runs. Can be used to tear
+          # down fixture information used in test case scope.
+          #
+          # Here is an example test case:
+          #   class TestMyClass < Test::Unit::TestCase
+          #     class << self
+          #       def shutdown
+          #         ...
+          #       end
+          #     end
+          #
+          #     def teardown
+          #       ...
+          #     end
+          #
+          #     def test_my_class1
+          #       ...
+          #     end
+          #
+          #     def test_my_class2
+          #       ...
+          #     end
+          #   end
+          #
+          # Here is a call order:
+          #   * test_my_class1 (or test_my_class2)
+          #   * teardown
+          #   * test_my_class2 (or test_my_class1)
+          #   * teardown
+          #   * shutdown
+          #
+          # Note that you should not assume test order. Tests
+          # should be worked in any order.
+          def shutdown
+            
+          end
+        end
+
+        attr_reader :method_name
+
+        # Creates a new instance of the fixture for running the
+        # test represented by test_method_name.
+        def initialize(test_method_name)
+          throw :invalid_test unless respond_to?(test_method_name)
+          test_method = method(test_method_name)
+          throw :invalid_test if test_method.arity > 0
+          if test_method.respond_to?(:owner)
+            if test_method.owner.class != Module and
+                self.class != test_method.owner
+              throw :invalid_test
+            end
+          end
+          @method_name = test_method_name
+          @test_passed = true
+          @interrupted = false
+        end
+
         # Runs the individual test method represented by this
         # instance of the fixture, collecting statistics, failures
         # and errors in result.
@@ -276,23 +400,37 @@ begin
           @_result = result
           @case_contents_array=case_contents_array
           test_skipped = false
+          skip_text = ""
+
           begin
 
-            if MobyUtil::Parameter[ :runner_skip_enabled, "false" ] == "true" 
-						
-              fail_execs = tdriver_get_current_by_status( "failed" )
-              pass_execs = tdriver_get_current_by_status( "passed" )
-      
-              fail_execs = fail_execs.respond_to?( :count ) ? fail_execs.count : 0            
-              pass_execs = pass_execs.respond_to?( :count ) ? pass_execs.count : 0
+            if skip_sequential = TDriver::Parameter[ :runner_sequence_skip, "false" ] == "true"
+            
+              fails_now = tdriver_get_sequential_fails
+              fail_treshold = TDriver::Parameter[ :runner_sequence_treshold, 1 ].to_i
+              skip_text = "Not run due to sequential failures over treshold (#{ fail_treshold })."
+              test_skipped = fails_now > fail_treshold
+                
+            end
+                        
+            if !test_skipped            
+              if TDriver::Parameter[ :runner_skip_enabled, "false" ] == "true"
               
-              skip_treshold = MobyUtil::Parameter[ :runner_skip_treshold, "5" ].to_i
+                fail_execs = tdriver_get_current_by_status( "failed" )
+                pass_execs = tdriver_get_current_by_status( "passed" )
+        
+                fail_execs = fail_execs.respond_to?( :count ) ? fail_execs.count : 0            
+                pass_execs = pass_execs.respond_to?( :count ) ? pass_execs.count : 0
+                
+                skip_treshold = TDriver::Parameter[ :runner_skip_treshold, "5" ].to_i
+                
+                if fail_execs + pass_execs >= skip_treshold and fail_execs + pass_execs > 0
+                  skip_rate = TDriver::Parameter[ :runner_skip_fail_rate, "66" ].to_i / 100.0
+                  skip_text = "Not run due to consistent failures exceeding maximum fail rate(#{ skip_rate } %)."
+                  test_skipped = fail_execs/(fail_execs + pass_execs).to_f >= skip_rate               
+                end
               
-              if fail_execs + pass_execs >= skip_treshold and fail_execs + pass_execs > 0
-                skip_rate = MobyUtil::Parameter[ :runner_skip_fail_rate, "66" ].to_i / 100.0
-                test_skipped = fail_execs/(fail_execs + pass_execs).to_f >= skip_rate               
               end
-            
             end
             
             if !test_skipped
@@ -313,8 +451,8 @@ begin
 
             else
 
-              tdriver_report_log( "Not run due to consistent failures." )              
-              tdriver_report_set_test_case_status( MobyUtil::Parameter[ :runner_skip_status, "not run" ] )              
+              tdriver_report_log( skip_text )              
+              tdriver_report_set_test_case_status( TDriver::Parameter[ :runner_skip_status, "not run" ] )
               
             end
 
@@ -347,17 +485,26 @@ begin
                 raise if PASSTHROUGH_EXCEPTIONS.include? $!.class
                 add_error($!)
               end
-			end
+            end
             @case_contents_array[current_index]=[@case_contents_array[current_index].at(0),@case_contents_array[current_index].at(1),@case_contents_array[current_index].at(2),@test_passed] if @case_contents_array!=nil && status==nil
           end
           result.add_run
           yield(FINISHED, name)
         end
+
       end
       class TestSuite
         include TDRunner::TDRunnerMonitor
         # Runs the tests and/or suites contained in this
         # TestSuite.
+
+        # Creates a new TestSuite with the given name.
+        def initialize(name="Unnamed TestSuite", test_case=nil)          
+          @name = name
+          @tests = []
+          @test_case = test_case
+        end
+
         def parse_parameter_string(string)
           s = string
 
@@ -387,13 +534,15 @@ begin
         end
         def run(result,arguments=nil,case_contents_array=nil, current_index=nil,status=nil, &progress_block)
           yield(STARTED, name)
+          run_startup(result)
           @tests,@case_contents_array=randomize_test_cases(@tests,$tdrunner_parameters)
           @test_level_and_result=Array.new if @test_level_and_result==nil
           current_index=0
           previous_test_level=0
           previous_test_level_result=nil
           current_test_level=0
-          @tests.each do |test|
+          @tests.each do |test|            
+            record_test_to_recorder_profile('test_unit',test)
             parameters_arr=nil
             eval_parameters_arr=[]
             if @case_contents_array!=nil
@@ -450,8 +599,25 @@ begin
             current_index+=1
           end
           add_failed_testunit_tests($tdrunner_parameters, @case_contents_array)
+          run_shutdown(result)
           yield(FINISHED, name)
         end
+
+        private
+        def run_startup(result)          
+          return if @test_case.nil? or !@test_case.respond_to?(:startup)
+
+            @test_case.startup
+
+        end
+
+        def run_shutdown(result)
+          return if @test_case.nil? or !@test_case.respond_to?(:shutdown)
+
+            @test_case.shutdown
+
+        end
+
       end
     end
   end

data/rakefile

@@ -56,8 +56,7 @@ def make_spec
     s.add_dependency("testability-driver")
     s.add_dependency("rails", ">=2.3.5")
     s.add_dependency("zippy")
-    s.add_dependency("sqlite3-ruby", ">=1.2.5")
-    
+    s.add_dependency("sqlite3-ruby")    
   end
 end
 
@@ -87,7 +86,7 @@ task :gem_install do
   puts "### Installing GEM  #{GEM_NAME}       ###"
   puts "#########################################################"
   tdrunner_gem = "tdrunner-#{@__gem_version}.gem"
-  if /win/ =~ RUBY_PLATFORM
+  if /win/ =~ RUBY_PLATFORM || /mingw32/ =~ RUBY_PLATFORM
     cmd = "gem install pkg\\*.gem --LOCAL"
   else
     cmd = "gem install pkg/*.gem --LOCAL"
@@ -106,7 +105,7 @@ task :gem_uninstall do
   puts "#########################################################"
   tdrunner_gem = "tdrunner-#{@__gem_version}.gem"
    FileUtils.rm(Dir.glob('pkg/*gem'))
-  if /win/ =~ RUBY_PLATFORM    
+  if /win/ =~ RUBY_PLATFORM || /mingw32/ =~ RUBY_PLATFORM
     cmd = "del /F /Q pkg\\"
     failure = system(cmd)
     #raise "deleting #{GEM_NAME} in pkg folder failed" if (failure != true) or ($? != 0)

data/websi/app/controllers/report_editor/test_run/cases_controller.rb

@@ -229,7 +229,7 @@ class ReportEditor::TestRun::CasesController < ApplicationController
   end
 
   def test_case_comment(test_case)
-    pass_statuses=MobyUtil::Parameter[ :report_passed_statuses, "passed" ].split('|')
+    pass_statuses=TDriver::Parameter[ :report_passed_statuses, "passed" ].split('|')
     status=test_case[7].to_s
     comment=nil
     if pass_statuses.include?(status)==false

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testability-driver-runner
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
-  - 1
-  version: 1.1.1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Testability Driver team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 Z
+date: 2011-06-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: testability-driver
@@ -69,12 +69,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 3
         segments: 
-        - 1
-        - 2
-        - 5
-        version: 1.2.5
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id004
 description: Testability Driver test runner