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

Guido van Rossum guido@python.org
Tue, 4 Jun 2002 14:59:58 -0400


Update of /cvs-repository/Zope3/lib/python/Zope/Publisher/Browser/tests
In directory cvs.zope.org:/tmp/cvs-serv1575/lib/python/Zope/Publisher/Browser/tests

Modified Files:
      Tag: Zope-3x-branch
	testDirectives.py 
Log Message:
Whoever (not Jeremy :-) checks in files from Windows with the CRLF
markers still left in, please stop doing this.  It screws up the
checkouts for everyone else (including Windows users who use the
command line cvs tools).  Hint: some wincvs do this.



=== Zope3/lib/python/Zope/Publisher/Browser/tests/testDirectives.py 1.1.2.5 => 1.1.2.6 ===
 # 
 ##############################################################################
-import unittest, sys
-from Zope.Configuration.xmlconfig import xmlconfig
-from Zope.Publisher.Browser.IBrowserPublisher import IBrowserPublisher
-from Zope.Publisher.Browser.tests.TestViews import IC, V1, VZMI, R1, RZMI
-from Zope.ComponentArchitecture import getView, getResource
-from Zope.ComponentArchitecture import getDefaultViewName
-from Zope.ComponentArchitecture.tests.PlacelessSetup import PlacelessSetup
-from cStringIO import StringIO
-
-template = """<zopeConfigure
-   xmlns='http://namespaces.zope.org/zope'
-   xmlns:browser='http://namespaces.zope.org/browser'>
-   %s
-   </zopeConfigure>"""
-
-class Ob:
-    __implements__ = IC
-
-class Test(PlacelessSetup, unittest.TestCase):
-
-    # XXX: tests for other directives needed
-
-    def testView(self):
-
-        ob = Ob()
-        self.assertEqual(getView(ob, 'test', IBrowserPublisher, None), None)
-
-        xmlconfig(StringIO(template % (
-            """
-            <directive name="view"
-                       attributes="component, name, for, layer"
-               handler="Zope.Publisher.Browser.metaConfigure.view"
-               namespace="http://namespaces.zope.org/browser" />
-            <browser:view name="test"
-                  factory="Zope.Publisher.Browser.tests.TestViews.V1"
-                  for="Zope.Publisher.Browser.tests.TestViews.IC" /> 
-            """
-            ))) 
-        
-        self.assertEqual(getView(ob, 'test', IBrowserPublisher, None
-                                 ).__class__, V1)
-         
-    def testDefaultView(self):
-
-        ob = Ob()
-        self.assertEqual(getView(ob, 'test', IBrowserPublisher, None), None)
-
-        xmlconfig(StringIO(template % (
-            """
-            <directive name="defaultView"
-                       attributes="component, name, for, layer"
-               handler="Zope.Publisher.Browser.metaConfigure.defaultView"
-               namespace="http://namespaces.zope.org/browser" />
-            <browser:defaultView name="test"
-                  factory="Zope.Publisher.Browser.tests.TestViews.V1"
-                  for="Zope.Publisher.Browser.tests.TestViews.IC" /> 
-            """
-            ))) 
-        
-        self.assertEqual(getView(ob, 'test', IBrowserPublisher, None
-                                 ).__class__, V1)
-        self.assertEqual(getDefaultViewName(ob, IBrowserPublisher
-                                 ), 'test')
-                                 
-        
-      
-    def testSKinView(self):
-
-        ob = Ob()
-        self.assertEqual(getView(ob, 'test', IBrowserPublisher, None), None)
-
-        xmlconfig(StringIO(template % (
-            """
-            <directive name="view"
-                       attributes="component, name, for, layer"
-                handler="Zope.Publisher.Browser.metaConfigure.view"
-                namespace="http://namespaces.zope.org/browser" />
-            <directive name="skin" attributes="name, layers"
-                handler="Zope.Publisher.Browser.metaConfigure.skin"
-                namespace="http://namespaces.zope.org/browser" />
-            <browser:skin name="zmi" layers="zmi," />
-            <browser:view name="test"
-                  factory="Zope.Publisher.Browser.tests.TestViews.VZMI"
-                  layer="zmi" 
-                  for="Zope.Publisher.Browser.tests.TestViews.IC" /> 
-            <browser:view name="test"
-                  factory="Zope.Publisher.Browser.tests.TestViews.V1"
-                  for="Zope.Publisher.Browser.tests.TestViews.IC" />
-            """
-            ))) 
-        
-        self.assertEqual(getView(ob, 'test', IBrowserPublisher, None
-                                 ).__class__, V1)
-        self.assertEqual(getView(ob, 'test', IBrowserPublisher, None,
-                                 skin='zmi').__class__,
-                         VZMI)
-
-    def testResource(self):
-
-        ob = Ob()
-        self.assertEqual(getResource(ob, 'test', IBrowserPublisher, None),
-                         None)
-
-        xmlconfig(StringIO(template % (
-            """
-            <directive name="resource"
-                       attributes="component, name, layer"
-               handler="Zope.Publisher.Browser.metaConfigure.resource"
-               namespace="http://namespaces.zope.org/browser" />
-            <browser:resource name="test"
-                  component="Zope.Publisher.Browser.tests.TestViews.r1" /> 
-            """
-            ))) 
-        
-        self.assertEqual(
-            getResource(ob, 'test', IBrowserPublisher, None).__class__,
-            R1)
-         
-    def testSkinResource(self):
-
-        ob = Ob()
-        self.assertEqual(
-            getResource(ob, 'test', IBrowserPublisher, None),
-            None)
-
-        xmlconfig(StringIO(template % (
-            """
-            <directive name="resource" attributes="component, name, layer"
-                handler="Zope.Publisher.Browser.metaConfigure.resource"
-                namespace="http://namespaces.zope.org/browser" />
-            <directive name="skin" attributes="name, layers"
-                handler="Zope.Publisher.Browser.metaConfigure.skin"
-                namespace="http://namespaces.zope.org/browser" />
-            <browser:skin name="zmi" layers="zmi," />
-            <browser:resource name="test"
-                  component="Zope.Publisher.Browser.tests.TestViews.rZMI"
-                  layer="zmi" /> 
-            <browser:resource name="test"
-                  component="Zope.Publisher.Browser.tests.TestViews.r1" />
-            """
-            ))) 
-        
-        self.assertEqual(
-            getResource(ob, 'test', IBrowserPublisher, None).__class__,
-            R1)
-        self.assertEqual(
-            getResource(ob, 'test', IBrowserPublisher, None,
-                        skin='zmi').__class__,
-            RZMI)
-    
-def test_suite():
-    loader=unittest.TestLoader()
-    return loader.loadTestsFromTestCase(Test)
-
-if __name__=='__main__':
-    unittest.TextTestRunner().run(test_suite())
+import unittest, sys
+from Zope.Configuration.xmlconfig import xmlconfig
+from Zope.Publisher.Browser.IBrowserPublisher import IBrowserPublisher
+from Zope.Publisher.Browser.tests.TestViews import IC, V1, VZMI, R1, RZMI
+from Zope.ComponentArchitecture import getView, getResource
+from Zope.ComponentArchitecture import getDefaultViewName
+from Zope.ComponentArchitecture.tests.PlacelessSetup import PlacelessSetup
+from cStringIO import StringIO
+
+template = """<zopeConfigure
+   xmlns='http://namespaces.zope.org/zope'
+   xmlns:browser='http://namespaces.zope.org/browser'>
+   %s
+   </zopeConfigure>"""
+
+class Ob:
+    __implements__ = IC
+
+class Test(PlacelessSetup, unittest.TestCase):
+
+    # XXX: tests for other directives needed
+
+    def testView(self):
+
+        ob = Ob()
+        self.assertEqual(getView(ob, 'test', IBrowserPublisher, None), None)
+
+        xmlconfig(StringIO(template % (
+            """
+            <directive name="view"
+                       attributes="component, name, for, layer"
+               handler="Zope.Publisher.Browser.metaConfigure.view"
+               namespace="http://namespaces.zope.org/browser" />
+            <browser:view name="test"
+                  factory="Zope.Publisher.Browser.tests.TestViews.V1"
+                  for="Zope.Publisher.Browser.tests.TestViews.IC" /> 
+            """
+            ))) 
+        
+        self.assertEqual(getView(ob, 'test', IBrowserPublisher, None
+                                 ).__class__, V1)
+         
+    def testDefaultView(self):
+
+        ob = Ob()
+        self.assertEqual(getView(ob, 'test', IBrowserPublisher, None), None)
+
+        xmlconfig(StringIO(template % (
+            """
+            <directive name="defaultView"
+                       attributes="component, name, for, layer"
+               handler="Zope.Publisher.Browser.metaConfigure.defaultView"
+               namespace="http://namespaces.zope.org/browser" />
+            <browser:defaultView name="test"
+                  factory="Zope.Publisher.Browser.tests.TestViews.V1"
+                  for="Zope.Publisher.Browser.tests.TestViews.IC" /> 
+            """
+            ))) 
+        
+        self.assertEqual(getView(ob, 'test', IBrowserPublisher, None
+                                 ).__class__, V1)
+        self.assertEqual(getDefaultViewName(ob, IBrowserPublisher
+                                 ), 'test')
+                                 
+        
+      
+    def testSKinView(self):
+
+        ob = Ob()
+        self.assertEqual(getView(ob, 'test', IBrowserPublisher, None), None)
+
+        xmlconfig(StringIO(template % (
+            """
+            <directive name="view"
+                       attributes="component, name, for, layer"
+                handler="Zope.Publisher.Browser.metaConfigure.view"
+                namespace="http://namespaces.zope.org/browser" />
+            <directive name="skin" attributes="name, layers"
+                handler="Zope.Publisher.Browser.metaConfigure.skin"
+                namespace="http://namespaces.zope.org/browser" />
+            <browser:skin name="zmi" layers="zmi," />
+            <browser:view name="test"
+                  factory="Zope.Publisher.Browser.tests.TestViews.VZMI"
+                  layer="zmi" 
+                  for="Zope.Publisher.Browser.tests.TestViews.IC" /> 
+            <browser:view name="test"
+                  factory="Zope.Publisher.Browser.tests.TestViews.V1"
+                  for="Zope.Publisher.Browser.tests.TestViews.IC" />
+            """
+            ))) 
+        
+        self.assertEqual(getView(ob, 'test', IBrowserPublisher, None
+                                 ).__class__, V1)
+        self.assertEqual(getView(ob, 'test', IBrowserPublisher, None,
+                                 skin='zmi').__class__,
+                         VZMI)
+
+    def testResource(self):
+
+        ob = Ob()
+        self.assertEqual(getResource(ob, 'test', IBrowserPublisher, None),
+                         None)
+
+        xmlconfig(StringIO(template % (
+            """
+            <directive name="resource"
+                       attributes="component, name, layer"
+               handler="Zope.Publisher.Browser.metaConfigure.resource"
+               namespace="http://namespaces.zope.org/browser" />
+            <browser:resource name="test"
+                  component="Zope.Publisher.Browser.tests.TestViews.r1" /> 
+            """
+            ))) 
+        
+        self.assertEqual(
+            getResource(ob, 'test', IBrowserPublisher, None).__class__,
+            R1)
+         
+    def testSkinResource(self):
+
+        ob = Ob()
+        self.assertEqual(
+            getResource(ob, 'test', IBrowserPublisher, None),
+            None)
+
+        xmlconfig(StringIO(template % (
+            """
+            <directive name="resource" attributes="component, name, layer"
+                handler="Zope.Publisher.Browser.metaConfigure.resource"
+                namespace="http://namespaces.zope.org/browser" />
+            <directive name="skin" attributes="name, layers"
+                handler="Zope.Publisher.Browser.metaConfigure.skin"
+                namespace="http://namespaces.zope.org/browser" />
+            <browser:skin name="zmi" layers="zmi," />
+            <browser:resource name="test"
+                  component="Zope.Publisher.Browser.tests.TestViews.rZMI"
+                  layer="zmi" /> 
+            <browser:resource name="test"
+                  component="Zope.Publisher.Browser.tests.TestViews.r1" />
+            """
+            ))) 
+        
+        self.assertEqual(
+            getResource(ob, 'test', IBrowserPublisher, None).__class__,
+            R1)
+        self.assertEqual(
+            getResource(ob, 'test', IBrowserPublisher, None,
+                        skin='zmi').__class__,
+            RZMI)
+    
+def test_suite():
+    loader=unittest.TestLoader()
+    return loader.loadTestsFromTestCase(Test)
+
+if __name__=='__main__':
+    unittest.TextTestRunner().run(test_suite())