synthesis 0.0.15 → 0.1.0

data/README

@@ -82,6 +82,10 @@ Or, in the case of RSpec, it is equivalent to:
 
 Either <tt>"mocha_standalone"</tt> or <tt>"spec/mocks"</tt> need to be required before using <tt>mock_instance</tt>.
 
+== Git
+
+Public clone URL: git://github.com/gmalamid/synthesis.git
+
 == Known Issues
 
 Reporting the location (filename and line number) of tested/untested expectations doesn't work as intended with the Expectations adapter.

data/Rakefile

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

data/lib/synthesis/adapter/expectations.rb

@@ -17,6 +17,7 @@ module Synthesis
       Mocha::Expectation.extend(ExpectationInterceptor)
       Mocha::Expectation.record_expected_argument_types_on(:with)
       Mocha::Expectation.record_expected_return_values_on(:returns)
+      Mocha::Expectation.record_expected_return_values_on(:raises)
     end
     
     def stop_collecting_expectations

data/lib/synthesis/adapter/mocha.rb

@@ -18,6 +18,7 @@ module Synthesis
       Mocha::Expectation.extend(ExpectationInterceptor)
       Mocha::Expectation.record_expected_argument_types_on(:with)
       Mocha::Expectation.record_expected_return_values_on(:returns)
+      Mocha::Expectation.record_expected_return_values_on(:raises)
     end
     
     def stop_collecting_expectations

data/lib/synthesis/adapter/rspec.rb

@@ -22,6 +22,7 @@ module Synthesis
       Spec::Mocks::MessageExpectation.extend(ExpectationInterceptor)
       Spec::Mocks::MessageExpectation.record_expected_argument_types_on(:with)
       Spec::Mocks::MessageExpectation.record_expected_return_values_on(:and_return)
+      Spec::Mocks::MessageExpectation.record_expected_return_values_on(:and_raise)
     end
     
     def stop_collecting_expectations

data/lib/synthesis/expectation.rb

@@ -51,8 +51,8 @@ module Synthesis
         args.map { |arg| arg.class }
       end
       
-      def return_value_types
-        @return_values.map { |val| val.class }.uniq
+      def return_value_type
+        @return_values[0] ? @return_values[0].class : nil
       end
       
       def add_return_values(*vals)
@@ -79,7 +79,7 @@ module Synthesis
       end
       
       def to_s
-        "(#{return_value_types * ", "}) " +
+        "(#{return_value_type}) " +
         "#{@receiver.name}.#{@method}(#{@args.map { |arg| arg.class } * ', '})" + 
         "in #{@track}"
       end
@@ -99,8 +99,7 @@ module Synthesis
       end
       
       def to_s
-        "(#{return_value_types * ", "}) " +
-        "#{meta_receiver.name}.new.#{@method}" +
+        "(#{return_value_type}) #{meta_receiver.name}.new.#{@method}" +
         "(#{@args.map { |arg| arg.class } * ', '})" + 
         "in #{@track}"
       end

data/lib/synthesis/expectation_interceptor.rb

@@ -6,7 +6,7 @@ module Synthesis
     # Intercept the mock object framework's expectation method for declaring a mocked
     # method's arguments so that Synthesis can record them.
     def record_expected_argument_types_on(method_name)
-      @original_with = method_name
+      (@original_methods ||= []) << method_name
       
       class_eval do
         alias_method "intercepted_#{method_name}", method_name
@@ -26,7 +26,7 @@ module Synthesis
     # Intercept the mock object framework's expectation method for declaring a mocked
     # method's return values so that Synthesis can record them.
     def record_expected_return_values_on(method_name)
-      @original_returns = method_name
+      (@original_methods ||= []) << method_name
       
       class_eval do
         alias_method "intercepted_#{method_name}", method_name
@@ -43,12 +43,14 @@ module Synthesis
     # undefine their intercepted counterparts. Undefine the synthesis_expectation
     # accessors.
     def stop_intercepting!
-      with_method, returns_method = @original_with, @original_returns
+      @original_methods.each do |m|
+        class_eval do
+          alias_method m, "intercepted_#{m}"
+          remove_method "intercepted_#{m}"
+        end
+      end
+
       class_eval do
