Changeset 7683 for main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests

Timestamp:

23 Feb 2012, 07:43:06 (13 years ago)

Author:

Henrik Bettermann

Message:

Merge the vocabularies module with the interfaces module. I don't see any other way to avoid conflicting imports since we have now IApplicantsUtils defined in interfaces and needed in vocabularies.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests/test_interfaces.py (modified) (2 diffs)

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

@@ -22 +22 @@
 from zc.sourcefactory.browser.source import FactoredTerms
 from zope.publisher.browser import TestRequest
-from waeup.sirp.applicants.vocabularies import application_types_vocab
+from waeup.sirp.applicants.interfaces import ApplicationTypeSource
 from waeup.sirp.students.vocabularies import GenderSource
-
-class ApplicationCategoriesTestCase(unittest.TestCase):
-
-    def setUp(self):
-        self.vocab = application_types_vocab
-        return
-
-    def test_vocabulary_len(self):
-        self.assertEqual(len(self.vocab), 10)
-        return
-
-    def test_vocabulary_items(self):
-        self.assertTrue('pude' in self.vocab)
-        return
-
-    def test_term_attributes(self):
-        # Check that each vocab entry provided value, token, and title.
-        term = self.vocab.getTermByToken('pude')
-        self.assertEqual(term.token, 'pude')
-        self.assertEqual(term.value, 'pude')
-        self.assertEqual(term.title, 'Post UDE Screening')
-        return
 
 class InterfacesTest(unittest.TestCase):
@@ -82 +60 @@
     suite = unittest.TestSuite()
     for testcase in [
-            ApplicationCategoriesTestCase,
             InterfacesTest,
             ]: