[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ Fixed types tool test to only test creation for type infos.

Hanno Schlichting hannosch at hannosch.eu
Fri May 6 15:06:33 EDT 2011


Log message for revision 121572:
  Fixed types tool test to only test creation for type infos.
  

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
  U   Products.CMFCore/trunk/Products/CMFCore/tests/test_TypesTool.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2011-05-06 18:59:12 UTC (rev 121571)
+++ Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2011-05-06 19:06:33 UTC (rev 121572)
@@ -4,6 +4,8 @@
 2.3.0-alpha (unreleased)
 ------------------------
 
+- Fixed types tool test to only test creation for type infos.
+
 - utils: Fixed '_OldCacheHeaders' and '_FSCacheHeaders' methods.
   DateTimeErrors caused by invalid HTTP headers were not caught.
 

Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_TypesTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_TypesTool.py	2011-05-06 18:59:12 UTC (rev 121571)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_TypesTool.py	2011-05-06 19:06:33 UTC (rev 121572)
@@ -95,9 +95,9 @@
         return site
 
     def test_allMetaTypes(self):
-        # everything returned by allMetaTypes can be traversed to.
+        # all typeinfo's returned by allMetaTypes can be traversed to.
         from Acquisition import aq_base
-        from Products.PythonScripts.standard import html_quote
+        from Products.CMFCore.interfaces import ITypeInformation
         from webdav.NullResource import NullResource
         site = self._makeSite().__of__(self.root)
         tool = self._makeOne().__of__(site)
@@ -105,10 +105,10 @@
         # Seems we get NullResource if the method couldn't be traverse to
         # so we check for that. If we've got it, something is b0rked.
         for factype in tool.all_meta_types():
-            meta_types[factype['name']]=1
-            # The html_quote below is necessary 'cos of the one in
-            # main.dtml. Could be removed once that is gone.
-            act = tool.unrestrictedTraverse(html_quote(factype['action']))
+            if not ITypeInformation in factype['interfaces']:
+                continue
+            meta_types[factype['name']] = 1
+            act = tool.unrestrictedTraverse(factype['action'])
             self.failIf(type(aq_base(act)) is NullResource)
 
         # Check the ones we're expecting are there



More information about the checkins mailing list