@@ -211,22 +211,25 @@ void TestQgsVectorLayer::QgsVectorLayerGetValues()
211
211
QList<QVariant> varList = QgsVectorLayerUtils::getValues ( layer, QStringLiteral ( " col1" ), ok );
212
212
QVERIFY ( ok );
213
213
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 ) );
218
219
219
220
// check with selected features
220
221
varList = QgsVectorLayerUtils::getValues ( layer, QStringLiteral ( " col1" ), ok, true );
221
222
QVERIFY ( ok );
222
223
QCOMPARE ( varList.length (), 2 );
224
+ std::sort ( varList.begin (), varList.end () );
223
225
QCOMPARE ( varList.at ( 0 ), QVariant ( 2 ) );
224
226
QCOMPARE ( varList.at ( 1 ), QVariant ( 3 ) );
225
227
226
228
int nulls = 0 ;
227
229
QList<double > doubleList = QgsVectorLayerUtils::getDoubleValues ( layer, QStringLiteral ( " col1" ), ok, false , &nulls );
228
230
QVERIFY ( ok );
229
231
QCOMPARE ( doubleList.length (), 3 );
232
+ std::sort ( doubleList.begin (), doubleList.end () );
230
233
QCOMPARE ( doubleList.at ( 0 ), 1.0 );
231
234
QCOMPARE ( doubleList.at ( 1 ), 2.0 );
232
235
QCOMPARE ( doubleList.at ( 2 ), 3.0 );
@@ -235,6 +238,7 @@ void TestQgsVectorLayer::QgsVectorLayerGetValues()
235
238
// check with selected features
236
239
doubleList = QgsVectorLayerUtils::getDoubleValues ( layer, QStringLiteral ( " col1" ), ok, true , &nulls );
237
240
QVERIFY ( ok );
241
+ std::sort ( doubleList.begin (), doubleList.end () );
238
242
QCOMPARE ( doubleList.length (), 2 );
239
243
QCOMPARE ( doubleList.at ( 0 ), 2.0 );
240
244
QCOMPARE ( doubleList.at ( 1 ), 3.0 );
@@ -243,13 +247,15 @@ void TestQgsVectorLayer::QgsVectorLayerGetValues()
243
247
QList<QVariant> expVarList = QgsVectorLayerUtils::getValues ( layer, QStringLiteral ( " tostring(col1) || ' '" ), ok );
244
248
QVERIFY ( ok );
245
249
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 " ) );
250
255
251
256
QList<double > expDoubleList = QgsVectorLayerUtils::getDoubleValues ( layer, QStringLiteral ( " col1 * 2" ), ok, false , &nulls );
252
257
QVERIFY ( ok );
258
+ std::sort ( expDoubleList.begin (), expDoubleList.end () );
253
259
QCOMPARE ( expDoubleList.length (), 3 );
254
260
QCOMPARE ( expDoubleList.at ( 0 ), 2.0 );
255
261
QCOMPARE ( expDoubleList.at ( 1 ), 4.0 );
0 commit comments