Changeset 7432 for main/waeup.sirp/trunk/src/waeup

Timestamp:

22 Dec 2011, 06:39:15 (13 years ago)

Author:

Henrik Bettermann

Message:

Move the test methods into the correct classes.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests/test_browser.py (modified) (3 diffs)

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

@@ -284 +284 @@
         return
 
+class ApplicantsContainerUITests(ApplicantsFullSetup):
+    # Tests for ApplicantsContainer class views and pages
+
+    layer = FunctionalLayer
+
+    def test_anonymous_access(self):
+        # Anonymous users can access applicants containers
+        self.browser.open(self.container_path)
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertFalse(
+            'Manage' in self.browser.contents)
+        return
+
+    def test_manage_access(self):
+        # Managers can access the manage pages of applicants
+        # containers and can perform actions
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open(self.manage_container_path)
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(self.browser.url, self.manage_container_path)
+        self.browser.getControl("Save").click()
+        self.assertTrue('Data saved' in self.browser.contents)
+        self.browser.getControl("Remove selected", index=0).click()
+        self.assertTrue('No applicant selected' in self.browser.contents)
+        self.browser.getControl("Add local role").click()
+        self.assertTrue('No user selected' in self.browser.contents)
+        self.browser.getControl("Cancel", index=0).click()
+        self.assertEqual(self.browser.url, self.container_path)
+        return
+
     def test_add_delete_applicants(self):
         # Managers can add and delete applicants
@@ -314 +344 @@
         return
 
+class ApplicantUITests(ApplicantsFullSetup):
+    # Tests for uploading/browsing the passport image of appplicants
+
+    layer = FunctionalLayer
+
     def test_manage_and_view_applicant(self):
         # Managers can manage applicants
@@ -381 +416 @@
         self.assertMatches('...Form has been saved...', self.browser.contents)
         return
-
-class ApplicantsContainerUITests(ApplicantsFullSetup):
-    # Tests for ApplicantsContainer class views and pages
-
-    layer = FunctionalLayer
-
-    def test_anonymous_access(self):
-        # Anonymous users can access applicants containers
-        self.browser.open(self.container_path)
-        self.assertEqual(self.browser.headers['Status'], '200 Ok')
-        self.assertFalse(
-            'Manage' in self.browser.contents)
-        return
-
-    def test_manage_access(self):
-        # Managers can access the manage pages of applicants
-        # containers and can perform actions
-        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
-        self.browser.open(self.manage_container_path)
-        self.assertEqual(self.browser.headers['Status'], '200 Ok')
-        self.assertEqual(self.browser.url, self.manage_container_path)
-        self.browser.getControl("Save").click()
-        self.assertTrue('Data saved' in self.browser.contents)
-        self.browser.getControl("Remove selected", index=0).click()
-        self.assertTrue('No applicant selected' in self.browser.contents)
-        self.browser.getControl("Add local role").click()
-        self.assertTrue('No user selected' in self.browser.contents)
-        self.browser.getControl("Cancel", index=0).click()
-        self.assertEqual(self.browser.url, self.container_path)
-        return
-
-class ApplicantsPassportTests(ApplicantsFullSetup):
-    # Tests for uploading/browsing the passport image of appplicants
-
-    layer = FunctionalLayer
 
     def image_url(self, filename):