From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=39342 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGe5z-0003lP-Kj for qemu-devel@nongnu.org; Mon, 24 May 2010 16:18:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OGe5n-0000j4-Lz for qemu-devel@nongnu.org; Mon, 24 May 2010 16:17:51 -0400 Received: from e5.ny.us.ibm.com ([32.97.182.145]:37709) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OGe5l-0000ir-RJ for qemu-devel@nongnu.org; Mon, 24 May 2010 16:17:42 -0400 Received: from d01relay06.pok.ibm.com (d01relay06.pok.ibm.com [9.56.227.116]) by e5.ny.us.ibm.com (8.14.3/8.13.1) with ESMTP id o4OK1EUf030377 for ; Mon, 24 May 2010 16:01:14 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay06.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o4OKHV1D2363408 for ; Mon, 24 May 2010 16:17:31 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id o4OKHUaM021952 for ; Mon, 24 May 2010 16:17:30 -0400 Message-ID: <4BFADED9.3030808@linux.vnet.ibm.com> Date: Mon, 24 May 2010 15:17:29 -0500 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH v2 1/3] add some tests for invalid JSON References: <1274686793-1566-1-git-send-email-pbonzini@redhat.com> <1274686793-1566-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1274686793-1566-2-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org, lcapitulino@redhat.com On 05/24/2010 02:39 AM, Paolo Bonzini wrote: > Signed-off-by: Paolo Bonzini > I think this series conflicts a bit with Luiz's series which I just pushed. Could you rebase against the latest? Regards, Anthony Liguori > --- > check-qjson.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- > 1 files changed, 97 insertions(+), 1 deletions(-) > > diff --git a/check-qjson.c b/check-qjson.c > index 109e777..a04e334 100644 > --- a/check-qjson.c > +++ b/check-qjson.c > @@ -628,11 +628,90 @@ START_TEST(simple_varargs) > } > END_TEST > > +START_TEST(empty_input) > +{ > + QObject *obj = qobject_from_json(""); > + fail_unless(obj == NULL); > +} > +END_TEST > + > +START_TEST(unterminated_string) > +{ > + QObject *obj = qobject_from_json("\"abc"); > + fail_unless(obj == NULL); > +} > +END_TEST > + > +START_TEST(unterminated_sq_string) > +{ > + QObject *obj = qobject_from_json("'abc"); > + fail_unless(obj == NULL); > +} > +END_TEST > + > +START_TEST(unterminated_escape) > +{ > + QObject *obj = qobject_from_json("\"abc\\\""); > + fail_unless(obj == NULL); > +} > +END_TEST > + > +START_TEST(unterminated_array) > +{ > + QObject *obj = qobject_from_json("[32"); > + fail_unless(obj == NULL); > +} > +END_TEST > + > +START_TEST(unterminated_array_comma) > +{ > + QObject *obj = qobject_from_json("[32,"); > + fail_unless(obj == NULL); > +} > +END_TEST > + > +START_TEST(invalid_array_comma) > +{ > + QObject *obj = qobject_from_json("[32,}"); > + fail_unless(obj == NULL); > +} > +END_TEST > + > +START_TEST(unterminated_dict) > +{ > + QObject *obj = qobject_from_json("{'abc':32"); > + fail_unless(obj == NULL); > +} > +END_TEST > + > +START_TEST(unterminated_dict_comma) > +{ > + QObject *obj = qobject_from_json("{'abc':32,"); > + fail_unless(obj == NULL); > +} > +END_TEST > + > +#if 0 > +START_TEST(invalid_dict_comma) > +{ > + QObject *obj = qobject_from_json("{'abc':32,}"); > + fail_unless(obj == NULL); > +} > +END_TEST > + > +START_TEST(unterminated_literal) > +{ > + QObject *obj = qobject_from_json("nul"); > + fail_unless(obj == NULL); > +} > +END_TEST > +#endif > + > static Suite *qjson_suite(void) > { > Suite *suite; > TCase *string_literals, *number_literals, *keyword_literals; > - TCase *dicts, *lists, *whitespace, *varargs; > + TCase *dicts, *lists, *whitespace, *varargs, *errors; > > string_literals = tcase_create("String Literals"); > tcase_add_test(string_literals, simple_string); > @@ -658,6 +737,22 @@ static Suite *qjson_suite(void) > varargs = tcase_create("Varargs"); > tcase_add_test(varargs, simple_varargs); > > + errors = tcase_create("Invalid JSON"); > + tcase_add_test(errors, empty_input); > + tcase_add_test(errors, unterminated_string); > + tcase_add_test(errors, unterminated_escape); > + tcase_add_test(errors, unterminated_sq_string); > + tcase_add_test(errors, unterminated_array); > + tcase_add_test(errors, unterminated_array_comma); > + tcase_add_test(errors, invalid_array_comma); > + tcase_add_test(errors, unterminated_dict); > + tcase_add_test(errors, unterminated_dict_comma); > +#if 0 > + /* FIXME: this print parse error messages on stderr. */ > + tcase_add_test(errors, invalid_dict_comma); > + tcase_add_test(errors, unterminated_literal); > +#endif > + > suite = suite_create("QJSON test-suite"); > suite_add_tcase(suite, string_literals); > suite_add_tcase(suite, number_literals); > @@ -666,6 +761,7 @@ static Suite *qjson_suite(void) > suite_add_tcase(suite, lists); > suite_add_tcase(suite, whitespace); > suite_add_tcase(suite, varargs); > + suite_add_tcase(suite, errors); > > return suite; > } >