Commit 7ad993b4 authored Mar 01, 2014 by Markus Armbruster Committed by Luiz Capitulino Mar 03, 2014

tests/qapi-schema: Cover union types with base



Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>

parent aabbd472

tests/qapi-schema/qapi-schema-test.json

+1 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@
		'data': { 'integer': 'int' } }

		{ 'union': 'UserDefUnion',
		'base': 'UserDefZero',
		'data': { 'a' : 'UserDefA', 'b' : 'UserDefB' } }

		{ 'union': 'UserDefAnonUnion',

tests/qapi-schema/qapi-schema-test.out

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		OrderedDict([('type', 'UserDefNested'), ('data', OrderedDict([('string0', 'str'), ('dict1', OrderedDict([('string1', 'str'), ('dict2', OrderedDict([('userdef1', 'UserDefOne'), ('string2', 'str')])), ('*dict3', OrderedDict([('userdef2', 'UserDefOne'), ('string3', 'str')]))]))]))]),
		OrderedDict([('type', 'UserDefA'), ('data', OrderedDict([('boolean', 'bool')]))]),
		OrderedDict([('type', 'UserDefB'), ('data', OrderedDict([('integer', 'int')]))]),
		OrderedDict([('union', 'UserDefUnion'), ('data', OrderedDict([('a', 'UserDefA'), ('b', 'UserDefB')]))]),
		OrderedDict([('union', 'UserDefUnion'), ('base', 'UserDefZero'), ('data', OrderedDict([('a', 'UserDefA'), ('b', 'UserDefB')]))]),
		OrderedDict([('union', 'UserDefAnonUnion'), ('discriminator', OrderedDict()), ('data', OrderedDict([('uda', 'UserDefA'), ('s', 'str'), ('i', 'int')]))]),
		OrderedDict([('union', 'UserDefNativeListUnion'), ('data', OrderedDict([('integer', ['int']), ('s8', ['int8']), ('s16', ['int16']), ('s32', ['int32']), ('s64', ['int64']), ('u8', ['uint8']), ('u16', ['uint16']), ('u32', ['uint32']), ('u64', ['uint64']), ('number', ['number']), ('boolean', ['bool']), ('string', ['str'])]))]),
		OrderedDict([('command', 'user_def_cmd'), ('data', OrderedDict())]),

tests/test-qmp-input-strict.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ static void test_validate_union(TestInputVisitorData *data,
		Visitor *v;
		Error *errp = NULL;

		v = validate_test_init(data, "{ 'type': 'b', 'data' : { 'integer': 42 } }");
		v = validate_test_init(data, "{ 'type': 'b', 'integer': 41, 'data' : { 'integer': 42 } }");

		visit_type_UserDefUnion(v, &tmp, NULL, &errp);
		g_assert(!errp);
		@@ -205,7 +205,7 @@ static void test_validate_fail_union(TestInputVisitorData *data,
		Error *errp = NULL;
		Visitor *v;

		v = validate_test_init(data, "{ 'type': 'b', 'data' : { 'integer': 42 }, 'extra': 'yyy' }");
		v = validate_test_init(data, "{ 'type': 'b', 'data' : { 'integer': 42 } }");

		visit_type_UserDefUnion(v, &tmp, NULL, &errp);
		g_assert(errp);

tests/test-qmp-input-visitor.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -293,11 +293,12 @@ static void test_visitor_in_union(TestInputVisitorData *data,
		Error *err = NULL;
		UserDefUnion *tmp;

		v = visitor_input_test_init(data, "{ 'type': 'b', 'data' : { 'integer': 42 } }");
		v = visitor_input_test_init(data, "{ 'type': 'b', 'integer': 41, 'data' : { 'integer': 42 } }");

		visit_type_UserDefUnion(v, &tmp, NULL, &err);
		g_assert(err == NULL);
		g_assert_cmpint(tmp->kind, ==, USER_DEF_UNION_KIND_B);
		g_assert_cmpint(tmp->integer, ==, 41);
		g_assert_cmpint(tmp->b->integer, ==, 42);
		qapi_free_UserDefUnion(tmp);
		}

tests/test-qmp-output-visitor.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -416,6 +416,7 @@ static void test_visitor_out_union(TestOutputVisitorData *data,

		UserDefUnion *tmp = g_malloc0(sizeof(UserDefUnion));
		tmp->kind = USER_DEF_UNION_KIND_A;
		tmp->integer = 41;
		tmp->a = g_malloc0(sizeof(UserDefA));
		tmp->a->boolean = true;

		@@ -427,6 +428,7 @@ static void test_visitor_out_union(TestOutputVisitorData *data,
		qdict = qobject_to_qdict(arg);

		g_assert_cmpstr(qdict_get_str(qdict, "type"), ==, "a");
		g_assert_cmpint(qdict_get_int(qdict, "integer"), ==, 41);

		qvalue = qdict_get(qdict, "data");
		g_assert(data != NULL);