Changeset 8354 for main/waeup.kofa/trunk/src

Timestamp:

4 May 2012, 23:26:58 (13 years ago)

Author:

uli

Message:

• Improve readability of a tiny part.
• Reorder imports.
• Test password settings.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_batching.py (modified) (4 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_batching.py

@@ -29 +29 @@
 
 from waeup.kofa.app import University
-from waeup.kofa.university.faculty import Faculty
-from waeup.kofa.university.department import Department
+from waeup.kofa.interfaces import IBatchProcessor, FatalCSVError, IUserAccount
 from waeup.kofa.students.batching import (
     StudentProcessor, StudentStudyCourseProcessor,
@@ -38 +37 @@
 from waeup.kofa.students.studylevel import StudentStudyLevel, CourseTicket
 from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase
-from waeup.kofa.interfaces import IBatchProcessor, FatalCSVError
+from waeup.kofa.university.faculty import Faculty
+from waeup.kofa.university.department import Department
+
 
 STUDENT_SAMPLE_DATA = open(
@@ -328 +329 @@
         assert len(self.app['students'].keys()) == 5
         self.assertEqual(self.app['students']['X666666'].reg_number,'1')
-        self.assertEqual(self.app['students']['X666666'].state,'courses validated')
+        self.assertEqual(
+            self.app['students']['X666666'].state, 'courses validated')
         shutil.rmtree(os.path.dirname(fin_file))
 
@@ -412 +414 @@
             '5,John,E123456,x,aa@aa.ng,1234,,1990-01-06,Kennedy,,100004,sex: Invalid value\r\n'
             )
-        self.assertTrue('A123456' in self.app['students'].keys())
-        self.assertEqual(self.app['students']['A123456'].state,'clearance started')
-        self.assertEqual(self.app['students']['A123456'].date_of_birth,
-            datetime.date(1990, 1, 2))
-        self.assertFalse(self.app['students']['A123456'].clearance_locked)
-        self.assertEqual(self.app['students']['B123456'].state,'cleared')
-        self.assertEqual(self.app['students']['B123456'].date_of_birth,
-            datetime.date(1990, 1, 3))
-        self.assertTrue(self.app['students']['B123456'].clearance_locked)
-        history = ' '.join(self.app['students']['A123456'].history.messages)
+        students = self.app['students']
+        self.assertTrue('A123456' in students.keys())
+        self.assertEqual(students['A123456'].state, 'clearance started')
+        self.assertEqual(students['A123456'].date_of_birth,
+                         datetime.date(1990, 1, 2))
+        self.assertFalse(students['A123456'].clearance_locked)
+        self.assertEqual(students['B123456'].state, 'cleared')
+        self.assertEqual(students['B123456'].date_of_birth,
+                         datetime.date(1990, 1, 3))
+        self.assertTrue(students['B123456'].clearance_locked)
+        history = ' '.join(students['A123456'].history.messages)
         self.assertTrue(
             "State 'clearance started' set by system" in history)
         # state was empty and student is thus in state created
-        self.assertEqual(self.app['students']['F123456'].state,'created')
+        self.assertEqual(students['F123456'].state,'created')
+        # passwords were set correctly
+        self.assertEqual(
+            IUserAccount(students['A123456']).checkPassword('mypw1'), True)
+        self.assertEqual(
+            IUserAccount(students['C123456']).checkPassword('mypw1'), True)
         shutil.rmtree(os.path.dirname(fin_file))