riot 0.9.12 → 0.10.0

data/test/benchmark/riot_vs_minitest.rb

@@ -15,7 +15,12 @@ end
 # Riot
 
 require 'riot'
-Riot.silently!
+
+context "a room" do
+  setup { Room.new("bed") }
+
+  asserts("name") { topic.name }.equals("bed")
+end # a room
 
 #
 # MiniTest::Unit
@@ -40,13 +45,8 @@ n = 100 * 100
 
 Benchmark.bmbm do |x|
   x.report("Riot") do
-    n.times do
-      context "a room" do
-        setup { Room.new("bed") }
-
-        asserts("name") { topic.name }.equals("bed")
-      end # a room
-    end
+    Riot.silently!
+    n.times { Riot.run }
   end
 
   x.report("MiniTest") do

data/test/benchmark/same_elements_vs_set.rb

@@ -0,0 +1,41 @@
+require 'benchmark'
+
+#
+# Benchmarking
+
+n = 100 * 100
+
+Benchmark.bmbm do |x|
+  x.report("Set theory") do
+    require 'set'
+    def set_theory(expected, actual)
+      a = Set.new(expected)
+      b = Set.new(actual)
+      a == b
+    end
+
+    n.times do
+      array = ["a", 1, {:foo => :bar}]
+      set_theory(array, array.reverse)
+    end
+  end
+
+  x.report("same_elements from shoulda (sorta)") do
+    def same_elements(a1, a2)
+      [:select, :inject, :size].each do |m|
+        [a1, a2].each { |a| a.respond_to?(m) || return }
+      end
+
+      a1h = a1.inject({}) { |h,e| h[e] = a1.select { |i| i == e }.size; h }
+      a2h = a2.inject({}) { |h,e| h[e] = a2.select { |i| i == e }.size; h }
+
+      a1h == a2h
+    end
+
+    n.times do
+      array = ["a", 1, {:foo => :bar}]
+      same_elements(array, array.reverse)
+    end
+  end
+end
+

data/test/benchmark/simple_context_and_assertions.rb

@@ -47,7 +47,12 @@ end
 # Riot
 
 require 'riot'
-Riot.silently!
+
+context "a room" do
+  setup { Room.new("bed") }
+
+  asserts("name") { topic.name }.equals("bed")
+end # a room
 
 #
 # Benchmarking
@@ -56,13 +61,8 @@ n = 100 * 100
 
 Benchmark.bmbm do |x|
   x.report("Riot") do
-    n.times do
-      context "a room" do
-        setup { @room = Room.new("bed") }
-
-        asserts("name") { @room.name }.equals("bed")
-      end # a room
-    end
+    Riot.silently!
+    n.times { Riot.run }
   end
 
   x.report("Test::Unit") do

data/test/context_test.rb

@@ -1,105 +1,90 @@
 require 'teststrap'
 
-context "any context" do
+context "Reporting a context" do
   setup do
-    @reporter = Riot::NilReport.new
-    @context = Riot::Context.new("a", @reporter)
-  end
-
-  context "that doesn't have passing tests" do
-    setup do
-      @context.should("a") { true }
-      @context.should("b") { false }
-      @context.should("c") { raise Exception, "blah" }
-      @context.report
+    a_context = Riot::Context.new("foobar") do
+      asserts("passing") { true }
+      asserts("failing") { false }
+      asserts("erroring") { raise Exception }
     end
+    a_context.run(MockReporter.new)
+  end
 
-    asserts("passed test count") { @reporter.passes }.equals(1)
-    asserts("failure count") { @reporter.failures }.equals(1)
-    asserts("unexpected errors count") { @reporter.errors }.equals(1)
-  end # that doesn't have passing tests
-
-  context "when running setup:" do
-    setup { @context.setup { "foo" } }
-
-    asserts "topic becomes available to test as result of setup" do
-      @context.should("bar") { topic }.actual
-    end.equals("foo")
-
-    asserts "calling topic in context will return assertion that returns topic as the actual" do
-      @context.topic.actual
-    end.equals("foo")
-  end # when running setup
-end # any context
-
-# 
-# Basic Context
+  asserts("one passed test") { topic.passes == 1 }
+  asserts("one failed test") { topic.failures == 1 }
+  asserts("one errored test") { topic.errors == 1 }
+end # Reporting a context
 
-context "basic context" do
+context "Defining a context with multiple setups" do
   setup do
-    test_context = Riot::Context.new("foo", Riot::NilReport.new)
-    test_context.setup { @test_counter = 0 }
-    test_context.asserts("truthiness") { @test_counter += 1; true }
-    test_context.asserts("more truthiness") { @test_counter += 1; true }
-    test_context
+    a_context = Riot::Context.new("foobar") do
+      setup { "foo" }
+      setup { topic + "bar" }
+      asserts("blah") { topic == "foobar" }
+    end
+    a_context.run(MockReporter.new)
   end
 
