Ensure calling isSupportedOutputValue doesn't add layer to project

This is an advance test only, and shouldn't result in layers attempting to add to the project. Refs qgis#57698
nyalldawson · Jun 7, 2024 · dcf88dd · dcf88dd
1 parent e6baabe
commit dcf88dd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/python/plugins/processing/algs/gdal/Datasources2Vrt.py b/python/plugins/processing/algs/gdal/Datasources2Vrt.py
@@ -93,7 +93,7 @@ def supportedOutputRasterLayerExtensions(self):
                 return ['vrt']
 
             def isSupportedOutputValue(self, value, context):
-                output_path = QgsProcessingParameters.parameterAsOutputLayer(self, value, context)
+                output_path = QgsProcessingParameters.parameterAsOutputLayer(self, value, context, testOnly=True)
                 if pathlib.Path(output_path).suffix.lower() != '.vrt':
                     return False, QCoreApplication.translate("GdalAlgorithm", 'Output filename must use a .vrt extension')
                 return True, ''

diff --git a/python/plugins/processing/algs/gdal/buildvrt.py b/python/plugins/processing/algs/gdal/buildvrt.py
@@ -83,7 +83,7 @@ def parameterAsOutputLayer(self, definition, value, context):
                 return super(QgsProcessingParameterRasterDestination, self).parameterAsOutputLayer(definition, value, context)
 
             def isSupportedOutputValue(self, value, context):
-                output_path = QgsProcessingParameters.parameterAsOutputLayer(self, value, context)
+                output_path = QgsProcessingParameters.parameterAsOutputLayer(self, value, context, testOnly=True)
                 if pathlib.Path(output_path).suffix.lower() != '.vrt':
                     return False, QCoreApplication.translate("GdalAlgorithm", 'Output filename must use a .vrt extension')
                 return True, ''

diff --git a/src/core/processing/qgsprocessingprovider.cpp b/src/core/processing/qgsprocessingprovider.cpp
@@ -130,7 +130,7 @@ QStringList QgsProcessingProvider::supportedOutputTableExtensions() const
 bool QgsProcessingProvider::isSupportedOutputValue( const QVariant &outputValue, const QgsProcessingDestinationParameter *parameter, QgsProcessingContext &context, QString &error ) const
 {
   error.clear();
-  QString outputPath = QgsProcessingParameters::parameterAsOutputLayer( parameter, outputValue, context ).trimmed();
+  QString outputPath = QgsProcessingParameters::parameterAsOutputLayer( parameter, outputValue, context, true ).trimmed();
 
   if ( outputPath.isEmpty() )
   {

diff --git a/tests/src/analysis/testqgsprocessing.cpp b/tests/src/analysis/testqgsprocessing.cpp
@@ -8122,19 +8122,21 @@ void TestQgsProcessing::parameterVectorOut()
   def.reset( new QgsProcessingParameterVectorDestination( "with_geom", QString(), Qgis::ProcessingSourceType::VectorAnyGeometry, QString(), true ) );
   DummyProvider3 provider;
   QString error;
+  context.setLayersToLoadOnCompletion( {} );
   QVERIFY( provider.isSupportedOutputValue( QVariant(), def.get(), context, error ) ); // optional
   QVERIFY( provider.isSupportedOutputValue( QString(), def.get(), context, error ) ); // optional
   QVERIFY( !provider.isSupportedOutputValue( "d:/test.shp", def.get(), context, error ) );
   QVERIFY( !provider.isSupportedOutputValue( "d:/test.SHP", def.get(), context, error ) );
   QVERIFY( !provider.isSupportedOutputValue( "ogr:d:/test.shp", def.get(), context, error ) );
-  QVERIFY( !provider.isSupportedOutputValue( QgsProcessingOutputLayerDefinition( "d:/test.SHP" ), def.get(), context, error ) );
+  QVERIFY( !provider.isSupportedOutputValue( QgsProcessingOutputLayerDefinition( "d:/test.SHP", &p ), def.get(), context, error ) );
   QVERIFY( provider.isSupportedOutputValue( "d:/test.mif", def.get(), context, error ) );
   QVERIFY( provider.isSupportedOutputValue( "d:/test.MIF", def.get(), context, error ) );
   QVERIFY( provider.isSupportedOutputValue( "ogr:d:/test.MIF", def.get(), context, error ) );
-  QVERIFY( provider.isSupportedOutputValue( QgsProcessingOutputLayerDefinition( "d:/test.MIF" ), def.get(), context, error ) );
+  QVERIFY( provider.isSupportedOutputValue( QgsProcessingOutputLayerDefinition( "d:/test.MIF", &p ), def.get(), context, error ) );
   def.reset( new QgsProcessingParameterVectorDestination( "with_geom", QString(), Qgis::ProcessingSourceType::VectorAnyGeometry, QString(), false ) );
   QVERIFY( !provider.isSupportedOutputValue( QVariant(), def.get(), context, error ) ); // non-optional
   QVERIFY( !provider.isSupportedOutputValue( QString(), def.get(), context, error ) ); // non-optional
+  QVERIFY( context.layersToLoadOnCompletion().isEmpty() );
 
   provider.loadAlgorithms();
   def->mOriginalProvider = &provider;