[Git][NTPsec/ntpsec][master] Use TEST_ASSERT_NULL/TEST_ASSERT_NOT_NULL macros for clarity

[Matt Selsky]

Matt Selsky pushed to branch master at NTPsec / ntpsec


Commits:
35ebc3c8 by Matt Selsky at 2017-05-27T22:34:59-04:00
Use TEST_ASSERT_NULL/TEST_ASSERT_NOT_NULL macros for clarity

Avoid testing for NULL and not NULL directly via TEST_ASSERT_TRUE

- - - - -


3 changed files:

- tests/libntp/humandate.c
- tests/libntp/netof.c
- tests/libntp/recvbuff.c


Changes:

=====================================
tests/libntp/humandate.c
=====================================
--- a/tests/libntp/humandate.c
+++ b/tests/libntp/humandate.c
@@ -20,7 +20,7 @@ TEST(humandate, RegularTime) {
 
 	struct tm* tm;
 	tm = localtime_r(&sample, &tmbuf);
-	TEST_ASSERT_TRUE(tm != NULL);
+	TEST_ASSERT_NOT_NULL(tm);
 
 	snprintf(expected, 255, "%02d:%02d:%02d", tm->tm_hour, tm->tm_min, tm->tm_sec);
 
@@ -37,7 +37,7 @@ TEST(humandate, CurrentTime) {
 
 	struct tm* tm;
 	tm = localtime_r(&sample, &tmbuf);
-	TEST_ASSERT_TRUE(tm != NULL);
+	TEST_ASSERT_NOT_NULL(tm);
 
 	snprintf(expected, 255, "%02d:%02d:%02d", tm->tm_hour, tm->tm_min, tm->tm_sec);
 


=====================================
tests/libntp/netof.c
=====================================
--- a/tests/libntp/netof.c
+++ b/tests/libntp/netof.c
@@ -19,7 +19,7 @@ TEST(netof, ClassBAddress) {
 
 	sockaddr_u* actual = netof(&input);
 
-	TEST_ASSERT_TRUE(actual != NULL);
+	TEST_ASSERT_NOT_NULL(actual);
 	TEST_ASSERT_TRUE(IsEqualS(&expected, actual));
 }
 
@@ -29,7 +29,7 @@ TEST(netof, ClassCAddress) {
 
 	sockaddr_u* actual = netof(&input);
 
-	TEST_ASSERT_TRUE(actual != NULL);
+	TEST_ASSERT_NOT_NULL(actual);
 	TEST_ASSERT_TRUE(IsEqualS(&expected, actual));
 }
 
@@ -42,7 +42,7 @@ TEST(netof, ClassAAddress) {
 
 	sockaddr_u* actual = netof(&input);
 
-	TEST_ASSERT_TRUE(actual != NULL);
+	TEST_ASSERT_NOT_NULL(actual);
 	TEST_ASSERT_TRUE(IsEqualS(&expected, actual));
 }
 
@@ -74,7 +74,7 @@ TEST(netof, IPv6Address) {
 
 	sockaddr_u* actual = netof(&input);
 
-	TEST_ASSERT_TRUE(actual != NULL);
+	TEST_ASSERT_NOT_NULL(actual);
 	TEST_ASSERT_TRUE(IsEqualS(&expected, actual));
 }
 


=====================================
tests/libntp/recvbuff.c
=====================================
--- a/tests/libntp/recvbuff.c
+++ b/tests/libntp/recvbuff.c
@@ -19,7 +19,7 @@ TEST(recvbuff, Initialization) {
 	TEST_ASSERT_EQUAL(RECV_INIT, free_recvbuffs());
 	TEST_ASSERT_EQUAL(0, full_recvbuffs());
 	TEST_ASSERT_FALSE(has_full_recv_buffer());
-	TEST_ASSERT_TRUE(get_full_recv_buffer() == NULL);
+	TEST_ASSERT_NULL(get_full_recv_buffer());
 }
 
 TEST(recvbuff, GetAndFree) {



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/35ebc3c80a43c1cffc51868cb93d6890bdcde914

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/35ebc3c80a43c1cffc51868cb93d6890bdcde914
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170528/78f2ebea/attachment.html>