Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/students/tests/test_student.py

Timestamp:

21 Sep 2012, 08:19:35 (12 years ago)

Author:

uli

Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

Location:

main/waeup.kofa/branches/uli-zc-async

Files:

• . (modified) (1 prop)
• src/waeup/kofa/students/tests/test_student.py (modified) (3 diffs)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/students/tests/test_student.py

@@ -21 +21 @@
 import re
 import unittest
-import grok
 from cStringIO import StringIO
 from datetime import tzinfo
-from zope.component import getUtility, queryUtility, createObject
-from zope.catalog.interfaces import ICatalog
+from zope.component import getUtility
 from zope.component.interfaces import IFactory
-from zope.event import notify
 from zope.interface import verify
-from zope.schema.interfaces import RequiredMissing
 from waeup.kofa.interfaces import IExtFileStore, IFileStoreNameChooser
 from waeup.kofa.students.export import EXPORTER_NAMES
@@ -133 +129 @@
         studylevel = StudentStudyLevel()
         self.assertRaises(
-            TypeError, studylevel.addCourseTicket, department, department)
+            TypeError, studylevel.addCourseTicket, department)
 
     def test_booking_date(self):
@@ -240 +236 @@
         return
 
-class StudentTransferTests(StudentImportExportSetup):
-
-    layer = FunctionalLayer
-
-    def setUp(self):
-        super(StudentTransferTests, self).setUp()
-
-        # Add additional certificate
-        self.certificate2 = createObject('waeup.Certificate')
-        self.certificate2.code = 'CERT2'
-        self.certificate2.application_category = 'basic'
-        self.certificate2.start_level = 200
-        self.certificate2.end_level = 500
-        self.app['faculties']['fac1']['dep1'].certificates.addCertificate(
-            self.certificate2)
-
-        # Add student with subobjects
-        student = Student()
-        self.app['students'].addStudent(student)
-        student = self.setup_student(student)
-        notify(grok.ObjectModifiedEvent(student))
-        self.student = self.app['students'][student.student_id]
-        return
-
-    def test_transfer_student(self):
-        self.assertRaises(
-            RequiredMissing, self.student.transfer, self.certificate2)
-        error = self.student.transfer(self.certificate2, current_session=1000)
-        self.assertTrue(error == -1)
-        error = self.student.transfer(self.certificate2, current_session=2013)
-        self.assertTrue(error == None)
-        self.assertEqual(self.student['studycourse_1'].certificate.code, 'CERT1')
-        self.assertEqual(self.student['studycourse'].certificate.code, 'CERT2')
-        self.assertEqual(self.student['studycourse_1'].current_session, 2012)
-        self.assertEqual(self.student['studycourse'].current_session, 2013)
-        self.assertEqual(self.student['studycourse'].entry_session,
-            self.student['studycourse_1'].entry_session)
-        self.assertEqual(self.student['studycourse_1'].__name__, 'studycourse_1')
-        logfile = os.path.join(
-            self.app['datacenter'].storage, 'logs', 'students.log')
-        logcontent = open(logfile).read()
-        self.assertTrue('system - K1000000 - transferred from CERT1 to CERT2'
-            in logcontent)
-        messages = ' '.join(self.student.history.messages)
-        self.assertMatches(
-            '...<YYYY-MM-DD hh:mm:ss> UTC - '
-            'Transferred from CERT1 to CERT2 by system', messages)
-
-        # The students_catalog has been updated.
-        cat = queryUtility(ICatalog, name='students_catalog')
-        results = cat.searchResults(certcode=('CERT1', 'CERT1'))
-        results = [x for x in results]
-        self.assertEqual(len(results), 0)
-        results = cat.searchResults(certcode=('CERT2', 'CERT2'))
-        results = [x for x in results]
-        self.assertEqual(len(results), 1)
-        assert results[0] is self.app['students'][self.student.student_id]
-        results = cat.searchResults(current_session=(2013,2013))
-        results = [x for x in results]
-        self.assertEqual(len(results), 1)
-        assert results[0] is self.app['students'][self.student.student_id]
-
-        # Students can be transferred (only) two times.
-        error = self.student.transfer(self.certificate,
-            current_session=2013)
-        self.assertTrue(error == None)
-        error = self.student.transfer(self.certificate2,
-            current_session=2013)
-        self.assertTrue(error == -3)
-        self.assertEqual([i for i in self.student.keys()],
-            [u'accommodation', u'payments', u'studycourse',
-             u'studycourse_1', u'studycourse_2'])
-
-        # The students_catalog has been updated again.
-        cat = queryUtility(ICatalog, name='students_catalog')
-        results = cat.searchResults(certcode=('CERT1', 'CERT1'))
-        results = [x for x in results]
-        self.assertEqual(len(results), 1)
-        assert results[0] is self.app['students'][self.student.student_id]
-        return
 
 class StudentFactoryTest(FunctionalTestCase):