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

Timestamp:

7 Dec 2012, 10:57:53 (12 years ago)

Author:

uli

Message:

Update tests to reflect last changes.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_export.py (modified) (5 diffs)

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

@@ -5 +5 @@
 from zope.interface.verify import verifyObject, verifyClass
 from waeup.kofa.interfaces import ICSVExporter
+from waeup.kofa.students.catalog import StudentsQuery
 from waeup.kofa.students.export import (
     StudentsExporter, StudentStudyCourseExporter, StudentStudyLevelExporter,
     CourseTicketExporter, PaymentsExporter, BedTicketsExporter,
     StudentPaymentsOverviewExporter, StudentStudyLevelsOverviewExporter,
-    get_students, StudentsExportFilter)
+    get_students,)
 from waeup.kofa.students.accommodation import BedTicket
 from waeup.kofa.students.interfaces import ICSVStudentExporter
@@ -42 +43 @@
     def test_get_students_by_session(self):
         # we can filter out students of a certain session
-        my_filter1 = StudentsExportFilter(current_session=2012)
+        my_filter1 = StudentsQuery(current_session=2012)
         result = get_students(self.app, stud_filter=my_filter1)
         self.assertEqual(len(list(result)), 1)
 
-        my_filter2 = StudentsExportFilter(current_session=1964)
+        my_filter2 = StudentsQuery(current_session=1964)
         result = get_students(self.app, stud_filter=my_filter2)
         self.assertEqual(len(list(result)), 0)
@@ -53 +54 @@
     def test_get_students_by_level(self):
         # we can filter out students of a certain level
-        my_filter1 = StudentsExportFilter(current_level=200)
+        my_filter1 = StudentsQuery(current_level=200)
         result = get_students(self.app, stud_filter=my_filter1)
         self.assertEqual(len(list(result)), 1)
 
-        my_filter2 = StudentsExportFilter(current_level=300)
+        my_filter2 = StudentsQuery(current_level=300)
         result = get_students(self.app, stud_filter=my_filter2)
         self.assertEqual(len(list(result)), 0)
@@ -64 +65 @@
     def test_get_students_by_deptcode(self):
         # we can filter out students of a certain dept.
-        my_filter1 = StudentsExportFilter(depcode='NA')
+        my_filter1 = StudentsQuery(depcode='NA')
         result = get_students(self.app, stud_filter=my_filter1)
         self.assertEqual(len(list(result)), 1)
 
-        my_filter2 = StudentsExportFilter(depcode='NOTEXISTING')
+        my_filter2 = StudentsQuery(depcode='NOTEXISTING')
         result = get_students(self.app, stud_filter=my_filter2)
         self.assertEqual(len(list(result)), 0)
@@ -75 +76 @@
     def test_get_students_by_faccode(self):
         # we can filter out students of a certain faculty.
-        my_filter1 = StudentsExportFilter(faccode='NA')
+        my_filter1 = StudentsQuery(faccode='NA')
         result = get_students(self.app, stud_filter=my_filter1)
         self.assertEqual(len(list(result)), 1)
 
-        my_filter2 = StudentsExportFilter(faccode='NOTEXISTING')
+        my_filter2 = StudentsQuery(faccode='NOTEXISTING')
         result = get_students(self.app, stud_filter=my_filter2)
         self.assertEqual(len(list(result)), 0)