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

List:       kde-commits
Subject:    [tellico/frameworks] src/tests: update musicbrainzfetchertest
From:       Robby Stephenson <robby () periapsis ! org>
Date:       2015-06-01 1:06:49
Message-ID: E1YzEBl-0008KJ-2v () scm ! kde ! org
[Download RAW message or body]

Git commit ff4a35c9007240cc4ead614a35c0143d634c2369 by Robby Stephenson.
Committed on 31/05/2015 at 20:28.
Pushed by rstephenson into branch 'frameworks'.

update musicbrainzfetchertest

M  +4    -2    src/tests/CMakeLists.txt
M  +6    -8    src/tests/musicbrainzfetchertest.cpp

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

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index d0f2a02..bb82f89 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -561,11 +561,13 @@ add_test(mrlookupfetchertest mrlookupfetchertest)
 ecm_mark_as_test(mrlookupfetchertest)
 TARGET_LINK_LIBRARIES(mrlookupfetchertest fetcherstest ${TELLICO_BTPARSE_L=
IBS} ${TELLICO2_TEST_LIBS})
 =

-add_executable(musicbrainzfetchertest musicbrainzfetchertest.cpp abstractf=
etchertest.cpp)
+add_executable(musicbrainzfetchertest musicbrainzfetchertest.cpp abstractf=
etchertest.cpp
+  ../fetch/musicbrainzfetcher.cpp
+)
 ecm_mark_nongui_executable(musicbrainzfetchertest)
 add_test(musicbrainzfetchertest musicbrainzfetchertest)
 ecm_mark_as_test(musicbrainzfetchertest)
-TARGET_LINK_LIBRARIES(musicbrainzfetchertest fetch ${TELLICO_TEST_LIBS})
+TARGET_LINK_LIBRARIES(musicbrainzfetchertest fetcherstest ${TELLICO2_TEST_=
LIBS})
 =

 IF( QJSON_FOUND )
     add_executable(openlibraryfetchertest openlibraryfetchertest.cpp abstr=
actfetchertest.cpp)
diff --git a/src/tests/musicbrainzfetchertest.cpp b/src/tests/musicbrainzfe=
tchertest.cpp
index 037b100..8e81003 100644
--- a/src/tests/musicbrainzfetchertest.cpp
+++ b/src/tests/musicbrainzfetchertest.cpp
@@ -25,19 +25,17 @@
 #undef QT_NO_CAST_FROM_ASCII
 =

 #include "musicbrainzfetchertest.h"
-#include "qtest_kde.h"
 =

 #include "../fetch/musicbrainzfetcher.h"
 #include "../collections/musiccollection.h"
 #include "../collectionfactory.h"
 #include "../entry.h"
 #include "../images/imagefactory.h"
+#include "../utils/datafileregistry.h"
 =

-#include <KStandardDirs>
+#include <QTest>
 =

-#include <unistd.h>
-
-QTEST_KDEMAIN( MusicBrainzFetcherTest, GUI )
+QTEST_GUILESS_MAIN( MusicBrainzFetcherTest )
 =

 MusicBrainzFetcherTest::MusicBrainzFetcherTest() : AbstractFetcherTest() {
 }
@@ -45,7 +43,7 @@ MusicBrainzFetcherTest::MusicBrainzFetcherTest() : Abstra=
ctFetcherTest() {
 void MusicBrainzFetcherTest::initTestCase() {
   Tellico::RegisterCollection<Tellico::Data::MusicCollection> registerMusi=
c(Tellico::Data::Collection::Album, "album");
   // since we use the importer
-  KGlobal::dirs()->addResourceDir("appdata", QString::fromLatin1(KDESRCDIR=
) + "/../../xslt/");
+  Tellico::DataFileRegistry::self()->addDataLocation(QFINDTESTDATA("../../=
xslt/musicbrainz2tellico.xsl"));
   Tellico::ImageFactory::init();
 =

   m_fieldValues.insert(QLatin1String("title"), QLatin1String("carried alon=
g"));
@@ -76,8 +74,8 @@ void MusicBrainzFetcherTest::testTitle() {
 }
 =

 void MusicBrainzFetcherTest::testKeyword() {
-  // the total test case ends up exceeding the throttle limit so pause
-  usleep(1000 * 1000);
+  // the total test case ends up exceeding the throttle limit so pause for=
 a second
+  QTest::qWait(1000);
 =

   Tellico::Fetch::FetchRequest request(Tellico::Data::Collection::Album, T=
ellico::Fetch::Keyword,
                                        m_fieldValues.value(QLatin1String("=
title")));

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