identation errors and wrong file paths

Author: Maximilian Krambach

python/plugins/processing/algs/qgis/Dissolve.py

@@ -93,9 +93,11 @@ def processAlgorithm(self, progress):
                     if len(errors) != 0:
                         for error in errors:
                             ProcessingLog.addToLog(ProcessingLog.LOG_ERROR,
-                                self.tr('ValidateGeometry() error: One or '
-                                                       'more input features have invalid '
-                                                       'geometry: ') + error.what())
+                                                   self.tr('ValidateGeometry()'
+                                                           'error: One or more '
+                                                           'input features have '
+                                                           'invalid geometry: ')
+                                                   + error.what())
                         continue
                     outFeat.setGeometry(tmpInGeom)
                     first = False
@@ -108,9 +110,11 @@ def processAlgorithm(self, progress):
                     if len(errors) != 0:
                         for error in errors:
                             ProcessingLog.addToLog(ProcessingLog.LOG_ERROR,
-                                self.tr('ValidateGeometry() error: One or '
-                                                       'more input features have invalid '
-                                                       'geometry: ') + error.what())
+                                                   self.tr('ValidateGeometry()'
+                                                           'error:One or more input'
+                                                           'features have invalid '
+                                                           'geometry: ')
+                                                   + error.what())
                         continue
                     try:
                         tmpOutGeom = QgsGeometry(tmpOutGeom.combine(tmpInGeom))
@@ -142,9 +146,11 @@ def processAlgorithm(self, progress):
                 if len(errors) != 0:
                     for error in errors:
                         ProcessingLog.addToLog(ProcessingLog.LOG_ERROR,
-                        self.tr('ValidateGeometry() error: One or '
-                            'more input features have invalid '
-                            'geometry: ') + error.what())
+                                               self.tr('ValidateGeometry() '
+                                                       'error: One or more input'
+                                                       'features have invalid '
+                                                       'geometry: ')
+                                               + error.what())
 
                 if attrDict[unicode(tempItem).strip()] is None:
                     # keep attributes of first feature

…g/tests/testdata/PolygonDissolveTest.gfs …/testdata/custom/PolygonDissolveTest.gfspython/plugins/processing/tests/testdata/PolygonDissolveTest.gfs renamed to python/plugins/processing/tests/testdata/custom/PolygonDissolveTest.gfs python/plugins/processing/tests/testdata/PolygonDissolveTest.gfs renamed to python/plugins/processing/tests/testdata/custom/PolygonDissolveTest.gfs

@@ -208,7 +208,7 @@ tests:
       DISSOLVE_ALL: 'True'
       FIELD: None
       INPUT:
-        name: nullGeometryDissolve.gml
+        name: custom/nullGeometryDissolve.gml
         type: vector
     results:
       OUTPUT:
@@ -222,9 +222,10 @@ tests:
       DISSOLVE_ALL: 'True'
       FIELD: None
       INPUT:
-        name: PolygonDissolveTest.gml
+        name: custom/PolygonDissolveTest.gml
         type: vector
     results:
       OUTPUT:
         type: vector
         name: expected/PolygonDissolveTest_output.gml
+