-  asserts("context description") { topic.to_s }.equals("foo")
-  asserts("assertion count") { topic.assertions.length }.equals(2)
-  should("call setup once per context") { topic.situation }.assigns(:test_counter, 2)
-end # basic context
-
-# 
-# Nested Context
+  asserts("all tests pass") { topic.passes == 1 }
+end # Defining a context with multiple setups
 
-context "nested context" do
+context "Nesting a context" do
   setup do
-    test_context = Riot::Context.new("foo", Riot::NilReport.new)
-    test_context.setup { @test_counter = 0; @foo = "bar" }
-    test_context.asserts("truthiness") { @test_counter += 1; true }
-    test_context
+    a_context = Riot::Context.new("foobar") do
+      asserts("passing") { true }
+      context "bazboo" do
+        asserts("passing") { true }
+        asserts("failing") { false }
+        asserts("erroring") { raise Exception }
+      end
+    end
+    a_context.run(MockReporter.new)
   end
-  
-  context "inner context with own setup" do
+
+  asserts("one passed test") { topic.passes == 2 }
+  asserts("one failed test") { topic.failures == 1 }
+  asserts("one errored test") { topic.errors == 1 }
+
+  context "with setups" do
     setup do
-      test_context = topic.context("baz")
-      test_context.setup { @test_counter += 10 }
-      test_context
+      a_context = Riot::Context.new("foobar") do
+        setup { "foo" }
+        context "bazboo" do
+          setup { topic + "bar" }
+          asserts("passing") { topic == "foobar" }
+        end
+      end
+      a_context.run(MockReporter.new)
     end
-  
-    should("inherit parent context") { topic.situation }.assigns(:test_counter, 10)
-    should("chain context names") { topic.to_s }.equals("foo baz")
-  end
 
-  context "inner context without its own setup" do
-    setup { topic.context("bum") }
-    asserts("parent setup is called") { topic.situation }.assigns(:foo, "bar")
+    asserts("parent setups are called") { topic.passes == 1 }
+  end # with setups
+end # Nestings a context
+
+context "Using should" do
+  setup do
+    a_context = Riot::Context.new("foobar") do
+      should("pass") { true }
+      should("fail") { false }
+      should("error") { raise Exception }
+    end
+    a_context.run(MockReporter.new)
   end
-end
 
-# 
-# Multiple setups in a context
+  asserts("one passed test") { topic.passes == 1 }
+  asserts("one failed test") { topic.failures == 1 }
+  asserts("one errored test") { topic.errors == 1 }
+end # Using should
 
-context "multiple setups" do
+context "The asserts_topic shortcut" do
   setup do
-    test_context = Riot::Context.new("foo", Riot::NilReport.new)
-    test_context.setup { @foo = "bar" }
-    test_context.setup { @baz = "boo" }
-    test_context
+    Riot::Context.new("foo") {}.asserts_topic
   end
 
-  asserts("foo") { topic.situation }.assigns(:foo, "bar")
-  asserts("bar") { topic.situation }.assigns(:baz, "boo")
-
-  context "in the parent of a nested context" do
-    setup do
-      test_context = topic.context("goo")
-      test_context.setup { @goo = "car" }
-      test_context
-    end
+  should("return an Assertion") { topic }.kind_of(Riot::Assertion)
 
-    asserts("foo") { topic.situation }.assigns(:foo, "bar")
-    asserts("bar") { topic.situation }.assigns(:baz, "boo")
-    asserts("goo") { topic.situation }.assigns(:goo, "car")
-  end # in the parent of a nested context
-end # multiple setups
+  should("return the actual topic as the result of evaling the assertion") do
+    (situation = Riot::Situation.new).topic = "bar"
+    topic.equals("bar").run(situation)
+  end.equals([:pass])
+end # The asserts_topic shortcut

data/test/report_test.rb

@@ -0,0 +1,44 @@
+require 'teststrap'
+
+context "A reporter" do
+  setup do
+    Class.new(Riot::Reporter) do
+      def pass(d) "passed(#{d})"; end
+      def fail(d, message) "failed(#{d}, #{message})"; end
+      def error(d, e) "errored(#{d}, #{e})"; end
+    end.new
+  end
+
+  # pass
+
+  asserts("pass count increase when :pass sent to #report") do
+    topic.report("", [:pass])
+    topic.passes
+  end.equals(1)
+
+  asserts("description sent to #pass") do
+    topic.report("hi mom", [:pass])
+  end.equals("passed(hi mom)")
+
+  # fail
+
+  asserts("fail count increase when :fail sent to #report") do
+    topic.report("", [:fail, ""])
+    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)")
+
+  # error
+
+  asserts("error count increase when :error sent to #report") do
+    topic.report("", [:error, ""])
+    topic.errors
+  end.equals(1)
+
+  asserts("description sent to #error") do
+    topic.report("break it down", [:error, "error time"])
+  end.equals("errored(break it down, error time)")
+end # A reporter

