synthesis 0.0.1 → 0.0.2

data/README

@@ -51,5 +51,5 @@ Synthesis will currently ignore dynamically generated at runtime methods.
 == Related reading
 
 * 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-test-unit-and-mocha )
+* 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 )

data/Rakefile

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

data/lib/synthesis.rb

@@ -5,6 +5,8 @@ $: << File.dirname(__FILE__)
 require "synthesis/logging"
 require "synthesis/recordable"
 require "synthesis/object"
+require "synthesis/class"
+require "synthesis/module"
 require "synthesis/expectation_record"
 require "synthesis/method_invocation_watcher"
 require "synthesis/expectation"

data/lib/synthesis/adapter/expectations.rb

@@ -9,5 +9,6 @@ require "synthesis/adapter/mocha/object"
 require "synthesis/adapter/mocha/class_method"
 require "synthesis/adapter/mocha/expectation_record"
 require "synthesis/adapter/mocha/method_invocation_watcher"
+require "synthesis/adapter/mocha/mocha_expectation"
 require "synthesis/adapter/expectations/expectations_adapter"
 require "synthesis/adapter/expectations/suite_runner"

data/lib/synthesis/adapter/mocha.rb

@@ -9,4 +9,5 @@ require "synthesis/adapter/mocha/object"
 require "synthesis/adapter/mocha/class_method"
 require "synthesis/adapter/mocha/expectation_record"
 require "synthesis/adapter/mocha/method_invocation_watcher"
+require "synthesis/adapter/mocha/mocha_expectation"
 require "synthesis/adapter/mocha/mocha_adapter"

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

@@ -0,0 +1,12 @@
+module Mocha
+  class Expectation
+    attr_accessor :synthesis_expectation
+    
+    alias mocha_with with
+    
+    def with(*expected_parameters, &matching_block)
+      synthesis_expectation.args = expected_parameters if synthesis_expectation
+      mocha_with *expected_parameters, &matching_block
+    end
+  end
+end

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

@@ -2,8 +2,10 @@ class Object
   alias mocha_expects expects
   
   def expects(meth)
-    Synthesis::ExpectationRecord.add_expectation(self, meth)
-    mocha_expects(meth)
+    s_expectation = Synthesis::ExpectationRecord.add_expectation(self, meth)
+    m_expectation = mocha_expects(meth)
+    m_expectation.synthesis_expectation = s_expectation
+    m_expectation
   end
   
   def mocked!

data/lib/synthesis/class.rb

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

data/lib/synthesis/expectation.rb

@@ -1,16 +1,13 @@
 module Synthesis
   module Expectation
     def self.new(receiver, method, args = [])
-      if receiver.is_a?(Class) || receiver.is_a?(Module)
-        Singleton.new(receiver, method, args)
-      else
-        Instance.new(receiver, method, args)
-      end
+      receiver.expectation method, args
     end
   
     class Expectation
       include Logging
-      attr_reader :receiver, :method, :args
+      attr_reader :receiver, :method
+      attr_accessor :args
       
       def initialize(receiver, method, args)
         @receiver, @method, @args = receiver, method, args
@@ -34,6 +31,12 @@ module Synthesis
       def invoked!
         @invoked = true
       end
+      
+      protected
+      
+      def args_match?(other)
+        self.args.map { |arg| arg.class } == other.args.map { |arg| arg.class }
+      end
     end
   
     class Singleton < Expectation
@@ -42,7 +45,9 @@ module Synthesis
       end
       
       def eql?(other)
-        @receiver.name == other.receiver.name && @method == other.method
+        @receiver.name == other.receiver.name && 
+        @method == other.method && 
+        args_match?(other)
       end
       
       def hash
@@ -50,7 +55,7 @@ module Synthesis
       end
       
       def to_s
-        "#{@receiver.name}.#{@method}"
+        "#{@receiver.name}.#{@method}(#{@args.map { |arg| arg.class } * ', '})"
       end
     end
     
@@ -60,7 +65,9 @@ module Synthesis
       end
       
       def eql?(other)
-        meta_receiver.name == other.meta_receiver.name && @method == other.method
+        meta_receiver.name == other.meta_receiver.name && 
+        @method == other.method && 
+        args_match?(other)
       end
       
       def hash
@@ -68,7 +75,7 @@ module Synthesis
       end
       
       def to_s
-        "#{meta_receiver.name}.new.#{@method}"
+        "#{meta_receiver.name}.new.#{@method}(#{@args.map { |arg| arg.class } * ', '})"
       end
     end
     

data/lib/synthesis/expectation_record.rb

@@ -4,7 +4,11 @@ module Synthesis
       include Logging
       
       def add_expectation(receiver, method, args = [])
