mcmire-protest 0.2.5 → 0.3.0

data/.gitignore

@@ -1,2 +1,3 @@
 doc
 dist
+*.gem

data/lib/protest/runner.rb

@@ -11,13 +11,18 @@ module Protest
     # and before and after each test case (+enter+ and +exit+.)
     def run(*test_cases)
       @report.on_start if @report.respond_to?(:on_start)
-      test_cases.each do |test_case|
-        @report.on_enter(test_case) if @report.respond_to?(:on_enter)
-        test_case.run(self)
-        @report.on_exit(test_case) if @report.respond_to?(:on_exit)
-      end
+      test_cases.each {|test_case| run_test_case(test_case) }
       @report.on_end if @report.respond_to?(:on_end)
     end
+    
+    # Run a test case, along with any child test cases. This will fire the +enter+
+    # event before running the test case and the +exit+ event afterward.
+    def run_test_case(test_case)
+      @report.on_enter(test_case) if @report.respond_to?(:on_enter)
+      sub_test_cases = Protest.send(:available_test_cases).select {|tc| tc.superclass == test_case }
+      test_case.run(self, sub_test_cases)
+      @report.on_exit(test_case) if @report.respond_to?(:on_exit)
+    end
 
     # Run a test and report if it passes, fails, or is pending. Takes the name
     # of the test as an argument. By passing +true+ as the second argument, you

data/lib/protest/test_case.rb

@@ -31,16 +31,21 @@ module Protest
     rescue LoadError
     end
 
-    # Run all tests in this context. Takes a Report instance in order to
-    # provide output.
-    def self.run(runner)
+    # Run all tests in this context, then run any test cases under this test case.
+    # Takes a Report instance in order to provide output. <tt>global_setup</tt>
+    # will be run before the first test is run; <tt>global_teardown</tt> will
+    # be run after the final test is run (including any tests in child test cases).
+    def self.run(runner, sub_test_cases)
       runner.report(TestWrapper.new(:setup, self), true)
       tests.each {|test| runner.report(test, false) }
+      sub_test_cases.each {|test_case| runner.run_test_case(test_case) }
       runner.report(TestWrapper.new(:teardown, self), true)
     rescue Exception => e
       # If any exception bubbles up here, then it means it was during the
       # global setup/teardown blocks, so let's just skip the rest of this
       # context.
+      #warn "#{e.class}: #{e.message}"
+      #warn e.backtrace.join("\n")
       return
     end
 
@@ -81,7 +86,7 @@ module Protest
     def self.global_setup(&block)
       (class << self; self; end).class_eval do
         define_method :do_global_setup do
-          super()
+          #super()
           instance_eval(&block)
         end
       end
@@ -110,7 +115,7 @@ module Protest
       (class << self; self; end).class_eval do
         define_method :do_global_teardown do
           instance_eval(&block)
-          super()
+          #super()
         end
       end
     end

data/lib/protest.rb

@@ -1,5 +1,5 @@
 module Protest
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 
   # Exception raised when an assertion fails. See TestCase#assert
   class AssertionFailed < StandardError; end
@@ -45,7 +45,7 @@ module Protest
   #
   # See Protest.add_test_case and Protest.report_with
   def self.run_all_tests!(*report_args)
-    Runner.new(@report).run(*available_test_cases)
+    Runner.new(@report).run(*root_test_cases)
   end
 
   # Select the name of the Report to use when running tests. See
@@ -76,6 +76,12 @@ module Protest
     @backtrace_filter
   end
 
+  def self.root_test_cases
+    v = available_test_cases.select {|tc| tc.superclass == Protest::TestCase }
+    #pp :root_test_cases => v
+    v
+  end
+
   def self.available_test_cases
     @test_cases ||= []
   end

data/mcmire-protest.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = "mcmire-protest"
-  s.version = "0.2.5"
+  s.version = "0.3.0"
   s.date    = "2010-01-10"
 
   s.description = "Protest is a tiny, simple, and easy-to-extend test framework"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mcmire-protest
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Sanguinetti"