Changeset 8886

Timestamp:

3 Jul 2012, 10:41:09 (12 years ago)

Author:

Henrik Bettermann

Message:

Add tests for delEntry.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

• batching.py (modified) (2 diffs)
• tests/test_batching.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/batching.py

@@ -618 +618 @@
         student = self.getParent(row, site).__parent__
         student.__parent__.logger.info(
-            '%s - %s - updated: %s'
-            % (student.student_id, obj.p_id, items_changed))
+            '%s - Payment ticket updated: %s'
+            % (student.student_id, items_changed))
         return
 
@@ -638 +638 @@
         if payment is not None:
             student = self._getStudent(row, site)
-            student.__parent__.logger.info('%s - removed: %s'
+            student.__parent__.logger.info('%s - Payment ticket removed: %s'
                 % (student.student_id, payment.p_id))
             del parent[payment.p_id]
-        pass
+        return
 
     def checkConversion(self, row, mode='ignore'):

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

@@ -825 +825 @@
             self.app) is self.student['payments']['p120']
 
+    def test_delEntry(self):
+        assert self.processor.getEntry(
+            dict(student_id=self.student.student_id, p_id='p120'),
+            self.app) is self.student['payments']['p120']
+        self.assertEqual(len(self.student['payments'].keys()),1)
+        self.processor.delEntry(
+            dict(student_id=self.student.student_id, p_id='p120'),
+            self.app)
+        assert self.processor.getEntry(
+            dict(student_id=self.student.student_id, p_id='p120'),
+            self.app) is None
+        self.assertEqual(len(self.student['payments'].keys()),0)
+
     def test_addEntry(self):
         self.assertEqual(len(self.student['payments'].keys()),1)
@@ -870 +883 @@
         self.assertEqual(str(payment.creation_date.tzinfo),'UTC')
         shutil.rmtree(os.path.dirname(fin_file))
-
         logcontent = open(self.logfile).read()
-        # Logging message from updateEntry,
+        # Logging message from updateEntry
         self.assertTrue(
             'INFO - system - K1000001 - Payment ticket updated: '
@@ -891 +903 @@
         self.assertEqual(num_warns,0)
         shutil.rmtree(os.path.dirname(fin_file))
+
+    def test_import_remove(self):
+        num, num_warns, fin_file, fail_file = self.processor.doImport(
+            self.csv_file, PAYMENT_HEADER_FIELDS,'create')
+        num, num_warns, fin_file, fail_file = self.processor.doImport(
+            self.csv_file, PAYMENT_HEADER_FIELDS,'remove')
+        self.assertEqual(num_warns,0)
+        shutil.rmtree(os.path.dirname(fin_file))
+        logcontent = open(self.logfile).read()
+        self.assertTrue(
+            'INFO - system - K1000001 - Payment ticket removed: p1266236341955'
+            in logcontent)
 
     def test_import_wo_pid(self):