1 files changed, 14 insertions, 0 deletions
diff --git a/mox_test.py b/mox_test.py
index bf806f6..e1626d6 100755
--- a/mox_test.py
+++ b/mox_test.py
@@ -1030,6 +1030,20 @@ class MockObjectTest(unittest.TestCase):
     self.assertEquals(['a', 'b'], [x for x in dummy])
     dummy._Verify()
 
+  def testInstantiationWithAdditionalAttributes(self):
+    mock_object = mox.MockObject(TestClass, attrs={"attr1": "value"})
+    self.assertEquals(mock_object.attr1, "value")
+
+  def testCantOverrideMethodsWithAttributes(self):
+    self.assertRaises(ValueError, mox.MockObject, TestClass,
+                      attrs={"ValidCall": "value"})
+
+  def testCantMockNonPublicAttributes(self):
+    self.assertRaises(mox.PrivateAttributeError, mox.MockObject, TestClass,
+                      attrs={"_protected": "value"})
+    self.assertRaises(mox.PrivateAttributeError, mox.MockObject, TestClass,
+                      attrs={"__private": "value"})
+
 
 class MoxTest(unittest.TestCase):
   """Verify Mox works correctly."""