test dicts rather than dict keys only

eHealthAfrica · Oct 3, 2013 · 2eafc20 · 2eafc20
1 parent ec482ca
commit 2eafc20
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/common_tags.py b/common_tags.py
@@ -35,7 +35,7 @@
 DATE = u"_date"
 GEOLOCATION = u"_geolocation"
 SUBMISSION_TIME = u'_submission_time'
-DELETEDAT = "_deleted_at"  # marker for delete surveys
+DELETEDAT = u"_deleted_at"  # marker for delete surveys
 BAMBOO_DATASET_ID = u"_bamboo_dataset_id"
 
 META_INSTANCE_ID = u"meta/instanceID"

diff --git a/main/tests/test_form_api.py b/main/tests/test_form_api.py
@@ -33,7 +33,7 @@ def test_api(self):
         d = dict_for_mongo_without_userform_id(
             self.xform.surveys.all()[0].parsed_instance)
         find_d = json.loads(response.content)[0]
-        self.assertEqual(sorted(find_d, key=find_d.get), sorted(d, key=d.get))
+        self.assertEqual(find_d, d)
 
     def test_api_with_query(self):
         # query string
@@ -43,7 +43,7 @@ def test_api_with_query(self):
         self.assertEqual(response.status_code, 200)
         d = dict_for_mongo_without_userform_id(self.xform.surveys.all()[0].parsed_instance)
         find_d = json.loads(response.content)[0]
-        self.assertEqual(sorted(find_d, key=find_d.get), sorted(d, key=d.get))
+        self.assertEqual(find_d, d)
 
     def test_api_query_no_records(self):
         # query string
@@ -70,7 +70,7 @@ def test_api_jsonp(self):
         content = response.content[start: end]
         d = dict_for_mongo_without_userform_id(self.xform.surveys.all()[0].parsed_instance)
         find_d = json.loads(content)[0]
-        self.assertEqual(sorted(find_d, key=find_d.get), sorted(d, key=d.get))
+        self.assertEqual(find_d, d)
 
     def test_api_with_query_start_limit(self):
         # query string
@@ -80,7 +80,7 @@ def test_api_with_query_start_limit(self):
         self.assertEqual(response.status_code, 200)
         d = dict_for_mongo_without_userform_id(self.xform.surveys.all()[0].parsed_instance)
         find_d = json.loads(response.content)[0]
-        self.assertEqual(sorted(find_d, key=find_d.get), sorted(d, key=d.get))
+        self.assertEqual(find_d, d)
 
     def test_api_with_query_invalid_start_limit(self):
         # query string