Changeset 6297

Timestamp:

8 Jun 2011, 00:14:45 (14 years ago)

Author:

uli

Message:

Fix testing problems simply by turning basic unittests into functional
ones.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests/test_applicants.py (modified) (7 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests/test_applicants.py

@@ -22 +22 @@
 """Tests for applicants and related.
 """
-import logging
 import unittest
-from StringIO import StringIO
-from hurry.file.file import IdFileRetrieval
-from hurry.file.interfaces import IFileRetrieval
-from zope.app.testing import placelesssetup
+from zope.app.testing.functional import FunctionalTestCase
 from zope.component import (
     provideAdapter, adapts, getGlobalSiteManager, provideUtility)
@@ -35 +31 @@
 from zope.publisher.base import TestRequest
 from zope.publisher.interfaces import NotFound
-from waeup.sirp.interfaces import IWAeUPSIRPPluggable
 from waeup.sirp.image.image import WAeUPImageFile
 from waeup.sirp.image.interfaces import IWAeUPImageFile
@@ -44 +39 @@
     IResultEntry, IApplicant,
     )
+from waeup.sirp.testing import FunctionalLayer
 
 class FakeImageLocation(object):
@@ -69 +65 @@
         assert entry.score == 3.7
 
-class ApplicantTest(unittest.TestCase):
+class ApplicantTest(FunctionalTestCase):
+
+    layer = FunctionalLayer
 
     def setUp(self):
-        placelesssetup.setUp()
-        provideUtility(IdFileRetrieval(), IFileRetrieval)
         self.applicant = Applicant()
 
     def tearDown(self):
-        placelesssetup.tearDown()
         pass
 
@@ -84 +79 @@
         verify.verifyObject(IApplicant, self.applicant)
 
-class ApplicantFactoryTest(unittest.TestCase):
+class ApplicantFactoryTest(FunctionalTestCase):
+
+    layer = FunctionalLayer
 
     def setUp(self):
@@ -104 +101 @@
         assert implemented_by.isOrExtends(IApplicant)
 
-class ApplicantTraverserTest(unittest.TestCase):
+
+class ApplicantTraverserTest(FunctionalTestCase):
+
+    layer = FunctionalLayer
 
     def setUp(self):
+        super(ApplicantTraverserTest, self).setUp()
+        provideAdapter(FakeImageLocation)
         self.applicant = Applicant()
+
         self.request = TestRequest('')
-        self.gsm = getGlobalSiteManager()
-        self.gsm.registerAdapter(FakeImageLocation)
-        self.fileretrieval = IdFileRetrieval()
-        provideUtility(self.fileretrieval, IFileRetrieval)
         return
 
     def tearDown(self):
-        self.gsm.unregisterAdapter(FakeImageLocation)
-        self.gsm.unregisterUtility(self.fileretrieval, IFileRetrieval)
+        gsm = getGlobalSiteManager()
+        gsm.unregisterAdapter(FakeImageLocation)
+        super(ApplicantTraverserTest, self).tearDown()
         return
 
@@ -162 +162 @@
         self.assertTrue(isinstance(result, FakeImageLocation))
         return
-
-def test_suite():
-    suite = unittest.TestSuite()
-    for testcase in [
-        ResultEntryTest, ApplicantTest, ApplicantFactoryTest,
-        ApplicantTraverserTest,
-        ]:
-        suite.addTest(unittest.TestLoader().loadTestsFromTestCase(
-                testcase
-                )
-        )
-    return suite