Skip to content

Commit 2e20f13

Browse files
committed
Fix fragile test
1 parent 51a4981 commit 2e20f13

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

tests/src/core/testqgsvectorlayer.cpp

+14-8
Original file line numberDiff line numberDiff line change
@@ -211,22 +211,25 @@ void TestQgsVectorLayer::QgsVectorLayerGetValues()
211211
QList<QVariant> varList = QgsVectorLayerUtils::getValues( layer, QStringLiteral( "col1" ), ok );
212212
QVERIFY( ok );
213213
QCOMPARE( varList.length(), 4 );
214-
QCOMPARE( varList.at( 0 ), QVariant( 1 ) );
215-
QCOMPARE( varList.at( 1 ), QVariant( 2 ) );
216-
QCOMPARE( varList.at( 2 ), QVariant( 3 ) );
217-
QCOMPARE( varList.at( 3 ), QVariant() );
214+
std::sort( varList.begin(), varList.end() );
215+
QCOMPARE( varList.at( 0 ), QVariant() );
216+
QCOMPARE( varList.at( 1 ), QVariant( 1 ) );
217+
QCOMPARE( varList.at( 2 ), QVariant( 2 ) );
218+
QCOMPARE( varList.at( 3 ), QVariant( 3 ) );
218219

219220
//check with selected features
220221
varList = QgsVectorLayerUtils::getValues( layer, QStringLiteral( "col1" ), ok, true );
221222
QVERIFY( ok );
222223
QCOMPARE( varList.length(), 2 );
224+
std::sort( varList.begin(), varList.end() );
223225
QCOMPARE( varList.at( 0 ), QVariant( 2 ) );
224226
QCOMPARE( varList.at( 1 ), QVariant( 3 ) );
225227

226228
int nulls = 0;
227229
QList<double> doubleList = QgsVectorLayerUtils::getDoubleValues( layer, QStringLiteral( "col1" ), ok, false, &nulls );
228230
QVERIFY( ok );
229231
QCOMPARE( doubleList.length(), 3 );
232+
std::sort( doubleList.begin(), doubleList.end() );
230233
QCOMPARE( doubleList.at( 0 ), 1.0 );
231234
QCOMPARE( doubleList.at( 1 ), 2.0 );
232235
QCOMPARE( doubleList.at( 2 ), 3.0 );
@@ -235,6 +238,7 @@ void TestQgsVectorLayer::QgsVectorLayerGetValues()
235238
//check with selected features
236239
doubleList = QgsVectorLayerUtils::getDoubleValues( layer, QStringLiteral( "col1" ), ok, true, &nulls );
237240
QVERIFY( ok );
241+
std::sort( doubleList.begin(), doubleList.end() );
238242
QCOMPARE( doubleList.length(), 2 );
239243
QCOMPARE( doubleList.at( 0 ), 2.0 );
240244
QCOMPARE( doubleList.at( 1 ), 3.0 );
@@ -243,13 +247,15 @@ void TestQgsVectorLayer::QgsVectorLayerGetValues()
243247
QList<QVariant> expVarList = QgsVectorLayerUtils::getValues( layer, QStringLiteral( "tostring(col1) || ' '" ), ok );
244248
QVERIFY( ok );
245249
QCOMPARE( expVarList.length(), 4 );
246-
QCOMPARE( expVarList.at( 0 ).toString(), QString( "1 " ) );
247-
QCOMPARE( expVarList.at( 1 ).toString(), QString( "2 " ) );
248-
QCOMPARE( expVarList.at( 2 ).toString(), QString( "3 " ) );
249-
QCOMPARE( expVarList.at( 3 ), QVariant() );
250+
std::sort( expVarList.begin(), expVarList.end() );
251+
QCOMPARE( expVarList.at( 0 ), QVariant() );
252+
QCOMPARE( expVarList.at( 1 ).toString(), QString( "1 " ) );
253+
QCOMPARE( expVarList.at( 2 ).toString(), QString( "2 " ) );
254+
QCOMPARE( expVarList.at( 3 ).toString(), QString( "3 " ) );
250255

251256
QList<double> expDoubleList = QgsVectorLayerUtils::getDoubleValues( layer, QStringLiteral( "col1 * 2" ), ok, false, &nulls );
252257
QVERIFY( ok );
258+
std::sort( expDoubleList.begin(), expDoubleList.end() );
253259
QCOMPARE( expDoubleList.length(), 3 );
254260
QCOMPARE( expDoubleList.at( 0 ), 2.0 );
255261
QCOMPARE( expDoubleList.at( 1 ), 4.0 );

0 commit comments

Comments
 (0)