iotests: Remove raciness from 162

[qemu.git] / tests / test-qmp-input-visitor.c

diff --git a/tests/test-qmp-input-visitor.c b/tests/test-qmp-input-visitor.c
index 3b6b39e297265b615271dcc85035c44ddfe75425..f583dce3ed2f0e89fed19444672a17de35d8236d 100644 (file)
--- a/tests/test-qmp-input-visitor.c
+++ b/tests/test-qmp-input-visitor.c
@@ -18,10 +18,11 @@
 #include "test-qapi-types.h"
 #include "test-qapi-visit.h"
 #include "qapi/qmp/types.h"
 #include "test-qapi-types.h"
 #include "test-qapi-visit.h"
 #include "qapi/qmp/types.h"

+#include "qapi/qmp/qjson.h"

 
 typedef struct TestInputVisitorData {
     QObject *obj;
 
 typedef struct TestInputVisitorData {
     QObject *obj;

-    QmpInputVisitor *qiv;
+    Visitor *qiv;

 } TestInputVisitorData;
 
 static void visitor_input_teardown(TestInputVisitorData *data,
 } TestInputVisitorData;
 
 static void visitor_input_teardown(TestInputVisitorData *data,


@@ -31,7 +32,7 @@ static void visitor_input_teardown(TestInputVisitorData *data,
     data->obj = NULL;
 
     if (data->qiv) {
     data->obj = NULL;
 
     if (data->qiv) {

-        qmp_input_visitor_cleanup(data->qiv);
+        visit_free(data->qiv);

         data->qiv = NULL;
     }
 }
         data->qiv = NULL;
     }
 }


@@ -43,8 +44,6 @@ static Visitor *visitor_input_test_init_internal(TestInputVisitorData *data,
                                                  const char *json_string,
                                                  va_list *ap)
 {
                                                  const char *json_string,
                                                  va_list *ap)
 {

-    Visitor *v;
-

     visitor_input_teardown(data, NULL);
 
     data->obj = qobject_from_jsonv(json_string, ap);
     visitor_input_teardown(data, NULL);
 
     data->obj = qobject_from_jsonv(json_string, ap);


@@ -52,11 +51,7 @@ static Visitor *visitor_input_test_init_internal(TestInputVisitorData *data,
 
     data->qiv = qmp_input_visitor_new(data->obj, false);
     g_assert(data->qiv);
 
     data->qiv = qmp_input_visitor_new(data->obj, false);
     g_assert(data->qiv);

-
-    v = qmp_input_get_visitor(data->qiv);
-    g_assert(v);
-
-    return v;
+    return data->qiv;

 }
 
 static GCC_FMT_ATTR(2, 3)
 }
 
 static GCC_FMT_ATTR(2, 3)


@@ -303,7 +298,7 @@ static void test_visitor_in_null(TestInputVisitorData *data,
     visit_type_null(v, "b", &err);
     error_free_or_abort(&err);
     visit_check_struct(v, &error_abort);
     visit_type_null(v, "b", &err);
     error_free_or_abort(&err);
     visit_check_struct(v, &error_abort);

-    visit_end_struct(v);
+    visit_end_struct(v, NULL);

 }
 
 static void test_visitor_in_union_flat(TestInputVisitorData *data,
 }
 
 static void test_visitor_in_union_flat(TestInputVisitorData *data,


@@ -766,6 +761,8 @@ static void test_visitor_in_errors(TestInputVisitorData *data,
     Error *err = NULL;
     Visitor *v;
     strList *q = NULL;
     Error *err = NULL;
     Visitor *v;
     strList *q = NULL;

+    UserDefTwo *r = NULL;
+    WrapAlternate *s = NULL;

 
     v = visitor_input_test_init(data, "{ 'integer': false, 'boolean': 'foo', "
                                 "'string': -42 }");
 
     v = visitor_input_test_init(data, "{ 'integer': false, 'boolean': 'foo', "
                                 "'string': -42 }");


@@ -778,6 +775,16 @@ static void test_visitor_in_errors(TestInputVisitorData *data,
     visit_type_strList(v, NULL, &q, &err);
     error_free_or_abort(&err);
     assert(!q);
     visit_type_strList(v, NULL, &q, &err);
     error_free_or_abort(&err);
     assert(!q);

+
+    v = visitor_input_test_init(data, "{ 'str':'hi' }");
+    visit_type_UserDefTwo(v, NULL, &r, &err);
+    error_free_or_abort(&err);
+    assert(!r);
+
+    v = visitor_input_test_init(data, "{ }");
+    visit_type_WrapAlternate(v, NULL, &s, &err);
+    error_free_or_abort(&err);
+    assert(!s);

 }
 
 static void test_visitor_in_wrong_type(TestInputVisitorData *data,
 }
 
 static void test_visitor_in_wrong_type(TestInputVisitorData *data,