March 2012 - tor-commits - lists.torproject.org

[tor/master] Use test_streq in format_helper_exit_status tests
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 6b3854f8a37a50f7e48ca3552d3c031bd04a8a5e Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Fri Feb 10 23:41:39 2012 +0100 Use test_streq in format_helper_exit_status tests --- src/test/test_util.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index e0d3540..78a93a8 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1721,23 +1721,23 @@ test_util_exit_status(void *ptr) clear_hex_errno(hex_errno); format_helper_exit_status(0, 0, hex_errno); - tt_str_op(hex_errno, ==, " 0/0\n"); + test_streq(" 0/0\n", hex_errno); clear_hex_errno(hex_errno); format_helper_exit_status(0, 0x7FFFFFFF, hex_errno); - tt_str_op(hex_errno, ==, " 0/7FFFFFFF\n"); + test_streq(" 0/7FFFFFFF\n", hex_errno); clear_hex_errno(hex_errno); format_helper_exit_status(0xFF, -0x80000000, hex_errno); - tt_str_op(hex_errno, ==, "FF/-80000000\n"); + test_streq("FF/-80000000\n", hex_errno); clear_hex_errno(hex_errno); format_helper_exit_status(0x7F, 0, hex_errno); - tt_str_op(hex_errno, ==, " 7F/0\n"); + test_streq(" 7F/0\n", hex_errno); clear_hex_errno(hex_errno); format_helper_exit_status(0x08, -0x242, hex_errno); - tt_str_op(hex_errno, ==, " 8/-242\n"); + test_streq(" 8/-242\n", hex_errno); done: ;

1 0

[tor/master] Improve get_parent_directory unit tests
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 22a915bcd21f4dadff11e951099e7b9e15f8ad7f Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Fri Feb 10 23:33:37 2012 +0100 Improve get_parent_directory unit tests * Add more test cases to the get_parent_directory tests * Switch the parameter order so that the expected value is the first one --- src/test/test_util.c | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 4c3a364..e0d3540 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1652,24 +1652,40 @@ test_util_parent_dir(void *ptr) char *cp; (void)ptr; -#define T(input,expect_ok,output) \ +#define T(output,expect_ok,input) \ do { \ int ok; \ cp = tor_strdup(input); \ ok = get_parent_directory(cp); \ - tt_int_op(ok, ==, expect_ok); \ + tt_int_op(expect_ok, ==, ok); \ if (ok==0) \ - tt_str_op(cp, ==, output); \ + tt_str_op(output, ==, cp); \ tor_free(cp); \ } while (0); - T("/home/wombat/knish", 0, "/home/wombat"); - T("/home/wombat/knish/", 0, "/home/wombat"); - T("./home/wombat/knish/", 0, "./home/wombat"); - T("./wombat", 0, "."); + T("/home/wombat", 0, "/home/wombat/knish"); + T("/home/wombat", 0, "/home/wombat/knish/"); + T("/home/wombat", 0, "/home/wombat/knish///"); + T("./home/wombat", 0, "./home/wombat/knish/"); + T(".", 0, "./wombat"); + T(".", 0, "./wombat/"); + T(".", 0, "./wombat//"); + T("wombat", 0, "wombat/foo"); + T("wombat/..", 0, "wombat/../foo"); + T("wombat/../", 0, "wombat/..//foo"); /* Is this correct? */ + T("wombat", 0, "wombat/..//"); + T("wombat", 0, "wombat/foo/"); + T("wombat", 0, "wombat/.foo"); + T("wombat", 0, "wombat/.foo/"); + T("", -1, ""); - T("/", -1, ""); - T("////", -1, ""); + T("", -1, "."); + T("", -1, ".."); + T("", -1, "../"); + T("", -1, "/"); + T("", -1, "////"); + T("", -1, "wombat"); + T("", -1, "wombat/"); done: tor_free(cp);

1 0

