Skip to content

Commit

Permalink
Disable test when pg test environment not available
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Mar 13, 2020
1 parent 3833928 commit cad3695
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions tests/src/gui/testqgsnewdatabasetablewidget.cpp
Expand Up @@ -60,10 +60,13 @@ void TestQgsNewDatabaseTableNameWidget::initTestCase()
QgsApplication::initQgis();

// Add some connections to test with
QgsProviderMetadata *md { QgsProviderRegistry::instance()->providerMetadata( QStringLiteral( "postgres" ) ) };
QgsProviderMetadata *md = nullptr;
#ifdef ENABLE_PGTEST
md = QgsProviderRegistry::instance()->providerMetadata( QStringLiteral( "postgres" ) );
mPgConn.reset( md->createConnection( qgetenv( "QGIS_PGTEST_DB" ), { } ) );
md->saveConnection( mPgConn.get(), QStringLiteral( "PG_1" ) );
md->saveConnection( mPgConn.get(), QStringLiteral( "PG_2" ) );
#endif

md = QgsProviderRegistry::instance()->providerMetadata( QStringLiteral( "ogr" ) );
QString errCause;
Expand Down Expand Up @@ -110,6 +113,7 @@ void TestQgsNewDatabaseTableNameWidget::testWidgetFilters()

void TestQgsNewDatabaseTableNameWidget::testWidgetSignalsPostgres()
{
#ifdef ENABLE_PGTEST
std::unique_ptr<QgsNewDatabaseTableNameWidget> w { qgis::make_unique<QgsNewDatabaseTableNameWidget>( nullptr, QStringList{ "postgres" } ) };

auto index = w->mBrowserModel->findPath( QStringLiteral( "pg:/PG_1" ) );
Expand Down Expand Up @@ -206,10 +210,12 @@ void TestQgsNewDatabaseTableNameWidget::testWidgetSignalsPostgres()
QCOMPARE( w->schema(), QString( "public" ) );
QCOMPARE( w->dataProviderKey(), QString( "postgres" ) );
QVERIFY( w->uri().contains( R"("public"."someData")" ) );
#endif
}

void TestQgsNewDatabaseTableNameWidget::testWidgetSignalsGeopackage()
{
#ifdef ENABLE_PGTEST
std::unique_ptr<QgsNewDatabaseTableNameWidget> w { qgis::make_unique<QgsNewDatabaseTableNameWidget>( nullptr, QStringList{ "ogr" } ) };

auto index = w->mBrowserModel->findPath( QStringLiteral( "pg:/PG_1" ) );
Expand Down Expand Up @@ -260,7 +266,7 @@ void TestQgsNewDatabaseTableNameWidget::testWidgetSignalsGeopackage()
QCOMPARE( w->schema(), mGpkgPath );
QCOMPARE( w->dataProviderKey(), QString( "ogr" ) );
QCOMPARE( w->uri(), mGpkgPath + QStringLiteral( "|layername=newTableName" ) );

#endif
}

QGSTEST_MAIN( TestQgsNewDatabaseTableNameWidget )
Expand Down

0 comments on commit cad3695

Please sign in to comment.