[gtksourceview/wip/loader-saver: 2/2] Adapt the FileSaver unit tests
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview/wip/loader-saver: 2/2] Adapt the FileSaver unit tests
- Date: Tue, 25 Mar 2014 18:31:29 +0000 (UTC)
commit 1213ab21a50125323bd8061d28f37fd64f483ee8
Author: Sébastien Wilmet <swilmet gnome org>
Date: Tue Mar 25 19:30:33 2014 +0100
Adapt the FileSaver unit tests
tests/Makefile.am | 12 +++---
tests/test-file-saver.c | 92 ++++++++++++++++++++---------------------------
2 files changed, 45 insertions(+), 59 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 38390af..e4b13ba 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -107,12 +107,12 @@ test_file_loader_LDADD = \
$(DEP_LIBS) \
$(TESTS_LIBS)
-#UNIT_TEST_PROGS += test-file-saver
-#test_file_saver_SOURCES = test-file-saver.c
-#test_file_saver_LDADD = \
-# $(top_builddir)/gtksourceview/libgtksourceview-3.0.la \
-# $(DEP_LIBS) \
-# $(TESTS_LIBS)
+UNIT_TEST_PROGS += test-file-saver
+test_file_saver_SOURCES = test-file-saver.c
+test_file_saver_LDADD = \
+ $(top_builddir)/gtksourceview/libgtksourceview-3.0.la \
+ $(DEP_LIBS) \
+ $(TESTS_LIBS)
UNIT_TEST_PROGS += test-language
test_language_SOURCES = \
diff --git a/tests/test-file-saver.c b/tests/test-file-saver.c
index ef4e13a..cf4b0c5 100644
--- a/tests/test-file-saver.c
+++ b/tests/test-file-saver.c
@@ -3,7 +3,7 @@
* This file is part of GtkSourceView
*
* Copyright (C) 2010 - Jesse van den Kieboom
- * Copyright (C) 2013 - Sébastien Wilmet
+ * Copyright (C) 2014 - Sébastien Wilmet
*
* GtkSourceView is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -51,10 +51,9 @@ typedef void (*SavedCallback) (SaverTestData *data);
struct _SaverTestData
{
- GtkSourceFile *file;
- GFile *location;
+ GtkSourceFileSaver *saver;
+ GFile *file;
const gchar *expected_file_contents;
- GtkSourceFileSaveFlags save_flags;
SavedCallback saved_callback;
gpointer userdata;
@@ -86,17 +85,17 @@ read_file (GFile *location)
}
static void
-save_file_cb (GtkSourceFile *file,
- GAsyncResult *result,
- SaverTestData *data)
+save_file_cb (GtkSourceFileSaver *saver,
+ GAsyncResult *result,
+ SaverTestData *data)
{
GError *error = NULL;
- gtk_source_file_save_finish (file, result, &error);
+ gtk_source_file_saver_save_finish (saver, result, &error);
g_assert_no_error (error);
- g_assert_cmpstr (data->expected_file_contents, ==, read_file (data->location));
+ g_assert_cmpstr (data->expected_file_contents, ==, read_file (data->file));
if (data->saved_callback != NULL)
{
@@ -105,7 +104,7 @@ save_file_cb (GtkSourceFile *file,
if (!data->file_existed)
{
- g_file_delete (data->location, NULL, NULL);
+ g_file_delete (data->file, NULL, NULL);
}
/* finished */
@@ -115,26 +114,25 @@ save_file_cb (GtkSourceFile *file,
static void
save_file (SaverTestData *data)
{
- data->file_existed = g_file_query_exists (data->location, NULL);
-
- gtk_source_file_save_async (data->file,
- data->save_flags,
- G_PRIORITY_DEFAULT,
- NULL,
- NULL,
- NULL,
- (GAsyncReadyCallback) save_file_cb,
- data);
+ data->file_existed = g_file_query_exists (data->file, NULL);
+
+ gtk_source_file_saver_save_async (data->saver,
+ G_PRIORITY_DEFAULT,
+ NULL,
+ NULL,
+ NULL,
+ (GAsyncReadyCallback) save_file_cb,
+ data);
}
static void
-mount_cb (GFile *location,
+mount_cb (GFile *file,
GAsyncResult *result,
SaverTestData *data)
{
GError *error = NULL;
- g_file_mount_enclosing_volume_finish (location, result, &error);
+ g_file_mount_enclosing_volume_finish (file, result, &error);
if (error != NULL && error->code == G_IO_ERROR_ALREADY_MOUNTED)
{
@@ -161,7 +159,7 @@ check_mounted (SaverTestData *data)
{
GMountOperation *mount_operation;
- if (g_file_is_native (data->location))
+ if (g_file_is_native (data->file))
{
save_file (data);
return;
@@ -169,7 +167,7 @@ check_mounted (SaverTestData *data)
mount_operation = gtk_mount_operation_new (NULL);
- g_file_mount_enclosing_volume (data->location,
+ g_file_mount_enclosing_volume (data->file,
G_MOUNT_MOUNT_NONE,
mount_operation,
NULL,
@@ -184,39 +182,39 @@ test_saver (const gchar *filename_or_uri,
const gchar *buffer_contents,
const gchar *expected_file_contents,
GtkSourceNewlineType newline_type,
- GtkSourceFileSaveFlags save_flags,
SavedCallback saved_callback,
gpointer userdata)
{
- GFile *location;
+ GFile *file;
GtkSourceBuffer *buffer;
- GtkSourceFile *file;
+ GtkSourceFileSaver *saver;
SaverTestData *data;
- location = g_file_new_for_commandline_arg (filename_or_uri);
+ file = g_file_new_for_commandline_arg (filename_or_uri);
buffer = gtk_source_buffer_new (NULL);
gtk_text_buffer_set_text (GTK_TEXT_BUFFER (buffer), buffer_contents, -1);
- file = gtk_source_file_new (location, buffer);
- g_object_unref (buffer);
+ saver = gtk_source_file_saver_new (buffer, file);
- gtk_source_file_set_newline_type (file, newline_type);
- gtk_source_file_set_encoding (file, gtk_source_encoding_get_utf8 ());
+ g_object_set (saver,
+ "newline-type", newline_type,
+ "encoding", gtk_source_encoding_get_utf8 (),
+ NULL);
data = g_slice_new (SaverTestData);
+ data->saver = saver;
data->file = file;
- data->location = location;
data->expected_file_contents = expected_file_contents;
- data->save_flags = save_flags;
data->saved_callback = saved_callback;
data->userdata = userdata;
check_mounted (data);
gtk_main ();
- g_object_unref (data->file);
- g_object_unref (data->location);
+ g_object_unref (file);
+ g_object_unref (buffer);
+ g_object_unref (saver);
g_slice_free (SaverTestData, data);
}
@@ -260,8 +258,7 @@ static NewLineTestData newline_test_data[] = {
};
static void
-test_new_line (const gchar *filename,
- GtkSourceFileSaveFlags save_flags)
+test_new_line (const gchar *filename)
{
gint i;
gint num = sizeof (newline_test_data) / sizeof (NewLineTestData);
@@ -274,7 +271,6 @@ test_new_line (const gchar *filename,
nt->text,
nt->result,
nt->type,
- save_flags,
NULL,
NULL);
}
@@ -283,7 +279,7 @@ test_new_line (const gchar *filename,
static void
test_local_newline (void)
{
- test_new_line (DEFAULT_LOCAL_URI, 0);
+ test_new_line (DEFAULT_LOCAL_URI);
}
static void
@@ -293,7 +289,6 @@ test_local (void)
"hello world",
"hello world\n",
GTK_SOURCE_NEWLINE_TYPE_LF,
- 0,
NULL,
NULL);
@@ -301,7 +296,6 @@ test_local (void)
"hello world\r\n",
"hello world\n\n",
GTK_SOURCE_NEWLINE_TYPE_LF,
- 0,
NULL,
NULL);
@@ -309,7 +303,6 @@ test_local (void)
"hello world\n",
"hello world\n\n",
GTK_SOURCE_NEWLINE_TYPE_LF,
- 0,
NULL,
NULL);
}
@@ -317,7 +310,7 @@ test_local (void)
static void
test_remote_newline (void)
{
- test_new_line (DEFAULT_REMOTE_URI, 0);
+ test_new_line (DEFAULT_REMOTE_URI);
}
static void
@@ -327,7 +320,6 @@ test_remote (void)
"hello world",
"hello world\n",
GTK_SOURCE_NEWLINE_TYPE_LF,
- 0,
NULL,
NULL);
@@ -335,7 +327,6 @@ test_remote (void)
"hello world\r\n",
"hello world\n\n",
GTK_SOURCE_NEWLINE_TYPE_LF,
- 0,
NULL,
NULL);
@@ -343,7 +334,6 @@ test_remote (void)
"hello world\n",
"hello world\n\n",
GTK_SOURCE_NEWLINE_TYPE_LF,
- 0,
NULL,
NULL);
}
@@ -376,7 +366,7 @@ check_permissions_saved (SaverTestData *data)
{
guint permissions = (guint)GPOINTER_TO_INT (data->userdata);
- check_permissions (data->location, permissions);
+ check_permissions (data->file, permissions);
}
static void
@@ -428,7 +418,6 @@ test_permissions (const gchar *uri,
DEFAULT_CONTENT,
DEFAULT_CONTENT_RESULT,
GTK_SOURCE_NEWLINE_TYPE_LF,
- 0,
check_permissions_saved,
GINT_TO_POINTER ((gint)permissions));
@@ -453,7 +442,6 @@ test_local_unowned_directory (void)
DEFAULT_CONTENT,
DEFAULT_CONTENT_RESULT,
GTK_SOURCE_NEWLINE_TYPE_LF,
- 0,
NULL,
NULL);
}
@@ -465,7 +453,6 @@ test_remote_unowned_directory (void)
DEFAULT_CONTENT,
DEFAULT_CONTENT_RESULT,
GTK_SOURCE_NEWLINE_TYPE_LF,
- 0,
NULL,
NULL);
}
@@ -487,7 +474,7 @@ test_unowned_group_permissions (SaverTestData *data)
const gchar *group;
guint32 mode;
- GFileInfo *info = g_file_query_info (data->location,
+ GFileInfo *info = g_file_query_info (data->file,
G_FILE_ATTRIBUTE_OWNER_GROUP ","
G_FILE_ATTRIBUTE_UNIX_MODE,
G_FILE_QUERY_INFO_NONE,
@@ -513,7 +500,6 @@ test_unowned_group (const gchar *uri)
DEFAULT_CONTENT,
DEFAULT_CONTENT_RESULT,
GTK_SOURCE_NEWLINE_TYPE_LF,
- 0,
test_unowned_group_permissions,
NULL);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
