Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging

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

diff --git a/tests/test-qmp-input-strict.c b/tests/test-qmp-input-strict.c
index 0f770034b16b69e6952f66bec0c5c10cde47bf57..d71727e27243ee67df76984333d9f4199cc276ef 100644 (file)
--- a/tests/test-qmp-input-strict.c
+++ b/tests/test-qmp-input-strict.c
@@ -1,7 +1,7 @@
 /*
  * QMP Input Visitor unit-tests (strict mode).
  *
 /*
  * QMP Input Visitor unit-tests (strict mode).
  *

- * Copyright (C) 2011-2012 Red Hat Inc.
+ * Copyright (C) 2011-2012, 2015 Red Hat Inc.

  *
  * Authors:
  *  Luiz Capitulino <[email protected]>
  *
  * Authors:
  *  Luiz Capitulino <[email protected]>


@@ -11,14 +11,18 @@
  * See the COPYING file in the top-level directory.
  */
 
  * See the COPYING file in the top-level directory.
  */
 

+#include "qemu/osdep.h"

 #include <glib.h>
 #include <glib.h>

-#include <stdarg.h>

 
 #include "qemu-common.h"
 
 #include "qemu-common.h"

+#include "qapi/error.h"

 #include "qapi/qmp-input-visitor.h"
 #include "test-qapi-types.h"
 #include "test-qapi-visit.h"
 #include "qapi/qmp/types.h"
 #include "qapi/qmp-input-visitor.h"
 #include "test-qapi-types.h"
 #include "test-qapi-visit.h"
 #include "qapi/qmp/types.h"

+#include "test-qmp-introspect.h"
+#include "qmp-introspect.h"
+#include "qapi-visit.h"

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


@@ -37,78 +41,65 @@ static void validate_teardown(TestInputVisitorData *data,
     }
 }
 
     }
 }
 

-/* This is provided instead of a test setup function so that the JSON
-   string used by the tests are kept in the test functions (and not
-   int main()) */
-static GCC_FMT_ATTR(2, 3)
-Visitor *validate_test_init(TestInputVisitorData *data,
-                             const char *json_string, ...)
+/* The various test_init functions are provided instead of a test setup
+   function so that the JSON string used by the tests are kept in the test
+   functions (and not in main()). */
+static Visitor *validate_test_init_internal(TestInputVisitorData *data,
+                                            const char *json_string,
+                                            va_list *ap)

 {
     Visitor *v;
 {
     Visitor *v;

-    va_list ap;

 
 

-    va_start(ap, json_string);
-    data->obj = qobject_from_jsonv(json_string, &ap);
-    va_end(ap);
+    validate_teardown(data, NULL);

 
 

-    g_assert(data->obj != NULL);
+    data->obj = qobject_from_jsonv(json_string, ap);
+    g_assert(data->obj);

 
     data->qiv = qmp_input_visitor_new_strict(data->obj);
 
     data->qiv = qmp_input_visitor_new_strict(data->obj);

-    g_assert(data->qiv != NULL);
+    g_assert(data->qiv);

 
     v = qmp_input_get_visitor(data->qiv);
 
     v = qmp_input_get_visitor(data->qiv);

-    g_assert(v != NULL);
+    g_assert(v);

 
     return v;
 }
 
 
     return v;
 }
 

-typedef struct TestStruct
-{
-    int64_t integer;
-    bool boolean;
-    char *string;
-} TestStruct;
-
-static void visit_type_TestStruct(Visitor *v, TestStruct **obj,
-                                  const char *name, Error **errp)
+static GCC_FMT_ATTR(2, 3)
+Visitor *validate_test_init(TestInputVisitorData *data,
+                             const char *json_string, ...)

 {
 {

-    Error *err = NULL;
+    Visitor *v;
+    va_list ap;

 
 

-    visit_start_struct(v, (void **)obj, "TestStruct", name, sizeof(TestStruct),
-                       &err);
-    if (err) {
-        goto out;
-    }
+    va_start(ap, json_string);
+    v = validate_test_init_internal(data, json_string, &ap);
+    va_end(ap);
+    return v;
+}

 
 

-    visit_type_int(v, &(*obj)->integer, "integer", &err);
-    if (err) {
-        goto out_end;
-    }
-    visit_type_bool(v, &(*obj)->boolean, "boolean", &err);
-    if (err) {
-        goto out_end;
-    }
-    visit_type_str(v, &(*obj)->string, "string", &err);
-
-out_end:
-    error_propagate(errp, err);
-    err = NULL;
-    visit_end_struct(v, &err);
-out:
-    error_propagate(errp, err);
+/* similar to validate_test_init(), but does not expect a string
+ * literal/format json_string argument and so can be used for
+ * programatically generated strings (and we can't pass in programatically
+ * generated strings via %s format parameters since qobject_from_jsonv()
+ * will wrap those in double-quotes and treat the entire object as a
+ * string)
+ */
+static Visitor *validate_test_init_raw(TestInputVisitorData *data,
+                                       const char *json_string)
+{
+    return validate_test_init_internal(data, json_string, NULL);

 }
 
 }
 

