From 32fe732f645e00632cb8b795db35f6ad41018711 Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Thu, 16 Apr 2015 18:54:42 +0200
Subject: [PATCH] Adapt clementine tests to qt5

---
 CMakeLists.txt                      | 2 +-
 tests/CMakeLists.txt                | 1 +
 tests/main.cpp                      | 2 +-
 tests/mock_networkaccessmanager.cpp | 6 ++++--
 tests/zeroconf_test.cpp             | 4 ++--
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0b2aa1b8..675143b6b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@ endif (UNIX AND NOT APPLE)
 
 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)
 if(X11_FOUND)
   find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 95c954d00..617704241 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -100,6 +100,7 @@ macro(add_test_file test_source gui_required)
       ${test_source}
     )
     target_link_libraries(${TEST_NAME} ${GMOCK_LIBRARIES} clementine_lib test_utils)
+    qt5_use_modules (${TEST_NAME} Test)
     set(GUI_REQUIRED ${gui_required})
     if (GUI_REQUIRED)
       target_link_libraries(${TEST_NAME} test_gui_main)
diff --git a/tests/main.cpp b/tests/main.cpp
index eb058fbc6..036e02111 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -25,7 +25,7 @@
 
 #ifndef Q_WS_X11
 # include <QtPlugin>
-  Q_IMPORT_PLUGIN(qsqlite)
+  Q_IMPORT_PLUGIN(QSQLiteDriverPlugin)
 #endif
 
 int main(int argc, char** argv) {
diff --git a/tests/mock_networkaccessmanager.cpp b/tests/mock_networkaccessmanager.cpp
index 64d6d5f68..bb0224d39 100644
--- a/tests/mock_networkaccessmanager.cpp
+++ b/tests/mock_networkaccessmanager.cpp
@@ -18,6 +18,7 @@
 #include "mock_networkaccessmanager.h"
 
 #include <QtDebug>
+#include <QUrlQuery>
 
 #include <algorithm>
 using std::min;
@@ -44,10 +45,11 @@ class RequestForUrlMatcher : public MatcherInterface<const QNetworkRequest&> {
       return false;
     }
 
+    QUrlQuery url_query(url);
     for (QMap<QString, QString>::const_iterator it = expected_params_.constBegin();
          it != expected_params_.constEnd(); ++it) {
-      if (!url.hasQueryItem(it.key()) ||
-          url.queryItemValue(it.key()) != it.value()) {
+      if (!url_query.hasQueryItem(it.key()) ||
+          url_query.queryItemValue(it.key()) != it.value()) {
         return false;
       }
     }
diff --git a/tests/zeroconf_test.cpp b/tests/zeroconf_test.cpp
index 3448f8221..973953e25 100644
--- a/tests/zeroconf_test.cpp
+++ b/tests/zeroconf_test.cpp
@@ -21,7 +21,7 @@ static const char kLongMultiByteString[] =
 
 TEST(ZeroconfTest, TruncatesAscii) {
   QByteArray truncated = Zeroconf::TruncateName(
-      QString::fromAscii(k64CharAscii));
+      QString::fromLatin1(k64CharAscii));
   EXPECT_EQ(63, truncated.size());
   EXPECT_TRUE(truncated.endsWith('\0'));
 }
@@ -34,7 +34,7 @@ TEST(ZeroconfTest, DoesNotTruncateShortMultiByteUTF8) {
 
 TEST(ZeroconfTest, TruncatesLongMultiByteUTF8) {
   QByteArray truncated = Zeroconf::TruncateName(
-      QString::fromAscii(kLongMultiByteString));
+      QString::fromLatin1(kLongMultiByteString));
   EXPECT_LE(63, truncated.size());
   EXPECT_TRUE(truncated.endsWith('\0'));
 }