浏览代码

tests: Don't check qobject_type() before qobject_to_qlist()

qobject_to_qlist(obj) returns NULL when obj isn't a QList.  Check
that instead of qobject_type(obj) == QTYPE_QLIST.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1487363905-9480-9-git-send-email-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Markus Armbruster 8 年之前
父节点
当前提交
cd17ba51f5
共有 1 个文件被更改,包括 2 次插入5 次删除
  1. 2 5
      tests/test-qobject-output-visitor.c

+ 2 - 5
tests/test-qobject-output-visitor.c

@@ -261,7 +261,6 @@ static void test_visitor_out_list(TestOutputVisitorData *data,
     bool value_bool = true;
     bool value_bool = true;
     int value_int = 10;
     int value_int = 10;
     QListEntry *entry;
     QListEntry *entry;
-    QObject *obj;
     QList *qlist;
     QList *qlist;
     int i;
     int i;
 
 
@@ -279,10 +278,8 @@ static void test_visitor_out_list(TestOutputVisitorData *data,
 
 
     visit_type_TestStructList(data->ov, NULL, &head, &error_abort);
     visit_type_TestStructList(data->ov, NULL, &head, &error_abort);
 
 
-    obj = visitor_get(data);
-    g_assert(qobject_type(obj) == QTYPE_QLIST);
-
-    qlist = qobject_to_qlist(obj);
+    qlist = qobject_to_qlist(visitor_get(data));
+    g_assert(qlist);
     g_assert(!qlist_empty(qlist));
     g_assert(!qlist_empty(qlist));
 
 
     /* ...and ensure that the visitor sees it in order */
     /* ...and ensure that the visitor sees it in order */