synthesis 0.0.10 → 0.0.11

data/Rakefile

@@ -91,15 +91,15 @@ end
 
 gem_spec = Gem::Specification.new do |s|
   s.name = 'synthesis'
-  s.version = '0.0.10'
+  s.version = '0.0.11'
   s.platform = Gem::Platform::RUBY
   s.rubyforge_project = "synthesis"
   s.summary, s.description = 'A tool for Synthesized Testing'
-  s.author = 'Stuart Caborn, George Malamidis'
+  s.authors = 'Stuart Caborn, George Malamidis'
   s.email = 'george@nutrun.com'
   s.homepage = 'http://synthesis.rubyforge.org'
   s.has_rdoc = true
-  s.rdoc_options += ['--quiet', '--title', 'Queueue', '--main', 'README', '--inline-source']
+  s.rdoc_options += ['--quiet', '--title', 'Synthesis', '--main', 'README', '--inline-source']
   s.extra_rdoc_files = ['README', 'COPYING']
   excluded = FileList['etc/*']
   # s.test_files = FileList['test/**/*_test.rb']

data/lib/synthesis/adapter/rspec.rb

@@ -10,6 +10,7 @@ module Synthesis
       rspec_options.files.clear
       fail_unless do
         rspec_options.instance_variable_set(:@formatters, nil)
+        # rspec_options.instance_variable_set(:@format_options, [["profile", STDOUT]])
         rspec_options.run_examples
       end
     end

data/lib/synthesis/expectation.rb

@@ -19,6 +19,18 @@ module Synthesis
         meta_receiver.recordable_method(@method)
       end
       
+      def explode
+        if @return_values.size > 1
+          @return_values.map do |v|
+            expectation = self.class.new(@receiver, @method, @track, @args, [])
+            expectation.add_return_values(v)
+            expectation
+          end
+        else
+          self
+        end
+      end
+      
       def eql?(other)
         ExpectationMatcher.new(self, other).match?
       end

data/lib/synthesis/expectation_record.rb

@@ -4,7 +4,7 @@ module Synthesis
       include Logging
 
       def add_expectation(receiver, method, track, args = [])
-        unless ignore? receiver
+        unless ignore?(receiver)
           expectation = Expectation.new(receiver, method, track, args)
           expectations << expectation
           expectation
@@ -12,16 +12,16 @@ module Synthesis
       end
 
       def ignore(*args)
-        ignored.merge args
+        ignored.merge(args)
       end
 
       def expectations
-        # Using an Array instead of a Set because the +Expectation+ instance is not complete when first added
+        # Using an Array instead of a Set because the +Expectation+ instance 
+        # is not complete when first added. A Set would result to possible duplicates.
         # 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
 
@@ -30,11 +30,15 @@ module Synthesis
       end
 
       def [](matcher)
-        # Using a hash when recording invocations for improving performance
+        # Using a hash when for faster look up of expectations 
+        # when recording invocations
         expectations_hash[matcher] || Expectation::NilExpectation.new
       end
 
       def record_invocations
+        expectations.map! { |e| e.explode }
+        expectations.flatten!
+        expectations.uniq!
         expectations.each { |e| e.record_invocations }
       end
 

data/test/synthesis/expectation_record_test.rb

@@ -47,5 +47,20 @@ module Synthesis
       actual.add_return_values(:return_val)
       assert_equal(expected, actual)
     end
+    
+    def test_uniqs_expectations_before_recording_invocations
+      ExpectationRecord.add_expectation(Hash, :foo, :track)
+      ExpectationRecord.add_expectation(Hash, :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)
+      expectation.add_return_values(1, "str", "sym")
+      ExpectationRecord.record_invocations
+      ExpectationRecord.expectations.each { |val| assert(!val.is_a?(Array)) }
+    end
   end
 end

data/test/synthesis/expectation_test.rb

@@ -74,5 +74,21 @@ module Synthesis
       expectation = Expectation.new(String.new, :new, :track, [], [:sym])
       assert(!expectation.return_values_defined?)
     end
+    
+    def test_explodes_to_new_expectations_for_each_return_value
+      expectation = Expectation.new(String, :new, :track, [])
+      expectation.add_return_values(:sym, "str")
+      expected = [
+        Expectation.new(String, :new, :track, [], [:sym]),
+        Expectation.new(String, :new, :track, [], ["str"])
+      ]
+      assert_equal(expected, expectation.explode)
+    end
+    
+    def test_returns_self_when_only_one_return_type_on_explode
+      expectation = Expectation.new(String, :new, :track, [])
+      expectation.add_return_values("rock")
+      assert_equal(expectation, expectation.explode)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: synthesis
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - Stuart Caborn, George Malamidis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-30 00:00:00 +01:00
+date: 2008-05-14 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -78,7 +78,7 @@ post_install_message:
 rdoc_options: 
 - --quiet
 - --title
-- Queueue
+- Synthesis
 - --main
 - README
 - --inline-source