expectations 0.1.4 → 0.1.5

data/README

@@ -114,6 +114,23 @@ expectations can be used for state based and behavior based testing.
 	    String
 	  end
 	  
+	  expect xml("<a><foo>bar</foo></a>") do
+	    "<a>\n\t<foo>bar</foo>  \n</a>"
+	  end
+	  
+	  expect xml(<<-eos) do
+	    <one>
+	      <two>
+	        <three>4</three>
+	        <five> 6 </five>
+	      </two>
+	    </one>
+	    eos
+	    "<one><two><three>4</three>
+	      <five> 6 </five>
+	    </two></one>"    
+	  end
+	  
 	end
 
 == Contributors

data/lib/expectations/behavior_based_expectation.rb

@@ -6,7 +6,7 @@ module Expectations::BehaviorBasedExpectation
       expected.verify
       self.extend(Expectations::Results::Fulfilled)
     rescue Mocha::ExpectationError => ex
-      self.extend(Expectations::Results::BehaviorFailure)
+      self.extend(Expectations::Results::BehaviorBasedFailure)
       self.message = ex.message
     rescue Exception => ex
       self.extend(Expectations::Results::Error)

data/lib/expectations/results.rb

@@ -8,7 +8,7 @@ module Expectations::Results
   end
   
   def failure?
-    self.is_a?(Expectations::Results::StateBasedFailure) || self.is_a?(Expectations::Results::BehaviorFailure)
+    self.is_a?(Expectations::Results::StateBasedFailure) || self.is_a?(Expectations::Results::BehaviorBasedFailure)
   end
   
   def error?
@@ -41,7 +41,7 @@ module Expectations::Results
 end
 
 module Expectations::Results
-  module BehaviorFailure
+  module BehaviorBasedFailure
     attr_accessor :message
     include Expectations::Results
     char "F"

data/lib/expectations/suite.rb

@@ -4,34 +4,37 @@ class Expectations::Suite
     Expectations::MockRecorder.new(Mocha::Mock.new)
   end
   
+  def xml(string)
+    Expectations::XmlString.new(string)
+  end
+  
   def execute(out=STDOUT)
-    return true if @do_not_run
     suite_result = Expectations::SuiteResults.new(out)
-    benchmark = Benchmark.measure { ENV["LINE"].nil? ? run_all(suite_result) : run_one(suite_result) }
+    return suite_result if @do_not_run
+    benchmark = Benchmark.measure do
+      expectations_for(ENV["LINE"]).each { |expectation| suite_result << expectation.execute }
+    end
     suite_result.print_results(benchmark)
     suite_result.write_junit_xml(ENV["JUnitXmlPath"]) unless ENV["JUnitXmlPath"].nil?
-    yield suite_result if block_given?
-    suite_result.succeeded?
+    suite_result
   end
   
-  def run_all(suite_result)
-    expectations.each { |expectation| suite_result << expectation.execute }
+  def expect(expected, &block)
+    expectations << Expectations::Expectation.new(expected, &block)
+  end
+  
+  def do_not_run
+    @do_not_run = true
   end
   
-  def run_one(suite_result)
-    one = expectations.inject { |result, expectation| expectation.line > ENV["LINE"].to_i ? result : expectation }
-    suite_result << one.execute
+  def expectations_for(line)
+    return expectations if line.nil?
+    [expectations.inject { |result, expectation| expectation.line > line.to_i ? result : expectation }]
   end
 
+  private
   def expectations
     @expectations ||= []
   end
   
-  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_runner.rb

@@ -5,9 +5,7 @@ class Expectations::SuiteRunner
   def initialize
     self.suite = Expectations::Suite.new
     at_exit do
-      suite.execute do |result|
-        exit 1 unless result.succeeded?
-      end
+      exit 1 unless suite.execute.succeeded?
     end
   end
   

data/lib/expectations/xml_string.rb

@@ -0,0 +1,10 @@
+class Expectations::XmlString < String
+  
+  def expectations_equal_to(other)
+    self.strip.gsub(/>[\s]*</, "><") == other.strip.gsub(/>[\s]*</, "><")
+  end
+  
+  def inspect
+    "[as xml] #{self.strip.gsub(/>[\s]*</, "><")}"
+  end
+end

