assert 0.1.0 → 0.2.0

data/lib/assert/rake_tasks.rb

@@ -6,6 +6,26 @@ module Assert::RakeTasks
 
   FILE_SUFFIX = "_test.rb"
 
+  # Setup the rake tasks for testing
+  # * add 'include Assert::RakeTasks' to your Rakefile
+  def self.included(receiver)
+    # get rid of rake warnings
+    if defined?(::Rake::DSL)
+      receiver.send :include, ::Rake::DSL
+    end
+
+    # auto-build rake tasks for the ./test files (if defined in ./test)
+    self.for(:test) if File.exists?(File.expand_path('./test', Dir.pwd))
+  end
+
+  def self.for(test_namespace = :test)
+    self.irb_task(test_namespace.to_s)
+    self.to_tasks(test_namespace.to_s)
+  end
+
+
+
+
   class TestTask < Rake::TaskLib
     attr_accessor :name, :description, :test_files
 
@@ -46,11 +66,6 @@ module Assert::RakeTasks
   end
 
   class << self
-    def for(test_namespace = :test)
-      self.irb_task(test_namespace.to_s)
-      self.to_tasks(test_namespace.to_s)
-    end
-
     def irb_task(path)
       irb_file = File.join(path, "irb.rb")
       if File.exist?(irb_file)
@@ -64,28 +79,31 @@ module Assert::RakeTasks
     def to_tasks(path)
       suite_name = File.basename(path)
 
-      # define a rake test task for all top-level test files at this path
+      # define a rake test task for all test files that have addional sub-folder tests
       if !Dir.glob(File.join(path, "**/*#{FILE_SUFFIX}")).empty?
         TestTask.new(suite_name.to_sym) do |t|
           file_location = suite_name == path ? '' : " for #{File.join(path.split(File::SEPARATOR)[1..-1])}"
           t.description = "Run all tests#{file_location}"
-          t.test_files = FileList["#{path}/**/*#{FILE_SUFFIX}"]
+          t.test_files = (File.exists?(p = (path+FILE_SUFFIX)) ? FileList[p] : []) + FileList["#{path}/**/*#{FILE_SUFFIX}"]
         end.to_task
       end
 
       namespace suite_name.to_s do
-        # define rake test tasks for each top-level test file individually
         Dir.glob(File.join(path, "*#{FILE_SUFFIX}")).each do |test_file|
           test_name = File.basename(test_file, FILE_SUFFIX)
-          TestTask.new(test_name.to_sym) do |t|
-            t.description = "Run tests for #{[path.split(File::SEPARATOR), test_name].flatten[1..-1].join(':')}"
-            t.test_files = FileList[test_file]
-          end.to_task
+
+          # define rake test task for all test files without sub-folder tests
+          if Dir.glob(File.join(path, test_name, "*#{FILE_SUFFIX}")).empty?
+            TestTask.new(test_name.to_sym) do |t|
+              t.description = "Run tests for #{[path.split(File::SEPARATOR), test_name].flatten[1..-1].join(':')}"
+              t.test_files = FileList[test_file]
+            end.to_task
+          end
         end
 
         # recursively define rake test tasks for each file
         # in each top-level directory
-        Dir.glob(File.join(path, "*/")).each do |test_dir|
+        Dir.glob(File.join(path, "*")).each do |test_dir|
           self.to_tasks(test_dir)
         end
       end

data/lib/assert/result.rb

@@ -39,6 +39,7 @@ module Assert::Result
 
     # './lib' in project dir, or '/usr/local/blahblah' if installed
     ASSERT_DIR = File.dirname(File.dirname(file))
+    MACROS_DIR = File.join(File.dirname(file), 'macros')
 
     def initialize(value=nil)
       super(value || ["No backtrace"])
@@ -52,15 +53,22 @@ module Assert::Result
       new_bt = []
 
       self.each do |line|
-        break if line.rindex ASSERT_DIR, 0
+        break if filter_out?(line)
         new_bt << line
       end
 
-      new_bt = self.reject { |line| line.rindex ASSERT_DIR, 0 } if new_bt.empty?
+      new_bt = self.reject { |line| filter_out?(line) } if new_bt.empty?
       new_bt = self.dup if new_bt.empty?
 
       self.class.new(new_bt)
     end
+
+    protected
+
+    def filter_out?(line)
+      line.rindex(ASSERT_DIR, 0) && !line.rindex(MACROS_DIR, 0)
+    end
+
   end
 
 
@@ -89,11 +97,11 @@ module Assert::Result
     def trace
       self.backtrace.filtered.first.to_s
     end
-    
+
     def ==(other)
       self.class == other.class && self.message == other.message
     end
-    
+
     def inspect
       "#<#{self.class} @message=#{self.message.inspect}>"
     end

data/lib/assert/result_set.rb

@@ -5,8 +5,8 @@ module Assert
 
     def <<(result)
       super
