diff mbox

[4/7] tests: Add QOM property unit tests

Message ID 1443184788-18859-5-git-send-email-afaerber@suse.de
State New
Headers show

Commit Message

Andreas Färber Sept. 25, 2015, 12:39 p.m. UTC
Add a test for parsing and setting a uint64 property.

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 MAINTAINERS             |   1 +
 tests/Makefile          |   3 ++
 tests/check-qom-props.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 124 insertions(+)
 create mode 100644 tests/check-qom-props.c

Comments

Eric Blake Sept. 25, 2015, 2:58 p.m. UTC | #1
On 09/25/2015 06:39 AM, Andreas Färber wrote:
> Add a test for parsing and setting a uint64 property.
> 
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
>  MAINTAINERS             |   1 +
>  tests/Makefile          |   3 ++
>  tests/check-qom-props.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 124 insertions(+)
>  create mode 100644 tests/check-qom-props.c
> 

> +static void test_dummy_uint64(void)
> +{
> +    Error *err = NULL;
> +    char *str;
> +    DummyObject *dobj = DUMMY_OBJECT(object_new(TYPE_DUMMY));
> +
> +    g_assert(dobj->u64val == 0);
> +
> +    str = g_strdup_printf("%" PRIu64, UINT64_MAX);
> +    object_property_parse(OBJECT(dobj), str, "u64val", &err);
> +    g_free(str);
> +    g_assert(!err);

Use &error_abort, then you don't need the g_assert(!err).

> +    g_assert_cmpint(dobj->u64val, ==, UINT64_MAX);
> +
> +    dobj->u64val = 0;
> +    str = g_strdup_printf("0x%" PRIx64, UINT64_MAX);
> +    object_property_parse(OBJECT(dobj), str, "u64val", &err);
> +    g_free(str);
> +    g_assert(!err);
> +    g_assert_cmpint(dobj->u64val, ==, UINT64_MAX);
> +
> +    object_unref(OBJECT(dobj));

As with other patches in this series, intentionally testing the behavior
of -1, and of (ULLONG_MAX+1), would be good.
Daniel P. Berrangé Sept. 25, 2015, 3:01 p.m. UTC | #2
On Fri, Sep 25, 2015 at 02:39:45PM +0200, Andreas Färber wrote:
> Add a test for parsing and setting a uint64 property.
> 
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
>  MAINTAINERS             |   1 +
>  tests/Makefile          |   3 ++
>  tests/check-qom-props.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 124 insertions(+)
>  create mode 100644 tests/check-qom-props.c

FWIW, back in commit a31bdae5a76ecc060c1eb8a66be1896072c1e8b2 I added
a  check-qom-proplist.c unit test, and later extended it with test
for enums. Perhaps your addition is best placed in there, or we could
rename that test to check-qom-props.c so we just have one file for all
property unit testing

Regards,
Daniel
Andreas Färber Nov. 11, 2015, 7:52 p.m. UTC | #3
Am 25.09.2015 um 17:01 schrieb Daniel P. Berrange:
> On Fri, Sep 25, 2015 at 02:39:45PM +0200, Andreas Färber wrote:
>> Add a test for parsing and setting a uint64 property.
>>
>> Signed-off-by: Andreas Färber <afaerber@suse.de>
>> ---
>>  MAINTAINERS             |   1 +
>>  tests/Makefile          |   3 ++
>>  tests/check-qom-props.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++
>>  3 files changed, 124 insertions(+)
>>  create mode 100644 tests/check-qom-props.c
> 
> FWIW, back in commit a31bdae5a76ecc060c1eb8a66be1896072c1e8b2 I added
> a  check-qom-proplist.c unit test, and later extended it with test
> for enums.

That's where your copyright and authorship came from.

> Perhaps your addition is best placed in there, or we could
> rename that test to check-qom-props.c so we just have one file for all
> property unit testing

I can only guess that my dislike was "/qom/proplist" as my test has
nothing to do with lists. Otherwise it looks similar enough. I'll rename
it and merge the two.

Regards,
Andreas
diff mbox

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 71c652b..a941cfd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1032,6 +1032,7 @@  F: include/qom/
 X: include/qom/cpu.h
 F: qom/
 X: qom/cpu.c
+F: tests/check-qom-props.c
 F: tests/qom-test.c
 
 QMP
diff --git a/tests/Makefile b/tests/Makefile
index 4063639..93116a2 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -72,6 +72,8 @@  check-unit-y += tests/check-qom-interface$(EXESUF)
 gcov-files-check-qom-interface-y = qom/object.c
 check-unit-y += tests/check-qom-proplist$(EXESUF)
 gcov-files-check-qom-proplist-y = qom/object.c
+check-unit-y += tests/check-qom-props$(EXESUF)
+gcov-files-check-qom-props-y = qom/object.c
 check-unit-y += tests/test-qemu-opts$(EXESUF)
 gcov-files-test-qemu-opts-y = qom/test-qemu-opts.c
 check-unit-y += tests/test-write-threshold$(EXESUF)
@@ -303,6 +305,7 @@  tests/check-qfloat$(EXESUF): tests/check-qfloat.o $(test-util-obj-y)
 tests/check-qjson$(EXESUF): tests/check-qjson.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)
