Changeset 12633 for main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests

Timestamp:

27 Feb 2015, 17:39:46 (10 years ago)

Author:

Henrik Bettermann

Message:

Copy over valid_from and valid_to from products when creating contract objects.

Fix ContractProcessorBase?. Do really allow to import tc_dict, valid_from, title and valid_to.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests

Files:

• sample_contract_data.csv (modified) (1 diff)
• test_batching.py (modified) (4 diffs)
• test_export.py (modified) (4 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/sample_contract_data.csv

@@ -1 @@
-class_name,contract_id,reg_number,product_object,document_object,product_options,tc_dict,title
-SampleContract,c3,1,SAM,DOC1,"[('Base Fee', '800.6', 'USD')]",{'en':'Hello World'},Nice Contract
-SampleContract,c4,2,SAM,DOC1,[],{},
-SampleContract,c5,3,SAM,DOC1,[],{},
-SampleContract,,1,SAM,DOC1,[],{},
-SampleContract,c5,2,SAM,DOC1,[],{},
-SampleContract,c6,3,SAM,NONEXISTENT,[],{},
-SampleContract,c7,3,NONEXISTENT,DOC1,[],{},
+class_name,contract_id,reg_number,product_object,document_object,product_options,tc_dict,title,valid_from,valid_to
+SampleContract,c3,1,SAM,DOC1,"[('Base Fee', '800.6', 'USD')]",{'en':'Hello World'},Nice Contract,2014-06-25#,2015-06-25#
+SampleContract,c4,2,SAM,DOC1,[],,,,
+SampleContract,c5,3,SAM,DOC1,[],,,,
+SampleContract,,1,SAM,DOC1,[],,,,
+SampleContract,c5,2,SAM,DOC1,[],,,,
+SampleContract,c6,3,SAM,NONEXISTENT,[],,,,
+SampleContract,c7,3,NONEXISTENT,DOC1,[],,,,

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_batching.py

@@ -158 +158 @@
         contract.product_options = self.product.options
         contract.tc_dict = {'en': u'Hello world'}
+        contract.valid_from = datetime.date(2014, 2, 4)
+        contract.valid_to = datetime.date(2014, 12, 4)
+
         customer['contracts'].addContract(contract)
         self.contract = contract
@@ -498 +501 @@
         fail_file = open(fail_file).read()
         self.assertEqual(fail_file,
-            'reg_number,contract_id,title,class_name,product_object,tc_dict,document_object,product_options,--ERRORS--\r\n'
-            '2,c5,,SampleContract,SAM,{},DOC1,[],This object already exists. Skipping.\r\n'
-            '3,c6,,SampleContract,SAM,{},NONEXISTENT,[],document_object: Invalid value\r\n'
-            '3,c7,,SampleContract,NONEXISTENT,{},DOC1,[],product_object: Invalid value\r\n'
+            'reg_number,valid_from,contract_id,title,class_name,valid_to,product_object,tc_dict,document_object,product_options,--ERRORS--\r\n'
+            '2,,c5,,SampleContract,,SAM,,DOC1,[],This object already exists. Skipping.\r\n'
+            '3,,c6,,SampleContract,,SAM,,NONEXISTENT,[],document_object: Invalid value\r\n'
+            '3,,c7,,SampleContract,,NONEXISTENT,,DOC1,[],product_object: Invalid value\r\n'
             )
         contract = self.processor.getEntry(dict(reg_number='1',
@@ -512 +515 @@
         self.assertEqual(contract.product_options[0].currency, 'USD')
         self.assertEqual(contract.contract_id, 'c3')
-        self.assertEqual(contract.tc_dict, u"{'en':'Hello World'}")
+        self.assertEqual(contract.title, u'Nice Contract')
+        self.assertEqual(contract.tc_dict, {'en':'Hello World'})
         contract = self.processor.getEntry(dict(reg_number='3',
             contract_id='c5'), self.app)
@@ -523 +527 @@
         self.assertTrue(
             'INFO - system - Customer Sample Contract Processor - sample_contract_data - '
-            'X666666 - %s - updated: title=, product_object=SAM, tc_dict={}, document_object=DOC1, '
+            'X666666 - %s - updated: valid_from=, title=, valid_to=, product_object=SAM, tc_dict=, document_object=DOC1, '
             'product_options=[]' % conid
             in logcontent)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_export.py

@@ -257 +257 @@
             'class_name,comment,contract_category,contract_id,document_object,'
             'history,last_product_id,'
-            'product_object,product_options,state,tc_dict,title,user_id\r\n'
-
-            'SampleContract,,sample,CON1,,[],,,[],,{},,\r\n'
+            'product_object,product_options,state,tc_dict,title,user_id,'
+            'valid_from,valid_to\r\n'
+
+            'SampleContract,,sample,CON1,,[],,,[],,{},,,,\r\n'
             )
         return
@@ -273 +274 @@
             'class_name,comment,contract_category,contract_id,document_object,'
             'history,last_product_id,'
-            'product_object,product_options,state,tc_dict,title,user_id\r\n'
+            'product_object,product_options,state,tc_dict,title,user_id,'
+            'valid_from,valid_to\r\n'
 
             'SampleContract,,sample,CON1,DOC1,[u\'2014-12-04 12:10:46 UTC - '
             'Contract created by system\'],,'
             'SAM,"[(u\'Base Fee\', u\'800.6\', u\'USD\')]",'
-            'created,{\'en\': u\'Hello world\'},,A111111\r\n',
+            'created,{\'en\': u\'Hello world\'},,A111111,'
+            '2014-02-04#,2014-12-04#\r\n',
             result
             )
@@ -293 +296 @@
             'class_name,comment,contract_category,contract_id,document_object,'
             'history,last_product_id,'
-            'product_object,product_options,state,tc_dict,title,user_id\r\n'
+            'product_object,product_options,state,tc_dict,title,user_id,'
+            'valid_from,valid_to\r\n'
 
             'SampleContract,,sample,CON1,DOC1,[u\'2014-12-04 12:10:46 UTC - '
             'Contract created by system\'],,'
             'SAM,"[(u\'Base Fee\', u\'800.6\', u\'USD\')]",'
-            'created,{\'en\': u\'Hello world\'},,A111111\r\n',
+            'created,{\'en\': u\'Hello world\'},,A111111,'
+            '2014-02-04#,2014-12-04#\r\n',
             result
             )
@@ -313 +318 @@
             'class_name,comment,contract_category,contract_id,document_object,'
             'history,last_product_id,'
-            'product_object,product_options,state,tc_dict,title,user_id\r\n'
+            'product_object,product_options,state,tc_dict,title,user_id,'
+            'valid_from,valid_to\r\n'
 
             'SampleContract,,sample,CON1,DOC1,[u\'2014-12-04 12:10:46 UTC - '
             'Contract created by system\'],,'
             'SAM,"[(u\'Base Fee\', u\'800.6\', u\'USD\')]",'
-            'created,{\'en\': u\'Hello world\'},,A111111\r\n',
-            result
-            )
-        return
-
+            'created,{\'en\': u\'Hello world\'},,A111111,'
+            '2014-02-04#,2014-12-04#\r\n',
+            result
+            )
+        return
+