[Zope-Checkins] CVS: Zope3/lib/python/Zope/ComponentArchitecture/tests - testDirectives.py:1.1.2.6

Shane Hathaway shane@cvs.zope.org
Wed, 13 Mar 2002 23:19:45 -0500


Update of /cvs-repository/Zope3/lib/python/Zope/ComponentArchitecture/tests
In directory cvs.zope.org:/tmp/cvs-serv17881

Modified Files:
      Tag: Zope-3x-branch
	testDirectives.py 
Log Message:
Removed the carriage-return characters.


=== Zope3/lib/python/Zope/ComponentArchitecture/tests/testDirectives.py 1.1.2.5 => 1.1.2.6 ===
-#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# 
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
-# 
-##############################################################################
-
-import unittest, sys
-from Zope.Configuration.xmlconfig import xmlconfig
-from Zope.ComponentArchitecture.tests.TestViews import \
-     IV, IC, V1, VZMI, R1, RZMI
-from Zope.ComponentArchitecture.Exceptions import ComponentLookupError
-from Zope.ComponentArchitecture import getView, getResource, createObject
-from cStringIO import StringIO
-from Zope.Testing.CleanUp import CleanUp # Base class w registry cleanup
-from Zope.ComponentArchitecture import getDefaultViewName
-
-template = """<zopeConfigure
-   xmlns='http://namespaces.zope.org/zope'
-   xmlns:test='http://www.zope.org/NS/Zope3/test'>
-   %s
-   </zopeConfigure>"""
-
-
-class Ob:
-    __implements__ = IC
-
-class Test(CleanUp, unittest.TestCase):
-
-    # XXX: tests for other directives needed
-
-    def testView(self):
-
-        ob = Ob()
-        self.assertEqual(getView(ob, 'test', IV, None), None)
-
-        xmlconfig(StringIO(template % (
-            """
-            <directive name="view"
-                       attributes="component, type, name, for, layer"
-               handler="Zope.ComponentArchitecture.metaConfigure.view"
-               namespace="http://namespaces.zope.org/zope" />
-            <view name="test"
-                  factory="Zope.ComponentArchitecture.tests.TestViews.V1"
-                  for="Zope.ComponentArchitecture.tests.TestViews.IC" 
-                  type="Zope.ComponentArchitecture.tests.TestViews.IV"/> 
-            """
-            ))) 
-        
-        self.assertEqual(getView(ob, 'test', IV, None).__class__, V1)
-        
-        
-    def testDefaultView(self):
-
-        ob = Ob()
-        self.assertEqual(getView(ob, 'test', IV, None), None)
-
-        xmlconfig(StringIO(template % (
-            """
-            <directive name="defaultView"
-                       attributes="component, type, name, for, layer"
-               handler="Zope.ComponentArchitecture.metaConfigure.defaultView"
-               namespace="http://namespaces.zope.org/zope" />
-            <defaultView name="test"
-                  factory="Zope.ComponentArchitecture.tests.TestViews.V1"
-                  for="Zope.ComponentArchitecture.tests.TestViews.IC" 
-                  type="Zope.ComponentArchitecture.tests.TestViews.IV"/> 
-            """
-            ))) 
-        
-        self.assertEqual(getView(ob, 'test', IV, None).__class__, V1)
-        self.assertEqual(getDefaultViewName(ob, IV), 'test')
-         
-    def testSKinView(self):
-
-        ob = Ob()
-        self.assertEqual(getView(ob, 'test', IV, None), None)
-
-        xmlconfig(StringIO(template % (
-            """
-            <directive name="view"
-                       attributes="component, type, name, for, layer"
-                handler="Zope.ComponentArchitecture.metaConfigure.view"
-                namespace="http://namespaces.zope.org/zope" />
-            <directive name="skin" attributes="name, type, layers"
-                handler="Zope.ComponentArchitecture.metaConfigure.skin"
-                namespace="http://namespaces.zope.org/zope" />
-            <skin name="zmi" layers="zmi,"
-                  type="Zope.ComponentArchitecture.tests.TestViews.IV" />
-            <view name="test"
-                  factory="Zope.ComponentArchitecture.tests.TestViews.VZMI"
-                  layer="zmi" 
-                  for="Zope.ComponentArchitecture.tests.TestViews.IC" 
-                  type="Zope.ComponentArchitecture.tests.TestViews.IV"/> 
-            <view name="test"
-                  factory="Zope.ComponentArchitecture.tests.TestViews.V1"
-                  for="Zope.ComponentArchitecture.tests.TestViews.IC" 
-                  type="Zope.ComponentArchitecture.tests.TestViews.IV"/>
-            """
-            ))) 
-        
-        self.assertEqual(getView(ob, 'test', IV, None).__class__, V1)
-        self.assertEqual(getView(ob, 'test', IV, None, skin='zmi').__class__,
-                         VZMI)
-
-    def testResource(self):
-
-        ob = Ob()
-        self.assertEqual(getResource(ob, 'test', IV, None), None)
-
-        xmlconfig(StringIO(template % (
-            """
-            <directive name="resource"
-                       attributes="component, type, name, layer"
-               handler="Zope.ComponentArchitecture.metaConfigure.resource"
-               namespace="http://namespaces.zope.org/zope" />
-            <resource name="test"
-                  component="Zope.ComponentArchitecture.tests.TestViews.r1"
-                  type="Zope.ComponentArchitecture.tests.TestViews.IV"/> 
-            """
-            ))) 
-        
-        self.assertEqual(getResource(ob, 'test', IV, None).__class__, R1)
-         
-    def testSKinResource(self):
-
-        ob = Ob()
-        self.assertEqual(getResource(ob, 'test', IV, None), None)
-
-        xmlconfig(StringIO(template % (
-            """
-            <directive name="resource"
-                       attributes="component, type, name, layer"
-                handler="Zope.ComponentArchitecture.metaConfigure.resource"
-                namespace="http://namespaces.zope.org/zope" />
-            <directive name="skin" attributes="name, type, layers"
-                handler="Zope.ComponentArchitecture.metaConfigure.skin"
-                namespace="http://namespaces.zope.org/zope" />
-            <skin name="zmi" layers="zmi,"
-                  type="Zope.ComponentArchitecture.tests.TestViews.IV" />
-            <resource name="test"
-                  component="Zope.ComponentArchitecture.tests.TestViews.rZMI"
-                  layer="zmi" 
-                  type="Zope.ComponentArchitecture.tests.TestViews.IV"/> 
-            <resource name="test"
-                  component="Zope.ComponentArchitecture.tests.TestViews.r1"
-                  type="Zope.ComponentArchitecture.tests.TestViews.IV"/>
-            """
-            ))) 
-        
-        self.assertEqual(getResource(ob, 'test', IV, None).__class__, R1)
-        self.assertEqual(
-            getResource(ob, 'test', IV, None, skin='zmi').__class__,
-            RZMI)
-
-    def testFactory(self):
-
-        self.assertRaises(ComponentLookupError, createObject, None, 'foo')
-
-        xmlconfig(StringIO(template % (
-            """
-            <directive name="facory"
-                       attributes="component, factory_id"
-               handler="Zope.ComponentArchitecture.metaConfigure.factory"
-               namespace="http://namespaces.zope.org/zope" />
-            <facory 
-               factory_id="foo"
-               component="Zope.ComponentArchitecture.tests.TestFactory.f"
-               />
-            <facory 
-               component="Zope.ComponentArchitecture.tests.TestFactory.f"
-               />
-            """
-            ))) 
-
-        from Zope.ComponentArchitecture.tests.TestFactory import X
-        self.assertEqual(createObject(None, 'foo').__class__, X)
-        self.assertEqual(createObject(
-            None,
-            'Zope.ComponentArchitecture.tests.TestFactory.f').__class__, X)
-    
-def test_suite():
-    loader=unittest.TestLoader()
-    return loader.loadTestsFromTestCase(Test)
-if __name__=='__main__':
-    unittest.TextTestRunner().run(test_suite())
-
+##############################################################################
+#
+# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# 
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE
+# 
+##############################################################################
+
+import unittest, sys
+from Zope.Configuration.xmlconfig import xmlconfig
+from Zope.ComponentArchitecture.tests.TestViews import \
+     IV, IC, V1, VZMI, R1, RZMI
+from Zope.ComponentArchitecture.Exceptions import ComponentLookupError
+from Zope.ComponentArchitecture import getView, getResource, createObject
+from cStringIO import StringIO
+from Zope.Testing.CleanUp import CleanUp # Base class w registry cleanup
+from Zope.ComponentArchitecture import getDefaultViewName
+
+template = """<zopeConfigure
+   xmlns='http://namespaces.zope.org/zope'
+   xmlns:test='http://www.zope.org/NS/Zope3/test'>
+   %s
+   </zopeConfigure>"""
+
+
+class Ob:
+    __implements__ = IC
+
+class Test(CleanUp, unittest.TestCase):
+
+    # XXX: tests for other directives needed
+
+    def testView(self):
+
+        ob = Ob()
+        self.assertEqual(getView(ob, 'test', IV, None), None)
+
+        xmlconfig(StringIO(template % (
+            """
+            <directive name="view"
+                       attributes="component, type, name, for, layer"
+               handler="Zope.ComponentArchitecture.metaConfigure.view"
+               namespace="http://namespaces.zope.org/zope" />
+            <view name="test"
+                  factory="Zope.ComponentArchitecture.tests.TestViews.V1"
+                  for="Zope.ComponentArchitecture.tests.TestViews.IC" 
+                  type="Zope.ComponentArchitecture.tests.TestViews.IV"/> 
+            """
+            ))) 
+        
+        self.assertEqual(getView(ob, 'test', IV, None).__class__, V1)
+        
+        
+    def testDefaultView(self):
+
+        ob = Ob()
+        self.assertEqual(getView(ob, 'test', IV, None), None)
+
+        xmlconfig(StringIO(template % (
+            """
+            <directive name="defaultView"
+                       attributes="component, type, name, for, layer"
+               handler="Zope.ComponentArchitecture.metaConfigure.defaultView"
+               namespace="http://namespaces.zope.org/zope" />
+            <defaultView name="test"
+                  factory="Zope.ComponentArchitecture.tests.TestViews.V1"
+                  for="Zope.ComponentArchitecture.tests.TestViews.IC" 
+                  type="Zope.ComponentArchitecture.tests.TestViews.IV"/> 
+            """
+            ))) 
+        
+        self.assertEqual(getView(ob, 'test', IV, None).__class__, V1)
+        self.assertEqual(getDefaultViewName(ob, IV), 'test')
+         
+    def testSKinView(self):
+
+        ob = Ob()
+        self.assertEqual(getView(ob, 'test', IV, None), None)
+
+        xmlconfig(StringIO(template % (
+            """
+            <directive name="view"
+                       attributes="component, type, name, for, layer"
+                handler="Zope.ComponentArchitecture.metaConfigure.view"
+                namespace="http://namespaces.zope.org/zope" />
+            <directive name="skin" attributes="name, type, layers"
+                handler="Zope.ComponentArchitecture.metaConfigure.skin"
+                namespace="http://namespaces.zope.org/zope" />
+            <skin name="zmi" layers="zmi,"
+                  type="Zope.ComponentArchitecture.tests.TestViews.IV" />
+            <view name="test"
+                  factory="Zope.ComponentArchitecture.tests.TestViews.VZMI"
+                  layer="zmi" 
+                  for="Zope.ComponentArchitecture.tests.TestViews.IC" 
+                  type="Zope.ComponentArchitecture.tests.TestViews.IV"/> 
+            <view name="test"
+                  factory="Zope.ComponentArchitecture.tests.TestViews.V1"
+                  for="Zope.ComponentArchitecture.tests.TestViews.IC" 
+                  type="Zope.ComponentArchitecture.tests.TestViews.IV"/>
+            """
+            ))) 
+        
+        self.assertEqual(getView(ob, 'test', IV, None).__class__, V1)
+        self.assertEqual(getView(ob, 'test', IV, None, skin='zmi').__class__,
+                         VZMI)
+
+    def testResource(self):
+
+        ob = Ob()
+        self.assertEqual(getResource(ob, 'test', IV, None), None)
+
+        xmlconfig(StringIO(template % (
+            """
+            <directive name="resource"
+                       attributes="component, type, name, layer"
+               handler="Zope.ComponentArchitecture.metaConfigure.resource"
+               namespace="http://namespaces.zope.org/zope" />
+            <resource name="test"
+                  component="Zope.ComponentArchitecture.tests.TestViews.r1"
+                  type="Zope.ComponentArchitecture.tests.TestViews.IV"/> 
+            """
+            ))) 
+        
+        self.assertEqual(getResource(ob, 'test', IV, None).__class__, R1)
+         
+    def testSKinResource(self):
+
+        ob = Ob()
+        self.assertEqual(getResource(ob, 'test', IV, None), None)
+
+        xmlconfig(StringIO(template % (
+            """
+            <directive name="resource"
+                       attributes="component, type, name, layer"
+                handler="Zope.ComponentArchitecture.metaConfigure.resource"
+                namespace="http://namespaces.zope.org/zope" />
+            <directive name="skin" attributes="name, type, layers"
+                handler="Zope.ComponentArchitecture.metaConfigure.skin"
+                namespace="http://namespaces.zope.org/zope" />
+            <skin name="zmi" layers="zmi,"
+                  type="Zope.ComponentArchitecture.tests.TestViews.IV" />
+            <resource name="test"
+                  component="Zope.ComponentArchitecture.tests.TestViews.rZMI"
+                  layer="zmi" 
+                  type="Zope.ComponentArchitecture.tests.TestViews.IV"/> 
+            <resource name="test"
+                  component="Zope.ComponentArchitecture.tests.TestViews.r1"
+                  type="Zope.ComponentArchitecture.tests.TestViews.IV"/>
+            """
+            ))) 
+        
+        self.assertEqual(getResource(ob, 'test', IV, None).__class__, R1)
+        self.assertEqual(
+            getResource(ob, 'test', IV, None, skin='zmi').__class__,
+            RZMI)
+
+    def testFactory(self):
+
+        self.assertRaises(ComponentLookupError, createObject, None, 'foo')
+
+        xmlconfig(StringIO(template % (
+            """
+            <directive name="facory"
+                       attributes="component, factory_id"
+               handler="Zope.ComponentArchitecture.metaConfigure.factory"
+               namespace="http://namespaces.zope.org/zope" />
+            <facory 
+               factory_id="foo"
+               component="Zope.ComponentArchitecture.tests.TestFactory.f"
+               />
+            <facory 
+               component="Zope.ComponentArchitecture.tests.TestFactory.f"
+               />
+            """
+            ))) 
+
+        from Zope.ComponentArchitecture.tests.TestFactory import X
+        self.assertEqual(createObject(None, 'foo').__class__, X)
+        self.assertEqual(createObject(
+            None,
+            'Zope.ComponentArchitecture.tests.TestFactory.f').__class__, X)
+    
+def test_suite():
+    loader=unittest.TestLoader()
+    return loader.loadTestsFromTestCase(Test)
+if __name__=='__main__':
+    unittest.TextTestRunner().run(test_suite())
+