From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: David Hildenbrand <david@redhat.com>
Subject: [Qemu-devel] [PULL 08/32] test-string-input-visitor: Split off uint64 list tests
Date: Thu, 13 Dec 2018 19:43:16 +0100 [thread overview]
Message-ID: <20181213184340.24037-9-armbru@redhat.com> (raw)
In-Reply-To: <20181213184340.24037-1-armbru@redhat.com>
From: David Hildenbrand <david@redhat.com>
Basically copy all int64 list tests but adapt them to work on uint64
instead. The values for very big/very small values have to be adapted.
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20181121164421.20780-9-david@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
tests/test-string-input-visitor.c | 113 ++++++++++++++++++++++++++++--
1 file changed, 109 insertions(+), 4 deletions(-)
diff --git a/tests/test-string-input-visitor.c b/tests/test-string-input-visitor.c
index 718d9a03c3..9b1dd44b2d 100644
--- a/tests/test-string-input-visitor.c
+++ b/tests/test-string-input-visitor.c
@@ -112,7 +112,6 @@ static void test_visitor_in_intList(TestInputVisitorData *data,
int64_t expect2[] = { 32767, -32768, -32767 };
int64_t expect3[] = { INT64_MIN, INT64_MAX };
int64_t expect4[] = { 1 };
- uint64_t expect5[] = { UINT64_MAX };
Error *err = NULL;
int64List *res = NULL;
Visitor *v;
@@ -133,9 +132,6 @@ static void test_visitor_in_intList(TestInputVisitorData *data,
v = visitor_input_test_init(data, "1-1");
check_ilist(v, expect4, ARRAY_SIZE(expect4));
- v = visitor_input_test_init(data, "18446744073709551615");
- check_ulist(v, expect5, ARRAY_SIZE(expect5));
-
/* Value too large */
v = visitor_input_test_init(data, "9223372036854775808");
@@ -211,6 +207,113 @@ static void test_visitor_in_intList(TestInputVisitorData *data,
visit_end_list(v, NULL);
}
+static void test_visitor_in_uintList(TestInputVisitorData *data,
+ const void *unused)
+{
+ uint64_t expect1[] = { 1, 2, 0, 2, 3, 4, 20, 5, 6, 7,
+ 8, 9, 1, 2, 3, 4, 5, 6, 7, 8 };
+ uint64_t expect2[] = { 32767, -32768, -32767 };
+ uint64_t expect3[] = { INT64_MIN, INT64_MAX };
+ uint64_t expect4[] = { 1 };
+ uint64_t expect5[] = { UINT64_MAX };
+ Error *err = NULL;
+ uint64List *res = NULL;
+ Visitor *v;
+ uint64_t val;
+
+ /* Valid lists */
+
+ v = visitor_input_test_init(data, "1,2,0,2-4,20,5-9,1-8");
+ check_ulist(v, expect1, ARRAY_SIZE(expect1));
+
+ v = visitor_input_test_init(data, "32767,-32768--32767");
+ check_ulist(v, expect2, ARRAY_SIZE(expect2));
+
+ v = visitor_input_test_init(data,
+ "-9223372036854775808,9223372036854775807");
+ check_ulist(v, expect3, ARRAY_SIZE(expect3));
+
+ v = visitor_input_test_init(data, "1-1");
+ check_ulist(v, expect4, ARRAY_SIZE(expect4));
+
+ v = visitor_input_test_init(data, "18446744073709551615");
+ check_ulist(v, expect5, ARRAY_SIZE(expect5));
+
+ /* Value too large */
+
+ v = visitor_input_test_init(data, "18446744073709551616");
+ visit_type_uint64List(v, NULL, &res, &err);
+ error_free_or_abort(&err);
+ g_assert(!res);
+
+ /* Value too small */
+
+ v = visitor_input_test_init(data, "-18446744073709551616");
+ visit_type_uint64List(v, NULL, &res, &err);
+ error_free_or_abort(&err);
+ g_assert(!res);
+
+ /* Range not ascending */
+
+ v = visitor_input_test_init(data, "3-1");
+ visit_type_uint64List(v, NULL, &res, &err);
+ error_free_or_abort(&err);
+ g_assert(!res);
+
+ v = visitor_input_test_init(data, "18446744073709551615-0");
+ visit_type_uint64List(v, NULL, &res, &err);
+ error_free_or_abort(&err);
+ g_assert(!res);
+
+ /* Range too big (65536 is the limit against DOS attacks) */
+
+ v = visitor_input_test_init(data, "0-65536");
+ visit_type_uint64List(v, NULL, &res, &err);
+ error_free_or_abort(&err);
+ g_assert(!res);
+
+ /* Empty list */
+
+ v = visitor_input_test_init(data, "");
+ visit_type_uint64List(v, NULL, &res, &error_abort);
+ g_assert(!res);
+
+ /* Not a list */
+
+ v = visitor_input_test_init(data, "not an uint list");
+
+ visit_type_uint64List(v, NULL, &res, &err);
+ error_free_or_abort(&err);
+ g_assert(!res);
+
+ /* Unvisited list tail */
+
+ v = visitor_input_test_init(data, "0,2-3");
+
+ visit_start_list(v, NULL, NULL, 0, &error_abort);
+ visit_type_uint64(v, NULL, &val, &error_abort);
+ g_assert_cmpuint(val, ==, 0);
+ visit_type_uint64(v, NULL, &val, &error_abort);
+ g_assert_cmpuint(val, ==, 2);
+
+ visit_check_list(v, &err);
+ error_free_or_abort(&err);
+ visit_end_list(v, NULL);
+
+ /* Visit beyond end of list */
+
+ v = visitor_input_test_init(data, "0");
+
+ visit_start_list(v, NULL, NULL, 0, &error_abort);
+ visit_type_uint64(v, NULL, &val, &err);
+ g_assert_cmpuint(val, ==, 0);
+ visit_type_uint64(v, NULL, &val, &err);
+ error_free_or_abort(&err);
+
+ visit_check_list(v, &error_abort);
+ visit_end_list(v, NULL);
+}
+
static void test_visitor_in_bool(TestInputVisitorData *data,
const void *unused)
{
@@ -384,6 +487,8 @@ int main(int argc, char **argv)
&in_visitor_data, test_visitor_in_int);
input_visitor_test_add("/string-visitor/input/intList",
&in_visitor_data, test_visitor_in_intList);
+ input_visitor_test_add("/string-visitor/input/uintList",
+ &in_visitor_data, test_visitor_in_uintList);
input_visitor_test_add("/string-visitor/input/bool",
&in_visitor_data, test_visitor_in_bool);
input_visitor_test_add("/string-visitor/input/number",
--
2.17.2
next prev parent reply other threads:[~2018-12-13 18:43 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-13 18:43 [Qemu-devel] [PULL 00/32] QAPI patches for 2018-12-13 Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 01/32] cutils: Add qemu_strtod() and qemu_strtod_finite() Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 02/32] cutils: Fix qemu_strtosz() & friends to reject non-finite sizes Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 03/32] qapi: Fix string-input-visitor to reject NaN and infinities Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 04/32] qapi: Use qemu_strtod_finite() in qobject-input-visitor Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 05/32] test-string-input-visitor: Add more tests Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 06/32] qapi: Rewrite string-input-visitor's integer and list parsing Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 07/32] test-string-input-visitor: Use virtual walk Markus Armbruster
2018-12-13 18:43 ` Markus Armbruster [this message]
2018-12-13 18:43 ` [Qemu-devel] [PULL 09/32] test-string-input-visitor: Add range overflow tests Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 10/32] docs: Update references to JSON RFC Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 11/32] json: Fix to reject duplicate object member names Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 12/32] tests/qapi: Cover commands with 'if' and union / alternate 'data' Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 13/32] qapi: rename QAPISchemaEnumType.values to .members Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 14/32] qapi: break long lines at 'data' member Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 15/32] qapi: Do not define enumeration value explicitly Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 16/32] qapi: change enum visitor and gen_enum* to take QAPISchemaMember Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 17/32] tests: print enum type members more like object type members Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 18/32] qapi: factor out checking for keys Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 19/32] qapi: improve reporting of unknown or missing keys Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 20/32] qapi: add a dictionary form with 'name' key for enum members Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 21/32] qapi: add 'if' to " Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 22/32] qapi-events: add 'if' condition to implicit event enum Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 23/32] qapi: add a dictionary form for TYPE Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 24/32] qapi: Add 'if' to implicit struct members Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 25/32] qapi: add 'if' to union members Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 26/32] qapi: add 'if' to alternate members Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 27/32] qapi: add #if conditions to generated code members Markus Armbruster
2018-12-13 21:52 ` Eric Blake
2018-12-14 6:06 ` Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 28/32] qapi: add 'If:' condition to enum values documentation Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 29/32] qapi: add 'If:' condition to struct members documentation Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 30/32] qapi: add condition to variants documentation Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 31/32] qapi: add more conditions to SPICE Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 32/32] qapi: add conditions to REPLICATION type/commands on the schema Markus Armbruster
2018-12-17 16:00 ` Thomas Huth
2018-12-17 18:38 ` Marc-André Lureau
2018-12-18 7:03 ` Markus Armbruster
2018-12-17 19:18 ` Markus Armbruster
2018-12-18 8:27 ` [Qemu-devel] Regression test with --disable options (was: qapi: add conditions to REPLICATION type/commands on the schema) Thomas Huth
2018-12-18 10:08 ` [Qemu-devel] Regression test with --disable options Markus Armbruster
2018-12-14 5:35 ` [Qemu-devel] [PULL 00/32] QAPI patches for 2018-12-13 Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181213184340.24037-9-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=david@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).