From patchwork Wed Aug 19 23:08:00 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 31704 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 5B8B2B6F1F for ; Thu, 20 Aug 2009 10:01:32 +1000 (EST) Received: from localhost ([127.0.0.1]:44140 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mdv5s-0003xr-8H for incoming@patchwork.ozlabs.org; Wed, 19 Aug 2009 20:01:28 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MduIB-0002ed-WE for qemu-devel@nongnu.org; Wed, 19 Aug 2009 19:10:08 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MduI7-0002eG-TX for qemu-devel@nongnu.org; Wed, 19 Aug 2009 19:10:07 -0400 Received: from [199.232.76.173] (port=49927 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MduI7-0002eD-PN for qemu-devel@nongnu.org; Wed, 19 Aug 2009 19:10:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59708) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MduI7-0005eu-1t for qemu-devel@nongnu.org; Wed, 19 Aug 2009 19:10:03 -0400 Received: from int-mx06.intmail.prod.int.phx2.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.19]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7JNA1Rv009705; Wed, 19 Aug 2009 19:10:01 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx06.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7JNA0vn013726; Wed, 19 Aug 2009 19:10:01 -0400 Received: from localhost (vpn-10-5.bos.redhat.com [10.16.10.5]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n7JN9wrp032066; Wed, 19 Aug 2009 19:09:59 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 19 Aug 2009 20:08:00 -0300 Message-Id: <1250723280-3509-30-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1250723280-3509-1-git-send-email-lcapitulino@redhat.com> References: <1250723280-3509-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.19 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, avi@redhat.com Subject: [Qemu-devel] [PATCH 29/29] Introduce QDict unit-tests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This suite contains tests to assure that QDict API works as expected. To execute it you should have check installed and build QEMU with check support enabled (--enable-check) and then run: $ ./check-qdict Signed-off-by: Luiz Capitulino --- Makefile | 1 + check-qdict.c | 347 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure | 2 +- 3 files changed, 349 insertions(+), 1 deletions(-) create mode 100644 check-qdict.c diff --git a/Makefile b/Makefile index e5c87ac..b7284bb 100644 --- a/Makefile +++ b/Makefile @@ -184,6 +184,7 @@ ifdef CONFIG_CHECK LIBS += $(CHECK_LIBS) check-qint: check-qint.o qint.o qemu-malloc.o check-qstring: check-qstring.o qstring.o qemu-malloc.o +check-qdict: check-qdict.o qdict.o qint.o qstring.o qemu-malloc.o endif clean: diff --git a/check-qdict.c b/check-qdict.c new file mode 100644 index 0000000..7044cb9 --- /dev/null +++ b/check-qdict.c @@ -0,0 +1,347 @@ +/* + * QDict unit-tests. + * + * Copyright (C) 2009 Red Hat Inc. + * + * Authors: + * Luiz Capitulino + */ +#include + +#include "qint.h" +#include "qdict.h" +#include "qstring.h" +#include "qemu-common.h" + +/* + * Public Interface test-cases + * + * (with some violations to access 'private' data) + */ + +START_TEST(qdict_new_test) +{ + QDict *qdict; + + qdict = qdict_new(); + fail_unless(qdict != NULL); + fail_unless(qdict_size(qdict) == 0); + fail_unless(qdict->base.refcnt == 1); + fail_unless(qobject_type(QOBJECT(qdict)) == QTYPE_QDICT); + + // destroy doesn't exit yet + free(qdict); +} +END_TEST + +START_TEST(qdict_add_test) +{ + QInt *qi; + QDict *qdict; + QDictEntry *ent; + const int num = 42; + + qdict = qdict_new(); + qi = qint_from_int(num); + + // key "" will have hash 12345 + qdict_add(qdict, "", QOBJECT(qi)); + + fail_unless(qdict_size(qdict) == 1); + ent = qdict->table[12345 % QDICT_HASH_SIZE]; + qi = qobject_to_qint(ent->value); + fail_unless(qint_to_int(qi) == num); + + // destroy doesn't exit yet + QDECREF(qi); + qemu_free(ent->key); + qemu_free(ent); + qemu_free(qdict); +} +END_TEST + +START_TEST(qdict_destroy_simple_test) +{ + QInt *qi; + QString *qs; + QDict *qdict; + + qi = qint_from_int(0); + qs = qstring_from_str("foo"); + + qdict = qdict_new(); + qdict_add(qdict, "num", QOBJECT(qi)); + qdict_add(qdict, "str", QOBJECT(qs)); + + QDECREF(qdict); +} +END_TEST + +static QDict *tests_dict = NULL; + +static void qdict_setup(void) +{ + tests_dict = qdict_new(); + fail_unless(tests_dict != NULL); +} + +static void qdict_teardown(void) +{ + QDECREF(tests_dict); + tests_dict = NULL; +} + +START_TEST(qdict_get_test) +{ + QInt *qi; + QObject *obj; + const int value = 42; + const char *key = "test"; + + qi = qint_from_int(value); + qdict_add(tests_dict, key, QOBJECT(qi)); + + obj = qdict_get(tests_dict, key); + fail_unless(obj != NULL); + + qi = qobject_to_qint(obj); + fail_unless(qint_to_int(qi) == value); +} +END_TEST + +START_TEST(qdict_get_int_test) +{ + int ret; + const int value = 42; + const char *key = "int"; + + qdict_add_qint(tests_dict, key, qint_from_int(value)); + + ret = qdict_get_int(tests_dict, key); + fail_unless(ret == value); +} +END_TEST + +START_TEST(qdict_get_str_test) +{ + const char *p; + const char *key = "key"; + const char *str = "string"; + + qdict_add_qstring(tests_dict, key, qstring_from_str(str)); + + p = qdict_get_str(tests_dict, key); + fail_unless(p != NULL); + fail_unless(strcmp(p, str) == 0); +} +END_TEST + +START_TEST(qdict_exists_not_test) +{ + fail_unless(qdict_exists(tests_dict, "test") == 0); +} +END_TEST + +START_TEST(qdict_exists_test) +{ + QInt *qi; + const char *key = "test"; + + qi = qint_from_int(0); + qdict_add(tests_dict, key, QOBJECT(qi)); + fail_unless(qdict_exists(tests_dict, key) == 1); +} +END_TEST + +START_TEST(qdict_del_test) +{ + QString *qs; + const char *key = "key test"; + + qs = qstring_from_str("foo"); + qdict_add(tests_dict, key, QOBJECT(qs)); + fail_unless(qdict_size(tests_dict) == 1); + + qdict_del(tests_dict, key); + + fail_unless(qdict_size(tests_dict) == 0); + fail_unless(qdict_get(tests_dict, key) == NULL); +} +END_TEST + +/* + * Errors test-cases + */ + +START_TEST(qdict_add_exists_test) +{ + int value; + QInt *qi1, *qi2; + const char *key = "test"; + + qi1 = qint_from_int(1); + qdict_add(tests_dict, key, QOBJECT(qi1)); + + qi2 = qint_from_int(2); + qdict_add(tests_dict, key, QOBJECT(qi2)); + + value = qdict_get_int(tests_dict, key); + fail_unless(value == 1); + + // Wasn't added + QDECREF(qi2); +} +END_TEST + +START_TEST(qdict_get_not_exists_test) +{ + fail_unless(qdict_get(tests_dict, "foo") == NULL); +} +END_TEST + +/* + * Stress test-case + * + * This is a lot big for a unit-test, but there is no other place + * to have it. + */ + +static void remove_dots(char *string) +{ + char *p = strchr(string, ':'); + if (p) + *p = '\0'; +} + +static QString *read_line(FILE *file, char *key) +{ + char value[128]; + + if (fscanf(file, "%s%s", key, value) == EOF) + return NULL; + remove_dots(key); + return qstring_from_str(value); +} + +#define reset_file(file) fseek(file, 0L, SEEK_SET) + +START_TEST(qdict_stress_test) +{ + size_t lines; + char key[128]; + FILE *test_file; + QDict *qdict; + QString *value; + const char *test_file_path = "qdict-test-data.txt"; + + test_file = fopen(test_file_path, "r"); + fail_unless(test_file != NULL); + + // Create the dict + qdict = qdict_new(); + fail_unless(qdict != NULL); + + // Add everything from the test file + for (lines = 0;; lines++) { + value = read_line(test_file, key); + if (!value) + break; + + qdict_add_qstring(qdict, key, value); + } + fail_unless(qdict_size(qdict) == lines); + + // Check if everything is really in there + reset_file(test_file); + for (;;) { + const char *str1, *str2; + + value = read_line(test_file, key); + if (!value) + break; + + str1 = qstring_get_str(value); + + str2 = qdict_get_str(qdict, key); + fail_unless(str2 != NULL); + + fail_unless(strcmp(str1, str2) == 0); + + QDECREF(value); + } + + // Delete everything + reset_file(test_file); + for (;;) { + value = read_line(test_file, key); + if (!value) + break; + + qdict_del(qdict, key); + QDECREF(value); + + fail_unless(qdict_get(qdict, key) == NULL); + } + fclose(test_file); + + fail_unless(qdict_size(qdict) == 0); + QDECREF(qdict); +} +END_TEST + +static Suite *qdict_suite(void) +{ + Suite *s; + TCase *qdict_public_tcase; + TCase *qdict_public2_tcase; + TCase *qdict_stress_tcase; + TCase *qdict_errors_tcase; + + s = suite_create("QDict test-suite"); + + qdict_public_tcase = tcase_create("Public Interface"); + suite_add_tcase(s, qdict_public_tcase); + tcase_add_test(qdict_public_tcase, qdict_new_test); + tcase_add_test(qdict_public_tcase, qdict_add_test); + tcase_add_test(qdict_public_tcase, qdict_destroy_simple_test); + + /* Continue, but now with fixtures */ + qdict_public2_tcase = tcase_create("Public Interface (2)"); + suite_add_tcase(s, qdict_public2_tcase); + tcase_add_checked_fixture(qdict_public2_tcase, qdict_setup, qdict_teardown); + tcase_add_test(qdict_public2_tcase, qdict_get_test); + tcase_add_test(qdict_public2_tcase, qdict_get_int_test); + tcase_add_test(qdict_public2_tcase, qdict_get_str_test); + tcase_add_test(qdict_public2_tcase, qdict_exists_not_test); + tcase_add_test(qdict_public2_tcase, qdict_exists_test); + tcase_add_test(qdict_public2_tcase, qdict_del_test); + + qdict_errors_tcase = tcase_create("Errors"); + suite_add_tcase(s, qdict_errors_tcase); + tcase_add_checked_fixture(qdict_errors_tcase, qdict_setup, qdict_teardown); + tcase_add_test(qdict_errors_tcase, qdict_add_exists_test); + tcase_add_test(qdict_errors_tcase, qdict_get_not_exists_test); + + /* The Big one */ + qdict_stress_tcase = tcase_create("Stress Test"); + suite_add_tcase(s, qdict_stress_tcase); + tcase_add_test(qdict_stress_tcase, qdict_stress_test); + + return s; +} + +int main(void) +{ + int nf; + Suite *s; + SRunner *sr; + + s = qdict_suite(); + sr = srunner_create(s); + + srunner_run_all(sr, CK_NORMAL); + nf = srunner_ntests_failed(sr); + srunner_free(sr); + + return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; +} diff --git a/configure b/configure index 725f366..d3d4b2d 100755 --- a/configure +++ b/configure @@ -1781,7 +1781,7 @@ if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then if [ "$linux" = "yes" ] ; then tools="qemu-nbd\$(EXESUF) qemu-io\$(EXESUF) $tools" if [ "$check" = "yes" ]; then - tools="check-qint check-qstring $tools" + tools="check-qint check-qstring check-qdict $tools" fi fi fi