riot 0.10.12.pre → 0.10.12

data/CHANGELOG

@@ -1,18 +1,16 @@
-*0.10.12.pre*
+*0.10.12*
+
+* Recognizing file and line number of an assertion declaration on failure [vandrijevik]
 
 * RR support in Riot [vandrijevik,jaknowlden]
 
     # teststrap.rb
     require 'riot'
-    Riot.rr
+    require 'riot/rr'
     
     # your-test.rb
     context "foo" do
-      setup do
-        mock!.hello {"world"}
-      end
-      
-      asserts("failure due to not calling hello") { true } # actually fails
+      asserts("failure due to not calling hello") { mock!.hello {"world"} } # actually fails
     end
 
 * Added Riot::Message to make messages in macros easier to write [jaknowlden]

data/Rakefile

@@ -1,20 +1,13 @@
 require 'rubygems'
 require 'rake'
 
-task :default => ["test:core", "test:assertion_macros"]
-task "test:all" => ["test:core", "test:assertion_macros", "test:extensions"]
+task :default => ["test:core"]
+task "test:all" => ["test:core", "test:extensions"]
 
 require 'rake/testtask'
 Rake::TestTask.new("test:core") do |test|
   test.libs    << 'test'
-  test.pattern =  'test/*_test.rb'
-  test.warning =  true
-  test.verbose =  false
-end
-
-Rake::TestTask.new("test:assertion_macros") do |test|
-  test.libs    << 'test'
-  test.pattern =  'test/assertion_macros/*_test.rb'
+  test.pattern =  'test/core/**/*_test.rb'
   test.warning =  true
   test.verbose =  false
 end
@@ -26,6 +19,25 @@ Rake::TestTask.new("test:extensions") do |test|
   test.verbose =  false
 end
 
