Commit 3ba01362437102501a173b9fe072a5690358baa0
2013-03-20T11:46:03
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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57
diff --git a/tests-clar/clar_libgit2.h b/tests-clar/clar_libgit2.h
index 321ec5f..667b805 100644
--- a/tests-clar/clar_libgit2.h
+++ b/tests-clar/clar_libgit2.h
@@ -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
diff --git a/tests-clar/network/urlparse.c b/tests-clar/network/urlparse.c
index 84d0bfb..173e57d 100644
--- a/tests-clar/network/urlparse.c
+++ b/tests-clar/network/urlparse.c
@@ -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)