-        alias_method with_method, "intercepted_#{with_method}"
-        alias_method returns_method, "intercepted_#{returns_method}"
-        remove_method "intercepted_#{with_method}"
-        remove_method "intercepted_#{returns_method}"
         remove_method :synthesis_expectation
         remove_method :synthesis_expectation=
       end

data/lib/synthesis/expectation_matcher.rb

@@ -17,7 +17,7 @@ module Synthesis
     
     def return_values_match?
       return true unless @expectation_one.return_values_defined? || @expectation_two.return_values_defined?
-      @expectation_one.return_value_types == @expectation_two.return_value_types
+      @expectation_one.return_value_type == @expectation_two.return_value_type
     end
   end
 end

data/lib/synthesis/expectation_record.rb

@@ -72,7 +72,9 @@ module Synthesis
       end
 
       def ignore?(obj)
-        ignored.include?(obj.class) || (obj.is_a?(Class) && ignored.include?(obj)) || obj.is_a?(MOCK_OBJECT)
+        ignored.include?(obj.class) ||
+        (obj.is_a?(Class) && ignored.include?(obj)) ||
+        obj.is_a?(MOCK_OBJECT)
       end
 
       def reset!

data/lib/synthesis/recordable.rb

@@ -15,9 +15,14 @@ module Synthesis
         alias_method "__recordable__#{meth}".intern, meth
         class_eval <<-end_eval
           def #{meth}(*args, &block)
-            return_value = send("__recordable__#{meth}", *args, &block)
-            MethodInvocationWatcher.invoked(self, "#{meth}".intern, args, [return_value])
-            return_value
+            begin
+              return_value = send("__recordable__#{meth}", *args, &block)
+              MethodInvocationWatcher.invoked(self, "#{meth}".intern, args, [return_value])
+              return_value
+            rescue Exception => e
+              MethodInvocationWatcher.invoked(self, "#{meth}".intern, args, [e])
+              raise e
+            end
           end
         end_eval
       end
@@ -26,9 +31,14 @@ module Synthesis
     def magic_recordable_method(meth)
       class_eval <<-end_eval
         def #{meth}(*args)