data/lib/expectations.rb

@@ -16,11 +16,11 @@ require 'benchmark'
 require 'erb'
 require 'fileutils'
 require File.expand_path(File.dirname(__FILE__) + '/expectations/object')
+require File.expand_path(File.dirname(__FILE__) + '/expectations/xml_string')
 require File.expand_path(File.dirname(__FILE__) + '/expectations/regexp')
 require File.expand_path(File.dirname(__FILE__) + '/expectations/range')
 require File.expand_path(File.dirname(__FILE__) + '/expectations/module')
 require File.expand_path(File.dirname(__FILE__) + '/expectations/string')
-require File.expand_path(File.dirname(__FILE__) + '/expectations/mocha')
 require File.expand_path(File.dirname(__FILE__) + '/expectations/suite')
 require File.expand_path(File.dirname(__FILE__) + '/expectations/suite_runner')
 require File.expand_path(File.dirname(__FILE__) + '/expectations/suite_results')

data/rakefile.rb

@@ -46,7 +46,7 @@ specification = Gem::Specification.new do |s|
   expect NoMethodError do 
     Object.invalid_method_call 
   end."
-	s.version = "0.1.4"
+	s.version = "0.1.5"
 	s.author = 'Jay Fields'
   s.description = "A lightweight unit testing framework. Tests (expectations) will be written as follows 
   expect 2 do 
@@ -65,7 +65,6 @@ specification = Gem::Specification.new do |s|
                          
   s.email = 'ruby@jayfields.com'
   s.files = FileList['{lib,test}/**/*.rb', '[A-Z]*$', 'rakefile.rb'].to_a
-	s.test_file = "test/all_tests.rb"
 end
 
 Rake::GemPackageTask.new(specification) do |package|

data/test/expectations/module_test.rb

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

data/test/expectations/object_test.rb

@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + "/../test_helper"
+
+Expectations do
+  expect true do
+    object = Object.new
+    object.expectations_equal_to object
+  end
+
+  expect false do
+    Object.new.expectations_equal_to Object.new
+  end
+end

data/test/expectations/results_test.rb

@@ -11,7 +11,7 @@ Expectations do
   end
 
   expect "F" do
-    Object.new.extend(Expectations::Results::BehaviorFailure).char
+    Object.new.extend(Expectations::Results::BehaviorBasedFailure).char
   end
 
   expect "E" do
@@ -27,11 +27,43 @@ Expectations do
   end
 
   expect false do
-    Object.new.extend(Expectations::Results::BehaviorFailure).fulfilled?
+    Object.new.extend(Expectations::Results::BehaviorBasedFailure).fulfilled?
   end
 
   expect false do
     Object.new.extend(Expectations::Results::Error).fulfilled?
   end
 
+  expect false do
+    Object.new.extend(Expectations::Results::Fulfilled).error?
+  end
+
+  expect false do
+    Object.new.extend(Expectations::Results::StateBasedFailure).error?
+  end
+
+  expect false do
+    Object.new.extend(Expectations::Results::BehaviorBasedFailure).error?
+  end
+
+  expect true do
+    Object.new.extend(Expectations::Results::Error).error?
+  end
+
+  expect false do
+    Object.new.extend(Expectations::Results::Fulfilled).failure?
+  end
+
+  expect true do
+    Object.new.extend(Expectations::Results::StateBasedFailure).failure?
+  end
+
+  expect true do
+    Object.new.extend(Expectations::Results::BehaviorBasedFailure).failure?
+  end
+
+  expect false do
+    Object.new.extend(Expectations::Results::Error).failure?
+  end
+
 end

data/test/expectations/suite_results_test.rb

@@ -22,7 +22,7 @@ Expectations do
 
   expect false do
     results = Expectations::SuiteResults.new(Silent)
-    results << Object.new.extend(Expectations::Results::BehaviorFailure)
+    results << Object.new.extend(Expectations::Results::BehaviorBasedFailure)
     results << Object.new.extend(Expectations::Results::Fulfilled)
     results.succeeded?
   end

