Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Adapt clementine tests to qt5

This commit is contained in:
Chocobozzz 2015-04-16 18:54:42 +02:00
parent 8bafaced14
commit 32fe732f64
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -35,7 +35,7 @@ endif (UNIX AND NOT APPLE)
set(QT_MIN_VERSION 5.0.0) set(QT_MIN_VERSION 5.0.0)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core OpenGL Sql Network Xml Widgets Concurrent) find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core OpenGL Sql Network Xml Widgets Concurrent Test)
find_package(X11) find_package(X11)
if(X11_FOUND) if(X11_FOUND)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras) find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras)

1
tests/CMakeLists.txt
View File

@ -100,6 +100,7 @@ macro(add_test_file test_source gui_required)
${test_source} ${test_source}
) )
target_link_libraries(${TEST_NAME} ${GMOCK_LIBRARIES} clementine_lib test_utils) target_link_libraries(${TEST_NAME} ${GMOCK_LIBRARIES} clementine_lib test_utils)
qt5_use_modules (${TEST_NAME} Test)
set(GUI_REQUIRED ${gui_required}) set(GUI_REQUIRED ${gui_required})
if (GUI_REQUIRED) if (GUI_REQUIRED)
target_link_libraries(${TEST_NAME} test_gui_main) target_link_libraries(${TEST_NAME} test_gui_main)

2
tests/main.cpp
View File

@ -25,7 +25,7 @@
#ifndef Q_WS_X11 #ifndef Q_WS_X11
# include <QtPlugin> # include <QtPlugin>
Q_IMPORT_PLUGIN(qsqlite) Q_IMPORT_PLUGIN(QSQLiteDriverPlugin)
#endif #endif
int main(int argc, char** argv) { int main(int argc, char** argv) {

6
tests/mock_networkaccessmanager.cpp
View File

@ -18,6 +18,7 @@
#include "mock_networkaccessmanager.h" #include "mock_networkaccessmanager.h"
#include <QtDebug> #include <QtDebug>
#include <QUrlQuery>
#include <algorithm> #include <algorithm>
using std::min; using std::min;
@ -44,10 +45,11 @@ class RequestForUrlMatcher : public MatcherInterface<const QNetworkRequest&> {
return false; return false;
} }
QUrlQuery url_query(url);
for (QMap<QString, QString>::const_iterator it = expected_params_.constBegin(); for (QMap<QString, QString>::const_iterator it = expected_params_.constBegin();
it != expected_params_.constEnd(); ++it) { it != expected_params_.constEnd(); ++it) {
if (!url.hasQueryItem(it.key()) || if (!url_query.hasQueryItem(it.key()) ||
url.queryItemValue(it.key()) != it.value()) { url_query.queryItemValue(it.key()) != it.value()) {
return false; return false;
} }
} }

4
tests/zeroconf_test.cpp
View File

@ -21,7 +21,7 @@ static const char kLongMultiByteString[] =
TEST(ZeroconfTest, TruncatesAscii) { TEST(ZeroconfTest, TruncatesAscii) {
QByteArray truncated = Zeroconf::TruncateName( QByteArray truncated = Zeroconf::TruncateName(
QString::fromAscii(k64CharAscii)); QString::fromLatin1(k64CharAscii));
EXPECT_EQ(63, truncated.size()); EXPECT_EQ(63, truncated.size());
EXPECT_TRUE(truncated.endsWith('\0')); EXPECT_TRUE(truncated.endsWith('\0'));
} }
@ -34,7 +34,7 @@ TEST(ZeroconfTest, DoesNotTruncateShortMultiByteUTF8) {
TEST(ZeroconfTest, TruncatesLongMultiByteUTF8) { TEST(ZeroconfTest, TruncatesLongMultiByteUTF8) {
QByteArray truncated = Zeroconf::TruncateName( QByteArray truncated = Zeroconf::TruncateName(
QString::fromAscii(kLongMultiByteString)); QString::fromLatin1(kLongMultiByteString));
EXPECT_LE(63, truncated.size()); EXPECT_LE(63, truncated.size());
EXPECT_TRUE(truncated.endsWith('\0')); EXPECT_TRUE(truncated.endsWith('\0'));
} }