-      if @view && @view.respond_to?(:print_runtime_result)
-        @view.print_runtime_result(result)
+      if @view && @view.respond_to?(:handle_runtime_result)
+        @view.handle_runtime_result(result)
       end
     end
 

data/lib/assert/runner.rb

@@ -12,15 +12,11 @@ module Assert
     end
 
     def run(*args)
-      @suite.setup_blocks.each do |setup| # TODO: tests!
-        setup.call
-      end
+      @suite.setup
       @view.render do
         benchmark { run_suite }
       end
-      @suite.teardown_blocks.each do |teardown| # TODO: tests!
-        teardown.call
-      end
+      @suite.teardown
       count(:failed) + count(:errored)
     end
 

data/lib/assert/setup/autorun.rb

@@ -22,7 +22,6 @@ module Assert
 
         exit_code = nil
         at_exit { exit(false) if exit_code && exit_code != 0 }
-        # TODO: read options from a config for extentions??
         Runner.new(self.suite, self.view).run
       end unless @@at_exit_installed
       @@at_exit_installed = true

data/lib/assert/suite.rb

@@ -6,7 +6,7 @@ module Assert
     # A suite is a set of tests to run.  When a test class subclasses
     # the Context class, that test class is pushed to the suite.
 
-    attr_accessor :start_time, :end_time, :setup_blocks, :teardown_blocks
+    attr_accessor :start_time, :end_time
 
     def run_time
       (@end_time || 0) - (@start_time || 0)
@@ -70,28 +70,32 @@ module Assert
       end
     end
 
-    def setup_blocks
-      @setup_blocks ||= []
-    end
-
-    def teardown_blocks
-      @teardown_blocks ||= []
-    end
-
-    # TODO: tests!
     def setup(&block)
-      raise ArgumentError, "please provide a setup block" unless block_given?
-      self.setup_blocks << block
+      if block_given?
+        self.setups << block
+      else
+        self.setups.each{|setup| setup.call}
+      end
     end
 
-    # TODO: tests!
     def teardown(&block)
-      raise ArgumentError, "please provide a teardown block" unless block_given?
-      self.teardown_blocks << block
+      if block_given?
+        self.teardowns << block
+      else
+        self.teardowns.reverse.each{|teardown| teardown.call}
+      end
     end
 
     protected
 
+    def setups
+      @setups ||= []
+    end
+
+    def teardowns
+      @teardowns ||= []
+    end
+
     def local_public_test_methods(klass)
       methods = klass.public_instance_methods
       while (klass.superclass)

data/lib/assert/test.rb

@@ -19,9 +19,9 @@ module Assert
 
     def run(view=nil)
       @results.view = view
+      run_scope = @context_class.new(self)
       begin
-        run_scope = @context_class.new(self)
-        run_setup(run_scope)
+        @context_class.setup(run_scope)
         if @code.kind_of?(::Proc)
           run_scope.instance_eval(&@code)
         elsif run_scope.respond_to?(@code.to_s)
@@ -33,7 +33,7 @@ module Assert
         @results << Result::Error.new(self.name, err)
       ensure
         begin
-          run_teardown(run_scope) if run_scope
+          @context_class.teardown(run_scope)
         rescue Exception => teardown_err
           @results << Result::Error.new(self.name, teardown_err)
         end
@@ -42,18 +42,6 @@ module Assert
       @results
     end
 
-    def run_setup(scope)
-      @context_class.all_setup_blocks.each do |setup|
-        scope.instance_eval(&setup)
-      end
-    end
-
-    def run_teardown(scope)
-      @context_class.all_teardown_blocks.each do |teardown|
-        scope.instance_eval(&teardown)
-      end
-    end
-
     Assert::Result.types.each do |name, klass|
       define_method "#{name}_results" do
         @results.select{|r| r.kind_of?(klass) }
@@ -82,8 +70,9 @@ module Assert
     protected
 
     def name_from_context(name)
-      name = name.gsub(/^test:\s+should/, "should")
-      [ @context_class.full_description, name ].compact.join(" ")
+      [ @context_class.description,
+        name.gsub(/^test:\s+should/, "should")
+      ].compact.reject{|p| p.empty?}.join(" ")
     end
 
   end

data/lib/assert/version.rb

@@ -1,3 +1,3 @@
 module Assert
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/assert/view/base.rb

@@ -16,7 +16,7 @@ module Assert::View
     def render(*args, &runner)
     end
 
-    def print_runtime_result(result)
+    def handle_runtime_result(result)
       sym = result.to_sym
       if self.respond_to?(:options)
         io_print(self.options.send("#{sym}_abbrev"))

data/lib/assert/view/terminal.rb

@@ -1,32 +1,12 @@
 require 'assert/view/base'
 require 'assert/result'
 
+require 'ansi/code'
+
 module Assert::View
 
   class Terminal < Base
 
