From patchwork Fri Jun 20 05:55:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hu Tao X-Patchwork-Id: 362080 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6C3D7140086 for ; Fri, 20 Jun 2014 15:58:28 +1000 (EST) Received: from localhost ([::1]:39072 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxrqE-0007B7-OC for incoming@patchwork.ozlabs.org; Fri, 20 Jun 2014 01:58:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40424) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wxrpj-0006Cq-De for qemu-devel@nongnu.org; Fri, 20 Jun 2014 01:58:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wxrpc-0005J1-R9 for qemu-devel@nongnu.org; Fri, 20 Jun 2014 01:57:55 -0400 Received: from [59.151.112.132] (port=14366 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wxrpb-0005IQ-Vg for qemu-devel@nongnu.org; Fri, 20 Jun 2014 01:57:48 -0400 X-IronPort-AV: E=Sophos;i="5.00,743,1396972800"; d="scan'208";a="32183995" Received: from localhost (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 20 Jun 2014 13:55:07 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id s5K5vjZe030177; Fri, 20 Jun 2014 13:57:45 +0800 Received: from G08FNSTD100614.fnst.cn.fujitsu.com (10.167.226.102) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Fri, 20 Jun 2014 13:57:52 +0800 From: Hu Tao To: Date: Fri, 20 Jun 2014 13:55:43 +0800 Message-ID: <61b0b2f7ec170edcbe9dd45d6f098ae50c1178f9.1403243169.git.hutao@cn.fujitsu.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.167.226.102] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: Yasunori Goto , Paolo Bonzini , "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH 3/3] tests: add human format test for string output visitor X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Hu Tao --- tests/test-string-output-visitor.c | 109 ++++++++++++++++++++++++++++++------- 1 file changed, 90 insertions(+), 19 deletions(-) diff --git a/tests/test-string-output-visitor.c b/tests/test-string-output-visitor.c index 28e7359..e89e43c 100644 --- a/tests/test-string-output-visitor.c +++ b/tests/test-string-output-visitor.c @@ -21,12 +21,25 @@ typedef struct TestOutputVisitorData { StringOutputVisitor *sov; Visitor *ov; + bool human; } TestOutputVisitorData; static void visitor_output_setup(TestOutputVisitorData *data, const void *unused) { - data->sov = string_output_visitor_new(false); + data->human = false; + data->sov = string_output_visitor_new(data->human); + g_assert(data->sov != NULL); + + data->ov = string_output_get_visitor(data->sov); + g_assert(data->ov != NULL); +} + +static void visitor_output_setup_human(TestOutputVisitorData *data, + const void *unused) +{ + data->human = true; + data->sov = string_output_visitor_new(data->human); g_assert(data->sov != NULL); data->ov = string_output_get_visitor(data->sov); @@ -53,7 +66,11 @@ static void test_visitor_out_int(TestOutputVisitorData *data, str = string_output_get_string(data->sov); g_assert(str != NULL); - g_assert_cmpstr(str, ==, "42"); + if (data->human) { + g_assert_cmpstr(str, ==, "42 (0x2a)"); + } else { + g_assert_cmpstr(str, ==, "42"); + } g_free(str); } @@ -78,8 +95,15 @@ static void test_visitor_out_intList(TestOutputVisitorData *data, str = string_output_get_string(data->sov); g_assert(str != NULL); - g_assert_cmpstr(str, ==, - "0-1,3-6,9-16,21-22,9223372036854775806-9223372036854775807"); + if (data->human) { + g_assert_cmpstr(str, ==, + "0-1,3-6,9-16,21-22,9223372036854775806-9223372036854775807 " + "(0x0-0x1,0x3-0x6,0x9-0x10,0x15-0x16," + "0x7ffffffffffffffe-0x7fffffffffffffff)"); + } else { + g_assert_cmpstr(str, ==, + "0-1,3-6,9-16,21-22,9223372036854775806-9223372036854775807"); + } g_free(str); while (list) { intList *tmp2; @@ -125,6 +149,7 @@ static void test_visitor_out_string(TestOutputVisitorData *data, const void *unused) { char *string = (char *) "Q E M U"; + const char *string_human = "\"Q E M U\""; Error *err = NULL; char *str; @@ -133,7 +158,11 @@ static void test_visitor_out_string(TestOutputVisitorData *data, str = string_output_get_string(data->sov); g_assert(str != NULL); - g_assert_cmpstr(str, ==, string); + if (data->human) { + g_assert_cmpstr(str, ==, string_human); + } else { + g_assert_cmpstr(str, ==, string); + } g_free(str); } @@ -150,7 +179,11 @@ static void test_visitor_out_no_string(TestOutputVisitorData *data, str = string_output_get_string(data->sov); g_assert(str != NULL); - g_assert_cmpstr(str, ==, ""); + if (data->human) { + g_assert_cmpstr(str, ==, ""); + } else { + g_assert_cmpstr(str, ==, ""); + } g_free(str); } @@ -162,12 +195,26 @@ static void test_visitor_out_enum(TestOutputVisitorData *data, EnumOne i; for (i = 0; i < ENUM_ONE_MAX; i++) { + char *str_human; + int len; + visit_type_EnumOne(data->ov, &i, "unused", &err); g_assert(!err); + len = strlen(EnumOne_lookup[i]) + 2; + str_human = g_malloc0(len); + str_human[0] = '"'; + strncpy(str_human + 1, EnumOne_lookup[i], strlen(EnumOne_lookup[i])); + str_human[len - 1] = '"'; + str = string_output_get_string(data->sov); g_assert(str != NULL); - g_assert_cmpstr(str, ==, EnumOne_lookup[i]); + if (data->human) { + g_assert_cmpstr(str, ==, str_human); + } else { + g_assert_cmpstr(str, ==, EnumOne_lookup[i]); + } + g_free(str_human); g_free(str); } } @@ -186,11 +233,15 @@ static void test_visitor_out_enum_errors(TestOutputVisitorData *data, } } -static void output_visitor_test_add(const char *testpath, - TestOutputVisitorData *data, - void (*test_func)(TestOutputVisitorData *data, const void *user_data)) +static void +output_visitor_test_add(const char *testpath, + TestOutputVisitorData *data, + void (*test_func)(TestOutputVisitorData *data, + const void *user_data), + bool human) { - g_test_add(testpath, TestOutputVisitorData, data, visitor_output_setup, + g_test_add(testpath, TestOutputVisitorData, data, + human ? visitor_output_setup_human : visitor_output_setup, test_func, visitor_output_teardown); } @@ -201,21 +252,41 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); output_visitor_test_add("/string-visitor/output/int", - &out_visitor_data, test_visitor_out_int); + &out_visitor_data, test_visitor_out_int, false); + output_visitor_test_add("/string-visitor/output/int", + &out_visitor_data, test_visitor_out_int, true); + output_visitor_test_add("/string-visitor/output/bool", + &out_visitor_data, test_visitor_out_bool, false); output_visitor_test_add("/string-visitor/output/bool", - &out_visitor_data, test_visitor_out_bool); + &out_visitor_data, test_visitor_out_bool, true); + output_visitor_test_add("/string-visitor/output/number", + &out_visitor_data, test_visitor_out_number, false); output_visitor_test_add("/string-visitor/output/number", - &out_visitor_data, test_visitor_out_number); + &out_visitor_data, test_visitor_out_number, true); output_visitor_test_add("/string-visitor/output/string", - &out_visitor_data, test_visitor_out_string); + &out_visitor_data, test_visitor_out_string, false); + output_visitor_test_add("/string-visitor/output/string", + &out_visitor_data, test_visitor_out_string, true); + output_visitor_test_add("/string-visitor/output/no-string", + &out_visitor_data, test_visitor_out_no_string, + false); output_visitor_test_add("/string-visitor/output/no-string", - &out_visitor_data, test_visitor_out_no_string); + &out_visitor_data, test_visitor_out_no_string, + true); + output_visitor_test_add("/string-visitor/output/enum", + &out_visitor_data, test_visitor_out_enum, false); output_visitor_test_add("/string-visitor/output/enum", - &out_visitor_data, test_visitor_out_enum); + &out_visitor_data, test_visitor_out_enum, true); output_visitor_test_add("/string-visitor/output/enum-errors", - &out_visitor_data, test_visitor_out_enum_errors); + &out_visitor_data, test_visitor_out_enum_errors, + false); + output_visitor_test_add("/string-visitor/output/enum-errors", + &out_visitor_data, test_visitor_out_enum_errors, + true); + output_visitor_test_add("/string-visitor/output/intList", + &out_visitor_data, test_visitor_out_intList, false); output_visitor_test_add("/string-visitor/output/intList", - &out_visitor_data, test_visitor_out_intList); + &out_visitor_data, test_visitor_out_intList, true); g_test_run();