wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

split up file unit tests into smaller pieces

This commit is contained in:
Arvid Norberg 2015-05-30 21:10:34 +00:00
parent 3073be4bbd
commit d9813ca56d
5 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/dht_server.cpp
View File

@ -172,8 +172,6 @@ int num_dht_hits()
void stop_dht() void stop_dht()
{ {
fprintf(stderr, "%s: stop_dht()\n", time_now_string());
g_dht.reset(); g_dht.reset();
fprintf(stderr, "%s: stop_dht() done\n", time_now_string());
} }

4
test/main.cpp
View File

@ -263,11 +263,11 @@ int main(int argc, char const* argv[])
if (!tests_to_run.empty()) if (!tests_to_run.empty())
{ {
fprintf(stderr, "UNKONWN tests:\n"); fprintf(stderr, "\x1b[1mUNKONWN tests:\x1b[0m\n");
for (std::set<std::string>::iterator i = tests_to_run.begin() for (std::set<std::string>::iterator i = tests_to_run.begin()
, end(tests_to_run.end()); i != end; ++i) , end(tests_to_run.end()); i != end; ++i)
{ {
fprintf(stderr, "%s\n", i->c_str()); fprintf(stderr, " %s\n", i->c_str());
} }
} }

2
test/peer_server.cpp
View File

@ -160,8 +160,6 @@ int num_peer_hits()
void stop_peer() void stop_peer()
{ {
fprintf(stderr, "%s: PEER stop_peer()\n", time_now_string());
g_peer.reset(); g_peer.reset();
fprintf(stderr, "%s: PEER stop_peer() done\n", time_now_string());
} }

30
test/test_file.cpp
View File

@ -59,7 +59,7 @@ int touch_file(std::string const& filename, int size)
return 0; return 0;
} }
void test_create_directory() TORRENT_TEST(create_directory)
{ {
error_code ec; error_code ec;
create_directory("__foobar__", ec); create_directory("__foobar__", ec);
@ -75,7 +75,7 @@ void test_create_directory()
TEST_CHECK(!ec); TEST_CHECK(!ec);
} }
void test_stat() TORRENT_TEST(file_status)
{ {
error_code ec; error_code ec;
@ -103,11 +103,8 @@ void test_stat()
TEST_CHECK(diff >= 2 && diff <= 4); TEST_CHECK(diff >= 2 && diff <= 4);
} }
TORRENT_TEST(file) TORRENT_TEST(directory)
{ {
test_create_directory();
test_stat();
error_code ec; error_code ec;
create_directory("file_test_dir", ec); create_directory("file_test_dir", ec);
@ -150,8 +147,11 @@ TORRENT_TEST(file)
if (ec) fprintf(stderr, "remove_all: %s\n", ec.message().c_str()); if (ec) fprintf(stderr, "remove_all: %s\n", ec.message().c_str());
remove_all("file_test_dir2", ec); remove_all("file_test_dir2", ec);
if (ec) fprintf(stderr, "remove_all: %s\n", ec.message().c_str()); if (ec) fprintf(stderr, "remove_all: %s\n", ec.message().c_str());
}
// test path functions // test path functions
TORRENT_TEST(paths)
{
TEST_EQUAL(combine_path("test1/", "test2"), "test1/test2"); TEST_EQUAL(combine_path("test1/", "test2"), "test1/test2");
TEST_EQUAL(combine_path("test1", "."), "test1"); TEST_EQUAL(combine_path("test1", "."), "test1");
TEST_EQUAL(combine_path(".", "test1"), "test1"); TEST_EQUAL(combine_path(".", "test1"), "test1");
@ -242,9 +242,11 @@ TORRENT_TEST(file)
#endif #endif
TEST_EQUAL(complete("."), current_working_directory()); TEST_EQUAL(complete("."), current_working_directory());
}
// test split_string // test split_string
TORRENT_TEST(split_string)
{
char const* tags[10]; char const* tags[10];
char tags_str[] = " this is\ta test\t string\x01to be split and it cannot " char tags_str[] = " this is\ta test\t string\x01to be split and it cannot "
"extend over the limit of elements \t"; "extend over the limit of elements \t";
@ -274,11 +276,13 @@ TORRENT_TEST(file)
test = "1.2.3/_"; test = "1.2.3/_";
replace_extension(test, "txt"); replace_extension(test, "txt");
TEST_EQUAL(test, "1.2.3/_.txt"); TEST_EQUAL(test, "1.2.3/_.txt");
}
// file class
// file class TORRENT_TEST(file)
{
error_code ec;
file f; file f;
ec.clear();
#if TORRENT_USE_UNC_PATHS || !defined WIN32 #if TORRENT_USE_UNC_PATHS || !defined WIN32
TEST_CHECK(f.open("con", file::read_write, ec)); TEST_CHECK(f.open("con", file::read_write, ec));
#else #else
@ -302,7 +306,5 @@ TORRENT_TEST(file)
TEST_CHECK(!ec); TEST_CHECK(!ec);
TEST_CHECK(strcmp(test_buf, "test") == 0); TEST_CHECK(strcmp(test_buf, "test") == 0);
f.close(); f.close();
return 0;
} }

2
test/udp_tracker.cpp
View File

@ -224,8 +224,6 @@ int num_udp_announces()
void stop_udp_tracker() void stop_udp_tracker()
{ {
fprintf(stderr, "%s: UDP stop_udp_tracker()\n", time_now_string());
g_udp_tracker.reset(); g_udp_tracker.reset();
fprintf(stderr, "%s: UDP stop_udp_tracker() done\n", time_now_string());
} }