Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py	(revision 7056)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py	(revision 7057)
@@ -27,4 +27,6 @@
 import cStringIO
 from datetime import datetime
+import grok
+from zope.event import notify
 from zope.component import createObject
 from zope.component.hooks import setSite, clearSite
@@ -927,6 +929,6 @@
                            self.browser.contents)
         # Bed has been allocated
-        bed = self.app['hostels']['hall-1']['hall-1_A_101_A']
-        self.assertTrue(bed.owner == self.student_id)
+        bed1 = self.app['hostels']['hall-1']['hall-1_A_101_A']
+        self.assertTrue(bed1.owner == self.student_id)
         # BedTicketAddPage is now blocked
         self.browser.getLink("Book accommodation").click()
@@ -940,5 +942,5 @@
         self.assertMatches('...regular_male_fr...', self.browser.contents)
         self.assertMatches('...%s...' % pin, self.browser.contents)
-        # Managers can relocate students
+        # Managers can relocate students if the student's bed_type has changed
         self.browser.getLink("Relocate student").click()
         self.assertMatches(
@@ -948,5 +950,4 @@
         self.assertMatches(
             "...Hall 1, Block A, Room 101, Bed B...", self.browser.contents)
-        bed1 = self.app['hostels']['hall-1']['hall-1_A_101_A']
         self.assertTrue(bed1.owner == NOT_OCCUPIED)
         bed2 = self.app['hostels']['hall-1']['hall-1_A_101_B']
@@ -958,4 +959,16 @@
         payment = self.student['payments'][payment_id]
         self.assertTrue(payment.p_item == u'regular_male_fr')
+        # 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'
+        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)
+        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
         self.browser.open(self.acco_student_path)
@@ -965,7 +978,7 @@
         self.browser.getControl("Remove selected", index=0).click()
         self.assertMatches('...Successfully removed...', self.browser.contents)
-        # The bed has been released properly by the event handler
-        bed = self.app['hostels']['hall-1']['hall-1_A_101_A']
-        self.assertTrue(bed.owner == NOT_OCCUPIED)
+        # The bed has been properly released by the event handler
+        self.assertMatches(bed1.owner, NOT_OCCUPIED)
+        self.assertMatches(bed2.owner, NOT_OCCUPIED)
         return
 
