synthesis 0.0.13 → 0.0.14

data/Rakefile

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

data/lib/synthesis/adapter/expectations.rb

@@ -15,13 +15,13 @@ module Synthesis
       Object.extend(ExpectationRecordEnabled)
       Object.record_expectations_on(:expects)
       Mocha::Expectation.extend(ExpectationInterceptor)
-      Mocha::Expectation.intercept_expected_argument_types_on(:with)
-      Mocha::Expectation.intercept_expected_return_values_on(:returns)
+      Mocha::Expectation.record_expected_argument_types_on(:with)
+      Mocha::Expectation.record_expected_return_values_on(:returns)
     end
     
     def stop_collecting_expectations
-      Mocha::Expectation.reset!
-      Object.reset!
+      Mocha::Expectation.stop_intercepting!
+      Object.stop_recording!
     end
   end
 end

data/lib/synthesis/adapter/mocha.rb

@@ -16,13 +16,13 @@ module Synthesis
       Object.extend(ExpectationRecordEnabled)
       Object.record_expectations_on(:expects)
       Mocha::Expectation.extend(ExpectationInterceptor)
-      Mocha::Expectation.intercept_expected_argument_types_on(:with)
-      Mocha::Expectation.intercept_expected_return_values_on(:returns)
+      Mocha::Expectation.record_expected_argument_types_on(:with)
+      Mocha::Expectation.record_expected_return_values_on(:returns)
     end
     
     def stop_collecting_expectations
-      Mocha::Expectation.reset!
-      Object.reset!
+      Mocha::Expectation.stop_intercepting!
+      Object.stop_recording!
     end
   end  
 end

data/lib/synthesis/adapter/rspec.rb

@@ -20,13 +20,13 @@ module Synthesis
       Spec::Mocks::Methods.extend(ExpectationRecordEnabled)
       Spec::Mocks::Methods.record_expectations_on(:should_receive)
       Spec::Mocks::MessageExpectation.extend(ExpectationInterceptor)
-      Spec::Mocks::MessageExpectation.intercept_expected_argument_types_on(:with)
-      Spec::Mocks::MessageExpectation.intercept_expected_return_values_on(:and_return)
+      Spec::Mocks::MessageExpectation.record_expected_argument_types_on(:with)
+      Spec::Mocks::MessageExpectation.record_expected_return_values_on(:and_return)
     end
     
     def stop_collecting_expectations
-      Spec::Mocks::MessageExpectation.reset!
-      Spec::Mocks::Methods.reset!
+      Spec::Mocks::MessageExpectation.stop_intercepting!
+      Spec::Mocks::Methods.stop_recording!
     end
   end  
 end

data/lib/synthesis/expectation_interceptor.rb

@@ -5,7 +5,7 @@ module Synthesis
   module ExpectationInterceptor
     # Intercept the mock object framework's expectation method for declaring a mocked
     # method's arguments so that Synthesis can record them.
-    def intercept_expected_argument_types_on(method_name)
+    def record_expected_argument_types_on(method_name)
       @original_with = method_name
       
       class_eval <<-end_eval
@@ -20,7 +20,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 intercept_expected_return_values_on(method_name)
+    def record_expected_return_values_on(method_name)
       @original_returns = method_name
       
       class_eval <<-end_eval
@@ -37,7 +37,7 @@ module Synthesis
     # Restore the original methods ExpectationInterceptor has rewritten and
     # undefine their intercepted counterparts. Undefine the synthesis_expectation
     # accessors.
-    def reset!
+    def stop_intercepting!
       class_eval <<-end_eval
         alias #{@original_with} intercepted_#{@original_with}
         alias #{@original_returns} intercepted_#{@original_returns}

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).any?
+      @expectation_one.return_value_types == @expectation_two.return_value_types
     end
   end
 end

data/lib/synthesis/expectation_record_enabled.rb

@@ -22,7 +22,7 @@ module Synthesis
     
     # Restore the original methods ExpectationRecordEnabled has rewritten and
     # undefine their intercepted counterparts.
-    def reset!
+    def stop_recording!
       class_eval <<-end_eval
         alias #{@original_expects} intercepted_#{@original_expects}
         undef intercepted_#{@original_expects}

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

@@ -0,0 +1,18 @@
+class Object
+  def self.mock_instance(*args)
+    class_eval do
+      alias original_initialize initialize
+      def initialize()end
+    end
+
+    instance = new
+    expects(:new).with(*args).returns(instance)
+
+    class_eval do
+      alias initialize original_initialize
+      undef original_initialize
+    end
+
+    return instance
+  end
+end

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

@@ -0,0 +1,37 @@
+module Spec::Mocks::Methods
+  def mock_instance(*args)
+    class_eval do
+      alias original_initialize initialize
+      def initialize()end
+    end
+
+    instance = new
+    should_receive(:new).with(*args).and_return(instance)
+
+    class_eval do
+      alias initialize original_initialize
+      undef original_initialize
+    end
+
+    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

data/test/synthesis/expectation_matcher_test.rb

@@ -39,7 +39,7 @@ module Synthesis
       assert(!ExpectationMatcher.new(exp1, exp2).match?)
     end
     
-    def test_match_based_on_intersection_of_return_value_types
+    def test_match_based_on_return_value_types
       exp1 = Expectation.new(Object.new, :foo, :track, [Array, Hash], [[1], {:a => :b}])
       exp2 = Expectation.new(Object.new, :foo, :track, [Array, Hash], [[4], {:a => 9}])
       assert(ExpectationMatcher.new(exp1, exp2).match?)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: synthesis
 version: !ruby/object:Gem::Version 
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors: 
 - Stuart Caborn, George Malamidis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-19 00:00:00 +01:00
+date: 2008-05-21 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -41,6 +41,8 @@ files:
 - lib/synthesis/reporter.rb
 - lib/synthesis/runner.rb
 - lib/synthesis/task.rb
+- lib/synthesis/util/mock_instance/mocha.rb
+- lib/synthesis/util/mock_instance/rspec.rb
 - lib/synthesis.rb
 - test/synthesis/adapter/mocha/expectation_record_test.rb
 - test/synthesis/adapter/mocha/helper.rb