From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id AB495A00C4; Mon, 25 Jul 2022 18:36:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DE3B642B6C; Mon, 25 Jul 2022 18:36:17 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 1A52A42B6C for ; Mon, 25 Jul 2022 18:36:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658766976; x=1690302976; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2jWvXNu7k5y+RJMnBVt7Jt0AzmkFgSDoz4YBZon6f44=; b=VGccUNDD13+FaKHErtzcyF+06MzXEWq8ckbD6A7aGnVaRY8p71XpEby1 VyoxNWCDYzDylH76PBJ7o72obcp5X8YaRCtse/voAULntJ3wqzfi3tOYB s128Xq8SnOwwwzuMruihkJcwfW2E1KDb06Ug+KUDnf2brtOcPDwlZY4Ku LaT3xtR82Jb34GqpWrv3ALCU6nS0oRGHpm2zKl+oTrb+glbudMMbXMByN Wj4u75YMhY4BUIrPwQ6GYVmATUXM+dIz0hjPVFaetbFZVu+3hg7RwzPRu ePrx0BUmtU8xrmRHaMg8vxwOe9Ud+wBRU9t/hsBUVJQHUlZWa6Oc04LXZ Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10419"; a="288499081" X-IronPort-AV: E=Sophos;i="5.93,193,1654585200"; d="scan'208";a="288499081" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jul 2022 09:36:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,193,1654585200"; d="scan'208";a="575121922" Received: from silpixa00401385.ir.intel.com (HELO silpixa00401385.ger.corp.intel.com.) ([10.237.223.47]) by orsmga006.jf.intel.com with ESMTP; 25 Jul 2022 09:36:14 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Ciara Power Subject: [PATCH v2 05/13] test/telemetry-json: add test for escaping strings in arrays Date: Mon, 25 Jul 2022 17:35:34 +0100 Message-Id: <20220725163543.875775-6-bruce.richardson@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220725163543.875775-1-bruce.richardson@intel.com> References: <20220623164245.561371-1-bruce.richardson@intel.com> <20220725163543.875775-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add test-case to validate that when adding strings to arrays, the strings are properly escaped to remove any invalid characters. Signed-off-by: Bruce Richardson --- app/test/test_telemetry_json.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/app/test/test_telemetry_json.c b/app/test/test_telemetry_json.c index 955c2e5b1b..31a13ea1d7 100644 --- a/app/test/test_telemetry_json.c +++ b/app/test/test_telemetry_json.c @@ -141,6 +141,29 @@ test_string_char_escaping(void) return strncmp(expected, buf, sizeof(buf)); } +static int +test_array_char_escaping(void) +{ + /* "meaning of life", with tab between first two words, '\n' at end, + * and "life" in quotes, followed by "all the fish" in quotes + */ + const char *expected = "[\"meaning\\tof \\\"life\\\"\\n\",\"\\\"all the fish\\\"\"]"; + char buf[1024]; + int used = 0; + + used = rte_tel_json_empty_array(buf, sizeof(buf), used); + if (used != 2 || strcmp(buf, "[]")) + return -1; + + used = rte_tel_json_add_array_string(buf, sizeof(buf), used, "meaning\tof \"life\"\n"); + used = rte_tel_json_add_array_string(buf, sizeof(buf), used, "\"all the fish\""); + + printf("buf = '%s', expected = '%s'\n", buf, expected); + if (used != (int)strlen(expected)) + return -1; + return strncmp(expected, buf, sizeof(buf)); +} + typedef int (*test_fn)(void); static int @@ -155,6 +178,7 @@ test_telemetry_json(void) test_large_array_element, test_large_obj_element, test_string_char_escaping, + test_array_char_escaping, }; for (i = 0; i < RTE_DIM(fns); i++) if (fns[i]() == 0) -- 2.34.1