From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [Qemu-devel] [PULL 13/47] tests/check-qlit: New, covering qobject/qlit.c
Date: Fri, 1 Sep 2017 14:55:37 +0200 [thread overview]
Message-ID: <20170901125611.29295-14-armbru@redhat.com> (raw)
In-Reply-To: <20170901125611.29295-1-armbru@redhat.com>
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20170825105913.4060-11-marcandre.lureau@redhat.com>
[Copyright notice correction squashed in, commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
tests/Makefile.include | 5 +++-
tests/check-qlit.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 68 insertions(+), 1 deletion(-)
create mode 100644 tests/check-qlit.c
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 00af45ca85..fae5715e9c 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -43,6 +43,8 @@ check-unit-y += tests/check-qnull$(EXESUF)
gcov-files-check-qnull-y = qobject/qnull.c
check-unit-y += tests/check-qjson$(EXESUF)
gcov-files-check-qjson-y = qobject/qjson.c
+check-unit-y += tests/check-qlit$(EXESUF)
+gcov-files-check-qlit-y = qobject/qlit.c
check-unit-y += tests/test-qobject-output-visitor$(EXESUF)
gcov-files-test-qobject-output-visitor-y = qapi/qobject-output-visitor.c
check-unit-y += tests/test-clone-visitor$(EXESUF)
@@ -541,7 +543,7 @@ GENERATED_FILES += tests/test-qapi-types.h tests/test-qapi-visit.h \
test-obj-y = tests/check-qnum.o tests/check-qstring.o tests/check-qdict.o \
tests/check-qlist.o tests/check-qnull.o \
- tests/check-qjson.o \
+ tests/check-qjson.o tests/check-qlit.o \
tests/test-coroutine.o tests/test-string-output-visitor.o \
tests/test-string-input-visitor.o tests/test-qobject-output-visitor.o \
tests/test-clone-visitor.o \
@@ -575,6 +577,7 @@ tests/check-qdict$(EXESUF): tests/check-qdict.o $(test-util-obj-y)
tests/check-qlist$(EXESUF): tests/check-qlist.o $(test-util-obj-y)
tests/check-qnull$(EXESUF): tests/check-qnull.o $(test-util-obj-y)
tests/check-qjson$(EXESUF): tests/check-qjson.o $(test-util-obj-y)
+tests/check-qlit$(EXESUF): tests/check-qlit.o $(test-util-obj-y)
tests/check-qom-interface$(EXESUF): tests/check-qom-interface.o $(test-qom-obj-y)
tests/check-qom-proplist$(EXESUF): tests/check-qom-proplist.o $(test-qom-obj-y)
diff --git a/tests/check-qlit.c b/tests/check-qlit.c
new file mode 100644
index 0000000000..d2422bbaf0
--- /dev/null
+++ b/tests/check-qlit.c
@@ -0,0 +1,64 @@
+/*
+ * QLit unit-tests.
+ *
+ * Copyright (C) 2017 Red Hat Inc.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+
+#include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qlit.h"
+#include "qapi/qmp/qnum.h"
+#include "qapi/qmp/qstring.h"
+
+static QLitObject qlit = QLIT_QDICT(((QLitDictEntry[]) {
+ { "foo", QLIT_QNUM(42) },
+ { "bar", QLIT_QSTR("hello world") },
+ { "baz", QLIT_QNULL },
+ { "bee", QLIT_QLIST(((QLitObject[]) {
+ QLIT_QNUM(43),
+ QLIT_QNUM(44),
+ QLIT_QBOOL(true),
+ { },
+ }))},
+ { },
+}));
+
+static QObject *make_qobject(void)
+{
+ QDict *qdict = qdict_new();
+ QList *list = qlist_new();
+
+ qdict_put_int(qdict, "foo", 42);
+ qdict_put_str(qdict, "bar", "hello world");
+ qdict_put_null(qdict, "baz");
+
+ qlist_append_int(list, 43);
+ qlist_append_int(list, 44);
+ qlist_append_bool(list, true);
+ qdict_put(qdict, "bee", list);
+
+ return QOBJECT(qdict);
+}
+
+static void qlit_equal_qobject_test(void)
+{
+ QObject *qobj = make_qobject();
+
+ g_assert(qlit_equal_qobject(&qlit, qobj));
+
+ qobject_decref(qobj);
+}
+
+int main(int argc, char **argv)
+{
+ g_test_init(&argc, &argv, NULL);
+
+ g_test_add_func("/qlit/equal_qobject", qlit_equal_qobject_test);
+
+ return g_test_run();
+}
--
2.13.5
next prev parent reply other threads:[~2017-09-01 12:56 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-01 12:55 [Qemu-devel] [PULL 00/47] QAPI patches for 2017-09-01 Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 01/47] qapi: Fix error handling code on alternate conflict Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 02/47] tests/qmp-test: Add generic, basic test of query commands Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 03/47] qobject: Explain how QNum works, and why Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 04/47] qdict: Add qdict_put_null() helper, and put it to use Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 05/47] qlit: move qlit from check-qjson to qobject/ Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 06/47] qlit: use QLit prefix consistently Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 07/47] qlit: Change compound literals to initializers Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 08/47] qlit: rename compare_litqobj_to_qobj() to qlit_equal_qobject() Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 09/47] qlit: make qlit_equal_qobject return a bool Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 10/47] qlit: make qlit_equal_qobject() take const arguments Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 11/47] qlit: add QLIT_QNULL and QLIT_BOOL Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 12/47] qlit: Replace open-coded qnum_get_int() by call Markus Armbruster
2017-09-01 12:55 ` Markus Armbruster [this message]
2017-09-01 12:55 ` [Qemu-devel] [PULL 14/47] qlit: Tighten QLit dict vs QDict comparison Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 15/47] qlit: Tighten QLit list vs QList comparison Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 16/47] qapi-schema: Document how generated documentation is ordered Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 17/47] qapi-schema: Introspection doc is in the wrong section, fix Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 18/47] qapi-schema: Rocker doc section contains unrelated stuff, fix Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 19/47] qapi-schema: Collect sockets stuff in qapi/sockets.json Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 20/47] qapi-schema: Collect run state stuff in qapi/run-state.json Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 21/47] qapi-schema: Collect char device stuff in qapi/char.json Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 22/47] qapi-schema: Collect net device stuff in qapi/net.json Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 23/47] qapi-schema: Collect UI stuff in qapi/ui.json Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 24/47] qapi-schema: Collect migration stuff in qapi/migration.json Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 25/47] qapi-schema: Collect transaction stuff in qapi/transaction.json Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 26/47] qapi-schema: Collect TPM stuff in qapi/tpm.json Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 27/47] qapi-schema: Move block events from event.json to block.json Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 28/47] qapi-schema: Fold event.json back into qapi-schema.json Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 29/47] qapi-schema: Make block-core.json self-contained Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 30/47] qapi-schema: Move queries from common.json to qapi-schema.json Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 31/47] qapi-schema: Improve section headings Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 32/47] qapi: Update qapi-code-gen.txt examples to match current code Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 33/47] qapi: Drop superfluous qapi_enum_parse() parameter max Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 34/47] tpm: Clean up driver registration & lookup Markus Armbruster
2017-09-01 12:55 ` [Qemu-devel] [PULL 35/47] tpm: Clean up model " Markus Armbruster
2017-09-01 12:56 ` [Qemu-devel] [PULL 36/47] hmp: Use qapi_enum_parse() in hmp_migrate_set_capability() Markus Armbruster
2017-09-01 12:56 ` [Qemu-devel] [PULL 37/47] hmp: Use qapi_enum_parse() in hmp_migrate_set_parameter() Markus Armbruster
2017-09-01 12:56 ` [Qemu-devel] [PULL 38/47] block: Use qemu_enum_parse() in blkdebug_debug_breakpoint() Markus Armbruster
2017-09-01 12:56 ` [Qemu-devel] [PULL 39/47] quorum: Use qapi_enum_parse() in quorum_open() Markus Armbruster
2017-09-01 12:56 ` [Qemu-devel] [PULL 40/47] crypto: Use qapi_enum_parse() in qcrypto_block_luks_name_lookup() Markus Armbruster
2017-09-01 12:56 ` [Qemu-devel] [PULL 41/47] qapi: Use qapi_enum_parse() in input_type_enum() Markus Armbruster
2017-09-01 12:56 ` [Qemu-devel] [PULL 42/47] qapi: Avoid unnecessary use of enum lookup table's sentinel Markus Armbruster
2017-09-01 12:56 ` [Qemu-devel] [PULL 43/47] qapi: Generate FOO_str() macro for QAPI enum FOO Markus Armbruster
2017-09-01 12:56 ` [Qemu-devel] [PULL 44/47] qapi: Mechanically convert FOO_lookup[...] to FOO_str(...) Markus Armbruster
2017-09-01 12:56 ` [Qemu-devel] [PULL 45/47] qapi: Convert indirect uses of FOO_lookup[...] to qapi_enum_lookup() Markus Armbruster
2017-09-01 12:56 ` [Qemu-devel] [PULL 46/47] qapi: Change data type of the FOO_lookup generated for enum FOO Markus Armbruster
2017-09-01 12:56 ` [Qemu-devel] [PULL 47/47] qapi: drop the sentinel in enum array Markus Armbruster
2017-09-01 13:58 ` [Qemu-devel] [PULL 00/47] QAPI patches for 2017-09-01 no-reply
2017-09-01 14:34 ` 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=20170901125611.29295-14-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=marcandre.lureau@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).