Merge pull request #2 from zotya/master

Fixed tests for eea.sparql
collective · Feb 4, 2013 · aa5fad8 · aa5fad8
2 parents 30214ce + 10cea8b
commit aa5fad8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -5,6 +5,8 @@ Changelog
 ----------------------
 * Upgrade step: Within "Plone > Site setup > Add-ons" click on
   upgrade button available for eea.sparql.
+* Bug fix: Fixed tests for eea.sparql
+  [szabozo0 refs #9424]
 * Feature: Handling specific annotations for data values
   [voineali refs #9558]
 * Bug fix: Fixed preview for queries returning empty fields

diff --git a/eea/sparql/converter/sparql2json.py b/eea/sparql/converter/sparql2json.py
@@ -99,8 +99,8 @@ def sparql2json(data, **kwargs):
         'string': u''}]
 
     """
-    column_types = kwargs.get('column_types')
-    annotations = kwargs.get('annotations')
+    column_types = kwargs.get('column_types', [])
+    annotations = kwargs.get('annotations', {})
 
     data_result = data['result']
     items = []

diff --git a/eea/sparql/tests/mock_data.py b/eea/sparql/tests/mock_data.py
@@ -2,7 +2,11 @@
 """
 
 from eea.sparql.content.sparql import Sparql
-from Products.ZSPARQLMethod.Method import parse_arg_spec, map_arg_values
+from Products.ZSPARQLMethod.Method import parse_arg_spec, \
+                                            map_arg_values, \
+                                            run_with_timeout, \
+                                            interpolate_query, \
+                                            query_and_get_result
 from eea.sparql.tests.base import PORT
 
 def mock_sparql_query():
@@ -18,9 +22,16 @@ def loadSparql():
     sparql.timeout = None
     sparql.arg_spec = ""
 
-    args = None
+    args = ""
     arg_spec = parse_arg_spec(sparql.arg_spec)
     arg_values = map_arg_values(arg_spec, args)[1]
-    data = sparql.execute(**sparql.map_arguments(**arg_values))
 
-    return data
+    cooked_query = interpolate_query(sparql.query, arg_values)
+
+    query_args = (sparql.endpoint_url, cooked_query)
+
+    data = run_with_timeout(
+                10,
+                query_and_get_result,
+                *query_args)
+    return data