jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

made test_storage build and fixed bug introduced when storage was turned into a customization point

Browse Source
This commit is contained in:
Arvid Norberg
2007-04-02 05:46:19 +00:00
parent bf5dc7fce4
commit 7a30b397f8
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage.cpp
View File

@@ -439,7 +439,7 @@ namespace libtorrent
path old_path; path old_path;
path new_path; path new_path;
m_save_path = complete(save_path); save_path = complete(save_path);
#if defined(_WIN32) && defined(UNICODE) #if defined(_WIN32) && defined(UNICODE)
std::wstring wsave_path(safe_convert(save_path.native_file_string())); std::wstring wsave_path(safe_convert(save_path.native_file_string()));

22
test/test_storage.cpp
View File

@@ -47,34 +47,35 @@ void run_storage_tests(torrent_info& info)
{ // avoid having two storages use the same files { // avoid having two storages use the same files
file_pool fp; file_pool fp;
storage s(info, initial_path(), fp); boost::scoped_ptr<storage_interface> s(
default_storage_constructor(info, initial_path(), fp));
// write piece 1 (in slot 0) // write piece 1 (in slot 0)
s.write(piece1, 0, 0, half); s->write(piece1, 0, 0, half);
s.write(piece1 + half, 0, half, half); s->write(piece1 + half, 0, half, half);
// verify piece 1 // verify piece 1
TEST_CHECK(s.read(piece, 0, 0, piece_size) == piece_size); TEST_CHECK(s->read(piece, 0, 0, piece_size) == piece_size);
TEST_CHECK(std::equal(piece, piece + piece_size, piece1)); TEST_CHECK(std::equal(piece, piece + piece_size, piece1));
// do the same with piece 0 and 2 (in slot 1 and 2) // do the same with piece 0 and 2 (in slot 1 and 2)
s.write(piece0, 1, 0, piece_size); s->write(piece0, 1, 0, piece_size);
s.write(piece2, 2, 0, piece_size); s->write(piece2, 2, 0, piece_size);
// verify piece 0 and 2 // verify piece 0 and 2
TEST_CHECK(s.read(piece, 1, 0, piece_size) == piece_size); TEST_CHECK(s->read(piece, 1, 0, piece_size) == piece_size);
TEST_CHECK(std::equal(piece, piece + piece_size, piece0)); TEST_CHECK(std::equal(piece, piece + piece_size, piece0));
s.read(piece, 2, 0, piece_size); s->read(piece, 2, 0, piece_size);
TEST_CHECK(std::equal(piece, piece + piece_size, piece2)); TEST_CHECK(std::equal(piece, piece + piece_size, piece2));
s.release_files(); s->release_files();
} }
// make sure the piece_manager can identify the pieces // make sure the piece_manager can identify the pieces
{ {
file_pool fp; file_pool fp;
piece_manager pm(info, initial_path(), fp); piece_manager pm(info, initial_path(), fp, default_storage_constructor);
boost::mutex lock; boost::mutex lock;
libtorrent::aux::piece_checker_data d; libtorrent::aux::piece_checker_data d;
@@ -91,6 +92,7 @@ void run_storage_tests(torrent_info& info)
TEST_CHECK(num_pieces == std::count(pieces.begin(), pieces.end() TEST_CHECK(num_pieces == std::count(pieces.begin(), pieces.end()
, true)); , true));
TEST_CHECK(exists("temp_storage"));
pm.move_storage("temp_storage2"); pm.move_storage("temp_storage2");
TEST_CHECK(!exists("temp_storage")); TEST_CHECK(!exists("temp_storage"));
TEST_CHECK(exists("temp_storage2/temp_storage")); TEST_CHECK(exists("temp_storage2/temp_storage"));