From patchwork Tue Dec 20 02:44:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Turner X-Patchwork-Id: 1866 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1461362vsa; Mon, 19 Dec 2016 18:44:56 -0800 (PST) X-Received: by 10.28.187.67 with SMTP id l64mr15216327wmf.114.1482201896320; Mon, 19 Dec 2016 18:44:56 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o145si16980953wme.156.2016.12.19.18.44.55; Mon, 19 Dec 2016 18:44:56 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 73D8C68A115; Tue, 20 Dec 2016 04:44:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4FE13689FCF for ; Tue, 20 Dec 2016 04:44:38 +0200 (EET) Received: by mail-pf0-f194.google.com with SMTP id c4so8141518pfb.3 for ; Mon, 19 Dec 2016 18:44:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:subject:date:message-id; bh=jWwWWU3Wh3897AS8lMpfG7HjpS4FeJ8xQue1tvO19so=; b=JPzq+BYsnM/qksOs9azx8m7KsiHnpadbX/Jq/hXD70Qy29ZFrlor/F/HFRnIP6yjBn kFCEbihxhaujMCF0/BSaCMiG+KGpn34DlrURo3vRg1e2XEy45wB4MHfCtJHu2Y6UO/tv 9mKQMI8UoUvX1caMzDcZCUdP94EvZ8IMcT1+zpUEZjGPm9BhHcX47bF3EElTkOtuAnDL 8gr4pPNW8u+GKD4BMepm4OrmMCU/KapyXX2y1trLkUqw75YbwxpJ3H+aKQcUwjlyGkWx inHyiIUqGJzFcvPyN8TYAsU0TPpsAsfSRhcukojheau+QCzcIrQfFtqSZM9yvGV8SVeL rxlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=jWwWWU3Wh3897AS8lMpfG7HjpS4FeJ8xQue1tvO19so=; b=bDg32Wjotjg+7yMH7NTTaucCAL2PQQiBlYS2716HyiIOhzUIwtb+xMTfjiv1hUcPAp pAbjqBKPEjtFH1mQH/KzmH2epaKWoFmvq7wjLYC9d+Bpsl70cIK5qZifQK8oBqvTHJ3j siUM/MH2niNokksK3ym8pUOQhJ3FxbOMU1NczaHNTY+anCYistHC3Nx8cchTQRiS3VdB Pxy9XdHF8pjJb3mdb2fwQQ5WAQsResGpUgE3aosiDaBg6woW+Sl/FsDTdndboDAVEGKC vWXZRcunU52b4SRLSxlkjaZxjBNMX2oJOPIj+LbdNPmJafrcwm355bCDnLJl+8ihpHGB CK7A== X-Gm-Message-State: AKaTC03IPhMg3MZTuRigg1tIGYolt/0OUrMj5b+w38fiPyU7pfatbywGsoeVgZwy9MsRgg== X-Received: by 10.99.125.65 with SMTP id m1mr32877957pgn.159.1482201884566; Mon, 19 Dec 2016 18:44:44 -0800 (PST) Received: from Zany.fios-router.home ([47.147.141.23]) by smtp.gmail.com with ESMTPSA id r68sm24937006pfk.85.2016.12.19.18.44.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Dec 2016 18:44:44 -0800 (PST) From: Thomas Turner To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Dec 2016 18:44:42 -0800 Message-Id: <1482201882-7013-1-git-send-email-thomastdt@googlemail.com> X-Mailer: git-send-email 1.9.1 Subject: [FFmpeg-devel] [PATCH] avutil: Improved test coverage for avstring.c X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Thomas Turner --- libavutil/tests/avstring.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/libavutil/tests/avstring.c b/libavutil/tests/avstring.c index 1242b3f..290b170 100644 --- a/libavutil/tests/avstring.c +++ b/libavutil/tests/avstring.c @@ -25,7 +25,7 @@ int main(void) { int i; - char *fullpath; + char *fullpath, *ptr; static const char * const strings[] = { "''", "", @@ -54,6 +54,8 @@ int main(void) "'\\fo\\o:': blahblah", "\\'fo\\o\\:': foo ' :blahblah" }; + const char *haystack = "Education consists mainly in what we have unlearned."; + const char * const needle[] = {"learned.", "unlearned.", "Unlearned"}; printf("Testing av_get_token()\n"); for (i = 0; i < FF_ARRAY_ELEMS(strings); i++) { @@ -79,5 +81,27 @@ int main(void) TEST_APPEND_PATH_COMPONENT("path", "/comp", "path/comp"); TEST_APPEND_PATH_COMPONENT("path/", "/comp", "path/comp"); TEST_APPEND_PATH_COMPONENT("path/path2/", "/comp/comp2", "path/path2/comp/comp2"); + + /*Testing av_strnstr()*/ + #define TEST_STRNSTR(haystack, needle, hay_length, expected) \ + ptr = av_strnstr(haystack, needle, hay_length); \ + if (ptr != expected){ \ + printf("expected: %p, received %p\n", expected, ptr); \ + } + TEST_STRNSTR(haystack, needle [0], strlen(haystack), haystack+44); + TEST_STRNSTR(haystack, needle [1], strlen(haystack), haystack+42); + TEST_STRNSTR(haystack, needle [2], strlen(haystack), NULL ); + TEST_STRNSTR(haystack, strings[1], strlen(haystack), haystack ); + + /*Testing av_d2str()*/ + #define TEST_D2STR(value, expected) \ + if((ptr = av_d2str(value)) == NULL){ \ + printf("error, received null pointer!\n"); \ + } else if(strcmp(ptr, expected) != 0){ \ + printf( "expected: %s, received: %s\n", expected, ptr); \ + } + TEST_D2STR(0 , "0.000000"); + TEST_D2STR(-1.2333234, "-1.233323"); + TEST_D2STR(-1.2333237, "-1.233324"); return 0; }