synthesis 0.0.2 → 0.0.3

data/README

@@ -8,6 +8,10 @@ Currently we believe that developers are writing unnecessary functional tests to
 
  sudo gem i synthesis
 
+== Download
+
+Synthesis RubyForge page ( http://rubyforge.org/projects/synthesis )
+
 == Dependencies
 
 Synthesis's core doesn't have any dependencies. 
@@ -52,4 +56,5 @@ Synthesis will currently ignore dynamically generated at runtime methods.
 
 * Synthesized Testing: A Primer ( http://nutrun.com/weblog/synthesized-testing-a-primer )
 * Using Synthesis With Test::Unit and Mocha ( http://nutrun.com/weblog/using-synthesis-with-testunit-and-mocha )
-* Using Synthesis With Expectations ( http://nutrun.com/weblog/using-synthesis-with-expectations )
+* Using Synthesis With Expectations ( http://nutrun.com/weblog/using-synthesis-with-expectations )
+* Synthesis validates simulated method calls taking method signature arguments into account ( http://nutrun.com/weblog/synthesis-002 )

data/Rakefile

@@ -71,13 +71,13 @@ end
 
 gem_spec = Gem::Specification.new do |s|
   s.name = 'synthesis'
-  s.version = '0.0.2'
+  s.version = '0.0.3'
   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.email = 'george@nutrun.com'
-  s.homepage = 'http://nutrun.com/synthesis'
+  s.homepage = 'http://synthesis.rubyforge.org'
   s.has_rdoc = true
   s.rdoc_options += ['--quiet', '--title', 'Queueue', '--main', 'README', '--inline-source']
   s.extra_rdoc_files = ['README', 'COPYING']
@@ -89,4 +89,7 @@ end
 Rake::GemPackageTask.new(gem_spec) do |t|
   t.need_zip = false
   t.need_tar = false
-end
+end
+
+desc "Remove rdoc and package artefacts"
+task :clean => ['clobber_package', 'clobber_rdoc']

data/lib/synthesis/adapter/mocha/expectation_record.rb

@@ -3,10 +3,10 @@ module Synthesis
     class << self
       alias_method :add_mocha_expectation, :add_expectation
 
-      def add_expectation(obj, meth, args = [])
+      def add_expectation(obj, meth, track, args = [])
         # Ignone things like "foo = mock"
         return nil if obj.is_a?(Class::AnyInstance)
-        add_mocha_expectation(obj, meth, args)
+        add_mocha_expectation(obj, meth, track, args)
       end
     end
   end

data/lib/synthesis/adapter/mocha/object.rb

@@ -2,7 +2,7 @@ class Object
   alias mocha_expects expects
   
   def expects(meth)
-    s_expectation = Synthesis::ExpectationRecord.add_expectation(self, meth)
+    s_expectation = Synthesis::ExpectationRecord.add_expectation(self, meth, caller[0])
     m_expectation = mocha_expects(meth)
     m_expectation.synthesis_expectation = s_expectation
     m_expectation

data/lib/synthesis/class.rb

@@ -1,5 +1,5 @@
 class Class
-  def expectation(method, args = [])
-    Synthesis::Expectation::Singleton.new(self, method, args)
+  def expectation(method, track, args = [])
+    Synthesis::Expectation::Singleton.new(self, method, track, args)
   end
 end

data/lib/synthesis/expectation.rb

@@ -1,7 +1,7 @@
 module Synthesis
   module Expectation
-    def self.new(receiver, method, args = [])
-      receiver.expectation method, args
+    def self.new(receiver, method, track, args = [])
+      receiver.expectation method, track, args
     end
   
     class Expectation
@@ -9,8 +9,8 @@ module Synthesis
       attr_reader :receiver, :method
       attr_accessor :args
       
-      def initialize(receiver, method, args)
-        @receiver, @method, @args = receiver, method, args
+      def initialize(receiver, method, track, args)
+        @receiver, @method, @track, @args = receiver, method, track, args
       end
       
       def record_invocations
@@ -55,7 +55,7 @@ module Synthesis
       end
       
       def to_s
-        "#{@receiver.name}.#{@method}(#{@args.map { |arg| arg.class } * ', '})"
+        "#{@receiver.name}.#{@method}(#{@args.map { |arg| arg.class } * ', '}) in #{@track}"
       end
     end
     
@@ -75,7 +75,7 @@ module Synthesis
       end
       
       def to_s
-        "#{meta_receiver.name}.new.#{@method}(#{@args.map { |arg| arg.class } * ', '})"
+        "#{meta_receiver.name}.new.#{@method}(#{@args.map { |arg| arg.class } * ', '}) in #{@track}"
       end
     end
     

data/lib/synthesis/expectation_record.rb

@@ -3,9 +3,9 @@ module Synthesis
     class << self
       include Logging
       
-      def add_expectation(receiver, method, args = [])
+      def add_expectation(receiver, method, track, args = [])
         unless ignore? receiver
-          expectation = Expectation.new(receiver, method, args)
+          expectation = Expectation.new(receiver, method, track, args)
           expectations << expectation
           expectation
         end

data/lib/synthesis/method_invocation_watcher.rb

@@ -1,7 +1,7 @@
 module Synthesis
   class MethodInvocationWatcher
     def self.invoked(receiver, method, args = [])
-      matcher = Expectation.new(receiver, method, args)
+      matcher = Expectation.new(receiver, method, nil, args)
       ExpectationRecord[matcher].invoked!
     end
   end

data/lib/synthesis/module.rb

@@ -1,5 +1,5 @@
 class Module
-  def expectation(method, args = [])
-    Synthesis::Expectation::Singleton.new(self, method, args)
+  def expectation(method, track, args = [])
+    Synthesis::Expectation::Singleton.new(self, method, track, args)
   end
 end

data/lib/synthesis/object.rb

@@ -3,7 +3,7 @@ class Object
     class << self; self end
   end
   
-  def expectation(method, args = [])
-    Synthesis::Expectation::Instance.new(self, method, args)
+  def expectation(method, track, args = [])
+    Synthesis::Expectation::Instance.new(self, method, track, args)
   end
 end

data/lib/synthesis/recordable.rb

@@ -1,8 +1,10 @@
 module Synthesis
   module Recordable
     def recordable_method(method)
-      alias_method "__recordable__#{method}", method
-      class_eval @@recordable_method_def[method]
+      unless method_defined? "__recordable__#{method}".intern
+        alias_method "__recordable__#{method}".intern, method
+        class_eval @@recordable_method_def[method]
+      end
     end
       
     @@recordable_method_def = proc { |method| %(

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

@@ -9,7 +9,7 @@ module Synthesis
 
     def test_does_not_add_any_instance_expectation
       any = Class::AnyInstance.new(Object)
-      ExpectationRecord.add_expectation(any, :foo)
+      ExpectationRecord.add_expectation(any, :foo, :track)
       assert_equal(0, ExpectationRecord.expectations.size)
     end  
   end

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

@@ -9,7 +9,7 @@ module Synthesis
 
     def test_ignores_invocation_for_mocked_object
       foo = Class.new { def self.bar;end }
-      ExpectationRecord.add_expectation foo, :bar
+      ExpectationRecord.add_expectation foo, :bar, :track
       ExpectationRecord.record_invocations
       e = ExpectationRecord.expectations.to_a[0]
       foo.expects(:bar)
@@ -19,7 +19,7 @@ module Synthesis
 
     def test_records_invocation_for_non_mocked_object
       foo = Class.new { def self.bar;end }
-      ExpectationRecord.add_expectation foo, :bar
+      ExpectationRecord.add_expectation foo, :bar, :track
       ExpectationRecord.record_invocations
       e = ExpectationRecord.expectations.to_a[0]
       foo.bar

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

@@ -12,7 +12,7 @@ class MochaExpectationTest < Test::Unit::TestCase
   end
   
   def test_with_passes_expected_params_to_synthesis_expectation
-    @mocha_expectation.synthesis_expectation = Synthesis::Expectation.new(Hash, :foo)
+    @mocha_expectation.synthesis_expectation = Synthesis::Expectation.new Hash, :foo, :track
     @mocha_expectation.with 1, 2
     assert_equal([1, 2], @mocha_expectation.synthesis_expectation.args)
   end

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

@@ -4,14 +4,14 @@ require File.dirname(__FILE__) + "/../../../../lib/synthesis/adapter/mocha"
 module Synthesis
   class ObjectTest < Test::Unit::TestCase
     def test_records_singleton_method_expectation
-      ExpectationRecord.expects(:add_expectation).with(Hash, :foo)
+      ExpectationRecord.expects(:add_expectation).with(Hash, :foo, kind_of(String))
       Hash.expects(:foo)
       Hash.foo
     end
 
     def test_records_instance_method_expectation
       hash = Hash.new
-      ExpectationRecord.expects(:add_expectation).with(hash, :foo)
+      ExpectationRecord.expects(:add_expectation).with(hash, :foo, kind_of(String))
       hash.expects(:foo)
       hash.foo
     end  

data/test/synthesis/class_test.rb

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

data/test/synthesis/expectation_record_test.rb

@@ -9,13 +9,13 @@ module Synthesis
     end
 
     def test_adds_expectation
-      ExpectationRecord.add_expectation Object.new, :to_s
+      ExpectationRecord.add_expectation Object.new, :to_s, :track
       assert_equal(1, ExpectationRecord.expectations.size)
     end
 
     def test_watches_expectation_invocations
       c = Class.new { def foo; end }
-      ExpectationRecord.add_expectation c.new, :foo
+      ExpectationRecord.add_expectation c.new, :foo, :track
       ExpectationRecord.record_invocations
       a = c.new
       MethodInvocationWatcher.expects(:invoked).with(a, :foo, [])
@@ -23,29 +23,29 @@ module Synthesis
     end
 
     def test_finds_expectation
-      ExpectationRecord.add_expectation Object.new, :foo
+      ExpectationRecord.add_expectation Object.new, :foo, :track
       expected = ExpectationRecord.expectations.to_a[0]
-      matcher = Expectation.new Object.new, :foo
+      matcher = Expectation.new Object.new, :foo, :track
       actual = ExpectationRecord[matcher]
       assert_equal(expected, actual)
     end
 
     def test_returns_nil_expectation_on_no_expectation_found
-      ExpectationRecord.add_expectation Object.new, :foo
-      matcher = Expectation.new Object.new, :bar
+      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
 
     def test_does_not_add_expectation_for_ignored_class
       ExpectationRecord.ignore Hash
-      ExpectationRecord.add_expectation Hash, :foo
+      ExpectationRecord.add_expectation Hash, :foo, :track
       assert ExpectationRecord.expectations.empty?
     end
     
     def test_returns_added_expectation_on_add
-      expected = Expectation.new Hash, :foo
-      actual = ExpectationRecord.add_expectation Hash, :foo
+      expected = Expectation.new Hash, :foo, :track
+      actual = ExpectationRecord.add_expectation Hash, :foo, :track
       assert_equal expected, actual
     end
   end

data/test/synthesis/expectation_test.rb

@@ -4,55 +4,55 @@ require File.dirname(__FILE__) + "/../../lib/synthesis"
 module Synthesis
   class ExpectationTest < Test::Unit::TestCase
     def test_creates_singleton_method_expectation_given_class
-      expectation = Expectation.new Class.new, :foo
+      expectation = Expectation.new Class.new, :foo, :track
       assert_kind_of Expectation::Singleton, expectation
     end
 
     def test_creates_instance_method_expectation_given_instance
-      expectation = Expectation.new Class.new.new, :foo
+      expectation = Expectation.new Class.new.new, :foo, :track
       assert_kind_of Expectation::Instance, expectation
     end
 
     def test_creates_singleton_method_expectation_given_module
-      expectation = Expectation.new Module.new, :foo
+      expectation = Expectation.new Module.new, :foo, :track
       assert_kind_of Expectation::Singleton, expectation
     end
 
     def test_records_instance_receiver_method_invocations
       receiver = Class.new { def foo;end }
-      expectation = Expectation.new receiver.new, :foo
+      expectation = Expectation.new receiver.new, :foo, :track
       expectation.record_invocations
       assert_respond_to receiver.new, :__recordable__foo
     end
 
     def test_records_singleton_receiver_method_invocations
       receiver = Class.new { def self.foo;end }
-      expectation = Expectation.new receiver, :foo
+      expectation = Expectation.new receiver, :foo, :track
       expectation.record_invocations
       assert_respond_to receiver, :__recordable__foo
     end
 
     def test_equality
-      exp1 = Expectation.new Object.new, :foo
-      exp2 = Expectation.new Object.new, :foo
+      exp1 = Expectation.new Object.new, :foo, :track
+      exp2 = Expectation.new Object.new, :foo, :track
       assert_equal exp1, exp2
     end
 
     def test_non_equality
-      exp1 = Expectation.new Hash.new, :foo
-      exp2 = Expectation.new Array.new, :foo
+      exp1 = Expectation.new Hash.new, :foo, :track
+      exp2 = Expectation.new Array.new, :foo, :track
       assert_not_equal exp1, exp2
     end
     
     def test_equality_based_on_same_type_args
-      exp1 = Expectation.new Object.new, :foo, [1, 2]
-      exp2 = Expectation.new Object.new, :foo, [1, 2]
+      exp1 = Expectation.new Object.new, :foo, :track, [1, 2]
+      exp2 = Expectation.new Object.new, :foo, :track, [1, 2]
       assert_equal exp1, exp2
     end
     
     def test_args_based_non_equality_based_on_different_type_args
-      exp1 = Expectation.new Object.new, :foo, [1, Hash.new]
-      exp2 = Expectation.new Object.new, :foo, [1, 2]
+      exp1 = Expectation.new Object.new, :foo, :track, [1, Hash.new]
+      exp2 = Expectation.new Object.new, :foo, :track, [1, 2]
       assert_not_equal exp1, exp2
     end
 
@@ -65,7 +65,7 @@ module Synthesis
     end
 
     def test_does_not_blow_up_on_name_error
-      expectation = Expectation.new(Hash, :bad)
+      expectation = Expectation.new Hash, :bad, :track
       silent(expectation) do
         assert_nothing_raised(NameError) { expectation.record_invocations }
       end

data/test/synthesis/module_test.rb

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

data/test/synthesis/object_test.rb

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

data/test/synthesis/recordable_test.rb

@@ -17,6 +17,14 @@ module Synthesis
       bar = foo.new
       MethodInvocationWatcher.expects(:invoked).with(bar, :b, [])
       bar.b
-    end  
+    end
+    
+    def test_does_not_redefine_already_redefined_method
+      foo = Class.new { def b; end }
+      foo.extend Recordable
+      foo.stubs(:method_defined?).returns(true)
+      foo.expects(:alias_method).never
+      foo.recordable_method(:b)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: synthesis
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Stuart Caborn, George Malamidis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-14 00:00:00 +00:00
+date: 2008-02-03 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -68,7 +68,7 @@ files:
 - README
 - Rakefile
 has_rdoc: true
-homepage: http://nutrun.com/synthesis
+homepage: http://synthesis.rubyforge.org
 post_install_message: 
 rdoc_options: 
 - --quiet