From 1bf2184087b6b10d8f112aa71c32ddad7c534caa Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 2 Jul 2020 16:28:37 +0200
Subject: [PATCH] ndisc/tests: make assertion checks a macro and not a function
 in test-ndisc-fake

By having it a function, the assertion failure does not show the line
number of the origin. Make them a macro, so that we see where exactly it
failed.

(cherry picked from commit 3b896cc64237262055cc44abb7e914c905e33ecf)
(cherry picked from commit b1a7eda71d73de410736b23ca82a70b7eeba239b)
(cherry picked from commit 8316943338bab1f5682e0e1f222e570a394a5410)
(cherry picked from commit 017bfbf4d72b5bc926e62ebb6de832e6385964aa)
(cherry picked from commit 95beb170ea84220fbcf159582ce08a0819470b5a)
---
 src/ndisc/tests/test-ndisc-fake.c | 75 ++++++++++++++++---------------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/src/ndisc/tests/test-ndisc-fake.c b/src/ndisc/tests/test-ndisc-fake.c
index d2291d4495..439427f5e5 100644
--- a/src/ndisc/tests/test-ndisc-fake.c
+++ b/src/ndisc/tests/test-ndisc-fake.c
@@ -62,44 +62,45 @@ match_gateway (const NMNDiscData *rdata, guint idx, const char *addr, guint32 ts
 	g_assert_cmpint (gw->preference, ==, pref);
 }
 
-static void
-match_address (const NMNDiscData *rdata, guint idx, const char *addr, guint32 ts, guint32 lt, guint32 preferred)
-{
-	const NMNDiscAddress *a;
-	char buf[INET6_ADDRSTRLEN];
+#define match_address(rdata, idx, addr, ts, lt, pref) \
+	G_STMT_START { \
+		const NMNDiscData *_rdata = (rdata); \
+		guint _idx = (idx); \
+		const NMNDiscAddress *_a; \
+		\
+		g_assert (_rdata); \
+		g_assert_cmpint (_idx, <, _rdata->addresses_n); \
+		g_assert (_rdata->addresses); \
+		\
+		_a = &_rdata->addresses[_idx]; \
+		\
+		nmtst_assert_ip6_address (&_a->address, (addr)); \
+		g_assert_cmpint (_a->timestamp, ==, (ts)); \
+		g_assert_cmpint (_a->lifetime, ==, (lt)); \
+		g_assert_cmpint (_a->preferred, ==, (pref)); \
+	} G_STMT_END
 
-	g_assert (rdata);
-	g_assert_cmpint (idx, <, rdata->addresses_n);
-	g_assert (rdata->addresses);
-
-	a = &rdata->addresses[idx];
-
-	g_assert_cmpstr (inet_ntop (AF_INET6, &a->address, buf, sizeof (buf)), ==, addr);
-	g_assert_cmpint (a->timestamp, ==, ts);
-	g_assert_cmpint (a->lifetime, ==, lt);
-	g_assert_cmpint (a->preferred, ==, preferred);
-}
-
-static void
-match_route (const NMNDiscData *rdata, guint idx, const char *nw, int plen, const char *gw, guint32 ts, guint32 lt, NMIcmpv6RouterPref pref)
-{
-	const NMNDiscRoute *route;
-	char buf[INET6_ADDRSTRLEN];
-
-	g_assert (rdata);
-	g_assert_cmpint (idx, <, rdata->routes_n);
-	g_assert (rdata->routes);
-	g_assert (plen > 0 && plen <= 128);
-
-	route = &rdata->routes[idx];
-
-	g_assert_cmpstr (inet_ntop (AF_INET6, &route->network, buf, sizeof (buf)), ==, nw);
-	g_assert_cmpint ((int) route->plen, ==, plen);
-	g_assert_cmpstr (inet_ntop (AF_INET6, &route->gateway, buf, sizeof (buf)), ==, gw);
-	g_assert_cmpint (route->timestamp, ==, ts);
-	g_assert_cmpint (route->lifetime, ==, lt);
-	g_assert_cmpint (route->preference, ==, pref);
-}
+#define match_route(rdata, idx, nw, pl, gw, ts, lt, pref) \
+	G_STMT_START { \
+		const NMNDiscData *_rdata = (rdata); \
+		guint _idx = (idx); \
+		const NMNDiscRoute *_r; \
+		int _plen = (pl); \
+		\
+		g_assert (_rdata); \
+		g_assert_cmpint (_idx, <, _rdata->routes_n); \
+		g_assert (_rdata->routes); \
+		g_assert (_plen > 0 && _plen <= 128); \
+		\
+		_r = &_rdata->routes[idx]; \
+		\
+		nmtst_assert_ip6_address (&_r->network, (nw)); \
+		g_assert_cmpint ((int) _r->plen, ==, _plen); \
+		nmtst_assert_ip6_address (&_r->gateway, (gw)); \
+		g_assert_cmpint (_r->timestamp, ==, (ts)); \
+		g_assert_cmpint (_r->lifetime, ==, (lt)); \
+		g_assert_cmpint (_r->preference, ==, (pref)); \
+	} G_STMT_END
 
 static void
 match_dns_server (const NMNDiscData *rdata, guint idx, const char *addr, guint32 ts, guint32 lt)