Changeset 12996 for main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_batching.py

Timestamp:

23 May 2015, 06:54:24 (9 years ago)

Author:

Henrik Bettermann

Message:

Be more careful when checking conversion. Take ignore marker into consideration.

File:

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

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

@@ -1064 +1064 @@
     def test_checkConversion(self):
         errs, inv_errs, conv_dict = self.processor.checkConversion(
+            dict(p_id='<IGNORE>'), mode='create')
+        self.assertEqual(len(errs),0)
+        errs, inv_errs, conv_dict = self.processor.checkConversion(
+            dict(p_id='<IGNORE>'), mode='update')
+        self.assertEqual(len(errs),1)
+        self.assertEqual(errs[0], ('p_id', u'missing'))
+        errs, inv_errs, conv_dict = self.processor.checkConversion(
             dict(p_id='3816951266236341955'))
         self.assertEqual(len(errs),0)
@@ -1075 +1082 @@
             dict(p_id='nonsense'))
         self.assertEqual(len(errs),1)
+        self.assertEqual(errs[0], ('p_id', u'invalid format'))
         timestamp = ("%d" % int(time()*10000))[1:]
         p_id = "p%s" % timestamp
@@ -1142 +1150 @@
         # We perform the same import twice,
         # the second time in update mode. The number
-        # of warnings must be the same.
+        # of warnings increases becaus one p_id is missing.
         num, num_warns, fin_file, fail_file = self.processor.doImport(
             self.csv_file, PAYMENT_HEADER_FIELDS,'create')
@@ -1148 +1156 @@
         num, num_warns, fin_file, fail_file = self.processor.doImport(
             self.csv_file, PAYMENT_HEADER_FIELDS,'update')
-        self.assertEqual(num_warns,0)
-        shutil.rmtree(os.path.dirname(fin_file))
+        self.assertEqual(num_warns,1)
+        content = open(fail_file).read()
+        shutil.rmtree(os.path.dirname(fin_file))
+        self.assertTrue('p_id: missing' in content)
 
     def test_import_remove(self):
         # We perform the same import twice,
         # the second time in remove mode. The number
-        # of warnings must be the same.
+        # of warnings increases becaus one p_id is missing.
         num, num_warns, fin_file, fail_file = self.processor.doImport(
             self.csv_file, PAYMENT_HEADER_FIELDS,'create')
@@ -1160 +1170 @@
         num, num_warns, fin_file, fail_file = self.processor.doImport(
             self.csv_file, PAYMENT_HEADER_FIELDS,'remove')
-        self.assertEqual(num_warns,0)
+        self.assertEqual(num_warns,1)
+        content = open(fail_file).read()
+        self.assertTrue('p_id: missing' in content)
         shutil.rmtree(os.path.dirname(fin_file))
         logcontent = open(self.logfile).read()
@@ -1167 +1179 @@
             in logcontent)
 
-    def test_import_wo_pid(self):
+    def test_import_same_payment_exists(self):
         num, num_warns, fin_file, fail_file = self.processor.doImport(
             self.csv_file2, PAYMENT_CREATE_HEADER_FIELDS,'create')