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

Followup a463858, fix failing tests

Browse Source
This commit is contained in:
Nyall Dawson 2018-04-20 08:38:15 +10:00
parent 2d7addc9f7
commit 6c892652ac
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/plugins/processing/algs/qgis/IdwInterpolation.py
View File

@ -76,10 +76,10 @@ class ParameterInterpolationData(QgsProcessingParameterDefinition):
def dataToString(data):
s = ''
for c in data:
s += '{}::~:: {}::~:: {:d}::~:: {:d};'.format(c[0],
c[1],
c[2],
c[3])
s += '{}::~::{}::~::{:d}::~::{:d};'.format(c[0],
c[1],
c[2],
c[3])
return s[:-1]

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

@ -155,9 +155,9 @@ class AlgorithmsTest(object):
prefix = processingTestDataPath()
tmp = ''
for r in param['name'].split(';'):
v = r.split(',')
tmp += '{},{},{},{};'.format(os.path.join(prefix, v[0]),
v[1], v[2], v[3])
v = r.split('::~::')
tmp += '{}::~::{}::~::{}::~::{};'.format(os.path.join(prefix, v[0]),
v[1], v[2], v[3])
return tmp[:-1]
except TypeError:
# No type specified, use whatever is there

8
python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml vendored
View File

@ -1715,7 +1715,7 @@ tests:
DISTANCE_COEFFICIENT: 2.0
EXTENT: 0, 8, -5, 3
INTERPOLATION_DATA:
name: pointsz.gml,0,1,0
name: pointsz.gml::~::0::~::1::~::0
type: interpolation
ROWS: 300
results:
@ -1732,7 +1732,7 @@ tests:
DISTANCE_COEFFICIENT: 2.0
EXTENT: 0, 8, -5, 3
INTERPOLATION_DATA:
name: pointsz.gml,1,-1,0
name: pointsz.gml::~::1::~::-1::~::0
type: interpolation
ROWS: 300
results:
@ -1748,7 +1748,7 @@ tests:
COLUMNS: 300
EXTENT: 0, 8, -5, 3
INTERPOLATION_DATA:
name: pointsz.gml,0,1,0
name: pointsz.gml::~::0::~::1::~::0
type: interpolation
METHOD: '0'
ROWS: 300
@ -1768,7 +1768,7 @@ tests:
COLUMNS: 300
EXTENT: 0, 8, -5, 3
INTERPOLATION_DATA:
name: pointsz.gml,1,-1,0
name: pointsz.gml::~::1::~::-1::~::0
type: interpolation
METHOD: '1'
ROWS: 300