expectations 0.1.3 → 0.1.4

data/lib/expectations.rb

@@ -2,12 +2,10 @@ module Expectations
 end
 
 def Expectations(&block)
-  begin
-    Expectations::SuiteRunner.instance.suite_eval &block
-  rescue
-    Expectations::SuiteRunner.instance.do_not_run
-    raise
-  end
+  Expectations::SuiteRunner.suite_eval &block
+rescue
+  Expectations::SuiteRunner.do_not_run
+  raise
 end
 
 require 'rubygems'

data/lib/expectations/range.rb

@@ -1,7 +1,7 @@
 class Range
   
   def expectations_equal_to(other)
-    self === other
+    self === other || self == other
   end
   
 end

data/lib/expectations/regexp.rb

@@ -1,7 +1,7 @@
 class Regexp
   
   def expectations_equal_to(other)
-    self === other
+    self === other || self == other
   end
   
 end

data/lib/expectations/suite.rb

@@ -1,29 +1,25 @@
 class Expectations::Suite
-
+  
   def mock
     Expectations::MockRecorder.new(Mocha::Mock.new)
   end
   
   def execute(out=STDOUT)
+    return true if @do_not_run
     suite_result = Expectations::SuiteResults.new(out)
-    benchmark = Benchmark.measure do
-      ENV["LINE"].nil? ? run_all(suite_result) : run_one(suite_result)
-    end
+    benchmark = Benchmark.measure { ENV["LINE"].nil? ? run_all(suite_result) : run_one(suite_result) }
     suite_result.print_results(benchmark)
     suite_result.write_junit_xml(ENV["JUnitXmlPath"]) unless ENV["JUnitXmlPath"].nil?
-    suite_result.result
+    yield suite_result if block_given?
+    suite_result.succeeded?
   end
   
   def run_all(suite_result)
-    expectations.each do |expectation|
-      suite_result << expectation.execute
-    end
+    expectations.each { |expectation| suite_result << expectation.execute }
   end
   
   def run_one(suite_result)
-    one = expectations.inject do |result, expectation|
-      expectation.line > ENV["LINE"].to_i ? result : expectation
-    end
+    one = expectations.inject { |result, expectation| expectation.line > ENV["LINE"].to_i ? result : expectation }
     suite_result << one.execute
   end
 
@@ -34,4 +30,8 @@ class Expectations::Suite
   def expect(expected, &block)
     self.expectations << Expectations::Expectation.new(expected, &block)
   end
+  
+  def do_not_run
+    @do_not_run = true
+  end
 end

data/lib/expectations/suite_results.rb

@@ -1,18 +1,21 @@
 class Expectations::SuiteResults
-  attr_accessor :result, :out, :expectations
+  attr_accessor :out, :expectations
   
   def initialize(out)
-    self.out, self.result, self.expectations = out, true, []
+    self.out, self.expectations = out, []
     out.print "Expectations "
   end
   
   def <<(expectation_result)
     out.print expectation_result.char
     self.expectations << expectation_result
-    self.result &&= expectation_result.fulfilled?
     self
   end
   
+  def succeeded?
+    expectations.all? { |expectation| expectation.fulfilled? }
+  end
+  
   def fulfilled
     expectations.select { |expectation| expectation.fulfilled? }
   end
@@ -29,7 +32,7 @@ class Expectations::SuiteResults
     run_time = benchmark.real
     run_time = 0.001 if run_time < 0.001
     out.puts "\nFinished in #{run_time.to_s.gsub(/(\d*)\.(\d{0,5}).*/,'\1.\2')} seconds"
-    if result
+    if succeeded?
       out.puts "\nSuccess: #{fulfilled.size} fulfilled"
     else
       out.puts "\nFailure: #{failures.size} failed, #{errors.size} errors, #{fulfilled.size} fulfilled"

data/lib/expectations/suite_runner.rb

@@ -1,20 +1,22 @@
 class Expectations::SuiteRunner
   include Singleton
-  attr_accessor :suite, :runnable
+  attr_accessor :suite
   
   def initialize
     self.suite = Expectations::Suite.new
-    self.runnable = true
     at_exit do
-      exit 1 unless runnable && suite.execute
+      suite.execute do |result|
+        exit 1 unless result.succeeded?
+      end
     end
   end
   
-  def do_not_run
-    self.runnable = false
+  def self.do_not_run
+    self.instance.suite.do_not_run
   end
   
