test/stubba_integration_test.rb in mocha-0.3.3 vs test/stubba_integration_test.rb in mocha-0.4.0

@@ -1,94 +1,87 @@
 require 'test_helper'
 
-require 'stubba/object'
-require 'smart_test_case/multiple_setup_and_teardown'
-require 'stubba/setup_and_teardown'
+require 'mocha/object'
+require 'mocha/test_case_adapter'
+require 'mocha/standalone'
 
 class StubbaIntegrationTest < Test::Unit::TestCase
   
   class DontMessWithMe
-    def self.method_x
+    def self.my_class_method
       :original_return_value
     end
-    def instance_method_1
+    def my_instance_method
       :original_return_value
     end
-    # def self.object
-    #   @object ||= Class.new do
-    #     def instance_method_1
-    #       :original_return_value
-    #     end
-    #   end.new
-    # end
   end
   
   def test_should_stub_class_method_within_test
     test = build_test do
-      DontMessWithMe.expects(:method_x).returns(:new_return_value)
-      assert_equal :new_return_value, DontMessWithMe.method_x
+      DontMessWithMe.expects(:my_class_method).returns(:new_return_value)
+      assert_equal :new_return_value, DontMessWithMe.my_class_method
     end
 
     test_result = Test::Unit::TestResult.new
     test.run(test_result) {}
     assert test_result.passed?
   end
 
   def test_should_leave_stubbed_class_method_unchanged_after_test
     test = build_test do
-      DontMessWithMe.expects(:method_x).returns(:new_return_value)
+      DontMessWithMe.expects(:my_class_method).returns(:new_return_value)
     end
 
     test.run(Test::Unit::TestResult.new) {}
-    assert_equal :original_return_value, DontMessWithMe.method_x
+    assert_equal :original_return_value, DontMessWithMe.my_class_method
   end
   
   def test_should_reset_class_expectations_after_test
     test = build_test do
-      DontMessWithMe.expects(:method_x)
+      DontMessWithMe.expects(:my_class_method)
     end
     
     test.run(Test::Unit::TestResult.new) {}
     assert_equal 0, DontMessWithMe.mocha.expectations.size
   end  
 
   def test_should_stub_instance_method_within_test
     instance = DontMessWithMe.new
     test = build_test do
-      instance.expects(:instance_method_1).returns(:new_return_value)
-      assert_equal :new_return_value, instance.instance_method_1
+      instance.expects(:my_instance_method).returns(:new_return_value)
+      assert_equal :new_return_value, instance.my_instance_method
     end
     test_result = Test::Unit::TestResult.new
     test.run(test_result) {}
     assert test_result.passed?
   end
   
   def test_should_leave_stubbed_instance_method_unchanged_after_test
     instance = DontMessWithMe.new
     test = build_test do
-      instance.expects(:instance_method_1).returns(:new_return_value)
+      instance.expects(:my_instance_method).returns(:new_return_value)
     end
 
     test.run(Test::Unit::TestResult.new) {}
-    assert_equal :original_return_value, instance.instance_method_1
+    assert_equal :original_return_value, instance.my_instance_method
   end
   
   def test_should_reset_instance_expectations_after_test
     instance = DontMessWithMe.new
     test = build_test do
-      instance.expects(:instance_method_1).returns(:new_return_value)
+      instance.expects(:my_instance_method).returns(:new_return_value)
     end
     
     test.run(Test::Unit::TestResult.new) {}
     assert_equal 0, instance.mocha.expectations.size
   end  
 
   private
 
   def build_test(&block)
     test_class = Class.new(Test::Unit::TestCase) do
-      include MultipleSetupAndTeardown
-      include SetupAndTeardown
+      include Mocha::Standalone
+      include Mocha::TestCaseAdapter
       define_method(:test_me, &block)
     end
     test_class.new(:test_me)
   end
 
\ No newline at end of file