Followup a463858, fix failing tests

qgis · Apr 19, 2018 · 6c89265 · 6c89265 · nirvn · Apr 20, 2018
1 parent 2d7addc
commit 6c89265
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/python/plugins/processing/algs/qgis/IdwInterpolation.py b/python/plugins/processing/algs/qgis/IdwInterpolation.py
@@ -76,10 +76,10 @@ def parseValue(value):
     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]
 
 

diff --git a/python/plugins/processing/tests/AlgorithmsTestBase.py b/python/plugins/processing/tests/AlgorithmsTestBase.py
@@ -155,9 +155,9 @@ def load_param(self, param, id=None):
                 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

diff --git a/python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml b/python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml
@@ -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