-  def suite_eval(&block)
-    self.suite.instance_eval &block
+  def self.suite_eval(&block)
+    self.instance.suite.instance_eval &block
   end
+    
 end

data/rakefile.rb

@@ -2,9 +2,14 @@ require 'rubygems'
 require 'rake/gempackagetask'
 require 'rake/rdoctask'
 require 'rake/contrib/sshpublisher'
+require 'rake/testtask'
 
-task :default do
-  require File.dirname(__FILE__) + '/test/all_tests.rb'  
+task :default => [:test]
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
 end
 
 desc 'Generate RDoc'
@@ -41,7 +46,7 @@ specification = Gem::Specification.new do |s|
   expect NoMethodError do 
     Object.invalid_method_call 
   end."
-	s.version = "0.1.3"
+	s.version = "0.1.4"
 	s.author = 'Jay Fields'
   s.description = "A lightweight unit testing framework. Tests (expectations) will be written as follows 
   expect 2 do 

data/test/expectations/expectations_test.rb

@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + "/../test_helper"
+
+Expectations do
+
+  expect Expectations::SuiteRunner.to_receive(:suite_eval) do |suite|
+    Expectations {  }
+  end
+
+  expect Expectations::SuiteRunner.to_receive(:do_not_run) do |suite|
+    Expectations { Object.no_method_error_should_raise } rescue nil
+  end
+
+end

data/test/expectations/range_test.rb

@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + "/../test_helper"
+
+Expectations do
+  expect true do
+    (1..5).expectations_equal_to 3
+  end
+
+  expect true do
+    (1..5).expectations_equal_to 1..5
+  end
+end

data/test/expectations/regexp_test.rb

@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + "/../test_helper"
+
+Expectations do
+  expect true do
+    /foo/.expectations_equal_to "foo"
+  end
+
+  expect true do
+    /foo/.expectations_equal_to /foo/
+  end
+end

data/test/expectations/suite_results_test.rb

@@ -13,21 +13,25 @@ Expectations do
     results.errors.size
   end
   
-  expect true do
-    results = Expectations::SuiteResults.new(Silent)
-    results << Object.new.extend(Expectations::Results::Fulfilled)
-    results.result
-  end
-
   expect false do
     results = Expectations::SuiteResults.new(Silent)
     results << Object.new.extend(Expectations::Results::StateBasedFailure)
-    results.result
+    results << Object.new.extend(Expectations::Results::Fulfilled)
+    results.succeeded?
   end
 
   expect false do
     results = Expectations::SuiteResults.new(Silent)
     results << Object.new.extend(Expectations::Results::BehaviorFailure)
-    results.result
+    results << Object.new.extend(Expectations::Results::Fulfilled)
+    results.succeeded?
   end
+  
+  expect true do
+    results = Expectations::SuiteResults.new(Silent)
+    results << Object.new.extend(Expectations::Results::Fulfilled)
+    results << Object.new.extend(Expectations::Results::Fulfilled)
+    results.succeeded?
+  end
+  
 end

data/test/expectations/suite_runner_test.rb

@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + "/../test_helper"
+
+Expectations do
+  expect mock.to_receive(:instance_eval) do |suite|
+    Expectations::SuiteRunner.stubs(:instance).returns stub(:suite => suite)
+    Expectations::SuiteRunner.suite_eval {}
+  end
+
+  expect mock.to_receive(:do_not_run) do |suite|
+    Expectations::SuiteRunner.stubs(:instance).returns stub(:suite => suite)
+    Expectations::SuiteRunner.do_not_run
+  end
+end

data/test/expectations/suite_test.rb

@@ -12,10 +12,26 @@ Expectations do
     suite.execute(Silent)
   end
   
+  expect true do
+    suite = Expectations::Suite.new
+    suite.expect(1) { 2 }
+    suite.do_not_run
+    suite.execute(Silent)
+  end
+  
   expect false do
     suite = Expectations::Suite.new
     suite.expect(1) { 2 }
     suite.execute(Silent)
   end
+  
+  expect true do
+    suite = Expectations::Suite.new
+    result=nil
+    suite.execute(Silent) do |yielded_value|
+      result = yielded_value.succeeded?
+    end
+    result
+  end
 
 end

data/test/failures_test.rb

