assert 2.0.0.rc.1 → 2.0.0

data/lib/assert/version.rb

@@ -1,3 +1,3 @@
 module Assert
-  VERSION = "2.0.0.rc.1"
+  VERSION = "2.0.0"
 end

data/test/helper.rb

@@ -1,19 +1,51 @@
-# this file is automatically required in when you require 'assert'
-# put test helpers here
+# this file is automatically required when you run `assert`
+# put any test helpers here
 
-require 'stringio'
-
-# test/.. (root dir for gem)
+# add the root dir to the load path
 $LOAD_PATH.unshift(File.expand_path("../..", __FILE__))
 
-# This is the suite intended to be used in the tests, this is seperate from Assert.suite which is
-# the actual suite being used to run the tests, confused? Don't use Assert.suite in your tests,
-# use TEST_ASSERT_SUITE
+# Force tests to run without halting on failures (needed so all tests will run
+# properly).  For halt on fail behavior testing, the context of those tests
+# configures Assert temporarily as needed.
+
+class Assert::Context
+  def setup
+    Assert.config.halt_on_fail false
+    # Note: don't mess with the `show_output` setting in this setup block. Doing
+    # so will break the capture output tests.  If you really need to set it one
+    # way or the other, do so in the `.assert.rb` local settings file.
+  end
+
+  # a context for use in testing all the different context singleton methods
+  class ContextSingletonTests < Assert::Context
+    desc "Assert context singleton"
+    setup do
+      @orig_assert_suite = Assert.suite
+      Assert.config.suite TEST_ASSERT_SUITE
+      @test = Factory.test
+      @context_class = @test.context_class
+    end
+    teardown do
+      TEST_ASSERT_SUITE.tests.clear
+      Assert.config.suite @orig_assert_suite
+    end
+    subject{ @context_class }
+
+  end
+
+end
+
+
+# A Suite for use in the tests.  It is seperate from `Assert.suite`
+# (which is the actual suite being used to run the tests). Don't use
+# `Assert.suite` in your tests, use TEST_ASSERT_SUITE
+
 TEST_ASSERT_SUITE = Assert::Suite.new
 
-# This is the test context intended to be used in the tests, and is also used in the context_class
-# factory by default. This will ensure any contexts you define in your tests will not be shoved
-# onto the the suite running the tests.
+# A context for use in the tests and also in the `context_class` factory. This
+# will ensure any contexts defined as part of the tests will add their methods
+# to `TEST_ASSERT_SUITE`
+
 class TestContext < Assert::Context
   def self.method_added(meth)
     if meth.to_s =~ Assert::Suite::TEST_METHOD_REGEX
@@ -23,54 +55,45 @@ class TestContext < Assert::Context
   end
 end
 
-# force tests to run without halting on fail (needed for tests to run)
-# anywhere we test halt on fail behavior, we take care of it in the specific context
-class Assert::Context
-  def setup
-    Assert.config.halt_on_fail false
-    # Note: don't mess with `Assert.config.output` in this setup block - it will
-    # break the capture output tests.  If you really need to set it one way or
-    # another, do it in the `.assert.rb` local settings file.
+module Factory
+
+  def self.context_info_called_from
+    "/path/to_file.rb:1234"
   end
-end
 
-module Factory
-  class << self
+  def self.context_info(context_class)
+    Assert::Suite::ContextInfo.new(context_class, context_info_called_from)
+  end
 
-    def context_info_called_from
-      "/path/to_file.rb:1234"
-    end
+  # Generate an anonymous `Context` inherited from `TestContext` by default.
+  # This provides a common interface for all contexts used in testing.
 
-    def context_info(context_class)
-      Assert::Suite::ContextInfo.new(context_class, context_info_called_from)
-    end
-    # Generates an anonymous class inherited from whatever you pass or TextContext by default. This
-    # provides a common interface for all context classes to be generated in the tests.
-    def context_class(inherit_from = nil, &block)
-      inherit_from ||= TestContext
-      klass = Class.new(inherit_from, &block)
-      default = (const_name = "FactoryAssertContext").dup
-      while(Object.const_defined?(const_name)) do
-        const_name = "FactoryAssertContext#{rand(Time.now.to_i)}"
-      end
-      Object.const_set(const_name, klass)
-      klass
+  def self.context_class(inherit_from=nil, &block)
+    inherit_from ||= TestContext
+    klass = Class.new(inherit_from, &block)
+    default = (const_name = "FactoryAssertContext").dup
+
+    while(Object.const_defined?(const_name)) do
+      const_name = "FactoryAssertContext#{rand(Time.now.to_i)}"
     end
+    Object.const_set(const_name, klass)
+    klass
+  end
 
-    # Common interface for generating a new test, takes args and a block, will default everything
-    # if you need a no-op test.
-    def test(*args, &block)
-      name = (args[0] || "a test").to_s
-      context_info = args[1] || self.context_info(self.context_class)
-      test_block = (block || args[2] || ::Proc.new{})
+  # Generate a no-op test for use in testing.
 
