qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH v4 23/28] tests: Cover partial input visit of list
Date: Fri,  3 Mar 2017 13:32:43 +0100	[thread overview]
Message-ID: <1488544368-30622-24-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1488544368-30622-1-git-send-email-armbru@redhat.com>

Demonstrates a design flaw: there is no way to for input visitors to
report that a list visit didn't visit the complete input list.  The
generated list visits always do, but manual visits needn't.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 tests/test-opts-visitor.c          | 41 +++++++++++++++++++++++++++++++++++
 tests/test-qobject-input-visitor.c | 44 ++++++++++++++++++++++++++++++++++++++
 tests/test-string-input-visitor.c  | 22 +++++++++++++++++++
 3 files changed, 107 insertions(+)

diff --git a/tests/test-opts-visitor.c b/tests/test-opts-visitor.c
index 0a9e75f..d0f7646 100644
--- a/tests/test-opts-visitor.c
+++ b/tests/test-opts-visitor.c
@@ -172,6 +172,44 @@ expect_u64_max(OptsVisitorFixture *f, gconstpointer test_data)
 
 /* test cases */
 
+static void
+test_opts_range_unvisited(void)
+{
+    intList *list = NULL;
+    intList *tail;
+    QemuOpts *opts;
+    Visitor *v;
+
+    opts = qemu_opts_parse(qemu_find_opts("userdef"), "ilist=0-2", false,
+                           &error_abort);
+
+    v = opts_visitor_new(opts);
+
+    visit_start_struct(v, NULL, NULL, 0, &error_abort);
+
+    /* Would be simpler if the visitor genuinely supported virtual walks */
+    visit_start_list(v, "ilist", (GenericList **)&list, sizeof(*list),
+                     &error_abort);
+    tail = list;
+    visit_type_int(v, NULL, &tail->value, &error_abort);
+    g_assert_cmpint(tail->value, ==, 0);
+    tail = (intList *)visit_next_list(v, (GenericList *)tail, sizeof(*list));
+    g_assert(tail);
+    visit_type_int(v, NULL, &tail->value, &error_abort);
+    g_assert_cmpint(tail->value, ==, 1);
+    tail = (intList *)visit_next_list(v, (GenericList *)tail, sizeof(*list));
+    g_assert(tail);
+    visit_end_list(v, (void **)&list);
+    /* BUG: unvisited tail not reported; actually not reportable by design */
+
+    visit_check_struct(v, &error_abort);
+    visit_end_struct(v, NULL);
+
+    qapi_free_intList(list);
+    visit_free(v);
+    qemu_opts_del(opts);
+}
+
 int
 main(int argc, char **argv)
 {
@@ -263,6 +301,9 @@ main(int argc, char **argv)
     add_test("/visitor/opts/i64/range/2big/full", &expect_fail,
              "i64=-0x8000000000000000-0x7fffffffffffffff");
 
+    g_test_add_func("/visitor/opts/range/unvisited",
+                    test_opts_range_unvisited);
+
     g_test_run();
     return 0;
 }
diff --git a/tests/test-qobject-input-visitor.c b/tests/test-qobject-input-visitor.c
index 32c6b3d..10c15c4 100644
--- a/tests/test-qobject-input-visitor.c
+++ b/tests/test-qobject-input-visitor.c
@@ -923,6 +923,46 @@ static void test_visitor_in_fail_struct_missing(TestInputVisitorData *data,
     visit_end_struct(v, NULL);
 }
 
