[tepl] testsuite: FileSaver: move function to tepl-test-utils



commit 717eed170caa6ed3593337f591cd64e1b8b7bb26
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri May 22 15:11:53 2020 +0200

    testsuite: FileSaver: move function to tepl-test-utils

 testsuite/tepl-test-utils.c | 11 +++++++++++
 testsuite/tepl-test-utils.h |  3 +++
 testsuite/test-file-saver.c | 19 ++++---------------
 3 files changed, 18 insertions(+), 15 deletions(-)
---
diff --git a/testsuite/tepl-test-utils.c b/testsuite/tepl-test-utils.c
index c647f37..5bfb038 100644
--- a/testsuite/tepl-test-utils.c
+++ b/testsuite/tepl-test-utils.c
@@ -38,6 +38,17 @@ _tepl_test_utils_get_file_content (GFile *file)
        return file_content;
 }
 
+void
+_tepl_test_utils_check_file_content (GFile       *file,
+                                    const gchar *expected_file_content)
+{
+       gchar *received_file_content;
+
+       received_file_content = _tepl_test_utils_get_file_content (file);
+       g_assert_true (g_str_equal (received_file_content, expected_file_content));
+       g_free (received_file_content);
+}
+
 struct _TeplWaitSignalData
 {
        guint signal_received : 1;
diff --git a/testsuite/tepl-test-utils.h b/testsuite/tepl-test-utils.h
index 04a90d5..e4f7ea3 100644
--- a/testsuite/tepl-test-utils.h
+++ b/testsuite/tepl-test-utils.h
@@ -16,6 +16,9 @@ void  _tepl_test_utils_set_file_content       (GFile       *file,
 
 gchar *        _tepl_test_utils_get_file_content       (GFile *file);
 
+void   _tepl_test_utils_check_file_content     (GFile       *file,
+                                                const gchar *expected_file_content);
+
 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 1e18f6a..6eb52b1 100644
--- a/testsuite/test-file-saver.c
+++ b/testsuite/test-file-saver.c
@@ -5,17 +5,6 @@
 #include <tepl/tepl.h>
 #include "tepl-test-utils.h"
 
-static void
-check_equal_content (GFile       *file,
-                    const gchar *content)
-{
-       gchar *file_content;
-
-       file_content = _tepl_test_utils_get_file_content (file);
-       g_assert_true (g_str_equal (file_content, content));
-       g_free (file_content);
-}
-
 static GFile *
 get_tmp_location (void)
 {
@@ -71,7 +60,7 @@ check_save_content (const gchar *content)
        saver = tepl_file_saver_new_with_target (buffer, file, location);
 
        save_sync (saver);
-       check_equal_content (location, content);
+       _tepl_test_utils_check_file_content (location, content);
 
        g_object_unref (buffer);
        g_object_unref (file);
@@ -106,7 +95,7 @@ test_backup (void)
 
        saver = tepl_file_saver_new_with_target (buffer, file, location);
        save_sync (saver);
-       check_equal_content (location, "contentA");
+       _tepl_test_utils_check_file_content (location, "contentA");
        g_object_unref (saver);
 
        gtk_text_buffer_set_text (GTK_TEXT_BUFFER (buffer), "contentB", -1);
@@ -114,11 +103,11 @@ test_backup (void)
        saver = tepl_file_saver_new_with_target (buffer, file, location);
        tepl_file_saver_set_flags (saver, TEPL_FILE_SAVER_FLAGS_CREATE_BACKUP);
        save_sync (saver);
-       check_equal_content (location, "contentB");
+       _tepl_test_utils_check_file_content (location, "contentB");
        g_object_unref (saver);
 
        backup_location = get_tmp_backup_location ();
-       check_equal_content (backup_location, "contentA");
+       _tepl_test_utils_check_file_content (backup_location, "contentA");
 
        g_object_unref (buffer);
        g_object_unref (file);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]