data/test/setup_test.rb

@@ -0,0 +1,17 @@
+require 'teststrap'
+
+context "A setup block" do
+  setup do
+    Riot::Setup.new { "fooberries" }
+  end
+  
+  asserts("topic is set for situation when run") do
+    situation = Riot::Situation.new
+    topic.run(situation)
+    situation.topic == "fooberries"
+  end
+
+  asserts(":setup is returned from calling run") do
+    topic.run(Riot::Situation.new) == [:setup]
+  end
+end # A setup block

data/test/situation_test.rb

@@ -0,0 +1,16 @@
+require 'teststrap'
+
+context "A situation" do
+  setup do
+    Riot::Situation.new
+  end
+
+  asserts("the topic is result of calling setup") do
+    topic.setup { "foo" }
+    topic.topic == "foo"
+  end
+
+  asserts("evaluate will return result of evaluation") do
+    topic.evaluate { "foo" == "bar" } == false
+  end
+end # A situation

data/test/teststrap.rb

@@ -1 +1,32 @@
+$: << File.join(File.dirname(__FILE__), "..", "lib")
 require 'riot'
+
+module Riot
+  module AssertionTestContextMacros
+
+    def assertion_test_passes(description, &block)
+      context(description) do
+        setup(&block)
+        asserts("passes") { topic.run(Riot::Situation.new) }.equals([:pass])
+      end
+    end
+
+    def assertion_test_fails(description, failure_message, &block)
+      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)
+      end
+    end
+
+  end # AssertionTestContextMacros
+end # Riot
+
+Riot::Context.instance_eval { include Riot::AssertionTestContextMacros }
+
+class MockReporter < Riot::Reporter
+  def pass(description); end
+  def fail(description, message); 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.9.12
+  version: 0.10.0
 platform: ruby
 authors: 
 - Justin 'Gus' Knowlden
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-22 00:00:00 -05:00
+date: 2009-11-21 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -28,25 +28,29 @@ files:
 - Rakefile
 - VERSION
 - lib/riot.rb
-- lib/riot/assertion.rb
 - lib/riot/assertion_macros.rb
 - lib/riot/context.rb
-- lib/riot/errors.rb
-- lib/riot/report.rb
+- lib/riot/reporter.rb
+- lib/riot/runnable.rb
 - lib/riot/situation.rb
 - riot.gemspec
-- test/assertion_macros/assertion_macro_assigns_test.rb
-- test/assertion_macros/assertion_macro_equals_test.rb
-- test/assertion_macros/assertion_macro_exists_test.rb
-- test/assertion_macros/assertion_macro_kind_of_test.rb
-- test/assertion_macros/assertion_macro_matching_test.rb
-- test/assertion_macros/assertion_macro_nil_test.rb
-- test/assertion_macros/assertion_macro_raises_test.rb
-- test/assertion_macros/assertion_macro_respond_to_test.rb
+- test/assertion_macros/assigns_test.rb
+- test/assertion_macros/equals_test.rb
+- test/assertion_macros/exists_test.rb
+- test/assertion_macros/kind_of_test.rb
+- test/assertion_macros/matching_test.rb
+- test/assertion_macros/nil_test.rb
+- test/assertion_macros/raises_test.rb
+- test/assertion_macros/respond_to_test.rb
+- test/assertion_macros/same_elements_test.rb
 - test/assertion_test.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/report_test.rb
+- test/setup_test.rb
+- test/situation_test.rb
 - test/teststrap.rb
 has_rdoc: true
 homepage: http://github.com/thumblemonks/riot
@@ -77,16 +81,21 @@ signing_key:
 specification_version: 3
 summary: An extremely fast, expressive, and context-driven unit-testing framework. Protest the slow test.
 test_files: 
-- test/assertion_macros/assertion_macro_assigns_test.rb
-- test/assertion_macros/assertion_macro_equals_test.rb
-- test/assertion_macros/assertion_macro_exists_test.rb
-- test/assertion_macros/assertion_macro_kind_of_test.rb
-- test/assertion_macros/assertion_macro_matching_test.rb
-- test/assertion_macros/assertion_macro_nil_test.rb
-- test/assertion_macros/assertion_macro_raises_test.rb
-- test/assertion_macros/assertion_macro_respond_to_test.rb
+- test/assertion_macros/assigns_test.rb
+- test/assertion_macros/equals_test.rb
+- test/assertion_macros/exists_test.rb
+- test/assertion_macros/kind_of_test.rb
+- test/assertion_macros/matching_test.rb
+- test/assertion_macros/nil_test.rb
+- test/assertion_macros/raises_test.rb
+- test/assertion_macros/respond_to_test.rb
+- test/assertion_macros/same_elements_test.rb
 - test/assertion_test.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/report_test.rb
+- test/setup_test.rb
+- test/situation_test.rb
 - test/teststrap.rb