assert 2.15.2 → 2.16.0

data/lib/assert/version.rb

@@ -1,3 +1,3 @@
 module Assert
-  VERSION = "2.15.2"
+  VERSION = "2.16.0"
 end

data/lib/assert/view_helpers.rb

@@ -28,16 +28,6 @@ module Assert
 
     module InstanceMethods
 
-      # get the formatted run time for an idividual test
-      def test_run_time(test, format = '%.6f')
-        format % test.run_time
-      end
-
-      # get the formatted result rate for an individual test
-      def test_result_rate(test, format = '%.6f')
-        format % test.result_rate
-      end
-
       # show any captured output
       def captured_output(output)
         "--- stdout ---\n"\
@@ -50,12 +40,12 @@ module Assert
         "assert -t #{test_id.gsub(Dir.pwd, '.')}"
       end
 
-      def test_count_statement
-        "#{self.count(:tests)} test#{'s' if self.count(:tests) != 1}"
+      def tests_to_run_count_statement
+        "#{self.tests_to_run_count} test#{'s' if self.tests_to_run_count != 1}"
       end
 
       def result_count_statement
-        "#{self.count(:results)} result#{'s' if self.count(:results) != 1}"
+        "#{self.result_count} result#{'s' if self.result_count != 1}"
       end
 
       # generate a comma-seperated sentence fragment given a list of items
@@ -69,9 +59,9 @@ module Assert
 
       # generate an appropriate result summary msg for all tests passing
       def all_pass_result_summary_msg
-        if self.count(:results) < 1
+        if self.result_count < 1
           "uhh..."
-        elsif self.count(:results) == 1
+        elsif self.result_count == 1
           "pass"
         else
           "all pass"
@@ -83,16 +73,16 @@ module Assert
         if result_type == :pass && self.all_pass?
           self.all_pass_result_summary_msg
         else
-          "#{self.count(result_type)} #{result_type.to_s}"
+          "#{self.send("#{result_type}_result_count")} #{result_type}"
         end
       end
 
       # generate a sentence fragment describing the breakdown of test results
       # if a block is given, yield each msg in the breakdown for custom formatting
       def results_summary_sentence
-        summaries = self.ocurring_result_types.map do |result_sym|
-          summary_msg = self.result_summary_msg(result_sym)
-          block_given? ? yield(summary_msg, result_sym) : summary_msg
+        summaries = self.ocurring_result_types.map do |result_type|
+          summary_msg = self.result_summary_msg(result_type)
+          block_given? ? yield(summary_msg, result_type) : summary_msg
         end
         self.to_sentence(summaries)
       end
@@ -186,9 +176,9 @@ module Assert
         style_names.map{ |n| "\e[#{CODES[n]}m" if CODES.key?(n) }.compact.join('')
       end
 
-      def ansi_styled_msg(msg, result_or_sym)
+      def ansi_styled_msg(msg, result_type)
         return msg if !self.is_tty? || !self.styled
-        code = Assert::ViewHelpers::Ansi.code_for(*self.send("#{result_or_sym.to_sym}_styles"))
+        code = Assert::ViewHelpers::Ansi.code_for(*self.send("#{result_type}_styles"))
         return msg if code.empty?
         code + msg + Assert::ViewHelpers::Ansi.code_for(:reset)
       end

data/test/helper.rb

@@ -17,3 +17,43 @@ if !(a = Array.new).respond_to?(:sample) && a.respond_to?(:choice)
     alias_method :sample, :choice
   end
 end
+
+class Assert::Test
+
+  module TestHelpers
+
+    def self.included(receiver)
+      receiver.class_eval do
+        setup do
+          @test_run_results = []
+          @run_callback = proc{ |result| @test_run_results << result }
+        end
+      end
+
+      private
+
+      def test_run_callback
+        @run_callback
+      end
+
+      def test_run_results(type = nil)
+        return @test_run_results if type.nil?
+        @test_run_results.select{ |r| r.type == type }
+      end
+
+      def test_run_result_count(type = nil)
+        test_run_results(type).count
+      end
+
+      def test_run_result_messages
+        @test_run_results.map(&:message)
+      end
+
+      def last_test_run_result
+        @test_run_results.last
+      end
+    end
+
+  end
+
+end

data/test/system/test_tests.rb

@@ -3,6 +3,8 @@ require 'assert'
 class Assert::Test
 
   class SystemTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "Assert::Test"
     subject{ @test }
 
@@ -12,11 +14,11 @@ class Assert::Test
     desc "when producing no results"
     setup do
       @test = Factory.test
-      @test.run
+      @test.run(&test_run_callback)
     end
 
-    should "have 0 results" do
-      assert_equal 0, subject.result_count
+    should "generate 0 results" do
+      assert_equal 0, test_run_result_count
     end
 
   end
@@ -25,15 +27,15 @@ class Assert::Test
     desc "when passing a single assertion"
     setup do
       @test = Factory.test{ assert(1 == 1) }
-      @test.run
+      @test.run(&test_run_callback)
     end
 
-    should "have 1 result" do
-      assert_equal 1, subject.result_count
+    should "generate 1 result" do
+      assert_equal 1, test_run_result_count
     end
 
