diff options
| author | Max Kellermann <max@duempel.org> | 2014-02-07 00:29:07 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-02-07 00:42:14 +0100 |
| commit | c13810ebaa7075284691eb2add089ba407dfd1ea (patch) | |
| tree | 1ebeb2104ee4a3e73f49416267aec2e79943821b /test | |
| parent | 19a982cf693e660ce296a29a9830f1e94d9f1b4c (diff) | |
| download | mpd-c13810ebaa7075284691eb2add089ba407dfd1ea.tar.gz mpd-c13810ebaa7075284691eb2add089ba407dfd1ea.tar.xz mpd-c13810ebaa7075284691eb2add089ba407dfd1ea.zip | |
Mapper: move map_song_detach() to db/DatabaseSong.cxx
Use Storage::MapUTF8() internally, don't use global variables.
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_translate_song.cxx | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/test/test_translate_song.cxx b/test/test_translate_song.cxx index bc1ae82d6..aacc25820 100644 --- a/test/test_translate_song.cxx +++ b/test/test_translate_song.cxx @@ -117,7 +117,9 @@ static const char *uri1 = "/foo/bar.ogg"; static const char *uri2 = "foo/bar.ogg"; DetachedSong * -DatabaseDetachSong(gcc_unused const Database &db, const char *uri, +DatabaseDetachSong(gcc_unused const Database &db, + gcc_unused const Storage &storage, + const char *uri, gcc_unused Error &error) { if (strcmp(uri, uri2) == 0) @@ -143,6 +145,12 @@ Client::GetDatabase(gcc_unused Error &error) const return reinterpret_cast<const Database *>(this); } +const Storage * +Client::GetStorage() const +{ + return reinterpret_cast<const Storage *>(this); +} + bool Client::AllowFile(gcc_unused Path path_fs, gcc_unused Error &error) const { @@ -217,7 +225,7 @@ class TranslateSongTest : public CppUnit::TestFixture { void TestAbsoluteURI() { DetachedSong song1("http://example.com/foo.ogg"); auto se = ToString(song1); - const SongLoader loader(nullptr); + const SongLoader loader(nullptr, nullptr); CPPUNIT_ASSERT(playlist_check_translate_song(song1, "/ignored", loader)); CPPUNIT_ASSERT_EQUAL(se, ToString(song1)); @@ -236,14 +244,15 @@ class TranslateSongTest : public CppUnit::TestFixture { auto s1 = ToString(song1); auto se = ToString(DetachedSong(uri1, MakeTag1c())); - const SongLoader loader(nullptr); + const SongLoader loader(nullptr, nullptr); CPPUNIT_ASSERT(playlist_check_translate_song(song1, "/ignored", loader)); CPPUNIT_ASSERT_EQUAL(se, ToString(song1)); } void TestInDatabase() { - const SongLoader loader(reinterpret_cast<const Database *>(1)); + const SongLoader loader(reinterpret_cast<const Database *>(1), + reinterpret_cast<const Storage *>(2)); DetachedSong song1("doesntexist"); CPPUNIT_ASSERT(!playlist_check_translate_song(song1, nullptr, @@ -266,9 +275,10 @@ class TranslateSongTest : public CppUnit::TestFixture { void TestRelative() { const Database &db = *reinterpret_cast<const Database *>(1); - const SongLoader secure_loader(&db); + const Storage &storage = *reinterpret_cast<const Storage *>(2); + const SongLoader secure_loader(&db, &storage); const SongLoader insecure_loader(*reinterpret_cast<const Client *>(1), - &db); + &db, &storage); /* map to music_directory */ DetachedSong song1("bar.ogg", MakeTag2b()); |