[Zope3-checkins] CVS: Zope3/src/zope/app/container/tests - test_contained.py:1.1.2.3

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/container/tests
In directory cvs.zope.org:/tmp/cvs-serv24676/src/zope/app/container/tests

Modified Files:
      Tag: parentgeddon-branch
	test_contained.py 
Log Message:
Reimplemented the ContainedProxy to be a persistent proxy.

Had to make some changes to zodb to support persistent proxies.
I've termorarily broken conflict resolution.



=== Zope3/src/zope/app/container/tests/test_contained.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/container/tests/test_contained.py:1.1.2.2	Fri Sep 12 15:38:42 2003
+++ Zope3/src/zope/app/container/tests/test_contained.py	Wed Sep 17 09:00:49 2003
@@ -14,11 +14,154 @@
 import unittest
 from zope.testing.doctestunit import DocTestSuite
 from zope.app.tests.placelesssetup import setUp, tearDown
+from zope.app.container.contained import ContainedProxy
+from zodb.storage.memory import MemoryMinimalStorage
+from zodb.db import DB
+from transaction import get_transaction
+from persistence import Persistent
+
+class MyOb(Persistent):
+    pass
+
+def test_basic_attribute_management_and_picklability():
+    """Contained-object proxy
+
+    This is a picklable proxy that can be put around objects that
+    don't implemeny IContained.
+
+    >>> l = [1, 2, 3]
+    >>> p = ContainedProxy(l)
+    >>> p.__parent__ = 'Dad'
+    >>> p.__name__ = 'p'
+    >>> p
+    [1, 2, 3]
+    >>> p.__parent__
+    'Dad'
+    >>> p.__name__
+    'p'
+
+    >>> import pickle
+    >>> p2 = pickle.loads(pickle.dumps(p))
+    >>> p2
+    [1, 2, 3]
+    >>> p2.__parent__
+    'Dad'
+    >>> p2.__name__
+    'p'
+    """
+    
+def test_basic_persistence_w_non_perssitent_proxied():
+    """
+    >>> p = ContainedProxy([1])
+    >>> p.__parent__ = 2;
+    >>> p.__name__ = 'test'
+    >>> db = DB(MemoryMinimalStorage('test_storage'));
+    >>> c = db.open()
+    >>> c.root()['p'] = p
+    >>> get_transaction().commit()
+
+    >>> c2 = db.open()
+    >>> p2 = c2.root()['p']
+    >>> p2
+    [1]
+    >>> p2.__parent__
+    2
+    >>> p2.__name__
+    'test'
+    
+    """
+    
+def test_basic_persistence_w_perssitent_proxied():
+    """
+
+    Here, we'll verify that shared references work and
+    that updates to both the proxies and the proxied objects
+    are made correctly.
+
+            ----------------------
+            |                    |
+          parent                other
+            |                 /
+           ob  <--------------
+
+    Here we have an object, parent, that contains ob.  There is another
+    object, other, that has a non-container reference to ob.
+
+    >>> parent = MyOb()
+    >>> parent.ob = ContainedProxy(MyOb())
+    >>> parent.ob.__parent__ = parent
+    >>> parent.ob.__name__ = 'test'
+    >>> other = MyOb()
+    >>> other.ob = parent.ob
+
+    We can change ob through either parent or other
+    
+    >>> parent.ob.x = 1
+    >>> other.ob.y = 2
+
+    Now we'll save the data:
+    
+    >>> db = DB(MemoryMinimalStorage('test_storage'));
+    >>> c1 = db.open()
+    >>> c1.root()['parent'] = parent
+    >>> c1.root()['other'] = other
+    >>> get_transaction().commit()
+
+    We'll open a second connection and verify that we have the data we
+    expect:
+
+    >>> c2 = db.open()
+    >>> p2 = c2.root()['parent']
+    >>> p2.ob.__parent__ is p2
+    1
+    >>> p2.ob.x
+    1
+    >>> p2.ob.y
+    2
+    >>> o2 = c2.root()['other']
+    >>> o2.ob is p2.ob
+    1
+    >>> o2.ob is p2.ob
+    1
+    >>> o2.ob.__name__
+    'test'
+
+    Now we'll change things around a bit. We'll move things around
+    a bit. We'll also add an attribute to ob
+
+    >>> o2.ob.__name__ = 'test 2'
+    >>> o2.ob.__parent__ = o2
+    >>> o2.ob.z = 3
+
+    >>> p2.ob.__parent__ is p2
+    0
+    >>> p2.ob.__parent__ is o2
+    1
+
+    And save the changes:
+    
+    >>> get_transaction().commit()
+
+    Now we'll reopen the first connection and verify that we can see
+    the changes:
+
+    >>> c1.close()
+    >>> c1 = db.open()
+    >>> p2 = c1.root()['parent']
+    >>> p2.ob.__name__
+    'test 2'
+    >>> p2.ob.z
+    3
+    >>> p2.ob.__parent__ is c1.root()['other']
+    1
+        
+    """
 
 def test_suite():
     return unittest.TestSuite((
         DocTestSuite('zope.app.container.contained',
                      setUp=setUp, tearDown=tearDown),
+        DocTestSuite(),
         ))
 
 if __name__ == '__main__': unittest.main()