+#
+# Benchmarks
+
+def run_benchmarks(bin)
+  Dir["test/benchmark/*.rb"].each do |file|
+    puts ">> Running #{file}"
+    puts %x[#{bin} #{file}]
+  end
+end
+
+desc "Run all of them fancy benchmarks, Howard!"
+task("test:benchmarks") { run_benchmarks("ruby") }
+
+desc "Run all of them fancy benchmarks in ruby-1.9, Steve!"
+task("test:benchmarks:1.9") { run_benchmarks("ruby1.9") }
+
+#
+# YARDie
+
 begin
   require 'yard'
   require 'yard/rake/yardoc_task'
@@ -38,14 +50,6 @@ rescue LoadError
   # YARD isn't installed
 end
 
-desc "Run all of them fancy benchmarks, Howard!"
-task :benchmarks do
-  Dir["test/benchmark/*.rb"].each do |file|
-    puts ">> Running #{file}"
-    puts %x[ruby #{file}]
-  end
-end
-
 #
 # Some monks like diamonds. I like gems.
 

data/VERSION

@@ -1 +1 @@
-0.10.12.pre
+0.10.12

data/lib/riot/assertion.rb

@@ -4,7 +4,7 @@ module Riot
       def macros; @@macros ||= {}; end
 
       def register_macro(name, assertion_macro, expect_exception=false)
-        macros[name.to_s] = assertion_macro.new
+        macros[name.to_s] = assertion_macro
       end
     end
 
@@ -23,8 +23,10 @@ module Riot
     end
   private
     def enhance_with_macro(name, *expectings, &expectation_block)
-      @macro, @expectings, @expectation_block = self.class.macros[name.to_s], expectings, expectation_block
+      @expectings, @expectation_block = expectings, expectation_block
+      @macro = self.class.macros[name.to_s].new
       raise(NoMethodError, name) unless @macro
+      @macro.file, @macro.line = caller.first.match(/(.*):(\d+)/)[1..2]
       self
     end
     alias :method_missing :enhance_with_macro

data/lib/riot/assertion_macro.rb

@@ -47,8 +47,10 @@ module Riot
       end
     end
 
+    attr_accessor :line, :file
+
     def pass(message=nil) [:pass, message.to_s]; end
-    def fail(message) [:fail, message.to_s]; end
+    def fail(message) [:fail, message.to_s, line, file]; end
     def error(e) [:error, e]; end
 
     def expects_exception?; self.class.expects_exception; end

data/lib/riot/message.rb

@@ -1,5 +1,5 @@
 class BlankSlate
-  instance_methods.each { |meth| undef_method(meth) unless meth =~ /^__/ }
+  instance_methods.each { |meth| undef_method(meth) unless meth.to_s =~ /^(__|object_id)/ }
 end
 
 module Riot

data/lib/riot/reporter.rb

@@ -24,7 +24,8 @@ module Riot
         pass(description, result)
       when :fail then
         @failures += 1
-        fail(description, result)
+        message, line, file = *response[1..-1]
+        fail(description, message, line, file)
       when :error then
         @errors += 1
         error(description, result)
@@ -44,6 +45,10 @@ module Riot
     def puts(message) @writer.puts(message); end
     def print(message) @writer.print(message); end
 
+    def line_info(line, file)
+      line ? "(on line #{line} in #{file})" : ""
+    end
+
     def results(time_taken)
       values = [passes, failures, errors, ("%0.6f" % time_taken)]
       puts "\n%d passes, %d failures, %d errors in %s seconds" % values
@@ -76,7 +81,11 @@ module Riot
       puts context.description
     end
     def pass(description, message) puts "  + " + green("#{description} #{message}".strip); end
-    def fail(description, message) puts "  - " + yellow("#{description}: #{message}"); end
+
+    def fail(description, message, line, file)
+      puts "  - " + yellow("#{description}: #{message} #{line_info(line, file)}".strip)
+    end
+
     def error(description, e) puts "  ! " + red("#{description}: #{e.message}"); end
   end
 
@@ -97,26 +106,29 @@ module Riot
       print green(".")
     end
 
-    def fail(description, message)
+    def fail(description, message, line, file)
       print yellow("F")
-      @details << "FAILURE - #{current_context.description} #{description} => #{message}"
+      @details << "FAILURE - #{test_detail(description, message)} #{line_info(line, file)}".strip
     end
 
     def error(description, e)
       print red("E")
-      @details << "ERROR - #{current_context.description} #{description} => #{format_error(e)}"
+      @details << "ERROR - #{test_detail(description, format_error(e))}"
     end
 
     def results(time_taken)
-      puts "\n" unless @details.empty?
-      @details.each { |detail| puts detail }
+      puts "\n#{@details.join("\n\n")}" unless @details.empty?
       super
     end
+  private
+    def test_detail(description, message)
+      "#{current_context.description} #{description} => #{message}"
+    end
   end
 
   class SilentReporter < Reporter
     def pass(description, message); end
-    def fail(description, message); end
+    def fail(description, message, line, file); end
     def error(description, e); end
     def results(time_taken); end
   end

data/riot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riot}
-  s.version = "0.10.12.pre"
+  s.version = "0.10.12"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin 'Gus' Knowlden"]
-  s.date = %q{2010-02-09}
+  s.date = %q{2010-02-11}
   s.description = %q{An extremely fast, expressive, and context-driven unit-testing framework. A replacement for all other testing frameworks. Protest the slow test.}
   s.email = %q{gus@gusg.us}
   s.extra_rdoc_files = [
@@ -48,35 +48,35 @@ Gem::Specification.new do |s|
      "lib/riot/runnable.rb",
      "lib/riot/situation.rb",
      "riot.gemspec",
-     "test/assertion_macro_test.rb",
-     "test/assertion_macros/any_test.rb",
-     "test/assertion_macros/assigns_test.rb",
-     "test/assertion_macros/empty_test.rb",
-     "test/assertion_macros/equals_test.rb",
-     "test/assertion_macros/equivalent_to_test.rb",
-     "test/assertion_macros/exists_test.rb",
-     "test/assertion_macros/includes_test.rb",
-     "test/assertion_macros/kind_of_test.rb",
-     "test/assertion_macros/matching_test.rb",
-     "test/assertion_macros/nil_test.rb",
-     "test/assertion_macros/not_borat_test.rb",
-     "test/assertion_macros/raises_test.rb",
-     "test/assertion_macros/respond_to_test.rb",
-     "test/assertion_macros/same_elements_test.rb",
-     "test/assertion_macros/size_test.rb",
-     "test/assertion_test.rb",
      "test/benchmark/colorize.rb",
      "test/benchmark/message_concatenation.rb",
      "test/benchmark/riot_vs_minitest.rb",
      "test/benchmark/same_elements_vs_set.rb",
      "test/benchmark/simple_context_and_assertions.rb",
-     "test/context_test.rb",
+     "test/core/assertion_macro_test.rb",
+     "test/core/assertion_macros/any_test.rb",
+     "test/core/assertion_macros/assigns_test.rb",
+     "test/core/assertion_macros/empty_test.rb",
+     "test/core/assertion_macros/equals_test.rb",
+     "test/core/assertion_macros/equivalent_to_test.rb",
+     "test/core/assertion_macros/exists_test.rb",
+     "test/core/assertion_macros/includes_test.rb",
+     "test/core/assertion_macros/kind_of_test.rb",
+     "test/core/assertion_macros/matching_test.rb",
+     "test/core/assertion_macros/nil_test.rb",
+     "test/core/assertion_macros/not_borat_test.rb",
+     "test/core/assertion_macros/raises_test.rb",
+     "test/core/assertion_macros/respond_to_test.rb",
+     "test/core/assertion_macros/same_elements_test.rb",
+     "test/core/assertion_macros/size_test.rb",
+     "test/core/assertion_test.rb",
+     "test/core/context_test.rb",
+     "test/core/message_test.rb",
+     "test/core/report_test.rb",
+     "test/core/setup_test.rb",
+     "test/core/situation_test.rb",
+     "test/core/teardown_test.rb",
      "test/extensions/rrriot_test.rb",
-     "test/message_test.rb",
-     "test/report_test.rb",
-     "test/setup_test.rb",
-     "test/situation_test.rb",
-     "test/teardown_test.rb",
      "test/teststrap.rb"
   ]
   s.homepage = %q{http://github.com/thumblemonks/riot}
@@ -85,35 +85,35 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{An extremely fast, expressive, and context-driven unit-testing framework. Protest the slow test.}
   s.test_files = [
-    "test/assertion_macro_test.rb",
-     "test/assertion_macros/any_test.rb",
-     "test/assertion_macros/assigns_test.rb",
-     "test/assertion_macros/empty_test.rb",
-     "test/assertion_macros/equals_test.rb",
-     "test/assertion_macros/equivalent_to_test.rb",
-     "test/assertion_macros/exists_test.rb",
-     "test/assertion_macros/includes_test.rb",
-     "test/assertion_macros/kind_of_test.rb",
-     "test/assertion_macros/matching_test.rb",
-     "test/assertion_macros/nil_test.rb",
-     "test/assertion_macros/not_borat_test.rb",
-     "test/assertion_macros/raises_test.rb",
-     "test/assertion_macros/respond_to_test.rb",
-     "test/assertion_macros/same_elements_test.rb",
-     "test/assertion_macros/size_test.rb",
-     "test/assertion_test.rb",
-     "test/benchmark/colorize.rb",
+    "test/benchmark/colorize.rb",
      "test/benchmark/message_concatenation.rb",
      "test/benchmark/riot_vs_minitest.rb",
      "test/benchmark/same_elements_vs_set.rb",
      "test/benchmark/simple_context_and_assertions.rb",
-     "test/context_test.rb",
+     "test/core/assertion_macro_test.rb",
+     "test/core/assertion_macros/any_test.rb",
+     "test/core/assertion_macros/assigns_test.rb",
+     "test/core/assertion_macros/empty_test.rb",
+     "test/core/assertion_macros/equals_test.rb",
+     "test/core/assertion_macros/equivalent_to_test.rb",
+     "test/core/assertion_macros/exists_test.rb",
+     "test/core/assertion_macros/includes_test.rb",
+     "test/core/assertion_macros/kind_of_test.rb",
+     "test/core/assertion_macros/matching_test.rb",
+     "test/core/assertion_macros/nil_test.rb",
+     "test/core/assertion_macros/not_borat_test.rb",
+     "test/core/assertion_macros/raises_test.rb",
+     "test/core/assertion_macros/respond_to_test.rb",
+     "test/core/assertion_macros/same_elements_test.rb",
+     "test/core/assertion_macros/size_test.rb",
+     "test/core/assertion_test.rb",
+     "test/core/context_test.rb",
+     "test/core/message_test.rb",
+     "test/core/report_test.rb",
+     "test/core/setup_test.rb",
+     "test/core/situation_test.rb",
+     "test/core/teardown_test.rb",
      "test/extensions/rrriot_test.rb",
-     "test/message_test.rb",
-     "test/report_test.rb",
-     "test/setup_test.rb",
-     "test/situation_test.rb",
-     "test/teardown_test.rb",
      "test/teststrap.rb"
   ]
 

data/test/benchmark/message_concatenation.rb

@@ -1,7 +1,7 @@
 require 'benchmark'
 
 class BlankSlate
-  instance_methods.each { |meth| undef_method(meth) unless meth =~ /^__/ }
+  instance_methods.each { |meth| undef_method(meth) unless meth.to_s =~ /^(__|object_id)/ }
 end
 
 class NormalMessage < BlankSlate

data/test/{assertion_macro_test.rb → core/assertion_macro_test.rb}

@@ -6,6 +6,10 @@ context "An AssertionMacro instance" do
   asserts_topic.responds_to(:new_message)
   asserts_topic.responds_to(:expected_message)
   asserts_topic.responds_to(:should_have_message)
+  asserts_topic.responds_to(:line)
+  asserts_topic.responds_to(:line=)
+  asserts_topic.responds_to(:file)
+  asserts_topic.responds_to(:file=)
 
   context "receiving #new_message" do
     setup { topic.new_message("hope") }
@@ -28,3 +32,15 @@ context "An AssertionMacro instance" do
     asserts(:to_s).equals(%q[expected "hope"])
   end
 end # An AssertionMacro instance
+
+context "AssertionMacro#fail" do
+  setup do
+    macro = Riot::AssertionMacro.new
+    macro.line = 5
+    macro.file = "foo"
+    macro.fail("")
+  end
+
+  asserts_topic.includes(5)
+  asserts_topic.includes("foo")
+end # AssertionMacro#fail

data/test/{assertion_macros → core/assertion_macros}/equals_test.rb

@@ -16,7 +16,7 @@ context "An equals assertion macro" do
     setup { topic.equals("bar").run(Riot::Situation.new) }
 
     asserts(":fail") { topic.first == :fail }
-    asserts("message") { topic.last == %Q{expected "bar", not "foo"} }
+    asserts("message") { topic[1] == %Q{expected "bar", not "foo"} }
   end # that is failing
 
   context "with numeric topic" do
@@ -25,7 +25,7 @@ context "An equals assertion macro" do
     end
 
     asserts("failure") do
-      topic.equals(30000..32000).run(Riot::Situation.new) == [:fail, "expected 30000..32000, not 31415"]
+      topic.equals(30000..32000).run(Riot::Situation.new)[0..1] == [:fail, "expected 30000..32000, not 31415"]
     end
   end # with numeric topic
 
@@ -35,7 +35,7 @@ context "An equals assertion macro" do
     end.equals([:pass, %Q{is equal to "foo"}])
 
     asserts(":fail with message when block expectation not met") do
-      topic.equals { "bar" }.run(Riot::Situation.new)
+      topic.equals { "bar" }.run(Riot::Situation.new)[0..1]
     end.equals([:fail, %Q{expected "bar", not "foo"}])
   end # with block as the expectation
 

data/test/{assertion_macros → core/assertion_macros}/equivalent_to_test.rb

@@ -13,7 +13,7 @@ context "An equivalent_to assertion macro" do
   end
 
   asserts("an array is not equivalent to 'what'") do
-    topic.equivalent_to([]).run(Riot::Situation.new) == [:fail, %Q{expected "what" to be equivalent to []}]
+    topic.equivalent_to([]).run(Riot::Situation.new)[0..1] == [:fail, %Q{expected "what" to be equivalent to []}]
   end
 
   context "with numeric topic" do
@@ -29,7 +29,7 @@ context "An equivalent_to assertion macro" do
       setup { topic.equivalent_to(32000..33000).run(Riot::Situation.new) }
 
       asserts(":fail") { topic.first == :fail }
-      asserts("message") { topic.last == %Q{expected 31413 to be equivalent to 32000..33000} }
+      asserts("message") { topic[1] == %Q{expected 31413 to be equivalent to 32000..33000} }
     end
   end # with numeric topic
 

data/test/{assertion_macros → core/assertion_macros}/exists_test.rb

@@ -12,6 +12,6 @@ context "An exists assertion macro" do
   end.equals([:pass, "is not nil"])
 
   asserts(":fail with message when value is nil") do
-    Riot::Assertion.new("foo") { nil }.exists.run(topic)
+    Riot::Assertion.new("foo") { nil }.exists.run(topic)[0..1]
   end.equals([:fail, "expected a non-nil value"])
 end # An exists assertion macro

data/test/core/assertion_macros/kind_of_test.rb

@@ -0,0 +1,15 @@
+require 'teststrap'
+
+context "A kind_of assertion macro" do
+  assertion_test_passes(":pass when specific result is a kind of String", "is a kind of String") do
+    Riot::Assertion.new("foo") { "a" }.kind_of(String)
+  end
+
+  assertion_test_fails(":fail when not a kind of String", "expected kind of String, not Fixnum") do
+    Riot::Assertion.new("foo") { 0 }.kind_of(String)
+  end
+
+  assertion_test_fails(":fail when nil", "expected kind of String, not NilClass") do
+    Riot::Assertion.new("foo") { }.kind_of(String)
+  end
+end # A kind_of assertion macro

data/test/{assertion_macros → core/assertion_macros}/nil_test.rb

@@ -8,6 +8,6 @@ context "A nil assertion macro" do
   end.equals([:pass, "is nil"])
 
   asserts(":fail with message") do
-    Riot::Assertion.new("foo") { "a" }.nil.run(topic)
+    Riot::Assertion.new("foo") { "a" }.nil.run(topic)[0..1]
   end.equals([:fail, %Q{expected nil, not "a"}])
 end # A nil assertion macro

data/test/{assertion_test.rb → core/assertion_test.rb}

@@ -15,8 +15,8 @@ context "An assertion" do
     asserts("to_s") { topic.to_s == "foo" }
 
     asserts(":fail and message are evaluated") do
-      topic.run(Riot::Situation.new) == [:fail, "Expected non-false but got nil instead"]
-    end
+      topic.run(Riot::Situation.new)[0..1]
+    end.equals([:fail, "Expected non-false but got nil instead"])
   end # that is failing
 
   context "that is erroring" do

data/test/{report_test.rb → core/report_test.rb}

@@ -4,7 +4,7 @@ context "A reporter" do
   setup do
     Class.new(Riot::Reporter) do
       def pass(d, message) "passed(#{d}, #{message.inspect})"; end
-      def fail(d, message) "failed(#{d}, #{message})"; end
+      def fail(d, message, line, file) "failed(#{d}, #{message} on line #{line} in file #{file})"; end
       def error(d, e) "errored(#{d}, #{e})"; end
       def results(time); end
     end.new
@@ -28,9 +28,9 @@ context "A reporter" do
     topic.failures
   end.equals(1)
 
-  asserts("description and message sent to #fail") do
-    topic.report("hi mom", [:fail, "how are you"])
-  end.equals("failed(hi mom, how are you)")
+  asserts("description, message, line and file sent to #fail") do
+    topic.report("hi mom", [:fail, "how are you", 4, "foo"])
+  end.equals("failed(hi mom, how are you on line 4 in file foo)")
 
   # error
 
@@ -76,6 +76,12 @@ context "StoryReporter" do
     ColorHelper.uncolored(@out.string)
   end.equals("  + foo\n")
 
+  asserts("failure message excludes line info if none provided") do
+    @out.rewind
+    topic.fail("foo", "bar", nil, nil)
+    ColorHelper.uncolored(@out.string)
+  end.equals("  - foo: bar\n")
+
   context 'reporting on an empty context' do
     setup do
       context = Riot::Context.new('empty context') do

data/test/teststrap.rb

@@ -20,7 +20,7 @@ module Riot
       context(description) do
         setup(&block)
         asserts("failure") { topic.run(Riot::Situation.new).first }.equals(:fail)
-        asserts("failure message") { topic.run(Riot::Situation.new).last }.equals(failure_message)
+        asserts("failure message") { topic.run(Riot::Situation.new)[1] }.equals(failure_message)
       end
     end
 
@@ -31,7 +31,7 @@ Riot::Context.instance_eval { include Riot::AssertionTestContextMacros }
 
 class MockReporter < Riot::Reporter
   def pass(description, message); end
-  def fail(description, message); end
+  def fail(description, message, line, file); end
   def error(description, e); end
   def results; end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: riot
 version: !ruby/object:Gem::Version 
-  version: 0.10.12.pre
+  version: 0.10.12
 platform: ruby
 authors: 
 - Justin 'Gus' Knowlden
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-09 00:00:00 -06:00
+date: 2010-02-11 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,35 +73,35 @@ files:
 - lib/riot/runnable.rb
 - lib/riot/situation.rb
 - riot.gemspec
-- test/assertion_macro_test.rb
-- test/assertion_macros/any_test.rb
-- test/assertion_macros/assigns_test.rb
-- test/assertion_macros/empty_test.rb
-- test/assertion_macros/equals_test.rb
-- test/assertion_macros/equivalent_to_test.rb
-- test/assertion_macros/exists_test.rb
-- test/assertion_macros/includes_test.rb
-- test/assertion_macros/kind_of_test.rb
-- test/assertion_macros/matching_test.rb
-- test/assertion_macros/nil_test.rb
-- test/assertion_macros/not_borat_test.rb
-- test/assertion_macros/raises_test.rb
-- test/assertion_macros/respond_to_test.rb
-- test/assertion_macros/same_elements_test.rb
-- test/assertion_macros/size_test.rb
-- test/assertion_test.rb
 - test/benchmark/colorize.rb
 - test/benchmark/message_concatenation.rb
 - test/benchmark/riot_vs_minitest.rb
 - test/benchmark/same_elements_vs_set.rb
 - test/benchmark/simple_context_and_assertions.rb
-- test/context_test.rb
+- test/core/assertion_macro_test.rb
+- test/core/assertion_macros/any_test.rb
+- test/core/assertion_macros/assigns_test.rb
+- test/core/assertion_macros/empty_test.rb
+- test/core/assertion_macros/equals_test.rb
+- test/core/assertion_macros/equivalent_to_test.rb
+- test/core/assertion_macros/exists_test.rb
+- test/core/assertion_macros/includes_test.rb
+- test/core/assertion_macros/kind_of_test.rb
+- test/core/assertion_macros/matching_test.rb
+- test/core/assertion_macros/nil_test.rb
+- test/core/assertion_macros/not_borat_test.rb
+- test/core/assertion_macros/raises_test.rb
+- test/core/assertion_macros/respond_to_test.rb
+- test/core/assertion_macros/same_elements_test.rb
+- test/core/assertion_macros/size_test.rb
+- test/core/assertion_test.rb
+- test/core/context_test.rb
+- test/core/message_test.rb
+- test/core/report_test.rb
+- test/core/setup_test.rb
+- test/core/situation_test.rb
+- test/core/teardown_test.rb
 - test/extensions/rrriot_test.rb
-- test/message_test.rb
-- test/report_test.rb
-- test/setup_test.rb
-- test/situation_test.rb
-- test/teardown_test.rb
 - test/teststrap.rb
 has_rdoc: true
 homepage: http://github.com/thumblemonks/riot
@@ -120,9 +120,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
   version: 
 requirements: []
 
@@ -132,33 +132,33 @@ signing_key:
 specification_version: 3
 summary: An extremely fast, expressive, and context-driven unit-testing framework. Protest the slow test.
 test_files: 
-- test/assertion_macro_test.rb
-- test/assertion_macros/any_test.rb
-- test/assertion_macros/assigns_test.rb
-- test/assertion_macros/empty_test.rb
-- test/assertion_macros/equals_test.rb
-- test/assertion_macros/equivalent_to_test.rb
-- test/assertion_macros/exists_test.rb
-- test/assertion_macros/includes_test.rb
-- test/assertion_macros/kind_of_test.rb
-- test/assertion_macros/matching_test.rb
-- test/assertion_macros/nil_test.rb
-- test/assertion_macros/not_borat_test.rb
-- test/assertion_macros/raises_test.rb
-- test/assertion_macros/respond_to_test.rb
-- test/assertion_macros/same_elements_test.rb
-- test/assertion_macros/size_test.rb
-- test/assertion_test.rb
 - test/benchmark/colorize.rb
 - test/benchmark/message_concatenation.rb
 - test/benchmark/riot_vs_minitest.rb
 - test/benchmark/same_elements_vs_set.rb
 - test/benchmark/simple_context_and_assertions.rb
-- test/context_test.rb
+- test/core/assertion_macro_test.rb
+- test/core/assertion_macros/any_test.rb
+- test/core/assertion_macros/assigns_test.rb
+- test/core/assertion_macros/empty_test.rb
+- test/core/assertion_macros/equals_test.rb
+- test/core/assertion_macros/equivalent_to_test.rb
+- test/core/assertion_macros/exists_test.rb
+- test/core/assertion_macros/includes_test.rb
+- test/core/assertion_macros/kind_of_test.rb
+- test/core/assertion_macros/matching_test.rb
+- test/core/assertion_macros/nil_test.rb
+- test/core/assertion_macros/not_borat_test.rb
+- test/core/assertion_macros/raises_test.rb
+- test/core/assertion_macros/respond_to_test.rb
+- test/core/assertion_macros/same_elements_test.rb
+- test/core/assertion_macros/size_test.rb
+- test/core/assertion_test.rb
+- test/core/context_test.rb
+- test/core/message_test.rb
+- test/core/report_test.rb
+- test/core/setup_test.rb
+- test/core/situation_test.rb
+- test/core/teardown_test.rb
 - test/extensions/rrriot_test.rb
-- test/message_test.rb
-- test/report_test.rb
-- test/setup_test.rb
-- test/situation_test.rb
-- test/teardown_test.rb
 - test/teststrap.rb

data/test/assertion_macros/kind_of_test.rb

@@ -1,17 +0,0 @@
-require 'teststrap'
-
-context "A kind_of assertion macro" do
-  setup { Riot::Situation.new }
-
-  asserts ":pass when specific result is a kind of String" do
-    Riot::Assertion.new("foo") { "a" }.kind_of(String).run(topic)
-  end.equals([:pass, %Q{is a kind of String}])
-
-  asserts ":fail when not a kind of String" do
-    Riot::Assertion.new("foo") { 0 }.kind_of(String).run(topic)
-  end.equals([:fail, %Q{expected kind of String, not Fixnum}])
-  
-  asserts ":fail when nil" do
-    Riot::Assertion.new("foo") { }.kind_of(String).run(topic)
-  end.equals([:fail, %Q{expected kind of String, not NilClass}])
-end # A kind_of assertion macro