Changeset 9794

Timestamp:

10 Dec 2012, 01:22:50 (12 years ago)

Author:

uli

Message:

Split one big test into several little ones (as it are really
different tests).

File:

• main/waeup.kofa/trunk/src/waeup/kofa/tests/test_async.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/tests/test_async.py

@@ -104 +104 @@
         self.root = self.root_folder._p_jar.root()
 
+    def set_site(self):
+        # helper to set a site 'externally'.
+        # This is a bit complicated under the given limited setup conditions.
+        # Returns a persisted site.
+        site = rootFolder()
+        self.root_folder['application'] = site
+        createSiteManager(site, setsite=True)
+        transaction.commit()
+        return site
+
     def test_iface_job_manager(self):
         # JobManager implements the promised interfaces
@@ -136 +146 @@
         return
 
-    def test_get_site_externally_set_site(self):
-        # if, however, a site was set externally, it will be found
-        # even if passed in site is not valid
-        manager = getUtility(IJobManager)
-        site = rootFolder()
-        self.root_folder['application'] = site
-        createSiteManager(site, setsite=True)
-        transaction.commit()
-        result1 = manager._get_site(None)     # no site given
-        result2 = manager._get_site(site)     # valid site given
-        result3 = manager._get_site(object()) # invalid site given
-        result4 = manager._get_site(self.root_folder) # valid persisted obj
-        # we always get the externally set site...
-        self.assertEqual(result1, site)
-        self.assertEqual(result2, site)
-        self.assertEqual(result3, site)
-        # except if the passed object is already a valid persisted one
-        self.assertEqual(result4, self.root_folder)
+    def test_get_site_ext_set_none_given(self):
+        # with an externally set site we don't have to pass in a site
+        manager = getUtility(IJobManager)
+        site = self.set_site()
+        result = manager._get_site(None)
+        self.assertEqual(result, site)
+        return
+
+    def test_get_site_ext_set_valid_site(self):
+        # with an externally set site we can pass in this site
+        manager = getUtility(IJobManager)
+        site = self.set_site()
+        result = manager._get_site(site)
+        self.assertEqual(result, site)
+        return
+
+    def test_get_site_ext_set_invalid_site(self):
+        # with an externally set site we can pass in invalid sites
+        manager = getUtility(IJobManager)
+        site = self.set_site()
+        result = manager._get_site(object())
+        self.assertEqual(result, site)
+        return
+
+    def test_get_site_ext_set_valid_obj(self):
+        # valid persisted objects override externally set sites
+        manager = getUtility(IJobManager)
+        site = self.set_site()
+        result = manager._get_site(self.root_folder)
+        self.assertEqual(result, self.root_folder)
         return