Changeset 12666

Timestamp:

5 Mar 2015, 12:27:11 (10 years ago)

Author:

Henrik Bettermann

Message:

Update tests an remove invalid lgas.

Location:

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn

Files:

• customers/tests/test_browser.py (modified) (2 diffs)
• utils/lgas.py (modified) (1 diff)

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

@@ -224 +224 @@
         self.assertMatches(result,
             'categories_practice,class_name,comment,contract_category,contract_id,'
-            'history,last_product_id,lga,product_object,'
+            'fee_based,history,last_product_id,lga,product_object,'
             'product_options,res_address,state,state_of_origin,superintendent,'
-            'tc_dict,title,user_id,work_address,work_email,work_phone,'
+            'tc_dict,title,user_id,valid_from,valid_to,work_address,work_email,work_phone,'
             'year_qualification\r\n'
-            '[],RONContract,,ron,%s,'
+            '[],RONContract,,ron,%s,0,'
             '[u\'2015-01-18 16:40:01 WAT - License created by system\'],,,,'
-            '[],,created,,,{\'en\': u\'Hello World\'},,K1000000,,,,\r\n'
+            '[],,created,,,{\'en\': u\'Hello World\'},,K1000000,,,,,,\r\n'
             % self.contract1.contract_id)
         # We can reimport the file if we change the header
@@ -283 +283 @@
         self.assertMatches(result,
             'categories_practice,class_name,contract_category,contract_id,'
-            'date_of_qualification,history,inspected,last_license_number,'
+            '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,res_address,'
-            'state,superintendent,tc_dict,title,user_id,work_address\r\n'
-
-            '[],ROPContract,rop,%s,,'
+            '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\']'
-            ',,,,,,,,,,[],,,created,,{\'en\': u\'Hello World\'},,K1000000,\r\n'
+            ',,,,,,,,,,[],,,created,,{\'en\': u\'Hello World\'},,K1000000,,,\r\n'
             % self.contract2.contract_id)
         # We can reimport the file if we change the header

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/utils/lgas.py

@@ -245 +245 @@
     ('delta_ughelli-south','Delta / Ughelli-South'),
     ('delta_ukwuani','Delta / Ukwuani'),
-    ('delta_urwie','Delta / Urwie'),
-    ('delta_uvie','Delta / Uvie'),
-    ('delta_uvwei','Delta / Uvwei'),
     ('delta_uvwie','Delta / Uvwie'),
     ('delta_warri-central','Delta / Warri-Central'),