-    TERM_STYLES = {
-      :reset     => 0,
-      :bold      => 1,
-      :underline => 4,
-      :black     => 30,
-      :red       => 31,
-      :green     => 32,
-      :yellow    => 33,
-      :blue      => 34,
-      :magenta   => 35,
-      :cyan      => 36,
-      :white     => 37,
-      :bgblack   => 40,
-      :bgred     => 41,
-      :bggreen   => 42,
-      :bgyellow  => 43,
-      :bgblue    => 44,
-      :bgmagenta => 45,
-      :bgcyan    => 46,
-      :bgwhite   => 47
-    }
-
     options do
       default_styled          false
       default_passed_abbrev   '.'
@@ -42,7 +22,7 @@ module Assert::View
     end
 
     def render(*args, &block)
-      self.io_print(:load_stmt)
+      self.io_puts(:load_stmt)
 
       if count(:tests) > 0
         block.call if block
@@ -52,7 +32,7 @@ module Assert::View
       self.io_puts(:results_stmt)
     end
 
-    def print_runtime_result(result)
+    def handle_runtime_result(result)
       sym = result.to_sym
       self.io_print(result_io_msg(self.options.send("#{sym}_abbrev"), sym))
     end
@@ -61,7 +41,7 @@ module Assert::View
 
     def load_stmt
       tplur = (tcount = count(:tests)) == 1 ? "test": "tests"
-      "\nLoaded suite (#{tcount} #{tplur})  "
+      "\nLoaded suite (#{tcount} #{tplur})"
     end
 
     def detailed_results
@@ -116,16 +96,14 @@ module Assert::View
     def io_msg(msg, opts={})
       val = super
       if !(style = term_style(*opts[:term_styles])).empty?
-        val = style + val + term_style(:reset)
+        val = style + val + ANSI.send(:reset)
       else
         val
       end
     end
 
-    def term_style(*styles)
-      styles.collect do |style|
-        TERM_STYLES.include?(style) ? "\e[#{TERM_STYLES[style]}m" : nil
-      end.join('')
+    def term_style(*ansi_codes)
+      ansi_codes.collect{|code| ANSI.send(code) rescue nil}.compact.join('')
     end
 
     def show_result_details?(result)

data/test/assertions/assert_block_test.rb

@@ -25,7 +25,7 @@ class Assert::Assertions::AssertBlockTest < Assert::Context
   class FailMessageTest < AssertBlockTest
     desc "with a failed result"
     setup do
-      @expected = [ "Expected block to return true value.", @fail_desc ].join("\n")
+      @expected = [@fail_desc, "Expected block to return true value."].join("\n")
       @fail_message = @test.fail_results.first.message
     end
     subject{ @fail_message }

data/test/assertions/assert_empty_test.rb

@@ -0,0 +1,43 @@
+require 'assert'
+
+class Assert::Assertions::AssertEmptyTest < Assert::Context
+  desc "the assert_empty helper run in a test"
+  setup do
+    fail_desc = @fail_desc = "assert empty fail desc"
+    fail_args = @fail_args = [ [ 1 ], fail_desc ]
+    @test = Factory.test do
+      assert_empty([])          # pass
+      assert_empty(*fail_args)   # fail
+    end
+    @test.run
+  end
+  subject{ @test }
+
+  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
+
+  class FailMessageTest < AssertEmptyTest
+    desc "with a failed result"
+    setup do
+      @expected = [
+        @fail_args[1],
+        "Expected #{@fail_args[0].inspect} to be empty."
+      ].join("\n")
+      @fail_message = @test.fail_results.first.message
+    end
+    subject{ @fail_message }
+
+    should "have a fail message with an explanation of what failed and my fail description" do
+      assert_equal @expected, subject
+    end
+
+  end
+
+end

data/test/assertions/assert_equal_test.rb

@@ -0,0 +1,43 @@
+require 'assert'
+
+class Assert::Assertions::AssertEqualTest < Assert::Context
+  desc "the assert_equal helper run in a test"
+  setup do
+    fail_desc = @fail_desc = "assert equal fail desc"
+    fail_args = @fail_args = [ 1, 2, fail_desc ]
+    @test = Factory.test do
+      assert_equal(1, 1)        # pass
+      assert_equal(*fail_args)  # fail
+    end
+    @test.run
+  end
+  subject{ @test }
+
+  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
+
+  class FailMessageTest < AssertEqualTest
+    desc "with a failed result"
+    setup do
+      @expected = [
+        @fail_args[2],
+        "Expected #{@fail_args[0]}, not #{@fail_args[1]}."
+      ].join("\n")
+      @fail_message = @test.fail_results.first.message
+    end
+    subject{ @fail_message }
+
+    should "have a fail message with an explanation of what failed and my fail description" do
+      assert_equal @expected, subject
+    end
+
+  end
+
+end