-    should "have 1 pass result" do
-      assert_equal 1, subject.result_count(:pass)
+    should "generate 1 pass result" do
+      assert_equal 1, test_run_result_count(:pass)
     end
 
   end
@@ -42,15 +44,15 @@ class Assert::Test
     desc "when failing a single assertion"
     setup do
       @test = Factory.test{ assert(1 == 0) }
-      @test.run
+      @test.run(&test_run_callback)
     end
 
-    should "have 1 result" do
-      assert_equal 1, subject.result_count
+    should "generate 1 result" do
+      assert_equal 1, test_run_result_count
     end
 
-    should "have 1 fail result" do
-      assert_equal 1, subject.result_count(:fail)
+    should "generate 1 fail result" do
+      assert_equal 1, test_run_result_count(:fail)
     end
 
   end
@@ -59,15 +61,15 @@ class Assert::Test
     desc "when skipping once"
     setup do
       @test = Factory.test{ skip }
-      @test.run
+      @test.run(&test_run_callback)
     end
 
-    should "have 1 result" do
-      assert_equal 1, subject.result_count
+    should "generate 1 result" do
+      assert_equal 1, test_run_result_count
     end
 
-    should "have 1 skip result" do
-      assert_equal 1, subject.result_count(:skip)
+    should "generate 1 skip result" do
+      assert_equal 1, test_run_result_count(:skip)
     end
 
   end
@@ -76,15 +78,15 @@ class Assert::Test
     desc "when erroring once"
     setup do
       @test = Factory.test{ raise("WHAT") }
-      @test.run
+      @test.run(&test_run_callback)
     end
 
-    should "have 1 result" do
-      assert_equal 1, subject.result_count
+    should "generate 1 result" do
+      assert_equal 1, test_run_result_count
     end
 
-    should "have 1 error result" do
-      assert_equal 1, subject.result_count(:error)
+    should "generate 1 error result" do
+      assert_equal 1, test_run_result_count(:error)
     end
 
   end
@@ -96,19 +98,19 @@ class Assert::Test
         assert(1 == 1)
         assert(1 == 0)
       end
-      @test.run
+      @test.run(&test_run_callback)
     end
 
-    should "have 2 total results" do
-      assert_equal 2, subject.result_count
+    should "generate 2 total results" do
+      assert_equal 2, test_run_result_count
     end
 
-    should "have 1 pass result" do
-      assert_equal 1, subject.result_count(:pass)
+    should "generate 1 pass result" do
+      assert_equal 1, test_run_result_count(:pass)
     end
 
-    should "have 1 fail result" do
-      assert_equal 1, subject.result_count(:fail)
+    should "generate 1 fail result" do
+      assert_equal 1, test_run_result_count(:fail)
     end
 
   end
@@ -121,27 +123,27 @@ class Assert::Test
         skip
         assert(1 == 0)
       end
-      @test.run
+      @test.run(&test_run_callback)
     end
 
-    should "have 2 total results" do
-      assert_equal 2, subject.result_count
+    should "generate 2 total results" do
+      assert_equal 2, test_run_result_count
     end
 
-    should "have a skip for its last result" do
-      assert_kind_of Assert::Result::Skip, subject.results.last
+    should "generate a skip for its last result" do
+      assert_kind_of Assert::Result::Skip, last_test_run_result
     end
 
-    should "have 1 pass result" do
-      assert_equal 1, subject.result_count(:pass)
+    should "generate 1 pass result" do
+      assert_equal 1, test_run_result_count(:pass)
     end
 
-    should "have 1 skip result" do
-      assert_equal 1, subject.result_count(:skip)
+    should "generate 1 skip result" do
+      assert_equal 1, test_run_result_count(:skip)
     end
 
-    should "have 0 fail results" do
-      assert_equal 0, subject.result_count(:fail)
+    should "generate 0 fail results" do
+      assert_equal 0, test_run_result_count(:fail)
     end
 
   end
@@ -154,27 +156,27 @@ class Assert::Test
         raise Exception, "something errored"
         assert(1 == 0)
       end
-      @test.run
+      @test.run(&test_run_callback)
     end
 
-    should "have 2 total results" do
-      assert_equal 2, subject.result_count
+    should "generate 2 total results" do
+      assert_equal 2, test_run_result_count
     end
 
-    should "have an error for its last result" do
-      assert_kind_of Assert::Result::Error, subject.results.last
+    should "generate an error for its last result" do
+      assert_kind_of Assert::Result::Error, last_test_run_result
     end
 
-    should "have 1 pass result" do
-      assert_equal 1, subject.result_count(:pass)
+    should "generate 1 pass result" do
+      assert_equal 1, test_run_result_count(:pass)
     end
 
-    should "have 1 error result" do
-      assert_equal 1, subject.result_count(:error)
+    should "generate 1 error result" do
+      assert_equal 1, test_run_result_count(:error)
     end
 
-    should "have 0 fail results" do
-      assert_equal 0, subject.result_count(:fail)
+    should "generate 0 fail results" do
+      assert_equal 0, test_run_result_count(:fail)
     end
 
   end
