[Zope-Checkins] CVS: Zope3/lib/python/Zope/ComponentArchitecture/tests - testAPI.py:1.1.2.8

Fred Drake Jr fdrake@acm.org
Wed, 12 Dec 2001 15:41:03 -0500


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

Modified Files:
      Tag: Zope-3x-branch
	testAPI.py 
Log Message:
Presentation --> View

=== Zope3/lib/python/Zope/ComponentArchitecture/tests/testAPI.py 1.1.2.7 => 1.1.2.8 ===
 class I2(Interface.Interface): pass
 class Comp:
-    __implements__=I2
-    def __init__(self, context): self._context=context
+    __implements__ = I2
+    def __init__(self, context): self._context = context
     def getContext(self): return self._context
 
-comp=Comp(1)
+comp = Comp(1)
 
 class Ob:
-    __implements__=I1
+    __implements__ = I1
 
-ob=Ob()
+ob = Ob()
 
 class Test(unittest.TestCase):
     def tearDown(self):
@@ -59,29 +59,29 @@
         provideUtility(I2, comp)
         self.assertEquals(id(getUtility(ob, I2)), id(comp))
 
-    def testPresentation(self):
-        from Zope.ComponentArchitecture import providePresentation
-        from Zope.ComponentArchitecture import getPresentation
+    def testView(self):
+        from Zope.ComponentArchitecture import provideView
+        from Zope.ComponentArchitecture import getView
         from Zope.ComponentArchitecture.Exceptions import ComponentLookupError
 
-        self.assertRaises(ComponentLookupError, getPresentation, ob, 'foo', I1)
-        self.assertRaises(ComponentLookupError, getPresentation, ob, 'foo', I2)
-        self.assertEquals(getPresentation(ob, 'foo', I2, Test), Test)
+        self.assertRaises(ComponentLookupError, getView, ob, 'foo', I1)
+        self.assertRaises(ComponentLookupError, getView, ob, 'foo', I2)
+        self.assertEquals(getView(ob, 'foo', I2, Test), Test)
         
-        providePresentation(I1, 'foo', I2, Comp)
-        c=getPresentation(ob, 'foo', I2)
+        provideView(I1, 'foo', I2, Comp)
+        c = getView(ob, 'foo', I2)
         self.assertEquals(c.__class__, Comp)
         self.assertEquals(c.getContext(), ob)
 
         self.assertRaises(ComponentLookupError,
-                          getPresentation, ob, 'foo2', I1)
+                          getView, ob, 'foo2', I1)
         self.assertRaises(ComponentLookupError,
-                          getPresentation, ob, 'foo2', I2)
-        self.assertEquals(getPresentation(ob, 'foo2', I2, Test), Test)
+                          getView, ob, 'foo2', I2)
+        self.assertEquals(getView(ob, 'foo2', I2, Test), Test)
 
 def test_suite():
-    loader=unittest.TestLoader()
+    loader = unittest.TestLoader()
     return loader.loadTestsFromTestCase(Test)
 
-if __name__=='__main__':
+if __name__ == '__main__':
     unittest.TextTestRunner().run(test_suite())