Fix unit tests
This commit is contained in:
@@ -20,7 +20,11 @@
|
||||
|
||||
#include <gmock/gmock.h>
|
||||
|
||||
#include <QApplication>
|
||||
#ifdef GUI
|
||||
# include <QApplication>
|
||||
#else
|
||||
# include <QCoreApplication>
|
||||
#endif
|
||||
|
||||
#include "logging_env.h"
|
||||
#include "metatypes_env.h"
|
||||
|
||||
@@ -21,6 +21,8 @@
|
||||
#ifndef MOCK_NETWORKACCESSMANAGER_H
|
||||
#define MOCK_NETWORKACCESSMANAGER_H
|
||||
|
||||
#include <gmock/gmock.h>
|
||||
|
||||
#include <QtGlobal>
|
||||
#include <QMap>
|
||||
#include <QByteArray>
|
||||
@@ -29,7 +31,6 @@
|
||||
#include <QNetworkReply>
|
||||
|
||||
#include "test_utils.h"
|
||||
#include "gmock/gmock.h"
|
||||
|
||||
// Usage:
|
||||
// Create a MockNetworkAccessManager.
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
#include <QUrl>
|
||||
|
||||
#include "core/song.h"
|
||||
#include "core/settingsprovider.h"
|
||||
#include "core/sqlrow.h"
|
||||
#include "playlist/playlistitem.h"
|
||||
|
||||
|
||||
@@ -21,10 +21,10 @@
|
||||
#ifndef MOCK_SETTINGSPROVIDER_H
|
||||
#define MOCK_SETTINGSPROVIDER_H
|
||||
|
||||
#include "core/settingsprovider.h"
|
||||
|
||||
#include <gmock/gmock.h>
|
||||
|
||||
#include "core/settingsprovider.h"
|
||||
|
||||
// clazy:excludeall=function-args-by-value
|
||||
|
||||
class MockSettingsProvider : public SettingsProvider {
|
||||
|
||||
@@ -34,9 +34,6 @@ class ResourcesEnvironment : public ::testing::Environment {
|
||||
Q_INIT_RESOURCE(data);
|
||||
Q_INIT_RESOURCE(icons);
|
||||
Q_INIT_RESOURCE(testdata);
|
||||
#ifdef HAVE_TRANSLATIONS
|
||||
Q_INIT_RESOURCE(translations);
|
||||
#endif
|
||||
}
|
||||
private:
|
||||
Q_DISABLE_COPY(ResourcesEnvironment)
|
||||
|
||||
Reference in New Issue
Block a user