flexmock 0.8.11 → 0.9.0

data/lib/flexmock/rails.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003, 2004, 2005, 2006, 2007 by Jim Weirich (jim@weirichhouse.org).
+# Copyright 2003-2011 by Jim Weirich (jim@weirichhouse.org).
 # All rights reserved.
 #
 # Permission is granted for use, copying, modification, distribution,

data/lib/flexmock/recorder.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003, 2004, 2005, 2006, 2007 by Jim Weirich (jim@weirichhouse.org).
+# Copyright 2003-2011 by Jim Weirich (jim@weirichhouse.org).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,

data/lib/flexmock/rspec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003, 2004, 2005, 2006, 2007, 2010 by Jim Weirich (jim.weirich@gmail.com).
+# Copyright 2003-2011 by Jim Weirich (jim.weirich@gmail.com).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,

data/lib/flexmock/test_unit.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003, 2004, 2005, 2006, 2007 by Jim Weirich (jim@weirichhouse.org).
+# Copyright 2003-2011 by Jim Weirich (jim@weirichhouse.org).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -29,4 +29,4 @@ module Test
 
     end
   end
-end
+end

data/lib/flexmock/test_unit_integration.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003, 2004, 2005, 2006, 2007 by Jim Weirich (jim@weirichhouse.org).
+# Copyright 2003-2011 by Jim Weirich (jim@weirichhouse.org).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -13,13 +13,13 @@ require 'test/unit'
 require 'flexmock/base'
 
 class FlexMock
-  
+
   ####################################################################
   # Test::Unit::TestCase Integration.
   #
   # Include this module in any TestCase class in a Test::Unit test
   # suite to get integration with FlexMock.  When this module is
-  # included, the mock container methods (e.g. flexmock(), flexstub()) 
+  # included, the mock container methods (e.g. flexmock(), flexstub())
   # will be available.
   #
   # <b>Note:</b> If you define a +teardown+ method in the test case,
@@ -38,14 +38,14 @@ class FlexMock
     end
 
   end
-  
+
   ####################################################################
   # Adapter for adapting FlexMock to the Test::Unit framework.
   #
   class TestUnitFrameworkAdapter
     include Test::Unit::Assertions
     def assertion_failed_error
-      Test::Unit::AssertionFailedError
+      defined?(Test::Unit::AssertionFailedError) ? Test::Unit::AssertionFailedError : MiniTest::Assertion
     end
   end
 

data/lib/flexmock/undefined.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003, 2004, 2005, 2006, 2007 by Jim Weirich (jim@weirichhouse.org).
+# Copyright 2003-2011 by Jim Weirich (jim@weirichhouse.org).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -30,7 +30,11 @@ class FlexMock
     def clone
       self
     end
-    
+
+    def <=>(other)
+      self
+    end
+
     def coerce(other)
       [FlexMock.undefined, FlexMock.undefined]
     end
@@ -43,8 +47,8 @@ class FlexMock
   def self.undefined
     @undefined
   end
-  
+
   class << Undefined
     private :new
   end
-end 
+end

data/lib/flexmock/validators.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003, 2004, 2005, 2006, 2007 by Jim Weirich (jim@weirichhouse.org).
+# Copyright 2003-2011 by Jim Weirich (jim@weirichhouse.org).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -73,5 +73,5 @@ class FlexMock
         "Method '#{@exp}' should be called at most #{@limit} times,\n" +
         "only called #{n} times") { n <= @limit }
     end
-  end  
+  end
 end

data/lib/flexmock/version.rb

@@ -0,0 +1,11 @@
+class FlexMock
+  module Version
+    NUMBERS = [
+      MAJOR = 0,
+      MINOR = 9,
+      BUILD = 0,
+    ]
+  end
+
+  VERSION = Version::NUMBERS.join('.')
+end

data/test/{test_aliasing.rb → aliasing_test.rb}

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
-require 'flexmock'
+require 'test/test_setup'
 
 class FlexMock
   module StubsAndExpects
@@ -36,21 +35,21 @@ class AliasingTest < Test::Unit::TestCase
     assert_equal :woof!, m.pat
     assert_equal :woof!, m.pat
   end
-  
+
   def test_once_mocking
-    m = mock("a cute dog").expects(:pat).and_return(:woof!).mock
+    mock("a cute dog").expects(:pat).and_return(:woof!).mock
   end
-  
+
   def test_twice_mocking
     m = mock("a cute dog").expects(:pat).and_return(:woof!).twice.mock
-    assert_raises(Test::Unit::AssertionFailedError) { m.flexmock_verify }
+    assert_raises(assertion_failed_error) { m.flexmock_verify }
   end
-  
+
   def test_stubbing
     m = stub("a cute dog").expects(:pat).and_return(:woof!).mock
     assert_equal :woof!, m.pat
   end
