X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/a4e514033df5fbe3f494d757892589772a690cce..f727620859cacfa39146642b31ad446762212262:/test/bdd/environment.py

diff --git a/test/bdd/environment.py b/test/bdd/environment.py
index f0658c33..b6f6b986 100644
--- a/test/bdd/environment.py
+++ b/test/bdd/environment.py
@@ -5,8 +5,8 @@ import psycopg2
 import psycopg2.extras
 import subprocess
 import tempfile
-from nose.tools import * # for assert functions
-from sys import version_info as python_version
+
+from steps.geometry_factory import GeometryFactory
 
 logger = logging.getLogger(__name__)
 
@@ -21,13 +21,13 @@ userconfig = {
     'TEMPLATE_DB' : 'test_template_nominatim',
     'TEST_DB' : 'test_nominatim',
     'API_TEST_DB' : 'test_api_nominatim',
-    'TEST_SETTINGS_FILE' : '/tmp/nominatim_settings.php',
     'SERVER_MODULE_PATH' : None,
     'PHPCOV' : False, # set to output directory to enable code coverage
 }
 
 use_step_matcher("re")
 
+
 class NominatimEnvironment(object):
     """ Collects all functions for the execution of Nominatim functions.
     """
@@ -43,14 +43,14 @@ class NominatimEnvironment(object):
         self.test_db = config['TEST_DB']
         self.api_test_db = config['API_TEST_DB']
         self.server_module_path = config['SERVER_MODULE_PATH']
-        self.local_settings_file = config['TEST_SETTINGS_FILE']
         self.reuse_template = not config['REMOVE_TEMPLATE']
         self.keep_scenario_db = config['KEEP_TEST_DB']
         self.code_coverage_path = config['PHPCOV']
         self.code_coverage_id = 1
-        os.environ['NOMINATIM_SETTINGS'] = self.local_settings_file
+        self.test_env = None
 
         self.template_db_done = False
+        self.website_dir = None
 
     def connect_database(self, dbname):
         dbargs = {'database': dbname}
@@ -72,24 +72,31 @@ class NominatimEnvironment(object):
         return fn
 
     def write_nominatim_config(self, dbname):
-        f = open(self.local_settings_file, 'w')
-        # https://secure.php.net/manual/en/ref.pdo-pgsql.connection.php
-        f.write("<?php\n  @define('CONST_Database_DSN', 'pgsql:dbname=%s%s%s%s%s');\n" %
-                (dbname,
+        dsn = 'pgsql:dbname={}{}{}{}{}'.format(
+                dbname,
                  (';host=' + self.db_host) if self.db_host else '',
                  (';port=' + self.db_port) if self.db_port else '',
                  (';user=' + self.db_user) if self.db_user else '',
                  (';password=' + self.db_pass) if self.db_pass else ''
-                 ))
-        f.write("@define('CONST_Osm2pgsql_Flatnode_File', null);\n")
-        f.write("@define('CONST_Import_Style', CONST_BasePath.'/settings/import-full.style');\n")
-        f.close()
+                 )
+
+        if self.website_dir is not None \
+           and self.test_env is not None \
+           and dsn == self.test_env['NOMINATIM_DATABASE_DSN']:
+            return # environment already set uo
+
+        self.test_env = os.environ
+        self.test_env['NOMINATIM_DATABASE_DSN'] = dsn
+        self.test_env['NOMINATIM_FLATNODE_FILE'] = ''
+        self.test_env['NOMINATIM_IMPORT_STYLE'] = 'full'
+        self.test_env['NOMINATIM_USE_US_TIGER_DATA'] = 'yes'
+
+        if self.website_dir is not None:
+            self.website_dir.cleanup()
+
+        self.website_dir = tempfile.TemporaryDirectory()
+        self.run_setup_script('setup-website')
 
-    def cleanup(self):
-        try:
-            os.remove(self.local_settings_file)
-        except OSError:
-            pass # ignore missing file
 
     def db_drop_database(self, name):
         conn = self.connect_database('postgres')
