Fix script algorithm centroids tests

qgis · Jun 27, 2017 · 792a252 · 792a252
1 parent 96c5453
commit 792a252
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 21 deletions.
diff --git a/python/plugins/processing/tests/testdata/script_algorithm_tests.yaml b/python/plugins/processing/tests/testdata/script_algorithm_tests.yaml
@@ -2,16 +2,16 @@
 
 tests:
 
-#  - algorithm: script:centroids
+  - algorithm: script:centroids
-#    name: Centroids script test
+    name: Centroids script test
-#    params:
+    params:
-#      INPUT_LAYER:
+      INPUT_LAYER:
-#        name: polys.gml
+        name: polys.gml
-#        type: vector
+        type: vector
-#    results:
+    results:
-#      OUTPUT_LAYER:
+      OUTPUT_LAYER:
-#        name: expected/centroid_polys.gml
+        name: expected/centroid_polys.gml
-#        type: vector
+        type: vector
-#        compare:
+        compare:
-#          geometry:
+          geometry:
-#            precision: 7
+            precision: 7
diff --git a/python/plugins/processing/tests/testdata/scripts/centroids.py b/python/plugins/processing/tests/testdata/scripts/centroids.py
@@ -1,17 +1,24 @@
 ##Centroids=name
 ##Geometry=group
-##INPUT_LAYER=vector
+
-##OUTPUT_LAYER=output vector
+#inputs
+
+##INPUT_LAYER=source
+##OUTPUT_LAYER=sink point
+
+#outputs
+
+##OUTPUT_LAYER=output outputVector
 
 from qgis.core import QgsWkbTypes, QgsProcessingUtils
 
-layer = QgsProcessingUtils.mapLayerFromString(INPUT_LAYER, context)
+fields = INPUT_LAYER.fields()
-fields = layer.fields()
 
-writer, writer_dest = QgsProcessingUtils.createFeatureSink(OUTPUT_LAYER, context, fields, QgsWkbTypes.Point, layer.crs(), {'fileEncoding': 'utf-8'})
+(sink, OUTPUT_LAYER) = self.parameterAsSink(parameters, 'OUTPUT_LAYER', context,
+                                            fields, QgsWkbTypes.Point, INPUT_LAYER.sourceCrs())
 
-features = QgsProcessingUtils.getFeatures(layer, context)
+features = INPUT_LAYER.getFeatures()
-count = QgsProcessingUtils.featureCount(layer, context)
+count = INPUT_LAYER.featureCount()
 if count == 0:
     raise GeoAlgorithmExecutionException('Input layer contains no features.')
 
@@ -23,5 +30,5 @@
         outputGeometry = f.geometry().centroid()
         outputFeature.setGeometry(outputGeometry)
 
-    writer.addFeature(outputFeature)
+    sink.addFeature(outputFeature)
     feedback.setProgress(int(count * total))