Index: /main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_browser.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_browser.py	(revision 8319)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_browser.py	(revision 8320)
@@ -21,10 +21,14 @@
 from hurry.workflow.interfaces import IWorkflowState
 from zope.component.hooks import setSite, clearSite
+from zope.component import getUtility
 from waeup.kofa.app import University
 from waeup.kofa.students.tests.test_browser import StudentsFullSetup
 from waeup.kofa.testing import FunctionalTestCase
 from waeup.kofa.students.batching import StudentProcessor
+from waeup.kofa.students.interfaces import IStudentsUtils
 from waeup.uniben.students.batching import CustomStudentProcessor
 from waeup.uniben.testing import FunctionalLayer
+from waeup.uniben.students.utils import get_school_fee
+
 
 STUDENT_SAMPLE_DATA = open(
@@ -218,4 +222,5 @@
         self.assertMatches('...ticket created...',
                            self.browser.contents)
+        # In state admitted school fee can't be determined
         IWorkflowState(self.student).setState('admitted')
         self.browser.open(self.payments_path + '/addop')
@@ -247,3 +252,51 @@
         self.assertTrue('Save' in self.browser.contents)
 
-
+    def test_get_returning_data(self):
+        # Student is in level 100, session 2004 with verdict A
+        utils = getUtility(IStudentsUtils)
+        self.assertEqual(utils.getReturningData(self.student),(2005, 200))
+        self.student['studycourse'].current_verdict = 'C'
+        self.assertEqual(utils.getReturningData(self.student),(2005, 110))
+        self.student['studycourse'].current_verdict = 'D'
+        self.assertEqual(utils.getReturningData(self.student),(2005, 100))
+        return
+
+    def test_get_schoolfee(self):
+        self.assertEqual(get_school_fee(self.student),0.0)
+        IWorkflowState(self.student).setState('cleared')
+        self.assertEqual(get_school_fee(self.student),40000.0)
+        IWorkflowState(self.student).setState('returning')
+        self.assertEqual(get_school_fee(self.student),20000.0)
+        return
+
+    def test_get_payment_details(self):
+        self.app['configuration']['2004'].gown_fee = 150.0
+        self.app['configuration']['2004'].transfer_fee = 90.0
+        self.app['configuration']['2004'].booking_fee = 150.0
+        self.app['configuration']['2004'].maint_fee = 180.0
+        utils = getUtility(IStudentsUtils)
+        self.assertEqual(utils.getPaymentDetails('schoolfee',self.student),
+            {'p_level': 100, 'p_session': 2004, 'amount': 0.0,
+            'p_item': u'CERT1', 'error': u'Amount could not be determined.'}
+            )
+        self.assertEqual(utils.getPaymentDetails('clearance',self.student),
+            {'p_level': 100, 'p_session': 2004, 'amount': 34250.0,
+            'p_item': u'CERT1', 'error': u''}
+            )
+        self.assertEqual(utils.getPaymentDetails('gown',self.student),
+            {'p_level': 100, 'p_session': 2004, 'amount': 150.0,
+            'p_item': u'', 'error': u''}
+            )
+        self.assertEqual(utils.getPaymentDetails('hostel_maintenance',self.student),
+            {'p_level': 100, 'p_session': 2004, 'amount': 180.0,
+            'p_item': u'', 'error': u''}
+            )
+        self.assertEqual(utils.getPaymentDetails('bed_allocation',self.student),
+            {'p_level': 100, 'p_session': 2004, 'amount': 150.0,
+            'p_item': u'', 'error': u''}
+            )
+        self.assertEqual(utils.getPaymentDetails('transfer',self.student),
+            {'p_level': 100, 'p_session': 2004, 'amount': 90.0,
+            'p_item': u'', 'error': u''}
+            )
+        return