+static void test_visitor_in_fail_list(TestInputVisitorData *data,
+                                      const void *unused)
+{
+    int64_t i64 = -1;
+    Visitor *v;
+
+    /* Unvisited list tail */
+
+    v = visitor_input_test_init(data, "[ 1, 2, 3 ]");
+
+    visit_start_list(v, NULL, NULL, 0, &error_abort);
+    visit_type_int(v, NULL, &i64, &error_abort);
+    g_assert_cmpint(i64, ==, 1);
+    visit_type_int(v, NULL, &i64, &error_abort);
+    g_assert_cmpint(i64, ==, 2);
+    visit_end_list(v, NULL);
+    /* BUG: unvisited tail not reported; actually not reportable by design */
+}
+
+static void test_visitor_in_fail_list_nested(TestInputVisitorData *data,
+                                             const void *unused)
+{
+    int64_t i64 = -1;
+    Visitor *v;
+
+    /* Unvisited nested list tail */
+
+    v = visitor_input_test_init(data, "[ 0, [ 1, 2, 3 ] ]");
+
+    visit_start_list(v, NULL, NULL, 0, &error_abort);
+    visit_type_int(v, NULL, &i64, &error_abort);
+    g_assert_cmpint(i64, ==, 0);
+    visit_start_list(v, NULL, NULL, 0, &error_abort);
+    visit_type_int(v, NULL, &i64, &error_abort);
+    g_assert_cmpint(i64, ==, 1);
+    visit_end_list(v, NULL);
+    /* BUG: unvisited tail not reported; actually not reportable by design */
+    visit_end_list(v, NULL);
+}
+
 static void test_visitor_in_fail_union_native_list(TestInputVisitorData *data,
                                                    const void *unused)
 {
@@ -1070,6 +1110,10 @@ int main(int argc, char **argv)
                            NULL, test_visitor_in_fail_struct_in_list);
     input_visitor_test_add("/visitor/input/fail/struct-missing",
                            NULL, test_visitor_in_fail_struct_missing);
