tests for SAGA provider

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

Hide file tree

Showing 189 changed files with 1,155 additions and 63 deletions.
diff --git a/python/plugins/processing/tests/CMakeLists.txt b/python/plugins/processing/tests/CMakeLists.txt
@@ -5,13 +5,6 @@ PLUGIN_INSTALL(processing tests ${PY_FILES})
 PLUGIN_INSTALL(processing tests/testdata ${TEST_DATA_FILES})
 
 if(ENABLE_TESTS)
-
-  # enable SAGA tests
-  set (ENABLE_SAGA_TESTS FALSE CACHE BOOL "Enable Saga tests")
-  if ( ENABLE_SAGA_TESTS )
-    add_definitions(-DENABLE_SAGA_TESTS)
-  endif()
-
   include(UsePythonTest)
   ADD_PYTHON_TEST(ProcessingGeneralTest ProcessingGeneralTest.py)
   ADD_PYTHON_TEST(ProcessingGuiTest GuiTest.py)
@@ -29,7 +22,4 @@ if(ENABLE_TESTS)
   ADD_PYTHON_TEST(ProcessingGdalAlgorithmsVectorTest GdalAlgorithmsVectorTest.py)
   ADD_PYTHON_TEST(ProcessingCheckValidityAlgorithmTest CheckValidityAlgorithm.py)
   ADD_PYTHON_TEST(ProcessingScriptUtilsTest ScriptUtilsTest.py)
-if(ENABLE_SAGA_TESTS)
-  ADD_PYTHON_TEST(ProcessingSagaAlgorithmsTest SagaAlgorithmsTest.py)
-endif()
 endif()
diff --git a/python/plugins/processing/tests/GdalAlgorithmsGeneralTest.py b/python/plugins/processing/tests/GdalAlgorithmsGeneralTest.py
@@ -240,7 +240,7 @@ def testOgrOutputLayerName(self):
     def testOgrLayerNameExtraction(self):
         with tempfile.TemporaryDirectory() as outdir:
             def _copyFile(dst):
-                shutil.copyfile(os.path.join(testDataPath, 'custom', 'grass7', 'weighted.csv'), dst)
+                shutil.copyfile(os.path.join(testDataPath, 'custom', 'weighted.csv'), dst)
 
             # OGR provider - single layer
             _copyFile(os.path.join(outdir, 'a.csv'))

diff --git a/python/plugins/processing/tests/testdata/custom/circular_strings.gpkg b/python/plugins/processing/tests/testdata/custom/circular_strings.gpkg
diff --git a/python/plugins/processing/tests/testdata/custom/multi_polys_with_empty_geoms.gpkg b/python/plugins/processing/tests/testdata/custom/multi_polys_with_empty_geoms.gpkg
diff --git a/python/plugins/processing/tests/testdata/custom/pol.gpkg b/python/plugins/processing/tests/testdata/custom/pol.gpkg
diff --git a/python/plugins/processing/tests/testdata/custom/sumlinelengths.gpkg b/python/plugins/processing/tests/testdata/custom/sumlinelengths.gpkg
diff --git a/python/plugins/processing/tests/testdata/expected/merged_pol.gpkg b/python/plugins/processing/tests/testdata/expected/merged_pol.gpkg
diff --git a/python/plugins/processing/tests/testdata/expected/multi_polys_non_null_one_empty.gpkg b/python/plugins/processing/tests/testdata/expected/multi_polys_non_null_one_empty.gpkg
diff --git a/python/plugins/processing/tests/testdata/expected/results_remove_null_geometries.gpkg b/python/plugins/processing/tests/testdata/expected/results_remove_null_geometries.gpkg
diff --git a/python/plugins/sagaprovider/CMakeLists.txt b/python/plugins/sagaprovider/CMakeLists.txt
@@ -4,6 +4,7 @@ file(GLOB OTHER_FILES metadata.txt)
 
 add_subdirectory(ext)
 add_subdirectory(shorthelp)
+add_subdirectory(tests)
 
 PLUGIN_INSTALL(sagaprovider . ${PY_FILES} ${OTHER_FILES})
 PLUGIN_INSTALL(sagaprovider ./description/ ${DESCR_FILES})