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

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

Git commit 13fd136cd29b98ae803fe2c1086c8c8e6261a2d7 by Robby Stephenson.
Committed on 30/05/2015 at 12:14.
Pushed by rstephenson into branch 'frameworks'.

update googlescholarfetchertest

M  +5    -2    src/tests/CMakeLists.txt
M  +0    -1    src/tests/bibtextest.cpp
M  +4    -4    src/tests/googlescholarfetchertest.cpp

http://commits.kde.org/tellico/13fd136cd29b98ae803fe2c1086c8c8e6261a2d7

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 847b0a8..035b189 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -510,11 +510,14 @@ add_test(giantbombfetchertest giantbombfetchertest)
 ecm_mark_as_test(giantbombfetchertest)
 TARGET_LINK_LIBRARIES(giantbombfetchertest fetcherstest tellicomodels ${TE=
LLICO2_TEST_LIBS})
 =

-add_executable(googlescholarfetchertest googlescholarfetchertest.cpp abstr=
actfetchertest.cpp)
+add_executable(googlescholarfetchertest googlescholarfetchertest.cpp abstr=
actfetchertest.cpp
+  ../fetch/googlescholarfetcher.cpp
+  ../translators/bibteximporter.cpp
+)
 ecm_mark_nongui_executable(googlescholarfetchertest)
 add_test(googlescholarfetchertest googlescholarfetchertest)
 ecm_mark_as_test(googlescholarfetchertest)
-TARGET_LINK_LIBRARIES(googlescholarfetchertest fetch ${TELLICO_TEST_LIBS})
+TARGET_LINK_LIBRARIES(googlescholarfetchertest fetcherstest tellicomodels =
${TELLICO_BTPARSE_LIBS} ${TELLICO2_TEST_LIBS})
 =

 add_executable(ibsfetchertest ibsfetchertest.cpp abstractfetchertest.cpp)
 ecm_mark_nongui_executable(ibsfetchertest)
diff --git a/src/tests/bibtextest.cpp b/src/tests/bibtextest.cpp
index 6777774..b805fa7 100644
--- a/src/tests/bibtextest.cpp
+++ b/src/tests/bibtextest.cpp
@@ -42,7 +42,6 @@ QTEST_GUILESS_MAIN( BibtexTest )
 =

 void BibtexTest::initTestCase() {
   // since we use the bibtex mapping file
-//  KGlobal::dirs()->addResourceDir("appdata", QFINDTESTDATA("../translato=
rs/"));
   Tellico::DataFileRegistry::self()->addDataLocation(QFINDTESTDATA("../tra=
nslators/bibtex-translation.xml"));
 }
 =

diff --git a/src/tests/googlescholarfetchertest.cpp b/src/tests/googleschol=
arfetchertest.cpp
index defc9fe..03e50e8 100644
--- a/src/tests/googlescholarfetchertest.cpp
+++ b/src/tests/googlescholarfetchertest.cpp
@@ -25,17 +25,17 @@
 #undef QT_NO_CAST_FROM_ASCII
 =

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

 #include "../fetch/googlescholarfetcher.h"
 #include "../entry.h"
 #include "../collections/bibtexcollection.h"
 #include "../collectionfactory.h"
 #include "../utils/bibtexhandler.h"
+#include "../utils/datafileregistry.h"
 =

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

-QTEST_KDEMAIN( GoogleScholarFetcherTest, GUI )
+QTEST_GUILESS_MAIN( GoogleScholarFetcherTest )
 =

 GoogleScholarFetcherTest::GoogleScholarFetcherTest() : AbstractFetcherTest=
() {
 }
@@ -43,7 +43,7 @@ GoogleScholarFetcherTest::GoogleScholarFetcherTest() : Ab=
stractFetcherTest() {
 void GoogleScholarFetcherTest::initTestCase() {
   Tellico::RegisterCollection<Tellico::Data::BibtexCollection> registerBib=
tex(Tellico::Data::Collection::Bibtex, "bibtex");
   // since we use the bibtex importer
-  KGlobal::dirs()->addResourceDir("appdata", QString::fromLatin1(KDESRCDIR=
) + "/../translators/");
+  Tellico::DataFileRegistry::self()->addDataLocation(QFINDTESTDATA("../tra=
nslators/bibtex-translation.xml"));
 =

   m_fieldValues.insert(QLatin1String("entry-type"), QLatin1String("article=
"));
   m_fieldValues.insert(QLatin1String("title"), QLatin1String("Speeding up =
the Hybrid Monte Carlo algorithm for dynamical fermions"));

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