test/test_flexmodel.rb in flexmock-0.6.4 vs test/test_flexmodel.rb in flexmock-0.7.0

@@ -3,20 +3,36 @@
 require 'test/unit'
 
 class DummyModel
 end
 
+class ChildModel < DummyModel
+end
+
 ######################################################################
 class TestFlexModel < Test::Unit::TestCase
   include FlexMock::TestCase
 
   def test_initial_conditions
     model = flexmock(:model, DummyModel)
-    assert_match(/^DummyModel_\d+/, model.mock_name)
+    assert_match(/^DummyModel_\d+/, model.flexmock_name)
     assert_equal model.id.to_s, model.to_params
     assert ! model.new_record?
     assert model.is_a?(DummyModel)
+    # TODO: Make these work!!!
     assert_equal DummyModel, model.class
+    assert model.instance_of?(DummyModel)
+    assert model.kind_of?(DummyModel)
+  end
+
+  def test_classifying_mock_models
+    model = flexmock(:model, ChildModel)
+
+    assert model.kind_of?(ChildModel)
+    assert model.instance_of?(ChildModel)
+
+    assert model.kind_of?(DummyModel)
+    assert ! model.instance_of?(DummyModel)
   end
 
   def test_mock_models_have_different_ids
     m1 = flexmock(:model, DummyModel)
     m2 = flexmock(:model, DummyModel)