sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-09 00:08:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update tests

Browse Source
This commit is contained in:
Nyall Dawson 2021-02-06 07:03:08 +10:00
parent d0882d0f06
commit 15267f9e6c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/src/gui/testqgsfeaturelistcombobox.cpp
View File

@ -80,6 +80,7 @@ void TestQgsFeatureListComboBox::init()
{ {
// create layer // create layer
mLayer.reset( new QgsVectorLayer( QStringLiteral( "LineString?field=pk:int&field=material:string&field=diameter:int&field=raccord:string" ), QStringLiteral( "vl2" ), QStringLiteral( "memory" ) ) ); mLayer.reset( new QgsVectorLayer( QStringLiteral( "LineString?field=pk:int&field=material:string&field=diameter:int&field=raccord:string" ), QStringLiteral( "vl2" ), QStringLiteral( "memory" ) ) );
mLayer->setDisplayExpression( QStringLiteral( "pk" ) );
// add features // add features
mLayer->startEditing(); mLayer->startEditing();

1
tests/src/gui/testqgsrelationreferencewidget.cpp
View File

@ -100,6 +100,7 @@ void TestQgsRelationReferenceWidget::init()
QgsProject::instance()->addMapLayer( mLayer1.get(), false, false ); 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" ) ) ); mLayer2.reset( new QgsVectorLayer( QStringLiteral( "LineString?field=pk:int&field=material:string&field=diameter:int&field=raccord:string" ), QStringLiteral( "vl2" ), QStringLiteral( "memory" ) ) );
mLayer2->setDisplayExpression( QStringLiteral( "pk" ) );
QgsProject::instance()->addMapLayer( mLayer2.get(), false, false ); QgsProject::instance()->addMapLayer( mLayer2.get(), false, false );
// create relation // create relation

5
tests/src/python/test_qgsfieldformatters.py
View File

@ -203,6 +203,7 @@ class TestQgsRelationReferenceFieldFormatter(unittest.TestCase):
self.assertTrue(first_layer.isValid()) self.assertTrue(first_layer.isValid())
second_layer = QgsVectorLayer("none?field=pkid:integer&field=decoded:string", second_layer = QgsVectorLayer("none?field=pkid:integer&field=decoded:string",
"second_layer", "memory") "second_layer", "memory")
second_layer.setDisplayExpression('pkid')
self.assertTrue(second_layer.isValid()) self.assertTrue(second_layer.isValid())
QgsProject.instance().addMapLayers([first_layer, second_layer]) QgsProject.instance().addMapLayers([first_layer, second_layer])
f = QgsFeature() f = QgsFeature()
@ -241,10 +242,10 @@ class TestQgsRelationReferenceFieldFormatter(unittest.TestCase):
second_layer.setDisplayExpression('decoded') second_layer.setDisplayExpression('decoded')
self.assertEqual(fieldFormatter.representValue(first_layer, 0, config, None, '123'), '123') self.assertEqual(fieldFormatter.representValue(first_layer, 0, config, None, '123'), '123')
# No display expression # No display expression - will default internally to the decoded string
config = {'Relation': rel.id()} config = {'Relation': rel.id()}
second_layer.setDisplayExpression(None) second_layer.setDisplayExpression(None)
self.assertEqual(fieldFormatter.representValue(first_layer, 0, config, None, '123'), '123') self.assertEqual(fieldFormatter.representValue(first_layer, 0, config, None, '123'), 'decoded_val')
# Invalid display expression # Invalid display expression
config = {'Relation': rel.id()} config = {'Relation': rel.id()}

3
tests/src/python/test_qgsvectorlayer.py
View File

@ -3084,9 +3084,6 @@ class TestQgsVectorLayer(unittest.TestCase, FeatureSourceTestCase):
layer = QgsVectorLayer("Polygon?crs=epsg:2056&field=pk:int", "vl", "memory") layer = QgsVectorLayer("Polygon?crs=epsg:2056&field=pk:int", "vl", "memory")
self.assertEqual(layer.displayExpression(), '"pk"') self.assertEqual(layer.displayExpression(), '"pk"')
self.assertEqual(layer.displayField(), 'pk') self.assertEqual(layer.displayField(), 'pk')
layer = QgsVectorLayer("Polygon?crs=epsg:2056&field=pk:int&field=fid:int", "vl", "memory")
self.assertEqual(layer.displayExpression(), '"fid"')
self.assertEqual(layer.displayField(), 'fid')
layer = QgsVectorLayer("Polygon?crs=epsg:2056&field=pk:int&field=DESCRIPTION:string&field=fid:int", "vl", "memory") layer = QgsVectorLayer("Polygon?crs=epsg:2056&field=pk:int&field=DESCRIPTION:string&field=fid:int", "vl", "memory")
self.assertEqual(layer.displayExpression(), '"DESCRIPTION"') self.assertEqual(layer.displayExpression(), '"DESCRIPTION"')
self.assertEqual(layer.displayField(), 'DESCRIPTION') self.assertEqual(layer.displayField(), 'DESCRIPTION')