expectations 0.0.3 → 0.0.4

data/README

@@ -61,4 +61,6 @@ expectations can be used for state based and behavior based testing.
 	  
 	end
 
-== Contributors
+== Contributors
+
+Matt Mower

data/lib/expectations/expectation.rb

@@ -20,10 +20,11 @@ class Expectations::Expectation
       self.extend(Expectations::Results::Fulfilled)
     rescue Mocha::ExpectationError => ex
       self.extend(Expectations::Results::BehaviorFailure)
-      self.message = ex.message.gsub(/:/,";")
+      self.message = ex.message
     rescue Exception => ex
-      self.extend(Expectations::Results::Error)
+      self.extend(Expectations::Results::BehaviorBasedError)
       self.exception = ex 
+      self.message = ""
     ensure
       mocha_teardown
     end
@@ -36,7 +37,7 @@ class Expectations::Expectation
       return self.extend(Expectations::Results::Fulfilled) if expected == actual
     rescue Exception => ex
       return self.extend(Expectations::Results::Fulfilled) if expected == ex.class
-      self.extend(Expectations::Results::Error)
+      self.extend(Expectations::Results::StateBasedError)
       self.exception = ex 
       self.actual = ex.class if expected.is_a?(Class) && expected < StandardError
       return self

data/lib/expectations/results.rb

@@ -46,9 +46,20 @@ module Expectations::Results
 end
 
 module Expectations::Results
-  module Error
+  module BehaviorBasedError
+    attr_accessor :exception, :message
+    include Expectations::Results
+    char "E"
+  end
+end
+
+module Expectations::Results
+  module StateBasedError
     attr_accessor :exception
     include Expectations::Results
     char "E"
+    def message 
+      "expected: <#{expected.inspect}> got: <#{actual.inspect}>"
+    end
   end
 end

data/lib/expectations/suite_results.rb

@@ -18,7 +18,9 @@ class Expectations::SuiteResults
   end
   
   def errors
-    expectations.select { |expectation| expectation.is_a?(Expectations::Results::Error) }
+    expectations.select do |expectation|
+      expectation.is_a?(Expectations::Results::StateBasedError) || expectation.is_a?(Expectations::Results::BehaviorBasedError)
+    end
   end
   
   def failures
@@ -35,18 +37,20 @@ class Expectations::SuiteResults
       out.puts "\nSuccess: #{fulfilled.size} fulfilled"
     else
       out.puts "\nFailure: #{failures.size} failed, #{errors.size} errors, #{fulfilled.size} fulfilled"
-      out.puts "\nErrors:" if errors.any?
+      out.puts "\n--Errors--" if errors.any?
       errors.each do |error|
-        out.puts " #{error.file}:#{error.line}:in `expect'"
-        out.puts " line <#{error.line}>"
-        out.puts " error <#{error.exception.message.gsub(/:/,";")}>"
-        out.puts " expected <#{error.expected.inspect}> got <#{error.actual.inspect}>"
+        out.puts " #{error.file}:#{error.line}:in `expect'" if ENV["TM_MODE"]
+        out.puts "file <#{error.file}>"
+        out.puts "line <#{error.line}>"
+        out.puts "error <#{error.exception.message}>"
+        out.puts "#{error.message}\n\n" if error.message.any?
       end
-      out.puts "\nFailures:" if failures.any?
+      out.puts "\n--Failures--" if failures.any?
       failures.each do |failure|
-        out.puts " #{failure.file}:#{failure.line}:in `expect'"
-        out.puts " line <#{failure.line}>"
-        out.puts " #{failure.message}"
+        out.puts " #{failure.file}:#{failure.line}:in `expect'" if ENV["TM_MODE"]
+        out.puts "file <#{failure.file}>"
+        out.puts "line <#{failure.line}>"
+        out.puts "#{failure.message}\n\n"
       end
     end
   end

data/rakefile.rb

@@ -41,7 +41,7 @@ specification = Gem::Specification.new do |s|
   expect NoMethodError do 
     Object.invalid_method_call 
   end."
-	s.version = "0.0.3"
+	s.version = "0.0.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/expectation_test.rb

@@ -10,7 +10,7 @@ Expectations do
   end
   
   expect true do
-    Expectations::Expectation.new(1) { raise }.execute.is_a?(Expectations::Results::Error)
+    Expectations::Expectation.new(1) { raise }.execute.is_a?(Expectations::Results::StateBasedError)
   end
   
   expect NoMethodError do

data/test/expectations/results_test.rb

@@ -15,7 +15,7 @@ Expectations do
   end
 
   expect "E" do
-    Object.new.extend(Expectations::Results::Error).char
+    Object.new.extend(Expectations::Results::BehaviorBasedError).char
   end
 
   expect true do
@@ -31,7 +31,7 @@ Expectations do
   end
 
   expect false do
-    Object.new.extend(Expectations::Results::Error).fulfilled?
+    Object.new.extend(Expectations::Results::BehaviorBasedError).fulfilled?
   end
 
 end

data/test/sample_expectations_test.rb

@@ -23,4 +23,16 @@ Expectations do
     Object.deal(1)
   end
   
+  # expect Object.to_receive(:deal).with(1) do
+  #   Object.deals(1)
+  # end
+  # 
+  # expect Object.to_receive(:deal).with(1) do
+  #   Object.deal(2)
+  # end
+  # 
+  # expect Object.to_receive(:deal).with(1) do
+  #   Object.deal(1)
+  # end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: expectations
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jay Fields