test/stubba/instance_method_test.rb in mocha-0.3.2 vs test/stubba/instance_method_test.rb in mocha-0.3.3

@@ -25,73 +25,22 @@
   
   def test_should_raise_assertion_failed_error_when_attempting_to_stub_non_existent_method
     klass = Class.new
     instance = klass.new
     method = InstanceMethod.new(instance, :non_existent_method)
+
     assert_raise(Test::Unit::AssertionFailedError) { method.stub }
   end
   
-  def test_should_call_define_new_method
+  def test_should_not_raise_assertion_failed_error_when_attempting_to_stub_existing_method
     klass = Class.new { def method_x; end }
     instance = klass.new
     method = InstanceMethod.new(instance, :method_x)
-    method.define_instance_accessor(:define_called)
-    method.replace_instance_method(:define_new_method) { self.define_called = true }
-    
-    method.stub
-    
-    assert method.define_called
+
+    assert_nothing_raised(Test::Unit::AssertionFailedError) { method.stub }
   end
-    
-  def test_should_not_call_hide_original_method
-    klass = Class.new { def method_x; end }
-    instance = klass.new
-    method = InstanceMethod.new(instance, :method_x)
-    method.replace_instance_method(:define_new_method) { }
-    method.define_instance_accessor(:hide_called)
-    method.replace_instance_method(:hide_original_method) { self.hide_called = true }
-    
-    method.stub
-    
-    assert !method.hide_called
-  end
-    
-  def test_should_not_call_restore_original_method
-    klass = Class.new { def method_x; end }
-    instance = klass.new
-    method = InstanceMethod.new(instance, :method_x)
-    method.replace_instance_method(:define_new_method) { }
-    method.define_instance_accessor(:restore_called)
-    method.replace_instance_method(:restore_original_method) { self.restore_called = true }
-    
-    method.unstub
-    
-    assert !method.restore_called
-  end
   
-  def test_should_not_call_remove_new_method
-    klass = Class.new { def method_x; end }
-    instance = klass.new
-    method = InstanceMethod.new(instance, :method_x)
-    method.replace_instance_method(:define_new_method) { }
-    method.define_instance_accessor(:remove_called)
-    method.replace_instance_method(:remove_new_method) { self.remove_called = true }
-    
-    method.unstub
-    
-    assert !method.remove_called
+  def test_should_inherit_from_class_method
+    assert_equal ClassMethod, InstanceMethod.superclass
   end
-  
-  def test_should_not_call_reset_mocha
-    klass = Class.new { def method_x; end }
-    instance = klass.new
-    instance.define_instance_accessor(:reset_called)
-    instance.define_instance_method(:reset_mocha) { self.reset_called = true }
-    method = InstanceMethod.new(instance, :method_x)
-    method.replace_instance_method(:define_new_method) { }
-    
-    method.unstub
-    
-    assert !instance.reset_called
-  end
-  
+
 end
\ No newline at end of file