Changeset 7068 for main/waeup.sirp/trunk/src/waeup/sirp/students/tests

Timestamp:

10 Nov 2011, 18:56:18 (13 years ago)

Author:

Henrik Bettermann

Message:

Much more logic for bed allocation, bed release.

Implement student relocation.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py (modified) (2 diffs)

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

@@ -961 +961 @@
         self.browser.getLink("Relocate student").click()
         self.assertMatches(
-            "...Bed category hasn't changed...", self.browser.contents)
+            "...Student can't be relocated...", self.browser.contents)
         self.student.sex = u'f'
         self.browser.getLink("Relocate student").click()
@@ -977 +977 @@
         # Managers can relocate students if the bed's bed_type has changed
         bed1.bed_type = u'regular_female_fr'
-        bed2.bed_type = u'regular_male_reserved'
+        bed2.bed_type = u'regular_male_fr'
         notify(grok.ObjectModifiedEvent(bed1))
         notify(grok.ObjectModifiedEvent(bed2))
         self.browser.getLink("Relocate student").click()
         self.assertMatches(
-            "...Student relocated and new bed booked...", self.browser.contents)
+            "...Student relocated...", self.browser.contents)
         self.assertMatches(
             "... Hall 1, Block A, Room 101, Bed A...", self.browser.contents)
         self.assertMatches(bed1.owner, self.student_id)
         self.assertMatches(bed2.owner, NOT_OCCUPIED)
-        # Managers can delete bed tickets
+        # Managers can't relocate students if bed is reserved
+        self.student.sex = u'm'
+        bed1.bed_type = u'regular_female_reserved'
+        notify(grok.ObjectModifiedEvent(bed1))
+        self.browser.getLink("Relocate student").click()
+        self.assertMatches(
+            "...Students in reserved beds can't be relocated...",
+            self.browser.contents)
+        # Managers can relocate students if booking has been cancelled but
+        # other bed space has been manually allocated after cancellation
+        old_owner = bed1.releaseBed()
+        self.assertMatches(old_owner, self.student_id)
+        bed2.owner = self.student_id
+        self.browser.open(self.acco_student_path + '/2004')
+        self.assertMatches(
+            "...booking cancelled...", self.browser.contents)
+        self.browser.getLink("Relocate student").click()
+        # We didn't informed the catalog therefore the new owner is not found
+        self.assertMatches(
+            "...There is no free bed in your category regular_male_fr...",
+            self.browser.contents)
+        # Now we fire the event properly
+        notify(grok.ObjectModifiedEvent(bed2))
+        self.browser.getLink("Relocate student").click()
+        self.assertMatches(
+            "...Student relocated...", self.browser.contents)
+        self.assertMatches(
+            "... Hall 1, Block A, Room 101, Bed B...", self.browser.contents)
+          # Managers can delete bed tickets
         self.browser.open(self.acco_student_path)
         ctrl = self.browser.getControl(name='val_id')