Skip to content

P
protobuf-c
Commit b00f6d22 authored by Ilya Lipnitskiy's avatar Ilya Lipnitskiy
Browse files
Options

t/generated-code2/test-generated-code2.c: Rename test_optional_merge to 

test_field_merge
parent f4b9fd20
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
t/generated-code2/test-generated-code2.c
View file @ b00f6d22
...@@ -1407,7 +1407,7 @@ test_optional_default_values (void) ...@@ -1407,7 +1407,7 @@ test_optional_default_values (void)
} }
static void static void
test_optional_merge (void) test_field_merge (void)
{ {
Foo__TestMessOptional msg1 = FOO__TEST_MESS_OPTIONAL__INIT; Foo__TestMessOptional msg1 = FOO__TEST_MESS_OPTIONAL__INIT;
Foo__SubMess sub1 = FOO__SUB_MESS__INIT; Foo__SubMess sub1 = FOO__SUB_MESS__INIT;
...@@ -1670,7 +1670,7 @@ static Test tests[] = ...@@ -1670,7 +1670,7 @@ static Test tests[] =
{ "test required default values", test_required_default_values }, { "test required default values", test_required_default_values },
{ "test optional default values", test_optional_default_values }, { "test optional default values", test_optional_default_values },
{ "test optional merge", test_optional_merge }, { "test field merge", test_field_merge },
{ "test free unpacked", test_alloc_free_all }, { "test free unpacked", test_alloc_free_all },
{ "test alloc failure", test_alloc_fail }, { "test alloc failure", test_alloc_fail },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment