test/unit/mockery_test.rb in mocha-1.4.0 vs test/unit/mockery_test.rb in mocha-1.5.0

@@ -7,13 +7,28 @@
 class MockeryTest < Mocha::TestCase
 
   include Mocha
   include DeprecationDisabler
 
-  def test_should_build_instance_of_mockery
+  def setup
+    Mockery.setup
+  end
+
+  def teardown
+    Mockery.teardown
+  end
+
+  def test_should_return_null_mockery_if_not_setup
+    Mockery.teardown
     mockery = Mockery.instance
     assert_not_nil mockery
+    assert_kind_of Mockery::Null, mockery
+  end
+
+  def test_should_return_instance_of_mockery
+    mockery = Mockery.instance
+    assert_not_nil mockery
     assert_kind_of Mockery, mockery
   end
 
   def test_should_cache_instance_of_mockery
     mockery_1 = Mockery.instance
@@ -21,10 +36,10 @@
     assert_same mockery_1, mockery_2
   end
 
   def test_should_expire_mockery_instance_cache
     mockery_1 = Mockery.instance
-    Mockery.reset_instance
+    Mockery.teardown
     mockery_2 = Mockery.instance
     assert_not_same mockery_1, mockery_2
   end
 
   def test_should_raise_expectation_error_because_not_all_expectations_are_satisfied