[tor/master] Use test_eq et al in spawn_background unit tests
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 7b8a7556a8bec8e2b3e5a3796cad0f6d4c7ca393 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Sat Feb 11 00:00:52 2012 +0100 Use test_eq et al in spawn_background unit tests --- src/test/test_util.c | 54 +++++++++++++++++++++++++------------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 78a93a8..ba5f332 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1849,37 +1849,37 @@ run_util_spawn_background(const char *argv[], const char *expected_out, status = tor_spawn_background(argv[0], argv, NULL, &process_handle); #endif - tt_int_op(status, ==, expected_status); + test_eq(expected_status, status); if (status == PROCESS_STATUS_ERROR) return; - tt_assert(process_handle != NULL); - tt_int_op(process_handle->status, ==, expected_status); + test_assert(process_handle != NULL); + test_eq(expected_status, process_handle->status); - tt_int_op(process_handle->stdout_pipe, >, 0); - tt_int_op(process_handle->stderr_pipe, >, 0); + test_assert(process_handle->stdout_pipe > 0); + test_assert(process_handle->stderr_pipe > 0); /* Check stdout */ pos = tor_read_all_from_process_stdout(process_handle, stdout_buf, sizeof(stdout_buf) - 1); tt_assert(pos >= 0); stdout_buf[pos] = '\0'; - tt_str_op(stdout_buf, ==, expected_out); - tt_int_op(pos, ==, strlen(expected_out)); + test_eq(strlen(expected_out), pos); + test_streq(expected_out, stdout_buf); /* Check it terminated correctly */ retval = tor_get_exit_code(process_handle, 1, &exit_code); - tt_int_op(retval, ==, PROCESS_EXIT_EXITED); - tt_int_op(exit_code, ==, expected_exit); + test_eq(PROCESS_EXIT_EXITED, retval); + test_eq(expected_exit, exit_code); // TODO: Make test-child exit with something other than 0 /* Check stderr */ pos = tor_read_all_from_process_stderr(process_handle, stderr_buf, sizeof(stderr_buf) - 1); - tt_assert(pos >= 0); + test_assert(pos >= 0); stderr_buf[pos] = '\0'; - tt_str_op(stderr_buf, ==, expected_err); - tt_int_op(pos, ==, strlen(expected_err)); + test_streq(expected_err, stderr_buf); + test_eq(strlen(expected_err), pos); done: if (process_handle) @@ -1969,9 +1969,9 @@ test_util_spawn_background_partial_read(void *ptr) #else status = tor_spawn_background(argv[0], argv, NULL, &process_handle); #endif - tt_int_op(status, ==, expected_status); - tt_assert(process_handle); - tt_int_op(process_handle->status, ==, expected_status); + test_eq(expected_status, status); + test_assert(process_handle); + test_eq(expected_status, process_handle->status); /* Check stdout */ for (expected_out_ctr = 0; expected_out[expected_out_ctr] != NULL;) { @@ -1980,7 +1980,7 @@ test_util_spawn_background_partial_read(void *ptr) sizeof(stdout_buf) - 1, NULL); #else /* Check that we didn't read the end of file last time */ - tt_assert(!eof); + test_assert(!eof); pos = tor_read_all_handle(process_handle->stdout_handle, stdout_buf, sizeof(stdout_buf) - 1, NULL, &eof); #endif @@ -1990,10 +1990,10 @@ test_util_spawn_background_partial_read(void *ptr) if (0 == pos) continue; - tt_int_op(pos, >, 0); + test_assert(pos > 0); stdout_buf[pos] = '\0'; - tt_str_op(stdout_buf, ==, expected_out[expected_out_ctr]); - tt_int_op(pos, ==, strlen(expected_out[expected_out_ctr])); + test_streq(expected_out[expected_out_ctr], stdout_buf); + test_eq(strlen(expected_out[expected_out_ctr]), pos); expected_out_ctr++; } @@ -2002,33 +2002,33 @@ test_util_spawn_background_partial_read(void *ptr) pos = tor_read_all_handle(process_handle->stdout_pipe, stdout_buf, sizeof(stdout_buf) - 1, process_handle); - tt_int_op(pos, ==, 0); + test_eq(0, pos); #else if (!eof) { /* We should have got all the data, but maybe not the EOF flag */ pos = tor_read_all_handle(process_handle->stdout_handle, stdout_buf, sizeof(stdout_buf) - 1, process_handle, &eof); - tt_int_op(pos, ==, 0); - tt_assert(eof); + test_eq(0, pos); + test_assert(eof); } /* Otherwise, we got the EOF on the last read */ #endif /* Check it terminated correctly */ retval = tor_get_exit_code(process_handle, 1, &exit_code); - tt_int_op(retval, ==, PROCESS_EXIT_EXITED); - tt_int_op(exit_code, ==, expected_exit); + test_eq(PROCESS_EXIT_EXITED, retval); + test_eq(expected_exit, exit_code); // TODO: Make test-child exit with something other than 0 /* Check stderr */ pos = tor_read_all_from_process_stderr(process_handle, stderr_buf, sizeof(stderr_buf) - 1); - tt_assert(pos >= 0); + test_assert(pos >= 0); stderr_buf[pos] = '\0'; - tt_str_op(stderr_buf, ==, expected_err); - tt_int_op(pos, ==, strlen(expected_err)); + test_streq(expected_err, stderr_buf); + test_eq(strlen(expected_err), pos); done: tor_process_handle_destroy(process_handle, 1);

1 0

[tor/master] Put expected first in n_bits_set_u8 unit tests
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 3e4a977781fe0ae85ec9677e9496de5451e5c824 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Sat Feb 11 01:20:09 2012 +0100 Put expected first in n_bits_set_u8 unit tests --- src/test/test_util.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index a7554a4..809039b 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2214,10 +2214,12 @@ static void test_util_n_bits_set(void *ptr) { (void)ptr; - test_eq(n_bits_set_u8(0), 0); - test_eq(n_bits_set_u8(1), 1); - test_eq(n_bits_set_u8(129), 2); - test_eq(n_bits_set_u8(255), 8); + test_eq(0, n_bits_set_u8(0)); + test_eq(1, n_bits_set_u8(1)); + test_eq(3, n_bits_set_u8(7)); + test_eq(1, n_bits_set_u8(8)); + test_eq(2, n_bits_set_u8(129)); + test_eq(8, n_bits_set_u8(255)); done: ; }

1 0

[tor/master] Improve tor_split_lines unit tests
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit afb89b83f2d69833fd2c6625c786f6ac71219ac9 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Sat Feb 11 00:30:11 2012 +0100 Improve tor_split_lines unit tests * Add some more test cases * Switch to test_assert et al --- src/test/test_util.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index ea8dbb5..a7554a4 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2085,7 +2085,7 @@ test_util_join_win_cmdline(void *ptr) ; } -#define MAX_SPLIT_LINE_COUNT 3 +#define MAX_SPLIT_LINE_COUNT 4 struct split_lines_test_t { const char *orig_line; // Line to be split (may contain \0's) int orig_length; // Length of orig_line @@ -2106,6 +2106,12 @@ test_util_split_lines(void *ptr) {"\n\rfoo\n\rbar\r\n", 12, {"foo", "bar", NULL}}, {"fo o\r\nb\tar", 10, {"fo o", "b.ar", NULL}}, {"\x0f""f\0o\0\n\x01""b\0r\0\r", 12, {".f.o.", ".b.r.", NULL}}, + {"line 1\r\nline 2", 14, {"line 1", "line 2", NULL}}, + {"line 1\r\n\r\nline 2", 16, {"line 1", "line 2", NULL}}, + {"line 1\r\n\r\r\r\nline 2", 18, {"line 1", "line 2", NULL}}, + {"line 1\r\n\n\n\n\rline 2", 18, {"line 1", "line 2", NULL}}, + {"line 1\r\n\r\t\r\nline 3", 18, {"line 1", ".", "line 3", NULL}}, + {"\n\t\r\t\nline 3", 11, {".", ".", "line 3", NULL}}, {NULL, 0, { NULL }} }; @@ -2127,17 +2133,17 @@ test_util_split_lines(void *ptr) SMARTLIST_FOREACH(sl, const char *, line, { /* Check we have not got too many lines */ - tt_int_op(j, <, MAX_SPLIT_LINE_COUNT); + test_assert(j < MAX_SPLIT_LINE_COUNT); /* Check that there actually should be a line here */ - tt_assert(tests[i].split_line[j] != NULL); + test_assert(tests[i].split_line[j] != NULL); log_info(LD_GENERAL, "Line %d of test %d, should be <%s>", j, i, tests[i].split_line[j]); /* Check that the line is as expected */ - tt_str_op(tests[i].split_line[j], ==, line); + test_streq(line, tests[i].split_line[j]); j++; }); /* Check that we didn't miss some lines */ - tt_assert(tests[i].split_line[j] == NULL); + test_eq_ptr(NULL, tests[i].split_line[j]); tor_free(orig_line); smartlist_free(sl); sl = NULL;

