-
-
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.
QgisApp::addVectorLayer(): add |layername= to OGR datasets (fixes #20031
) Do it also in case of datasets that have a single layer, in case they might later be edited to have more layers (except for a few drivers known to be always single layer)
- Loading branch information
1 parent
bd6c111
commit 119cd8a
Showing
3 changed files
with
213 additions
and
44 deletions.
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,141 @@ | ||
| /*************************************************************************** | ||
| testqgisapp.cpp | ||
| -------------------------------------- | ||
| Date : 6 october 2018 | ||
| Copyright : (C) 2018 by Even Rouault | ||
| Email : even.rouault at spatialys.com | ||
| *************************************************************************** | ||
| * * | ||
| * 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 "qgstest.h" | ||
|
|
||
| #include <QApplication> | ||
| #include "gdal.h" | ||
|
|
||
| #include "qgisapp.h" | ||
| #include "qgsproject.h" | ||
| #include "qgsmaplayerstore.h" | ||
|
|
||
| /** | ||
| * \ingroup UnitTests | ||
| * This is a unit test for the QgisApp | ||
| */ | ||
| class TestQgisApp : public QObject | ||
| { | ||
| Q_OBJECT | ||
|
|
||
| public: | ||
| TestQgisApp(); | ||
|
|
||
| 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 addVectorLayerShp(); | ||
| void addVectorLayerGeopackageSingleLayer(); | ||
| void addVectorLayerGeopackageSingleLayerAlreadyLayername(); | ||
| void addVectorLayerInvalid(); | ||
|
|
||
| private: | ||
| QgisApp *mQgisApp = nullptr; | ||
| QString mTestDataDir; | ||
| }; | ||
|
|
||
| TestQgisApp::TestQgisApp() = default; | ||
|
|
||
| //runs before all tests | ||
| void TestQgisApp::initTestCase() | ||
| { | ||
| // Set up the QgsSettings environment | ||
| QCoreApplication::setOrganizationName( QStringLiteral( "QGIS" ) ); | ||
| QCoreApplication::setOrganizationDomain( QStringLiteral( "qgis.org" ) ); | ||
| QCoreApplication::setApplicationName( QStringLiteral( "QGIS-TEST" ) ); | ||
|
|
||
| qDebug() << "TestQgisApp::initTestCase()"; | ||
| // init QGIS's paths - true means that all path will be inited from prefix | ||
| QgsApplication::init(); | ||
| QgsApplication::initQgis(); | ||
| mTestDataDir = QStringLiteral( TEST_DATA_DIR ) + '/'; //defined in CmakeLists.txt | ||
| mQgisApp = new QgisApp(); | ||
| } | ||
|
|
||
| //runs after all tests | ||
| void TestQgisApp::cleanupTestCase() | ||
| { | ||
| QgsApplication::exitQgis(); | ||
| } | ||
|
|
||
| void TestQgisApp::init() | ||
| { | ||
| GDALDriverH hDriver = GDALGetDriverByName( "GPKG" ); | ||
| QVERIFY( hDriver ); | ||
| GDALDatasetH hDS = GDALCreate( hDriver, "/vsimem/test.gpkg", 0, 0, 0, GDT_Unknown, nullptr ); | ||
| QVERIFY( hDS ); | ||
| GDALDatasetCreateLayer( hDS, "my_layer", nullptr, wkbPoint, nullptr ); | ||
| GDALClose( hDS ); | ||
| } | ||
|
|
||
| void TestQgisApp::cleanup() | ||
| { | ||
| GDALDriverH hDriver = GDALGetDriverByName( "GPKG" ); | ||
| QVERIFY( hDriver ); | ||
| GDALDeleteDataset( hDriver, "/vsimem/test.gpkg" ); | ||
| } | ||
|
|
||
| void TestQgisApp::addVectorLayerShp() | ||
| { | ||
| QString filePath = mTestDataDir + QStringLiteral( "points.shp" ); | ||
| QgsVectorLayer *layer = mQgisApp->addVectorLayer( filePath, "test", QStringLiteral( "ogr" ) ); | ||
| QVERIFY( layer->isValid() ); | ||
|
|
||
| // No need for |layerName= for shapefiles | ||
| QVERIFY( layer->source().endsWith( QLatin1String( "points.shp" ) ) ); | ||
|
|
||
| // cleanup | ||
| QgsProject::instance()->layerStore()->removeMapLayers( QStringList() << layer->id() ); | ||
| } | ||
|
|
||
| void TestQgisApp::addVectorLayerGeopackageSingleLayer() | ||
| { | ||
| QString filePath = QLatin1String( "/vsimem/test.gpkg" ); | ||
| QgsVectorLayer *layer = mQgisApp->addVectorLayer( filePath, "test", QStringLiteral( "ogr" ) ); | ||
| QVERIFY( layer->isValid() ); | ||
|
|
||
| // Need for |layerName= for geopackage | ||
| QVERIFY( layer->source().endsWith( QLatin1String( "/vsimem/test.gpkg|layername=my_layer" ) ) ); | ||
|
|
||
| // cleanup | ||
| QgsProject::instance()->layerStore()->removeMapLayers( QStringList() << layer->id() ); | ||
| } | ||
|
|
||
| void TestQgisApp::addVectorLayerGeopackageSingleLayerAlreadyLayername() | ||
| { | ||
| QString filePath = QLatin1String( "/vsimem/test.gpkg|layername=my_layer" ); | ||
| QgsVectorLayer *layer = mQgisApp->addVectorLayer( filePath, "test", QStringLiteral( "ogr" ) ); | ||
| QVERIFY( layer->isValid() ); | ||
|
|
||
| // Need for |layerName= for geopackage | ||
| QVERIFY( layer->source().endsWith( QLatin1String( "/vsimem/test.gpkg|layername=my_layer" ) ) ); | ||
|
|
||
| // cleanup | ||
| QgsProject::instance()->layerStore()->removeMapLayers( QStringList() << layer->id() ); | ||
| } | ||
|
|
||
| void TestQgisApp::addVectorLayerInvalid() | ||
| { | ||
| QgsVectorLayer *layer = mQgisApp->addVectorLayer( "i_do_not_exist", "test", QStringLiteral( "ogr" ) ); | ||
| QVERIFY( !layer ); | ||
|
|
||
| layer = mQgisApp->addVectorLayer( "/vsimem/test.gpkg|layername=invalid_layer_name", "test", QStringLiteral( "ogr" ) ); | ||
| QVERIFY( !layer ); | ||
| } | ||
|
|
||
| QGSTEST_MAIN( TestQgisApp ) | ||
| #include "testqgisapp.moc" |