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 F2B1EA00C4; Mon, 25 Jul 2022 18:36:45 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AEE3042B7B; Mon, 25 Jul 2022 18:36:27 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 2367642905 for ; Mon, 25 Jul 2022 18:36:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658766986; x=1690302986; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Yhghxn4H7GoQuXi4I+1jhMgapNKh74utAFoe7F2Utoc=; b=YD0oECoqZizSPMyJD4Gnr9Eh5Zily6S4IT0X3wre9QVDGNhe6lqpOYFS kRVhNFvdamxl+fW7Om4JQUJO0nbrdR6Vl91d2GQYrBEtJcuKcbvnaSWKf +TTOaf+tJVMtVQ2goJS7hlJQw6NoJ4DczUu+SnMMf7ODgOcDSA1mpd8qA 71sSrUAWE7Ta+APHxcEw5ytj6mn9Qul41EwwpbvRPh4cvJmfcylERFIKL cKTgydjvTW1XPBON546XLhoudx00Z5ILGpH7jx5IeeuAoOnDP7KvQLziB xNDeF/w7tYsQ7T31+ys1BuoGoH1GF9nz3ubDXhIjR8s6TvUgaFT3Xe3hH Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10419"; a="288499119" X-IronPort-AV: E=Sophos;i="5.93,193,1654585200"; d="scan'208";a="288499119" 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:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,193,1654585200"; d="scan'208";a="575122656" 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:23 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Ciara Power Subject: [PATCH v2 08/13] test/telemetry_json: add test for string escaping in objects Date: Mon, 25 Jul 2022 17:35:37 +0100 Message-Id: <20220725163543.875775-9-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 a test-case to validate that when adding strings either as the name or the value of an entry in an object, that all values are escaped properly. 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 31a13ea1d7..184c3ba9f1 100644 --- a/app/test/test_telemetry_json.c +++ b/app/test/test_telemetry_json.c @@ -164,6 +164,29 @@ test_array_char_escaping(void) return strncmp(expected, buf, sizeof(buf)); } +static int +test_obj_char_escaping(void) +{ + const char *expected = "{\"good\":\"Clint Eastwood\\n\"," + "\"bad\":\"Lee\\tVan\\tCleef\"," + "\"ugly\":\"\\rEli Wallach\"}"; + char buf[1024]; + int used = 0; + + used = rte_tel_json_empty_obj(buf, sizeof(buf), used); + if (used != 2 || strcmp(buf, "{}")) + return -1; + + used = rte_tel_json_add_obj_str(buf, sizeof(buf), used, "good", "Clint Eastwood\n"); + used = rte_tel_json_add_obj_str(buf, sizeof(buf), used, "bad", "Lee\tVan\tCleef"); + used = rte_tel_json_add_obj_str(buf, sizeof(buf), used, "ugly", "\rEli Wallach"); + + 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 @@ -179,6 +202,7 @@ test_telemetry_json(void) test_large_obj_element, test_string_char_escaping, test_array_char_escaping, + test_obj_char_escaping }; for (i = 0; i < RTE_DIM(fns); i++) if (fns[i]() == 0) -- 2.34.1