Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2024-12-18 12:28:31 +01:00
Code Issues Releases Wiki Activity

Fix the library model test

Browse Source
This commit is contained in:
David Sansome 2011-02-26 13:34:31 +00:00
parent 6a14e0d94f
commit 62b6d052de
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/library/librarymodel.cpp
View File

@ -89,7 +89,7 @@ void LibraryModel::set_pretty_covers(bool use_pretty_covers) {
} }
} }
void LibraryModel::Init() { void LibraryModel::Init(bool async) {
connect(backend_, SIGNAL(SongsDiscovered(SongList)), SLOT(SongsDiscovered(SongList))); connect(backend_, SIGNAL(SongsDiscovered(SongList)), SLOT(SongsDiscovered(SongList)));
connect(backend_, SIGNAL(SongsDeleted(SongList)), SLOT(SongsDeleted(SongList))); connect(backend_, SIGNAL(SongsDeleted(SongList)), SLOT(SongsDeleted(SongList)));
connect(backend_, SIGNAL(SongsStatisticsChanged(SongList)), SLOT(SongsStatisticsChanged(SongList))); connect(backend_, SIGNAL(SongsStatisticsChanged(SongList)), SLOT(SongsStatisticsChanged(SongList)));
@ -98,7 +98,11 @@ void LibraryModel::Init() {
backend_->UpdateTotalSongCountAsync(); backend_->UpdateTotalSongCountAsync();
if (async) {
ResetAsync(); ResetAsync();
} else {
Reset();
}
} }
void LibraryModel::SongsDiscovered(const SongList& songs) { void LibraryModel::SongsDiscovered(const SongList& songs) {

2
src/library/librarymodel.h
View File

@ -142,7 +142,7 @@ class LibraryModel : public SimpleTreeModel<LibraryItem> {
void SetFilterQueryMode(QueryOptions::QueryMode query_mode); void SetFilterQueryMode(QueryOptions::QueryMode query_mode);
void SetGroupBy(const LibraryModel::Grouping& g); void SetGroupBy(const LibraryModel::Grouping& g);
void Init(); void Init(bool async = true);
void Reset(); void Reset();
void ResetAsync(); void ResetAsync();

24
tests/librarymodel_test.cpp
View File

@ -34,7 +34,7 @@ class LibraryModelTest : public ::testing::Test {
protected: protected:
void SetUp() { void SetUp() {
database_.reset(new MemoryDatabase); database_.reset(new MemoryDatabase);
backend_.reset(new LibraryBackend()); backend_.reset(new LibraryBackend);
backend_->Init(database_, Library::kSongsTable, backend_->Init(database_, Library::kSongsTable,
Library::kDirsTable, Library::kSubdirsTable, Library::kFtsTable); Library::kDirsTable, Library::kSubdirsTable, Library::kFtsTable);
model_.reset(new LibraryModel(backend_.get())); model_.reset(new LibraryModel(backend_.get()));
@ -86,7 +86,7 @@ TEST_F(LibraryModelTest, WithInitialArtists) {
AddSong("Title", "Artist 1", "Album", 123); AddSong("Title", "Artist 1", "Album", 123);
AddSong("Title", "Artist 2", "Album", 123); AddSong("Title", "Artist 2", "Album", 123);
AddSong("Title", "Foo", "Album", 123); AddSong("Title", "Foo", "Album", 123);
model_->Init(); model_->Init(false);
ASSERT_EQ(5, model_sorted_->rowCount(QModelIndex())); ASSERT_EQ(5, model_sorted_->rowCount(QModelIndex()));
EXPECT_EQ("A", model_sorted_->index(0, 0, QModelIndex()).data().toString()); EXPECT_EQ("A", model_sorted_->index(0, 0, QModelIndex()).data().toString());
@ -102,7 +102,7 @@ TEST_F(LibraryModelTest, CompilationAlbums) {
song.set_compilation(true); song.set_compilation(true);
AddSong(song); AddSong(song);
model_->Init(); model_->Init(false);
model_->fetchMore(model_->index(0, 0)); model_->fetchMore(model_->index(0, 0));
ASSERT_EQ(1, model_->rowCount(QModelIndex())); ASSERT_EQ(1, model_->rowCount(QModelIndex()));
@ -122,7 +122,7 @@ TEST_F(LibraryModelTest, NumericHeaders) {
AddSong("Title", "2artist", "Album", 123); AddSong("Title", "2artist", "Album", 123);
AddSong("Title", "0artist", "Album", 123); AddSong("Title", "0artist", "Album", 123);
AddSong("Title", "zartist", "Album", 123); AddSong("Title", "zartist", "Album", 123);
model_->Init(); model_->Init(false);
ASSERT_EQ(6, model_sorted_->rowCount(QModelIndex())); ASSERT_EQ(6, model_sorted_->rowCount(QModelIndex()));
EXPECT_EQ("0-9", model_sorted_->index(0, 0, QModelIndex()).data().toString()); EXPECT_EQ("0-9", model_sorted_->index(0, 0, QModelIndex()).data().toString());
@ -136,7 +136,7 @@ TEST_F(LibraryModelTest, NumericHeaders) {
TEST_F(LibraryModelTest, MixedCaseHeaders) { TEST_F(LibraryModelTest, MixedCaseHeaders) {
AddSong("Title", "Artist", "Album", 123); AddSong("Title", "Artist", "Album", 123);
AddSong("Title", "artist", "Album", 123); AddSong("Title", "artist", "Album", 123);
model_->Init(); model_->Init(false);
ASSERT_EQ(3, model_sorted_->rowCount(QModelIndex())); ASSERT_EQ(3, model_sorted_->rowCount(QModelIndex()));
EXPECT_EQ("A", model_sorted_->index(0, 0, QModelIndex()).data().toString()); EXPECT_EQ("A", model_sorted_->index(0, 0, QModelIndex()).data().toString());
@ -146,7 +146,7 @@ TEST_F(LibraryModelTest, MixedCaseHeaders) {
TEST_F(LibraryModelTest, UnknownArtists) { TEST_F(LibraryModelTest, UnknownArtists) {
AddSong("Title", "", "Album", 123); AddSong("Title", "", "Album", 123);
model_->Init(); model_->Init(false);
model_->fetchMore(model_->index(0, 0)); model_->fetchMore(model_->index(0, 0));
ASSERT_EQ(1, model_->rowCount(QModelIndex())); ASSERT_EQ(1, model_->rowCount(QModelIndex()));
@ -160,7 +160,7 @@ TEST_F(LibraryModelTest, UnknownArtists) {
TEST_F(LibraryModelTest, UnknownAlbums) { TEST_F(LibraryModelTest, UnknownAlbums) {
AddSong("Title", "Artist", "", 123); AddSong("Title", "Artist", "", 123);
AddSong("Title", "Artist", "Album", 123); AddSong("Title", "Artist", "Album", 123);
model_->Init(); model_->Init(false);
model_->fetchMore(model_->index(0, 0)); model_->fetchMore(model_->index(0, 0));
QModelIndex artist_index = model_->index(0, 0, QModelIndex()); QModelIndex artist_index = model_->index(0, 0, QModelIndex());
@ -190,7 +190,7 @@ TEST_F(LibraryModelTest, VariousArtistSongs) {
for (int i=0 ; i<4 ; ++i) for (int i=0 ; i<4 ; ++i)
AddSong(songs[i]); AddSong(songs[i]);
model_->Init(); model_->Init(false);
QModelIndex artist_index = model_->index(0, 0, QModelIndex()); QModelIndex artist_index = model_->index(0, 0, QModelIndex());
model_->fetchMore(artist_index); model_->fetchMore(artist_index);
@ -210,7 +210,7 @@ TEST_F(LibraryModelTest, RemoveSongsLazyLoaded) {
Song one = AddSong("Title 1", "Artist", "Album", 123); one.set_id(1); Song one = AddSong("Title 1", "Artist", "Album", 123); one.set_id(1);
Song two = AddSong("Title 2", "Artist", "Album", 123); two.set_id(2); Song two = AddSong("Title 2", "Artist", "Album", 123); two.set_id(2);
AddSong("Title 3", "Artist", "Album", 123); AddSong("Title 3", "Artist", "Album", 123);
model_->Init(); model_->Init(false);
// Lazy load the items // Lazy load the items
QModelIndex artist_index = model_->index(0, 0, QModelIndex()); QModelIndex artist_index = model_->index(0, 0, QModelIndex());
@ -241,7 +241,7 @@ TEST_F(LibraryModelTest, RemoveSongsLazyLoaded) {
TEST_F(LibraryModelTest, RemoveSongsNotLazyLoaded) { TEST_F(LibraryModelTest, RemoveSongsNotLazyLoaded) {
Song one = AddSong("Title 1", "Artist", "Album", 123); one.set_id(1); Song one = AddSong("Title 1", "Artist", "Album", 123); one.set_id(1);
Song two = AddSong("Title 2", "Artist", "Album", 123); two.set_id(2); Song two = AddSong("Title 2", "Artist", "Album", 123); two.set_id(2);
model_->Init(); model_->Init(false);
// Remove the first two songs // Remove the first two songs
QSignalSpy spy_preremove(model_.get(), SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int))); QSignalSpy spy_preremove(model_.get(), SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)));
@ -259,7 +259,7 @@ TEST_F(LibraryModelTest, RemoveEmptyAlbums) {
Song one = AddSong("Title 1", "Artist", "Album 1", 123); one.set_id(1); Song one = AddSong("Title 1", "Artist", "Album 1", 123); one.set_id(1);
Song two = AddSong("Title 2", "Artist", "Album 2", 123); two.set_id(2); Song two = AddSong("Title 2", "Artist", "Album 2", 123); two.set_id(2);
Song three = AddSong("Title 3", "Artist", "Album 2", 123); three.set_id(3); Song three = AddSong("Title 3", "Artist", "Album 2", 123); three.set_id(3);
model_->Init(); model_->Init(false);
QModelIndex artist_index = model_->index(0, 0, QModelIndex()); QModelIndex artist_index = model_->index(0, 0, QModelIndex());
model_->fetchMore(artist_index); model_->fetchMore(artist_index);
@ -282,7 +282,7 @@ TEST_F(LibraryModelTest, RemoveEmptyAlbums) {
TEST_F(LibraryModelTest, RemoveEmptyArtists) { TEST_F(LibraryModelTest, RemoveEmptyArtists) {
Song one = AddSong("Title", "Artist", "Album", 123); one.set_id(1); Song one = AddSong("Title", "Artist", "Album", 123); one.set_id(1);
model_->Init(); model_->Init(false);
// Lazy load the items // Lazy load the items
QModelIndex artist_index = model_->index(0, 0, QModelIndex()); QModelIndex artist_index = model_->index(0, 0, QModelIndex());