sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-18 00:03:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow using gpkg in processing tests

Browse Source
This commit is contained in:
Matthias Kuhn 2018-10-25 15:30:12 +02:00
parent b64e72a89d
commit 2a973fc0b6
No known key found for this signature in database
GPG Key ID: 7A7F1A1C90C3E6A7
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
python/plugins/processing/tests/AlgorithmsTestBase.py
View File

@ -36,6 +36,7 @@ import shutil
import glob import glob
import hashlib import hashlib
import tempfile import tempfile
import re
from osgeo.gdalconst import GA_ReadOnly from osgeo.gdalconst import GA_ReadOnly
from numpy import nan_to_num from numpy import nan_to_num
@ -199,7 +200,8 @@ class AlgorithmsTest(object):
basename = os.path.basename(param['name']) basename = os.path.basename(param['name'])
else: else:
basename = os.path.basename(param['name'][0]) basename = os.path.basename(param['name'][0])
filepath = os.path.join(outdir, basename)
filepath = self.uri_path_join(outdir, basename)
return filepath return filepath
elif param['type'] == 'rasterhash': elif param['type'] == 'rasterhash':
outdir = tempfile.mkdtemp() outdir = tempfile.mkdtemp()
@ -215,13 +217,14 @@ class AlgorithmsTest(object):
def load_layers(self, id, param): def load_layers(self, id, param):
layers = [] layers = []
if param['type'] in ('vector', 'table') and isinstance(param['name'], str): if param['type'] in ('vector', 'table'):
layers.append(self.load_layer(id, param)) if isinstance(param['name'], str) or 'uri' in param:
elif param['type'] in ('vector', 'table'): layers.append(self.load_layer(id, param))
for n in param['name']: else:
layer_param = deepcopy(param) for n in param['name']:
layer_param['name'] = n layer_param = deepcopy(param)
layers.append(self.load_layer(id, layer_param)) layer_param['name'] = n
layers.append(self.load_layer(id, layer_param))
else: else:
layers.append(self.load_layer(id, param)) layers.append(self.load_layer(id, param))
return layers return layers
@ -230,6 +233,7 @@ class AlgorithmsTest(object):
""" """
Loads a layer which was specified as parameter. Loads a layer which was specified as parameter.
""" """
filepath = self.filepath_from_param(param) filepath = self.filepath_from_param(param)
if 'in_place' in param and param['in_place']: if 'in_place' in param and param['in_place']:
@ -268,7 +272,22 @@ class AlgorithmsTest(object):
if 'location' in param and param['location'] == 'qgs': if 'location' in param and param['location'] == 'qgs':
prefix = unitTestDataPath() prefix = unitTestDataPath()
return os.path.join(prefix, param['name']) if 'uri' in param:
path = param['uri']
else:
path = param['name']
return self.uri_path_join(prefix, path)
def uri_path_join(self, prefix, filepath):
if filepath.startswith('ogr:'):
if not prefix[-1] == os.path.sep:
prefix += os.path.sep
filepath = re.sub(r"dbname='", "dbname='{}".format(prefix), filepath)
else:
filepath = os.path.join(prefix, filepath)
return filepath
def check_results(self, results, context, params, expected): def check_results(self, results, context, params, expected):
""" """