synthesis 0.1.0 → 0.1.1

data/Rakefile

@@ -25,22 +25,22 @@ Rake::TestTask.new('test:spec') do |t|
   t.pattern = 'test/synthesis/adapter/rspec/*_test.rb'
 end
 
-Synthesis::Task.new('synthesis:test:expectations') do |t|
+Synthesis::Task.new do |t|
+  t.pattern = 'test_project/mocha/test/*_test.rb'
+  t.ignored = [Array, Hash]
+  # t.out = File.new('synthesis.test.txt', 'a')
+end
+
+Synthesis::Task.new('synthesis:expectations') do |t|
   t.adapter = :expectations
   t.pattern = 'test_project/expectations/test/*_test.rb'
 end
 
-Synthesis::Task.new('synthesis:test:rspec') do |t|
+Synthesis::Task.new('synthesis:spec') do |t|
   t.adapter = :rspec
   t.pattern = 'test_project/rspec/*_spec.rb'
 end
 
-Synthesis::Task.new do |t|
-  t.pattern = 'test_project/mocha/test/*_test.rb'
-  t.ignored = [Array, Hash]
-  # t.out = File.new('synthesis.test.txt', 'a')
-end
-
 desc 'Generate RDoc'
 Rake::RDocTask.new do |task|
   task.main = 'README'
@@ -58,7 +58,7 @@ end
 
 gem_spec = Gem::Specification.new do |s|
   s.name = 'synthesis'
-  s.version = '0.1.0'
+  s.version = '0.1.1'
   s.platform = Gem::Platform::RUBY
   s.rubyforge_project = "synthesis"
   s.summary, s.description = 'A tool for Synthesized Testing'

data/lib/synthesis/adapter.rb

@@ -15,7 +15,7 @@ module Synthesis
     def fail_unless(&block)
       log "Collecting expectations..."
       collect_expectations
-      Dir[@pattern].each { |t| require t }
+      Dir[*@pattern].each { |t| require t }
       exit -1 unless yield
       log "Verifying expectation invocations..."
       stop_collecting_expectations

data/lib/synthesis/adapter/expectations.rb

@@ -15,7 +15,7 @@ module Synthesis
       Object.extend(ExpectationRecordEnabled)
       Object.record_expectations_on(:expects)
       Mocha::Expectation.extend(ExpectationInterceptor)
-      Mocha::Expectation.record_expected_argument_types_on(:with)
+      Mocha::Expectation.record_expected_arguments_on(:with)
       Mocha::Expectation.record_expected_return_values_on(:returns)
       Mocha::Expectation.record_expected_return_values_on(:raises)
     end

data/lib/synthesis/adapter/mocha.rb

@@ -16,7 +16,7 @@ module Synthesis
       Object.extend(ExpectationRecordEnabled)
       Object.record_expectations_on(:expects)
       Mocha::Expectation.extend(ExpectationInterceptor)
-      Mocha::Expectation.record_expected_argument_types_on(:with)
+      Mocha::Expectation.record_expected_arguments_on(:with)
       Mocha::Expectation.record_expected_return_values_on(:returns)
       Mocha::Expectation.record_expected_return_values_on(:raises)
     end

data/lib/synthesis/adapter/rspec.rb

@@ -20,7 +20,7 @@ module Synthesis
       Spec::Mocks::Methods.extend(ExpectationRecordEnabled)
       Spec::Mocks::Methods.record_expectations_on(:should_receive)
       Spec::Mocks::MessageExpectation.extend(ExpectationInterceptor)
-      Spec::Mocks::MessageExpectation.record_expected_argument_types_on(:with)
+      Spec::Mocks::MessageExpectation.record_expected_arguments_on(:with)
       Spec::Mocks::MessageExpectation.record_expected_return_values_on(:and_return)
       Spec::Mocks::MessageExpectation.record_expected_return_values_on(:and_raise)
     end

data/lib/synthesis/expectation.rb

@@ -6,7 +6,8 @@ module Synthesis
   
     class Expectation
       include Logging
-      attr_reader :receiver, :method
+      attr_reader :receiver, :method, :return_values
+      protected :return_values
       attr_accessor :args
       
       def initialize(receiver, method, track, args, return_values)
@@ -39,6 +40,10 @@ module Synthesis
         eql?(other)
       end
       
+      def <=>(other)
+        @return_values.size <=> other.return_values.size
+      end
+      
       def invoked?
         @invoked
       end
@@ -52,7 +57,7 @@ module Synthesis
       end
       
       def return_value_type
-        @return_values[0] ? @return_values[0].class : nil
+        @return_values.size == 1 ? @return_values[0].class : nil
       end
       
       def add_return_values(*vals)

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 record_expected_argument_types_on(method_name)
+    def record_expected_arguments_on(method_name)
       (@original_methods ||= []) << method_name
       
       class_eval do

data/lib/synthesis/expectation_record.rb

@@ -65,7 +65,7 @@ module Synthesis
 
       private
       def expectations_hash
-        @expectations_hash ||= expectations.inject({}) do |hash, expectation|
+        @expectations_hash ||= expectations.sort.inject({}) do |hash, expectation|
           hash[expectation] = expectation
           hash
         end