+    input_visitor_test_add("/visitor/input/fail/list",
+                           NULL, test_visitor_in_fail_list);
+    input_visitor_test_add("/visitor/input/fail/list-nested",
+                           NULL, test_visitor_in_fail_list_nested);
     input_visitor_test_add("/visitor/input/fail/union-flat",
                            NULL, test_visitor_in_fail_union_flat);
     input_visitor_test_add("/visitor/input/fail/union-flat-no-discriminator",
diff --git a/tests/test-string-input-visitor.c b/tests/test-string-input-visitor.c
index 72f8732..70cee65 100644
--- a/tests/test-string-input-visitor.c
+++ b/tests/test-string-input-visitor.c
@@ -121,6 +121,7 @@ static void test_visitor_in_intList(TestInputVisitorData *data,
     uint64_t expect4[] = { UINT64_MAX };
     Error *err = NULL;
     int64List *res = NULL;
+    int64List *tail;
     Visitor *v;
 
     /* Valid lists */
@@ -151,6 +152,27 @@ static void test_visitor_in_intList(TestInputVisitorData *data,
     visit_type_int64List(v, NULL, &res, &err);
     error_free_or_abort(&err);
     g_assert(!res);
+
+    /* Unvisited list tail */
+
+    v = visitor_input_test_init(data, "0,2-3");
+
+    /* Would be simpler if the visitor genuinely supported virtual walks */
+    visit_start_list(v, NULL, (GenericList **)&res, sizeof(*res),
+                     &error_abort);
+    tail = res;
+    visit_type_int64(v, NULL, &tail->value, &error_abort);
+    g_assert_cmpint(tail->value, ==, 0);
+    tail = (int64List *)visit_next_list(v, (GenericList *)tail, sizeof(*res));
+    g_assert(tail);
+    visit_type_int64(v, NULL, &tail->value, &error_abort);
+    g_assert_cmpint(tail->value, ==, 2);
+    tail = (int64List *)visit_next_list(v, (GenericList *)tail, sizeof(*res));
+    g_assert(tail);
+    visit_end_list(v, (void **)&res);
+    /* BUG: unvisited tail not reported; actually not reportable by design */
+
+    qapi_free_int64List(res);
 }
 
 static void test_visitor_in_bool(TestInputVisitorData *data,
-- 
2.7.4

  parent reply	other threads:[~2017-03-03 12:33 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-03 12:32 [Qemu-devel] [PATCH v4 00/28] qapi: QMP dispatch and input visitor work Markus Armbruster
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 01/28] qga: Fix crash on non-dictionary QMP argument Markus Armbruster
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 02/28] libqtest: Work around a "QMP wants a newline" bug Markus Armbruster
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 03/28] qmp-test: New, covering basic QMP protocol Markus Armbruster
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 04/28] qmp: Dumb down how we run QMP command registration Markus Armbruster
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 05/28] qapi: Support multiple command registries per program Markus Armbruster
2017-03-03 18:24   ` Eric Blake
2017-03-03 19:37     ` Markus Armbruster
2017-03-03 19:52       ` Eric Blake
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 06/28] qapi-introspect: Mangle --prefix argument properly for C Markus Armbruster
2017-03-03 18:29   ` Eric Blake
2017-03-03 19:41     ` Markus Armbruster
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 07/28] qmp: Clean up how we enforce capability negotiation Markus Armbruster
2017-03-03 18:40   ` Eric Blake
2017-03-03 19:45     ` Markus Armbruster
2017-03-03 19:57       ` Eric Blake
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 08/28] qmp: Drop duplicated QMP command object checks Markus Armbruster
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 09/28] qmp: Eliminate silly QERR_QMP_* macros Markus Armbruster
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 10/28] qmp: Improve QMP dispatch error messages Markus Armbruster
2017-03-03 19:55   ` Philippe Mathieu-Daudé
2017-03-05  8:01     ` Markus Armbruster
2017-03-06 16:10       ` Eric Blake
2017-03-07  7:45         ` Markus Armbruster
2017-03-07 14:21       ` Eric Blake
2017-03-07 14:26         ` Philippe Mathieu-Daudé
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 11/28] qapi: Improve a QObject input visitor error message Markus Armbruster
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 12/28] qapi: Clean up after commit 3d344c2 Markus Armbruster
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 13/28] qapi: Make QObject input visitor set *list reliably Markus Armbruster
2017-03-03 19:57   ` Philippe Mathieu-Daudé
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 14/28] qapi: Improve qobject input visitor error reporting Markus Armbruster
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 15/28] qapi: Drop string input visitor method optional() Markus Armbruster
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 16/28] qapi: Make string input and opts visitor require non-null input Markus Armbruster
2017-03-06 17:07   ` Philippe Mathieu-Daudé
2017-03-07  7:47     ` Markus Armbruster
2017-03-07 12:17       ` Philippe Mathieu-Daudé
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 17/28] qom: Make object_property_set_qobject()'s input visitor strict Markus Armbruster
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 18/28] test-qobject-input-visitor: Use strict visitor Markus Armbruster
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 19/28] qapi: Drop unused non-strict qobject input visitor Markus Armbruster
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 20/28] tests-qobject-input-strict: Merge into test-qobject-input-visitor Markus Armbruster
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 21/28] test-string-input-visitor: Tear down existing test automatically Markus Armbruster
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 22/28] test-string-input-visitor: Improve list coverage Markus Armbruster
2017-03-03 12:32 ` Markus Armbruster [this message]
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 24/28] test-qobject-input-visitor: Cover missing nested struct member Markus Armbruster
2017-03-03 18:45   ` Eric Blake
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 25/28] qapi: Make input visitors detect unvisited list tails Markus Armbruster
2017-03-03 19:15   ` Eric Blake
2017-03-03 19:50     ` Markus Armbruster
2017-03-03 20:01       ` Eric Blake
2017-03-05  8:06         ` Markus Armbruster
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 26/28] tests: Cover input visit beyond end of list Markus Armbruster
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 27/28] qapi: Fix object " Markus Armbruster
2017-03-03 12:32 ` [Qemu-devel] [PATCH v4 28/28] qapi: Improve qobject visitor documentation Markus Armbruster
2017-03-03 12:58 ` [Qemu-devel] [PATCH v4 00/28] qapi: QMP dispatch and input visitor work no-reply

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=1488544368-30622-24-git-send-email-armbru@redhat.com \
    --to=armbru@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).