+

 static void test_validate_struct(TestInputVisitorData *data,
                                   const void *unused)
 {
     TestStruct *p = NULL;
 static void test_validate_struct(TestInputVisitorData *data,
                                   const void *unused)
 {
     TestStruct *p = NULL;

-    Error *err = NULL;

     Visitor *v;
 
     v = validate_test_init(data, "{ 'integer': -42, 'boolean': true, 'string': 'foo' }");
 
     Visitor *v;
 
     v = validate_test_init(data, "{ 'integer': -42, 'boolean': true, 'string': 'foo' }");
 

-    visit_type_TestStruct(v, &p, NULL, &err);
-    g_assert(!err);
+    visit_type_TestStruct(v, NULL, &p, &error_abort);

     g_free(p->string);
     g_free(p);
 }
     g_free(p->string);
     g_free(p);
 }


@@ -116,43 +107,40 @@ static void test_validate_struct(TestInputVisitorData *data,
 static void test_validate_struct_nested(TestInputVisitorData *data,
                                          const void *unused)
 {
 static void test_validate_struct_nested(TestInputVisitorData *data,
                                          const void *unused)
 {

-    UserDefNested *udp = NULL;
-    Error *err = NULL;
+    UserDefTwo *udp = NULL;

     Visitor *v;
 
     Visitor *v;
 

-    v = validate_test_init(data, "{ 'string0': 'string0', 'dict1': { 'string1': 'string1', 'dict2': { 'userdef1': { 'integer': 42, 'string': 'string' }, 'string2': 'string2'}}}");
+    v = validate_test_init(data, "{ 'string0': 'string0', "
+                           "'dict1': { 'string1': 'string1', "
+                           "'dict2': { 'userdef': { 'integer': 42, "
+                           "'string': 'string' }, 'string': 'string2'}}}");

 
 

-    visit_type_UserDefNested(v, &udp, NULL, &err);
-    g_assert(!err);
-    qapi_free_UserDefNested(udp);
+    visit_type_UserDefTwo(v, NULL, &udp, &error_abort);
+    qapi_free_UserDefTwo(udp);

 }
 
 static void test_validate_list(TestInputVisitorData *data,
                                 const void *unused)
 {
     UserDefOneList *head = NULL;
 }
 
 static void test_validate_list(TestInputVisitorData *data,
                                 const void *unused)
 {
     UserDefOneList *head = NULL;

-    Error *err = NULL;

     Visitor *v;
 
     v = validate_test_init(data, "[ { 'string': 'string0', 'integer': 42 }, { 'string': 'string1', 'integer': 43 }, { 'string': 'string2', 'integer': 44 } ]");
 
     Visitor *v;
 
     v = validate_test_init(data, "[ { 'string': 'string0', 'integer': 42 }, { 'string': 'string1', 'integer': 43 }, { 'string': 'string2', 'integer': 44 } ]");
 

-    visit_type_UserDefOneList(v, &head, NULL, &err);
-    g_assert(!err);
+    visit_type_UserDefOneList(v, NULL, &head, &error_abort);

     qapi_free_UserDefOneList(head);
 }
 
     qapi_free_UserDefOneList(head);
 }
 

-static void test_validate_union(TestInputVisitorData *data,
-                                 const void *unused)
+static void test_validate_union_native_list(TestInputVisitorData *data,
+                                            const void *unused)

 {
 {

-    UserDefUnion *tmp = NULL;
+    UserDefNativeListUnion *tmp = NULL;

     Visitor *v;
     Visitor *v;

-    Error *err = NULL;

 
 

-    v = validate_test_init(data, "{ 'type': 'b', 'integer': 41, 'data' : { 'integer': 42 } }");
+    v = validate_test_init(data, "{ 'type': 'integer', 'data' : [ 1, 2 ] }");

 
 

-    visit_type_UserDefUnion(v, &tmp, NULL, &err);
-    g_assert(!err);
-    qapi_free_UserDefUnion(tmp);
+    visit_type_UserDefNativeListUnion(v, NULL, &tmp, &error_abort);
+    qapi_free_UserDefNativeListUnion(tmp);

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


@@ -160,31 +148,27 @@ static void test_validate_union_flat(TestInputVisitorData *data,
 {
     UserDefFlatUnion *tmp = NULL;
     Visitor *v;
 {
     UserDefFlatUnion *tmp = NULL;
     Visitor *v;

-    Error *err = NULL;

 
     v = validate_test_init(data,
                            "{ 'enum1': 'value1', "
 
     v = validate_test_init(data,
                            "{ 'enum1': 'value1', "

+                           "'integer': 41, "

                            "'string': 'str', "
                            "'boolean': true }");
                            "'string': 'str', "
                            "'boolean': true }");

-    /* TODO when generator bug is fixed, add 'integer': 41 */

 
 

-    visit_type_UserDefFlatUnion(v, &tmp, NULL, &err);
-    g_assert(!err);
+    visit_type_UserDefFlatUnion(v, NULL, &tmp, &error_abort);

     qapi_free_UserDefFlatUnion(tmp);
 }
 
     qapi_free_UserDefFlatUnion(tmp);
 }
 

-static void test_validate_union_anon(TestInputVisitorData *data,
-                                     const void *unused)
+static void test_validate_alternate(TestInputVisitorData *data,
+                                    const void *unused)

 {
 {

-    UserDefAnonUnion *tmp = NULL;
+    UserDefAlternate *tmp = NULL;

     Visitor *v;
     Visitor *v;

-    Error *err = NULL;

 
     v = validate_test_init(data, "42");
 
 
     v = validate_test_init(data, "42");
 

-    visit_type_UserDefAnonUnion(v, &tmp, NULL, &err);
-    g_assert(!err);
-    qapi_free_UserDefAnonUnion(tmp);
+    visit_type_UserDefAlternate(v, NULL, &tmp, &error_abort);
+    qapi_free_UserDefAlternate(tmp);

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


@@ -196,8 +180,8 @@ static void test_validate_fail_struct(TestInputVisitorData *data,
 
     v = validate_test_init(data, "{ 'integer': -42, 'boolean': true, 'string': 'foo', 'extra': 42 }");
 
 
     v = validate_test_init(data, "{ 'integer': -42, 'boolean': true, 'string': 'foo', 'extra': 42 }");
 

-    visit_type_TestStruct(v, &p, NULL, &err);
-    g_assert(err);
+    visit_type_TestStruct(v, NULL, &p, &err);
+    error_free_or_abort(&err);

     if (p) {
         g_free(p->string);
     }
     if (p) {
         g_free(p->string);
     }


@@ -207,15 +191,15 @@ static void test_validate_fail_struct(TestInputVisitorData *data,
 static void test_validate_fail_struct_nested(TestInputVisitorData *data,
                                               const void *unused)
 {
 static void test_validate_fail_struct_nested(TestInputVisitorData *data,
                                               const void *unused)
 {

-    UserDefNested *udp = NULL;
+    UserDefTwo *udp = NULL;

     Error *err = NULL;
     Visitor *v;
 
     v = validate_test_init(data, "{ 'string0': 'string0', 'dict1': { 'string1': 'string1', 'dict2': { 'userdef1': { 'integer': 42, 'string': 'string', 'extra': [42, 23, {'foo':'bar'}] }, 'string2': 'string2'}}}");
 
     Error *err = NULL;
     Visitor *v;
 
     v = validate_test_init(data, "{ 'string0': 'string0', 'dict1': { 'string1': 'string1', 'dict2': { 'userdef1': { 'integer': 42, 'string': 'string', 'extra': [42, 23, {'foo':'bar'}] }, 'string2': 'string2'}}}");
 

-    visit_type_UserDefNested(v, &udp, NULL, &err);
-    g_assert(err);
-    qapi_free_UserDefNested(udp);
+    visit_type_UserDefTwo(v, NULL, &udp, &err);
+    error_free_or_abort(&err);
+    qapi_free_UserDefTwo(udp);

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


@@ -227,23 +211,24 @@ static void test_validate_fail_list(TestInputVisitorData *data,
 
     v = validate_test_init(data, "[ { 'string': 'string0', 'integer': 42 }, { 'string': 'string1', 'integer': 43 }, { 'string': 'string2', 'integer': 44, 'extra': 'ggg' } ]");
 
 
     v = validate_test_init(data, "[ { 'string': 'string0', 'integer': 42 }, { 'string': 'string1', 'integer': 43 }, { 'string': 'string2', 'integer': 44, 'extra': 'ggg' } ]");
 

-    visit_type_UserDefOneList(v, &head, NULL, &err);
-    g_assert(err);
+    visit_type_UserDefOneList(v, NULL, &head, &err);
+    error_free_or_abort(&err);

     qapi_free_UserDefOneList(head);
 }
 
     qapi_free_UserDefOneList(head);
 }
 

-static void test_validate_fail_union(TestInputVisitorData *data,
-                                      const void *unused)
+static void test_validate_fail_union_native_list(TestInputVisitorData *data,
+                                                 const void *unused)

 {
 {

-    UserDefUnion *tmp = NULL;
+    UserDefNativeListUnion *tmp = NULL;

     Error *err = NULL;
     Visitor *v;
 
     Error *err = NULL;
     Visitor *v;
 

-    v = validate_test_init(data, "{ 'type': 'b', 'data' : { 'integer': 42 } }");
+    v = validate_test_init(data,
+                           "{ 'type': 'integer', 'data' : [ 'string' ] }");

 
 

-    visit_type_UserDefUnion(v, &tmp, NULL, &err);
-    g_assert(err);
-    qapi_free_UserDefUnion(tmp);
+    visit_type_UserDefNativeListUnion(v, NULL, &tmp, &err);
+    error_free_or_abort(&err);
+    qapi_free_UserDefNativeListUnion(tmp);

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


@@ -255,23 +240,59 @@ static void test_validate_fail_union_flat(TestInputVisitorData *data,
 
     v = validate_test_init(data, "{ 'string': 'c', 'integer': 41, 'boolean': true }");
 
 
     v = validate_test_init(data, "{ 'string': 'c', 'integer': 41, 'boolean': true }");
 

-    visit_type_UserDefFlatUnion(v, &tmp, NULL, &err);
-    g_assert(err);
+    visit_type_UserDefFlatUnion(v, NULL, &tmp, &err);
+    error_free_or_abort(&err);

     qapi_free_UserDefFlatUnion(tmp);
 }
 
     qapi_free_UserDefFlatUnion(tmp);
 }
 

-static void test_validate_fail_union_anon(TestInputVisitorData *data,
-                                          const void *unused)
+static void test_validate_fail_union_flat_no_discrim(TestInputVisitorData *data,
+                                                     const void *unused)

 {
 {

-    UserDefAnonUnion *tmp = NULL;
+    UserDefFlatUnion2 *tmp = NULL;
+    Error *err = NULL;
+    Visitor *v;
+
+    /* test situation where discriminator field ('enum1' here) is missing */
+    v = validate_test_init(data, "{ 'integer': 42, 'string': 'c', 'string1': 'd', 'string2': 'e' }");
+
+    visit_type_UserDefFlatUnion2(v, NULL, &tmp, &err);
+    error_free_or_abort(&err);
+    qapi_free_UserDefFlatUnion2(tmp);
+}
+
+static void test_validate_fail_alternate(TestInputVisitorData *data,
+                                         const void *unused)
+{
+    UserDefAlternate *tmp = NULL;

     Visitor *v;
     Error *err = NULL;
 
     v = validate_test_init(data, "3.14");
 
     Visitor *v;
     Error *err = NULL;
 
     v = validate_test_init(data, "3.14");
 

-    visit_type_UserDefAnonUnion(v, &tmp, NULL, &err);
-    g_assert(err);
-    qapi_free_UserDefAnonUnion(tmp);
+    visit_type_UserDefAlternate(v, NULL, &tmp, &err);
+    error_free_or_abort(&err);
+    qapi_free_UserDefAlternate(tmp);
+}
+
+static void do_test_validate_qmp_introspect(TestInputVisitorData *data,
+                                            const char *schema_json)
+{
+    SchemaInfoList *schema = NULL;
+    Visitor *v;
+
+    v = validate_test_init_raw(data, schema_json);
+
+    visit_type_SchemaInfoList(v, NULL, &schema, &error_abort);
+    g_assert(schema);
+
+    qapi_free_SchemaInfoList(schema);
+}
+
+static void test_validate_qmp_introspect(TestInputVisitorData *data,
+                                           const void *unused)
+{
+    do_test_validate_qmp_introspect(data, test_qmp_schema_json);
+    do_test_validate_qmp_introspect(data, qmp_schema_json);

 }
 
 static void validate_test_add(const char *testpath,
 }
 
 static void validate_test_add(const char *testpath,


@@ -289,29 +310,33 @@ int main(int argc, char **argv)
     g_test_init(&argc, &argv, NULL);
 
     validate_test_add("/visitor/input-strict/pass/struct",
     g_test_init(&argc, &argv, NULL);
 
     validate_test_add("/visitor/input-strict/pass/struct",

-                       &testdata, test_validate_struct);
+                      &testdata, test_validate_struct);

     validate_test_add("/visitor/input-strict/pass/struct-nested",
     validate_test_add("/visitor/input-strict/pass/struct-nested",

-                       &testdata, test_validate_struct_nested);
+                      &testdata, test_validate_struct_nested);

     validate_test_add("/visitor/input-strict/pass/list",
     validate_test_add("/visitor/input-strict/pass/list",

-                       &testdata, test_validate_list);
-    validate_test_add("/visitor/input-strict/pass/union",
-                       &testdata, test_validate_union);
+                      &testdata, test_validate_list);

     validate_test_add("/visitor/input-strict/pass/union-flat",
     validate_test_add("/visitor/input-strict/pass/union-flat",

-                       &testdata, test_validate_union_flat);
-    validate_test_add("/visitor/input-strict/pass/union-anon",
-                       &testdata, test_validate_union_anon);
+                      &testdata, test_validate_union_flat);
+    validate_test_add("/visitor/input-strict/pass/alternate",
+                      &testdata, test_validate_alternate);
+    validate_test_add("/visitor/input-strict/pass/union-native-list",
+                      &testdata, test_validate_union_native_list);

     validate_test_add("/visitor/input-strict/fail/struct",
     validate_test_add("/visitor/input-strict/fail/struct",

-                       &testdata, test_validate_fail_struct);
+                      &testdata, test_validate_fail_struct);

     validate_test_add("/visitor/input-strict/fail/struct-nested",
     validate_test_add("/visitor/input-strict/fail/struct-nested",

-                       &testdata, test_validate_fail_struct_nested);
+                      &testdata, test_validate_fail_struct_nested);

     validate_test_add("/visitor/input-strict/fail/list",
     validate_test_add("/visitor/input-strict/fail/list",

-                       &testdata, test_validate_fail_list);
-    validate_test_add("/visitor/input-strict/fail/union",
-                       &testdata, test_validate_fail_union);
+                      &testdata, test_validate_fail_list);

     validate_test_add("/visitor/input-strict/fail/union-flat",
     validate_test_add("/visitor/input-strict/fail/union-flat",

-                       &testdata, test_validate_fail_union_flat);
-    validate_test_add("/visitor/input-strict/fail/union-anon",
-                       &testdata, test_validate_fail_union_anon);
+                      &testdata, test_validate_fail_union_flat);
+    validate_test_add("/visitor/input-strict/fail/union-flat-no-discriminator",
+                      &testdata, test_validate_fail_union_flat_no_discrim);
+    validate_test_add("/visitor/input-strict/fail/alternate",
+                      &testdata, test_validate_fail_alternate);
+    validate_test_add("/visitor/input-strict/fail/union-native-list",
+                      &testdata, test_validate_fail_union_native_list);
+    validate_test_add("/visitor/input-strict/pass/qmp-introspect",
+                      &testdata, test_validate_qmp_introspect);

 
     g_test_run();
 
 
     g_test_run();