Changeset 12803 for main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/tests

Timestamp:

20 Mar 2015, 18:51:29 (10 years ago)

Author:

Henrik Bettermann

Message:

Prepare products and contracts for annual payments.

File:

• main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/tests/test_browser.py (modified) (2 diffs)

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/tests/test_browser.py

@@ -224 +224 @@
         result = open(self.outfile, 'rb').read()
         self.assertMatches(result,
-            'categories_practice,class_name,comment,contract_category,contract_id,'
-            'fee_based,history,last_product_id,lga,nationality,product_object,'
-            'product_options,state,superintendent,'
-            'tc_dict,title,user_id,valid_from,valid_to,work_address,work_email,work_phone,'
-            'year_qualification\r\n'
-            '[],RONContract,,ron,%s,0,'
-            '[u\'2015-01-18 16:40:01 WAT - License created by system\'],,,,,'
-            '[],created,,{\'en\': u\'Hello World\'},,K1000000,,,,,,\r\n'
+            'categories_practice,class_name,comment,contract_category,'
+            'contract_id,contract_year,fee_based,history,last_product_id,'
+            'lga,nationality,product_object,product_options,'
+            'qualification_year,state,superintendent,tc_dict,'
+            'title,user_id,valid_from,valid_to,work_address,'
+            'work_email,work_phone\r\n'
+            '[],RONContract,,ron,%s,,0,'
+            '[u\'2015-03-20 19:13:53 WAT - License created by system\']'
+            ',,,,,[],,created,,{\'en\': u\'Hello World\'},,K1000000,,,,,\r\n'
             % self.contract1.contract_id)
         # We can reimport the file if we change the header
@@ -283 +284 @@
         result = open(self.outfile, 'rb').read()
         self.assertMatches(result,
-            'categories_practice,class_name,contract_category,contract_id,'
-            'date_of_qualification,fee_based,history,inspected,last_license_number,'
+            'categories_practice,class_name,contract_category,'
+            'contract_id,contract_year,date_of_qualification,'
+            'fee_based,history,inspected,last_license_number,'
             'last_product_id,official_in_state,other_directors,'
             'pharmacists_directors,premises_address,premises_certificate,'
-            'product_object,product_options,recommended,'
-            'state,superintendent,tc_dict,title,user_id,valid_from,valid_to,'
-            'work_address\r\n'
-
-            '[],ROPContract,rop,%s,,0,'
-            '[u\'2015-01-20 18:51:03 WAT - License created by system\']'
+            'product_object,product_options,recommended,state,'
+            'superintendent,tc_dict,title,user_id,valid_from,'
+            'valid_to,work_address\r\n'
+
+            '[],ROPContract,rop,%s,,,0,'
+            '[u\'2015-03-20 19:18:30 WAT - License created by system\']'
             ',,,,,,,,,,[],,created,,{\'en\': u\'Hello World\'},,K1000000,,,\r\n'
             % self.contract2.contract_id)