ci_reporter 1.3.5 → 1.4

data/History.txt

@@ -1,3 +1,9 @@
+== 1.4
+
+- Test::Unit tests that fail in multiple places (setup, test method, and teardown) are now tracked (marcog)
+- Explicit dependency requirement on Builder (>= 2.1.2)
+- Use of RSpec < 0.9 is now deprecated; support will probably disappear in the next version
+
 == 1.3.5
 
 - Change way we append to environment variables to appease windows (Tracker #13998, Adam Anderson)

data/Rakefile

@@ -1,12 +1,13 @@
 require 'spec/rake/spectask'
+require 'spec/rake/verify_rcov'
 
 MANIFEST = FileList["History.txt", "Manifest.txt", "README.txt", "LICENSE.txt", "Rakefile",
   "*.rake", "lib/**/*.rb", "spec/**/*.rb", "tasks/**/*.rake"]
 
-require File.dirname(__FILE__) + '/lib/ci/reporter/version'
 begin
-  touch("Manifest.txt") unless File.exist?("Manifest.txt")
+  File.open("Manifest.txt", "w") {|f| MANIFEST.each {|n| f << "#{n}\n"} }
   require 'hoe'
+  require File.dirname(__FILE__) + '/lib/ci/reporter/version'
   hoe = Hoe.new("ci_reporter", CI::Reporter::VERSION) do |p|
     p.rubyforge_name = "caldersphere"
     p.url = "http://caldersphere.rubyforge.org/ci_reporter"
@@ -17,6 +18,7 @@ begin
     p.description = p.paragraphs_of('README.txt', 0...1).join("\n\n")
     p.extra_deps.reject!{|d| d.first == "hoe"}
     p.test_globs = ["spec/**/*_spec.rb"]
+    p.extra_deps << ['builder', ">= 2.1.2"]
   end
   hoe.spec.files = MANIFEST
   hoe.spec.dependencies.delete_if { |dep| dep.name == "hoe" }
@@ -28,16 +30,42 @@ end
 # !@#$ no easy way to empty the default list of prerequisites
 Rake::Task['default'].send :instance_variable_set, "@prerequisites", FileList[]
 
-task :default => :spec
+task :default => :rcov
 
 Spec::Rake::SpecTask.new do |t|
   t.spec_opts ||= []
   t.spec_opts << "--diff" << "unified"
 end
 
-# Automated manifest
-task :manifest do
-  File.open("Manifest.txt", "w") {|f| MANIFEST.each {|n| f << "#{n}\n"} }
+Spec::Rake::SpecTask.new("spec:rcov") do |t|
+  t.rcov = true
+end
+# so we don't confuse autotest
+RCov::VerifyTask.new(:rcov) do |t|
+  # Can't get threshold up to 100 until the RSpec < 1.0 compatibility
+  # code is dropped
+  t.threshold = 97
+  t.require_exact_threshold = false
+end
+task "spec:rcov" do
+  rm_f "Manifest.txt"
+end
+task :rcov => "spec:rcov"
+
+task :generate_output do
+  ENV['CI_REPORTS'] = "acceptance/reports"
+  begin
+    `ruby -Ilib acceptance/test_unit_example_test.rb` rescue nil
+    `ruby -Ilib -S spec --require ci/reporter/rake/rspec_loader --format CI::Reporter::RSpec acceptance/rspec_example_spec.rb` rescue nil
+  ensure
+    ENV.delete 'CI_REPORTS'
+  end
+end
+task :acceptance => :generate_output
+
+Spec::Rake::SpecTask.new(:acceptance_spec) do |t|
+  t.spec_files = FileList['acceptance/verification_spec.rb']
 end
+task :acceptance => :acceptance_spec
 
-task :package => :manifest
+task :default => :acceptance

data/lib/ci/reporter/rspec.rb

@@ -46,6 +46,15 @@ module CI
         @suite = nil
       end
 
+      def deprecated
+        unless @warned
+          require 'ci/reporter/version'
+          warn "warning: use of RSpec < 0.9 with CI::Reporter #{CI::Reporter::VERSION} is deprecated;"
+          warn "a future version will not be compatible."
+        end
+        @warned = true
+      end
+
       def start(spec_count)
         super
       end
@@ -53,6 +62,7 @@ module CI
       # Pre-0.9 hook
       def add_context(name, first)
         super
+        deprecated
         new_suite(name)
       end
 
@@ -65,6 +75,7 @@ module CI
       # Pre-0.9 hook
       def spec_started(name)
         super
+        deprecated
         case_started(name)
       end
 
@@ -77,6 +88,7 @@ module CI
       # Pre-0.9 hook
       def spec_failed(name, counter, failure)
         super
+        deprecated
         case_failed(name, counter, failure)
       end
 
@@ -89,6 +101,7 @@ module CI
       # Pre-0.9 hook
       def spec_passed(name)
         super
+        deprecated
         case_passed(name)
       end
 
@@ -136,7 +149,7 @@ module CI
       def case_failed(name, counter, failure)
         spec = @suite.testcases.last
         spec.finish
-        spec.failure = RSpecFailure.new(failure)
+        spec.failures << RSpecFailure.new(failure)
       end
 
       def case_passed(name)

data/lib/ci/reporter/test_suite.rb

@@ -57,25 +57,17 @@ module CI
       def finish
         self.tests = testcases.size
         self.time = Time.now - @start
-        self.failures = testcases.select {|tc| tc.failure? }.size
-        self.errors = testcases.select {|tc| tc.error? }.size
+        self.failures = testcases.inject(0) {|sum,tc| sum += tc.failures.select{|f| f.failure? }.size }
+        self.errors = testcases.inject(0) {|sum,tc| sum += tc.failures.select{|f| f.error? }.size }
         self.stdout = @capture_out.finish if @capture_out
         self.stderr = @capture_err.finish if @capture_err
       end
 
       # Creates the xml builder instance used to create the report xml document.
       def create_builder
-        begin
-          gem 'builder'
-          require 'builder'
-        rescue
-          begin
-            gem 'activesupport'
-            require 'active_support'
-          rescue
-            raise LoadError, "XML Builder is required by CI::Reporter"
-          end
-        end unless defined?(Builder::XmlMarkup)
+        require 'rubygems'
+        gem 'builder'
+        require 'builder'
         # :escape_attrs is obsolete in a newer version, but should do no harm
         Builder::XmlMarkup.new(:indent => 2, :escape_attrs => true)
       end
@@ -84,14 +76,8 @@ module CI
       def to_xml
         builder = create_builder
         # more recent version of Builder doesn't need the escaping
-        if Builder::XmlMarkup.private_instance_methods.include?("_attr_value")
-          def builder.trunc!(txt)
-            txt.sub(/\n.*/m, '...')
-          end
-        else
-          def builder.trunc!(txt)
-            _escape(txt.sub(/\n.*/m, '...'))
-          end
+        def builder.trunc!(txt)
+          txt.sub(/\n.*/m, '...')
         end
         builder.instruct!
         attrs = {}
@@ -112,7 +98,12 @@ module CI
 
     # Structure used to represent an individual test case.  Used to time the test and store the result.
     class TestCase < Struct.new(:name, :time, :assertions)
-      attr_accessor :failure
+      attr_accessor :failures
+
+      def initialize(*args)
+        super
+        @failures = []
+      end
 
       # Starts timing the test.
       def start
@@ -126,12 +117,12 @@ module CI
 
       # Returns non-nil if the test failed.
       def failure?
-        failure && failure.failure?
+        !failures.empty? && failures.detect {|f| f.failure? }
       end
 
       # Returns non-nil if the test had an error.
       def error?
-        failure && failure.error?
+        !failures.empty? && failures.detect {|f| f.error? }
       end
 
       # Writes xml representing the test result to the provided builder.
@@ -139,7 +130,7 @@ module CI
         attrs = {}
         each_pair {|k,v| attrs[k] = builder.trunc!(v.to_s) unless v.nil? || v.to_s.empty?}
         builder.testcase(attrs) do
-          if failure
+          failures.each do |failure|
             builder.failure(:type => builder.trunc!(failure.name), :message => builder.trunc!(failure.message)) do
               builder.text!(failure.message + " (#{failure.name})\n")
               builder.text!(failure.location)

data/lib/ci/reporter/test_unit.rb

@@ -74,7 +74,8 @@ module CI
       end
 
       def fault(fault)
-        finish_test(fault)
+        tc = @current_suite.testcases.last
+        tc.failures << Failure.new(fault)
       end
 
       def finished(elapsed_time)
@@ -112,10 +113,9 @@ module CI
         @current_suite.testcases << tc
       end
 
-      def finish_test(failure = nil)
+      def finish_test
         tc = @current_suite.testcases.last
         tc.finish
-        tc.failure = Failure.new(failure) if failure
         tc.assertions = @suite_result.assertion_count - @result_assertion_count
         @result_assertion_count = @suite_result.assertion_count
       end

data/lib/ci/reporter/version.rb

@@ -1,5 +1,5 @@
 module CI
   module Reporter
-    VERSION = "1.3.5"
+    VERSION = "1.4"
   end
 end

data/spec/ci/reporter/rspec_spec.rb

@@ -8,13 +8,6 @@ require 'stringio'
 describe "The RSpec reporter" do
   before(:each) do
     @error = mock("error")
-    @error.stub!(:exception).and_return do
-      begin
-        raise StandardError, "error message"
-      rescue => e
-        e
-      end
-    end
     @error.stub!(:expectation_not_met?).and_return(false)
     @error.stub!(:pending_fixed?).and_return(false)
     @report_mgr = mock("report manager")
@@ -37,4 +30,11 @@ describe "The RSpec reporter" do
     @fmt.example_failed("should fail", 1, @error)
     @fmt.dump_summary(0.1, 2, 1)
   end
+
+  it "should report deprecation when called with RSpec < 0.9" do
+    @fmt.should_receive(:warn).exactly(2).times
+    @fmt.deprecated
+    @fmt.deprecated
+    @fmt.deprecated
+  end
 end

data/spec/ci/reporter/test_suite_spec.rb

@@ -41,9 +41,9 @@ describe "A TestSuite" do
     @suite.start
     @suite.testcases << CI::Reporter::TestCase.new("example test")
     @suite.testcases << CI::Reporter::TestCase.new("failure test")
-    @suite.testcases.last.failure = failure
+    @suite.testcases.last.failures << failure
     @suite.testcases << CI::Reporter::TestCase.new("error test")
-    @suite.testcases.last.failure = error
+    @suite.testcases.last.failures << error
     @suite.finish
     @suite.tests.should == 3
     @suite.failures.should == 1
@@ -80,9 +80,9 @@ describe "TestSuite xml" do
     @suite.start
     @suite.testcases << CI::Reporter::TestCase.new("example test")
     @suite.testcases << CI::Reporter::TestCase.new("failure test")
-    @suite.testcases.last.failure = failure
+    @suite.testcases.last.failures << failure
     @suite.testcases << CI::Reporter::TestCase.new("error test")
-    @suite.testcases.last.failure = error
+    @suite.testcases.last.failures << error
     @suite.finish
 
     xml = @suite.to_xml
@@ -108,7 +108,7 @@ describe "TestSuite xml" do
     @suite.start
     @suite.testcases << CI::Reporter::TestCase.new("example test")
     @suite.testcases << CI::Reporter::TestCase.new("failure test")
-    @suite.testcases.last.failure = failure
+    @suite.testcases.last.failures << failure
     @suite.finish
 
     xml = @suite.to_xml
@@ -129,7 +129,7 @@ describe "TestSuite xml" do
 
     @suite.start
     @suite.testcases << CI::Reporter::TestCase.new("failure test")
-    @suite.testcases.last.failure = failure
+    @suite.testcases.last.failures << failure
     @suite.finish
 
     xml = @suite.to_xml

data/spec/ci/reporter/test_unit_spec.rb

@@ -69,6 +69,24 @@ describe "The TestUnit reporter" do
   end
   
   it "should add failures to testcases when encountering a fault" do
+    @failure = Test::Unit::Failure.new("test_one(TestCaseClass)", "somewhere:10", "it failed")
+
+    @suite = nil
+    @report_mgr.should_receive(:write_report).once.and_return {|suite| @suite = suite }
+
+    @testunit.started(@result)
+    @testunit.test_started("test_one(TestCaseClass)")
+    @testunit.fault(@failure)
+    @testunit.test_finished("test_one(TestCaseClass)")
+    @testunit.finished(10)
+
+    @suite.name.should == "TestCaseClass"
+    @suite.testcases.length.should == 1
+    @suite.testcases.first.name.should == "test_one"
+    @suite.testcases.first.should be_failure
+  end
+
+  it "should add errors to testcases when encountering a fault" do
     begin
       raise StandardError, "error"
     rescue => e
@@ -83,6 +101,7 @@ describe "The TestUnit reporter" do
     @testunit.test_finished("test_one(TestCaseClass)")
     @testunit.test_started("test_two(TestCaseClass)")
     @testunit.fault(@error)
+    @testunit.test_finished("test_two(TestCaseClass)")
     @testunit.finished(10)
 
     @suite.name.should == "TestCaseClass"
@@ -94,4 +113,40 @@ describe "The TestUnit reporter" do
     @suite.testcases.last.should_not be_failure
     @suite.testcases.last.should be_error
   end
+  
+  it "should add multiple failures to a testcase" do
+    @failure1 = Test::Unit::Failure.new("test_one(TestCaseClass)", "somewhere:10", "it failed")
+    @failure2 = Test::Unit::Failure.new("test_one(TestCaseClass)", "somewhere:12", "it failed again in teardown")
+
+    @suite = nil
+    @report_mgr.should_receive(:write_report).once.and_return {|suite| @suite = suite }
+
+    @testunit.started(@result)
+    @testunit.test_started("test_one(TestCaseClass)")
+    @testunit.fault(@failure1)
+    @testunit.fault(@failure2)
+    @testunit.test_finished("test_one(TestCaseClass)")
+    @testunit.finished(10)
+
+    @suite.name.should == "TestCaseClass"
+    @suite.testcases.length.should == 1
+    @suite.testcases.first.name.should == "test_one"
+    @suite.testcases.first.should be_failure
+    @suite.testcases.first.failures.size.should == 2
+    @suite.failures.should == 2
+  end
+
+  it "should count test case names that don't conform to the standard pattern" do
+    @suite = nil
+    @report_mgr.should_receive(:write_report).once.and_return {|suite| @suite = suite }
+
+    @testunit.started(@result)
+    @testunit.test_started("some unknown test")
+    @testunit.test_finished("some unknown test")
+    @testunit.finished(10)
+
+    @suite.name.should == "unknown-1"
+    @suite.testcases.length.should == 1
+    @suite.testcases.first.name.should == "some unknown test"
+  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: ci_reporter
 version: !ruby/object:Gem::Version 
-  version: 1.3.5
-date: 2007-09-25 00:00:00 -05:00
+  version: "1.4"
+date: 2007-11-23 00:00:00 -06:00
 summary: CI::Reporter allows you to generate reams of XML for use with continuous integration systems.
 require_paths: 
 - lib
@@ -74,5 +74,13 @@ extensions: []
 
 requirements: []
 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: builder
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.1.2
+    version: