premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

some windows fixes for unit tests

This commit is contained in:
Arvid Norberg 2013-07-23 07:32:38 +00:00
parent be737976d4
commit c0da76ac84
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/test_storage.cpp
View File

@ -855,9 +855,9 @@ void run_test(std::string const& test_path, bool unbuffered)
{ {
error_code ec; error_code ec;
file_storage fs; file_storage fs;
fs.add_file("temp_storage/test1.tmp", 3 * piece_size); fs.add_file(combine_path("temp_storage", "test1.tmp"), 3 * piece_size);
libtorrent::create_torrent t(fs, piece_size, -1, 0); libtorrent::create_torrent t(fs, piece_size, -1, 0);
TEST_CHECK(fs.file_path(*fs.begin()) == "temp_storage/test1.tmp"); TEST_CHECK(fs.file_path(*fs.begin()) == combine_path("temp_storage", "test1.tmp"));
t.set_hash(0, hasher(piece0, piece_size).final()); t.set_hash(0, hasher(piece0, piece_size).final());
t.set_hash(1, hasher(piece1, piece_size).final()); t.set_hash(1, hasher(piece1, piece_size).final());
t.set_hash(2, hasher(piece2, piece_size).final()); t.set_hash(2, hasher(piece2, piece_size).final());
@ -870,7 +870,7 @@ void run_test(std::string const& test_path, bool unbuffered)
run_storage_tests(info, fs, test_path, storage_mode_compact, unbuffered); run_storage_tests(info, fs, test_path, storage_mode_compact, unbuffered);
TEST_EQUAL(file_size(combine_path(test_path, "temp_storage/test1.tmp")), piece_size * 3); TEST_EQUAL(file_size(combine_path(test_path, combine_path("temp_storage", "test1.tmp"))), piece_size * 3);
remove_all(combine_path(test_path, "temp_storage"), ec); remove_all(combine_path(test_path, "temp_storage"), ec);
if (ec) std::cerr << "remove_all '" << combine_path(test_path, "temp_storage") if (ec) std::cerr << "remove_all '" << combine_path(test_path, "temp_storage")
<< "': " << ec.message() << std::endl; << "': " << ec.message() << std::endl;
@ -881,8 +881,8 @@ void run_test(std::string const& test_path, bool unbuffered)
run_storage_tests(info, fs, test_path, storage_mode_allocate, unbuffered); run_storage_tests(info, fs, test_path, storage_mode_allocate, unbuffered);
std::cerr << file_size(combine_path(test_path, "temp_storage/test1.tmp")) << std::endl; std::cerr << file_size(combine_path(test_path, combine_path("temp_storage", "test1.tmp"))) << std::endl;
TEST_EQUAL(file_size(combine_path(test_path, "temp_storage/test1.tmp")), 3 * piece_size); TEST_EQUAL(file_size(combine_path(test_path, combine_path("temp_storage", "test1.tmp"))), 3 * piece_size);
remove_all(combine_path(test_path, "temp_storage"), ec); remove_all(combine_path(test_path, "temp_storage"), ec);
if (ec) std::cerr << "remove_all '" << combine_path(test_path, "temp_storage") if (ec) std::cerr << "remove_all '" << combine_path(test_path, "temp_storage")
@ -961,8 +961,8 @@ void test_fastresume(std::string const& test_path)
if (ra.get()) resume = *alert_cast<save_resume_data_alert>(ra.get())->resume_data; if (ra.get()) resume = *alert_cast<save_resume_data_alert>(ra.get())->resume_data;
ses.remove_torrent(h, session::delete_files); ses.remove_torrent(h, session::delete_files);
} }
TEST_CHECK(!exists(combine_path(test_path, "tmp1/temporary"))); TEST_CHECK(!exists(combine_path(test_path, combine_path("tmp1", "temporary"))));
if (exists(combine_path(test_path, "tmp1/temporary"))) if (exists(combine_path(test_path, combine_path("tmp1", "temporary"))))
return; return;
#if defined TORRENT_DEBUG && TORRENT_USE_IOSTREAM #if defined TORRENT_DEBUG && TORRENT_USE_IOSTREAM
resume.print(std::cout); resume.print(std::cout);

6
test/test_upnp.cpp
View File

@ -133,6 +133,12 @@ int run_upnp_test(char const* root_filename, char const* router_model, char cons
buf.push_back(0); buf.push_back(0);
FILE* xml_file = fopen("upnp.xml", "w+"); FILE* xml_file = fopen("upnp.xml", "w+");
if (xml_file == NULL)
{
fprintf(stderr, "failed to open file 'upnp.xml': %s\n", strerror(errno));
TEST_CHECK(false);
return 1;
}
fprintf(xml_file, &buf[0], g_port); fprintf(xml_file, &buf[0], g_port);
fclose(xml_file); fclose(xml_file);