baretest 0.4.0.pre1 → 0.4.0.pre2

data/lib/baretest/assertion/support.rb

@@ -43,23 +43,6 @@ module BareTest
     #
     module Support
 
-      # Creates global setup and teardown callbacks that are needed by some of
-      # BareTest::Assertion::Support's methods.
-      #
-      module SetupAndTeardown
-
-        # Install the setup and teardown callbacks.
-        def self.extended(run_obj) # :nodoc:
-          run_obj.init do
-            suite.teardown do
-              ::BareTest.clean_touches(self) # instance evaled, self is the assertion
-            end
-          end
-        end
-
-        ::BareTest.extender << self
-      end
-
       # FIXME: undocumented and untested
       # It's really ugly. You should use a mock instead.
       def yields(subject, meth, args, *expected)

data/lib/baretest/assertion.rb

@@ -116,9 +116,9 @@ module BareTest
         status = Status.new(self, :pending)
       else
         context  = ::BareTest::Assertion::Context.new(self)
-        status   = execute_phase(:setup, context, with_setup) if with_setup
+        status   = execute_phase(:setup, context, with_setup.map { |s| [[s.value], s.block] }) if with_setup
         status   = execute_phase(:exercise, context, @block) unless status
-        status   = execute_phase(:teardown, context, and_teardown) unless (status || !and_teardown)
+        status   = execute_phase(:teardown, context, and_teardown.map { |t| [nil, t] }) unless (status || !and_teardown)
         status ||= Status.new(self, :success, context)
       end
 
@@ -138,7 +138,7 @@ module BareTest
 
       begin
         if code.is_a?(Array) then
-          code.each do |block| context.instance_eval(&block) end
+          code.each do |args, block| context.instance_exec(*args, &block) end
         else
           unless context.instance_eval(&code)
             failure_reason = "Assertion failed" 

data/lib/baretest/commandline.rb

@@ -74,11 +74,22 @@ module BareTest
         'lib'  => %w[test/helper/suite test/suite],
         'rake' => %w[test/helper/suite test/suite],
       }
+      baretest_version = BareTest::VERSION.to_a.first(3).join('.').inspect
+      ruby_version     = RUBY_VERSION.inspect
       files = {
         'test/setup.rb' => <<-END_OF_SETUP.gsub(/^ {10}/, '')
-          BareTest.require_ruby     #{RUBY_VERSION.inspect}
-          BareTest.require_baretest #{BareTest::VERSION.to_a.first(3).join('.').inspect}
-          $LOAD_PATH.unshift(File.expand_path("\#{__FILE__}/../../lib")) # Add PROJECT/lib to $LOAD_PATH
+          # Add PROJECT/lib to $LOAD_PATH
+          $LOAD_PATH.unshift(File.expand_path("\#{__FILE__}/../../lib"))
+
+          # Ensure baretest is required
+          require 'baretest'
+
+          # Some defaults on BareTest (see Kernel#BareTest)
+          BareTest do
+            require_baretest #{baretest_version} # minimum baretest version to run these tests
+            require_ruby     #{ruby_version} # minimum ruby version to run these tests
+            use              :support # Use :support in all suites
+          end
         END_OF_SETUP
       }
 

data/lib/baretest/run.rb

@@ -200,7 +200,7 @@ module BareTest
     # Invoked once for every variation of an assertion.
     # Gets the assertion to run as single argument.
     def run_test(assertion, setup)
-      rv = assertion.execute(setup.map { |s| s.block }, assertion.suite.ancestry_teardown)
+      rv = assertion.execute(setup, assertion.suite.ancestry_teardown)
       @count[:test]     += 1
       @count[rv.status] += 1
 
@@ -241,7 +241,7 @@ module BareTest
     # Get an assertions' interpolated description for a given Array of Setup
     # instances.
     # See Assertion#interpolated_description
-    def interpolated_description(assertion, setup)
+    def interpolated_description(assertion, setups)
       setups = setups ? setups.select { |s| s.component } : []
       substitutes = {}
       setups.each do |setup| substitutes[setup.component] = setup.substitute end

data/lib/baretest/version.rb

@@ -21,7 +21,7 @@ module BareTest
     TINY       = 0
 
     # Prerelease number - nil for release versions
