tests for GRASS provider

qgis · Jun 21, 2021 · a0945cf · a0945cf
1 parent 6e93efe
commit a0945cf
Show file tree

Hide file tree

Showing 218 changed files with 1,849 additions and 349 deletions.
diff --git a/python/plugins/grassprovider/CMakeLists.txt b/python/plugins/grassprovider/CMakeLists.txt
@@ -3,6 +3,7 @@ file(GLOB OTHER_FILES grass7.txt metadata.txt)
 file(GLOB DESCR_FILES description/*.txt)
 
 add_subdirectory(ext)
+add_subdirectory(tests)
 
 PLUGIN_INSTALL(grassprovider . ${PY_FILES} ${OTHER_FILES})
 PLUGIN_INSTALL(grassprovider ./description ${DESCR_FILES})
diff --git a/python/plugins/grassprovider/Grass7Algorithm.py b/python/plugins/grassprovider/Grass7Algorithm.py
@@ -75,7 +75,7 @@
 
 from processing.core.parameters import getParameterFromString
 
-from .Grass7Utils import Grass7Utils
+from grassprovider.Grass7Utils import Grass7Utils
 
 from processing.tools.system import isWindows, getTempFilename
 
@@ -141,7 +141,7 @@ def __init__(self, descriptionfile):
         name = self.name().replace('.', '_')
         try:
             self.module = importlib.import_module(
-                'processing.algs.grass7.ext.{}'.format(name))
+                'grassprovider.ext.{}'.format(name))
         except ImportError:
             self.module = None
 
@@ -445,9 +445,6 @@ def processAlgorithm(self, original_parameters, context, feedback):
             outName = out.name()
             if outName in parameters:
                 if outName in self.fileOutputs:
-                    print('ADD', outName)
-                    print('VAL', parameters[outName])
-                    print('VAL 2', self.fileOutputs[outName])
                     outputs[outName] = self.fileOutputs[outName]
                 else:
                     outputs[outName] = parameters[outName]

diff --git a/python/plugins/grassprovider/Grass7AlgorithmProvider.py b/python/plugins/grassprovider/Grass7AlgorithmProvider.py
@@ -31,8 +31,8 @@
                        QgsProcessingUtils,
                        QgsRuntimeProfiler)
 from processing.core.ProcessingConfig import (ProcessingConfig, Setting)
-from .Grass7Utils import Grass7Utils
-from .Grass7Algorithm import Grass7Algorithm
+from grassprovider.Grass7Utils import Grass7Utils
+from grassprovider.Grass7Algorithm import Grass7Algorithm
 from processing.tools.system import isWindows, isMac
 
 

diff --git a/python/plugins/grassprovider/ext/CMakeLists.txt b/python/plugins/grassprovider/ext/CMakeLists.txt
@@ -1,3 +1,3 @@
 file(GLOB PY_FILES *.py)
 
-PLUGIN_INSTALL(processing algs/grass7/ext ${PY_FILES})
+PLUGIN_INSTALL(grassprovider ./ext ${PY_FILES})
diff --git a/python/plugins/grassprovider/ext/i.py b/python/plugins/grassprovider/ext/i.py
@@ -23,7 +23,7 @@
 
 import os
 from processing.tools.system import (isWindows, getTempFilename)
-from processing.algs.grass7.Grass7Utils import Grass7Utils
+from grassprovider.Grass7Utils import Grass7Utils
 from qgis.PyQt.QtCore import QDir
 from qgis.core import QgsProcessingParameterString
 from qgis.core import QgsMessageLog

diff --git a/python/plugins/grassprovider/ext/i_pansharpen.py b/python/plugins/grassprovider/ext/i_pansharpen.py
@@ -22,9 +22,9 @@
 __copyright__ = '(C) 2016, Médéric Ribreux'
 
 import os
-from processing.tools.system import getTempFilename
-from processing.algs.grass7.Grass7Utils import Grass7Utils
 from qgis.core import QgsProcessingParameterString
+from processing.tools.system import getTempFilename
+from grassprovider.Grass7Utils import Grass7Utils
 
 
 def processCommand(alg, parameters, context, feedback):

diff --git a/python/plugins/grassprovider/ext/r_blend_rgb.py b/python/plugins/grassprovider/ext/r_blend_rgb.py
@@ -22,7 +22,7 @@
 __copyright__ = '(C) 2016, Médéric Ribreux'
 
 import os
-from processing.algs.grass7.Grass7Utils import Grass7Utils
+from grassprovider.Grass7Utils import Grass7Utils
 
 
 def processInputs(alg, parameters, context, feedback):

diff --git a/python/plugins/grassprovider/ext/r_category.py b/python/plugins/grassprovider/ext/r_category.py
@@ -22,7 +22,7 @@
 __copyright__ = '(C) 2016, Médéric Ribreux'
 
 from processing.tools.system import getTempFilename
-from processing.algs.grass7.Grass7Utils import Grass7Utils
+from grassprovider.Grass7Utils import Grass7Utils
 
 
 def checkParameterValuesBeforeExecuting(alg, parameters, context):

diff --git a/python/plugins/grassprovider/ext/r_colors.py b/python/plugins/grassprovider/ext/r_colors.py
@@ -22,7 +22,7 @@
 __copyright__ = '(C) 2016, Médéric Ribreux'
 
 import os
-from processing.algs.grass7.Grass7Utils import Grass7Utils
+from grassprovider.Grass7Utils import Grass7Utils
 from processing.tools.system import getTempFilename
 
 

diff --git a/python/plugins/grassprovider/ext/r_colors_stddev.py b/python/plugins/grassprovider/ext/r_colors_stddev.py
@@ -21,7 +21,7 @@
 __date__ = 'February 2016'
 __copyright__ = '(C) 2016, Médéric Ribreux'
 
-from processing.algs.grass7.Grass7Utils import Grass7Utils
+from grassprovider.Grass7Utils import Grass7Utils
 
 
 def processInputs(alg, parameters, context, feedback):

diff --git a/python/plugins/grassprovider/ext/r_mask_rast.py b/python/plugins/grassprovider/ext/r_mask_rast.py
@@ -21,7 +21,7 @@
 __date__ = 'February 2016'
 __copyright__ = '(C) 2016, Médéric Ribreux'
 
-from processing.algs.grass7.Grass7Utils import Grass7Utils
+from grassprovider.Grass7Utils import Grass7Utils
 
 
 def processCommand(alg, parameters, context, feedback):

diff --git a/python/plugins/grassprovider/ext/r_mask_vect.py b/python/plugins/grassprovider/ext/r_mask_vect.py
@@ -21,7 +21,7 @@
 __date__ = 'February 2016'
 __copyright__ = '(C) 2016, Médéric Ribreux'
 
-from processing.algs.grass7.Grass7Utils import Grass7Utils
+from grassprovider.Grass7Utils import Grass7Utils
 
 
 def processCommand(alg, parameters, context, feedback):

diff --git a/python/plugins/grassprovider/ext/r_proj.py b/python/plugins/grassprovider/ext/r_proj.py
@@ -23,7 +23,7 @@
 
 from qgis.core import QgsProcessingParameterString
 from processing.tools.system import isWindows
-from processing.algs.grass7.Grass7Utils import Grass7Utils
+from grassprovider.Grass7Utils import Grass7Utils
 
 
 def processInputs(alg, parameters, context, feedback):

diff --git a/python/plugins/grassprovider/ext/r_series_interp.py b/python/plugins/grassprovider/ext/r_series_interp.py
@@ -22,7 +22,7 @@
 __copyright__ = '(C) 2016, Médéric Ribreux'
 
 import os
-from processing.algs.grass7.Grass7Utils import Grass7Utils
+from grassprovider.Grass7Utils import Grass7Utils
 
 
 def checkParameterValuesBeforeExecuting(alg, parameters, context):

diff --git a/python/plugins/grassprovider/ext/r_statistics.py b/python/plugins/grassprovider/ext/r_statistics.py
@@ -22,7 +22,7 @@
 __copyright__ = '(C) 2017, Médéric Ribreux'
 
 from qgis.core import QgsProcessingParameterString
-from processing.algs.grass7.Grass7Utils import Grass7Utils
+from grassprovider.Grass7Utils import Grass7Utils
 
 
 def processCommand(alg, parameters, context, feedback):

diff --git a/python/plugins/grassprovider/ext/r_stats_quantile_rast.py b/python/plugins/grassprovider/ext/r_stats_quantile_rast.py
@@ -21,9 +21,9 @@
 __date__ = 'February 2016'
 __copyright__ = '(C) 2016, Médéric Ribreux'
 
-from qgis.core import QgsProcessingParameterString
-from processing.algs.grass7.Grass7Utils import Grass7Utils
 import os
+from qgis.core import QgsProcessingParameterString
+from grassprovider.Grass7Utils import Grass7Utils
 
 
 def processCommand(alg, parameters, context, feedback):

diff --git a/python/plugins/grassprovider/ext/r_tileset.py b/python/plugins/grassprovider/ext/r_tileset.py
@@ -21,7 +21,7 @@
 __date__ = 'October 2017'
 __copyright__ = '(C) 2017, Médéric Ribreux'
 
-from processing.algs.grass7.Grass7Utils import Grass7Utils
+from grassprovider.Grass7Utils import Grass7Utils
 
 
 def processOutputs(alg, parameters, context, feedback):

diff --git a/python/plugins/grassprovider/ext/v_proj.py b/python/plugins/grassprovider/ext/v_proj.py
@@ -22,7 +22,7 @@
 __copyright__ = '(C) 2017, Médéric Ribreux'
 
 from qgis.core import QgsProcessingParameterString
-from processing.algs.grass7.Grass7Utils import Grass7Utils
+from grassprovider.Grass7Utils import Grass7Utils
 
 
 def processInputs(alg, parameters, context, feedback):

diff --git a/python/plugins/grassprovider/ext/v_rectify.py b/python/plugins/grassprovider/ext/v_rectify.py
@@ -22,7 +22,7 @@
 __copyright__ = '(C) 2016, Médéric Ribreux'
 
 import os
-from processing.algs.grass7.Grass7Utils import Grass7Utils
+from grassprovider.Grass7Utils import Grass7Utils
 from processing.tools.system import getTempFilename