tests: Add free_test_data function

Freeing of the serialize_test_data structure is now done by one function
in helpers.c

Change-Id: I9b0b638e2c7faee461f8b95caa8da8c39a3e5c6c
Signed-off-by: Konrad Kuchciak <k.kuchciak@samsung.com>

diff --git a/tests/unit/decision_made_event_tests.c b/tests/unit/decision_made_event_tests.c
index 38dd57f5be22708e2788da453ebe6739ef07aa47..8b2ebf0c668aa640059b5b1a29580970b29a7c13 100644 (file)
--- a/tests/unit/decision_made_event_tests.c
+++ b/tests/unit/decision_made_event_tests.c
@@ -66,8 +66,7 @@ static int teardown(void **state)
        free(dm_ev->action);
        free(dm_ev->reason);
        free(dm_ev);
-       serialized_elems_free(td->test_data, td->size);
-       free(td);
+       free_test_data(td);
 
        return 0;
 }

diff --git a/tests/unit/helpers.h b/tests/unit/helpers.h
index a1e8e6fffb590649d7a5dca1b117073c72615e67..6275cadebf70d2666711a37eee1a3c98a5a54de7 100644 (file)
--- a/tests/unit/helpers.h
+++ b/tests/unit/helpers.h
@@ -126,4 +126,10 @@ static inline void free_service(struct systemd_service *srv)
        free(srv->recovery_unit);
 }
 
+static inline void free_test_data(struct serialize_test_data *td)
+{
+       serialized_elems_free(td->test_data, td->size);
+       free(td);
+}
+
 #endif /* FAULTD_HELPERS_H */

diff --git a/tests/unit/resource_violation_event_tests.c b/tests/unit/resource_violation_event_tests.c
index e4cea82b7ec999ca673f8cfd18de1a8a3fddf3d2..3f802d24481ecf61679d0dc463aa1ab7befe90f1 100644 (file)
--- a/tests/unit/resource_violation_event_tests.c
+++ b/tests/unit/resource_violation_event_tests.c
@@ -57,8 +57,8 @@ static int teardown(void **state)
        free_event(&rv_ev->event);
        free_service(&rv_ev->service);
        free(rv_ev);
-       serialized_elems_free(td->test_data, td->size);
-       free(td);
+       free_test_data(td);
+
        return 0;
 }
 

diff --git a/tests/unit/service_failed_event_tests.c b/tests/unit/service_failed_event_tests.c
index 3c78cd507e9715a55d342bb49ac40794324d91fd..0707eb4be159bcfe3b8c883341af29f1ab71c3bd 100644 (file)
--- a/tests/unit/service_failed_event_tests.c
+++ b/tests/unit/service_failed_event_tests.c
@@ -53,8 +53,8 @@ static int teardown(void **state)
        free_event(&sf_ev->event);
        free_service(&sf_ev->service);
        free(sf_ev);
-       serialized_elems_free(td->test_data, td->size);
-       free(td);
+       free_test_data(td);
+
        return 0;
 }
 

diff --git a/tests/unit/system_booted_event_tests.c b/tests/unit/system_booted_event_tests.c
index d6b261d3ab51b7ef7e0bc7185712949608e0ed95..ca12e2cc7e7fe72137875c558a30ae3105416551 100644 (file)
--- a/tests/unit/system_booted_event_tests.c
+++ b/tests/unit/system_booted_event_tests.c
@@ -45,8 +45,8 @@ static int teardown(void **state)
 
        free_event(&sb_ev->event);
        free(sb_ev);
-       serialized_elems_free(td->test_data, td->size);
-       free(td);
+       free_test_data(td);
+
        return 0;
 }