-  
+
   def test_partial
     obj = Object.new
     stub(obj).stubs(:wag).and_return(:tail)

data/test/{test_container_methods.rb → container_methods_test.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003, 2004, 2005, 2006, 2007 by Jim Weirich (jim@weirichhouse.org).
+# Copyright 2003-2011 by Jim Weirich (jim@weirichhouse.org).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -9,8 +9,7 @@
 # above copyright notice is included.
 #+++
 
-require "test/unit"
-require "flexmock"
+require "test/test_setup"
 
 # These tests exercise the interface used to define mocks
 class TestFlexmockContainerMethods < Test::Unit::TestCase
@@ -21,36 +20,36 @@ class TestFlexmockContainerMethods < Test::Unit::TestCase
     mock.should_receive(:hi).once.and_return(:lo)
     assert_equal :lo, mock.hi
   end
-  
+
   def test_mock_with_name
     mock = flexmock("Danny")
     mock.should_receive(:xxx).with(1)
-    ex = assert_raise(Test::Unit::AssertionFailedError) { mock.xxx }
+    ex = assert_raise(assertion_failed_error) { mock.xxx }
     assert_match(/Danny/, ex.message)
   end
-  
+
   def test_mock_with_symbol_name
     mock = flexmock(:Danny)
     mock.should_receive(:xxx).with(1)
-    ex = assert_raise(Test::Unit::AssertionFailedError) { mock.xxx }
+    ex = assert_raise(assertion_failed_error) { mock.xxx }
     assert_match(/Danny/, ex.message)
   end
-  
+
   def test_mock_with_hash
     mock = flexmock(:hi => :lo, :good => :bye)
     assert_equal :lo, mock.hi
     assert_equal :bye, mock.good
   end
-  
+
   def test_mock_with_name_and_hash
     mock = flexmock("Danny", :hi => :lo, :good => :bye)
     mock.should_receive(:xxx).with(1)
     assert_equal :lo, mock.hi
     assert_equal :bye, mock.good
-    ex = assert_raise(Test::Unit::AssertionFailedError) { mock.xxx }
+    ex = assert_raise(assertion_failed_error) { mock.xxx }
     assert_match(/Danny/, ex.message)
   end
-  
+
   def test_mock_with_name_hash_and_block
     mock = flexmock("Danny", :hi => :lo, :good => :bye) do |m|
       m.should_receive(:one).and_return(1)
@@ -58,25 +57,25 @@ class TestFlexmockContainerMethods < Test::Unit::TestCase
     assert_equal 1, mock.one
     assert_equal :lo, mock.hi
   end
-  
+
   def test_basic_stub
     fido = Object.new
     mock = flexmock(fido)
     mock.should_receive(:wag).and_return(:happy)
     assert_equal :happy, fido.wag
   end
-  
+
   def test_basic_stub_with_name
     fido = Object.new
     mock = flexmock(fido, "Danny")
     mock.should_receive(:xxx).with(1).and_return(:happy)
-    ex = assert_raise(Test::Unit::AssertionFailedError) { fido.xxx }
+    ex = assert_raise(assertion_failed_error) { fido.xxx }
     assert_match(/Danny/, ex.message)
   end
 
   def test_stub_with_quick_definitions
     fido = Object.new
-    mock = flexmock(fido, :wag => :happy)
+    flexmock(fido, :wag => :happy)
     assert_equal :happy, fido.wag
   end
 
@@ -84,31 +83,31 @@ class TestFlexmockContainerMethods < Test::Unit::TestCase
     fido = Object.new
     mock = flexmock(fido, "Danny", :wag => :happy)
     mock.should_receive(:xxx).with(1).and_return(:happy)
-    ex = assert_raise(Test::Unit::AssertionFailedError) { fido.xxx }
+    ex = assert_raise(assertion_failed_error) { fido.xxx }
     assert_match(/Danny/, ex.message)
     assert_equal :happy, fido.wag
   end
-  
+
   def test_stubs_are_auto_verified
     fido = Object.new
     mock = flexmock(fido)
     mock.should_receive(:hi).once
-    ex = assert_raise(Test::Unit::AssertionFailedError) { flexmock_verify }
+    assert_raise(assertion_failed_error) { flexmock_verify }
   end
-  
+
   def test_stubbing_a_string
     s = "hello"
-    mock = flexmock(:base, s, :length => 2)
+    flexmock(:base, s, :length => 2)
     assert_equal 2, s.length
   end
-  
+
   def test_multiple_stubs_work_with_same_partial_mock_proxy
     obj = Object.new
     mock1 = flexmock(obj)
     mock2 = flexmock(obj)
     assert_equal mock1, mock2
   end
-  
+
   def test_multiple_stubs_layer_behavior
     obj = Object.new
     flexmock(obj, :hi => :lo)

data/test/{test_default_framework_adapter.rb → default_framework_adapter_test.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003, 2004, 2005, 2006, 2007 by Jim Weirich (jim@weirichhouse.org).
+# Copyright 2003-2011 by Jim Weirich (jim@weirichhouse.org).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -9,16 +9,15 @@
 # above copyright notice is included.
 #+++
 
-require "test/unit"
-require "flexmock"
+require "test/test_setup"
 
 class TestFlexmockDefaultFrameworkAdapter < Test::Unit::TestCase
   def setup
     @adapter = FlexMock::DefaultFrameworkAdapter.new
   end
 
-  def test_assert_block_raises_exception  
-    ex = assert_raise(FlexMock::DefaultFrameworkAdapter::AssertionFailedError) { 
+  def test_assert_block_raises_exception
+    assert_raise(FlexMock::DefaultFrameworkAdapter::AssertionFailedError) {
       @adapter.assert_block("failure message") { false }
     }
   end
@@ -26,14 +25,14 @@ class TestFlexmockDefaultFrameworkAdapter < Test::Unit::TestCase
   def test_assert_block_doesnt_raise_exception
     @adapter.assert_block("failure message") { true }
   end
-  
+
   def test_assert_equal_doesnt_raise_exception
     @adapter.assert_equal("a", "a", "no message")
   end
-  
+
   def test_assert_equal_can_fail
-    ex = assert_raise(FlexMock::DefaultFrameworkAdapter::AssertionFailedError) {
+    assert_raise(FlexMock::DefaultFrameworkAdapter::AssertionFailedError) {
       @adapter.assert_equal("a", "b", "a should not equal b")
     }
   end
-end
+end

data/test/{test_demeter_mocking.rb → demeter_mocking_test.rb}

@@ -1,12 +1,9 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
-require 'flexmock'
-require 'test/asserts'
+require 'test/test_setup'
 
 class TestDemeterMocking < Test::Unit::TestCase
   include FlexMock::TestCase
-  include FlexMock::FailureAssertion
 
   def test_demeter_mocking
     m = flexmock("A")

data/test/{test_deprecated_methods.rb → deprecated_methods_test.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003, 2004, 2005, 2006, 2007 by Jim Weirich (jim@weirichhouse.org).
+# Copyright 2003-2011 by Jim Weirich (jim@weirichhouse.org).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -9,10 +9,8 @@
 # above copyright notice is included.
 #+++
 
-require 'test/unit'
-require 'flexmock'
+require 'test/test_setup'
 require 'flexmock/deprecated_methods'
-require 'test/redirect_error'
 
 class TestFlexMock < Test::Unit::TestCase
   include FlexMock::TestCase
@@ -79,7 +77,7 @@ class TestFlexMock < Test::Unit::TestCase
     @mock.blip
     begin
       @mock.flexmock_verify
-    rescue Test::Unit::AssertionFailedError => err
+    rescue assertion_failed_error => err
     end
     assert_not_nil err
   end
@@ -94,7 +92,7 @@ class TestFlexMock < Test::Unit::TestCase
   end
 
   def test_zero_counts
-    assert_raises(Test::Unit::AssertionFailedError) do
+    assert_raises(assertion_failed_error) do
       FlexMock.use { |m|
         s { m.mock_handle(:blip, 0) }
         m.blip
@@ -103,7 +101,7 @@ class TestFlexMock < Test::Unit::TestCase
   end
 
   def test_file_io_with_use
-    file = FlexMock.use do |m|
+    FlexMock.use do |m|
       filedata = ["line 1", "line 2"]
       s { m.mock_handle(:gets, 3) { filedata.shift } }
       assert_equal 2, count_lines(m)
@@ -112,14 +110,14 @@ class TestFlexMock < Test::Unit::TestCase
 
   def count_lines(stream)
     result = 0
-    while line = stream.gets
+    while stream.gets
       result += 1
     end
-    result    
+    result
   end
 
   def test_use
-    assert_raises(Test::Unit::AssertionFailedError) {
+    assert_raises(assertion_failed_error) {
       FlexMock.use do |m|
 	s { m.mock_handle(:blip, 2) }
 	m.blip
@@ -145,7 +143,7 @@ class TestFlexMock < Test::Unit::TestCase
     assert_equal 9, @mock.get
     assert_equal 16, @mock.get
   end
-  
+
   def test_respond_to_returns_false_for_non_handled_methods
     assert(!@mock.respond_to?(:blah), "should not respond to blah")
   end
@@ -222,6 +220,6 @@ class TestAnyInstance < Test::Unit::TestCase
       end
     end
     m = Dog.new
-    assert_equal :whimper,  m.bark   
+    assert_equal :whimper,  m.bark
   end
-end  
+end