data/test/expectations/suite_test.rb

@@ -1,37 +1,53 @@
 require File.dirname(__FILE__) + "/../test_helper"
 
 Expectations do
-  expect 1 do
-    suite = Expectations::Suite.new
-    suite.expect(1) { 1 }
-    suite.expectations.size
-  end
 
   expect true do
     suite = Expectations::Suite.new
-    suite.execute(Silent)
+    suite.execute(Silent).succeeded?
   end
   
   expect true do
     suite = Expectations::Suite.new
     suite.expect(1) { 2 }
     suite.do_not_run
-    suite.execute(Silent)
+    suite.execute(Silent).succeeded?
   end
   
   expect false do
     suite = Expectations::Suite.new
     suite.expect(1) { 2 }
-    suite.execute(Silent)
+    suite.execute(Silent).succeeded?
   end
   
-  expect true do
+  expect Expectations::MockRecorder do
+    Expectations::Suite.new.mock
+  end
+  
+  expect Mocha::Mock do
+    Expectations::Suite.new.mock.target
+  end
+  
+  expect 3 do
     suite = Expectations::Suite.new
-    result=nil
-    suite.execute(Silent) do |yielded_value|
-      result = yielded_value.succeeded?
-    end
-    result
+    suite.expect(1) { 2 }
+    suite.expect(1) { 2 }
+    suite.expect(1) { 2 }
+    suite.expectations_for(nil).size
   end
-
+  
+  expect 1 do
+    suite = Expectations::Suite.new
+    suite.expect(1) { 2 }
+    suite.expect(1) { 2 }
+    suite.expectations_for(__LINE__ - 1).size
+  end
+  
+  expect :expected do
+    suite = Expectations::Suite.new
+    suite.expect(1) { 2 }
+    suite.expect(:expected) { 2 }
+    suite.expectations_for(__LINE__ - 1).first.expected
+  end
+  
 end

data/test/expectations/xml_string_test.rb

@@ -0,0 +1,44 @@
+require File.dirname(__FILE__) + "/../test_helper"
+
+Expectations do
+  expect true do
+    Expectations::XmlString.new("<foo>bar</foo>").expectations_equal_to "<foo>bar</foo>"
+  end
+
+  expect true do
+    Expectations::XmlString.new("<foo>bar</foo>").expectations_equal_to "  <foo>bar</foo>  "
+  end
+
+  expect true do
+    Expectations::XmlString.new("  <foo>bar</foo>  ").expectations_equal_to "<foo>bar</foo>"
+  end
+
+  expect true do
+    Expectations::XmlString.new("<foo>bar</foo>").expectations_equal_to "<foo>bar</foo>\n"
+  end
+
+  expect true do
+    Expectations::XmlString.new("\n<foo>bar</foo>").expectations_equal_to "<foo>bar</foo>"
+  end
+
+  expect true do
+    Expectations::XmlString.new("\t<foo>bar</foo>").expectations_equal_to "<foo>bar</foo>"
+  end
+
+  expect true do
+    Expectations::XmlString.new("<foo>bar</foo>").expectations_equal_to "<foo>bar</foo>\t"
+  end
+
+  expect true do
+    Expectations::XmlString.new("<a>\n<foo>bar</foo>").expectations_equal_to "<a><foo>bar</foo>"
+  end
+
+  expect true do
+    Expectations::XmlString.new("<a>\n<foo>\t \n bar</foo>").expectations_equal_to "<a><foo>\t \n bar</foo>"
+  end
+
+  expect true do
+    Expectations::XmlString.new("<a>\n<foo>\t \n bar</foo>\n \t </a>").expectations_equal_to "<a><foo>\t \n bar</foo></a>"
+  end
+
+end

data/test/failures_test.rb

@@ -4,47 +4,41 @@ Expectations do
   expect Expectations::Results::StateBasedFailure do
     suite = Expectations::Suite.new
     suite.expect(2) { 3 }
