Fix the unit test mocks from before

TheUbuntuGuy · Apr 28, 2011 · 6820a36 · 6820a36
1 parent 06852aa
commit 6820a36
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/tests/mock_player.h b/tests/mock_player.h
@@ -37,6 +37,9 @@ class MockPlayer : public PlayerInterface {
   MOCK_CONST_METHOD1(GetItemAt, PlaylistItemPtr(int));
   MOCK_CONST_METHOD0(playlists, PlaylistManagerInterface*());
 
+  MOCK_METHOD1(RegisterUrlHandler, void(UrlHandler*));
+  MOCK_METHOD1(UnregisterUrlHandler, void(UrlHandler*));
+
   MOCK_METHOD0(ReloadSettings, void());
 
   MOCK_METHOD3(PlayAt, void(int, Engine::TrackChangeFlags, bool));
@@ -51,7 +54,6 @@ class MockPlayer : public PlayerInterface {
   MOCK_METHOD1(SeekTo, void(int));
   MOCK_METHOD0(SeekForward, void());
   MOCK_METHOD0(SeekBackward, void());
-  MOCK_METHOD1(HandleSpecialLoad, void(const PlaylistItem::SpecialLoadResult&));
   MOCK_METHOD1(CurrentMetadataChanged, void(const Song&));
 
   MOCK_METHOD0(Mute, void());

diff --git a/tests/mock_playlistitem.h b/tests/mock_playlistitem.h
@@ -37,12 +37,8 @@ class MockPlaylistItem : public PlaylistItem {
       void());
   MOCK_CONST_METHOD0(Metadata,
       Song());
-  MOCK_METHOD0(StartLoading,
-      PlaylistItem::SpecialLoadResult());
   MOCK_CONST_METHOD0(Url,
       QUrl());
-  MOCK_METHOD0(LoadNext,
-      PlaylistItem::SpecialLoadResult());
   MOCK_METHOD1(SetTemporaryMetadata,
       void(const Song& metadata));
   MOCK_METHOD0(ClearTemporaryMetadata,

diff --git a/tests/mock_playlistmanager.h b/tests/mock_playlistmanager.h
@@ -46,7 +46,11 @@ class MockPlaylistManager : public PlaylistManagerInterface {
   MOCK_CONST_METHOD0(sequence, PlaylistSequence*());
   MOCK_CONST_METHOD0(parser, PlaylistParser*());
 
-  MOCK_METHOD2(New, void(const QString&, const SongList&));
+  MOCK_METHOD1(RegisterSpecialPlaylistType, void(SpecialPlaylistType*));
+  MOCK_METHOD1(UnregisterSpecialPlaylistType, void(SpecialPlaylistType*));
+  MOCK_CONST_METHOD1(GetPlaylistType, SpecialPlaylistType*(const QString&));
+
+  MOCK_METHOD3(New, void(const QString&, const SongList&, const QString&));
   MOCK_METHOD1(Load, void(const QString&));
   MOCK_METHOD2(Save, void(int, const QString&));
   MOCK_METHOD2(Rename, void(int, const QString&));