1 0

[tor/master] Use test_streq in join_win_cmdline unit tests
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 699af29baedee2309f3ecf550c1d39608e1de6e6 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Sat Feb 11 00:04:24 2012 +0100 Use test_streq in join_win_cmdline unit tests --- src/test/test_util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index ba5f332..ea8dbb5 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2077,7 +2077,7 @@ test_util_join_win_cmdline(void *ptr) for (i=0; cmdlines[i]!=NULL; i++) { log_info(LD_GENERAL, "Joining argvs[%d], expecting <%s>", i, cmdlines[i]); joined_argv = tor_join_win_cmdline(argvs[i]); - tt_str_op(joined_argv, ==, cmdlines[i]); + test_streq(cmdlines[i], joined_argv); tor_free(joined_argv); }

1 0

[tor/master] Add extra tests for wrap_string
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 8d62e42fd31e292328adfc67257fb7b936b37c46 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Sat Feb 11 22:44:25 2012 +0100 Add extra tests for wrap_string --- src/test/test_util.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 600bdd5..3efe617 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -747,7 +747,24 @@ test_util_strmisc(void) test_streq(cp, "### A\n# test\n# of\n# stri\n# ng\n# wrap\n# ping\n# ...\n"); tor_free(cp); SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp)); + smartlist_clear(sl); + + wrap_string(sl, "Wrapping test", 6, "#### ", "# "); + cp = smartlist_join_strings(sl, "", 0, NULL); + test_streq(cp, "#### W\n# rapp\n# ing\n# test\n"); + tor_free(cp); + SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp)); + smartlist_clear(sl); + + wrap_string(sl, "Small test", 6, "### ", "#### "); + cp = smartlist_join_strings(sl, "", 0, NULL); + test_streq(cp, "### Sm\n#### a\n#### l\n#### l\n#### t\n#### e\n#### s\n#### t\n"); + tor_free(cp); + SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp)); smartlist_free(sl); + + /* Can't test prefixes that have the same length as the line width, because + the function has an assert */ } /* Test hex_str */

1 0

[tor/master] Tweak test case text so it's clearer
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit fa1d6f812c31d438ecd81f6f9e57a1982fa5ba52 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Sat Feb 11 22:33:49 2012 +0100 Tweak test case text so it's clearer --- src/test/test_util.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index fe6f4d7..f5adad9 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1514,7 +1514,7 @@ test_util_find_str_at_start_of_line(void *ptr) char *line2 = strchr(long_string,'\n')+1; char *line3 = strchr(line2,'\n')+1; const char *short_string = "hello kitty\n" - "third line\n"; + "second line\n"; char *short_line2 = strchr(short_string,'\n')+1; (void)ptr; @@ -1535,7 +1535,7 @@ test_util_find_str_at_start_of_line(void *ptr) test_eq_ptr(line3, find_str_at_start_of_line(long_string, "third line")); test_eq_ptr(NULL, find_str_at_start_of_line(long_string, "third line\n")); test_eq_ptr(short_line2, find_str_at_start_of_line(short_string, - "third line\n")); + "second line\n")); done: ; }

1 0

[tor/master] Improve eat_whitespace* unit tests
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 4beebea698fc2bad233d86646014847c2ec9403e Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Sat Feb 11 01:27:50 2012 +0100 Improve eat_whitespace* unit tests --- src/test/test_util.c | 74 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 48 insertions(+), 26 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 809039b..fe6f4d7 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2240,56 +2240,78 @@ test_util_eat_whitespace(void *ptr) strcpy(str, "fuubaar"); for (i = 0; i < sizeof(ws); ++i) { str[0] = ws[i]; - test_streq(eat_whitespace(str), str + 1); - test_streq(eat_whitespace_eos(str, str + strlen(str)), str + 1); - test_streq(eat_whitespace_eos_no_nl(str, str + strlen(str)), str + 1); - test_streq(eat_whitespace_no_nl(str), str + 1); + test_eq_ptr(str + 1, eat_whitespace(str)); + test_eq_ptr(str + 1, eat_whitespace_eos(str, str + strlen(str))); + test_eq_ptr(str + 1, eat_whitespace_no_nl(str)); + test_eq_ptr(str + 1, eat_whitespace_eos_no_nl(str, str + strlen(str))); } str[0] = '\n'; - test_streq(eat_whitespace(str), str + 1); - test_streq(eat_whitespace_eos(str, str + strlen(str)), str + 1); + test_eq_ptr(str + 1, eat_whitespace(str)); + test_eq_ptr(str + 1, eat_whitespace_eos(str, str + strlen(str))); + test_eq_ptr(str, eat_whitespace_no_nl(str)); + test_eq_ptr(str, eat_whitespace_eos_no_nl(str, str + strlen(str))); /* Empty string */ strcpy(str, ""); - test_eq_ptr(eat_whitespace(str), str); - test_eq_ptr(eat_whitespace_eos(str, str), str); - test_eq_ptr(eat_whitespace_eos_no_nl(str, str), str); - test_eq_ptr(eat_whitespace_no_nl(str), str); + test_eq_ptr(str, eat_whitespace(str)); + test_eq_ptr(str, eat_whitespace_eos(str, str)); + test_eq_ptr(str, eat_whitespace_no_nl(str)); + test_eq_ptr(str, eat_whitespace_eos_no_nl(str, str)); /* Only ws */ strcpy(str, " \t\r\n"); - test_eq_ptr(eat_whitespace(str), str + strlen(str)); - test_eq_ptr(eat_whitespace_eos(str, str + strlen(str)), str + strlen(str)); + test_eq_ptr(str + strlen(str), eat_whitespace(str)); + test_eq_ptr(str + strlen(str), eat_whitespace_eos(str, str + strlen(str))); + test_eq_ptr(str + strlen(str) - 1, + eat_whitespace_no_nl(str)); + test_eq_ptr(str + strlen(str) - 1, + eat_whitespace_eos_no_nl(str, str + strlen(str))); strcpy(str, " \t\r "); - test_eq_ptr(eat_whitespace_no_nl(str), str + strlen(str)); - test_eq_ptr(eat_whitespace_eos_no_nl(str, str + strlen(str)), - str + strlen(str)); + test_eq_ptr(str + strlen(str), eat_whitespace(str)); + test_eq_ptr(str + strlen(str), + eat_whitespace_eos(str, str + strlen(str))); + test_eq_ptr(str + strlen(str), eat_whitespace_no_nl(str)); + test_eq_ptr(str + strlen(str), + eat_whitespace_eos_no_nl(str, str + strlen(str))); /* Multiple ws */ strcpy(str, "fuubaar"); for (i = 0; i < sizeof(ws); ++i) str[i] = ws[i]; - test_streq(eat_whitespace(str), str + sizeof(ws)); - test_streq(eat_whitespace_eos(str, str + strlen(str)), str + sizeof(ws)); - test_streq(eat_whitespace_no_nl(str), str + sizeof(ws)); - test_streq(eat_whitespace_eos_no_nl(str, str + strlen(str)), - str + sizeof(ws)); + test_eq_ptr(str + sizeof(ws), eat_whitespace(str)); + test_eq_ptr(str + sizeof(ws), eat_whitespace_eos(str, str + strlen(str))); + test_eq_ptr(str + sizeof(ws), eat_whitespace_no_nl(str)); + test_eq_ptr(str + sizeof(ws), + eat_whitespace_eos_no_nl(str, str + strlen(str))); /* Eat comment */ strcpy(str, "# Comment \n No Comment"); - test_streq(eat_whitespace(str), "No Comment"); - test_streq(eat_whitespace_eos(str, str + strlen(str)), "No Comment"); + test_streq("No Comment", eat_whitespace(str)); + test_streq("No Comment", eat_whitespace_eos(str, str + strlen(str))); + test_eq_ptr(str, eat_whitespace_no_nl(str)); + test_eq_ptr(str, eat_whitespace_eos_no_nl(str, str + strlen(str))); /* Eat comment & ws mix */ strcpy(str, " # \t Comment \n\t\nNo Comment"); - test_streq(eat_whitespace(str), "No Comment"); - test_streq(eat_whitespace_eos(str, str + strlen(str)), "No Comment"); + test_streq("No Comment", eat_whitespace(str)); + test_streq("No Comment", eat_whitespace_eos(str, str + strlen(str))); + test_eq_ptr(str + 1, eat_whitespace_no_nl(str)); + test_eq_ptr(str + 1, eat_whitespace_eos_no_nl(str, str + strlen(str))); /* Eat entire comment */ strcpy(str, "#Comment"); - test_eq_ptr(eat_whitespace(str), str + strlen(str)); - test_eq_ptr(eat_whitespace_eos(str, str + strlen(str)), str + strlen(str)); + test_eq_ptr(str + strlen(str), eat_whitespace(str)); + test_eq_ptr(str + strlen(str), eat_whitespace_eos(str, str + strlen(str))); + test_eq_ptr(str, eat_whitespace_no_nl(str)); + test_eq_ptr(str, eat_whitespace_eos_no_nl(str, str + strlen(str))); + + /* Blank line, then comment */ + strcpy(str, " \t\n # Comment"); + test_eq_ptr(str + strlen(str), eat_whitespace(str)); + test_eq_ptr(str + strlen(str), eat_whitespace_eos(str, str + strlen(str))); + test_eq_ptr(str + 2, eat_whitespace_no_nl(str)); + test_eq_ptr(str + 2, eat_whitespace_eos_no_nl(str, str + strlen(str))); done: ;

1 0

[tor/master] Add extra tests for get_parent_directory
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 9ae7d511f4d55cf47f0d28bc121bb0460067793a Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Sat Feb 11 22:43:42 2012 +0100 Add extra tests for get_parent_directory --- src/test/test_util.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index f5adad9..600bdd5 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1667,12 +1667,18 @@ test_util_parent_dir(void *ptr) T("/home/wombat", 0, "/home/wombat/knish/"); T("/home/wombat", 0, "/home/wombat/knish///"); T("./home/wombat", 0, "./home/wombat/knish/"); +#if 0 + T("/", 0, "/home"); + T("/", 0, "/home//"); +#endif T(".", 0, "./wombat"); T(".", 0, "./wombat/"); T(".", 0, "./wombat//"); T("wombat", 0, "wombat/foo"); T("wombat/..", 0, "wombat/../foo"); T("wombat/../", 0, "wombat/..//foo"); /* Is this correct? */ + T("wombat/.", 0, "wombat/./foo"); + T("wombat/./", 0, "wombat/.//foo"); /* Is this correct? */ T("wombat", 0, "wombat/..//"); T("wombat", 0, "wombat/foo/"); T("wombat", 0, "wombat/.foo");

1 0