Skip to content
Permalink
Browse files
Translate
  • Loading branch information
nyalldawson committed Sep 10, 2021
1 parent 45b8867 commit b12d163c476d3a0049ad78342128cca4db52d0ed
Showing with 6 additions and 6 deletions.
  1. +6 −6 tests/src/analysis/testqgsprocessing.cpp
@@ -967,13 +967,13 @@ void TestQgsProcessing::compatibleLayers()
lIds.clear();
for ( QgsAnnotationLayer *pcl : QgsProcessingUtils::compatibleAnnotationLayers( &p ) )
lIds << pcl->name();
QCOMPARE( lIds, QStringList() << "Annotations" << "secondary annotation layer" );
QCOMPARE( lIds, QStringList() << QObject::tr( "Annotations" ) << "secondary annotation layer" );

// unsorted
lIds.clear();
for ( QgsAnnotationLayer *pcl : QgsProcessingUtils::compatibleAnnotationLayers( &p, false ) )
lIds << pcl->name();
QCOMPARE( lIds, QStringList() << "secondary annotation layer" << "Annotations" );
QCOMPARE( lIds, QStringList() << "secondary annotation layer" << QObject::tr( "Annotations" ) );

// point only
lIds.clear();
@@ -1019,19 +1019,19 @@ void TestQgsProcessing::compatibleLayers()
for ( QgsMapLayer *l : QgsProcessingUtils::compatibleLayers( &p ) )
lIds << l->name();
#ifdef HAVE_EPT
QCOMPARE( lIds, QStringList() << "Annotations" << "ar2" << "mA" << "MX" << "pA" << "pcA" << "PCX" << "PX" << "R1" << "secondary annotation layer" << "v1" << "v3" << "V4" << "vvvv4" << "zz" );
QCOMPARE( lIds, QStringList() << QObject::tr( "Annotations" ) << "ar2" << "mA" << "MX" << "pA" << "pcA" << "PCX" << "PX" << "R1" << "secondary annotation layer" << "v1" << "v3" << "V4" << "vvvv4" << "zz" );
#else
QCOMPARE( lIds, QStringList() << "Annotations" << "ar2" << "mA" << "MX" << "pA" << "PX" << "R1" << "secondary annotation layer" << "v1" << "v3" << "V4" << "vvvv4" << "zz" );
QCOMPARE( lIds, QStringList() << QObject::tr( "Annotations" ) << "ar2" << "mA" << "MX" << "pA" << "PX" << "R1" << "secondary annotation layer" << "v1" << "v3" << "V4" << "vvvv4" << "zz" );
#endif

// unsorted
lIds.clear();
for ( QgsMapLayer *l : QgsProcessingUtils::compatibleLayers( &p, false ) )
lIds << l->name();
#ifdef HAVE_EPT
QCOMPARE( lIds, QStringList() << "R1" << "ar2" << "zz" << "V4" << "v1" << "v3" << "vvvv4" << "MX" << "mA" << "PCX" << "pcA" << "secondary annotation layer" << "Annotations" << "PX" << "pA" );
QCOMPARE( lIds, QStringList() << "R1" << "ar2" << "zz" << "V4" << "v1" << "v3" << "vvvv4" << "MX" << "mA" << "PCX" << "pcA" << "secondary annotation layer" << QObject::tr( "Annotations" ) << "PX" << "pA" );
#else
QCOMPARE( lIds, QStringList() << "R1" << "ar2" << "zz" << "V4" << "v1" << "v3" << "vvvv4" << "MX" << "mA" << "secondary annotation layer" << "Annotations" << "PX" << "pA" );
QCOMPARE( lIds, QStringList() << "R1" << "ar2" << "zz" << "V4" << "v1" << "v3" << "vvvv4" << "MX" << "mA" << "secondary annotation layer" << QObject::tr( "Annotations" ) << "PX" << "pA" );
#endif
}

0 comments on commit b12d163

Please sign in to comment.