fix test

mblesius · Feb 6, 2023 · c9e83de · c9e83de
1 parent 3043f19
commit c9e83de
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/tests/src/core/testqgsnewsfeedparser.cpp b/tests/src/core/testqgsnewsfeedparser.cpp
@@ -19,7 +19,6 @@
 #include <QSignalSpy>
 #include "qgsnewsfeedparser.h"
 #include "qgsnewsfeedmodel.h"
-#include "qgssettings.h"
 
 
 class TestQgsNewsFeedParser: public QObject
@@ -73,7 +72,7 @@ void TestQgsNewsFeedParser::testFetch()
 
   const QUrl url( QUrl::fromLocalFile( QStringLiteral( TEST_DATA_DIR ) + "/newsfeed/feed" ) );
   const QString feedKey = QgsNewsFeedParser::keyForFeed( url.toString() );
-  QgsSettings().remove( feedKey, QgsSettings::Core );
+  QgsNewsFeedParser::sTreeNewsFeed->deleteItem( feedKey );
 
   const qint64 beforeTime = QDateTime::currentDateTimeUtc().toSecsSinceEpoch();
 
@@ -115,7 +114,7 @@ void TestQgsNewsFeedParser::testFetch()
   QVERIFY( after >= beforeTime );
 
   // reset to a standard known last time
-  QgsSettings().remove( feedKey, QgsSettings::Core );
+  QgsNewsFeedParser::sTreeNewsFeed->deleteItem( feedKey );
   QgsNewsFeedParser::settingsFeedLastFetchTime->setValue( 1457360008, feedKey );
 
   // refetch, only new items should be fetched
@@ -200,7 +199,7 @@ void TestQgsNewsFeedParser::testAutoExpiry()
 {
   const QUrl url( QStringLiteral( "xxx" ) );
   const QString feedKey = QgsNewsFeedParser::keyForFeed( url.toString() );
-  QgsSettings().remove( feedKey, QgsSettings::Core );
+  QgsNewsFeedParser::sTreeNewsFeed->deleteItem( feedKey );
 
   // ensure entries "auto expire" when past their use-by date
   QgsNewsFeedParser::Entry testEntry;
@@ -228,7 +227,7 @@ void TestQgsNewsFeedParser::testLang()
 
   const QUrl url( QUrl::fromLocalFile( QStringLiteral( TEST_DATA_DIR ) + "/newsfeed/feed" ) );
   const QString feedKey = QgsNewsFeedParser::keyForFeed( url.toString() );
-  QgsSettings().remove( feedKey, QgsSettings::Core );
+  QgsNewsFeedParser::sTreeNewsFeed->deleteItem( feedKey );
   // force to Spanish language
   QgsNewsFeedParser::settingsFeedLanguage->setValue( QStringLiteral( "es" ), feedKey );
 
@@ -255,7 +254,7 @@ void TestQgsNewsFeedParser::testGeoFencing()
 
   const QUrl url( QUrl::fromLocalFile( QStringLiteral( TEST_DATA_DIR ) + "/newsfeed/feed" ) );
   const QString feedKey = QgsNewsFeedParser::keyForFeed( url.toString() );
-  QgsSettings().remove( feedKey, QgsSettings::Core );
+  QgsNewsFeedParser::sTreeNewsFeed->deleteItem( feedKey );
   QgsNewsFeedParser::settingsFeedLatitude->setValue( 37.2343, feedKey );
   QgsNewsFeedParser::settingsFeedLongitude->setValue( -115.8067, feedKey );
 
@@ -282,7 +281,7 @@ void TestQgsNewsFeedParser::testModel()
   // test news feed model
   const QUrl url( QUrl::fromLocalFile( QStringLiteral( TEST_DATA_DIR ) + "/newsfeed/feed" ) );
   const QString feedKey = QgsNewsFeedParser::keyForFeed( url.toString() );
-  QgsSettings().remove( feedKey, QgsSettings::Core );
+  QgsNewsFeedParser::sTreeNewsFeed->deleteItem( feedKey );
 
   QgsNewsFeedParser parser( url );
   const QgsNewsFeedModel model( &parser );
@@ -361,7 +360,7 @@ void TestQgsNewsFeedParser::testProxyModel()
   // test news feed proxy model
   const QUrl url( QUrl::fromLocalFile( QStringLiteral( TEST_DATA_DIR ) + "/newsfeed/feed" ) );
   const QString feedKey = QgsNewsFeedParser::keyForFeed( url.toString() );
-  QgsSettings().remove( feedKey, QgsSettings::Core );
+  QgsNewsFeedParser::sTreeNewsFeed->deleteItem( feedKey );
 
   QgsNewsFeedParser parser( url );
   const QgsNewsFeedProxyModel model( &parser );