Changeset 35144

Timestamp:

04/12/06 15:45:24 (3 years ago)

Author:

gracinet

Message:

#1608: datamodel is instancied if necessary in ProxyTool?.createRevision

Files:

• CPSCore/trunk/ProxyTool.py (modified) (2 diffs)
• CPSCore/trunk/tests/dummy.py (modified) (1 diff)
• CPSCore/trunk/tests/test_indexing.py (modified) (1 diff)
• CPSCore/trunk/tests/test_proxy.py (modified) (4 diffs)

CPSCore/trunk/ProxyTool.py

@@ -44 +44 @@
-     REQUEST_LANGUAGE_KEY
-from Products.CPSUtil.session import sessionGet
+from Products.CPSUtil.integration import isProductPresent
+try:
+    from Products.CPSSchemas.DataModel import DataModel
+except ImportError:
+    DATAMODEL_PRESENT = False
+else:
+    DATAMODEL_PRESENT = True
-
-from zope.app.event.interfaces import IObjectModifiedEvent
@@ -165 +172 @@
-            ob, rev = repotool.copyRevision(docid, from_rev)
-        else:
+            dm = kw.get('datamodel')
+            if dm is None and DATAMODEL_PRESENT:
+                dm = DataModel(None)
+                kw['datamodel'] = dm
+            if dm is not None:
+                dm._setObject(None, proxy=proxy)
-            ob, rev = repotool.createRevision(docid, type_name, *args, **kw)
-        if hasattr(aq_base(ob), 'setLanguage'):

CPSCore/trunk/tests/dummy.py

@@ -65 +65 @@
-            return DummyTypeInfo('Dummy Content')
-        return None
+
+class DummyObjectRepositoryTool(Folder):
+    _last_calls = {}
+
+    def createRevision(self, docid, type_name, *args, **kw):
+        self._last_calls['createRevision'] = {'docid': docid,
+                                              'type_name': type_name,
+                                              'args': args,
+                                              'kw': kw}
+        rev = 17
+
+        id = 'ob_%s_%s' % (docid, rev)  #Copy/Paste from DummyProxyTool
+        if id not in self.objectIds():
+            doc = SimpleItem(id)
+            doc._setId(id)
+            doc.portal_type = 'Some Type'
+            self._setObject(id, doc)
+        return self._getOb(id), rev
+
+    def getFreeDocid(self):
+        return 'a free docid from repotool'
+
+    def isObjectInRepository(self, ob):
+        return ob in self.objectValues()
+

CPSCore/trunk/tests/test_indexing.py

@@ -70 +70 @@
-class FakeTI:
-    _isTypeInformation = True
-
+, **kw
-        ob = DummyOb(id)
-        container._setObject(id, ob)

CPSCore/trunk/tests/test_proxy.py

@@ -34 +34 @@
-
-from Products.CPSCore.ProxyTool import ProxyTool
+from Products.CPSCore.ProxyTool import DATAMODEL_PRESENT
-from Products.CPSCore.ProxyBase import ProxyBase, ProxyFolder
-
-
+
+
+
+
+
-
-from Products.CMFCore.permissions import View
@@ -78 +83 @@
-        self.id = id
-        ProxyBase.__init__(self, **kw)
-
-
-def sortinfos(infos):
@@ -264 +268 @@
-        root = self.root
-
+        root._setObject('portal_repository', DummyObjectRepositoryTool())
-        root._setObject('portal_proxies', ProxyTool())
-        root._setObject('portal_url', DummyPortalUrl())
-        root._setObject('portal_workflow', DummyWorkflowTool())
+        root._setObject('portal_types', DummyTypesTool())
-
-        root.docs = Folder()
@@ -340 +346 @@
-        self.assertRaises(KeyError, ptool.getProxyInfosFromDocid, 'blah')
-
+    def test_createRevision(self):
+        # see #1608
+        ptool = self.root.portal_proxies
+        ptool.ignore_events = True # Dummy repotool cannot cope
+
+        proxy = ProxyBase(1357, language_revs={'en': 78})
+
+        # preparing the proxy to insulate what's being tested
+        def getPortalTypeName():
+            return 'Dummy Content'
+        def dontReindex():
+            pass
+        proxy.getPortalTypeName = getPortalTypeName
+        proxy.proxyChanged = dontReindex
+
+        # call
+        rev = ptool.createRevision(proxy, 'fr')
+
+        if not DATAMODEL_PRESENT:
+            return
+
+        # datamodel was constructed and tied to the proxy
+        passed = self.root.portal_repository._last_calls['createRevision']
+        dm = passed['kw'].get('datamodel')
+        self.assert_(dm is not None)
+        self.assertEquals(dm.getProxy(), proxy)
+
+        # previous datamodel stays the same, but is now tied to the proxy
+        from Products.CPSCore.ProxyTool import DataModel
+        dm = DataModel(None)
+        rev = ptool.createRevision(proxy, 'fr2', datamodel=dm)
+        passed = self.root.portal_repository._last_calls['createRevision']
+        passed_dm = passed['kw'].get('datamodel')
+        self.assert_(passed_dm is dm)
+        self.assertEquals(dm.getProxy(), proxy)
+
+
-
-def test_suite():