-      Assert::Test.new(name, context_info, &test_block)
-    end
+  def self.test(*args, &block)
+    name = (args[0] || "a test").to_s
+    context_info = args[1] || self.context_info(self.context_class)
+    test_block = (block || args[2] || ::Proc.new{})
 
-    # Common interface for generating a new skip result
-    def skip_result(name, exception)
-      Assert::Result::Skip.new(Factory.test(name), exception)
-    end
+    Assert::Test.new(name, context_info, &test_block)
+  end
 
+  # Generate a skip result for use in testing.
+
+  def self.skip_result(name, exception)
+    Assert::Result::Skip.new(Factory.test(name), exception)
   end
+
 end

data/test/{test → system}/running_tests.rb

@@ -1,13 +1,10 @@
 require 'assert'
 
-class Assert::Test
+class RunningTheTestsTests < Assert::Context
+  desc "Assert tests that are run"
+  subject{ @test }
 
-  class RunningTests < Assert::Context
-    desc "Assert tests that are run"
-    subject{ @test }
-  end
-
-  class NothingTests < RunningTests
+  class NothingTests < RunningTheTestsTests
     desc "and does nothing"
     setup do
       @test = Factory.test
@@ -20,9 +17,7 @@ class Assert::Test
 
   end
 
-
-
-  class PassTests < RunningTests
+  class PassTests < RunningTheTestsTests
     desc "and passes a single assertion"
     setup do
       @test = Factory.test{ assert(1 == 1) }
@@ -38,9 +33,7 @@ class Assert::Test
 
   end
 
-
-
-  class FailTests < RunningTests
+  class FailTests < RunningTheTestsTests
     desc "and fails a single assertion"
     setup do
       @test = Factory.test{ assert(1 == 0) }
@@ -56,9 +49,7 @@ class Assert::Test
 
   end
 
-
-
-  class SkipTests < RunningTests
+  class SkipTests < RunningTheTestsTests
     desc "and skips"
     setup do
       @test = Factory.test{ skip }
@@ -74,9 +65,7 @@ class Assert::Test
 
   end
 
-
-
-  class ErrorTests < RunningTests
+  class ErrorTests < RunningTheTestsTests
     desc "and errors"
     setup do
       @test = Factory.test{ raise("WHAT") }
@@ -92,9 +81,7 @@ class Assert::Test
 
   end
 
-
-
-  class MixedTests < RunningTests
+  class MixedTests < RunningTheTestsTests
     desc "and has 1 pass and 1 fail assertion"
     setup do
       @test = Factory.test do
@@ -116,9 +103,7 @@ class Assert::Test
 
   end
 
-
-
-  class MixedSkipTests < RunningTests
+  class MixedSkipTests < RunningTheTestsTests
     desc "and has 1 pass and 1 fail assertion with a skip call in between"
     setup do
       @test = Factory.test do
@@ -147,9 +132,7 @@ class Assert::Test
 
   end
 
-
-
-  class MixedErrorTests < RunningTests
+  class MixedErrorTests < RunningTheTestsTests
     desc "and has 1 pass and 1 fail assertion with an exception raised in between"
     setup do
       @test = Factory.test do
@@ -178,9 +161,7 @@ class Assert::Test
 
   end
 
-
-
-  class MixedPassTests < RunningTests
+  class MixedPassTests < RunningTheTestsTests
     desc "and has 1 pass and 1 fail assertion with a pass call in between"
     setup do
       @test = Factory.test do
@@ -206,9 +187,7 @@ class Assert::Test
 
   end
 
-
-
-  class MixedFailTests < RunningTests
+  class MixedFailTests < RunningTheTestsTests
     desc "and has 1 pass and 1 fail assertion with a fail call in between"
     setup do
       @test = Factory.test do
@@ -234,9 +213,7 @@ class Assert::Test
 
   end
 
-
-
-  class MixedFlunkTests < RunningTests
+  class MixedFlunkTests < RunningTheTestsTests
     desc "and has 1 pass and 1 fail assertion with a flunk call in between"
     setup do
       @test = Factory.test do
@@ -262,9 +239,7 @@ class Assert::Test
 
   end
 
-
-
-  class WithSetupTests < RunningTests
+  class WithSetupTests < RunningTheTestsTests
     desc "a Test that runs and has assertions that depend on setups"
     setup do
       assert_style_msg = @asm = "set by assert style setup"
@@ -307,9 +282,7 @@ class Assert::Test
 
   end
 
-
-
-  class WithTeardownTests < RunningTests
+  class WithTeardownTests < RunningTheTestsTests
     desc "a Test that runs and has assertions with teardowns"
     setup do
       assert_style_msg = @asm = "set by assert style teardown"

data/test/unit/assertions/assert_block_tests.rb

