Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2025-01-31 03:27:40 +01:00
Code Issues Releases Wiki Activity

Codereview comments from r685

Browse Source
This commit is contained in:
David Sansome 2010-04-14 16:00:45 +00:00
parent 3172f6b950
commit 65440dd374
3 changed files with 121 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/playlistsequence.h
View File

@ -22,6 +22,8 @@
#include "ui_playlistsequence.h"
#include "settingsprovider.h"
#include <boost/scoped_ptr.hpp>
class QMenu;
class PlaylistSequence : public QWidget {

2
src/settingsprovider.h
View File

@ -20,8 +20,6 @@
#include <QVariant>
#include <QSettings>
#include <boost/scoped_ptr.hpp>
class SettingsProvider {
public:
SettingsProvider();

240
tests/playlist_test.cpp
View File

@ -23,8 +23,6 @@
#include <QtDebug>
#include <boost/scoped_ptr.hpp>
using ::testing::Return;
namespace {
@ -32,13 +30,13 @@ namespace {
class PlaylistTest : public ::testing::Test {
protected:
PlaylistTest()
: playlist_(new Playlist(NULL, new DummySettingsProvider)),
sequence_(new PlaylistSequence(NULL, new DummySettingsProvider))
: playlist_(NULL, new DummySettingsProvider),
sequence_(NULL, new DummySettingsProvider)
{
}
void SetUp() {
playlist_->set_sequence(sequence_.get());
playlist_.set_sequence(&sequence_);
}
MockPlaylistItem* MakeMockItem(const QString& title,
@ -57,207 +55,207 @@ class PlaylistTest : public ::testing::Test {
return ret;
}
boost::scoped_ptr<Playlist> playlist_;
boost::scoped_ptr<PlaylistSequence> sequence_;
Playlist playlist_;
PlaylistSequence sequence_;
};
TEST_F(PlaylistTest, Basic) {
EXPECT_EQ(0, playlist_->rowCount(QModelIndex()));
EXPECT_EQ(0, playlist_.rowCount(QModelIndex()));
}
TEST_F(PlaylistTest, InsertItems) {
MockPlaylistItem* item = MakeMockItem("Title", "Artist", "Album", 123);
// Insert the item
EXPECT_EQ(0, playlist_->rowCount(QModelIndex()));
playlist_->InsertItems(QList<PlaylistItem*>() << item, -1);
ASSERT_EQ(1, playlist_->rowCount(QModelIndex()));
EXPECT_EQ(0, playlist_.rowCount(QModelIndex()));
playlist_.InsertItems(QList<PlaylistItem*>() << item, -1);
ASSERT_EQ(1, playlist_.rowCount(QModelIndex()));
// Get the metadata
EXPECT_EQ("Title", playlist_->data(playlist_->index(0, Playlist::Column_Title)));
EXPECT_EQ("Artist", playlist_->data(playlist_->index(0, Playlist::Column_Artist)));
EXPECT_EQ("Album", playlist_->data(playlist_->index(0, Playlist::Column_Album)));
EXPECT_EQ(123, playlist_->data(playlist_->index(0, Playlist::Column_Length)));
EXPECT_EQ("Title", playlist_.data(playlist_.index(0, Playlist::Column_Title)));
EXPECT_EQ("Artist", playlist_.data(playlist_.index(0, Playlist::Column_Artist)));
EXPECT_EQ("Album", playlist_.data(playlist_.index(0, Playlist::Column_Album)));
EXPECT_EQ(123, playlist_.data(playlist_.index(0, Playlist::Column_Length)));
}
TEST_F(PlaylistTest, Indexes) {
playlist_->InsertItems(QList<PlaylistItem*>()
playlist_.InsertItems(QList<PlaylistItem*>()
<< MakeMockItem("One") << MakeMockItem("Two") << MakeMockItem("Three"));
ASSERT_EQ(3, playlist_->rowCount(QModelIndex()));
ASSERT_EQ(3, playlist_.rowCount(QModelIndex()));
// Start "playing" track 1
playlist_->set_current_index(0);
EXPECT_EQ(0, playlist_->current_index());
EXPECT_EQ("One", playlist_->current_item()->Metadata().title());
EXPECT_EQ(-1, playlist_->previous_index());
EXPECT_EQ(1, playlist_->next_index());
playlist_.set_current_index(0);
EXPECT_EQ(0, playlist_.current_index());
EXPECT_EQ("One", playlist_.current_item()->Metadata().title());
EXPECT_EQ(-1, playlist_.previous_index());
EXPECT_EQ(1, playlist_.next_index());
// Stop playing
EXPECT_EQ(0, playlist_->last_played_index());
playlist_->set_current_index(-1);
EXPECT_EQ(0, playlist_->last_played_index());
EXPECT_EQ(-1, playlist_->current_index());
EXPECT_EQ(0, playlist_.last_played_index());
playlist_.set_current_index(-1);
EXPECT_EQ(0, playlist_.last_played_index());
EXPECT_EQ(-1, playlist_.current_index());
// Play track 2
playlist_->set_current_index(1);
EXPECT_EQ(1, playlist_->current_index());
EXPECT_EQ("Two", playlist_->current_item()->Metadata().title());
EXPECT_EQ(0, playlist_->previous_index());
EXPECT_EQ(2, playlist_->next_index());
playlist_.set_current_index(1);
EXPECT_EQ(1, playlist_.current_index());
EXPECT_EQ("Two", playlist_.current_item()->Metadata().title());
EXPECT_EQ(0, playlist_.previous_index());
EXPECT_EQ(2, playlist_.next_index());
// Play track 3
playlist_->set_current_index(2);
EXPECT_EQ(2, playlist_->current_index());
EXPECT_EQ("Three", playlist_->current_item()->Metadata().title());
EXPECT_EQ(1, playlist_->previous_index());
EXPECT_EQ(-1, playlist_->next_index());
playlist_.set_current_index(2);
EXPECT_EQ(2, playlist_.current_index());
EXPECT_EQ("Three", playlist_.current_item()->Metadata().title());
EXPECT_EQ(1, playlist_.previous_index());
EXPECT_EQ(-1, playlist_.next_index());
}
TEST_F(PlaylistTest, RepeatPlaylist) {
playlist_->InsertItems(QList<PlaylistItem*>()
playlist_.InsertItems(QList<PlaylistItem*>()
<< MakeMockItem("One") << MakeMockItem("Two") << MakeMockItem("Three"));
ASSERT_EQ(3, playlist_->rowCount(QModelIndex()));
ASSERT_EQ(3, playlist_.rowCount(QModelIndex()));
playlist_->sequence()->SetRepeatMode(PlaylistSequence::Repeat_Playlist);
playlist_.sequence()->SetRepeatMode(PlaylistSequence::Repeat_Playlist);
playlist_->set_current_index(0);
EXPECT_EQ(1, playlist_->next_index());
playlist_.set_current_index(0);
EXPECT_EQ(1, playlist_.next_index());
playlist_->set_current_index(1);
EXPECT_EQ(2, playlist_->next_index());
playlist_.set_current_index(1);
EXPECT_EQ(2, playlist_.next_index());
playlist_->set_current_index(2);
EXPECT_EQ(0, playlist_->next_index());
playlist_.set_current_index(2);
EXPECT_EQ(0, playlist_.next_index());
}
TEST_F(PlaylistTest, RepeatTrack) {
playlist_->InsertItems(QList<PlaylistItem*>()
playlist_.InsertItems(QList<PlaylistItem*>()
<< MakeMockItem("One") << MakeMockItem("Two") << MakeMockItem("Three"));
ASSERT_EQ(3, playlist_->rowCount(QModelIndex()));
ASSERT_EQ(3, playlist_.rowCount(QModelIndex()));
playlist_->sequence()->SetRepeatMode(PlaylistSequence::Repeat_Track);
playlist_.sequence()->SetRepeatMode(PlaylistSequence::Repeat_Track);
playlist_->set_current_index(0);
EXPECT_EQ(0, playlist_->next_index());
playlist_.set_current_index(0);
EXPECT_EQ(0, playlist_.next_index());
}
TEST_F(PlaylistTest, RepeatAlbum) {
playlist_->InsertItems(QList<PlaylistItem*>()
playlist_.InsertItems(QList<PlaylistItem*>()
<< MakeMockItem("One", "Album one")
<< MakeMockItem("Two", "Album two")
<< MakeMockItem("Three", "Album one"));
ASSERT_EQ(3, playlist_->rowCount(QModelIndex()));
ASSERT_EQ(3, playlist_.rowCount(QModelIndex()));
playlist_->sequence()->SetRepeatMode(PlaylistSequence::Repeat_Album);
playlist_.sequence()->SetRepeatMode(PlaylistSequence::Repeat_Album);
playlist_->set_current_index(0);
EXPECT_EQ(2, playlist_->next_index());
playlist_.set_current_index(0);
EXPECT_EQ(2, playlist_.next_index());
playlist_->set_current_index(2);
EXPECT_EQ(0, playlist_->next_index());
playlist_.set_current_index(2);
EXPECT_EQ(0, playlist_.next_index());
}
TEST_F(PlaylistTest, RemoveBeforeCurrent) {
playlist_->InsertItems(QList<PlaylistItem*>()
playlist_.InsertItems(QList<PlaylistItem*>()
<< MakeMockItem("One") << MakeMockItem("Two") << MakeMockItem("Three"));
ASSERT_EQ(3, playlist_->rowCount(QModelIndex()));
ASSERT_EQ(3, playlist_.rowCount(QModelIndex()));
// Remove a row before the currently playing track
playlist_->set_current_index(2);
EXPECT_EQ(2, playlist_->current_index());
playlist_->removeRow(1, QModelIndex());
EXPECT_EQ(1, playlist_->current_index());
EXPECT_EQ(1, playlist_->last_played_index());
EXPECT_EQ(0, playlist_->previous_index());
EXPECT_EQ(-1, playlist_->next_index());
playlist_.set_current_index(2);
EXPECT_EQ(2, playlist_.current_index());
playlist_.removeRow(1, QModelIndex());
EXPECT_EQ(1, playlist_.current_index());
EXPECT_EQ(1, playlist_.last_played_index());
EXPECT_EQ(0, playlist_.previous_index());
EXPECT_EQ(-1, playlist_.next_index());
}
TEST_F(PlaylistTest, RemoveAfterCurrent) {
playlist_->InsertItems(QList<PlaylistItem*>()
playlist_.InsertItems(QList<PlaylistItem*>()
<< MakeMockItem("One") << MakeMockItem("Two") << MakeMockItem("Three"));
ASSERT_EQ(3, playlist_->rowCount(QModelIndex()));
ASSERT_EQ(3, playlist_.rowCount(QModelIndex()));
// Remove a row after the currently playing track
playlist_->set_current_index(0);
EXPECT_EQ(0, playlist_->current_index());
playlist_->removeRow(1, QModelIndex());
EXPECT_EQ(0, playlist_->current_index());
EXPECT_EQ(0, playlist_->last_played_index());
EXPECT_EQ(-1, playlist_->previous_index());
EXPECT_EQ(1, playlist_->next_index());
playlist_.set_current_index(0);
EXPECT_EQ(0, playlist_.current_index());
playlist_.removeRow(1, QModelIndex());
EXPECT_EQ(0, playlist_.current_index());
EXPECT_EQ(0, playlist_.last_played_index());
EXPECT_EQ(-1, playlist_.previous_index());
EXPECT_EQ(1, playlist_.next_index());
playlist_->set_current_index(1);
EXPECT_EQ(-1, playlist_->next_index());
playlist_.set_current_index(1);
EXPECT_EQ(-1, playlist_.next_index());
}
TEST_F(PlaylistTest, RemoveCurrent) {
playlist_->InsertItems(QList<PlaylistItem*>()
playlist_.InsertItems(QList<PlaylistItem*>()
<< MakeMockItem("One") << MakeMockItem("Two") << MakeMockItem("Three"));
ASSERT_EQ(3, playlist_->rowCount(QModelIndex()));
ASSERT_EQ(3, playlist_.rowCount(QModelIndex()));
// Remove the currently playing track's row
playlist_->set_current_index(1);
EXPECT_EQ(1, playlist_->current_index());
playlist_->removeRow(1, QModelIndex());
EXPECT_EQ(-1, playlist_->current_index());
EXPECT_EQ(-1, playlist_->last_played_index());
EXPECT_EQ(-1, playlist_->previous_index());
EXPECT_EQ(0, playlist_->next_index());
playlist_.set_current_index(1);
EXPECT_EQ(1, playlist_.current_index());
playlist_.removeRow(1, QModelIndex());
EXPECT_EQ(-1, playlist_.current_index());
EXPECT_EQ(-1, playlist_.last_played_index());
EXPECT_EQ(-1, playlist_.previous_index());
EXPECT_EQ(0, playlist_.next_index());
}
TEST_F(PlaylistTest, InsertBeforeCurrent) {
playlist_->InsertItems(QList<PlaylistItem*>()
playlist_.InsertItems(QList<PlaylistItem*>()
<< MakeMockItem("One") << MakeMockItem("Two") << MakeMockItem("Three"));
ASSERT_EQ(3, playlist_->rowCount(QModelIndex()));
ASSERT_EQ(3, playlist_.rowCount(QModelIndex()));
playlist_->set_current_index(1);
EXPECT_EQ(1, playlist_->current_index());
playlist_->InsertItems(QList<PlaylistItem*>() << MakeMockItem("Four"), 0);
ASSERT_EQ(4, playlist_->rowCount(QModelIndex()));
playlist_.set_current_index(1);
EXPECT_EQ(1, playlist_.current_index());
playlist_.InsertItems(QList<PlaylistItem*>() << MakeMockItem("Four"), 0);
ASSERT_EQ(4, playlist_.rowCount(QModelIndex()));
EXPECT_EQ(2, playlist_->current_index());
EXPECT_EQ(2, playlist_->last_played_index());
EXPECT_EQ(1, playlist_->previous_index());
EXPECT_EQ(3, playlist_->next_index());
EXPECT_EQ(2, playlist_.current_index());
EXPECT_EQ(2, playlist_.last_played_index());
EXPECT_EQ(1, playlist_.previous_index());
EXPECT_EQ(3, playlist_.next_index());
EXPECT_EQ("Four", playlist_->data(playlist_->index(0, Playlist::Column_Title)));
EXPECT_EQ("One", playlist_->data(playlist_->index(1, Playlist::Column_Title)));
EXPECT_EQ("Four", playlist_.data(playlist_.index(0, Playlist::Column_Title)));
EXPECT_EQ("One", playlist_.data(playlist_.index(1, Playlist::Column_Title)));
}
TEST_F(PlaylistTest, InsertAfterCurrent) {
playlist_->InsertItems(QList<PlaylistItem*>()
playlist_.InsertItems(QList<PlaylistItem*>()
<< MakeMockItem("One") << MakeMockItem("Two") << MakeMockItem("Three"));
ASSERT_EQ(3, playlist_->rowCount(QModelIndex()));
ASSERT_EQ(3, playlist_.rowCount(QModelIndex()));
playlist_->set_current_index(1);
EXPECT_EQ(1, playlist_->current_index());
playlist_->InsertItems(QList<PlaylistItem*>() << MakeMockItem("Four"), 2);
ASSERT_EQ(4, playlist_->rowCount(QModelIndex()));
playlist_.set_current_index(1);
EXPECT_EQ(1, playlist_.current_index());
playlist_.InsertItems(QList<PlaylistItem*>() << MakeMockItem("Four"), 2);
ASSERT_EQ(4, playlist_.rowCount(QModelIndex()));
EXPECT_EQ(1, playlist_->current_index());
EXPECT_EQ(1, playlist_->last_played_index());
EXPECT_EQ(0, playlist_->previous_index());
EXPECT_EQ(2, playlist_->next_index());
EXPECT_EQ(1, playlist_.current_index());
EXPECT_EQ(1, playlist_.last_played_index());
EXPECT_EQ(0, playlist_.previous_index());
EXPECT_EQ(2, playlist_.next_index());
EXPECT_EQ("Two", playlist_->data(playlist_->index(1, Playlist::Column_Title)));
EXPECT_EQ("Four", playlist_->data(playlist_->index(2, Playlist::Column_Title)));
EXPECT_EQ("Three", playlist_->data(playlist_->index(3, Playlist::Column_Title)));
EXPECT_EQ("Two", playlist_.data(playlist_.index(1, Playlist::Column_Title)));
EXPECT_EQ("Four", playlist_.data(playlist_.index(2, Playlist::Column_Title)));
EXPECT_EQ("Three", playlist_.data(playlist_.index(3, Playlist::Column_Title)));
}
TEST_F(PlaylistTest, Clear) {
playlist_->InsertItems(QList<PlaylistItem*>()
playlist_.InsertItems(QList<PlaylistItem*>()
<< MakeMockItem("One") << MakeMockItem("Two") << MakeMockItem("Three"));
ASSERT_EQ(3, playlist_->rowCount(QModelIndex()));
ASSERT_EQ(3, playlist_.rowCount(QModelIndex()));
playlist_->set_current_index(1);
EXPECT_EQ(1, playlist_->current_index());
playlist_->Clear();
playlist_.set_current_index(1);
EXPECT_EQ(1, playlist_.current_index());
playlist_.Clear();
EXPECT_EQ(0, playlist_->rowCount(QModelIndex()));
EXPECT_EQ(-1, playlist_->current_index());
EXPECT_EQ(-1, playlist_->last_played_index());
EXPECT_EQ(-1, playlist_->previous_index());
EXPECT_EQ(-1, playlist_->next_index());
EXPECT_EQ(0, playlist_.rowCount(QModelIndex()));
EXPECT_EQ(-1, playlist_.current_index());
EXPECT_EQ(-1, playlist_.last_played_index());
EXPECT_EQ(-1, playlist_.previous_index());
EXPECT_EQ(-1, playlist_.next_index());
}