ci_reporter 1.0 → 1.1

data/History.txt

@@ -1,3 +1,7 @@
+== 1.1
+
+- Add +assertions+ attribute to the +testsuite+ element that will contain per-suite assertion counts when used with Test::Unit.  Not useful with applications that read Ant/JUnit XML, but custom applications may wish to access it.
+
 == 1.0
 
 Initial Release.

data/README.txt

@@ -33,9 +33,11 @@ CI::Reporter works best with projects that use a +Rakefile+ along with the stand
 
     rake ci:setup:testunit test
 
+Report files are written, by default, to the <code>test/reports</code> or <code>spec/reports</code> subdirectory of your project.  If you wish to customize the location, simply set the environment variable CI_REPORTS (either in the environment, on the Rake command line, or in your Rakefile) to the location where they should go.
+
 == Advanced Usage
 
-If for some reason you can't use the above technique to inject CI::Reporter, you'll have to do one of these:
+If for some reason you can't use the above technique to inject CI::Reporter (e.g., you're not using Rake), you'll have to do one of these:
 
 1. If you're using <code>Test::Unit</code>, ensure the <code>ci/reporter/rake/test_unit_loader.rb</code> file is loaded or required at some point before the tests are run.
 2. If you're using +RSpec+, you'll need to pass the following arguments to the +spec+ command:

data/Rakefile

@@ -4,7 +4,7 @@ require 'hoe'
 MANIFEST = FileList["History.txt", "Manifest.txt", "README.txt", "Rakefile",
   "lib/**/*.rb", "spec/**/*.rb", "tasks/**/*.rake"]
 
-Hoe.new("ci_reporter", "1.0") do |p|
+Hoe.new("ci_reporter", "1.1") do |p|
   p.rubyforge_name = "caldersphere"
   p.url = "http://caldersphere.rubyforge.org/ci_reporter"
   p.author = "Nick Sieger"

data/lib/ci/reporter/test_suite.rb

@@ -1,7 +1,7 @@
 module CI
   module Reporter
     # Basic structure representing the running of a test suite.  Used to time tests and store results.
-    class TestSuite < Struct.new(:name, :tests, :time, :failures, :errors)
+    class TestSuite < Struct.new(:name, :tests, :time, :failures, :errors, :assertions)
       attr_accessor :testcases
       def initialize(name)
         super
@@ -53,7 +53,7 @@ module CI
         end
         builder.instruct!
         attrs = {}
-        each_pair {|k,v| attrs[k] = builder.trunc!(v.to_s) }
+        each_pair {|k,v| attrs[k] = builder.trunc!(v.to_s) unless v.nil? || v.to_s.empty? }
         builder.testsuite(attrs) do
           @testcases.each do |tc|
             tc.to_xml(builder)

data/lib/ci/reporter/test_unit.rb

@@ -49,6 +49,8 @@ module CI
       end
 
       def started(result)
+        @suite_result = result
+        @last_assertion_count = 0
         @current_suite = nil
         @unknown_count = 0
       end
@@ -93,6 +95,8 @@ module CI
       def finish_suite
         if @current_suite
           @current_suite.finish 
+          @current_suite.assertions = @suite_result.assertion_count - @last_assertion_count
+          @last_assertion_count = @suite_result.assertion_count
           @report_manager.write_report(@current_suite)
         end
       end

data/spec/ci/reporter/test_suite_spec.rb

@@ -45,6 +45,7 @@ end
 context "TestSuite xml" do
   setup do
     @suite = CI::Reporter::TestSuite.new("example suite")
+    @suite.assertions = 11
     begin
       raise StandardError, "an exception occurred"
     rescue => e
@@ -77,11 +78,13 @@ context "TestSuite xml" do
 
     xml = @suite.to_xml
     doc = REXML::Document.new(xml)
-    testsuite = doc.root.elements.to_a('/testsuite')
+    testsuite = doc.root.elements.to_a("/testsuite")
     testsuite.length.should == 1
     testsuite = testsuite.first
+    testsuite.attributes["name"].should == "example suite"
+    testsuite.attributes["assertions"].should == "11"
 
-    testcases = testsuite.elements.to_a('testcase')
+    testcases = testsuite.elements.to_a("testcase")
     testcases.length.should == 3
   end
   

data/spec/ci/reporter/test_unit_spec.rb

@@ -4,13 +4,15 @@ context "The TestUnit reporter" do
   setup do
     @report_mgr = mock("report manager")
     @testunit = CI::Reporter::TestUnit.new(nil, @report_mgr)
+    @result = mock("result")
+    @result.stub!(:assertion_count).and_return(7)
   end
 
   specify "should build suites based on adjacent tests with the same class name" do
     @suite = nil
     @report_mgr.should_receive(:write_report).once.and_return {|suite| @suite = suite }
 
-    @testunit.started(mock("result"))
+    @testunit.started(@result)
     @testunit.test_started("test_one(TestCaseClass)")
     @testunit.test_finished("test_one(TestCaseClass)")
     @testunit.test_started("test_two(TestCaseClass)")
@@ -31,7 +33,7 @@ context "The TestUnit reporter" do
     @suites = []
     @report_mgr.should_receive(:write_report).twice.and_return {|suite| @suites << suite }
 
-    @testunit.started(mock("result"))
+    @testunit.started(@result)
     @testunit.test_started("test_one(TestCaseClass)")
     @testunit.test_finished("test_one(TestCaseClass)")
     @testunit.test_started("test_two(AnotherTestCaseClass)")
@@ -46,6 +48,18 @@ context "The TestUnit reporter" do
     @suites.last.testcases.first.name.should == "test_two"
   end
   
+  specify "should record assertion counts during test run" do
+    @suite = nil
+    @report_mgr.should_receive(:write_report).and_return {|suite| @suite = suite }
+
+    @testunit.started(@result)
+    @testunit.test_started("test_one(TestCaseClass)")
+    @testunit.test_finished("test_one(TestCaseClass)")
+    @testunit.finished(10)
+
+    @suite.assertions.should == 7
+  end
+  
   specify "should add failures to testcases when encountering a fault" do
     begin
       raise StandardError, "error"
@@ -56,7 +70,7 @@ context "The TestUnit reporter" do
     @suite = nil
     @report_mgr.should_receive(:write_report).once.and_return {|suite| @suite = suite }
 
-    @testunit.started(mock("result"))
+    @testunit.started(@result)
     @testunit.test_started("test_one(TestCaseClass)")
     @testunit.test_finished("test_one(TestCaseClass)")
     @testunit.test_started("test_two(TestCaseClass)")

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: ci_reporter
 version: !ruby/object:Gem::Version 
-  version: "1.0"
-date: 2007-02-14 00:00:00 -06:00
+  version: "1.1"
+date: 2007-03-15 00:00:00 -05:00
 summary: CI::Reporter allows you to generate reams of XML for use with continuous integration systems.
 require_paths: 
 - lib