Update cl_assert_equal_sz to be nicer

This makes the size_t comparison test nicer (assuming that the
values are actually not using the full length), and converts
some cases that were using it for pointer comparison to use the
macro that is designed for pointer comparison.
This commit is contained in:
Russell Belfer 2013-03-20 11:46:03 -07:00
parent 7202ec29e9
commit 3ba0136243
2 changed files with 7 additions and 7 deletions

View File

@ -29,7 +29,7 @@
void cl_git_report_failure(int, const char *, int, const char *);
#define cl_assert_equal_sz(sz1,sz2) cl_assert((sz1) == (sz2))
#define cl_assert_equal_sz(sz1,sz2) cl_assert_equal_i((int)sz1, (int)(sz2))
/*
* Some utility macros for building long strings

View File

@ -23,8 +23,8 @@ void test_network_urlparse__trivial(void)
"example.com/resource", "8080"));
cl_assert_equal_s(host, "example.com");
cl_assert_equal_s(port, "8080");
cl_assert_equal_sz(user, NULL);
cl_assert_equal_sz(pass, NULL);
cl_assert_equal_p(user, NULL);
cl_assert_equal_p(pass, NULL);
}
void test_network_urlparse__user(void)
@ -34,7 +34,7 @@ void test_network_urlparse__user(void)
cl_assert_equal_s(host, "example.com");
cl_assert_equal_s(port, "8080");
cl_assert_equal_s(user, "user");
cl_assert_equal_sz(pass, NULL);
cl_assert_equal_p(pass, NULL);
}
void test_network_urlparse__user_pass(void)
@ -55,8 +55,8 @@ void test_network_urlparse__port(void)
"example.com:9191/resource", "8080"));
cl_assert_equal_s(host, "example.com");
cl_assert_equal_s(port, "9191");
cl_assert_equal_sz(user, NULL);
cl_assert_equal_sz(pass, NULL);
cl_assert_equal_p(user, NULL);
cl_assert_equal_p(pass, NULL);
}
void test_network_urlparse__user_port(void)
@ -67,7 +67,7 @@ void test_network_urlparse__user_port(void)
cl_assert_equal_s(host, "example.com");
cl_assert_equal_s(port, "9191");
cl_assert_equal_s(user, "user");
cl_assert_equal_sz(pass, NULL);
cl_assert_equal_p(pass, NULL);
}
void test_network_urlparse__user_pass_port(void)