[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [tellico/frameworks] src: update imdbfetchertest
From:       Robby Stephenson <robby () periapsis ! org>
Date:       2015-06-01 1:06:43
Message-ID: E1YzEBf-0008KJ-4k () scm ! kde ! org
[Download RAW message or body]

Git commit f252b87076a5c31214f527cb4b4e390a663a0373 by Robby Stephenson.
Committed on 31/05/2015 at 13:23.
Pushed by rstephenson into branch 'frameworks'.

update imdbfetchertest

M  +1    -1    src/fetch/imdbfetcher.cpp
M  +5    -2    src/tests/CMakeLists.txt
M  +8    -6    src/tests/imdbfetchertest.cpp

http://commits.kde.org/tellico/f252b87076a5c31214f527cb4b4e390a663a0373

diff --git a/src/fetch/imdbfetcher.cpp b/src/fetch/imdbfetcher.cpp
index 2c9e347..ae4f1a5 100644
--- a/src/fetch/imdbfetcher.cpp
+++ b/src/fetch/imdbfetcher.cpp
@@ -952,7 +952,7 @@ Tellico::Data::EntryPtr IMDBFetcher::parseEntry(const QString& str_) {
     // we want to strip the "/combined" from the url
     QString url = m_url.url();
     if(url.endsWith(QLatin1String("/combined"))) {
-      url = m_url.resolved(QUrl(QLatin1String(".."))).url();
+      url = m_url.adjusted(QUrl::RemoveFilename).url();
     }
     entry->setField(imdb, url);
   }
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index fa1b02c..d6bfd74 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -527,11 +527,14 @@ add_test(ibsfetchertest ibsfetchertest)
 ecm_mark_as_test(ibsfetchertest)
 TARGET_LINK_LIBRARIES(ibsfetchertest fetcherstest ${TELLICO2_TEST_LIBS})
 
-add_executable(imdbfetchertest imdbfetchertest.cpp abstractfetchertest.cpp)
+add_executable(imdbfetchertest imdbfetchertest.cpp abstractfetchertest.cpp
+  ../fetch/imdbfetcher.cpp
+  ../gui/listwidgetitem.cpp
+)
 ecm_mark_nongui_executable(imdbfetchertest)
 add_test(imdbfetchertest imdbfetchertest)
 ecm_mark_as_test(imdbfetchertest)
-TARGET_LINK_LIBRARIES(imdbfetchertest fetch ${TELLICO_TEST_LIBS})
+TARGET_LINK_LIBRARIES(imdbfetchertest fetcherstest ${TELLICO2_TEST_LIBS})
 
 add_executable(isbndbfetchertest isbndbfetchertest.cpp abstractfetchertest.cpp)
 ecm_mark_nongui_executable(isbndbfetchertest)
diff --git a/src/tests/imdbfetchertest.cpp b/src/tests/imdbfetchertest.cpp
index c49232d..5618d9e 100644
--- a/src/tests/imdbfetchertest.cpp
+++ b/src/tests/imdbfetchertest.cpp
@@ -25,7 +25,6 @@
 #undef QT_NO_CAST_FROM_ASCII
 
 #include "imdbfetchertest.h"
-#include "qtest_kde.h"
 
 #include "../fetch/imdbfetcher.h"
 #include "../entry.h"
@@ -35,9 +34,12 @@
 #include "../fieldformat.h"
 #include "../fetch/fetcherjob.h"
 
+#include <KConfig>
 #include <KConfigGroup>
 
-QTEST_KDEMAIN( ImdbFetcherTest, GUI )
+#include <QTest>
+
+QTEST_GUILESS_MAIN( ImdbFetcherTest )
 
 ImdbFetcherTest::ImdbFetcherTest() : AbstractFetcherTest() {
 }
@@ -48,7 +50,7 @@ void ImdbFetcherTest::initTestCase() {
 }
 
 void ImdbFetcherTest::testSnowyRiver() {
-  KConfig config(QString::fromLatin1(KDESRCDIR)  + "/tellicotest.config", KConfig::SimpleConfig);
+  KConfig config(QFINDTESTDATA("tellicotest.config"), KConfig::SimpleConfig);
   QString groupName = QLatin1String("IMDB");
   if(!config.hasGroup(groupName)) {
     QSKIP("This test requires a config file.", SkipAll);
@@ -89,7 +91,7 @@ void ImdbFetcherTest::testSnowyRiver() {
 
 void ImdbFetcherTest::testSnowyRiverFr() {
   return;
-  KConfig config(QString::fromLatin1(KDESRCDIR)  + "/tellicotest.config", KConfig::SimpleConfig);
+  KConfig config(QFINDTESTDATA("tellicotest.config"), KConfig::SimpleConfig);
   QString groupName = QLatin1String("IMDB FR");
   if(!config.hasGroup(groupName)) {
     QSKIP("This test requires a config file.", SkipAll);
@@ -132,7 +134,7 @@ void ImdbFetcherTest::testSnowyRiverFr() {
 
 void ImdbFetcherTest::testSnowyRiverEs() {
   return;
-  KConfig config(QString::fromLatin1(KDESRCDIR)  + "/tellicotest.config", KConfig::SimpleConfig);
+  KConfig config(QFINDTESTDATA("tellicotest.config"), KConfig::SimpleConfig);
   QString groupName = QLatin1String("IMDB ES");
   if(!config.hasGroup(groupName)) {
     QSKIP("This test requires a config file.", SkipAll);
@@ -174,7 +176,7 @@ void ImdbFetcherTest::testSnowyRiverEs() {
 }
 
 void ImdbFetcherTest::testAsterix() {
-  KConfig config(QString::fromLatin1(KDESRCDIR)  + "/tellicotest.config", KConfig::SimpleConfig);
+  KConfig config(QFINDTESTDATA("tellicotest.config"), KConfig::SimpleConfig);
   QString groupName = QLatin1String("IMDB");
   if(!config.hasGroup(groupName)) {
     QSKIP("This test requires a config file.", SkipAll);

[prev in list] [next in list] [prev in thread] [next in thread]