Changeset 8321 for main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/tests

Timestamp:

2 May 2012, 06:24:42 (12 years ago)

Author:

Henrik Bettermann

Message:

We have to store the cost in AccessCode? not only in AccessCodeBatches?. We need this for access code slips in students.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/tests

Files:

• sample_import.csv (modified) (1 diff)
• test_accesscode.py (modified) (4 diffs)
• test_catalog.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/tests/sample_import.csv

@@ -1 @@
-"prefix","serial","ac","state","history"
-"FOO","9.99","1","0"
-"FOO","0","FOO-1-11111111","used","2011-06-01 12:12:14 - AC initialized by system||2011-06-01 12:14:14 - comment with ""quotes"" by system"
-"FOO","1","FOO-1-22222222","initialized","2011-05-30 21:10:12 - AC initialized by system"
-"FOO","2","FOO-1-33333333","disabled","2012-05-30 21:12:10 - AC initialized by system||2012-05-30 23:10:10 - AC disabled by system"
+"prefix","serial","ac","state","history","cost"
+"FOO","9.99","1","0",""
+"FOO","0","FOO-1-11111111","used","2011-06-01 12:12:14 - AC initialized by system||2011-06-01 12:14:14 - comment with ""quotes"" by system","1000.0"
+"FOO","1","FOO-1-22222222","initialized","2011-05-30 21:10:12 - AC initialized by system",""
+"FOO","2","FOO-1-33333333","disabled","2012-05-30 21:12:10 - AC initialized by system||2012-05-30 23:10:10 - AC disabled by system",""

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/tests/test_accesscode.py

@@ -238 +238 @@
 
     def test_cost(self):
-        # We get the cost set in batch
+        # The cost of an access code will be stored by handle_batch_added
+        # right after the batch has been added to the ZODB. Thus after
+        # creation of the batch, cost is still 0.0
         cost = self.ac1.cost
-        assert cost == 6.6
+        assert cost == 0.0
 
 class AccessCodeBatchTests(FunctionalTestCase):
@@ -264 +266 @@
 
         self.ac1 = AccessCode(0, '11111111')
+        self.ac1.cost = 2345.0
         self.ac2 = AccessCode(1, '22222222')
         self.ac3 = AccessCode(2, '33333333')
@@ -298 +301 @@
         result_path = os.path.join(batch._getStoragePath(), basename)
         expected = '''
-"prefix","serial","ac","state","history"
+"prefix","serial","ac","state","history","cost"
 "FOO","9.99","1","0"
-"FOO","0","FOO-1-11111111","used","<YYYY-MM-DD hh:mm:ss> UTC - ..."
-"FOO","1","FOO-1-22222222","initialized","<YYYY-MM-DD hh:mm:ss> UTC - ..."
-"FOO","2","FOO-1-33333333","disabled","<YYYY-MM-DD hh:mm:ss> UTC - ..."
+"FOO","0","FOO-1-11111111","used","<YYYY-MM-DD hh:mm:ss> UTC - ...","2345.0"
+"FOO","1","FOO-1-22222222","initialized","<YYYY-MM-DD hh:mm:ss> UTC - ...",""
+"FOO","2","FOO-1-33333333","disabled","<YYYY-MM-DD hh:mm:ss> UTC - ...",""
 '''[1:]
         contents = open(result_path, 'rb').read()
@@ -366 +369 @@
             keys,
             [u'FOO-1-11111111', u'FOO-1-22222222', u'FOO-1-33333333'])
+        # Also cost has been stored correctly
+        self.assertEqual(batch['FOO-1-11111111'].cost,1000.0)
 
     def test_getAccessCode(self):

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/tests/test_catalog.py

@@ -60 +60 @@
         self.ac2 = batch.getAccessCode('APP-1-22222222')
         self.ac3 = batch.getAccessCode('APP-1-33333333')
-
-
         return