Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / environment.py

diff --git a/test/bdd/environment.py b/test/bdd/environment.py
index c878c61c5f90bf4f407038654fbe76673508b131..6411d0117db77b94b26e4cd788a95404660ef3ab 100644 (file)
--- a/test/bdd/environment.py
+++ b/test/bdd/environment.py
@@ -4,17 +4,18 @@ import os
 import psycopg2
 import psycopg2.extras
 import subprocess
+from nose.tools import * # for assert functions
 from sys import version_info as python_version
 
 logger = logging.getLogger(__name__)
 
 userconfig = {
-    'BASEURL' : 'http://localhost/nominatim',
     'BUILDDIR' : os.path.join(os.path.split(__file__)[0], "../../build"),
     'REMOVE_TEMPLATE' : False,
     'KEEP_TEST_DB' : False,
     'TEMPLATE_DB' : 'test_template_nominatim',
     'TEST_DB' : 'test_nominatim',
+    'API_TEST_DB' : 'test_api_nominatim',
     'TEST_SETTINGS_FILE' : '/tmp/nominatim_settings.php'
 }
 
@@ -28,6 +29,7 @@ class NominatimEnvironment(object):
         self.build_dir = os.path.abspath(config['BUILDDIR'])
         self.template_db = config['TEMPLATE_DB']
         self.test_db = config['TEST_DB']
+        self.api_test_db = config['API_TEST_DB']
         self.local_settings_file = config['TEST_SETTINGS_FILE']
         self.reuse_template = not config['REMOVE_TEMPLATE']
         self.keep_scenario_db = config['KEEP_TEST_DB']
@@ -97,7 +99,8 @@ class NominatimEnvironment(object):
                               'create-partition-tables', 'create-partition-functions',
                               'load-data', 'create-search-indices')
 
-
+    def setup_api_db(self, context):
+        self.write_nominatim_config(self.api_test_db)
 
     def setup_db(self, context):
         self.setup_template_db()
@@ -121,12 +124,17 @@ class NominatimEnvironment(object):
         if not self.keep_scenario_db:
             self.db_drop_database(self.test_db)
 
-    def run_setup_script(self, *args):
-        self.run_nominatim_script('setup', *args)
+    def run_setup_script(self, *args, **kwargs):
+        self.run_nominatim_script('setup', *args, **kwargs)
+
+    def run_update_script(self, *args, **kwargs):
+        self.run_nominatim_script('update', *args, **kwargs)
 
-    def run_nominatim_script(self, script, *args):
+    def run_nominatim_script(self, script, *args, **kwargs):
         cmd = [os.path.join(self.build_dir, 'utils', '%s.php' % script)]
         cmd.extend(['--%s' % x for x in args])
+        for k, v in kwargs.items():
+            cmd.extend(('--' + k.replace('_', '-'), str(v)))
         proc = subprocess.Popen(cmd, cwd=self.build_dir,
                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         (outp, outerr) = proc.communicate()
@@ -143,28 +151,28 @@ class OSMDataFactory(object):
         self.scene_cache = {}
 
     def parse_geometry(self, geom, scene):
-        if geom[0].find(':') >= 0:
-            out = self.get_scene_geometry(scene, geom[1:])
-        if geom.find(',') < 0:
-            out = 'POINT(%s)' % geom
+        if geom.find(':') >= 0:
+            out = self.get_scene_geometry(scene, geom)
+        elif geom.find(',') < 0:
+            out = "'POINT(%s)'::geometry" % geom
         elif geom.find('(') < 0:
-            out = 'LINESTRING(%s)' % geom
+            out = "'LINESTRING(%s)'::geometry" % geom
         else:
-            out = 'POLYGON(%s)' % geom
+            out = "'POLYGON(%s)'::geometry" % geom
 
-        # TODO parse precision
-        return out, 0
+        return "ST_SetSRID(%s, 4326)" % out
 
     def get_scene_geometry(self, default_scene, name):
         geoms = []
-        defscene = self.load_scene(default_scene)
         for obj in name.split('+'):
             oname = obj.strip()
             if oname.startswith(':'):
+                assert_is_not_none(default_scene, "You need to set a scene")
+                defscene = self.load_scene(default_scene)
                 wkt = defscene[oname[1:]]
             else:
                 scene, obj = oname.split(':', 2)
-                scene_geoms = world.load_scene(scene)
+                scene_geoms = self.load_scene(scene)
                 wkt = scene_geoms[obj]
 
             geoms.append("'%s'::geometry" % wkt)
@@ -207,6 +215,8 @@ def after_all(context):
 def before_scenario(context, scenario):
     if 'DB' in context.tags:
         context.nominatim.setup_db(context)
+    elif 'APIDB' in context.tags:
+        context.nominatim.setup_api_db(context)
     context.scene = None
 
 def after_scenario(context, scenario):