synthesis 0.0.9 → 0.0.10

data/README

@@ -67,6 +67,10 @@ To use with Expectations, redirecting output to a file
 
 Reporting the location (filename and line number) of tested/untested expectations doesn't work as intended with the Expectations adapter.
 
+== Contributors
+
+Danilo Sato, Paul Nasrat
+
 == Related reading
 
 * Synthesized Testing: A Primer ( http://nutrun.com/weblog/synthesized-testing-a-primer )

data/Rakefile

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

data/lib/synthesis/expectation_record.rb

@@ -2,7 +2,7 @@ module Synthesis
   class ExpectationRecord
     class << self
       include Logging
-      
+
       def add_expectation(receiver, method, track, args = [])
         unless ignore? receiver
           expectation = Expectation.new(receiver, method, track, args)
@@ -10,56 +10,71 @@ module Synthesis
           expectation
         end
       end
-      
+
       def ignore(*args)
         ignored.merge args
       end
-      
+
       def expectations
+        # Using an Array instead of a Set because the +Expectation+ instance is not complete when first added
+        # obj.expects(:method).with(:args)
+        # the +Expectation+ will be added when obj.expects(:method) is called
+        # the +Expectation+ arguments will be added when .with(:args) is called
         @expectations ||= []
         @expectations.uniq!
         @expectations
       end
-      
+
       def ignored
         @ignored ||= Set.new
       end
-      
+
       def [](matcher)
-        expectations.detect { |e| e == matcher } || Expectation::NilExpectation.new
+        # Using a hash when recording invocations for improving performance
+        expectations_hash[matcher] || Expectation::NilExpectation.new
       end
-      
+
       def record_invocations
         expectations.each { |e| e.record_invocations }
       end
-      
+
       def tested_expectations
         expectations.select { |e| e.invoked? }
       end
-      
+
       def untested_expectations
         expectations.select { |e| !e.invoked? }
-      end      
-      
+      end
+
       def print_tested_expectations
         log; log "Tested Expectations: "
         tested_expectations.each { |e| log e }
       end
-      
+
       def print_untested_expectations
         log; log "Untested Expectations: "
         untested_expectations.each { |e| log e }
       end
-      
+
       def print_ignored
-        log; log "Ignoring: #{ignored.to_a * ', '}" 
+        log; log "Ignoring: #{ignored.to_a * ', '}"
       end
-      
+
       private
-      
+      def expectations_hash
+        @expectations_hash ||= expectations.inject({}) do |hash, expectation|
+          hash[expectation] = expectation
+          hash
+        end
+      end
+
       def ignore?(obj)
         ignored.include?(obj.class) || ignored.include?(obj) || obj.is_a?(MOCK_OBJECT)
-      end  
+      end
+
+      def reset!
+        @expectations_hash, @expectations, @ignored = nil
+      end
     end
   end
 end

data/test/synthesis/adapter/mocha/expectation_record_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + "/helper"
 module Synthesis
   class ExpectationRecordTest < Test::Unit::TestCase
     def teardown
-      ExpectationRecord.expectations.clear
+      ExpectationRecord.send(:reset!)
     end
 
     def test_does_not_add_any_instance_expectation

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

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + "/helper"
 module Synthesis
   class ExpectationRecordTest < Test::Unit::TestCase
     def teardown
-      ExpectationRecord.expectations.clear
+      ExpectationRecord.send(:reset!)
     end
 
     def test_does_not_add_any_instance_expectation

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

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + "/helper"
 module Synthesis
   class MethodsTest < Test::Unit::TestCase
     def teardown
-      ExpectationRecord.expectations.clear
+      ExpectationRecord.send(:reset!)
     end
     
     def test_records_singleton_method_expectation

data/test/synthesis/expectation_record_test.rb

@@ -3,8 +3,7 @@ require File.dirname(__FILE__) + "/helper"
 module Synthesis
   class ExpectationRecordTest < Test::Unit::TestCase
     def teardown
-      ExpectationRecord.expectations.clear
-      ExpectationRecord.ignored.clear
+      ExpectationRecord.send(:reset!)
     end
 
     def test_adds_expectation

data/test/synthesis/method_invocation_watcher_test.rb

@@ -2,6 +2,10 @@ require File.dirname(__FILE__) + "/helper"
 
 module Synthesis
   class MethodInvocationWatcherTest < Test::Unit::TestCase
+    def teardown
+      ExpectationRecord.send(:reset!)
+    end
+
     def test_marks_expectation_invoked
       ExpectationRecord.add_expectation(Hash, :to_s, :track, []).add_return_values(1)
       MethodInvocationWatcher.invoked(Hash, :to_s, [], [1])

metadata

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