Expand the pack/unpack API, implement unpack flags

[jansson.git] / test / suites / api / test_unpack.c

diff --git a/test/suites/api/test_unpack.c b/test/suites/api/test_unpack.c
index ac16326..992a611 100644 (file)
--- a/test/suites/api/test_unpack.c
+++ b/test/suites/api/test_unpack.c
@@ -26,77 +26,77 @@ int main()
      */
 
     /* true */
-    rv = json_unpack(json_true(), &error, "b", &i1);
+    rv = json_unpack_ex(json_true(), &error, 0, "b", &i1);
     if(rv || !i1)
         fail("json_unpack boolean failed");
 
     /* false */
-    rv = json_unpack(json_false(), &error, "b", &i1);
+    rv = json_unpack_ex(json_false(), &error, 0, "b", &i1);
     if(rv || i1)
         fail("json_unpack boolean failed");
 
     /* null */
-    if(json_unpack(json_null(), &error, "n"))
+    if(json_unpack_ex(json_null(), &error, 0, "n"))
         fail("json_unpack null failed");
 
     /* integer */
     j = json_integer(42);
-    rv = json_unpack(j, &error, "i", &i1);
+    rv = json_unpack_ex(j, &error, 0, "i", &i1);
     if(rv || i1 != 42)
         fail("json_unpack integer failed");
     json_decref(j);
 
     /* real */
     j = json_real(1.7);
-    rv = json_unpack(j, &error, "f", &f);
+    rv = json_unpack_ex(j, &error, 0, "f", &f);
     if(rv || f != 1.7)
         fail("json_unpack real failed");
     json_decref(j);
 
     /* string */
     j = json_string("foo");
-    rv = json_unpack(j, &error, "s", &s);
+    rv = json_unpack_ex(j, &error, 0, "s", &s);
     if(rv || strcmp(s, "foo"))
         fail("json_unpack string failed");
     json_decref(j);
 
     /* empty object */
     j = json_object();
-    if(json_unpack(j, &error, "{}"))
+    if(json_unpack_ex(j, &error, 0, "{}"))
         fail("json_unpack empty object failed");
     json_decref(j);
 
     /* empty list */
     j = json_array();
-    if(json_unpack(j, &error, "[]"))
+    if(json_unpack_ex(j, &error, 0, "[]"))
         fail("json_unpack empty list failed");
     json_decref(j);
 
     /* non-incref'd object */
     j = json_object();
-    rv = json_unpack(j, &error, "o", &j2);
+    rv = json_unpack_ex(j, &error, 0, "o", &j2);
     if(j2 != j || j->refcount != 1)
         fail("json_unpack object failed");
     json_decref(j);
 
     /* incref'd object */
     j = json_object();
-    rv = json_unpack(j, &error, "O", &j2);
+    rv = json_unpack_ex(j, &error, 0, "O", &j2);
     if(j2 != j || j->refcount != 2)
         fail("json_unpack object failed");
     json_decref(j);
     json_decref(j);
 
     /* simple object */
-    j = json_pack(&error, "{s:i}", "foo", 42);
-    rv = json_unpack(j, &error, "{s:i}", "foo", &i1);
+    j = json_pack("{s:i}", "foo", 42);
+    rv = json_unpack_ex(j, &error, 0, "{s:i}", "foo", &i1);
     if(rv || i1 != 42)
         fail("json_unpack simple object failed");
     json_decref(j);
 
     /* simple array */
-    j = json_pack(&error, "[iii]", 1, 2, 3);
-    rv = json_unpack(j, &error, "[i,i,i]", &i1, &i2, &i3);
+    j = json_pack("[iii]", 1, 2, 3);
+    rv = json_unpack_ex(j, &error, 0, "[i,i,i]", &i1, &i2, &i3);
     if(rv || i1 != 1 || i2 != 2 || i3 != 3)
         fail("json_unpack simple array failed");
     json_decref(j);
@@ -106,37 +106,37 @@ int main()
      */
 
     /* mismatched open/close array/object */
-    j = json_pack(&error, "[]");
-    if(!json_unpack(j, &error, "[}"))
+    j = json_pack("[]");
+    if(!json_unpack_ex(j, &error, 0, "[}"))
         fail("json_unpack failed to catch mismatched ']'");
     json_decref(j);
 
-    j = json_pack(&error, "{}");
-    if(!json_unpack(j, &error, "{]"))
+    j = json_pack("{}");
+    if(!json_unpack_ex(j, &error, 0, "{]"))
         fail("json_unpack failed to catch mismatched '}'");
     json_decref(j);
 
     /* missing close array */
-    j = json_pack(&error, "[]");
-    if(!json_unpack(j, &error, "["))
+    j = json_pack("[]");
+    if(!json_unpack_ex(j, &error, 0, "["))
         fail("json_unpack failed to catch missing ']'");
     json_decref(j);
 
     /* missing close object */
-    j = json_pack(&error, "{}");
-    if(!json_unpack(j, &error, "{"))
+    j = json_pack("{}");
+    if(!json_unpack_ex(j, &error, 0, "{"))
         fail("json_unpack failed to catch missing '}'");
     json_decref(j);
 
     /* NULL format string */
-    j = json_pack(&error, "[]");
-    if(!json_unpack(j, &error, NULL))
+    j = json_pack("[]");
+    if(!json_unpack_ex(j, &error, 0, NULL))
         fail("json_unpack failed to catch null format string");
     json_decref(j);
 
     /* NULL string pointer */
     j = json_string("foobie");
-    if(!json_unpack(j, &error, "s", NULL))
+    if(!json_unpack_ex(j, &error, 0, "s", NULL))
         fail("json_unpack failed to catch null string pointer");
     json_decref(j);