More functional tests from ZODB: test persistent class invalidation, and...

More functional tests from ZODB: test persistent class invalidation, and changing the _p_oid and _p_jar when not in a jar's cache.

persistent/tests/test_persistence.py

@@ -127,6 +127,15 @@ class _Persistent_Base(object):
         self.assertTrue(inst._p_jar is jar)
         inst._p_jar = jar # reassign only to same DM
 
+    def test_assign_p_jar_not_in_cache_allowed(self):
+        jar = self._makeJar()
+        inst = self._makeOne()
+        inst._p_jar = jar
+        # Both of these are allowed
+        inst._p_jar = self._makeJar()
+        inst._p_jar = None
+        self.assertEqual(inst._p_jar, None)
+
     def test_assign_p_oid_w_invalid_oid(self):
         inst, jar, OID = self._makeOneWithJar()
         def _test():
@@ -166,6 +175,15 @@ class _Persistent_Base(object):
             inst._p_oid = new_OID
         self.assertRaises(ValueError, _test)
 
+    def test_assign_p_oid_not_in_cache_allowed(self):
+        jar = self._makeJar()
+        inst = self._makeOne()
+        inst._p_jar = jar
+        inst._p_oid = 1 # anything goes
+        inst._p_oid = 42
+        self.assertEqual(inst._p_oid, 42)
+
+
     def test_delete_p_oid_wo_jar(self):
         from persistent.timestamp import _makeOctets
         OID = _makeOctets('\x01' * 8)

persistent/tests/test_picklecache.py

@@ -1025,6 +1025,25 @@ class PickleCacheTests(unittest.TestCase):
         # sanity check
         self.assertTrue(cache.total_estimated_size >= 0)
 
+    def test_invalidate_persistent_class_calls_p_invalidate(self):
+        from persistent._compat import _b
+        KEY = _b('pclass')
+        class pclass(object):
+            _p_oid = KEY
+            invalidated = False
+            @classmethod
+            def _p_invalidate(cls):
+                cls.invalidated = True
+
+
+        cache = self._makeOne()
+
+        cache[KEY] = pclass
+
+        cache.invalidate(KEY)
+
+        self.assertTrue(pclass.invalidated)
+
 class DummyPersistent(object):
 
     def _p_invalidate(self):