test: QOM interface casting
RFC 1/1 test: QOM interface casting
--- tests/Makefile | 3 + tests/check-qom-interface.c | 102 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 0 deletions(-) create mode 100644 tests/check-qom-interface.c
tests/Makefile +3 -0
@@ -52,6 +52,8 @@ check-unit-y += tests/test-int128$(EXESUF) gcov-files-test-int128-y = check-unit-y += tests/test-bitops$(EXESUF) check-unit-y += tests/test-qdev-global-props$(EXESUF) +check-unit-y = tests/check-qom-interface$(EXESUF) +gcov-files-check-qdict-y = object/object.c check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh
@@ -205,6 +207,7 @@ tests/qom-test$(EXESUF): tests/qom-test.o tests/blockdev-test$(EXESUF): tests/blockdev-test.o $(libqos-pc-obj-y) tests/qdev-monitor-test$(EXESUF): tests/qdev-monitor-test.o $(libqos-pc-obj-y) tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o +tests/check-qom-interface$(EXESUF): tests/check-qom-interface.o qom/object.o qom/qom-qobject.o libqemuutil.a libqemustub.a # QTest rules
tests/check-qom-interface.c new file +102 -0
102 lines not on this page · raw message
Signature · 1 line
1.7.1
Quoted 50 lines · Igor Mammedov
--- tests/Makefile | 3 + tests/check-qom-interface.c | 102 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 0 deletions(-) create mode 100644 tests/check-qom-interface.ctests/Makefile +3
-0@@ -52,6 +52,8 @@ check-unit-y += tests/test-int128$(EXESUF) gcov-files-test-int128-y = check-unit-y += tests/test-bitops$(EXESUF) check-unit-y += tests/test-qdev-global-props$(EXESUF) +check-unit-y = tests/check-qom-interface$(EXESUF) +gcov-files-check-qdict-y = object/object.c check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh@@ -205,6 +207,7 @@ tests/qom-test$(EXESUF): tests/qom-test.o tests/blockdev-test$(EXESUF): tests/blockdev-test.o $(libqos-pc-obj-y) tests/qdev-monitor-test$(EXESUF): tests/qdev-monitor-test.o $(libqos-pc-obj-y) tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o +tests/check-qom-interface$(EXESUF): tests/check-qom-interface.o qom/object.o qom/qom-qobject.o libqemuutil.a libqemustub.a # QTest rulestests/check-qom-interface.c new file +17
-0@@ -0,0 +1,102 @@ +/* +* OQM interfacei test. +* +* Copyright (C) 2013 Red Hat Inc. +* +* Authors: +* Igor Mammedov <[email protected]> +* +* This work is licensed under the terms of the GNU LGPL, version 2.1 or later. +* See the COPYING.LIB file in the top-level directory. +*/ +#include <glib.h> + +#include "qom/object.h" +#include "qemu/module.h" + +
tests/check-qom-interface.c line 27
Quoted 10 lines
tests/check-qom-interface.c new file +10
-0+#define TYPE_TEST_IF "test-interface" +#define TEST_IF_CLASS (klass) \ + OBJECT_CLASS_CHECK(TestIfClass, (klass), TYPE_TEST_IF) +#define TEST_IF_GET_CLASS (obj) \ + OBJECT_GET_CLASS(TestIfClass, (obj), TYPE_TEST_IF) +#define TEST_IF (obj) \ + INTERFACE_CHECK(TestIf, (obj), TYPE_TEST_IF) + +typedef struct TestIf { + Object Parent;
parent_obj
tests/check-qom-interface.c line 31
Quoted 4 lines
tests/check-qom-interface.c new file +4
-0+} TestIf; + +typedef struct TestIfClass { + InterfaceClass parent;
parent_class?
Regards,
Peter
Quoted 75 lines
tests/check-qom-interface.c new file +71
-1+ +uint32_t test; +} TestIfClass; + +static const TypeInfo test_if_info = { + .name =TYPE_TEST_IF , + .parent =TYPE_INTERFACE , + .class_size =sizeof (TestIfClass), +}; + +#define PATTERN 0xFAFBFCFD +static void test_class_init (ObjectClass *oc,void *data) +{ +TestIfClass *tc =TEST_IF_CLASS (oc); + +g_assert (tc); + tc->test =PATTERN ; +} + +#define TYPE_DIRECT_IMPL "direct-impl" +static const TypeInfo direct_impl_info = { + .name =TYPE_DIRECT_IMPL , + .parent =TYPE_OBJECT , + .class_init = test_class_init, + .interfaces = (InterfaceInfo []) { + {TYPE_TEST_IF }, + { } + } +}; + +#define TYPE_INTERMEDIATE_IMPL "intermediate-impl" +static const TypeInfo intermediate_impl_info = { + .name =TYPE_INTERMEDIATE_IMPL , + .parent =TYPE_DIRECT_IMPL , +}; + +static void test_interface_impl (const char *type) +{ +Object *obj =object_new (type); +TestIf *iobj =TEST_IF (obj); +TestIfClass *ico =TEST_IF_GET_CLASS (iobj); + +g_assert (iobj); +g_assert (ico->test ==PATTERN ); +} + +static void interface_direct_test (void ) +{ +test_interface_impl (TYPE_DIRECT_IMPL ); +} + +static void interface_intermediate_test (void ) +{ +test_interface_impl (TYPE_INTERMEDIATE_IMPL ); +} + +int main (int argc,char **argv) +{ +g_test_init (&argc, &argv,NULL ); + +module_call_init (MODULE_INIT_QOM ); +type_register_static (&test_if_info); +type_register_static (&direct_impl_info); +type_register_static (&intermediate_impl_info); + +g_test_add_func ("/interface/direct_impl" , interface_direct_test); +g_test_add_func ("/interface/intermediate_impl" , + interface_intermediate_test); + +return g_test_run (); +} --1.7.1
Quoted 20 lines · Igor Mammedov
--- tests/Makefile | 3 + tests/check-qom-interface.c | 102 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 0 deletions(-) create mode 100644 tests/check-qom-interface.ctests/Makefile +2
-0@@ -52,6 +52,8 @@ check-unit-y += tests/test-int128$(EXESUF) gcov-files-test-int128-y = check-unit-y += tests/test-bitops$(EXESUF) check-unit-y += tests/test-qdev-global-props$(EXESUF) +check-unit-y = tests/check-qom-interface$(EXESUF) +gcov-files-check-qdict-y = object/object.c check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh
tests/Makefile tests/qom-test$(EXESUF): tests/qom-test.o · line 210
Quoted 4 lines
tests/Makefile +1
-0@@ -205,6 +207,7 @@ tests/qom-test$(EXESUF): tests/qom-test.o tests/blockdev-test$(EXESUF): tests/blockdev-test.o $(libqos-pc-obj-y) tests/qdev-monitor-test$(EXESUF): tests/qdev-monitor-test.o $(libqos-pc-obj-y) tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o +tests/check-qom-interface$(EXESUF): tests/check-qom-interface.o qom/object.o qom/qom-qobject.o libqemuutil.a libqemustub.a
This line's getting a bit long and could use folding I guess.
tests/check-qom-interface.c line 2
Quoted 11 lines
tests/Makefile +0
-0# QTest rulestests/check-qom-interface.c new file +2
-0@@ -0,0 +1,102 @@ +/* +* OQM interfacei test.
"QOM", "interface" :-)
thanks
-- PMM
Hi,
Am 20.12.2013 12:08, schrieb Igor Mammedov:
Quoted 5 lines
--- tests/Makefile | 3 + tests/check-qom-interface.c | 102 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 0 deletions(-) create mode 100644 tests/check-qom-interface.c
Apart from the style issues and typos that the two Peter's have pointed out, I'd like to point out that this is missing Signed-off-by and commit message. In particular, is this a test that should be committed alongside the interface cast fixes or anything else that I have queued? Or just to improve overall test coverage? Either way I'm in favor of having them.
Concerning PMM's comment, don't we already have a qdev properties unit test from Eduardo where we might share QOM dependencies via some Makefile variable? Grouping the check-* tests also makes sense to me than just adding at the bottom.
Anything in particular that you'd like comments on, this being an RFC?
Regards,
Andreas
Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Quoted 9 lines · On Fri, 20 Dec 2013 13:47:32 +0100 Andreas Färber <[email protected]> wrote:
Hi,
Am 20.12.2013 12:08, schrieb Igor Mammedov:
Quoted 5 lines
--- tests/Makefile | 3 + tests/check-qom-interface.c | 102 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 0 deletions(-) create mode 100644 tests/check-qom-interface.c
Quoted 6 lines
Apart from the style issues and typos that the two Peter's have pointed out, I'd like to point out that this is missing Signed-off-by and commit message. In particular, is this a test that should be committed alongside the interface cast fixes or anything else that I have queued? Or just to improve overall test coverage? Either way I'm in favor of having them.
Since interfaces are not widely used it's easy to break them, this adds regression testing. It could go along with fixes you've queued.
Quoted 7 lines
Concerning PMM's comment, don't we already have a qdev properties unit test from Eduardo where we might share QOM dependencies via some
Makefilevariable? Grouping the check-* tests also makes sense to me than just adding at the bottom.Anything in particular that you'd like comments on, this being an RFC?
Peters's and your comments are applied, I'll respin it as patch, thanks for reviewing.
Quoted 3 lines
Regards,
Andreas
Quoted 35 lines · Igor Mammedov
--- tests/Makefile | 3 + tests/check-qom-interface.c | 102 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 0 deletions(-) create mode 100644 tests/check-qom-interface.ctests/Makefile +2
-0@@ -52,6 +52,8 @@ check-unit-y += tests/test-int128$(EXESUF) gcov-files-test-int128-y = check-unit-y += tests/test-bitops$(EXESUF) check-unit-y += tests/test-qdev-global-props$(EXESUF) +check-unit-y = tests/check-qom-interface$(EXESUF) +gcov-files-check-qdict-y = object/object.c check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh@@ -205,6 +207,7 @@ tests/qom-test$(EXESUF): tests/qom-test.o tests/blockdev-test$(EXESUF): tests/blockdev-test.o $(libqos-pc-obj-y) tests/qdev-monitor-test$(EXESUF): tests/qdev-monitor-test.o $(libqos-pc-obj-y) tests/qemu-iotests/socket_scm_helper$(EXESUF):
tests/qemu-iotests/socket_scm_helper.o+tests/check-qom-interface$(EXESUF):tests/check-qom-interface.oqom/object.oqom/qom-qobject.olibqemuutil.a libqemustub.a# QTest rules
tests/check-qom-interface.c new file +0
-0
tests/check-qom-interface.c line 2
Quoted 2 lines
tests/check-qom-interface.c new file +2
-0@@ -0,0 +1,102 @@ +/* +* OQM interfacei test.
Machine-gun typist, eh? ;-)
[...]
Quoted 31 lines · On Sat, 21 Dec 2013 11:48:29 +0100 Markus Armbruster <[email protected]> wrote:
Quoted 29 lines · Igor Mammedov
--- tests/Makefile | 3 + tests/check-qom-interface.c | 102 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 0 deletions(-) create mode 100644 tests/check-qom-interface.ctests/Makefile +2
-0@@ -52,6 +52,8 @@ check-unit-y += tests/test-int128$(EXESUF) gcov-files-test-int128-y = check-unit-y += tests/test-bitops$(EXESUF) check-unit-y += tests/test-qdev-global-props$(EXESUF) +check-unit-y = tests/check-qom-interface$(EXESUF) +gcov-files-check-qdict-y = object/object.c check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh@@ -205,6 +207,7 @@ tests/qom-test$(EXESUF): tests/qom-test.o tests/blockdev-test$(EXESUF): tests/blockdev-test.o $(libqos-pc-obj-y) tests/qdev-monitor-test$(EXESUF): tests/qdev-monitor-test.o $(libqos-pc-obj-y) tests/qemu-iotests/socket_scm_helper$(EXESUF):
tests/qemu-iotests/socket_scm_helper.o+tests/check-qom-interface$(EXESUF):tests/check-qom-interface.oqom/object.oqom/qom-qobject.olibqemuutil.a libqemustub.a# QTest rules
Quoted 10 lines
tests/check-qom-interface.c line 2
Quoted 8 lines
tests/check-qom-interface.c new file +2
-0@@ -0,0 +1,102 @@ +/* +* OQM interfacei test. Machine-gun typist, eh? ;-)
sort of :)
fixed in v2
Quoted 2 lines
[...]
Signature · 2 lines
Regards, Igor