[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/15] check-qlist: convert to gtest
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [PATCH 07/15] check-qlist: convert to gtest |
Date: |
Tue, 10 Jan 2012 13:10:48 -0600 |
Signed-off-by: Anthony Liguori <address@hidden>
---
check-qlist.c | 74 ++++++++++++++++++--------------------------------------
configure | 3 +-
2 files changed, 25 insertions(+), 52 deletions(-)
diff --git a/check-qlist.c b/check-qlist.c
index ee2454a..501ba26 100644
--- a/check-qlist.c
+++ b/check-qlist.c
@@ -9,7 +9,7 @@
* 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 <check.h>
+#include <glib.h>
#include "qint.h"
#include "qlist.h"
@@ -20,21 +20,20 @@
* (with some violations to access 'private' data)
*/
-START_TEST(qlist_new_test)
+static void qlist_new_test(void)
{
QList *qlist;
qlist = qlist_new();
- fail_unless(qlist != NULL);
- fail_unless(qlist->base.refcnt == 1);
- fail_unless(qobject_type(QOBJECT(qlist)) == QTYPE_QLIST);
+ g_assert(qlist != NULL);
+ g_assert(qlist->base.refcnt == 1);
+ g_assert(qobject_type(QOBJECT(qlist)) == QTYPE_QLIST);
// destroy doesn't exist yet
g_free(qlist);
}
-END_TEST
-START_TEST(qlist_append_test)
+static void qlist_append_test(void)
{
QInt *qi;
QList *qlist;
@@ -46,30 +45,28 @@ START_TEST(qlist_append_test)
qlist_append(qlist, qi);
entry = QTAILQ_FIRST(&qlist->head);
- fail_unless(entry != NULL);
- fail_unless(entry->value == QOBJECT(qi));
+ g_assert(entry != NULL);
+ g_assert(entry->value == QOBJECT(qi));
// destroy doesn't exist yet
QDECREF(qi);
g_free(entry);
g_free(qlist);
}
-END_TEST
-START_TEST(qobject_to_qlist_test)
+static void qobject_to_qlist_test(void)
{
QList *qlist;
qlist = qlist_new();
- fail_unless(qobject_to_qlist(QOBJECT(qlist)) == qlist);
+ g_assert(qobject_to_qlist(QOBJECT(qlist)) == qlist);
// destroy doesn't exist yet
g_free(qlist);
}
-END_TEST
-START_TEST(qlist_destroy_test)
+static void qlist_destroy_test(void)
{
int i;
QList *qlist;
@@ -81,7 +78,6 @@ START_TEST(qlist_destroy_test)
QDECREF(qlist);
}
-END_TEST
static int iter_called;
static const int iter_max = 42;
@@ -90,16 +86,16 @@ static void iter_func(QObject *obj, void *opaque)
{
QInt *qi;
- fail_unless(opaque == NULL);
+ g_assert(opaque == NULL);
qi = qobject_to_qint(obj);
- fail_unless(qi != NULL);
- fail_unless((qint_get_int(qi) >= 0) && (qint_get_int(qi) <= iter_max));
+ g_assert(qi != NULL);
+ g_assert((qint_get_int(qi) >= 0) && (qint_get_int(qi) <= iter_max));
iter_called++;
}
-START_TEST(qlist_iter_test)
+static void qlist_iter_test(void)
{
int i;
QList *qlist;
@@ -112,42 +108,20 @@ START_TEST(qlist_iter_test)
iter_called = 0;
qlist_iter(qlist, iter_func, NULL);
- fail_unless(iter_called == iter_max);
+ g_assert(iter_called == iter_max);
QDECREF(qlist);
}
-END_TEST
-static Suite *QList_suite(void)
+int main(int argc, char **argv)
{
- Suite *s;
- TCase *qlist_public_tcase;
+ g_test_init(&argc, &argv, NULL);
- s = suite_create("QList suite");
+ g_test_add_func("/public/new", qlist_new_test);
+ g_test_add_func("/public/append", qlist_append_test);
+ g_test_add_func("/public/to_qlist", qobject_to_qlist_test);
+ g_test_add_func("/public/destroy", qlist_destroy_test);
+ g_test_add_func("/public/iter", qlist_iter_test);
- qlist_public_tcase = tcase_create("Public Interface");
- suite_add_tcase(s, qlist_public_tcase);
- tcase_add_test(qlist_public_tcase, qlist_new_test);
- tcase_add_test(qlist_public_tcase, qlist_append_test);
- tcase_add_test(qlist_public_tcase, qobject_to_qlist_test);
- tcase_add_test(qlist_public_tcase, qlist_destroy_test);
- tcase_add_test(qlist_public_tcase, qlist_iter_test);
-
- return s;
-}
-
-int main(void)
-{
- int nf;
- Suite *s;
- SRunner *sr;
-
- s = QList_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;
+ return g_test_run();
}
diff --git a/configure b/configure
index 18f06ba..2ab7d6f 100755
--- a/configure
+++ b/configure
@@ -2800,10 +2800,9 @@ if test "$softmmu" = yes ; then
tools="qemu-ga\$(EXESUF) $tools"
fi
if [ "$check_utests" = "yes" ]; then
- checks="check-qlist"
checks="check-qjson $checks"
fi
- test_progs="$checks check-qdict check-qfloat check-qint check-qstring
test-coroutine test-qmp-output-visitor test-qmp-input-visitor"
+ test_progs="$checks check-qdict check-qfloat check-qint check-qstring
check-qlist test-coroutine test-qmp-output-visitor test-qmp-input-visitor"
fi
fi
--
1.7.4.1
- [Qemu-devel] --enable-check-utests gone, you may have to re-run configure (was: [PATCH 10/15] test: eliminate libcheck tests and have make check use gtester), (continued)
- [Qemu-devel] [PATCH 05/15] check-qint: convert to gtest, Anthony Liguori, 2012/01/10
- [Qemu-devel] [PATCH 09/15] check-qjson: enable disabled tests, Anthony Liguori, 2012/01/10
- [Qemu-devel] [PATCH 06/15] check-qstring: convert to gtest, Anthony Liguori, 2012/01/10
- [Qemu-devel] [PATCH 11/15] qtest: add test framework, Anthony Liguori, 2012/01/10
- [Qemu-devel] [PATCH 02/15] build: split unit test builds to a separate makefile fragment, Anthony Liguori, 2012/01/10
- [Qemu-devel] [PATCH 07/15] check-qlist: convert to gtest,
Anthony Liguori <=
- Re: [Qemu-devel] [PATCH 01/15] tests: mv tests/* -> tests/tcg, Andreas Färber, 2012/01/10
- Re: [Qemu-devel] [PATCH 01/15] tests: mv tests/* -> tests/tcg, Anthony Liguori, 2012/01/12