[tepl] testsuite: MetadataManager: move function to tepl-test-utils
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tepl] testsuite: MetadataManager: move function to tepl-test-utils
- Date: Fri, 22 May 2020 13:24:06 +0000 (UTC)
commit 256715919bfc5700245cca49f3b1a299a78fbc92
Author: Sébastien Wilmet <swilmet gnome org>
Date: Fri May 22 15:22:37 2020 +0200
testsuite: MetadataManager: move function to tepl-test-utils
testsuite/tepl-test-utils.c | 13 +++++++++++++
testsuite/tepl-test-utils.h | 19 +++++++++++--------
testsuite/test-metadata-manager.c | 29 ++---------------------------
3 files changed, 26 insertions(+), 35 deletions(-)
---
diff --git a/testsuite/tepl-test-utils.c b/testsuite/tepl-test-utils.c
index 5bfb038..22de494 100644
--- a/testsuite/tepl-test-utils.c
+++ b/testsuite/tepl-test-utils.c
@@ -49,6 +49,19 @@ _tepl_test_utils_check_file_content (GFile *file,
g_free (received_file_content);
}
+void
+_tepl_test_utils_check_equal_files_content (GFile *file1,
+ GFile *file2)
+{
+ gchar *file1_content = _tepl_test_utils_get_file_content (file1);
+ gchar *file2_content = _tepl_test_utils_get_file_content (file2);
+
+ g_assert_true (g_str_equal (file1_content, file2_content));
+
+ g_free (file1_content);
+ g_free (file2_content);
+}
+
struct _TeplWaitSignalData
{
guint signal_received : 1;
diff --git a/testsuite/tepl-test-utils.h b/testsuite/tepl-test-utils.h
index e4f7ea3..172cad1 100644
--- a/testsuite/tepl-test-utils.h
+++ b/testsuite/tepl-test-utils.h
@@ -11,19 +11,22 @@ G_BEGIN_DECLS
typedef struct _TeplWaitSignalData TeplWaitSignalData;
-void _tepl_test_utils_set_file_content (GFile *file,
- const gchar *content);
+void _tepl_test_utils_set_file_content (GFile *file,
+ const gchar *content);
-gchar * _tepl_test_utils_get_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);
+void _tepl_test_utils_check_file_content (GFile *file,
+ const gchar *expected_file_content);
+
+void _tepl_test_utils_check_equal_files_content (GFile *file1,
+ GFile *file2);
TeplWaitSignalData *
- _tepl_test_utils_wait_signal_setup (GObject *object,
- const gchar *detailed_signal_name);
+ _tepl_test_utils_wait_signal_setup (GObject *object,
+ const gchar *detailed_signal_name);
-void _tepl_test_utils_wait_signal (TeplWaitSignalData *data);
+void _tepl_test_utils_wait_signal (TeplWaitSignalData *data);
G_END_DECLS
diff --git a/testsuite/test-metadata-manager.c b/testsuite/test-metadata-manager.c
index 57c2f5d..3acb577 100644
--- a/testsuite/test-metadata-manager.c
+++ b/testsuite/test-metadata-manager.c
@@ -3,6 +3,7 @@
*/
#include <tepl/tepl.h>
+#include "tepl-test-utils.h"
static void
check_get (TeplMetadata *metadata,
@@ -25,32 +26,6 @@ get_store_file_for_test_data_filename (const gchar *filename)
NULL);
}
-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;
-}
-
-static void
-check_equal_file_content (GFile *file1,
- GFile *file2)
-{
- gchar *file1_content = get_file_content (file1);
- gchar *file2_content = get_file_content (file2);
-
- g_assert_true (g_str_equal (file1_content, file2_content));
-
- g_free (file1_content);
- g_free (file2_content);
-}
-
static GFile *
save_metadata_manager (void)
{
@@ -292,7 +267,7 @@ test_trim (void)
file_after = save_metadata_manager ();
expected_file_after = get_store_file_for_test_data_filename ("expected-to-succeed-01-trim-after.xml");
- check_equal_file_content (file_after, expected_file_after);
+ _tepl_test_utils_check_equal_files_content (file_after, expected_file_after);
g_object_unref (file_before);
g_object_unref (file_after);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]