@@ -0,0 +1,70 @@
+require File.dirname(__FILE__) + "/test_helper"
+
+Expectations do
+  expect Expectations::Results::StateBasedFailure do
+    suite = Expectations::Suite.new
+    suite.expect(2) { 3 }
+    suite.execute(Silent)
+    suite.expectations.first
+  end
+  
+  expect Expectations::Results::Error do
+    suite = Expectations::Suite.new
+    suite.expect(ArgumentError) { Object.no_method }
+    suite.execute(Silent)
+    suite.expectations.first
+  end
+
+  expect Expectations::Results::BehaviorFailure do
+    suite = Expectations::Suite.new
+    suite.expect(mock.to_receive(:dial).with("2125551212").times(2)) do |phone|
+      phone.dial("2125551212")
+      phone.dial("2125551212")
+      phone.dial("2125551212")
+    end
+    suite.execute(Silent)
+    suite.expectations.first
+  end
+
+  expect Expectations::Results::BehaviorFailure do
+    suite = Expectations::Suite.new
+    suite.expect(mock.to_receive(:dial).with("2125551212").times(2)) { |phone| phone.dial("2125551212") }
+    suite.execute(Silent)
+    suite.expectations.first
+  end
+
+  expect Expectations::Results::BehaviorFailure do
+    suite = Expectations::Suite.new
+    suite.expect(Object.to_receive(:deal)) {  }
+    suite.execute(Silent)
+    suite.expectations.first
+  end
+
+  expect Expectations::Results::Error do
+    suite = Expectations::Suite.new
+    suite.expect(2) { stub(:two => 2).twos }
+    suite.execute(Silent)
+    suite.expectations.first
+  end
+
+  expect Expectations::Results::Error do
+    suite = Expectations::Suite.new
+    suite.expect(2) do
+      Object.expects(:bar).returns 2
+      Object.barter
+    end
+    suite.execute(Silent)
+    suite.expectations.first
+  end
+
+  expect Expectations::Results::Error do
+    suite = Expectations::Suite.new
+    suite.expect(1) do
+      Object.expects(:give_me_three).with(3).returns 1
+      Object.give_me_three(stub(:three=>3).threes)
+    end
+    suite.execute(Silent)
+    suite.expectations.first
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: expectations
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jay Fields
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-18 00:00:00 -08:00
+date: 2008-01-21 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -39,11 +39,15 @@ files:
 - lib/expectations.rb
 - test/all_tests.rb
 - test/expectations/expectation_test.rb
+- test/expectations/expectations_test.rb
+- test/expectations/range_test.rb
+- test/expectations/regexp_test.rb
 - test/expectations/results_test.rb
 - test/expectations/string_test.rb
 - test/expectations/suite_results_test.rb
+- test/expectations/suite_runner_test.rb
 - test/expectations/suite_test.rb
-- test/failures.rb
+- test/failures_test.rb
 - test/sample_expectations_test.rb
 - test/silent.rb
 - test/test_helper.rb

data/test/failures.rb

@@ -1,53 +0,0 @@
-require File.dirname(__FILE__) + "/test_helper"
-
-Expectations do
-  
-  # State based expectation where a value equals another value
-  expect 2 do
-    3
-  end
-  
-  # State based expectation where an exception is expected. Simply expect the Class of the intended exception
-  expect ArgumentError do
-    Object.no_method
-  end
-  
-  # Behavior based test using a traditional mock
-  expect mock.to_receive(:dial).with("2125551212").times(2) do |phone|
-    phone.dial("2125551212")
-    phone.dial("2125551212") # !> `&' interpreted as argument prefix
-    phone.dial("2125551212")
-  end
-
-  # Behavior based test using a traditional mock
-  expect mock.to_receive(:dial).with("2125551212").times(2) do |phone|
-    phone.dial("2125551212")
-  end
-
-  # Behavior based test on a concrete mock
-  expect Object.to_receive(:deal) do
-    Object.no_deal
-  end
-  
-  # Behavior based test on a concrete mock
-  expect Object.to_receive(:deal) do
-  end
-  
-  # State based test utilizing a stub
-  expect 2 do
-    stub(:two => 2).twos
-  end
-  
-  # State based test utilizing a concrete mock
-  expect 2 do
-    Object.expects(:bar).returns 2
-    Object.barter
-  end
-  
-  # Behavior based test utilizing a stub and a concrete mock
-  expect 1 do
-    Object.expects(:give_me_three).with(3).returns 1
-    Object.give_me_three(stub(:three=>3).threes)
-  end
-  
-end