-    PRERELEASE = 1
+    PRERELEASE = 2
 
     # The version as a string
     STRING     = %{#{MAJOR}.#{MINOR||0}.#{TINY||0}#{".pre#{PRERELEASE}" if PRERELEASE}}

data/lib/baretest.rb

@@ -19,6 +19,16 @@ require 'ruby/kernel'
 
 
 
+module Kernel
+  # Execute a piece of code in the context of BareTest
+  def BareTest(&block)
+    BareTest.instance_eval(&block)
+  end
+  module_function :BareTest
+end
+
+
+
 module BareTest
   # A lookup table to test which of two states is more important
   # (MoreImportantStatus[[a,b]] # => a or b)

data/test/setup.rb

@@ -1,5 +1,12 @@
-BareTest.require_baretest "0.4"
-BareTest.require_ruby     "1.8.6"
-
+# Add PROJECT/lib to $LOAD_PATH
 $LOAD_PATH.unshift(File.expand_path("#{__FILE__}/../../lib"))
+
+# Ensure baretest is required
 require 'baretest'
+
+# Some defaults on BareTest (see Kernel#BareTest)
+BareTest do
+  require_baretest "0.4"    # minimum baretest version to run these tests
+  require_ruby     "1.8.6"  # minimum ruby version to run these tests
+  use              :support # Use :support in all suites
+end

data/test/suite/lib/baretest/run.rb

@@ -245,6 +245,101 @@ BareTest.suite "BareTest" do
       end
     end
 
+    suite "#run_test_variants" do
+      suite "With a suite with no setup" do
+        setup do
+          @suite     = ::BareTest::Suite.new
+          @assertion = ::BareTest::Assertion.new @suite, "test" do true end
+          @run       = ::BareTest::Run.new(::BareTest::Suite.new)
+        end
+
+        assert "Invokes run_test with the assertion once" do
+          invoked   = []
+          (class <<@run; self; end).send :define_method, :run_test do |assertion, setup|
+            invoked << [assertion, setup]
+            ::BareTest::Status.new(assertion, :success)
+          end
+          @run.run_test_variants(@assertion)
+
+          equal_unordered([[@assertion, []]], invoked)
+        end
+      end
+
+      suite "With a suite with a static setup" do
+        setup do
+          @suite     = ::BareTest::Suite.new do
+            setup do "nothing" end
+          end
+          @assertion = ::BareTest::Assertion.new @suite, "test" do true end
+          @run       = ::BareTest::Run.new(::BareTest::Suite.new)
+
+          @setups    = @suite.instance_variable_get(:@setup)[nil]
+        end
+
+        assert "Invokes run_test with the assertion once" do
+          invoked   = []
+          (class <<@run; self; end).send :define_method, :run_test do |assertion, setup|
+            invoked << [assertion, setup]
+            ::BareTest::Status.new(assertion, :success)
+          end
+          @run.run_test_variants(@assertion)
+
+          equal_unordered([[@assertion, @setups]], invoked)
+        end
+      end
+
+      suite "With a suite with a dynamic setup" do
+        setup do
+          @suite     = ::BareTest::Suite.new do
+            setup :component_name do "nothing" end
+          end
+          @assertion = ::BareTest::Assertion.new @suite, "test" do true end
+          @run       = ::BareTest::Run.new(::BareTest::Suite.new)
+
+          @setups    = @suite.instance_variable_get(:@setup)[:component_name]
+        end
+
+        assert "Invokes run_test with the assertion once" do
+          invoked   = []
+          (class <<@run; self; end).send :define_method, :run_test do |assertion, setup|
+            invoked << [assertion, setup]
+            ::BareTest::Status.new(assertion, :success)
+          end
+          @run.run_test_variants(@assertion)
+
+          equal_unordered([[@assertion, @setups]], invoked)
+        end
+      end
+
+      suite "With a suite with multiple dynamic setups using hash notation" do
+        setup do
+          @suite     = ::BareTest::Suite.new do
+            setup :component_name, {:a => 1, :b => 2, :c => 3} do "nothing" end
+          end
+          @assertion = ::BareTest::Assertion.new @suite, "test" do true end
+          @run       = ::BareTest::Run.new(::BareTest::Suite.new)
+
+          @setups    = @suite.instance_variable_get(:@setup)[:component_name]
+        end
+
+        assert "Invokes run_test with the assertion 3 times, with the corresponding setup" do
+          actual   = []
+          (class <<@run; self; end).send :define_method, :run_test do |assertion, setup|
+            actual << [assertion, setup]
+            ::BareTest::Status.new(assertion, :success)
+          end
+          @run.run_test_variants(@assertion)
+          expected = @setups.map { |setup| [@assertion,[setup]] }
+
+          equal_unordered(expected, actual)
+        end
+      end
+    end
+
+    suite "#interpolated_description" do
+      
+    end
+
     suite "#run_test" do
       assert "Runs the given test" do
         # should implement this with a mock, expecting #execute to be called

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: baretest
 version: !ruby/object:Gem::Version 
-  version: 0.4.0.pre1
+  version: 0.4.0.pre2
 platform: ruby
 authors: 
 - Stefan Rusterholz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 +01:00
+date: 2010-02-17 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -118,7 +118,7 @@ rdoc_options:
 - --tab-width
 - "2"
 - -t
-- baretest-0.4.0.pre1
+- baretest-0.4.0.pre2
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement