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

Timestamp:

4 Dec 2011, 07:56:39 (13 years ago)

Author:

Henrik Bettermann

Message:

Let's generate the applicant_id only when the applicant is added to its container to be compliant with the generic batch processor (importer).

Location:

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

Files:

• test_applicant.py (modified) (4 diffs)
• test_browser.py (modified) (1 diff)
• test_catalog.py (modified) (1 diff)

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

@@ -123 +123 @@
         # we can get an image filename for applicants not in a container
         appl = Applicant()
+        appl.applicant_id = u'dummy_123456'
         chooser = IFileStoreNameChooser(appl)
         result = chooser.chooseName()
         # the file would be stored in a ``_default`` directory.
         self.assertEqual(
-            result, '__img-applicant___default/xxx_1234.jpg')
+            result, '__img-applicant___default/dummy_123456.jpg')
         return
 
@@ -134 +135 @@
         fake_container.__name__ = 'folder'
         fake_container.code = 'folder'
-        appl = Applicant(container=fake_container)
+        appl = Applicant()
+        appl.applicant_id = u'folder_123456'
         appl.__parent__ = fake_container
         chooser = IFileStoreNameChooser(appl)
@@ -147 +149 @@
         fake_container.__name__ = 'folder'
         fake_container.code = 'folder'
-        appl = Applicant(container=fake_container)
+        appl = Applicant()
+        appl.applicant_id = u'folder_123456'
         appl.__parent__ = fake_container
         chooser = IFileStoreNameChooser(appl)
@@ -193 +196 @@
 
     def test_factory(self):
-        obj = self.factory(container=None)
+        obj = self.factory()
         assert isinstance(obj, Applicant)
 

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

@@ -117 +117 @@
 
         # Add an applicant
-        self.applicant = Applicant(container=applicantscontainer)
-        app['applicants']['app2009'][
-            self.applicant.application_number] = self.applicant
+        self.applicant = Applicant()
+        app['applicants']['app2009'].addApplicant(self.applicant)
         IUserAccount(
             self.app['applicants']['app2009'][

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

@@ -61 +61 @@
         setSite(self.app)
         self.app['applicants']['mystuff'] = self.container
-        self.applicant = Applicant(container=self.container)
-        self.app['applicants']['mystuff'][
-            self.applicant.application_number] = self.applicant
+        self.applicant = Applicant()
+        self.app['applicants']['mystuff'].addApplicant(self.applicant)
         return