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 10034)
@@ -0,0 +1,62 @@
+# Tests for webservices
+import xmlrpclib
+from zope.app.testing.xmlrpc import ServerProxy
+from zope.component import createObject
+from zope.component.hooks import setSite
+from zope.testbrowser.testing import Browser
+from waeup.kofa.app import University
+from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase
+
+class XMLRPCTests(FunctionalTestCase):
+    # 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')
+        self.assertTrue(result is None)
+        return
+
+    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')
+        self.assertEqual(result, 'K1000000')
+        self.assertEqual(stud1.student_id, result)
+        return
+
+    def test_get_student_id_block_unauthorized(self):
+        # requests from unauthorized users are blocked
+        # no username nor password
+        server = ServerProxy('http://localhost/app')
+        self.assertRaises(
+            xmlrpclib.ProtocolError, server.get_student_id, 'R123')
+        # wrong password
+        server = ServerProxy('http://mgr:WRONGPW@localhost/app')
+        self.assertRaises(
+            xmlrpclib.ProtocolError, server.get_student_id, 'R123')
+        # wrong username
+        server = ServerProxy('http://WRONGUSER:mgrpw@localhost/app')
+        self.assertRaises(
+            xmlrpclib.ProtocolError, server.get_student_id, 'R123')
+        return
Index: in/waeup.kofa/trunk/src/waeup/kofa/tests/test_webservices.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/tests/test_webservices.py	(revision 10033)
+++ 	(revision )
@@ -1,62 +1,0 @@
-# Tests for webservices
-import xmlrpclib
-from zope.app.testing.xmlrpc import ServerProxy
-from zope.component import createObject
-from zope.component.hooks import setSite
-from zope.testbrowser.testing import Browser
-from waeup.kofa.app import University
-from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase
-
-class XMLRPCTests(FunctionalTestCase):
-    # 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')
-        self.assertTrue(result is None)
-        return
-
-    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')
-        self.assertEqual(result, 'K1000000')
-        self.assertEqual(stud1.student_id, result)
-        return
-
-    def test_get_student_id_block_unauthorized(self):
-        # requests from unauthorized users are blocked
-        # no username nor password
-        server = ServerProxy('http://localhost/app')
-        self.assertRaises(
-            xmlrpclib.ProtocolError, server.get_student_id, 'R123')
-        # wrong password
-        server = ServerProxy('http://mgr:WRONGPW@localhost/app')
-        self.assertRaises(
-            xmlrpclib.ProtocolError, server.get_student_id, 'R123')
-        # wrong username
-        server = ServerProxy('http://WRONGUSER:mgrpw@localhost/app')
-        self.assertRaises(
-            xmlrpclib.ProtocolError, server.get_student_id, 'R123')
-        return
