diff options
Diffstat (limited to 'tests/test-visitor-serialization.c')
| -rw-r--r-- | tests/test-visitor-serialization.c | 54 |
1 files changed, 30 insertions, 24 deletions
diff --git a/tests/test-visitor-serialization.c b/tests/test-visitor-serialization.c index 1ccaaa9231..fa86cae88a 100644 --- a/tests/test-visitor-serialization.c +++ b/tests/test-visitor-serialization.c @@ -1,6 +1,7 @@ /* * Unit-tests for visitor-based serialization * + * Copyright (C) 2014-2015 Red Hat, Inc. * Copyright IBM, Corp. 2012 * * Authors: @@ -253,18 +254,21 @@ static UserDefTwo *nested_struct_create(void) { UserDefTwo *udnp = g_malloc0(sizeof(*udnp)); udnp->string0 = strdup("test_string0"); - udnp->dict1.string1 = strdup("test_string1"); - udnp->dict1.dict2.userdef = g_new0(UserDefOne, 1); - udnp->dict1.dict2.userdef->base = g_new0(UserDefZero, 1); - udnp->dict1.dict2.userdef->base->integer = 42; - udnp->dict1.dict2.userdef->string = strdup("test_string"); - udnp->dict1.dict2.string = strdup("test_string2"); - udnp->dict1.has_dict3 = true; - udnp->dict1.dict3.userdef = g_new0(UserDefOne, 1); - udnp->dict1.dict3.userdef->base = g_new0(UserDefZero, 1); - udnp->dict1.dict3.userdef->base->integer = 43; - udnp->dict1.dict3.userdef->string = strdup("test_string"); - udnp->dict1.dict3.string = strdup("test_string3"); + udnp->dict1 = g_malloc0(sizeof(*udnp->dict1)); + udnp->dict1->string1 = strdup("test_string1"); + udnp->dict1->dict2 = g_malloc0(sizeof(*udnp->dict1->dict2)); + udnp->dict1->dict2->userdef = g_new0(UserDefOne, 1); + udnp->dict1->dict2->userdef->base = g_new0(UserDefZero, 1); + udnp->dict1->dict2->userdef->base->integer = 42; + udnp->dict1->dict2->userdef->string = strdup("test_string"); + udnp->dict1->dict2->string = strdup("test_string2"); + udnp->dict1->dict3 = g_malloc0(sizeof(*udnp->dict1->dict3)); + udnp->dict1->has_dict3 = true; + udnp->dict1->dict3->userdef = g_new0(UserDefOne, 1); + udnp->dict1->dict3->userdef->base = g_new0(UserDefZero, 1); + udnp->dict1->dict3->userdef->base->integer = 43; + udnp->dict1->dict3->userdef->string = strdup("test_string"); + udnp->dict1->dict3->string = strdup("test_string3"); return udnp; } @@ -273,18 +277,20 @@ static void nested_struct_compare(UserDefTwo *udnp1, UserDefTwo *udnp2) g_assert(udnp1); g_assert(udnp2); g_assert_cmpstr(udnp1->string0, ==, udnp2->string0); - g_assert_cmpstr(udnp1->dict1.string1, ==, udnp2->dict1.string1); - g_assert_cmpint(udnp1->dict1.dict2.userdef->base->integer, ==, - udnp2->dict1.dict2.userdef->base->integer); - g_assert_cmpstr(udnp1->dict1.dict2.userdef->string, ==, - udnp2->dict1.dict2.userdef->string); - g_assert_cmpstr(udnp1->dict1.dict2.string, ==, udnp2->dict1.dict2.string); - g_assert(udnp1->dict1.has_dict3 == udnp2->dict1.has_dict3); - g_assert_cmpint(udnp1->dict1.dict3.userdef->base->integer, ==, - udnp2->dict1.dict3.userdef->base->integer); - g_assert_cmpstr(udnp1->dict1.dict3.userdef->string, ==, - udnp2->dict1.dict3.userdef->string); - g_assert_cmpstr(udnp1->dict1.dict3.string, ==, udnp2->dict1.dict3.string); + g_assert_cmpstr(udnp1->dict1->string1, ==, udnp2->dict1->string1); + g_assert_cmpint(udnp1->dict1->dict2->userdef->base->integer, ==, + udnp2->dict1->dict2->userdef->base->integer); + g_assert_cmpstr(udnp1->dict1->dict2->userdef->string, ==, + udnp2->dict1->dict2->userdef->string); + g_assert_cmpstr(udnp1->dict1->dict2->string, ==, + udnp2->dict1->dict2->string); + g_assert(udnp1->dict1->has_dict3 == udnp2->dict1->has_dict3); + g_assert_cmpint(udnp1->dict1->dict3->userdef->base->integer, ==, + udnp2->dict1->dict3->userdef->base->integer); + g_assert_cmpstr(udnp1->dict1->dict3->userdef->string, ==, + udnp2->dict1->dict3->userdef->string); + g_assert_cmpstr(udnp1->dict1->dict3->string, ==, + udnp2->dict1->dict3->string); } static void nested_struct_cleanup(UserDefTwo *udnp) |