sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-16 00:06:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Resurrect a processing test

Browse Source
This commit is contained in:
Nyall Dawson 2017-06-22 08:21:44 +10:00
parent df07772a56
commit db00cb1cdb
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.ci/travis/linux/blacklist.txt
View File

@ -10,7 +10,6 @@ PyQgsDBManagerGpkg
# temporary during processing refactoring # temporary during processing refactoring
ProcessingParametersTest ProcessingParametersTest
ProcessingModelerTest
ProcessingGdalAlgorithmsTest ProcessingGdalAlgorithmsTest
# layout tests are run on separate build # layout tests are run on separate build

45
python/plugins/processing/tests/ModelerTest.py
View File

@ -27,11 +27,11 @@ __revision__ = '$Format:%H$'
from qgis.testing import start_app, unittest from qgis.testing import start_app, unittest
from processing.modeler.ModelerAlgorithm import (Algorithm, from qgis.core import (QgsProcessingModelAlgorithm,
ModelerAlgorithm, QgsProcessingParameterString,
ModelerParameter, QgsProcessingParameterNumber,
ModelerOutput, QgsProcessingParameterField,
ValueFromOutput) QgsProcessingParameterFile)
from processing.modeler.ModelerParametersDialog import (ModelerParametersDialog) from processing.modeler.ModelerParametersDialog import (ModelerParametersDialog)
from processing.core.parameters import (ParameterFile, from processing.core.parameters import (ParameterFile,
ParameterNumber, ParameterNumber,
@ -45,29 +45,34 @@ class ModelerTest(unittest.TestCase):
def testModelerParametersDialogAvailableValuesOfType(self): def testModelerParametersDialogAvailableValuesOfType(self):
# test getAvailableValuesOfType from ModelerParametersDialog # test getAvailableValuesOfType from ModelerParametersDialog
m = ModelerAlgorithm() m = QgsProcessingModelAlgorithm()
string_param_1 = ModelerParameter(ParameterString('string', 'string desc'))
m.addParameter(string_param_1) string_param_1 = QgsProcessingModelAlgorithm.ModelParameter('string')
string_param_2 = ModelerParameter(ParameterString('string2', 'string desc')) m.addModelParameter(QgsProcessingParameterString('string'), string_param_1)
m.addParameter(string_param_2)
num_param = ModelerParameter(ParameterNumber('number', 'number desc')) string_param_2 = QgsProcessingModelAlgorithm.ModelParameter('string2')
m.addParameter(num_param) m.addModelParameter(QgsProcessingParameterString('string2'), string_param_2)
table_field_param = ModelerParameter(ParameterTableField('field', 'field desc'))
m.addParameter(table_field_param) num_param = QgsProcessingModelAlgorithm.ModelParameter('number')
file_param = ModelerParameter(ParameterFile('file', 'file desc')) m.addModelParameter(QgsProcessingParameterNumber('number'), num_param)
m.addParameter(file_param)
table_field_param = QgsProcessingModelAlgorithm.ModelParameter('field')
m.addModelParameter(QgsProcessingParameterField('field'), table_field_param)
file_param = QgsProcessingModelAlgorithm.ModelParameter('file')
m.addModelParameter(QgsProcessingParameterFile('file'), file_param)
dlg = ModelerParametersDialog(m, m) dlg = ModelerParametersDialog(m, m)
# test single types # test single types
self.assertEqual(set(p.name for p in dlg.getAvailableValuesOfType(ParameterNumber)), self.assertEqual(set(p.parameterName() for p in dlg.getAvailableValuesOfType(QgsProcessingParameterNumber)),
set(['number'])) set(['number']))
self.assertEqual(set(p.name for p in dlg.getAvailableValuesOfType(ParameterTableField)), self.assertEqual(set(p.parameterName() for p in dlg.getAvailableValuesOfType(QgsProcessingParameterField)),
set(['field'])) set(['field']))
self.assertEqual(set(p.name for p in dlg.getAvailableValuesOfType(ParameterFile)), self.assertEqual(set(p.parameterName() for p in dlg.getAvailableValuesOfType(QgsProcessingParameterFile)),
set(['file'])) set(['file']))
# test multiple types # test multiple types
self.assertEqual(set(p.name for p in dlg.getAvailableValuesOfType([ParameterString, ParameterNumber, ParameterFile])), self.assertEqual(set(p.parameterName() for p in dlg.getAvailableValuesOfType([QgsProcessingParameterString, QgsProcessingParameterNumber, QgsProcessingParameterFile])),
set(['string', 'string2', 'number', 'file'])) set(['string', 'string2', 'number', 'file']))