dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compile warnings in tests

Browse Source
This commit is contained in:
Jonas Kvinge
2020-04-23 21:01:34 +02:00
parent f0b529952d
commit a1eadecdef
8 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/src/closure_test.cpp
View File

@@ -18,6 +18,7 @@ TEST(ClosureTest, ClosureInvokesReceiver) {
TestQObject sender; TestQObject sender;
TestQObject receiver; TestQObject receiver;
_detail::ClosureBase* closure = NewClosure(&sender, SIGNAL(Emitted()), &receiver, SLOT(Invoke())); _detail::ClosureBase* closure = NewClosure(&sender, SIGNAL(Emitted()), &receiver, SLOT(Invoke()));
Q_UNUSED(closure);
EXPECT_EQ(0, receiver.invoked()); EXPECT_EQ(0, receiver.invoked());
sender.Emit(); sender.Emit();
EXPECT_EQ(1, receiver.invoked()); EXPECT_EQ(1, receiver.invoked());

4
tests/src/collectionmodel_test.cpp
View File

@@ -58,8 +58,8 @@ class CollectionModelTest : public ::testing::Test {
Song AddSong(Song& song) { Song AddSong(Song& song) {
song.set_directory_id(1); song.set_directory_id(1);
if (song.mtime() == -1) song.set_mtime(1); if (song.mtime() == 0) song.set_mtime(1);
if (song.ctime() == -1) song.set_ctime(1); if (song.ctime() == 0) song.set_ctime(1);
if (song.url().isEmpty()) song.set_url(QUrl("file:///tmp/foo")); if (song.url().isEmpty()) song.set_url(QUrl("file:///tmp/foo"));
if (song.filesize() == -1) song.set_filesize(1); if (song.filesize() == -1) song.set_filesize(1);

7
tests/src/concurrentrun_test.cpp
View File

@@ -9,6 +9,7 @@
#include "core/concurrentrun.h" #include "core/concurrentrun.h"
#include "test_utils.h" #include "test_utils.h"
int f();
int f() { int f() {
return 1337; return 1337;
} }
@@ -26,6 +27,7 @@ TEST(ConcurrentRunTest, ConcurrentRun0StartAndWait) {
} }
int g(int i);
int g(int i) { int g(int i) {
return ++i; return ++i;
} }
@@ -44,6 +46,7 @@ TEST(ConcurrentRunTest, ConcurrentRun1StartAndWait) {
} }
int max(int i, int j);
int max(int i, int j) { int max(int i, int j) {
return (i > j ? i : j); return (i > j ? i : j);
} }
@@ -63,6 +66,7 @@ TEST(ConcurrentRunTest, ConcurrentRun2StartAndWait) {
} }
int sum(int a, int b, int c);
int sum(int a, int b, int c) { int sum(int a, int b, int c) {
return a + b + c; return a + b + c;
} }
@@ -83,15 +87,18 @@ TEST(ConcurrentRunTest, ConcurrentRun3StartAndWait) {
} }
void aFunction(int* n);
void aFunction(int* n) { void aFunction(int* n) {
*n = 1337; *n = 1337;
} }
void bFunction(int* n, int *m);
void bFunction(int* n, int *m) { void bFunction(int* n, int *m) {
aFunction(n); aFunction(n);
*m = 1338; *m = 1338;
} }
void cFunction(int* n, int *m, int *o);
void cFunction(int* n, int *m, int *o) { void cFunction(int* n, int *m, int *o) {
bFunction(n, m); bFunction(n, m);
*o = 1339; *o = 1339;

2
tests/src/mock_networkaccessmanager.cpp
View File

@@ -118,7 +118,7 @@ qint64 MockNetworkReply::readData(char* data, qint64 size) {
} }
qint64 MockNetworkReply::writeData(const char* data, qint64) { qint64 MockNetworkReply::writeData(const char*, qint64) {
ADD_FAILURE() << "Something tried to write to a QNetworkReply"; ADD_FAILURE() << "Something tried to write to a QNetworkReply";
return -1; return -1;

2
tests/src/mock_playlistitem.h
View File

@@ -43,7 +43,7 @@ class MockPlaylistItem : public PlaylistItem {
MOCK_CONST_METHOD0(Url, QUrl()); MOCK_CONST_METHOD0(Url, QUrl());
MOCK_METHOD1(SetTemporaryMetadata, void(const Song& metadata)); MOCK_METHOD1(SetTemporaryMetadata, void(const Song& metadata));
MOCK_METHOD0(ClearTemporaryMetadata, void()); MOCK_METHOD0(ClearTemporaryMetadata, void());
MOCK_METHOD1(DatabaseValue, QVariant(DatabaseColumn)); //MOCK_METHOD1(DatabaseValue, QVariant(DatabaseColumn));
}; };

2
tests/src/mock_settingsprovider.h
View File

@@ -40,7 +40,7 @@ class DummySettingsProvider : public SettingsProvider {
public: public:
DummySettingsProvider() {} DummySettingsProvider() {}
void set_group(const char *group) {} void set_group(const char*) {}
QVariant value(const QString&, const QVariant& = QVariant()) const { return QVariant(); } QVariant value(const QString&, const QVariant& = QVariant()) const { return QVariant(); }
void setValue(const QString&, const QVariant&) {} void setValue(const QString&, const QVariant&) {}

7
tests/src/playlist_test.cpp
View File

@@ -53,10 +53,11 @@ class PlaylistTest : public ::testing::Test {
Song metadata; Song metadata;
metadata.Init(title, artist, album, length); metadata.Init(title, artist, album, length);
MockPlaylistItem* ret = new MockPlaylistItem; //MockPlaylistItem* ret = new MockPlaylistItem;
EXPECT_CALL(*ret, Metadata()).WillRepeatedly(Return(metadata)); //EXPECT_CALL(*ret, Metadata()).WillRepeatedly(Return(metadata));
return ret; //return ret;
return nullptr;
} }
std::shared_ptr<PlaylistItem> MakeMockItemP(const QString& title, const QString& artist = QString(), const QString& album = QString(), int length = 123) const { std::shared_ptr<PlaylistItem> MakeMockItemP(const QString& title, const QString& artist = QString(), const QString& album = QString(), int length = 123) const {

2
tests/src/test_utils.h
View File

@@ -58,7 +58,7 @@ void PrintTo(const ::QUrl& url, std::ostream& os);
#define EXPOSE_SIGNAL2(n, t1, t2) \ #define EXPOSE_SIGNAL2(n, t1, t2) \
void Emit##n(const t1& a1, const t2& a2) { emit n(a1, a2); } void Emit##n(const t1& a1, const t2& a2) { emit n(a1, a2); }
Q_DECLARE_METATYPE(QModelIndex); Q_DECLARE_METATYPE(QModelIndex)
class TemporaryResource : public QTemporaryFile { class TemporaryResource : public QTemporaryFile {
public: public: