[quarkplayer] r1442 committed - Improve tests

[quark...@googlecode.com]

Revision: 1442
Author: tkrotoff
Date: Mon Dec 19 07:09:54 2011
Log: Improve tests
http://code.google.com/p/quarkplayer/source/detail?r=1442

Modified:
/trunk/3rdparty/mediainfo/MediaInfo/CMakeLists.txt
/trunk/libs/ContentFetcher/LyricsFetcher.cpp
/trunk/tests/libs/ContentFetcher/AmazonCoverArtTest.cpp
/trunk/tests/libs/ContentFetcher/LyricsFetcherTest.cpp
/trunk/tests/libs/ContentFetcher/WikipediaArticleTest.cpp

=======================================
--- /trunk/3rdparty/mediainfo/MediaInfo/CMakeLists.txt Fri Jul 9 10:11:41
2010
+++ /trunk/3rdparty/mediainfo/MediaInfo/CMakeLists.txt Mon Dec 19 07:09:54
2011
@@ -180,6 +180,7 @@
set_target_properties(MediaInfo PROPERTIES
VERSION ${MEDIAINFO_VERSION}
SOVERSION ${MEDIAINFO_MAJOR_VERSION}
+ PREFIX ""
)

install(TARGETS MediaInfo ${INSTALL_TARGETS_DEFAULT_ARGS})
=======================================
--- /trunk/libs/ContentFetcher/LyricsFetcher.cpp Fri Aug 13 02:18:04 2010
+++ /trunk/libs/ContentFetcher/LyricsFetcher.cpp Mon Dec 19 07:09:54 2011
@@ -1,6 +1,6 @@
/*
* QuarkPlayer, a Phonon media player
- * Copyright (C) 2008-2010 Tanguy Krotoff <tkro...@gmail.com>
+ * Copyright (C) 2008-2011 Tanguy Krotoff <tkro...@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
published by
@@ -113,6 +113,7 @@
connect(_lyricsDownloader, SIGNAL(finished(QNetworkReply *)),
SLOT(gotLyrics(QNetworkReply *)));
_lyricsDownloader->get(QNetworkRequest(QUrl::fromEncoded(url.toAscii(),
QUrl::StrictMode)));
+ //Fuck here with QUrl::fromEncoded()
}

void LyricsFetcher::gotLyrics(QNetworkReply * reply) {
=======================================
--- /trunk/tests/libs/ContentFetcher/AmazonCoverArtTest.cpp Tue Feb 22
06:23:18 2011
+++ /trunk/tests/libs/ContentFetcher/AmazonCoverArtTest.cpp Mon Dec 19
07:09:54 2011
@@ -30,7 +30,16 @@
//Your Secret Access Key:
static const char * AMAZON_WEB_SERVICE_SECRET_KEY
= "RfD3RoKwZ+5GpJa/i03jhoiDZM26OAc+TPpXMps0";

+void disableMessageOutput(QtMsgType type, const char * msg) {
+ Q_UNUSED(type);
+ Q_UNUSED(msg);
+}
+
void AmazonCoverArtTest::initTestCase() {
+ //Disable qDebug() and friends
+ qInstallMsgHandler(disableMessageOutput);
+ ///
+
_amazonCoverArt = new AmazonCoverArt(AMAZON_WEB_SERVICE_ACCESS_KEY_ID,
AMAZON_WEB_SERVICE_SECRET_KEY, this);
connect(_amazonCoverArt,
SIGNAL(finished(QNetworkReply::NetworkError, const QUrl &, const
QByteArray &, const ContentFetcherTrack &)),
@@ -53,28 +62,28 @@

QTest::newRow("Michael Jackson") << "Michael Jackson" << "Off the Wall"
<< ""
<< static_cast<int>(QNetworkReply::NoError)
- << QRegExp("http://ecx.images-amazon.com/images/I/51mV9uUEKcL.jpg")
- << 44481;
+ << QRegExp("^http://ecx.images-amazon.com/images/I/.*.jpg$")
+ << 42381;

QTest::newRow("Noir Désir") << "Noir Désir" << "666.667 Club" << ""
<< static_cast<int>(QNetworkReply::NoError)
- << QRegExp("http://ecx.images-amazon.com/images/I/51me4zSIBML.jpg")
- << 61027;
+ << QRegExp("^http://ecx.images-amazon.com/images/I/.*.jpg$")
+ << 45356;

QTest::newRow("Non existing") << "Non existing artist" << "Non existing
album" << ""
<< static_cast<int>(QNetworkReply::ContentNotFoundError)
- << QRegExp("http://webservices.amazon.com/onca/xml.*")
+ << QRegExp("^http://webservices.amazon.com/onca/xml.*")
<< 0;

QTest::newRow("Empty") << "" << "" << ""
<< static_cast<int>(QNetworkReply::ContentNotFoundError)
- << QRegExp("http://webservices.amazon.com/onca/xml.*")
+ << QRegExp("^http://webservices.amazon.com/onca/xml.*$")
<< 0;

QTest::newRow("ASIN") << "" << "" << "B00005QGAT"
<< static_cast<int>(QNetworkReply::NoError)
- << QRegExp("http://ecx.images-amazon.com/images/I/51mV9uUEKcL.jpg")
- << 44481;
+ << QRegExp("^http://ecx.images-amazon.com/images/I/.*.jpg$")
+ << 42381;
}

void AmazonCoverArtTest::fetch() {
=======================================
--- /trunk/tests/libs/ContentFetcher/LyricsFetcherTest.cpp Tue Feb 22
06:23:18 2011
+++ /trunk/tests/libs/ContentFetcher/LyricsFetcherTest.cpp Mon Dec 19
07:09:54 2011
Binary file, no diff available.
=======================================
--- /trunk/tests/libs/ContentFetcher/WikipediaArticleTest.cpp Tue Feb 22
06:23:18 2011
+++ /trunk/tests/libs/ContentFetcher/WikipediaArticleTest.cpp Mon Dec 19
07:09:54 2011
@@ -24,7 +24,16 @@

QTEST_MAIN(WikipediaArticleTest)

+void disableMessageOutput(QtMsgType type, const char * msg) {
+ Q_UNUSED(type);
+ Q_UNUSED(msg);
+}
+
void WikipediaArticleTest::initTestCase() {
+ //Disable qDebug() and friends
+ qInstallMsgHandler(disableMessageOutput);
+ ///
+
_wikipediaArticle = new WikipediaArticle(this);
connect(_wikipediaArticle,
SIGNAL(finished(QNetworkReply::NetworkError, const QUrl &, const
QByteArray &, const ContentFetcherTrack &)),