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

Use C++11 enum class

Browse Source
This commit is contained in:
Jonas Kvinge
2023-02-18 14:09:27 +01:00
parent e6c5f76872
commit dd72fb4ca5
237 changed files with 2915 additions and 2840 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/src/collectionbackend_test.cpp
View File

@@ -46,7 +46,7 @@ class CollectionBackendTest : public ::testing::Test {
void SetUp() override {
database_.reset(new MemoryDatabase(nullptr));
backend_ = std::make_unique<CollectionBackend>();
backend_->Init(database_.get(), nullptr, Song::Source_Collection, SCollection::kSongsTable, SCollection::kFtsTable, SCollection::kDirsTable, SCollection::kSubdirsTable);
backend_->Init(database_.get(), nullptr, Song::Source::Collection, SCollection::kSongsTable, SCollection::kFtsTable, SCollection::kDirsTable, SCollection::kSubdirsTable);
}
static Song MakeDummySong(int directory_id) {
@@ -372,7 +372,7 @@ TEST_F(TestUrls, TestUrls) {
EXPECT_EQ(url, QUrl::fromEncoded(url.toString(QUrl::FullyEncoded).toUtf8()));
EXPECT_EQ(url.toString(QUrl::FullyEncoded), url.toEncoded());
Song song(Song::Source_Collection);
Song song(Song::Source::Collection);
song.set_directory_id(1);
song.set_title("Test Title");
song.set_album("Test Album");
@@ -456,7 +456,7 @@ TEST_F(UpdateSongsBySongID, UpdateSongsBySongID) {
url.setScheme("file");
url.setPath("/music/" + song_id);
Song song(Song::Source_Collection);
Song song(Song::Source::Collection);
song.set_song_id(song_id);
song.set_directory_id(1);
song.set_title("Test Title " + song_id);
@@ -500,7 +500,7 @@ TEST_F(UpdateSongsBySongID, UpdateSongsBySongID) {
EXPECT_EQ(songs.count(), song_ids.count());
for (QMap<QString, Song>::const_iterator it = songs.constBegin() ; it != songs.constEnd() ; ++it) {
for (SongMap::const_iterator it = songs.constBegin() ; it != songs.constEnd() ; ++it) {
EXPECT_EQ(it.key(), it.value().song_id());
}
@@ -527,7 +527,7 @@ TEST_F(UpdateSongsBySongID, UpdateSongsBySongID) {
url.setScheme("file");
url.setPath("/music/" + song_id);
Song song(Song::Source_Collection);
Song song(Song::Source::Collection);
song.set_song_id(song_id);
song.set_directory_id(1);
song.set_title("Test Title " + song_id);
@@ -572,7 +572,7 @@ TEST_F(UpdateSongsBySongID, UpdateSongsBySongID) {
url.setScheme("file");
url.setPath("/music/" + song_id);
Song song(Song::Source_Collection);
Song song(Song::Source::Collection);
song.set_song_id(song_id);
song.set_directory_id(1);
song.set_title("Test Title " + song_id);

26
tests/src/collectionmodel_test.cpp
View File

@@ -51,7 +51,7 @@ class CollectionModelTest : public ::testing::Test {
void SetUp() override {
database_ = std::make_shared<MemoryDatabase>(nullptr);
backend_ = std::make_unique<CollectionBackend>();
backend_->Init(database_.get(), nullptr, Song::Source_Collection, SCollection::kSongsTable, SCollection::kFtsTable, SCollection::kDirsTable, SCollection::kSubdirsTable);
backend_->Init(database_.get(), nullptr, Song::Source::Collection, SCollection::kSongsTable, SCollection::kFtsTable, SCollection::kDirsTable, SCollection::kSubdirsTable);
model_ = std::make_unique<CollectionModel>(backend_.get(), nullptr);
added_dir_ = false;
@@ -359,7 +359,7 @@ TEST_F(CollectionModelTest, TestContainerNodes) {
int year = 1960;
// Add some normal albums.
for (int artist_number = 1; artist_number <= 3 ; ++artist_number) {
Song song(Song::Source_Collection);
Song song(Song::Source::Collection);
song.set_artist(QString("Artist %1").arg(artist_number));
song.set_composer(QString("Composer %1").arg(artist_number));
song.set_performer(QString("Performer %1").arg(artist_number));
@@ -385,7 +385,7 @@ TEST_F(CollectionModelTest, TestContainerNodes) {
// Add some albums with 'album artist'.
for (int album_artist_number = 1; album_artist_number <= 3 ; ++album_artist_number) {
Song song(Song::Source_Collection);
Song song(Song::Source::Collection);
song.set_albumartist(QString("Album Artist %1").arg(album_artist_number));
song.set_composer(QString("Composer %1").arg(album_artist_number));
song.set_performer(QString("Performer %1").arg(album_artist_number));
@@ -415,7 +415,7 @@ TEST_F(CollectionModelTest, TestContainerNodes) {
// Add some compilation albums.
for (int album_number = 1; album_number <= 3 ; ++album_number) {
if (year > 2020) year = 1960;
Song song(Song::Source_Collection);
Song song(Song::Source::Collection);
song.set_mtime(1);
song.set_ctime(1);
song.set_directory_id(1);
@@ -441,7 +441,7 @@ TEST_F(CollectionModelTest, TestContainerNodes) {
// Songs with only title
{
Song song(Song::Source_Collection);
Song song(Song::Source::Collection);
song.set_mtime(1);
song.set_ctime(1);
song.set_directory_id(1);
@@ -457,7 +457,7 @@ TEST_F(CollectionModelTest, TestContainerNodes) {
// Song with only artist, album and title.
{
Song song(Song::Source_Collection);
Song song(Song::Source::Collection);
song.set_url(QUrl(QString("file:///tmp/artist-album-title-song")));
song.set_artist("Not Only Artist");
song.set_album("Not Only Album");
@@ -474,7 +474,7 @@ TEST_F(CollectionModelTest, TestContainerNodes) {
// Add possible Various artists conflicting songs.
{
Song song(Song::Source_Collection);
Song song(Song::Source::Collection);
song.set_url(QUrl(QString("file:///tmp/song-va-conflicting-1")));
song.set_artist("Various artists");
song.set_album("VA Album");
@@ -490,7 +490,7 @@ TEST_F(CollectionModelTest, TestContainerNodes) {
}
{
Song song(Song::Source_Collection);
Song song(Song::Source::Collection);
song.set_url(QUrl(QString("file:///tmp/song-va-conflicting-2")));
song.set_artist("Various artists");
song.set_albumartist("Various artists");
@@ -507,7 +507,7 @@ TEST_F(CollectionModelTest, TestContainerNodes) {
}
{
Song song(Song::Source_Collection);
Song song(Song::Source::Collection);
song.set_url(QUrl(QString("file:///tmp/song-va-conflicting-3")));
song.set_albumartist("Various artists");
song.set_album("VA Album");
@@ -524,7 +524,7 @@ TEST_F(CollectionModelTest, TestContainerNodes) {
// Albums with Album ID.
for (int album_id = 0; album_id <= 2 ; ++album_id) {
Song song(Song::Source_Collection);
Song song(Song::Source::Collection);
song.set_url(QUrl(QString("file:///tmp/song-with-album-id-1")));
song.set_artist("Artist with Album ID");
song.set_album(QString("Album %1 with Album ID").arg(album_id));
@@ -564,9 +564,9 @@ TEST_F(CollectionModelTest, TestContainerNodes) {
backend1 = std::make_unique<CollectionBackend>();
backend2= std::make_unique<CollectionBackend>();
backend3 = std::make_unique<CollectionBackend>();
backend1->Init(database1.get(), Song::Source_Collection, SCollection::kSongsTable, SCollection::kFtsTable, SCollection::kDirsTable, SCollection::kSubdirsTable);
backend2->Init(database2.get(), Song::Source_Collection, SCollection::kSongsTable, SCollection::kFtsTable, SCollection::kDirsTable, SCollection::kSubdirsTable);
backend3->Init(database3.get(), Song::Source_Collection, SCollection::kSongsTable, SCollection::kFtsTable, SCollection::kDirsTable, SCollection::kSubdirsTable);
backend1->Init(database1.get(), Song::Source::Collection, SCollection::kSongsTable, SCollection::kFtsTable, SCollection::kDirsTable, SCollection::kSubdirsTable);
backend2->Init(database2.get(), Song::Source::Collection, SCollection::kSongsTable, SCollection::kFtsTable, SCollection::kDirsTable, SCollection::kSubdirsTable);
backend3->Init(database3.get(), Song::Source::Collection, SCollection::kSongsTable, SCollection::kFtsTable, SCollection::kDirsTable, SCollection::kSubdirsTable);
model1 = std::make_unique<CollectionModel>(backend1.get(), nullptr);
model2 = std::make_unique<CollectionModel>(backend2.get(), nullptr);
model3 = std::make_unique<CollectionModel>(backend3.get(), nullptr);

8
tests/src/metatypes_env.h
View File

@@ -34,10 +34,10 @@ class MetatypesEnvironment : public ::testing::Environment {
public:
MetatypesEnvironment() = default;
void SetUp() override {
qRegisterMetaType<CollectionDirectory>("Directory");
qRegisterMetaType<CollectionDirectoryList>("DirectoryList");
qRegisterMetaType<CollectionSubdirectory>("Subdirectory");
qRegisterMetaType<CollectionSubdirectoryList>("SubdirectoryList");
qRegisterMetaType<CollectionDirectory>("CollectionDirectory");
qRegisterMetaType<CollectionDirectoryList>("CollectionDirectoryList");
qRegisterMetaType<CollectionSubdirectory>("CollectionSubdirectory");
qRegisterMetaType<CollectionSubdirectoryList>("CollectionSubdirectoryList");
qRegisterMetaType<SongList>("SongList");
qRegisterMetaType<QModelIndex>("QModelIndex");
qRegisterMetaType<SongLoader::Result>("SongLoader::Result");

2
tests/src/mock_playlistitem.cpp
View File

@@ -22,4 +22,4 @@
#include "mock_playlistitem.h"
MockPlaylistItem::MockPlaylistItem() : PlaylistItem(Song::Source_LocalFile) {}
MockPlaylistItem::MockPlaylistItem() : PlaylistItem(Song::Source::LocalFile) {}

56
tests/src/playlist_test.cpp
View File

@@ -81,7 +81,7 @@ TEST_F(PlaylistTest, InsertItems) {
// Insert the item
EXPECT_EQ(0, playlist_.rowCount(QModelIndex()));
playlist_.InsertItems(PlaylistItemList() << item_ptr, -1);
playlist_.InsertItems(PlaylistItemPtrList() << item_ptr, -1);
ASSERT_EQ(1, playlist_.rowCount(QModelIndex()));
// Get the metadata
@@ -94,7 +94,7 @@ TEST_F(PlaylistTest, InsertItems) {
TEST_F(PlaylistTest, Indexes) {
playlist_.InsertItems(PlaylistItemList() << MakeMockItemP("One") << MakeMockItemP("Two") << MakeMockItemP("Three"));
playlist_.InsertItems(PlaylistItemPtrList() << MakeMockItemP("One") << MakeMockItemP("Two") << MakeMockItemP("Three"));
ASSERT_EQ(3, playlist_.rowCount(QModelIndex()));
// Start "playing" track 1
@@ -128,10 +128,10 @@ TEST_F(PlaylistTest, Indexes) {
TEST_F(PlaylistTest, RepeatPlaylist) {
playlist_.InsertItems(PlaylistItemList() << MakeMockItemP("One") << MakeMockItemP("Two") << MakeMockItemP("Three"));
playlist_.InsertItems(PlaylistItemPtrList() << MakeMockItemP("One") << MakeMockItemP("Two") << MakeMockItemP("Three"));
ASSERT_EQ(3, playlist_.rowCount(QModelIndex()));
playlist_.sequence()->SetRepeatMode(PlaylistSequence::Repeat_Playlist);
playlist_.sequence()->SetRepeatMode(PlaylistSequence::RepeatMode::Playlist);
playlist_.set_current_row(0);
EXPECT_EQ(1, playlist_.next_row());
@@ -146,10 +146,10 @@ TEST_F(PlaylistTest, RepeatPlaylist) {
TEST_F(PlaylistTest, RepeatTrack) {
playlist_.InsertItems(PlaylistItemList() << MakeMockItemP("One") << MakeMockItemP("Two") << MakeMockItemP("Three"));
playlist_.InsertItems(PlaylistItemPtrList() << MakeMockItemP("One") << MakeMockItemP("Two") << MakeMockItemP("Three"));
ASSERT_EQ(3, playlist_.rowCount(QModelIndex()));
playlist_.sequence()->SetRepeatMode(PlaylistSequence::Repeat_Track);
playlist_.sequence()->SetRepeatMode(PlaylistSequence::RepeatMode::Track);
playlist_.set_current_row(0);
EXPECT_EQ(0, playlist_.next_row());
@@ -158,13 +158,13 @@ TEST_F(PlaylistTest, RepeatTrack) {
TEST_F(PlaylistTest, RepeatAlbum) {
playlist_.InsertItems(PlaylistItemList()
playlist_.InsertItems(PlaylistItemPtrList()
<< MakeMockItemP("One", "Album one")
<< MakeMockItemP("Two", "Album two")
<< MakeMockItemP("Three", "Album one"));
ASSERT_EQ(3, playlist_.rowCount(QModelIndex()));
playlist_.sequence()->SetRepeatMode(PlaylistSequence::Repeat_Album);
playlist_.sequence()->SetRepeatMode(PlaylistSequence::RepeatMode::Album);
playlist_.set_current_row(0);
EXPECT_EQ(2, playlist_.next_row());
@@ -176,7 +176,7 @@ TEST_F(PlaylistTest, RepeatAlbum) {
TEST_F(PlaylistTest, RemoveBeforeCurrent) {
playlist_.InsertItems(PlaylistItemList()
playlist_.InsertItems(PlaylistItemPtrList()
<< MakeMockItemP("One") << MakeMockItemP("Two") << MakeMockItemP("Three"));
ASSERT_EQ(3, playlist_.rowCount(QModelIndex()));
@@ -193,7 +193,7 @@ TEST_F(PlaylistTest, RemoveBeforeCurrent) {
TEST_F(PlaylistTest, RemoveAfterCurrent) {
playlist_.InsertItems(PlaylistItemList()
playlist_.InsertItems(PlaylistItemPtrList()
<< MakeMockItemP("One") << MakeMockItemP("Two") << MakeMockItemP("Three"));
ASSERT_EQ(3, playlist_.rowCount(QModelIndex()));
@@ -213,7 +213,7 @@ TEST_F(PlaylistTest, RemoveAfterCurrent) {
TEST_F(PlaylistTest, RemoveCurrent) {
playlist_.InsertItems(PlaylistItemList() << MakeMockItemP("One") << MakeMockItemP("Two") << MakeMockItemP("Three"));
playlist_.InsertItems(PlaylistItemPtrList() << MakeMockItemP("One") << MakeMockItemP("Two") << MakeMockItemP("Three"));
ASSERT_EQ(3, playlist_.rowCount(QModelIndex()));
// Remove the currently playing track's row
@@ -229,12 +229,12 @@ TEST_F(PlaylistTest, RemoveCurrent) {
TEST_F(PlaylistTest, InsertBeforeCurrent) {
playlist_.InsertItems(PlaylistItemList() << MakeMockItemP("One") << MakeMockItemP("Two") << MakeMockItemP("Three"));
playlist_.InsertItems(PlaylistItemPtrList() << MakeMockItemP("One") << MakeMockItemP("Two") << MakeMockItemP("Three"));
ASSERT_EQ(3, playlist_.rowCount(QModelIndex()));
playlist_.set_current_row(1);
EXPECT_EQ(1, playlist_.current_row());
playlist_.InsertItems(PlaylistItemList() << MakeMockItemP("Four"), 0);
playlist_.InsertItems(PlaylistItemPtrList() << MakeMockItemP("Four"), 0);
ASSERT_EQ(4, playlist_.rowCount(QModelIndex()));
EXPECT_EQ(2, playlist_.current_row());
@@ -249,12 +249,12 @@ TEST_F(PlaylistTest, InsertBeforeCurrent) {
TEST_F(PlaylistTest, InsertAfterCurrent) {
playlist_.InsertItems(PlaylistItemList() << MakeMockItemP("One") << MakeMockItemP("Two") << MakeMockItemP("Three"));
playlist_.InsertItems(PlaylistItemPtrList() << MakeMockItemP("One") << MakeMockItemP("Two") << MakeMockItemP("Three"));
ASSERT_EQ(3, playlist_.rowCount(QModelIndex()));
playlist_.set_current_row(1);
EXPECT_EQ(1, playlist_.current_row());
playlist_.InsertItems(PlaylistItemList() << MakeMockItemP("Four"), 2);
playlist_.InsertItems(PlaylistItemPtrList() << MakeMockItemP("Four"), 2);
ASSERT_EQ(4, playlist_.rowCount(QModelIndex()));
EXPECT_EQ(1, playlist_.current_row());
@@ -270,7 +270,7 @@ TEST_F(PlaylistTest, InsertAfterCurrent) {
TEST_F(PlaylistTest, Clear) {
playlist_.InsertItems(PlaylistItemList() << MakeMockItemP("One") << MakeMockItemP("Two") << MakeMockItemP("Three"));
playlist_.InsertItems(PlaylistItemPtrList() << MakeMockItemP("One") << MakeMockItemP("Two") << MakeMockItemP("Three"));
ASSERT_EQ(3, playlist_.rowCount(QModelIndex()));
playlist_.set_current_row(1);
@@ -290,7 +290,7 @@ TEST_F(PlaylistTest, UndoAdd) {
EXPECT_FALSE(playlist_.undo_stack()->canUndo());
EXPECT_FALSE(playlist_.undo_stack()->canRedo());
playlist_.InsertItems(PlaylistItemList() << MakeMockItemP("Title"));
playlist_.InsertItems(PlaylistItemPtrList() << MakeMockItemP("Title"));
EXPECT_EQ(1, playlist_.rowCount(QModelIndex()));
EXPECT_FALSE(playlist_.undo_stack()->canRedo());
ASSERT_TRUE(playlist_.undo_stack()->canUndo());
@@ -312,10 +312,10 @@ TEST_F(PlaylistTest, UndoAdd) {
TEST_F(PlaylistTest, UndoMultiAdd) {
// Add 1 item
playlist_.InsertItems(PlaylistItemList() << MakeMockItemP("One"));
playlist_.InsertItems(PlaylistItemPtrList() << MakeMockItemP("One"));
// Add 2 items
playlist_.InsertItems(PlaylistItemList() << MakeMockItemP("Two") << MakeMockItemP("Three"));
playlist_.InsertItems(PlaylistItemPtrList() << MakeMockItemP("Two") << MakeMockItemP("Three"));
// Undo adding 2 items
ASSERT_TRUE(playlist_.undo_stack()->canUndo());
@@ -336,7 +336,7 @@ TEST_F(PlaylistTest, UndoRemove) {
EXPECT_FALSE(playlist_.undo_stack()->canUndo());
EXPECT_FALSE(playlist_.undo_stack()->canRedo());
playlist_.InsertItems(PlaylistItemList() << MakeMockItemP("Title"));
playlist_.InsertItems(PlaylistItemPtrList() << MakeMockItemP("Title"));
EXPECT_TRUE(playlist_.undo_stack()->canUndo());
EXPECT_FALSE(playlist_.undo_stack()->canRedo());
@@ -363,7 +363,7 @@ TEST_F(PlaylistTest, UndoRemove) {
TEST_F(PlaylistTest, UndoMultiRemove) {
// Add 3 items
playlist_.InsertItems(PlaylistItemList() << MakeMockItemP("One") << MakeMockItemP("Two") << MakeMockItemP("Three"));
playlist_.InsertItems(PlaylistItemPtrList() << MakeMockItemP("One") << MakeMockItemP("Two") << MakeMockItemP("Three"));
ASSERT_EQ(3, playlist_.rowCount(QModelIndex()));
// Remove 1 item
@@ -385,7 +385,7 @@ TEST_F(PlaylistTest, UndoMultiRemove) {
TEST_F(PlaylistTest, UndoClear) {
playlist_.InsertItems(PlaylistItemList() << MakeMockItemP("One") << MakeMockItemP("Two") << MakeMockItemP("Three"));
playlist_.InsertItems(PlaylistItemPtrList() << MakeMockItemP("One") << MakeMockItemP("Two") << MakeMockItemP("Three"));
ASSERT_EQ(3, playlist_.rowCount(QModelIndex()));
playlist_.Clear();
@@ -400,7 +400,7 @@ TEST_F(PlaylistTest, UndoClear) {
TEST_F(PlaylistTest, UndoRemoveCurrent) {
playlist_.InsertItems(PlaylistItemList() << MakeMockItemP("Title"));
playlist_.InsertItems(PlaylistItemPtrList() << MakeMockItemP("Title"));
playlist_.set_current_row(0);
EXPECT_EQ(0, playlist_.current_row());
EXPECT_EQ(0, playlist_.last_played_row());
@@ -417,7 +417,7 @@ TEST_F(PlaylistTest, UndoRemoveCurrent) {
TEST_F(PlaylistTest, UndoRemoveOldCurrent) {
playlist_.InsertItems(PlaylistItemList() << MakeMockItemP("Title"));
playlist_.InsertItems(PlaylistItemPtrList() << MakeMockItemP("Title"));
playlist_.set_current_row(0);
EXPECT_EQ(0, playlist_.current_row());
EXPECT_EQ(0, playlist_.last_played_row());
@@ -437,7 +437,7 @@ TEST_F(PlaylistTest, UndoRemoveOldCurrent) {
TEST_F(PlaylistTest, ShuffleThenNext) {
// Add 100 items
PlaylistItemList items;
PlaylistItemPtrList items;
items.reserve(100);
for (int i=0 ; i<100 ; ++i)
items << MakeMockItemP("Item " + QString::number(i));
@@ -481,7 +481,7 @@ TEST_F(PlaylistTest, CollectionIdMapSingle) {
song.set_id(1);
PlaylistItemPtr item(std::make_shared<CollectionPlaylistItem>(song));
playlist_.InsertItems(PlaylistItemList() << item);
playlist_.InsertItems(PlaylistItemPtrList() << item);
EXPECT_EQ(0, playlist_.collection_items_by_id(-1).count());
EXPECT_EQ(0, playlist_.collection_items_by_id(0).count());
@@ -502,7 +502,7 @@ TEST_F(PlaylistTest, CollectionIdMapInvalid) {
ASSERT_EQ(-1, invalid.id());
PlaylistItemPtr item(std::make_shared<CollectionPlaylistItem>(invalid));
playlist_.InsertItems(PlaylistItemList() << item);
playlist_.InsertItems(PlaylistItemPtrList() << item);
EXPECT_EQ(0, playlist_.collection_items_by_id(-1).count());
EXPECT_EQ(0, playlist_.collection_items_by_id(0).count());
@@ -524,7 +524,7 @@ TEST_F(PlaylistTest, CollectionIdMapMulti) {
PlaylistItemPtr item_one(std::make_shared<CollectionPlaylistItem>(one));
PlaylistItemPtr item_two(std::make_shared<CollectionPlaylistItem>(two));
PlaylistItemPtr item_three(std::make_shared<CollectionPlaylistItem>(one));
playlist_.InsertItems(PlaylistItemList() << item_one << item_two << item_three);
playlist_.InsertItems(PlaylistItemPtrList() << item_one << item_two << item_three);
EXPECT_EQ(2, playlist_.collection_items_by_id(1).count());
EXPECT_EQ(1, playlist_.collection_items_by_id(2).count());