[z3-checkins] r10825 - z3/Five/trunk/tests/products/FiveTest

[philikon at codespeak.net]

Author: philikon
Date: Mon Apr 18 20:51:20 2005
New Revision: 10825

Added:
   z3/Five/trunk/tests/products/FiveTest/schemacontent.py   (contents, props changed)
Modified:
   z3/Five/trunk/tests/products/FiveTest/configure.zcml
   z3/Five/trunk/tests/products/FiveTest/fancycontent.py
Log:
flesh the complexschemacontent test class out to its own module
and fix some bugs/minor details (InitializeClass, metatype, etc.)


Modified: z3/Five/trunk/tests/products/FiveTest/configure.zcml
==============================================================================
--- z3/Five/trunk/tests/products/FiveTest/configure.zcml	(original)
+++ z3/Five/trunk/tests/products/FiveTest/configure.zcml	Mon Apr 18 20:51:20 2005
@@ -310,7 +310,7 @@
       permission="zope2.Public"
       />
       
-  <five:traversable class=".fancycontent.ComplexSchemaContent" />
+  <five:traversable class=".schemacontent.ComplexSchemaContent" />
 
   <browser:editform
       schema=".interfaces.IComplexSchemaContent"

Modified: z3/Five/trunk/tests/products/FiveTest/fancycontent.py
==============================================================================
--- z3/Five/trunk/tests/products/FiveTest/fancycontent.py	(original)
+++ z3/Five/trunk/tests/products/FiveTest/fancycontent.py	Mon Apr 18 20:51:20 2005
@@ -4,8 +4,7 @@
 from Globals import InitializeClass
 
 from zope.interface import implements
-from interfaces import IFancyContent, IComplexSchemaContent
-from simplecontent import FieldSimpleContent
+from interfaces import IFancyContent
 
 class FancyAttribute(Acquisition.Explicit):
     """Doc test fanatics"""
@@ -45,20 +44,3 @@
     """Add the fancy fancy content."""
     id = self._setObject(id, FancyContent(id))
     return ''
-
-class ComplexSchemaContent(SimpleItem):
-    
-     implements(IComplexSchemaContent)
-     
-     def __init__(self, id):
-         self.id = id
-         self.fish = FieldSimpleContent('fish', 'title')
-         self.fish.description = ""
-         self.fishtype = 'Lost fishy'
-
-InitializeClass(FancyContent)
-
-def manage_addComplexSchemaContent(self, id, REQUEST=None):
-    """Add the fancy fancy content."""
-    id = self._setObject(id, ComplexSchemaContent(id))
-    return ''

Added: z3/Five/trunk/tests/products/FiveTest/schemacontent.py
==============================================================================
--- (empty file)
+++ z3/Five/trunk/tests/products/FiveTest/schemacontent.py	Mon Apr 18 20:51:20 2005
@@ -0,0 +1,24 @@
+from OFS.SimpleItem import SimpleItem
+from Globals import InitializeClass
+
+from zope.interface import implements
+from interfaces import IComplexSchemaContent
+from simplecontent import FieldSimpleContent
+
+class ComplexSchemaContent(SimpleItem):
+     implements(IComplexSchemaContent)
+
+     meta_type ="Complex Schema Content"
+
+     def __init__(self, id):
+         self.id = id
+         self.fish = FieldSimpleContent('fish', 'title')
+         self.fish.description = ""
+         self.fishtype = 'Lost fishy'
+
+InitializeClass(ComplexSchemaContent)
+
+def manage_addComplexSchemaContent(self, id, REQUEST=None):
+    """Add the fancy fancy content."""
+    id = self._setObject(id, ComplexSchemaContent(id))
+    return ''