assert 2.4.0 → 2.5.0

data/test/support/factory.rb

@@ -0,0 +1,70 @@
+require 'assert/config'
+require 'assert/result'
+require 'assert/suite'
+require 'assert/test'
+
+module Factory
+
+  def self.context_info_called_from
+    "/path/to_file.rb:1234"
+  end
+
+  def self.context_info(context_klass = nil)
+    Assert::Suite::ContextInfo.new(context_klass || self.context_class, context_info_called_from)
+  end
+
+  # Generate an anonymous `Context` inherited from `Assert::Context` by default.
+  # This provides a common interface for all contexts used in testing.
+
+  def self.context_class(inherit_from = nil, &block)
+    klass = Class.new(inherit_from || Assert::Context, &block)
+    default = const_name = "FactoryAssertContext"
+
+    while(Object.const_defined?(const_name)) do
+      const_name = "#{default}#{rand(Time.now.to_i)}"
+    end
+    Object.const_set(const_name, klass)
+    klass
+  end
+
+  # Generate a no-op test for use in testing.
+
+  def self.test(*args, &block)
+    opts, config, context_info, name = [
+      args.last.kind_of?(::Hash) ? args.pop.dup : {},
+      args.last.kind_of?(Assert::Config) ? args.pop : self.modes_off_config,
+      args.last.kind_of?(Assert::Suite::ContextInfo) ? args.pop : self.context_info,
+      args.last.kind_of?(::String) ? args.pop : 'a test'
+    ]
+    Assert::Test.new(name, context_info, config, opts, &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
+
+  def self.modes_off_config
+    Assert::Config.new({
+      :capture_output => false,
+      :halt_on_fail   => false,
+      :changed_only   => false,
+      :pp_objects     => false,
+      :debug          => false
+    })
+  end
+
+  def self.modes_off_suite
+    Assert::Suite.new(self.modes_off_config)
+  end
+
+  def self.modes_off_context_class(*args, &block)
+    suite_obj = self.modes_off_suite
+    self.context_class(*args) do
+      suite(suite_obj)
+      instance_eval(&block) if !block.nil?
+    end
+  end
+
+end

data/test/system/running_tests.rb

@@ -1,11 +1,11 @@
 require 'assert'
 
-class RunningTheTestsTests < Assert::Context
-  desc "Assert tests that are run"
+class RunningSystemTests < Assert::Context
+  desc "Running a test (with no halt-on-fail) that"
   subject{ @test }
 
-  class NothingTests < RunningTheTestsTests
-    desc "and does nothing"
+  class NothingTests < RunningSystemTests
+    desc "does nothing"
     setup do
       @test = Factory.test
       @test.run
@@ -17,8 +17,8 @@ class RunningTheTestsTests < Assert::Context
 
   end
 
-  class PassTests < RunningTheTestsTests
-    desc "and passes a single assertion"
+  class PassTests < RunningSystemTests
+    desc "passes a single assertion"
     setup do
       @test = Factory.test{ assert(1 == 1) }
       @test.run
@@ -27,14 +27,15 @@ class RunningTheTestsTests < Assert::Context
     should "have 1 result" do
       assert_equal 1, subject.result_count
     end
+
     should "have 1 pass result" do
       assert_equal 1, subject.result_count(:pass)
     end
 
   end
 
-  class FailTests < RunningTheTestsTests
-    desc "and fails a single assertion"
+  class FailTests < RunningSystemTests
+    desc "fails a single assertion"
     setup do
       @test = Factory.test{ assert(1 == 0) }
       @test.run
@@ -43,14 +44,15 @@ class RunningTheTestsTests < Assert::Context
     should "have 1 result" do
       assert_equal 1, subject.result_count
     end
+
     should "have 1 fail result" do
       assert_equal 1, subject.result_count(:fail)
     end
 
   end
 
-  class SkipTests < RunningTheTestsTests
-    desc "and skips"
+  class SkipTests < RunningSystemTests
+    desc "skips once"
     setup do
       @test = Factory.test{ skip }
       @test.run
@@ -59,14 +61,15 @@ class RunningTheTestsTests < Assert::Context
     should "have 1 result" do
       assert_equal 1, subject.result_count
     end
+
     should "have 1 skip result" do
       assert_equal 1, subject.result_count(:skip)
     end
 
   end
 
-  class ErrorTests < RunningTheTestsTests
-    desc "and errors"
+  class ErrorTests < RunningSystemTests
+    desc "errors once"
     setup do
       @test = Factory.test{ raise("WHAT") }
       @test.run
@@ -75,14 +78,15 @@ class RunningTheTestsTests < Assert::Context
     should "have 1 result" do
       assert_equal 1, subject.result_count
     end
+
     should "have 1 error result" do
       assert_equal 1, subject.result_count(:error)
     end
 
   end
 
-  class MixedTests < RunningTheTestsTests
-    desc "and has 1 pass and 1 fail assertion"
+  class MixedTests < RunningSystemTests
+    desc "has 1 pass and 1 fail assertion"
     setup do
       @test = Factory.test do
         assert(1 == 1)
@@ -94,17 +98,19 @@ class RunningTheTestsTests < Assert::Context
     should "have 2 total results" do
       assert_equal 2, subject.result_count
     end
+
     should "have 1 pass result" do
       assert_equal 1, subject.result_count(:pass)
     end
+
     should "have 1 fail result" do
       assert_equal 1, subject.result_count(:fail)
     end
 
   end
 
-  class MixedSkipTests < RunningTheTestsTests
-    desc "and has 1 pass and 1 fail assertion with a skip call in between"
+  class MixedSkipTests < RunningSystemTests
+    desc "has 1 pass and 1 fail assertion with a skip call in between"
     setup do
       @test = Factory.test do
         assert(1 == 1)
@@ -117,23 +123,27 @@ class RunningTheTestsTests < Assert::Context
     should "have 2 total results" do
       assert_equal 2, subject.result_count
     end
+
     should "have a skip for its last result" do
       assert_kind_of Assert::Result::Skip, subject.results.last
     end
+
     should "have 1 pass result" do
       assert_equal 1, subject.result_count(:pass)
     end
+
     should "have 1 skip result" do
       assert_equal 1, subject.result_count(:skip)
     end
+
     should "have 0 fail results" do
       assert_equal 0, subject.result_count(:fail)
     end
 
   end
 
-  class MixedErrorTests < RunningTheTestsTests
-    desc "and has 1 pass and 1 fail assertion with an exception raised in between"
+  class MixedErrorTests < RunningSystemTests
+    desc "has 1 pass and 1 fail assertion with an exception raised in between"
     setup do
       @test = Factory.test do
         assert(1 == 1)
@@ -146,23 +156,27 @@ class RunningTheTestsTests < Assert::Context
     should "have an error for its last result" do
       assert_kind_of Assert::Result::Error, subject.results.last
     end
+
     should "have 2 total results" do
       assert_equal 2, subject.result_count
     end
+
     should "have 1 pass result" do
       assert_equal 1, subject.result_count(:pass)
     end
+
     should "have 1 error result" do
       assert_equal 1, subject.result_count(:error)
     end
+
     should "have 0 fail results" do
       assert_equal 0, subject.result_count(:fail)
     end
 
   end
 
-  class MixedPassTests < RunningTheTestsTests
-    desc "and has 1 pass and 1 fail assertion with a pass call in between"
+  class MixedPassTests < RunningSystemTests
+    desc "has 1 pass and 1 fail assertion with a pass call in between"
     setup do
       @test = Factory.test do
         assert(1 == 1)
@@ -175,20 +189,23 @@ class RunningTheTestsTests < Assert::Context
     should "have a pass for its last result" do
       assert_kind_of Assert::Result::Fail, subject.results.last
     end
+
     should "have 3 total results" do
       assert_equal 3, subject.result_count
     end
+
     should "have 2 pass results" do
       assert_equal 2, subject.result_count(:pass)
     end
+
     should "have 1 fail results" do
       assert_equal 1, subject.result_count(:fail)
     end
 
   end
 
-  class MixedFailTests < RunningTheTestsTests
-    desc "and has 1 pass and 1 fail assertion with a fail call in between"
+  class MixedFailTests < RunningSystemTests
+    desc "has 1 pass and 1 fail assertion with a fail call in between"
     setup do
       @test = Factory.test do
         assert(1 == 0)
@@ -201,20 +218,23 @@ class RunningTheTestsTests < Assert::Context
     should "have a fail for its last result" do
       assert_kind_of Assert::Result::Pass, subject.results.last
     end
+
     should "have 3 total results" do
       assert_equal 3, subject.result_count
     end
+
     should "have 1 pass results" do
       assert_equal 1, subject.result_count(:pass)
     end
+
     should "have 2 fail results" do
       assert_equal 2, subject.result_count(:fail)
     end
 
   end
 
-  class MixedFlunkTests < RunningTheTestsTests
-    desc "and has 1 pass and 1 fail assertion with a flunk call in between"
+  class MixedFlunkTests < RunningSystemTests
+    desc "has 1 pass and 1 fail assertion with a flunk call in between"
     setup do
       @test = Factory.test do
         assert(1 == 0)
@@ -227,20 +247,23 @@ class RunningTheTestsTests < Assert::Context
     should "have a fail for its last result" do
       assert_kind_of Assert::Result::Pass, subject.results.last
     end
+
     should "have 3 total results" do
       assert_equal 3, subject.result_count
     end
+
     should "have 1 pass results" do
       assert_equal 1, subject.result_count(:pass)
     end
+
     should "have 2 fail results" do
       assert_equal 2, subject.result_count(:fail)
     end
 
   end
 
-  class WithSetupTests < RunningTheTestsTests
-    desc "a Test that runs and has assertions that depend on setups"
+  class WithSetupTests < RunningSystemTests
+    desc "has assertions that depend on setups"
     setup do
       assert_style_msg = @asm = "set by assert style setup"
       testunit_style_msg = @tusm = "set by test/unit style setup"
@@ -273,17 +296,19 @@ class RunningTheTestsTests < Assert::Context
       assert_equal 2, subject.result_count
       assert_equal 2, subject.result_count(:pass)
     end
+
     should "have run the assert style setup" do
       assert_equal @asm, subject.pass_results.first.message
     end
+
     should "have run the test/unit style setup" do
       assert_equal @tusm, subject.pass_results.last.message
     end
 
   end
 
-  class WithTeardownTests < RunningTheTestsTests
-    desc "a Test that runs and has assertions with teardowns"
+  class WithTeardownTests < RunningSystemTests
+    desc "has assertions with teardowns"
     setup do
       assert_style_msg = @asm = "set by assert style teardown"
       testunit_style_msg = @tusm = "set by test/unit style teardown"
@@ -315,9 +340,11 @@ class RunningTheTestsTests < Assert::Context
       assert_equal 2, subject.result_count
       assert_equal 2, subject.result_count(:pass)
     end
+
     should "have run the assert style teardown" do
       assert_equal @asm, subject.pass_results.first.message
     end
+
     should "have run test/unit style teardown" do
       assert_equal @tusm, subject.pass_results.last.message
     end

data/test/unit/assert_tests.rb

@@ -1,9 +1,6 @@
 require 'assert'
 
-require 'assert/view/default_view'
-require 'assert/runner'
-require 'assert/suite'
-require 'assert/utils'
+require 'assert/config'
 
 module Assert
 
@@ -11,10 +8,10 @@ module Assert
     desc "the Assert module"
     subject { Assert }
 
-    should have_imeths :view, :suite, :runner, :config, :configure
+    should have_imeths :config, :configure, :view, :suite, :runner
 
-    should "know its config singleton" do
-      assert_same Config, subject.config
+    should "know its config instance" do
+      assert_kind_of Assert::Config, subject.config
     end
 
     should "map its view, suite and runner to its config" do
@@ -23,32 +20,8 @@ module Assert
       assert_same subject.config.runner, subject.runner
     end
 
-    # Note: don't really need to explicitly test the configure/init meths
-    # nothing runs as expected if they aren't working
-
-  end
-
-  class ConfigTests < Assert::Context
-    desc "the Assert Config singleton"
-    subject { Config }
-
-    should have_imeths :suite, :view, :runner, :test_dir, :test_helper, :changed_files
-    should have_imeths :runner_seed, :pp_proc, :use_diff_proc, :run_diff_proc
-    should have_imeths :capture_output, :halt_on_fail, :changed_only, :pp_objects
-    should have_imeths :debug, :apply
-
-    should "default the view, suite, and runner" do
-      assert_kind_of Assert::View::DefaultView, subject.view
-      assert_kind_of Assert::Suite,  subject.suite
-      assert_kind_of Assert::Runner, subject.runner
-    end
-
-    should "default the optional values" do
-      assert_not_nil subject.runner_seed
-      assert_not_nil subject.pp_proc
-      assert_not_nil subject.use_diff_proc
-      assert_not_nil subject.run_diff_proc
-    end
+    # Note: don't really need to explicitly test the configure method as
+    # nothing runs if it isn't working
 
   end
 

data/test/unit/assertions/assert_block_tests.rb

@@ -4,7 +4,7 @@ require 'assert/assertions'
 module Assert::Assertions
 
   class AssertBlockTests < Assert::Context
-    desc "the `assert_block` helper"
+    desc "`assert_block`"
     setup do
       desc = @desc = "assert block fail desc"
       @test = Factory.test do
@@ -29,7 +29,7 @@ module Assert::Assertions
   end
 
   class AssertNotBlockTests < Assert::Context
-    desc "the assert_not_block helper"
+    desc "`assert_not_block`"
     setup do
       desc = @desc = "assert not block fail desc"
       @test = Factory.test do
@@ -47,7 +47,7 @@ module Assert::Assertions
     end
 
     should "have a fail message with custom and generic explanations" do
-      exp = "#{@desc}\nExpected block to return a false value."
+      exp = "#{@desc}\nExpected block to not return a true value."
       assert_equal exp, subject.fail_results.first.message
     end
 

data/test/unit/assertions/assert_empty_tests.rb

@@ -6,7 +6,7 @@ require 'assert/utils'
 module Assert::Assertions
 
   class AssertEmptyTests < Assert::Context
-    desc "the assert_empty helper"
+    desc "`assert_empty`"
     setup do
       desc = @desc = "assert empty fail desc"
       args = @args = [ [ 1 ], desc ]
@@ -14,6 +14,7 @@ module Assert::Assertions
         assert_empty([])    # pass
         assert_empty(*args) # fail
       end
+      @c = @test.config
       @test.run
     end
     subject{ @test }
@@ -25,14 +26,14 @@ module Assert::Assertions
     end
 
     should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[1]}\nExpected #{Assert::U.show(@args[0])} to be empty."
+      exp = "#{@args[1]}\nExpected #{Assert::U.show(@args[0], @c)} to be empty."
       assert_equal exp, subject.fail_results.first.message
     end
 
   end
 
   class AssertNotEmptyTests < Assert::Context
-    desc "the assert_not_empty helper"
+    desc "`assert_not_empty`"
     setup do
       desc = @desc = "assert not empty fail desc"
       args = @args = [ [], desc ]
@@ -40,6 +41,7 @@ module Assert::Assertions
         assert_not_empty([ 1 ]) # pass
         assert_not_empty(*args) # fail
       end
+      @c = @test.config
       @test.run
     end
     subject{ @test }
@@ -51,7 +53,7 @@ module Assert::Assertions
     end
 
     should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[1]}\nExpected #{Assert::U.show(@args[0])} to not be empty."
+      exp = "#{@args[1]}\nExpected #{Assert::U.show(@args[0], @c)} to not be empty."
       assert_equal exp, subject.fail_results.first.message
     end