Changeset 12259 for main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_batching.py

Timestamp:

18 Dec 2014, 15:47:12 (10 years ago)

Author:

Henrik Bettermann

Message:

Adjust tests.

File:

• main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_batching.py (modified) (5 diffs)

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

@@ -139 +139 @@
         contract = createObject('waeup.SampleContract')
         contract.title = u'My Contract'
+        contract.contract_id = u'CON1'
         contract.product_object = self.product
         contract.document_object = self.document
@@ -436 +437 @@
             dict(customer_id='ID_NONE', contract_id='nonsense'), self.app) is None
         assert self.processor.getEntry(
-            dict(customer_id=self.customer.customer_id, contract_id='c101'),
-            self.app) is self.customer['contracts']['c101']
+            dict(customer_id=self.customer.customer_id, contract_id='CON1'),
+            self.app) is self.customer['contracts']['CON1']
 
     def test_delEntry(self):
         assert self.processor.getEntry(
-            dict(customer_id=self.customer.customer_id, contract_id='c101'),
-            self.app) is self.customer['contracts']['c101']
+            dict(customer_id=self.customer.customer_id, contract_id='CON1'),
+            self.app) is self.customer['contracts']['CON1']
         self.assertEqual(len(self.customer['contracts'].keys()),1)
         self.processor.delEntry(
-            dict(customer_id=self.customer.customer_id, contract_id='c101'),
+            dict(customer_id=self.customer.customer_id, contract_id='CON1'),
             self.app)
         assert self.processor.getEntry(
-            dict(customer_id=self.customer.customer_id, contract_id='c101'),
+            dict(customer_id=self.customer.customer_id, contract_id='CON1'),
             self.app) is None
         self.assertEqual(len(self.customer['contracts'].keys()),0)
 
     def test_addEntry(self):
-        self.assertEqual(self.app._curr_con_id, 102)
         self.assertEqual(len(self.customer['contracts'].keys()),1)
         contract1 = createObject(u'waeup.SampleContract')
-        contract1.contract_id = 'c234'
+        contract1.contract_id = u'CON2'
         self.processor.addEntry(
-            contract1, dict(customer_id=self.customer.customer_id, contract_id='c234'),
+            contract1, dict(customer_id=self.customer.customer_id, contract_id='CON2'),
             self.app)
         self.assertEqual(len(self.customer['contracts'].keys()),2)
-        self.assertEqual(self.customer['contracts']['c234'].contract_id, 'c234')
-        # _curr_con_id hasn't changed
-        self.assertEqual(self.app._curr_con_id, 102)
+        self.assertEqual(self.customer['contracts']['CON2'].contract_id, 'CON2')
 
     def test_checkConversion(self):
-        self.assertEqual(self.app._curr_con_id, 102)
-        errs, inv_errs, conv_dict = self.processor.checkConversion(
-            dict(contract_id='c126', class_name='SampleContract',
+        errs, inv_errs, conv_dict = self.processor.checkConversion(
+            dict(contract_id='CON3', class_name='SampleContract',
                  document_object='DOC1', product_object='SAM'))
         self.assertEqual(len(errs),0)
-        errs, inv_errs, conv_dict = self.processor.checkConversion(
-            dict(contract_id='nonsense', class_name='SampleContract'))
+        #errs, inv_errs, conv_dict = self.processor.checkConversion(
+        #    dict(contract_id='id with spaces', class_name='SampleContract'))
+        #self.assertEqual(len(errs),1)
+        errs, inv_errs, conv_dict = self.processor.checkConversion(
+            dict(contract_id='CON3', class_name='WrongContract'))
         self.assertEqual(len(errs),1)
-        errs, inv_errs, conv_dict = self.processor.checkConversion(
-            dict(contract_id='c127', class_name='WrongContract'))
-        self.assertEqual(len(errs),1)
-        # _curr_con_id hasn't changed
-        self.assertEqual(self.app._curr_con_id, 102)
 
     def test_import(self):
@@ -487 +482 @@
         fail_file = open(fail_file).read()
         self.assertEqual(fail_file,
-            'reg_number,contract_id,title,class_name,product_object,'
-            'document_object,--ERRORS--\r\n'
-            '2,c5,My stolen contract,SampleContract,SAM,DOC1,'
-            'contract_id: id exists\r\n'
-            '3,c6,My 5th contract,SampleContract,SAM,NONEXISTENT,'
-            'document_object: Invalid value\r\n'
-            '3,c7,My sixt contract,SampleContract,NONEXISTENT,DOC1,'
-            'product_object: Invalid value\r\n')
+            'reg_number,contract_id,title,class_name,product_object,document_object,--ERRORS--\r\n'
+            '2,c5,My stolen contract,SampleContract,SAM,DOC1,This object already exists. Skipping.\r\n'
+            '3,c6,My 5th contract,SampleContract,SAM,NONEXISTENT,document_object: Invalid value\r\n'
+            '3,c7,My sixt contract,SampleContract,NONEXISTENT,DOC1,product_object: Invalid value\r\n'
+            )
         contract = self.processor.getEntry(dict(reg_number='1',
             contract_id='c3'), self.app)
@@ -506 +498 @@
         logcontent = open(self.logfile).read()
         # Logging message from updateEntry
+        # Fetch uuid
+        conid = [i for i in self.app['customers']['X666666']['contracts'].keys()
+            if len(i) > 10][0]
         self.assertTrue(
-            'INFO - system - Contract Processor - '
-            'sample_contract_data - X666666 - updated: '
-            'contract_id=c3, title=My first contract'
+            'INFO - system - Contract Processor - sample_contract_data - '
+            'X666666 - %s - updated: title=My 4th contract, '
+            'product_object=SAM, document_object=DOC1' % conid
             in logcontent)
 
@@ -521 +516 @@
         num, num_warns, fin_file, fail_file = self.processor.doImport(
             self.csv_file, CONTRACT_HEADER_FIELDS,'update')
-        # There are one record without contract_id, one duplicate and two
+        # There are one record without contract_id and two
         # records with wrong object identifier.
-        self.assertEqual(num_warns,4)
+        self.assertEqual(num_warns,3)
         shutil.rmtree(os.path.dirname(fin_file))