[tepl] testsuite: FileSaver: move function to tepl-test-utils
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tepl] testsuite: FileSaver: move function to tepl-test-utils
- Date: Fri, 22 May 2020 13:03:07 +0000 (UTC)
commit 58aef63e99eb38c7437ea4ad2e2a3fcaa853c260
Author: Sébastien Wilmet <swilmet gnome org>
Date: Fri May 22 15:01:45 2020 +0200
testsuite: FileSaver: move function to tepl-test-utils
testsuite/tepl-test-utils.c | 13 +++++++++++++
testsuite/tepl-test-utils.h | 2 ++
testsuite/test-file-saver.c | 16 ++--------------
3 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/testsuite/tepl-test-utils.c b/testsuite/tepl-test-utils.c
index e574d49..c647f37 100644
--- a/testsuite/tepl-test-utils.c
+++ b/testsuite/tepl-test-utils.c
@@ -25,6 +25,19 @@ _tepl_test_utils_set_file_content (GFile *file,
g_assert_no_error (error);
}
+gchar *
+_tepl_test_utils_get_file_content (GFile *file)
+{
+ GError *error = NULL;
+ gchar *file_content = NULL;
+
+ g_file_load_contents (file, NULL, &file_content, NULL, NULL, &error);
+ g_assert_no_error (error);
+ g_assert_true (file_content != NULL);
+
+ return file_content;
+}
+
struct _TeplWaitSignalData
{
guint signal_received : 1;
diff --git a/testsuite/tepl-test-utils.h b/testsuite/tepl-test-utils.h
index cfa1a2e..04a90d5 100644
--- a/testsuite/tepl-test-utils.h
+++ b/testsuite/tepl-test-utils.h
@@ -14,6 +14,8 @@ typedef struct _TeplWaitSignalData TeplWaitSignalData;
void _tepl_test_utils_set_file_content (GFile *file,
const gchar *content);
+gchar * _tepl_test_utils_get_file_content (GFile *file);
+
TeplWaitSignalData *
_tepl_test_utils_wait_signal_setup (GObject *object,
const gchar *detailed_signal_name);
diff --git a/testsuite/test-file-saver.c b/testsuite/test-file-saver.c
index ac90570..1e18f6a 100644
--- a/testsuite/test-file-saver.c
+++ b/testsuite/test-file-saver.c
@@ -3,19 +3,7 @@
*/
#include <tepl/tepl.h>
-
-static gchar *
-get_file_content (GFile *file)
-{
- GError *error = NULL;
- gchar *file_content = NULL;
-
- g_file_load_contents (file, NULL, &file_content, NULL, NULL, &error);
- g_assert_no_error (error);
- g_assert_true (file_content != NULL);
-
- return file_content;
-}
+#include "tepl-test-utils.h"
static void
check_equal_content (GFile *file,
@@ -23,7 +11,7 @@ check_equal_content (GFile *file,
{
gchar *file_content;
- file_content = get_file_content (file);
+ file_content = _tepl_test_utils_get_file_content (file);
g_assert_true (g_str_equal (file_content, content));
g_free (file_content);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]