@@ -2153,6 +2153,7 @@ void TestQgsProcessing::parameterCrs()
2153
2153
QCOMPARE ( def->valueAsPythonString ( QVariant (), context ), QStringLiteral ( " None" ) );
2154
2154
QCOMPARE ( def->valueAsPythonString ( " EPSG:12003" , context ), QStringLiteral ( " 'EPSG:12003'" ) );
2155
2155
QCOMPARE ( def->valueAsPythonString ( " ProjectCrs" , context ), QStringLiteral ( " 'ProjectCrs'" ) );
2156
+ QCOMPARE ( def->valueAsPythonString ( QStringLiteral ( " c:\\ test\\ new data\\ test.dat" ), context ), QStringLiteral ( " 'c:\\\\ test\\\\ new data\\\\ test.dat'" ) );
2156
2157
QCOMPARE ( def->valueAsPythonString ( raster1, context ), QString ( " '" ) + testDataDir + QStringLiteral ( " tenbytenraster.asc'" ) );
2157
2158
QCOMPARE ( def->valueAsPythonString ( r1->id (), context ), QString ( " '" ) + testDataDir + QStringLiteral ( " tenbytenraster.asc'" ) );
2158
2159
QCOMPARE ( def->valueAsPythonString ( QVariant::fromValue ( QgsProperty::fromExpression ( " \" a\" =1" ) ), context ), QStringLiteral ( " QgsProperty.fromExpression('\" a\" =1')" ) );
@@ -2269,6 +2270,7 @@ void TestQgsProcessing::parameterLayer()
2269
2270
QCOMPARE ( def->valueAsPythonString ( r1->id (), context ), QString ( " '" ) + testDataDir + QStringLiteral ( " tenbytenraster.asc'" ) );
2270
2271
QCOMPARE ( def->valueAsPythonString ( QVariant::fromValue ( r1 ), context ), QString ( " '" ) + testDataDir + QStringLiteral ( " tenbytenraster.asc'" ) );
2271
2272
QCOMPARE ( def->valueAsPythonString ( QVariant::fromValue ( QgsProperty::fromExpression ( " \" a\" =1" ) ), context ), QStringLiteral ( " QgsProperty.fromExpression('\" a\" =1')" ) );
2273
+ QCOMPARE ( def->valueAsPythonString ( QStringLiteral ( " c:\\ test\\ new data\\ test.dat" ), context ), QStringLiteral ( " 'c:\\\\ test\\\\ new data\\\\ test.dat'" ) );
2272
2274
2273
2275
QString code = def->asScriptCode ();
2274
2276
QCOMPARE ( code, QStringLiteral ( " ##non_optional=layer" ) );
@@ -2545,6 +2547,7 @@ void TestQgsProcessing::parameterExtent()
2545
2547
QCOMPARE ( def->valueAsPythonString ( QgsReferencedRectangle ( QgsRectangle ( 11 , 12 , 13 , 14 ), QgsCoordinateReferenceSystem ( " epsg:4326" ) ), context ), QStringLiteral ( " '11, 13, 12, 14 [EPSG:4326]'" ) );
2546
2548
QCOMPARE ( def->valueAsPythonString ( " 1,2,3,4 [EPSG:4326]" , context ), QStringLiteral ( " '1,2,3,4 [EPSG:4326]'" ) );
2547
2549
QCOMPARE ( def->valueAsPythonString ( " uri='complex' username=\" complex\" " , context ), QStringLiteral ( " 'uri=\\ 'complex\\ ' username=\\\" complex\\\" '" ) );
2550
+ QCOMPARE ( def->valueAsPythonString ( QStringLiteral ( " c:\\ test\\ new data\\ test.dat" ), context ), QStringLiteral ( " 'c:\\\\ test\\\\ new data\\\\ test.dat'" ) );
2548
2551
2549
2552
QString code = def->asScriptCode ();
2550
2553
QCOMPARE ( code, QStringLiteral ( " ##non_optional=extent 1,2,3,4" ) );
@@ -2776,6 +2779,7 @@ void TestQgsProcessing::parameterFile()
2776
2779
QCOMPARE ( def->valueAsPythonString ( " bricks.bmp" , context ), QStringLiteral ( " 'bricks.bmp'" ) );
2777
2780
QCOMPARE ( def->valueAsPythonString ( QVariant::fromValue ( QgsProperty::fromExpression ( " \" a\" =1" ) ), context ), QStringLiteral ( " QgsProperty.fromExpression('\" a\" =1')" ) );
2778
2781
QCOMPARE ( def->valueAsPythonString ( " uri='complex' username=\" complex\" " , context ), QStringLiteral ( " 'uri=\\ 'complex\\ ' username=\\\" complex\\\" '" ) );
2782
+ QCOMPARE ( def->valueAsPythonString ( QStringLiteral ( " c:\\ test\\ new data\\ test.dat" ), context ), QStringLiteral ( " 'c:\\\\ test\\\\ new data\\\\ test.dat'" ) );
2779
2783
2780
2784
QString code = def->asScriptCode ();
2781
2785
QCOMPARE ( code, QStringLiteral ( " ##non_optional=file abc.bmp" ) );
@@ -3518,6 +3522,7 @@ void TestQgsProcessing::parameterRasterLayer()
3518
3522
QCOMPARE ( def->valueAsPythonString ( r1->id (), context ), QString ( " '" ) + testDataDir + QStringLiteral ( " tenbytenraster.asc'" ) );
3519
3523
QCOMPARE ( def->valueAsPythonString ( QVariant::fromValue ( r1 ), context ), QString ( " '" ) + testDataDir + QStringLiteral ( " tenbytenraster.asc'" ) );
3520
3524
QCOMPARE ( def->valueAsPythonString ( QVariant::fromValue ( QgsProperty::fromExpression ( " \" a\" =1" ) ), context ), QStringLiteral ( " QgsProperty.fromExpression('\" a\" =1')" ) );
3525
+ QCOMPARE ( def->valueAsPythonString ( QStringLiteral ( " c:\\ test\\ new data\\ test.dat" ), context ), QStringLiteral ( " 'c:\\\\ test\\\\ new data\\\\ test.dat'" ) );
3521
3526
3522
3527
QString code = def->asScriptCode ();
3523
3528
QCOMPARE ( code, QStringLiteral ( " ##non_optional=raster" ) );
@@ -3806,6 +3811,7 @@ void TestQgsProcessing::parameterString()
3806
3811
QCOMPARE ( def->valueAsPythonString ( QStringLiteral ( " abc\n def" ), context ), QStringLiteral ( " 'abc\\ ndef'" ) );
3807
3812
QCOMPARE ( def->valueAsPythonString ( QVariant::fromValue ( QgsProperty::fromExpression ( " \" a\" =1" ) ), context ), QStringLiteral ( " QgsProperty.fromExpression('\" a\" =1')" ) );
3808
3813
QCOMPARE ( def->valueAsPythonString ( " uri='complex' username=\" complex\" " , context ), QStringLiteral ( " 'uri=\\ 'complex\\ ' username=\\\" complex\\\" '" ) );
3814
+ QCOMPARE ( def->valueAsPythonString ( QStringLiteral ( " c:\\ test\\ new data\\ test.dat" ), context ), QStringLiteral ( " 'c:\\\\ test\\\\ new data\\\\ test.dat'" ) );
3809
3815
3810
3816
QString code = def->asScriptCode ();
3811
3817
QCOMPARE ( code, QStringLiteral ( " ##non_optional=string" ) );
@@ -4251,6 +4257,7 @@ void TestQgsProcessing::parameterVectorLayer()
4251
4257
QCOMPARE ( def->valueAsPythonString ( v1->id (), context ), QString ( " '" ) + testDataDir + QStringLiteral ( " multipoint.shp'" ) );
4252
4258
QCOMPARE ( def->valueAsPythonString ( QVariant::fromValue ( v1 ), context ), QString ( " '" ) + testDataDir + QStringLiteral ( " multipoint.shp'" ) );
4253
4259
QCOMPARE ( def->valueAsPythonString ( QVariant::fromValue ( QgsProperty::fromExpression ( " \" a\" =1" ) ), context ), QStringLiteral ( " QgsProperty.fromExpression('\" a\" =1')" ) );
4260
+ QCOMPARE ( def->valueAsPythonString ( QStringLiteral ( " c:\\ test\\ new data\\ test.dat" ), context ), QStringLiteral ( " 'c:\\\\ test\\\\ new data\\\\ test.dat'" ) );
4254
4261
4255
4262
QString code = def->asScriptCode ();
4256
4263
QCOMPARE ( code, QStringLiteral ( " ##non_optional=vector somelayer" ) );
@@ -4369,6 +4376,7 @@ void TestQgsProcessing::parameterFeatureSource()
4369
4376
QCOMPARE ( def->valueAsPythonString ( QVariant::fromValue ( QgsProperty::fromExpression ( " \" a\" =1" ) ), context ), QStringLiteral ( " QgsProperty.fromExpression('\" a\" =1')" ) );
4370
4377
QCOMPARE ( def->valueAsPythonString ( QVariant::fromValue ( v2 ), context ), QStringLiteral ( " '%1'" ).arg ( vector2 ) );
4371
4378
QCOMPARE ( def->valueAsPythonString ( " uri='complex' username=\" complex\" " , context ), QStringLiteral ( " 'uri=\\ 'complex\\ ' username=\\\" complex\\\" '" ) );
4379
+ QCOMPARE ( def->valueAsPythonString ( QStringLiteral ( " c:\\ test\\ new data\\ test.dat" ), context ), QStringLiteral ( " 'c:\\\\ test\\\\ new data\\\\ test.dat'" ) );
4372
4380
4373
4381
QVariantMap map = def->toVariantMap ();
4374
4382
QgsProcessingParameterFeatureSource fromMap ( " x" );
@@ -4481,6 +4489,7 @@ void TestQgsProcessing::parameterFeatureSink()
4481
4489
QCOMPARE ( def->valueAsPythonString ( QVariant::fromValue ( QgsProcessingOutputLayerDefinition ( QgsProperty::fromExpression ( " \" abc\" || \" def\" " ) ) ), context ), QStringLiteral ( " QgsProperty.fromExpression('\" abc\" || \" def\" ')" ) );
4482
4490
QCOMPARE ( def->valueAsPythonString ( QVariant::fromValue ( QgsProperty::fromExpression ( " \" a\" =1" ) ), context ), QStringLiteral ( " QgsProperty.fromExpression('\" a\" =1')" ) );
4483
4491
QCOMPARE ( def->valueAsPythonString ( " uri='complex' username=\" complex\" " , context ), QStringLiteral ( " 'uri=\\ 'complex\\ ' username=\\\" complex\\\" '" ) );
4492
+ QCOMPARE ( def->valueAsPythonString ( QStringLiteral ( " c:\\ test\\ new data\\ test.dat" ), context ), QStringLiteral ( " 'c:\\\\ test\\\\ new data\\\\ test.dat'" ) );
4484
4493
4485
4494
QCOMPARE ( def->defaultFileExtension (), QStringLiteral ( " shp" ) );
4486
4495
QCOMPARE ( def->generateTemporaryDestination (), QStringLiteral ( " memory:" ) );
@@ -4609,6 +4618,7 @@ void TestQgsProcessing::parameterVectorOut()
4609
4618
QCOMPARE ( def->valueAsPythonString ( QVariant::fromValue ( QgsProcessingOutputLayerDefinition ( QgsProperty::fromExpression ( " \" abc\" || \" def\" " ) ) ), context ), QStringLiteral ( " QgsProperty.fromExpression('\" abc\" || \" def\" ')" ) );
4610
4619
QCOMPARE ( def->valueAsPythonString ( QVariant::fromValue ( QgsProperty::fromExpression ( " \" a\" =1" ) ), context ), QStringLiteral ( " QgsProperty.fromExpression('\" a\" =1')" ) );
4611
4620
QCOMPARE ( def->valueAsPythonString ( " uri='complex' username=\" complex\" " , context ), QStringLiteral ( " 'uri=\\ 'complex\\ ' username=\\\" complex\\\" '" ) );
4621
+ QCOMPARE ( def->valueAsPythonString ( QStringLiteral ( " c:\\ test\\ new data\\ test.dat" ), context ), QStringLiteral ( " 'c:\\\\ test\\\\ new data\\\\ test.dat'" ) );
4612
4622
4613
4623
QCOMPARE ( def->defaultFileExtension (), QStringLiteral ( " shp" ) );
4614
4624
QVERIFY ( def->generateTemporaryDestination ().endsWith ( QStringLiteral ( " .shp" ) ) );
@@ -4725,6 +4735,7 @@ void TestQgsProcessing::parameterRasterOut()
4725
4735
QCOMPARE ( def->valueAsPythonString ( QVariant::fromValue ( QgsProcessingOutputLayerDefinition ( QgsProperty::fromExpression ( " \" abc\" || \" def\" " ) ) ), context ), QStringLiteral ( " QgsProperty.fromExpression('\" abc\" || \" def\" ')" ) );
4726
4736
QCOMPARE ( def->valueAsPythonString ( QVariant::fromValue ( QgsProperty::fromExpression ( " \" a\" =1" ) ), context ), QStringLiteral ( " QgsProperty.fromExpression('\" a\" =1')" ) );
4727
4737
QCOMPARE ( def->valueAsPythonString ( " uri='complex' username=\" complex\" " , context ), QStringLiteral ( " 'uri=\\ 'complex\\ ' username=\\\" complex\\\" '" ) );
4738
+ QCOMPARE ( def->valueAsPythonString ( QStringLiteral ( " c:\\ test\\ new data\\ test.dat" ), context ), QStringLiteral ( " 'c:\\\\ test\\\\ new data\\\\ test.dat'" ) );
4728
4739
4729
4740
QVariantMap map = def->toVariantMap ();
4730
4741
QgsProcessingParameterRasterDestination fromMap ( " x" );
@@ -4848,6 +4859,7 @@ void TestQgsProcessing::parameterFileOut()
4848
4859
QCOMPARE ( def->valueAsPythonString ( QVariant::fromValue ( QgsProcessingOutputLayerDefinition ( QgsProperty::fromExpression ( " \" abc\" || \" def\" " ) ) ), context ), QStringLiteral ( " QgsProperty.fromExpression('\" abc\" || \" def\" ')" ) );
4849
4860
QCOMPARE ( def->valueAsPythonString ( QVariant::fromValue ( QgsProperty::fromExpression ( " \" a\" =1" ) ), context ), QStringLiteral ( " QgsProperty.fromExpression('\" a\" =1')" ) );
4850
4861
QCOMPARE ( def->valueAsPythonString ( " uri='complex' username=\" complex\" " , context ), QStringLiteral ( " 'uri=\\ 'complex\\ ' username=\\\" complex\\\" '" ) );
4862
+ QCOMPARE ( def->valueAsPythonString ( QStringLiteral ( " c:\\ test\\ new data\\ test.dat" ), context ), QStringLiteral ( " 'c:\\\\ test\\\\ new data\\\\ test.dat'" ) );
4851
4863
4852
4864
QVariantMap map = def->toVariantMap ();
4853
4865
QgsProcessingParameterFileDestination fromMap ( " x" );
@@ -4943,6 +4955,7 @@ void TestQgsProcessing::parameterFolderOut()
4943
4955
QCOMPARE ( def->valueAsPythonString ( QStringLiteral ( " abc" ), context ), QStringLiteral ( " 'abc'" ) );
4944
4956
QCOMPARE ( def->valueAsPythonString ( QVariant::fromValue ( QgsProperty::fromExpression ( " \" a\" =1" ) ), context ), QStringLiteral ( " QgsProperty.fromExpression('\" a\" =1')" ) );
4945
4957
QCOMPARE ( def->valueAsPythonString ( " uri='complex' username=\" complex\" " , context ), QStringLiteral ( " 'uri=\\ 'complex\\ ' username=\\\" complex\\\" '" ) );
4958
+ QCOMPARE ( def->valueAsPythonString ( QStringLiteral ( " c:\\ test\\ new data\\ " ), context ), QStringLiteral ( " 'c:\\\\ test\\\\ new data\\\\ '" ) );
4946
4959
4947
4960
QVariantMap map = def->toVariantMap ();
4948
4961
QgsProcessingParameterFolderDestination fromMap ( " x" );
@@ -6664,6 +6677,7 @@ void TestQgsProcessing::stringToPythonLiteral()
6664
6677
QCOMPARE ( QgsProcessingUtils::stringToPythonLiteral ( QString () ), QStringLiteral ( " ''" ) );
6665
6678
QCOMPARE ( QgsProcessingUtils::stringToPythonLiteral ( QStringLiteral ( " a 'string'" ) ), QStringLiteral ( " 'a \\ 'string\\ ''" ) );
6666
6679
QCOMPARE ( QgsProcessingUtils::stringToPythonLiteral ( QStringLiteral ( " a \" string\" " ) ), QStringLiteral ( " 'a \\\" string\\\" '" ) );
6680
+ QCOMPARE ( QgsProcessingUtils::stringToPythonLiteral ( QStringLiteral ( " a \n str\t in\\ g" ) ), QStringLiteral ( " 'a \\ n str\\ tin\\\\ g'" ) );
6667
6681
}
6668
6682
6669
6683
void TestQgsProcessing::defaultExtensionsForProvider ()
0 commit comments