+tests/check-qom-props$(EXESUF): tests/check-qom-props.o $(test-qom-obj-y)
 tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(test-block-obj-y)
 tests/test-aio$(EXESUF): tests/test-aio.o $(test-block-obj-y)
 tests/test-rfifolock$(EXESUF): tests/test-rfifolock.o $(test-util-obj-y)
diff --git a/tests/check-qom-props.c b/tests/check-qom-props.c
new file mode 100644
index 0000000..53e5cc0
--- /dev/null
+++ b/tests/check-qom-props.c
@@ -0,0 +1,120 @@ 
+/*
+ * Copyright (C) 2015 Red Hat, Inc.
+ * Copyright (c) 2015 SUSE Linux GmbH
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Author: Daniel P. Berrange <berrange@redhat.com>
+ *         Andreas Färber <afaerber@suse.com>
+ */
+
+#include <glib.h>
+
+#include "qapi/visitor.h"
+#include "qom/object.h"
+#include "qemu/module.h"
+
+
+#define TYPE_DUMMY "qemu-dummy"
+
+typedef struct DummyObject DummyObject;
+typedef struct DummyObjectClass DummyObjectClass;
+
+#define DUMMY_OBJECT(obj)                               \
+    OBJECT_CHECK(DummyObject, (obj), TYPE_DUMMY)
+
+struct DummyObject {
+    Object parent_obj;
+
+    uint64_t u64val;
+};
+
+struct DummyObjectClass {
+    ObjectClass parent_class;
+};
+
+static void dummy_set_uint64(Object *obj, Visitor *v,
+                             void *opaque, const char *name,
+                             Error **errp)
+{
+    uint64_t *ptr = (uint64_t *)opaque;
+
+    visit_type_uint64(v, ptr, name, errp);
+}
+
+static void dummy_get_uint64(Object *obj, Visitor *v,
+                             void *opaque, const char *name,
+                             Error **errp)
+{
+    uint64_t value = *(uint64_t *)opaque;
+
+    visit_type_uint64(v, &value, name, errp);
+}
+
+static void dummy_init(Object *obj)
+{
+    DummyObject *dobj = DUMMY_OBJECT(obj);
+
+    object_property_add(obj, "u64val", "uint64",
+                              dummy_get_uint64,
+                              dummy_set_uint64,
+                              NULL, &dobj->u64val, NULL);
+}
+
+
+static const TypeInfo dummy_info = {
+    .name          = TYPE_DUMMY,
+    .parent        = TYPE_OBJECT,
+    .instance_size = sizeof(DummyObject),
+    .instance_init = dummy_init,
+    .class_size = sizeof(DummyObjectClass),
+};
+
+static void test_dummy_uint64(void)
+{
+    Error *err = NULL;
+    char *str;
+    DummyObject *dobj = DUMMY_OBJECT(object_new(TYPE_DUMMY));
+
+    g_assert(dobj->u64val == 0);
+
+    str = g_strdup_printf("%" PRIu64, UINT64_MAX);
+    object_property_parse(OBJECT(dobj), str, "u64val", &err);
+    g_free(str);
+    g_assert(!err);
+    g_assert_cmpint(dobj->u64val, ==, UINT64_MAX);
+
+    dobj->u64val = 0;
+    str = g_strdup_printf("0x%" PRIx64, UINT64_MAX);
+    object_property_parse(OBJECT(dobj), str, "u64val", &err);
+    g_free(str);
+    g_assert(!err);
+    g_assert_cmpint(dobj->u64val, ==, UINT64_MAX);
+
+    object_unref(OBJECT(dobj));
+}
+
+
+int main(int argc, char **argv)
+{
+    g_test_init(&argc, &argv, NULL);
+
+    module_call_init(MODULE_INIT_QOM);
+    type_register_static(&dummy_info);
+
+    g_test_add_func("/qom/props/uint64", test_dummy_uint64);
+
+    return g_test_run();
+}