test/stubba_integration_test.rb in mocha-0.1.2 vs test/stubba_integration_test.rb in mocha-0.2.0

@@ -1,10 +1,10 @@
 require 'test_helper'
-require 'stubba_replacer'
 
 require 'stubba/object'
-require 'stubba/test_case'
+require 'smart_test_case/multiple_setup_and_teardown'
+require 'stubba/setup_and_teardown'
 
 class StubbaIntegrationTest < Test::Unit::TestCase
   
   class DontMessWithMe
     def self.method_x
@@ -12,48 +12,48 @@
     end
   end
 
   def test_should_stub_class_method_within_test
     test_class = Class.new(Test::Unit::TestCase) do
-      def test_me
+      include MultipleSetupAndTeardown
+      include SetupAndTeardown
+      define_method(:test_me) do
         DontMessWithMe.expects(:method_x).returns(:new_return_value)
         assert_equal :new_return_value, DontMessWithMe.method_x
       end
     end
     test = test_class.new(:test_me)
 
-    replace_stubba(nil) do
-      test_result = Test::Unit::TestResult.new
-      test.run(test_result) {}
-      assert test_result.passed?
-    end
+    test_result = Test::Unit::TestResult.new
+    test.run(test_result) {}
+    assert test_result.passed?
   end
 
   def test_should_leave_stubbed_class_unchanged_after_test
     test_class = Class.new(Test::Unit::TestCase) do
-      def test_me
+      include MultipleSetupAndTeardown
+      include SetupAndTeardown
+      define_method(:test_me) do
         DontMessWithMe.expects(:method_x).returns(:new_return_value)
       end
     end
     test = test_class.new(:test_me)
 
-    replace_stubba(nil) do
-      test.run(Test::Unit::TestResult.new) {}
-      assert_equal :original_return_value, DontMessWithMe.method_x
-    end
+    test.run(Test::Unit::TestResult.new) {}
+    assert_equal :original_return_value, DontMessWithMe.method_x
   end
   
   def test_should_reset_expectations_after_test
     test_class = Class.new(Test::Unit::TestCase) do
-      def test_me
+      include MultipleSetupAndTeardown
+      include SetupAndTeardown
+      define_method(:test_me) do
         DontMessWithMe.expects(:method_x)
       end
     end
     test = test_class.new(:test_me)
     
-    replace_stubba(nil) do
-      test.run(Test::Unit::TestResult.new) {}
-    end
+    test.run(Test::Unit::TestResult.new) {}
     assert_equal 0, DontMessWithMe.mocha.expectations.size
   end  
 
 end
\ No newline at end of file