-    suite.execute(Silent)
-    suite.expectations.first
+    suite.execute(Silent).expectations.first
   end
   
   expect Expectations::Results::Error do
     suite = Expectations::Suite.new
     suite.expect(ArgumentError) { Object.no_method }
-    suite.execute(Silent)
-    suite.expectations.first
+    suite.execute(Silent).expectations.first
   end
 
-  expect Expectations::Results::BehaviorFailure do
+  expect Expectations::Results::BehaviorBasedFailure 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
+    suite.execute(Silent).expectations.first
   end
 
-  expect Expectations::Results::BehaviorFailure do
+  expect Expectations::Results::BehaviorBasedFailure 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
+    suite.execute(Silent).expectations.first
   end
 
-  expect Expectations::Results::BehaviorFailure do
+  expect Expectations::Results::BehaviorBasedFailure do
     suite = Expectations::Suite.new
     suite.expect(Object.to_receive(:deal)) {  }
-    suite.execute(Silent)
-    suite.expectations.first
+    suite.execute(Silent).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
+    suite.execute(Silent).expectations.first
   end
 
   expect Expectations::Results::Error do
@@ -53,8 +47,7 @@ Expectations do
       Object.expects(:bar).returns 2
       Object.barter
     end
-    suite.execute(Silent)
-    suite.expectations.first
+    suite.execute(Silent).expectations.first
   end
 
   expect Expectations::Results::Error do
@@ -63,8 +56,7 @@ Expectations 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
+    suite.execute(Silent).expectations.first
   end
 
 end

data/test/{sample_expectations_test.rb → successes_test.rb}

@@ -70,4 +70,21 @@ Expectations do
     String
   end
   
+  expect xml("<a><foo>bar</foo></a>") do
+    "<a>\n\t<foo>bar</foo>  \n</a>"
+  end
+  
+  expect xml(<<-eos) do
+    <one>
+      <two>
+        <three>4</three>
+        <five> 6 </five>
+      </two>
+    </one>
+    eos
+    "<one><two><three>4</three>
+      <five> 6 </five>
+    </two></one>"    
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: expectations
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Jay Fields
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-21 00:00:00 -08:00
+date: 2008-01-23 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -24,7 +24,6 @@ extra_rdoc_files:
 files: 
 - lib/expectations/behavior_based_expectation.rb
 - lib/expectations/expectation.rb
-- lib/expectations/mocha.rb
 - lib/expectations/mock_recorder.rb
 - lib/expectations/module.rb
 - lib/expectations/object.rb
@@ -36,10 +35,12 @@ files:
 - lib/expectations/suite.rb
 - lib/expectations/suite_results.rb
 - lib/expectations/suite_runner.rb
+- lib/expectations/xml_string.rb
 - lib/expectations.rb
-- test/all_tests.rb
 - test/expectations/expectation_test.rb
 - test/expectations/expectations_test.rb
+- test/expectations/module_test.rb
+- test/expectations/object_test.rb
 - test/expectations/range_test.rb
 - test/expectations/regexp_test.rb
 - test/expectations/results_test.rb
@@ -47,9 +48,10 @@ files:
 - test/expectations/suite_results_test.rb
 - test/expectations/suite_runner_test.rb
 - test/expectations/suite_test.rb
+- test/expectations/xml_string_test.rb
 - test/failures_test.rb
-- test/sample_expectations_test.rb
 - test/silent.rb
+- test/successes_test.rb
 - test/test_helper.rb
 - rakefile.rb
 - README
@@ -83,5 +85,5 @@ rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
 summary: A lightweight unit testing framework. Tests (expectations) will be written as follows  expect 2 do  1 + 1  end   expect NoMethodError do  Object.invalid_method_call  end.
-test_files: 
-- test/all_tests.rb
+test_files: []
+

data/lib/expectations/mocha.rb

@@ -1,9 +0,0 @@
-# module Mocha
-#   class Mock
-#     attr_reader :expectations
-#     alias to_receive expects
-#   end
-#   class ExpectationList
-#     attr_reader :expectations
-#   end
-# end

data/test/all_tests.rb

@@ -1 +0,0 @@
-Dir['**/*_test.rb'].each { |test_case| require test_case }