@@ -0,0 +1,57 @@
+require 'assert'
+require 'assert/assertions'
+
+module Assert::Assertions
+
+  class AssertBlockTests < Assert::Context
+    desc "the `assert_block` helper"
+    setup do
+      desc = @desc = "assert block fail desc"
+      @test = Factory.test do
+        assert_block{ true }        # pass
+        assert_block(desc){ false } # fail
+      end
+      @test.run
+    end
+    subject{ @test }
+
+    should "produce results as expected" do
+      assert_equal 2, subject.result_count
+      assert_equal 1, subject.result_count(:pass)
+      assert_equal 1, subject.result_count(:fail)
+    end
+
+    should "have a fail message with custom and generic explanations" do
+      exp = "#{@desc}\nExpected block to return a true value."
+      assert_equal exp, subject.fail_results.first.message
+    end
+
+  end
+
+  class AssertNotBlockTests < Assert::Context
+    desc "the assert_not_block helper"
+    setup do
+      desc = @desc = "assert not block fail desc"
+      @test = Factory.test do
+        assert_not_block(desc){ true } # fail
+        assert_not_block{ false }      # pass
+      end
+      @test.run
+    end
+    subject{ @test }
+
+    should "produce results as expected" do
+      assert_equal 2, subject.result_count
+      assert_equal 1, subject.result_count(:pass)
+      assert_equal 1, subject.result_count(:fail)
+    end
+
+    should "have a fail message with custom and generic explanations" do
+      exp = "#{@desc}\nExpected block to return a false value."
+      assert_equal exp, subject.fail_results.first.message
+    end
+
+  end
+
+end
+

data/test/unit/assertions/assert_empty_tests.rb

@@ -0,0 +1,58 @@
+require 'assert'
+require 'assert/assertions'
+
+module Assert::Assertions
+
+  class AssertEmptyTests < Assert::Context
+    desc "the assert_empty helper"
+    setup do
+      desc = @desc = "assert empty fail desc"
+      args = @args = [ [ 1 ], desc ]
+      @test = Factory.test do
+        assert_empty([])    # pass
+        assert_empty(*args) # fail
+      end
+      @test.run
+    end
+    subject{ @test }
+
+    should "produce results as expected" do
+      assert_equal 2, subject.result_count
+      assert_equal 1, subject.result_count(:pass)
+      assert_equal 1, subject.result_count(:fail)
+    end
+
+    should "have a fail message with custom and generic explanations" do
+      exp = "#{@args[1]}\nExpected #{@args[0].inspect} to be empty."
+      assert_equal exp, subject.fail_results.first.message
+    end
+
+  end
+
+  class AssertNotEmptyTests < Assert::Context
+    desc "the assert_not_empty helper"
+    setup do
+      desc = @desc = "assert not empty fail desc"
+      args = @args = [ [], desc ]
+      @test = Factory.test do
+        assert_not_empty([ 1 ]) # pass
+        assert_not_empty(*args) # fail
+      end
+      @test.run
+    end
+    subject{ @test }
+
+    should "produce results as expected" do
+      assert_equal 2, subject.result_count
+      assert_equal 1, subject.result_count(:pass)
+      assert_equal 1, subject.result_count(:fail)
+    end
+
+    should "have a fail message with custom and generic explanations" do
+      exp = "#{@args[1]}\nExpected #{@args[0].inspect} to not be empty."
+      assert_equal exp, subject.fail_results.first.message
+    end
+
+  end
+
+end

data/test/unit/assertions/assert_equal_tests.rb

@@ -0,0 +1,59 @@
+require 'assert'
+require 'assert/assertions'
+
+module Assert::Assertions
+
+  class AssertEqualTests < Assert::Context
+    desc "the assert_equal helper"
+    setup do
+      desc = @desc = "assert equal fail desc"
+      args = @args = [ '1', '2', desc ]
+      @test = Factory.test do
+        assert_equal(1, 1)   # pass
+        assert_equal(*args)  # fail
+      end
+      @test.run
+    end
+    subject{ @test }
+
+    should "produce results as expected" do
+      assert_equal 2, subject.result_count
+      assert_equal 1, subject.result_count(:pass)
+      assert_equal 1, subject.result_count(:fail)
+    end
+
+    should "have a fail message with custom and generic explanations" do
+      exp = "#{@args[2]}\nExpected #{@args[0].inspect}, not #{@args[1].inspect}."
+      assert_equal exp, subject.fail_results.first.message
+    end
+
+  end
+
+  class AssertNotEqualTests < Assert::Context
+    desc "the assert_not_equal helper"
+    setup do
+      desc = @desc = "assert not equal fail desc"
+      args = @args = [ '1', '1', desc ]
+      @test = Factory.test do
+        assert_not_equal(*args)  # fail
+        assert_not_equal(1, 2)   # pass
+      end
+      @test.run
+    end
+    subject{ @test }
+
+    should "produce results as expected" do
+      assert_equal 2, subject.result_count
+      assert_equal 1, subject.result_count(:pass)
+      assert_equal 1, subject.result_count(:fail)
+    end
+
+    should "have a fail message with custom and generic explanations" do
+      exp = "#{@args[2]}\n"\
+            "#{@args[1].inspect} not expected to equal #{@args[0].inspect}."
+      assert_equal exp, subject.fail_results.first.message
+    end
+
+  end
+
+end