luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-05 00:43:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Accept \r\n as line end. (#163030, Bastian Nocera)

Browse Source 
2005-01-19  Matthias Clasen  <mclasen@redhat.com>

	* glib/gkeyfile.c (g_key_file_parse_data): Accept \r\n as
	line end.  (#163030, Bastian Nocera)
	(g_key_file_load_from_data): Make -1 work as a size.

	* tests/keyfile-test.c: Some unit tests for the keyfile
	parser.

	* tests/Makefile.am (test_programs): Add keyfile-test.
This commit is contained in:
Matthias Clasen
2005-01-19 14:14:27 +00:00
committed by Matthias Clasen
parent b45420bca8
commit 92a710ba28
7 changed files with 155 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Makefile.am
View File

@@ -74,6 +74,7 @@ test_programs = \
gio-test \
hash-test \
iochannel-test \
keyfile-test \
list-test \
mainloop-test \
markup-escape-test \
@@ -127,6 +128,7 @@ env_test_LDADD = $(progs_ldadd)
gio_test_LDADD = $(progs_ldadd)
hash_test_LDADD = $(progs_ldadd)
iochannel_test_LDADD = $(progs_ldadd)
keyfile_test_LDADD = $(progs_ldadd)
list_test_LDADD = $(progs_ldadd)
mainloop_test_LDADD = $(thread_ldadd)
markup_test_LDADD = $(progs_ldadd)

98
tests/keyfile-test.c Normal file
View File

@@ -0,0 +1,98 @@
#include <glib.h>
#include <string.h>
#include <stdlib.h>
static GKeyFile *
load_data (const gchar *data)
{
GKeyFile *keyfile;
GError *error = NULL;
keyfile = g_key_file_new ();
g_key_file_load_from_data (keyfile, data, -1, 0, &error);
if (error)
{
g_print ("Could not load data: %s\n", error->message);
exit (1);
}
return keyfile;
}
static void
check_string_value (GKeyFile *keyfile,
const gchar *group,
const gchar *key,
const gchar *expected)
{
GError *error = NULL;
gchar *value;
value = g_key_file_get_string (keyfile, group, key, &error);
if (error)
{
g_print ("Group %s key %s: %s\n", group, key, error->message);
exit (1);
}
g_assert (value != NULL);
if (strcmp (value, expected) != 0)
{
g_print ("Group %s key %s: "
"expected value '%s', actual value '%s'\n",
group, key, expected, value);
exit (1);
}
}
static void
test_line_ends (void)
{
GKeyFile *keyfile;
const gchar *data =
"[group1]\n"
"key1=value1\n"
"key2=value2\r\n"
"[group2]\r\n"
"key3=value3\r\r\n"
"key4=value4\n";
keyfile = load_data (data);
check_string_value (keyfile, "group1", "key1", "value1");
check_string_value (keyfile, "group1", "key2", "value2");
check_string_value (keyfile, "group2", "key3", "value3\r");
check_string_value (keyfile, "group2", "key4", "value4");
}
static void
test_whitespace (void)
{
GKeyFile *keyfile;
const gchar *data =
"[group1]\n"
"key1 = value1\n"
"key2\t=\tvalue2\n"
" [ group2 ] \n"
"key3 = value3 \n"
"key4 = value \t4\n";
keyfile = load_data (data);
check_string_value (keyfile, "group1", "key1", "value1");
check_string_value (keyfile, "group1", "key2", "value2");
check_string_value (keyfile, " group2 ", "key3", "value3 ");
check_string_value (keyfile, " group2 ", "key4", "value \t4");
}
int
main (int argc, char *argv[])
{
test_line_ends ();
test_whitespace ();
return 0;
}