From patchwork Fri Feb 22 16:05:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olga Telezhnaya X-Patchwork-Id: 10826489 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BF68C1805 for ; Fri, 22 Feb 2019 16:05:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE6D632A18 for ; Fri, 22 Feb 2019 16:05:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AC9FB32A73; Fri, 22 Feb 2019 16:05:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3CE8532A74 for ; Fri, 22 Feb 2019 16:05:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727300AbfBVQFt (ORCPT ); Fri, 22 Feb 2019 11:05:49 -0500 Received: from a7-10.smtp-out.eu-west-1.amazonses.com ([54.240.7.10]:33624 "EHLO a7-10.smtp-out.eu-west-1.amazonses.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727202AbfBVQFs (ORCPT ); Fri, 22 Feb 2019 11:05:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=uku4taia5b5tsbglxyj6zym32efj7xqv; d=amazonses.com; t=1550851545; h=From:To:Message-ID:In-Reply-To:References:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Date:Feedback-ID; bh=Pd46mE7DV6EWDoOV2OATzjz/ZmJqBK24XE2K0SVy/GI=; b=qqKTzKmo2eraUMfUAq6mGVpY3pNrBBSaF7Tb7miaVnGMBU9etBYeEbtfXFrWcS9I 8/93eE4A15743LaFNn7q+7kTfo+F7sV80ioh+ezEwFqi9gBlYDcJfUyPtDbsYkfGs3k hoVDb4a8iaBwY7UXNTHCft1G/3zegY0wHj1wt9h0= From: Olga Telezhnaya To: git@vger.kernel.org Message-ID: <0102016915f49a75-65264938-9d50-4cf0-a55a-c5b7892c15b0-000000@eu-west-1.amazonses.com> In-Reply-To: <0102016915f499b8-5813fc52-230b-469e-b939-a1244e83a2b9-000000@eu-west-1.amazonses.com> References: <0102016915f499b8-5813fc52-230b-469e-b939-a1244e83a2b9-000000@eu-west-1.amazonses.com> Subject: [PATCH RFC 19/20] cat-file: tests for new atoms added MIME-Version: 1.0 Date: Fri, 22 Feb 2019 16:05:45 +0000 X-SES-Outgoing: 2019.02.22-54.240.7.10 Feedback-ID: 1.eu-west-1.YYPRFFOog89kHDDPKvTu4MK67j4wW0z7cAgZtFqQH58=:AmazonSES Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add some tests for new formatting atoms from ref-filter. Some of new atoms are supported automatically, some of them are expanded into empty string (because they are useless for some types of objects). Signed-off-by: Olga Telezhnaia --- t/t1006-cat-file.sh | 48 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) -- https://github.com/git/git/pull/568 diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh index 43c4be1e5ef55..3c848f2773bbb 100755 --- a/t/t1006-cat-file.sh +++ b/t/t1006-cat-file.sh @@ -20,6 +20,19 @@ maybe_remove_timestamp () { fi } +test_atom () { + name=$1 + sha1=$2 + atoms=$3 + expected=$4 + + test_expect_success "$name" ' + echo "$expected" >expect && + echo $sha1 | git cat-file --batch-check="$atoms" >actual && + test_cmp expect actual + ' +} + run_tests () { type=$1 sha1=$2 @@ -119,6 +132,13 @@ $content" maybe_remove_timestamp "$(cat actual.full)" $no_ts >actual && test_cmp expect actual ' + + for atom in refname parent body trailers upstream push symref flag + do + test_atom "Check %($atom) gives empty output" "$sha1" "%($atom)" "" + done + + test_atom "Check %(HEAD) gives only one space as output" "$sha1" '%(HEAD)' ' ' } hello_content="Hello World" @@ -140,6 +160,12 @@ test_expect_success '--batch-check without %(rest) considers whole line' ' test_cmp expect actual ' +shortname=`echo $hello_sha1 | sed 's/^.\{0\}\(.\{7\}\).*/\1/'` +test_atom 'Check format option %(objectname:short) works' "$hello_sha1" '%(objectname:short)' "$shortname" + +test_atom 'Check format option %(align) is not broken' \ + "$hello_sha1" "%(align:8)%(objecttype)%(end)%(objectname)" "blob $hello_sha1" + test_oid_init tree_sha1=$(git write-tree) @@ -159,6 +185,17 @@ $commit_message" run_tests 'commit' $commit_sha1 $commit_size "$commit_content" "$commit_content" 1 +test_atom "Check format option %(if) is not broken" "$commit_sha1" \ + "%(if)%(author)%(then)%(objectname)%(end)" "$commit_sha1" +test_atom "Check %(tree) works for commit" "$commit_sha1" "%(tree)" "$tree_sha1" +test_atom "Check %(numparent) works for commit" "$commit_sha1" "%(numparent)" "0" +test_atom "Check %(authorname) works for commit" "$commit_sha1" "%(authorname)" "$GIT_AUTHOR_NAME" +test_atom "Check %(authoremail) works for commit" "$commit_sha1" "%(authoremail)" "<$GIT_AUTHOR_EMAIL>" +test_atom "Check %(committername) works for commit" "$commit_sha1" "%(committername)" "$GIT_COMMITTER_NAME" +test_atom "Check %(committeremail) works for commit" "$commit_sha1" "%(committeremail)" "<$GIT_COMMITTER_EMAIL>" +test_atom "Check %(subject) works for commit" "$commit_sha1" "%(subject)" "$commit_message" +test_atom "Check %(contents) works for commit" "$commit_sha1" "%(contents)" "$commit_message" + tag_header_without_timestamp="object $hello_sha1 type blob tag hellotag @@ -173,6 +210,17 @@ tag_size=$(strlen "$tag_content") run_tests 'tag' $tag_sha1 $tag_size "$tag_content" "$tag_content" 1 +test_atom "Check %(object) works for tag" "$tag_sha1" "%(object)" "$hello_sha1" +test_atom "Check %(type) works for tag" "$tag_sha1" "%(type)" "blob" +test_atom "Check %(tag) works for tag" "$tag_sha1" "%(tag)" "hellotag" +test_atom "Check %(taggername) works for tag" "$tag_sha1" "%(taggername)" "$GIT_COMMITTER_NAME" +test_atom "Check %(taggeremail) works for tag" "$tag_sha1" "%(taggeremail)" "<$GIT_COMMITTER_EMAIL>" +test_atom "Check %(subject) works for tag" "$tag_sha1" "%(subject)" "$tag_description" +test_atom "Check %(contents) works for tag" "$tag_sha1" "%(contents)" "$tag_description" + +test_atom "Check %(color) gives no additional output" "$sha1" \ + "%(objectname) %(color:green) %(objecttype)" "$sha1 $type" + test_expect_success \ "Reach a blob from a tag pointing to it" \ "test '$hello_content' = \"\$(git cat-file blob $tag_sha1)\""