-          return_value = method_missing(:#{meth}, *args)
-          MethodInvocationWatcher.invoked(self, "#{meth}".intern, args, [return_value])
-          return_value
+          begin
+            return_value = method_missing(:#{meth}, *args)
+            MethodInvocationWatcher.invoked(self, "#{meth}".intern, args, [return_value])
+            return_value
+          rescue Exception => e
+            MethodInvocationWatcher.invoked(self, "#{meth}".intern, args, [e])
+            raise e
+          end
         end
 
         def __recordable__#{meth}() raise "Don't ever call me" end

data/lib/synthesis/util/mock_instance/rspec.rb

@@ -15,23 +15,4 @@ module Spec::Mocks::Methods
 
     return instance
   end
-  
-  # Don't know if this sucks or not...
-  
-  # def stub_instance
-  #   class_eval do
-  #     alias original_initialize initialize
-  #     def initialize()end
-  #   end
-  #   
-  #   instance = new
-  #   stub!(:new).and_return(instance)
-  #   
-  #   class_eval do
-  #     alias initialize original_initialize
-  #     undef original_initialize
-  #   end
-  # 
-  #   return instance
-  # end
-end
+end

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

@@ -20,6 +20,7 @@ class MochaExpectationTest < Test::Unit::TestCase
   def test_passes_return_values_to_synthesis_expectation
     @mocha_expectation.synthesis_expectation = @synthesis_expectation
     @mocha_expectation.returns(:rock)
-    assert_equal([Fixnum, Symbol], @synthesis_expectation.return_value_types)
+    return_values = @synthesis_expectation.instance_variable_get(:@return_values)
+    assert_equal([1, :rock], return_values)
   end
 end

data/test/synthesis/class_test.rb

@@ -2,6 +2,6 @@ require File.dirname(__FILE__) + "/helper"
 
 class ClassTest < Test::Unit::TestCase
   def test_has_singleton_expectation
-    assert_instance_of Synthesis::Expectation::Singleton, Hash.expectation(:foo, :track)
+    assert_instance_of(Synthesis::Expectation::Singleton, Hash.expectation(:foo, :track))
   end
 end

data/test/synthesis/expectation_record_test.rb

@@ -32,19 +32,19 @@ module Synthesis
       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
+      assert_kind_of(Expectation::NilExpectation, actual_instance)
     end
 
     def test_does_not_add_expectation_for_ignored_class
       ExpectationRecord.ignore(Hash)
       ExpectationRecord.add_expectation(Hash, :foo, :track)
-      assert ExpectationRecord.expectations.empty?
+      assert(ExpectationRecord.expectations.empty?)
     end
     
     def test_does_not_add_expectation_for_ignored_object
       ExpectationRecord.ignore(Hash)
       ExpectationRecord.add_expectation(Hash.new, :foo, :track)
-      assert ExpectationRecord.expectations.empty?
+      assert(ExpectationRecord.expectations.empty?)
     end
     
     def test_returns_added_expectation_on_add

data/test/synthesis/expectation_test.rb

@@ -52,9 +52,9 @@ module Synthesis
       assert_equal([Symbol, String], expectation.arg_types)
     end
     
-    def test_return_value_types
-      expectation = Expectation.new(String.new, :new, :track, [], [:sym, "str"])
-      assert_equal([Symbol, String], expectation.return_value_types)
+    def test_return_value_type
+      expectation = Expectation.new(String.new, :new, :track, [], [:sym])
+      assert_equal(Symbol, expectation.return_value_type)
     end
     
     def test_adds_return_value
@@ -90,5 +90,10 @@ module Synthesis
       expectation.add_return_values("rock")
       assert_equal(expectation, expectation.explode)
     end
+    
+    def test_returns_nil_when_no_return_values_on_return_value_type
+      expectation = Expectation.new(String, :new, :track, [])
+      assert_nil(expectation.return_value_type)
+    end
   end
 end

data/test/synthesis/helper.rb

@@ -1,3 +1,3 @@
 %w(test/unit rubygems mocha).each { |l| require l }
 require File.dirname(__FILE__) + "/../../lib/synthesis"
-MOCK_OBJECT = Class.new {} # FIXME: should find a better way of doing this...
+MOCK_OBJECT = Class.new {}

data/test/synthesis/method_invocation_watcher_test.rb

@@ -10,7 +10,7 @@ module Synthesis
       ExpectationRecord.add_expectation(Hash, :to_s, :track, []).add_return_values(1)
       MethodInvocationWatcher.invoked(Hash, :to_s, [], [1])
       expectation = ExpectationRecord.expectations.to_a.first
-      assert expectation.invoked?
+      assert(expectation.invoked?)
     end
   end
 end

data/test/synthesis/module_test.rb

@@ -2,6 +2,6 @@ require File.dirname(__FILE__) + "/helper"
 
 class ModuleTest < Test::Unit::TestCase
   def test_has_singleton_expectation
-    assert_instance_of Synthesis::Expectation::Singleton, Module.new.expectation(:foo, :track)
+    assert_instance_of(Synthesis::Expectation::Singleton, Module.new.expectation(:foo, :track))
   end
 end

data/test/synthesis/object_test.rb

@@ -2,6 +2,6 @@ require File.dirname(__FILE__) + "/helper"
 
 class ObjectTest < Test::Unit::TestCase
   def test_has_instance_expectation
-    assert_instance_of Synthesis::Expectation::Instance, Object.new.expectation(:foo, :track)
+    assert_instance_of(Synthesis::Expectation::Instance, Object.new.expectation(:foo, :track))
   end
 end

data/test/synthesis/recordable_test.rb

@@ -4,14 +4,14 @@ module Synthesis
   class RecordableTest < Test::Unit::TestCase
     def test_redefines_method
       foo = Class.new { def a; end }
-      foo.extend Recordable
+      foo.extend(Recordable)
       foo.recordable_method(:a)
       assert_respond_to(foo.new, :__recordable__a)
     end
 
     def test_records_method_invocation
       foo = Class.new { def b; end }
-      foo.extend Recordable
+      foo.extend(Recordable)
       foo.recordable_method(:b)
       bar = foo.new
       MethodInvocationWatcher.expects(:invoked).with(bar, :b, [], [nil])
@@ -20,7 +20,7 @@ module Synthesis
     
     def test_does_not_redefine_already_redefined_method
       foo = Class.new { def b; end }
-      foo.extend Recordable
+      foo.extend(Recordable)
       foo.stubs(:method_defined?).returns(true)
       foo.expects(:alias_method).never
       foo.recordable_method(:b)
@@ -28,39 +28,89 @@ module Synthesis
     
     def test_defines_non_existent_method
       foo = Class.new
-      foo.extend Recordable
+      foo.extend(Recordable)
       foo.recordable_method(:bar)
       assert_respond_to(foo.new, :bar)
     end
     
     def test_defines_non_existent_method_recordable_placeholder_method
       foo = Class.new
-      foo.extend Recordable
+      foo.extend(Recordable)
       foo.recordable_method(:bar)
       assert_respond_to(foo.new, :__recordable__bar)
     end
     
     def test_non_existed_method_placeholder_raises
       foo = Class.new
-      foo.extend Recordable
+      foo.extend(Recordable)
       foo.recordable_method(:bar)
       assert_raise(RuntimeError) { foo.new.__recordable__bar }
     end
     
     def test_does_not_redefine_already_defined_magic_method
       foo = Class.new
-      foo.extend Recordable
+      foo.extend(Recordable)
       foo.recordable_method(:b)
       foo.expects(:alias_method).never
     end
     
     def test_records_magic_method_invocation
       foo = Class.new {def method_missing(meth, *args) :magic! end}
-      foo.extend Recordable
+      foo.extend(Recordable)
       foo.recordable_method(:b)
       bar = foo.new
       MethodInvocationWatcher.expects(:invoked).with(bar, :b, [], [:magic!])
       bar.b
     end
+    
+    def test_records_raised_exception
+      begin
+        foo = Class.new {def bar() raise end}
+        foo.extend(Recordable)
+        foo.recordable_method(:bar)
+        inst = foo.new
+        matcher = Expectation.new(inst, :bar, nil, [])
+        matcher.add_return_values(RuntimeError.new)
+        not_found = Expectation::NilExpectation.new
+        ExpectationRecord.expects(:[]).with(matcher).returns(not_found)
+        inst.bar
+      rescue => e
+        raise e unless e.is_a?(RuntimeError)
+      end
+    end
+    
+    def test_reraises_recorded_exception
+      assert_raise(RuntimeError) do
+        foo = Class.new {def bar() raise end}
+        foo.extend(Recordable)
+        foo.recordable_method(:bar)
+        foo.new.bar
+      end
+    end
+    
+    def test_records_raised_exception_for_magic_method
+      begin
+        foo = Class.new {def method_missing(m, *a) raise end}
+        foo.extend(Recordable)
+        foo.recordable_method(:bar)
+        inst = foo.new
+        matcher = Expectation.new(inst, :bar, nil, [])
+        matcher.add_return_values(RuntimeError.new)
+        not_found = Expectation::NilExpectation.new
+        ExpectationRecord.expects(:[]).with(matcher).returns(not_found)
+        inst.bar
+      rescue => e
+        raise e unless e.is_a?(RuntimeError)
+      end
+    end
+    
+    def test_reraises_recorded_exception_for_magic_method
+      assert_raise(RuntimeError) do
+        foo = Class.new {def method_missing(m, *a) raise end}
+        foo.extend(Recordable)
+        foo.recordable_method(:bar)
+        foo.new.bar
+      end
+    end
   end
 end

data/test_project/expectations/test/data_brander_test.rb

@@ -6,4 +6,13 @@ Expectations do
   expect Storage.new('whatever').to.receive(:save).with('METAL - rock') do |storage|
     DataBrander.new(storage).save_branded 'rock'
   end
+  
+  expect Storage.new("").to.receive(:ouch!).raises(Problem.new) do |storage|
+    begin
+      DataBrander.new(storage).dont_do_this
+    rescue Problem
+      return true
+    end
+    fail
+  end  
 end

data/test_project/expectations/test/storage_test.rb

@@ -11,4 +11,8 @@ Expectations do
       FileUtils.rm_f 'test.txt'
     end
   end
+  
+  expect Problem do
+    Storage.new("").ouch!
+  end
 end

data/test_project/mocha/test/data_brander_test.rb

@@ -2,10 +2,10 @@
 require File.dirname(__FILE__) + "/../../test_project"
 
 class DataBranderTest < Test::Unit::TestCase
-  def test_saves_branded_to_pstore
-    pstore = Storage.new 'whatever'
-    pstore.expects(:save).with('METAL - rock')
-    DataBrander.new(pstore).save_branded('rock')
+  def test_saves_branded_to_storage
+    storage = Storage.new 'whatever'
+    storage.expects(:save).with('METAL - rock')
+    DataBrander.new(storage).save_branded('rock')
   end
   
   def test_ignores_total_ducks
@@ -13,4 +13,10 @@ class DataBranderTest < Test::Unit::TestCase
     m.expects(:foo)
     m.foo
   end
+  
+  def test_delegates_problem
+    storage = Storage.new("")
+    storage.expects(:ouch!).raises(Problem.new)
+    assert_raise(Problem) { DataBrander.new(storage).dont_do_this }
+  end
 end

data/test_project/mocha/test/storage_test.rb

@@ -9,4 +9,8 @@ class StorageTest < Test::Unit::TestCase
   ensure
     FileUtils.rm_f('test.txt')
   end
+  
+  def test_ouch_raises_problem
+    assert_raise(Problem) { Storage.new("").ouch! }
+  end
 end

data/test_project/rspec/data_brander_spec.rb

@@ -13,4 +13,10 @@ describe DataBrander do
     m.should_receive(:foo)
     m.foo
   end
+  
+  it "should delegate problem" do
+    storage = Storage.new("")
+    storage.should_receive(:ouch!).and_raise(Problem.new)
+    proc {DataBrander.new(storage).dont_do_this}.should raise_error(Problem)
+  end
 end

data/test_project/rspec/storage_spec.rb

@@ -10,4 +10,8 @@ describe Storage do
       FileUtils.rm_f('test.txt')
     end
   end
+  
+  it "should raise problem on ouch!" do
+    proc { Storage.new("").ouch! }.should raise_error(Problem)
+  end
 end

data/test_project/test_project.rb

@@ -1,3 +1,31 @@
-$: << File.dirname(__FILE__) + '/lib/'
-require "storage"
-require "data_brander"
+class DataBrander
+  BRAND = "METAL"
+  
+  def initialize(storage)
+    @storage = storage
+  end
+  
+  def save_branded(data)
+    @storage.save "#{BRAND} - #{data}"
+  end
+  
+  def dont_do_this
+    @storage.ouch!
+  end
+end
+
+class Storage
+  def initialize(filename)
+    @filename = filename
+  end
+  
+  def save(val)
+    File.open(@filename, 'w') {|f| f << val}
+  end
+  
+  def ouch!
+    raise Problem
+  end
+end
+
+class Problem < Exception;end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: synthesis
 version: !ruby/object:Gem::Version 
-  version: 0.0.15
+  version: 0.1.0
 platform: ruby
 authors: 
 - Stuart Caborn, George Malamidis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-25 00:00:00 +01:00
+date: 2008-05-29 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -65,8 +65,6 @@ files:
 - test/synthesis/recordable_test.rb
 - test_project/expectations/test/data_brander_test.rb
 - test_project/expectations/test/storage_test.rb
-- test_project/lib/data_brander.rb
-- test_project/lib/storage.rb
 - test_project/mocha/test/data_brander_test.rb
 - test_project/mocha/test/storage_test.rb
 - test_project/rspec/data_brander_spec.rb

data/test_project/lib/data_brander.rb

@@ -1,11 +0,0 @@
-class DataBrander
-  BRAND = "METAL"
-  
-  def initialize(pstore)
-    @pstore = pstore
-  end
-  
-  def save_branded(data)
-    @pstore.save "#{BRAND} - #{data}"
-  end
-end

data/test_project/lib/storage.rb

@@ -1,9 +0,0 @@
-class Storage
-  def initialize(filename)
-    @filename = filename
-  end
-  
-  def save(val)
-    File.open(@filename, 'w') {|f| f << val}
-  end
-end