[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 03/41] tests: Remove test cases for alternates of
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v2 03/41] tests: Remove test cases for alternates of 'number' and 'int' |
Date: |
Tue, 20 Jun 2017 14:40:30 +0200 |
From: Marc-André Lureau <address@hidden>
Alternates with both a 'number' and an 'int' branch will become
invalid when the next patch merges of QFloat and QInt into QNum.
More sophisticated alternate code could keep them valid, but since
we have no users outside tests, simply drop the tests.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
tests/qapi-schema/qapi-schema-test.json | 2 --
tests/qapi-schema/qapi-schema-test.out | 8 --------
tests/test-keyval.c | 4 ++--
tests/test-qobject-input-visitor.c | 26 --------------------------
4 files changed, 2 insertions(+), 38 deletions(-)
diff --git a/tests/qapi-schema/qapi-schema-test.json
b/tests/qapi-schema/qapi-schema-test.json
index 17649c6..91ffb26 100644
--- a/tests/qapi-schema/qapi-schema-test.json
+++ b/tests/qapi-schema/qapi-schema-test.json
@@ -103,8 +103,6 @@
{ 'alternate': 'AltEnumNum', 'data': { 'e': 'EnumOne', 'n': 'number' } }
{ 'alternate': 'AltNumEnum', 'data': { 'n': 'number', 'e': 'EnumOne' } }
{ 'alternate': 'AltEnumInt', 'data': { 'e': 'EnumOne', 'i': 'int' } }
-{ 'alternate': 'AltIntNum', 'data': { 'i': 'int', 'n': 'number' } }
-{ 'alternate': 'AltNumInt', 'data': { 'n': 'number', 'i': 'int' } }
# for testing use of 'str' within alternates
{ 'alternate': 'AltStrObj', 'data': { 's': 'str', 'o': 'TestStruct' } }
diff --git a/tests/qapi-schema/qapi-schema-test.out
b/tests/qapi-schema/qapi-schema-test.out
index 9f68610..e727a5a 100644
--- a/tests/qapi-schema/qapi-schema-test.out
+++ b/tests/qapi-schema/qapi-schema-test.out
@@ -10,18 +10,10 @@ alternate AltEnumNum
tag type
case e: EnumOne
case n: number
-alternate AltIntNum
- tag type
- case i: int
- case n: number
alternate AltNumEnum
tag type
case n: number
case e: EnumOne
-alternate AltNumInt
- tag type
- case n: number
- case i: int
alternate AltStrObj
tag type
case s: str
diff --git a/tests/test-keyval.c b/tests/test-keyval.c
index c3be005..baf7e33 100644
--- a/tests/test-keyval.c
+++ b/tests/test-keyval.c
@@ -615,7 +615,7 @@ static void test_keyval_visit_alternate(void)
Visitor *v;
QDict *qdict;
AltStrObj *aso;
- AltNumInt *ani;
+ AltNumEnum *ane;
AltEnumBool *aeb;
/*
@@ -631,7 +631,7 @@ static void test_keyval_visit_alternate(void)
g_assert_cmpint(aso->type, ==, QTYPE_QSTRING);
g_assert_cmpstr(aso->u.s, ==, "1");
qapi_free_AltStrObj(aso);
- visit_type_AltNumInt(v, "b", &ani, &err);
+ visit_type_AltNumEnum(v, "b", &ane, &err);
error_free_or_abort(&err);
visit_type_AltEnumBool(v, "c", &aeb, &err);
error_free_or_abort(&err);
diff --git a/tests/test-qobject-input-visitor.c
b/tests/test-qobject-input-visitor.c
index 6b997a1..83d663d 100644
--- a/tests/test-qobject-input-visitor.c
+++ b/tests/test-qobject-input-visitor.c
@@ -592,8 +592,6 @@ static void
test_visitor_in_alternate_number(TestInputVisitorData *data,
AltEnumNum *aen;
AltNumEnum *ans;
AltEnumInt *asi;
- AltIntNum *ain;
- AltNumInt *ani;
/* Parsing an int */
@@ -620,18 +618,6 @@ static void
test_visitor_in_alternate_number(TestInputVisitorData *data,
g_assert_cmpint(asi->u.i, ==, 42);
qapi_free_AltEnumInt(asi);
- v = visitor_input_test_init(data, "42");
- visit_type_AltIntNum(v, NULL, &ain, &error_abort);
- g_assert_cmpint(ain->type, ==, QTYPE_QINT);
- g_assert_cmpint(ain->u.i, ==, 42);
- qapi_free_AltIntNum(ain);
-
- v = visitor_input_test_init(data, "42");
- visit_type_AltNumInt(v, NULL, &ani, &error_abort);
- g_assert_cmpint(ani->type, ==, QTYPE_QINT);
- g_assert_cmpint(ani->u.i, ==, 42);
- qapi_free_AltNumInt(ani);
-
/* Parsing a double */
v = visitor_input_test_init(data, "42.5");
@@ -655,18 +641,6 @@ static void
test_visitor_in_alternate_number(TestInputVisitorData *data,
visit_type_AltEnumInt(v, NULL, &asi, &err);
error_free_or_abort(&err);
qapi_free_AltEnumInt(asi);
-
- v = visitor_input_test_init(data, "42.5");
- visit_type_AltIntNum(v, NULL, &ain, &error_abort);
- g_assert_cmpint(ain->type, ==, QTYPE_QFLOAT);
- g_assert_cmpfloat(ain->u.n, ==, 42.5);
- qapi_free_AltIntNum(ain);
-
- v = visitor_input_test_init(data, "42.5");
- visit_type_AltNumInt(v, NULL, &ani, &error_abort);
- g_assert_cmpint(ani->type, ==, QTYPE_QFLOAT);
- g_assert_cmpfloat(ani->u.n, ==, 42.5);
- qapi_free_AltNumInt(ani);
}
static void test_native_list_integer_helper(TestInputVisitorData *data,
--
2.7.5
- [Qemu-devel] [PULL v2 00/41] QAPI patches for 2017-06-09, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 02/41] object: fix potential leak in getters, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 04/41] tests: add more int/number ranges checks, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 03/41] tests: Remove test cases for alternates of 'number' and 'int',
Markus Armbruster <=
- [Qemu-devel] [PULL v2 05/41] qapi: Clean up qobject_input_type_number() control flow, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 01/41] qdev: remove PropertyInfo.qtype field, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 08/41] tests: remove /{qnum, qlist, dict}/destroy test, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 13/41] q35: fix get_mmcfg_size to use uint64 visitor, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 09/41] qnum: add uint type, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 10/41] json: learn to parse uint64 numbers, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 11/41] qapi: update the qobject visitor to use QNUM_U64, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 14/41] object: use more specific property type names, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 24/41] aspeed: use {set, get}_uint() for "ram-size" property, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 28/41] acpi: use get_uint() for various acpi properties, Markus Armbruster, 2017/06/20