data/test/synthesis/expectation_test.rb

@@ -51,12 +51,30 @@ module Synthesis
       expectation = Expectation.new(String.new, :new, :track, [:sym, "str"], [])
       assert_equal([Symbol, String], expectation.arg_types)
     end
-    
+        
     def test_return_value_type
-      expectation = Expectation.new(String.new, :new, :track, [], [:sym])
+      expectation = Expectation.new(String, :new, :track)
+      expectation.add_return_values(:sym)
       assert_equal(Symbol, expectation.return_value_type)
     end
     
+    def test_true_class_return_value_type
+      expectation = Expectation.new(String, :new, :track)
+      expectation.add_return_values(true)
+      assert_equal(TrueClass, expectation.return_value_type)
+    end
+    
+    def test_false_class_return_value_type
+      expectation = Expectation.new(String, :new, :track)
+      expectation.add_return_values(false)
+      assert_equal(FalseClass, expectation.return_value_type)
+    end
+    
+    def test_returns_nil_return_value_type_when_no_return_values
+      expectation = Expectation.new(String, :new, :track)
+      assert_nil(expectation.return_value_type)
+    end
+    
     def test_adds_return_value
       expectation = Expectation.new(String.new, :new, :track, [], [:sym])
       expectation.add_return_values("str")
@@ -91,9 +109,12 @@ module Synthesis
       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)
+    def test_expectation_sorting
+      light = Expectation.new(Object.new, :bar, :track, [])
+      heavy = Expectation.new(Object.new, :foo, :track, [], [:retval])
+      sorted = [light, heavy].sort.reverse
+      assert_equal(heavy, sorted[0])
+      assert_equal(light, sorted[1])
     end
   end
 end

data/test_project/mocha/test/data_brander_test.rb

@@ -19,4 +19,18 @@ class DataBranderTest < Test::Unit::TestCase
     storage.expects(:ouch!).raises(Problem.new)
     assert_raise(Problem) { DataBrander.new(storage).dont_do_this }
   end
+  
+  def test_is_ok
+    storage = Storage.new("")
+    storage.expects(:ok_or_problem).with(:ok).returns(:ok)
+    DataBrander.new(storage).ok
+  end
+  
+  def test_does_not_rescue_problem_on_not_ok
+    assert_raise(Problem) do
+      storage = Storage.new("")
+      storage.expects(:ok_or_problem).with(:not_ok).raises(Problem.new)
+      DataBrander.new(storage).not_ok
+    end
+  end
 end

data/test_project/mocha/test/storage_test.rb

@@ -13,4 +13,12 @@ class StorageTest < Test::Unit::TestCase
   def test_ouch_raises_problem
     assert_raise(Problem) { Storage.new("").ouch! }
   end
+  
+  def test_ok_or_problem_returns_ok_when_given_ok
+    assert_equal(:ok, Storage.new("").ok_or_problem(:ok))
+  end
+  
+  def test_ok_raises_problem_when_not_given_ok
+    assert_raise(Problem) { Storage.new("").ok_or_problem(:not_ok) }
+  end
 end

data/test_project/rspec/data_brander_spec.rb

@@ -19,4 +19,18 @@ describe DataBrander do
     storage.should_receive(:ouch!).and_raise(Problem.new)
     proc {DataBrander.new(storage).dont_do_this}.should raise_error(Problem)
   end
+  
+  it "should return :ok when given :ok" do
+    storage = Storage.new("")
+    storage.should_receive(:ok_or_problem).with(:ok).and_return(:ok)
+    DataBrander.new(storage).ok
+  end
+  
+  it "should not rescue problem on not ok" do
+    proc do
+      storage = Storage.new("")
+      storage.should_receive(:ok_or_problem).with(:not_ok).and_raise(Problem.new)
+      DataBrander.new(storage).not_ok
+    end.should raise_error(Problem)
+  end
 end

data/test_project/rspec/storage_spec.rb

@@ -14,4 +14,12 @@ describe Storage do
   it "should raise problem on ouch!" do
     proc { Storage.new("").ouch! }.should raise_error(Problem)
   end
+  
+  it "should return :ok when given :ok" do
+    Storage.new("").ok_or_problem(:ok).should == :ok
+  end
+  
+  it "should raise problem when not give :ok" do
+    proc { Storage.new("").ok_or_problem(:not_ok) }.should raise_error(Problem)
+  end
 end

data/test_project/test_project.rb

@@ -12,6 +12,14 @@ class DataBrander
   def dont_do_this
     @storage.ouch!
   end
+  
+  def ok
+    @storage.ok_or_problem(:ok)
+  end
+  
+  def not_ok
+    @storage.ok_or_problem(:not_ok)
+  end
 end
 
 class Storage
@@ -26,6 +34,10 @@ class Storage
   def ouch!
     raise Problem
   end
+  
+  def ok_or_problem(ok)
+    ok == :ok ? ok : 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.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Stuart Caborn, George Malamidis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-29 00:00:00 +01:00
+date: 2008-06-04 00:00:00 +01:00
 default_executable: 
 dependencies: []