Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_webservices.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_webservices.py	(revision 10034)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_webservices.py	(revision 10035)
@@ -1,4 +1,7 @@
 # Tests for webservices
 import xmlrpclib
+import httplib
+import urllib
+import base64
 from zope.app.testing.xmlrpc import ServerProxy
 from zope.component import createObject
@@ -7,31 +10,15 @@
 from waeup.kofa.app import University
 from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase
+from waeup.kofa.students.tests.test_browser import StudentsFullSetup
 
-class XMLRPCTests(FunctionalTestCase):
+class XMLRPCTests(StudentsFullSetup):
     # check XMLRPC services for university portal
 
     layer = FunctionalLayer
 
-    def setUp(self):
-        super(XMLRPCTests, self).setUp()
-        # create a site
-        self.root = self.getRootFolder()
-        self.app = University()
-        self.root['app'] = self.app
-        return
-
-    def create_student(self, reg_no=u'REG123'):
-        # create a student in site
-        setSite(self.app) # needed to create a student
-        stud = createObject('waeup.Student')
-        stud.reg_number = reg_no
-        self.app['students'].addStudent(stud)
-        setSite(None) # make sure no site is set when returning
-        return stud
-
     def test_get_student_id_no_match(self):
         # w/o any students we get none
         server = ServerProxy('http://mgr:mgrpw@localhost/app')
-        result = server.get_student_id('R123')
+        result = server.get_student_id('Nonsense')
         self.assertTrue(result is None)
         return
@@ -39,9 +26,8 @@
     def test_get_student_id_regno_exists(self):
         # we can get the id of an existing student with matching reg_no
-        stud1 = self.create_student(reg_no=u'R123')
         server = ServerProxy('http://mgr:mgrpw@localhost/app')
-        result = server.get_student_id('R123')
+        result = server.get_student_id('123')
         self.assertEqual(result, 'K1000000')
-        self.assertEqual(stud1.student_id, result)
+        self.assertEqual(self.student_id, result)
         return
 
@@ -51,12 +37,41 @@
         server = ServerProxy('http://localhost/app')
         self.assertRaises(
-            xmlrpclib.ProtocolError, server.get_student_id, 'R123')
+            xmlrpclib.ProtocolError, server.get_student_id, '123')
         # wrong password
         server = ServerProxy('http://mgr:WRONGPW@localhost/app')
         self.assertRaises(
-            xmlrpclib.ProtocolError, server.get_student_id, 'R123')
+            xmlrpclib.ProtocolError, server.get_student_id, '123')
         # wrong username
         server = ServerProxy('http://WRONGUSER:mgrpw@localhost/app')
         self.assertRaises(
-            xmlrpclib.ProtocolError, server.get_student_id, 'R123')
+            xmlrpclib.ProtocolError, server.get_student_id, '123')
         return
+
+    REQUEST_XML="""\
+<?xml version="1.0"?>
+<methodCall>
+<methodName>get_student_id</methodName>
+<params>
+<param>
+<value><string>123</string></value>
+</param>
+</params>
+</methodCall>"""
+
+    RESPONSE_XML="""\
+<?xml version='1.0'?>
+<methodResponse>
+<params>
+<param>
+<value><string>K1000000</string></value>
+</param>
+</params>
+</methodResponse>
+"""
+
+    def test_XMLRPC_post(self):
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.addHeader('Content-Length', len(self.REQUEST_XML))
+        self.browser.post('http://localhost/app', self.REQUEST_XML,
+            'text/xml; charset=utf-8')
+        self.assertEqual(self.browser.contents, self.RESPONSE_XML)
