Changeset 326:46fe057f2605 for pdw/tests/test_pd.py

Timestamp:

03/10/10 12:32:00 (6 months ago)

Author:

acracia

Branch:

default

Message:

[api]to_dict method on the model, tailored to use as input of the api

Files:

• pdw/tests/test_pd.py (modified) (3 diffs)

pdw/tests/test_pd.py

@@ -418 +418 @@
         calc = pd.determine_status(newwork,'ca')
         return calc
+        assert 'confidence' in calc.log
 
     def test_uk(self):
         '''
-        simple parsing of the json to create objects and pass them to the 
-        calculators / currently uk calculator is working. not Canadian one
+        test the calculator api for the UK
         '''
         parsed = json.loads(self.json_data2)
@@ -428 +428 @@
         jurisdiction = parsed['jurisdiction']
         newwork = model.Work.from_dict(workdata)
+        model.Session.remove()
         calc = pd.determine_status(newwork,jurisdiction)
 
         print parsed  
         return calc
+        assert calc.log>0
 
     def test_ca(self):
         '''
-        simple parsing of the json to create objects and pass them to the 
-        calculators / currently uk calculator is working. not Canadian one
+        test the calculator api for Canada
 
         '''
@@ -443 +444 @@
         jurisdiction = parsed['jurisdiction']
         newwork = model.Work.from_dict(workdata)
+        model.Session.remove()
         calc = pd.determine_status(newwork,jurisdiction)