From 681cb249c31e4e17e3ae9b8f68b10d7f33fea402 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Tue, 15 Feb 2011 11:36:03 -0700 Subject: replace itos() with g_strdup_printf() --- tests/test-expand.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'tests') diff --git a/tests/test-expand.c b/tests/test-expand.c index bf7e171..d823cfa 100644 --- a/tests/test-expand.c +++ b/tests/test-expand.c @@ -66,14 +66,12 @@ test_useragent (void) { void test_WEBKIT_VERSION (void) { - GString* expected = g_string_new(""); - g_string_append(expected, itos(webkit_major_version())); - g_string_append(expected, " "); - g_string_append(expected, itos(webkit_minor_version())); - g_string_append(expected, " "); - g_string_append(expected, itos(webkit_micro_version())); + gchar *expected = g_strdup_printf("%d %d %d", webkit_major_version(), + webkit_minor_version(), + webkit_micro_version()); - g_assert_cmpstr(expand("@WEBKIT_MAJOR @WEBKIT_MINOR @WEBKIT_MICRO", 0), ==, g_string_free(expected, FALSE)); + g_assert_cmpstr(expand("@WEBKIT_MAJOR @WEBKIT_MINOR @WEBKIT_MICRO", 0), ==, expected); + g_free(expected); } void @@ -89,11 +87,11 @@ test_COMMIT (void) { void test_cmd_useragent_full (void) { GString* expected = g_string_new("Uzbl (Webkit "); - g_string_append(expected, itos(WEBKIT_MAJOR_VERSION)); + g_string_append(expected, g_strdup_printf("%d", WEBKIT_MAJOR_VERSION)); g_string_append(expected, "."); - g_string_append(expected, itos(WEBKIT_MINOR_VERSION)); + g_string_append(expected, g_strdup_printf("%d", WEBKIT_MINOR_VERSION)); g_string_append(expected, "."); - g_string_append(expected, itos(WEBKIT_MICRO_VERSION)); + g_string_append(expected, g_strdup_printf("%d", WEBKIT_MICRO_VERSION)); g_string_append(expected, ") ("); struct utsname unameinfo; -- cgit v1.2.3