From b165d67571489d26213dde4fb8e263b70facf6f3 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Mon, 22 Jun 2015 13:24:49 +0200 Subject: [PATCH] tester: use CU_ASSERT_EQUAL instead of CU_ASSERT_TRUE for objects leaked and fix memory leaks in transport_supported helper --- tester/call_tester.c | 22 +++++++++++----------- tester/message_tester.c | 2 +- tester/multicast_call_tester.c | 2 +- tester/offeranswer_tester.c | 4 ++-- tester/tester.c | 1 + 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/tester/call_tester.c b/tester/call_tester.c index 92f56a1e7..939745372 100644 --- a/tester/call_tester.c +++ b/tester/call_tester.c @@ -413,7 +413,7 @@ marie = linphone_core_manager_new( "marie_rc"); linphone_core_manager_destroy(marie); leaked_objects=belle_sip_object_get_object_count()-begin; - BC_ASSERT_TRUE(leaked_objects==0); + BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d"); if (leaked_objects>0){ belle_sip_object_dump_active_objects(); } @@ -459,7 +459,7 @@ static void call_with_timeouted_bye(void) { linphone_core_manager_destroy(pauline); leaked_objects=belle_sip_object_get_object_count()-begin; - BC_ASSERT_TRUE(leaked_objects==0); + BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d"); if (leaked_objects>0){ belle_sip_object_dump_active_objects(); } @@ -3231,7 +3231,7 @@ static void accept_call_in_send_base(bool_t caller_has_ice) { leaked_objects=belle_sip_object_get_object_count()-begin; - BC_ASSERT_TRUE(leaked_objects==0); + BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d"); if (leaked_objects>0){ belle_sip_object_dump_active_objects(); } @@ -3277,7 +3277,7 @@ void two_accepted_call_in_send_only() { leaked_objects=belle_sip_object_get_object_count()-begin; - BC_ASSERT_TRUE(leaked_objects==0); + BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d"); if (leaked_objects>0){ belle_sip_object_dump_active_objects(); } @@ -3424,7 +3424,7 @@ end: linphone_core_manager_destroy(pauline); leaked_objects=belle_sip_object_get_object_count()-begin; - BC_ASSERT_TRUE(leaked_objects==0); + BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d"); if (leaked_objects>0){ belle_sip_object_dump_active_objects(); } @@ -3473,7 +3473,7 @@ end: linphone_core_manager_destroy(pauline); leaked_objects=belle_sip_object_get_object_count()-begin; - BC_ASSERT_TRUE(leaked_objects==0); + BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d"); if (leaked_objects>0){ belle_sip_object_dump_active_objects(); } @@ -3515,7 +3515,7 @@ end: linphone_core_manager_destroy(pauline); leaked_objects=belle_sip_object_get_object_count()-begin; - BC_ASSERT_TRUE(leaked_objects==0); + BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d"); if (leaked_objects>0){ belle_sip_object_dump_active_objects(); } @@ -3734,7 +3734,7 @@ end: linphone_core_manager_destroy(pauline); leaked_objects=belle_sip_object_get_object_count()-begin; - BC_ASSERT_TRUE(leaked_objects==0); + BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d"); if (leaked_objects>0){ belle_sip_object_dump_active_objects(); } @@ -3878,7 +3878,7 @@ static void call_with_generic_cn(void) { linphone_core_manager_destroy(pauline); leaked_objects=belle_sip_object_get_object_count()-begin; - BC_ASSERT_TRUE(leaked_objects==0); + BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d"); if (leaked_objects>0){ belle_sip_object_dump_active_objects(); } @@ -4035,7 +4035,7 @@ static void video_call_with_re_invite_inactive_followed_by_re_invite_base(Linpho linphone_core_manager_destroy(pauline); leaked_objects=belle_sip_object_get_object_count()-begin; - BC_ASSERT_TRUE(leaked_objects==0); + BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d"); if (leaked_objects>0){ belle_sip_object_dump_active_objects(); } @@ -4143,7 +4143,7 @@ end: ms_free(recordpath); leaked_objects=belle_sip_object_get_object_count()-begin; - BC_ASSERT_TRUE(leaked_objects==0); + BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d"); if (leaked_objects>0){ belle_sip_object_dump_active_objects(); } diff --git a/tester/message_tester.c b/tester/message_tester.c index c125dbc3f..eeba447ca 100644 --- a/tester/message_tester.c +++ b/tester/message_tester.c @@ -383,7 +383,7 @@ static void text_message_with_ack(void) { linphone_core_manager_destroy(pauline); } leaked_objects=belle_sip_object_get_object_count()-begin; - BC_ASSERT_TRUE(leaked_objects==0); + BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d"); if (leaked_objects>0){ belle_sip_object_dump_active_objects(); } diff --git a/tester/multicast_call_tester.c b/tester/multicast_call_tester.c index 05c8ebe09..4c85ea9ee 100644 --- a/tester/multicast_call_tester.c +++ b/tester/multicast_call_tester.c @@ -69,7 +69,7 @@ static void call_multicast_base(bool_t video) { linphone_core_manager_destroy(pauline); leaked_objects=belle_sip_object_get_object_count()-begin; - BC_ASSERT_TRUE(leaked_objects==0); + BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d"); if (leaked_objects>0){ belle_sip_object_dump_active_objects(); } diff --git a/tester/offeranswer_tester.c b/tester/offeranswer_tester.c index 21bd86fbb..8a5667391 100644 --- a/tester/offeranswer_tester.c +++ b/tester/offeranswer_tester.c @@ -113,7 +113,7 @@ static void simple_call_with_different_codec_mappings(void) { linphone_core_manager_destroy(pauline); leaked_objects=belle_sip_object_get_object_count()-begin; - BC_ASSERT_TRUE(leaked_objects==0); + BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d"); if (leaked_objects>0){ belle_sip_object_dump_active_objects(); } @@ -147,7 +147,7 @@ static void call_failed_because_of_codecs(void) { linphone_core_manager_destroy(pauline); } leaked_objects=belle_sip_object_get_object_count()-begin; - BC_ASSERT_TRUE(leaked_objects==0); + BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d"); if (leaked_objects>0){ belle_sip_object_dump_active_objects(); } diff --git a/tester/tester.c b/tester/tester.c index 092621261..42e5140f7 100644 --- a/tester/tester.c +++ b/tester/tester.c @@ -229,6 +229,7 @@ bool_t transport_supported(LinphoneTransportType transport) { Sal *sal = sal_init(); bool_t supported = sal_transport_available(sal,(SalTransport)transport); if (!supported) ms_warning("TLS transport not supported, falling back to TCP if possible otherwise skipping test."); + sal_uninit(sal); return supported; }