[Checkins] SVN: z3c.jbot/trunk/ Use ``five.pt`` if available.

[Malthe Borch]

Log message for revision 116241:
  Use ``five.pt`` if available.

Changed:
  U   z3c.jbot/trunk/CHANGES.txt
  U   z3c.jbot/trunk/z3c/jbot/tests/test_doctests.py
  U   z3c.jbot/trunk/z3c/jbot/tests/test_five.py

-=-
Modified: z3c.jbot/trunk/CHANGES.txt
===================================================================
--- z3c.jbot/trunk/CHANGES.txt	2010-09-09 07:18:45 UTC (rev 116240)
+++ z3c.jbot/trunk/CHANGES.txt	2010-09-09 07:42:51 UTC (rev 116241)
@@ -1,6 +1,8 @@
 Changes
 =======
 
+- Use ``five.pt`` if available. [malthe]
+
 - Fixed an issue where tests would fail on Zope 2.10. [malthe]
 
 0.6.3 (2010-09-07)

Modified: z3c.jbot/trunk/z3c/jbot/tests/test_doctests.py
===================================================================
--- z3c.jbot/trunk/z3c/jbot/tests/test_doctests.py	2010-09-09 07:18:45 UTC (rev 116240)
+++ z3c.jbot/trunk/z3c/jbot/tests/test_doctests.py	2010-09-09 07:42:51 UTC (rev 116241)
@@ -6,11 +6,8 @@
 OPTIONFLAGS = (zope.testing.doctest.ELLIPSIS |
                zope.testing.doctest.NORMALIZE_WHITESPACE)
 
-import zope.component.testing
+from common import setUp
 
-def setUp(test):
-    zope.component.testing.setUp(test)
-    import z3c.jbot.patches
 
 def test_suite():
     globs = dict(

Modified: z3c.jbot/trunk/z3c/jbot/tests/test_five.py
===================================================================
--- z3c.jbot/trunk/z3c/jbot/tests/test_five.py	2010-09-09 07:18:45 UTC (rev 116240)
+++ z3c.jbot/trunk/z3c/jbot/tests/test_five.py	2010-09-09 07:42:51 UTC (rev 116241)
@@ -1,15 +1,19 @@
+import common
 import unittest
 
-class FiveTests(unittest.TestCase):
+from Testing.ZopeTestCase import ZopeTestCase
+
+
+class FiveTests(ZopeTestCase):
     def setUp(self):
-        import zope.component.testing
-        zope.component.testing.setUp(self)
-        import z3c.jbot.patches
+        common.setUp(self)
+        super(FiveTests, self).setUp()
 
         from Products.Five.browser.pagetemplatefile import \
              ZopeTwoPageTemplateFile as Template
 
         from Products.Five.browser import BrowserView
+
         class MockView(BrowserView):
             template = Template(
                 "templates/example.pt")
@@ -22,9 +26,11 @@
 
         # set up mock site and request
         from zope.publisher.browser import TestRequest
+        from zope import component
+
         class MockSite(object):
             REQUEST = TestRequest("en")
-            getSiteManager = zope.component.getSiteManager
+            getSiteManager = component.getSiteManager
 
         try:
             from zope.site.hooks import setHooks, setSite
@@ -36,7 +42,7 @@
         self._request = MockSite.REQUEST
 
         # render templates for later comparison
-        view = self._view = MockView(None, MockSite.REQUEST)
+        view = self._view = MockView(self.folder, MockSite.REQUEST)
         self._original = view.template()
         self._interface_override = view.interface_override()
         self._http_override = view.http_override()
@@ -52,7 +58,7 @@
     def test_override_for_interface(self):
         from z3c.jbot.metaconfigure import handler
         from zope import interface
-        manager = handler(
+        handler(
             "%s/overrides/interface" % self._tests, interface.Interface)
         self.assertEqual(self._view.template(), self._interface_override)
 
@@ -65,9 +71,9 @@
             pass
 
         # register handlers
-        general = handler(
+        handler(
             "%s/overrides/interface" % self._tests, interface.Interface)
-        http = handler(
+        handler(
             "%s/overrides/https" % self._tests, IHTTPSRequest)
 
         # we get the general override
@@ -83,6 +89,7 @@
         noLongerProvides(self._request, IHTTPSRequest)
         self.assertEqual(self._view.template(), self._interface_override)
 
+
 def test_suite():
     return unittest.TestSuite((
         unittest.makeSuite(FiveTests),))