@@ -166,10 +173,7 @@ class NominatimEnvironment(object):
         cur.execute('CREATE DATABASE %s TEMPLATE = %s' % (self.test_db, self.template_db))
         conn.close()
         context.db = self.connect_database(self.test_db)
-        if python_version[0] < 3:
-            psycopg2.extras.register_hstore(context.db, globally=False, unicode=True)
-        else:
-            psycopg2.extras.register_hstore(context.db, globally=False)
+        psycopg2.extras.register_hstore(context.db, globally=False)
 
     def teardown_db(self, context):
         if 'db' in context:
@@ -193,7 +197,13 @@ class NominatimEnvironment(object):
         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,
+
+        if self.website_dir is not None:
+            cwd = self.website_dir.name
+        else:
+            cwd = self.build_dir
+
+        proc = subprocess.Popen(cmd, cwd=cwd, env=self.test_env,
                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         (outp, outerr) = proc.communicate()
         outerr = outerr.decode('utf-8').replace('\\n', '\n')
@@ -201,83 +211,6 @@ class NominatimEnvironment(object):
         assert (proc.returncode == 0), "Script '%s' failed:\n%s\n%s\n" % (script, outp, outerr)
 
 
-class OSMDataFactory(object):
-
-    def __init__(self):
-        scriptpath = os.path.dirname(os.path.abspath(__file__))
-        self.scene_path = os.environ.get('SCENE_PATH',
-                           os.path.join(scriptpath, '..', 'scenes', 'data'))
-        self.scene_cache = {}
-        self.clear_grid()
-
-    def parse_geometry(self, geom, scene):
-        if geom.find(':') >= 0:
-            return "ST_SetSRID(%s, 4326)" % self.get_scene_geometry(scene, geom)
-
-        if geom.find(',') < 0:
-            out = "POINT(%s)" % self.mk_wkt_point(geom)
-        elif geom.find('(') < 0:
-            line = ','.join([self.mk_wkt_point(x) for x in geom.split(',')])
-            out = "LINESTRING(%s)" % line
-        else:
-            inner = geom.strip('() ')
-            line = ','.join([self.mk_wkt_point(x) for x in inner.split(',')])
-            out = "POLYGON((%s))" % line
-
-        return "ST_SetSRID('%s'::geometry, 4326)" % out
-
-    def mk_wkt_point(self, point):
-        geom = point.strip()
-        if geom.find(' ') >= 0:
-            return geom
-        else:
-            pt = self.grid_node(int(geom))
-            assert_is_not_none(pt, "Point not found in grid")
-            return "%f %f" % pt
-
-    def get_scene_geometry(self, default_scene, name):
-        geoms = []
-        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 = self.load_scene(scene)
-                wkt = scene_geoms[obj]
-
-            geoms.append("'%s'::geometry" % wkt)
-
-        if len(geoms) == 1:
-            return geoms[0]
-        else:
-            return 'ST_LineMerge(ST_Collect(ARRAY[%s]))' % ','.join(geoms)
-
-    def load_scene(self, name):
-        if name in self.scene_cache:
-            return self.scene_cache[name]
-
-        scene = {}
-        with open(os.path.join(self.scene_path, "%s.wkt" % name), 'r') as fd:
-            for line in fd:
-                if line.strip():
-                    obj, wkt = line.split('|', 2)
-                    scene[obj.strip()] = wkt.strip()
-            self.scene_cache[name] = scene
-
-        return scene
-
-    def clear_grid(self):
-        self.grid = {}
-
-    def add_grid_node(self, nodeid, x, y):
-        self.grid[nodeid] = (x, y)
-
-    def grid_node(self, nodeid):
-        return self.grid.get(nodeid)
-
 
 def before_all(context):
     # logging setup
@@ -288,10 +221,7 @@ def before_all(context):
     logging.debug('User config: %s' %(str(context.config.userdata)))
     # Nominatim test setup
     context.nominatim = NominatimEnvironment(context.config.userdata)
-    context.osm = OSMDataFactory()
-
-def after_all(context):
-    context.nominatim.cleanup()
+    context.osm = GeometryFactory()
 
 
 def before_scenario(context, scenario):