-
-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes #36114 : NULL value relation sort
- Loading branch information
1 parent
acaebfd
commit 5b7cfa6
Showing
3 changed files
with
149 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,147 @@ | ||
/*************************************************************************** | ||
testqgsvaluerelationfieldformatter.cpp | ||
-------------------------------------- | ||
Date : 13/12/2019 | ||
Copyright : (C) 2019 by Alessandro Pasotti | ||
Email : elpaso at itopen dot it | ||
*************************************************************************** | ||
* * | ||
* This program is free software; you can redistribute it and/or modify * | ||
* it under the terms of the GNU General Public License as published by * | ||
* the Free Software Foundation; either version 2 of the License, or * | ||
* (at your option) any later version. * | ||
* * | ||
***************************************************************************/ | ||
|
||
#include <QObject> | ||
#include <QString> | ||
|
||
#include "qgstest.h" | ||
#include "qgsapplication.h" | ||
#include "qgsproject.h" | ||
#include "qgsrelationmanager.h" | ||
#include "qgsfieldformatterregistry.h" | ||
|
||
|
||
//header for class being tested | ||
#include "fieldformatter/qgsvaluerelationfieldformatter.h" | ||
|
||
class TestQgsValueRelationFieldFormatter: public QObject | ||
{ | ||
Q_OBJECT | ||
|
||
private slots: | ||
|
||
void initTestCase(); // will be called before the first testfunction is executed. | ||
void cleanupTestCase(); // will be called after the last testfunction was executed. | ||
void init(); // will be called before each testfunction is executed. | ||
void cleanup(); // will be called after every testfunction. | ||
void testSortValueNull(); | ||
|
||
private: | ||
std::unique_ptr<QgsVectorLayer> mLayer1; | ||
std::unique_ptr<QgsVectorLayer> mLayer2; | ||
std::unique_ptr<QgsRelation> mRelation; | ||
|
||
}; | ||
|
||
|
||
void TestQgsValueRelationFieldFormatter::initTestCase() | ||
{ | ||
QgsApplication::init(); | ||
QgsApplication::initQgis(); | ||
} | ||
|
||
void TestQgsValueRelationFieldFormatter::cleanupTestCase() | ||
{ | ||
QgsApplication::exitQgis(); | ||
} | ||
|
||
void TestQgsValueRelationFieldFormatter::cleanup() | ||
{ | ||
QgsProject::instance()->removeMapLayer( mLayer1.get() ); | ||
QgsProject::instance()->removeMapLayer( mLayer2.get() ); | ||
} | ||
|
||
|
||
void TestQgsValueRelationFieldFormatter::init() | ||
{ | ||
// create layer | ||
mLayer1.reset( new QgsVectorLayer( QStringLiteral( "LineString?crs=epsg:3111&field=pk:int&field=fk:int" ), QStringLiteral( "vl1" ), QStringLiteral( "memory" ) ) ); | ||
QgsProject::instance()->addMapLayer( mLayer1.get(), false, false ); | ||
|
||
mLayer2.reset( new QgsVectorLayer( QStringLiteral( "LineString?field=pk:int&field=material:string&field=diameter:int&field=raccord:string" ), QStringLiteral( "vl2" ), QStringLiteral( "memory" ) ) ); | ||
QgsProject::instance()->addMapLayer( mLayer2.get(), false, false ); | ||
|
||
// create relation | ||
mRelation.reset( new QgsRelation() ); | ||
mRelation->setId( QStringLiteral( "vl1.vl2" ) ); | ||
mRelation->setName( QStringLiteral( "vl1.vl2" ) ); | ||
mRelation->setReferencingLayer( mLayer1->id() ); | ||
mRelation->setReferencedLayer( mLayer2->id() ); | ||
mRelation->addFieldPair( QStringLiteral( "fk" ), QStringLiteral( "pk" ) ); | ||
QVERIFY( mRelation->isValid() ); | ||
QgsProject::instance()->relationManager()->addRelation( *mRelation ); | ||
|
||
// add features | ||
QgsFeature ft0( mLayer1->fields() ); | ||
ft0.setAttribute( QStringLiteral( "pk" ), 0 ); | ||
ft0.setAttribute( QStringLiteral( "fk" ), 0 ); | ||
mLayer1->startEditing(); | ||
mLayer1->addFeature( ft0 ); | ||
mLayer1->commitChanges(); | ||
|
||
QgsFeature ft1( mLayer1->fields() ); | ||
ft1.setAttribute( QStringLiteral( "pk" ), 1 ); | ||
ft1.setAttribute( QStringLiteral( "fk" ), 1 ); | ||
mLayer1->startEditing(); | ||
mLayer1->addFeature( ft1 ); | ||
mLayer1->commitChanges(); | ||
|
||
QgsFeature ft2( mLayer2->fields() ); | ||
ft2.setAttribute( QStringLiteral( "pk" ), 10 ); | ||
ft2.setAttribute( QStringLiteral( "material" ), "iron" ); | ||
ft2.setAttribute( QStringLiteral( "diameter" ), 120 ); | ||
ft2.setAttribute( QStringLiteral( "raccord" ), "brides" ); | ||
mLayer2->startEditing(); | ||
mLayer2->addFeature( ft2 ); | ||
mLayer2->commitChanges(); | ||
|
||
QgsFeature ft3( mLayer2->fields() ); | ||
ft3.setAttribute( QStringLiteral( "pk" ), 11 ); | ||
ft3.setAttribute( QStringLiteral( "material" ), "iron" ); | ||
ft3.setAttribute( QStringLiteral( "diameter" ), 120 ); | ||
ft3.setAttribute( QStringLiteral( "raccord" ), "sleeve" ); | ||
mLayer2->startEditing(); | ||
mLayer2->addFeature( ft3 ); | ||
mLayer2->commitChanges(); | ||
|
||
QgsFeature ft4( mLayer2->fields() ); | ||
ft4.setAttribute( QStringLiteral( "pk" ), 12 ); | ||
ft4.setAttribute( QStringLiteral( "material" ), "steel" ); | ||
ft4.setAttribute( QStringLiteral( "diameter" ), 120 ); | ||
ft4.setAttribute( QStringLiteral( "raccord" ), "collar" ); | ||
mLayer2->startEditing(); | ||
mLayer2->addFeature( ft4 ); | ||
mLayer2->commitChanges(); | ||
} | ||
|
||
void TestQgsValueRelationFieldFormatter::testSortValueNull() | ||
{ | ||
QgsValueRelationFieldFormatter formatter; | ||
QVariantMap config; | ||
config.insert( QStringLiteral( "Layer" ), mLayer2->id() ); | ||
config.insert( QStringLiteral( "Key" ), QStringLiteral( "pk" ) ); | ||
config.insert( QStringLiteral( "Value" ), QStringLiteral( "material" ) ); | ||
|
||
// when sorting, a null value is represented with a null QString, not "NULL" string | ||
// if not, the NULL values will take place between M and O (see https://github.com/qgis/QGIS/issues/36114) | ||
QVariant value = formatter.sortValue( mLayer2.get(), 1, config, QVariant(), QVariant() ); | ||
QCOMPARE( value, QVariant( QString() ) ); | ||
|
||
value = formatter.sortValue( mLayer2.get(), 1, config, QVariant(), QVariant( 10 ) ); | ||
QCOMPARE( value, QVariant( QString( "iron" ) ) ); | ||
} | ||
|
||
QGSTEST_MAIN( TestQgsValueRelationFieldFormatter ) | ||
#include "testqgsvaluerelationfieldformatter.moc" |