synthesis 0.1.2 → 0.1.3

data/Rakefile

@@ -58,7 +58,7 @@ end
 
 gem_spec = Gem::Specification.new do |s|
   s.name = 'synthesis'
-  s.version = '0.1.2'
+  s.version = '0.1.3'
   s.platform = Gem::Platform::RUBY
   s.rubyforge_project = "synthesis"
   s.summary, s.description = 'A tool for Synthesized Testing'

data/lib/synthesis/expectation.rb

@@ -40,10 +40,6 @@ module Synthesis
         eql?(other)
       end
       
-      def <=>(other)
-        @return_values.size <=> other.return_values.size
-      end
-      
       def invoked?
         @invoked
       end

data/lib/synthesis/expectation_record.rb

@@ -31,14 +31,23 @@ module Synthesis
       def [](matcher)
         # Using a hash for faster look up of expectations 
         # when recording invocations
-        expectations_hash[matcher] || Expectation::NilExpectation.new
+        expectations_with_return_values[matcher] ||
+        expectations_without_return_values[matcher] ||
+        Expectation::NilExpectation.new
       end
 
       def record_invocations
         expectations.map! { |e| e.explode }
         expectations.flatten!
         expectations.uniq!
-        expectations.each { |e| e.record_invocations }
+        expectations.each do |e|
+          e.record_invocations
+          if e.return_values_defined?
+            expectations_with_return_values[e] = e 
+          else
+            expectations_without_return_values[e] = e
+          end
+        end
       end
 
       def tested_expectations
@@ -64,11 +73,12 @@ module Synthesis
       end
 
       private
-      def expectations_hash
-        @expectations_hash ||= expectations.sort.inject({}) do |hash, expectation|
-          hash[expectation] = expectation
-          hash
-        end
+      def expectations_with_return_values
+        @expectations_with_return_values ||= {}
+      end
+
+      def expectations_without_return_values
+        @expectations_without_return_values ||= {}
       end
 
       def ignore?(obj)
@@ -79,7 +89,9 @@ module Synthesis
       end
 
       def reset!
-        @expectations_hash, @expectations, @ignored = nil
+        @expectations_with_return_values = nil
+        @expectations_without_return_values = nil
+        @expectations, @ignored = nil
       end
     end
   end

data/test/synthesis/adapter/rspec/message_expectation_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + "/helper"
 class MessageExpectationTest < Test::Unit::TestCase
   def setup
     error_generator = Class.new {def opts=(param)end}.new
-    @spec_expectation = Spec::Mocks::MessageExpectation.new error_generator, :n, :n, :n, :n
+    @spec_expectation = Spec::Mocks::MessageExpectation.new(error_generator, :n, :n, :n, :n)
   end
   
   def test_holds_synthesis_expectation
@@ -12,7 +12,7 @@ class MessageExpectationTest < Test::Unit::TestCase
   end
   
   def test_with_passes_expected_params_to_synthesis_expectation
-    @spec_expectation.synthesis_expectation = Synthesis::Expectation.new Hash, :foo, :track
+    @spec_expectation.synthesis_expectation = Synthesis::Expectation.new(Hash, :foo, :track)
     @spec_expectation.with 1, 2
     assert_equal([1, 2], @spec_expectation.synthesis_expectation.args)
   end

data/test/synthesis/expectation_record_test.rb

@@ -7,7 +7,7 @@ module Synthesis
     end
 
     def test_adds_expectation
-      ExpectationRecord.add_expectation Object.new, :to_s, :track
+      ExpectationRecord.add_expectation(Object.new, :to_s, :track)
       assert_equal(1, ExpectationRecord.expectations.size)
     end
 
@@ -21,16 +21,18 @@ module Synthesis
     end
 
     def test_finds_expectation
-      expected = ExpectationRecord.add_expectation(Object.new, :foo, :track)
+      c = Class.new { def foo; end }
+      expected = ExpectationRecord.add_expectation(c.new, :foo, :track)
       expected.add_return_values(20)
-      matcher = Expectation.new(Object.new, :foo, :track, [], [20])
+      ExpectationRecord.record_invocations
+      matcher = Expectation.new(c.new, :foo, :track, [], [20])
       actual = ExpectationRecord[matcher]
       assert_equal(expected, actual)
     end
 
     def test_returns_nil_expectation_on_no_expectation_found
-      ExpectationRecord.add_expectation Object.new, :foo, :track
-      matcher = Expectation.new Object.new, :bar, :track
+      ExpectationRecord.add_expectation(Object.new, :foo, :track)
+      matcher = Expectation.new(Object.new, :bar, :track)
       actual_instance = ExpectationRecord[matcher]
       assert_kind_of(Expectation::NilExpectation, actual_instance)
     end
@@ -61,15 +63,17 @@ module Synthesis
     end
     
     def test_uniqs_expectations_before_recording_invocations
-      ExpectationRecord.add_expectation(Hash, :foo, :track)
-      ExpectationRecord.add_expectation(Hash, :foo, :track)
+      c = Class.new { def foo; end }
+      ExpectationRecord.add_expectation(c, :foo, :track)
+      ExpectationRecord.add_expectation(c, :foo, :track)
       assert_equal(2, ExpectationRecord.expectations.size)
       ExpectationRecord.record_invocations
       assert_equal(1, ExpectationRecord.expectations.size)
     end
     
     def test_flattens_expectations_before_recording_invocations
-      expectation = ExpectationRecord.add_expectation(Hash, :foo, :track)
+      c = Class.new { def foo; end }
+      expectation = ExpectationRecord.add_expectation(c, :foo, :track)
       expectation.add_return_values(1, "str", "sym")
       ExpectationRecord.record_invocations
       ExpectationRecord.expectations.each { |val| assert(!val.is_a?(Array)) }

data/test/synthesis/expectation_test.rb

@@ -108,13 +108,5 @@ module Synthesis
       expectation.add_return_values("rock")
       assert_equal(expectation, expectation.explode)
     end
-    
-    def test_expectation_sorting
-      light = Expectation.new(Object.new, :bar, :track, [])
-      heavy = Expectation.new(Object.new, :foo, :track, [], [:retval])
-      sorted = [light, heavy].sort.reverse
-      assert_equal(heavy, sorted[0])
-      assert_equal(light, sorted[1])
-    end
   end
 end

data/test/synthesis/method_invocation_watcher_test.rb

@@ -7,8 +7,10 @@ module Synthesis
     end
 
     def test_marks_expectation_invoked
-      ExpectationRecord.add_expectation(Hash, :to_s, :track, []).add_return_values(1)
-      MethodInvocationWatcher.invoked(Hash, :to_s, [], [1])
+      c = Class.new { def foo; end }
+      ExpectationRecord.add_expectation(c, :to_s, :track, []).add_return_values(1)
+      ExpectationRecord.record_invocations
+      MethodInvocationWatcher.invoked(c, :to_s, [], [1])
       expectation = ExpectationRecord.expectations.to_a.first
       assert(expectation.invoked?)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: synthesis
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Stuart Caborn, George Malamidis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-04 00:00:00 +01:00
+date: 2008-06-05 00:00:00 +01:00
 default_executable: 
 dependencies: []