@@ -187,23 +189,23 @@ class Assert::Test
         pass
         assert(1 == 0)
       end
-      @test.run
+      @test.run(&test_run_callback)
     end
 
-    should "have 3 total results" do
-      assert_equal 3, subject.result_count
+    should "generate 3 total results" do
+      assert_equal 3, test_run_result_count
     end
 
-    should "have a fail for its last result" do
-      assert_kind_of Assert::Result::Fail, subject.results.last
+    should "generate a fail for its last result" do
+      assert_kind_of Assert::Result::Fail, last_test_run_result
     end
 
-    should "have 2 pass results" do
-      assert_equal 2, subject.result_count(:pass)
+    should "generate 2 pass results" do
+      assert_equal 2, test_run_result_count(:pass)
     end
 
-    should "have 1 fail result" do
-      assert_equal 1, subject.result_count(:fail)
+    should "generate 1 fail result" do
+      assert_equal 1, test_run_result_count(:fail)
     end
 
   end
@@ -216,23 +218,23 @@ class Assert::Test
         fail
         assert(1 == 1)
       end
-      @test.run
+      @test.run(&test_run_callback)
     end
 
-    should "have 3 total results" do
-      assert_equal 3, subject.result_count
+    should "generate 3 total results" do
+      assert_equal 3, test_run_result_count
     end
 
-    should "have a pass for its last result" do
-      assert_kind_of Assert::Result::Pass, subject.results.last
+    should "generate a pass for its last result" do
+      assert_kind_of Assert::Result::Pass, last_test_run_result
     end
 
-    should "have 1 pass result" do
-      assert_equal 1, subject.result_count(:pass)
+    should "generate 1 pass result" do
+      assert_equal 1, test_run_result_count(:pass)
     end
 
-    should "have 2 fail results" do
-      assert_equal 2, subject.result_count(:fail)
+    should "generate 2 fail results" do
+      assert_equal 2, test_run_result_count(:fail)
     end
 
   end
@@ -245,23 +247,23 @@ class Assert::Test
         flunk
         assert(1 == 1)
       end
-      @test.run
+      @test.run(&test_run_callback)
     end
 
-    should "have 3 total results" do
-      assert_equal 3, subject.result_count
+    should "generate 3 total results" do
+      assert_equal 3, test_run_result_count
     end
 
-    should "have a pass for its last result" do
-      assert_kind_of Assert::Result::Pass, subject.results.last
+    should "generate a pass for its last result" do
+      assert_kind_of Assert::Result::Pass, last_test_run_result
     end
 
-    should "have 1 pass results" do
-      assert_equal 1, subject.result_count(:pass)
+    should "generate 1 pass results" do
+      assert_equal 1, test_run_result_count(:pass)
     end
 
-    should "have 2 fail results" do
-      assert_equal 2, subject.result_count(:fail)
+    should "generate 2 fail results" do
+      assert_equal 2, test_run_result_count(:fail)
     end
 
   end
@@ -276,14 +278,14 @@ class Assert::Test
         def setup; pass 'test/unit style setup'; end
       end
       @test = Factory.test("t", Factory.context_info(@context_class)){ pass 'TEST' }
-      @test.run
+      @test.run(&test_run_callback)
     end
 
     should "execute all setup logic when run" do
-      assert_equal 3, subject.result_count(:pass)
+      assert_equal 3, test_run_result_count(:pass)
 
       exp = ['assert style setup', 'test/unit style setup', 'TEST']
-      assert_equal exp, subject.results.map(&:message)
+      assert_equal exp, test_run_result_messages
     end
 
   end
@@ -298,14 +300,14 @@ class Assert::Test
         def teardown; pass 'test/unit style teardown'; end
       end
       @test = Factory.test("t", Factory.context_info(@context_class)){ pass 'TEST' }
-      @test.run
+      @test.run(&test_run_callback)
     end
 
     should "execute all teardown logic when run" do
-      assert_equal 3, subject.result_count(:pass)
+      assert_equal 3, test_run_result_count(:pass)
 
       exp = ['TEST', 'assert style teardown', 'test/unit style teardown']
-      assert_equal exp, subject.results.map(&:message)
+      assert_equal exp, test_run_result_messages
     end
 
   end
@@ -339,11 +341,11 @@ class Assert::Test
         teardown{ pass "child teardown2" }
       end
       @test = Factory.test("t", Factory.context_info(@context_class)){ pass "TEST" }
-      @test.run
+      @test.run(&test_run_callback)
     end
 
     should "run the arounds outside of the setups/teardowns/test" do
-      assert_equal 13, subject.result_count(:pass)
+      assert_equal 13, test_run_result_count(:pass)
 
       exp = [
         'parent around start', 'child around1 start', 'child around2 start',
@@ -351,7 +353,7 @@ class Assert::Test
         'child teardown1', 'child teardown2', 'parent teardown',
         'child around2 end', 'child around1 end', 'parent around end'
       ]
-      assert_equal exp, subject.results.map(&:message)
+      assert_equal exp, test_run_result_messages
     end
 
   end