-        expectations << Expectation.new(receiver, method, args) unless ignore? receiver
+        unless ignore? receiver
+          expectation = Expectation.new(receiver, method, args)
+          expectations << expectation
+          expectation
+        end
       end
       
       def ignore(*args)
@@ -12,7 +16,9 @@ module Synthesis
       end
       
       def expectations
-        @expectations ||= Set.new
+        @expectations ||= []
+        @expectations.uniq!
+        @expectations
       end
       
       def ignored

data/lib/synthesis/module.rb

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

data/lib/synthesis/object.rb

@@ -2,4 +2,8 @@ class Object
   def __metaclass__
     class << self; self end
   end
+  
+  def expectation(method, args = [])
+    Synthesis::Expectation::Instance.new(self, method, args)
+  end
 end

data/lib/synthesis/task.rb

@@ -7,8 +7,7 @@ module Synthesis
     attr_accessor :verbose, :pattern, :ruby_opts, :adapter, :out
 
     def initialize(name='synthesis:test')
-      @name = name
-      @ignored = []
+      @name, @ignored = name, []
       yield self if block_given?
       @pattern ||= 'test/**/*.rb'
       @ruby_opts ||= []

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

@@ -0,0 +1,19 @@
+require "test/unit"
+require File.dirname(__FILE__) + "/../../../../lib/synthesis/adapter/mocha"
+
+class MochaExpectationTest < Test::Unit::TestCase
+  def setup
+    @mocha_expectation = Mocha::Expectation.new :mock, :blah
+  end
+  
+  def test_holds_synthesis_expectation
+    @mocha_expectation.synthesis_expectation = 1
+    assert_equal 1, @mocha_expectation.synthesis_expectation
+  end
+  
+  def test_with_passes_expected_params_to_synthesis_expectation
+    @mocha_expectation.synthesis_expectation = Synthesis::Expectation.new(Hash, :foo)
+    @mocha_expectation.with 1, 2
+    assert_equal([1, 2], @mocha_expectation.synthesis_expectation.args)
+  end
+end

data/test/synthesis/class_test.rb

@@ -0,0 +1,8 @@
+require "test/unit"
+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)
+  end
+end

data/test/synthesis/expectation_record_test.rb

@@ -42,5 +42,11 @@ module Synthesis
       ExpectationRecord.add_expectation Hash, :foo
       assert ExpectationRecord.expectations.empty?
     end
+    
+    def test_returns_added_expectation_on_add
+      expected = Expectation.new Hash, :foo
+      actual = ExpectationRecord.add_expectation Hash, :foo
+      assert_equal expected, actual
+    end
   end
 end

data/test/synthesis/expectation_test.rb

@@ -43,6 +43,18 @@ module Synthesis
       exp2 = Expectation.new Array.new, :foo
       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]
+      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]
+      assert_not_equal exp1, exp2
+    end
 
     def test_make_sure_equality_works_with_uniq
       arr = [

data/test/synthesis/module_test.rb

@@ -0,0 +1,8 @@
+require "test/unit"
+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)
+  end
+end

data/test/synthesis/object_test.rb

@@ -0,0 +1,8 @@
+require "test/unit"
+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)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: synthesis
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Stuart Caborn, George Malamidis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-12 00:00:00 +00:00
+date: 2008-01-14 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -30,13 +30,16 @@ files:
 - lib/synthesis/adapter/mocha/expectation_record.rb
 - lib/synthesis/adapter/mocha/method_invocation_watcher.rb
 - lib/synthesis/adapter/mocha/mocha_adapter.rb
+- lib/synthesis/adapter/mocha/mocha_expectation.rb
 - lib/synthesis/adapter/mocha/object.rb
 - lib/synthesis/adapter/mocha.rb
 - lib/synthesis/adapter.rb
+- lib/synthesis/class.rb
 - lib/synthesis/expectation.rb
 - lib/synthesis/expectation_record.rb
 - lib/synthesis/logging.rb
 - lib/synthesis/method_invocation_watcher.rb
+- lib/synthesis/module.rb
 - lib/synthesis/object.rb
 - lib/synthesis/recordable.rb
 - lib/synthesis/report.rb
@@ -45,10 +48,14 @@ files:
 - lib/synthesis.rb
 - test/synthesis/adapter/mocha/expectation_record_test.rb
 - test/synthesis/adapter/mocha/method_invocation_watcher_test.rb
+- test/synthesis/adapter/mocha/mocha_expectation_test.rb
 - test/synthesis/adapter/mocha/object_test.rb
+- test/synthesis/class_test.rb
 - test/synthesis/expectation_record_test.rb
 - test/synthesis/expectation_test.rb
 - test/synthesis/method_invocation_watcher_test.rb
+- test/synthesis/module_test.rb
+- test/synthesis/object_test.rb
 - test/synthesis/recordable_test.rb
 - test_project/expectations/test/data_brander_test.rb
 - test_project/expectations/test/storage_test.rb