Index: /main/waeup.cas/trunk/waeup/cas/tests/test_server.py
===================================================================
--- /main/waeup.cas/trunk/waeup/cas/tests/test_server.py	(revision 10603)
+++ /main/waeup.cas/trunk/waeup/cas/tests/test_server.py	(revision 10604)
@@ -17,5 +17,5 @@
     create_tgc_value, check_login_ticket, set_session_cookie,
     check_session_cookie, get_template, delete_session_cookie,
-    check_service_ticket, update_url
+    check_service_ticket, update_url, set_message
     )
 
@@ -311,4 +311,26 @@
         assert resp.status == '200 OK'
         assert resp.content_type == 'text/css'
+
+    def test_set_message(self):
+        # we can set a message
+        result = set_message('Hi there', '<body>MSG_TEXT</body>')
+        assert result == '<body>Hi there</body>'
+
+    def test_set_message_empty_or_none(self):
+        # without a message, no message text will be displayed
+        result = set_message('', '<body>MSG_TEXT</body>')
+        assert result == '<body></body>'
+        result = set_message('', '<body><div id="msg">MSG_TEXT</div></body>')
+        assert result == '<body></body>'
+        result = set_message(None, '<body><div id="msg">MSG_TEXT</div></body>')
+        assert result == '<body></body>'
+        result = set_message(
+            None,
+            '<body><div a="1">\n<div id="msg">MSG_TEXT</div>a\n</div></body>')
+        assert result == '<body><div a="1">\na\n</div></body>'
+        result = set_message(
+            None,
+            '<body><div a="1"><div id="msg">MSG_TEXT</div>a</div></body>')
+        assert result == '<body><div a="1">a</div></body>'
 
 
