From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Johan Herland <johan@herland.net>,
Josh Triplett <josh@joshtriplett.org>,
Thomas Rast <tr@thomasrast.ch>,
Michael Haggerty <mhagger@alum.mit.edu>,
Eric Sunshine <sunshine@sunshineco.com>,
Dan Carpenter <dan.carpenter@oracle.com>,
Greg Kroah-Hartman <greg@kroah.com>, Jeff King <peff@peff.net>
Subject: [PATCH v4 09/17] trailer: add tests for "git interpret-trailers"
Date: Thu, 30 Jan 2014 07:49:12 +0100 [thread overview]
Message-ID: <20140130064921.7504.21063.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20140130064217.7504.473.chriscool@tuxfamily.org>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
t/t7513-interpret-trailers.sh | 208 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 208 insertions(+)
create mode 100755 t/t7513-interpret-trailers.sh
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh
new file mode 100755
index 0000000..8be333c
--- /dev/null
+++ b/t/t7513-interpret-trailers.sh
@@ -0,0 +1,208 @@
+#!/bin/sh
+#
+# Copyright (c) 2013 Christian Couder
+#
+
+test_description='git interpret-trailers'
+
+. ./test-lib.sh
+
+cat >basic_message <<'EOF'
+subject
+
+body
+EOF
+
+cat >complex_message_body <<'EOF'
+my subject
+
+my body which is long
+and contains some special
+chars like : = ? !
+
+EOF
+
+# We want one trailing space at the end of each line.
+# Let's use sed to make sure that these spaces are not removed
+# by any automatic tool.
+sed -e 's/ Z$/ /' >complex_message_trailers <<-\EOF
+Fixes: Z
+Acked-by: Z
+Reviewed-by: Z
+Signed-off-by: Z
+EOF
+
+test_expect_success 'without config' '
+ printf "ack: Peff\nReviewed-by: \nAcked-by: Johan\n" >expected &&
+ git interpret-trailers "ack = Peff" "Reviewed-by" "Acked-by: Johan" >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success '--trim-empty without config' '
+ printf "ack: Peff\nAcked-by: Johan\n" >expected &&
+ git interpret-trailers --trim-empty "ack = Peff" "Reviewed-by" "Acked-by: Johan" "sob:" >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'with config setup' '
+ git config trailer.ack.key "Acked-by: " &&
+ printf "Acked-by: Peff\n" >expected &&
+ git interpret-trailers --trim-empty "ack = Peff" >actual &&
+ test_cmp expected actual &&
+ git interpret-trailers --trim-empty "Acked-by = Peff" >actual &&
+ test_cmp expected actual &&
+ git interpret-trailers --trim-empty "Acked-by :Peff" >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'with config setup and = sign' '
+ git config trailer.ack.key "Acked-by= " &&
+ printf "Acked-by= Peff\n" >expected &&
+ git interpret-trailers --trim-empty "ack = Peff" >actual &&
+ test_cmp expected actual &&
+ git interpret-trailers --trim-empty "Acked-by= Peff" >actual &&
+ test_cmp expected actual &&
+ git interpret-trailers --trim-empty "Acked-by : Peff" >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'with config setup and # sign' '
+ git config trailer.bug.key "Bug #" &&
+ printf "Bug #42\n" >expected &&
+ git interpret-trailers --trim-empty "bug = 42" >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'with commit basic message' '
+ git interpret-trailers --infile basic_message >actual &&
+ test_cmp basic_message actual
+'
+
+test_expect_success 'with commit complex message' '
+ cat complex_message_body complex_message_trailers >complex_message &&
+ cat complex_message_body >expected &&
+ printf "Fixes: \nAcked-by= \nReviewed-by: \nSigned-off-by: \n" >>expected &&
+ git interpret-trailers --infile complex_message >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'with commit complex message and args' '
+ cat complex_message_body >expected &&
+ printf "Fixes: \nAcked-by= \nAcked-by= Peff\nReviewed-by: \nSigned-off-by: \nBug #42\n" >>expected &&
+ git interpret-trailers --infile complex_message "ack: Peff" "bug: 42" >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'with commit complex message, args and --trim-empty' '
+ cat complex_message_body >expected &&
+ printf "Acked-by= Peff\nBug #42\n" >>expected &&
+ git interpret-trailers --trim-empty --infile complex_message "ack: Peff" "bug: 42" >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'using "where = before"' '
+ git config trailer.bug.where "before" &&
+ cat complex_message_body >expected &&
+ printf "Bug #42\nFixes: \nAcked-by= \nAcked-by= Peff\nReviewed-by: \nSigned-off-by: \n" >>expected &&
+ git interpret-trailers --infile complex_message "ack: Peff" "bug: 42" >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'using "where = before" for a token in the middle of infile' '
+ git config trailer.review.key "Reviewed-by:" &&
+ git config trailer.review.where "before" &&
+ cat complex_message_body >expected &&
+ printf "Bug #42\nFixes: \nAcked-by= \nAcked-by= Peff\nReviewed-by: Johan\nReviewed-by: \nSigned-off-by: \n" >>expected &&
+ git interpret-trailers --infile complex_message "ack: Peff" "bug: 42" "review: Johan" >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'using "where = before" and --trim-empty' '
+ cat complex_message_body >expected &&
+ printf "Bug #46\nBug #42\nAcked-by= Peff\nReviewed-by: Johan\n" >>expected &&
+ git interpret-trailers --infile complex_message --trim-empty "ack: Peff" "bug: 42" "review: Johan" "Bug: 46" >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'the default is "ifExist = addIfDifferent"' '
+ cat complex_message_body >expected &&
+ printf "Bug #42\nFixes: \nAcked-by= \nAcked-by= Peff\nReviewed-by: \nSigned-off-by: \n" >>expected &&
+ git interpret-trailers --infile complex_message "ack: Peff" "review:" "bug: 42" "ack: Peff" >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'using "ifExist = addIfDifferent"' '
+ git config trailer.review.ifExist "addIfDifferent" &&
+ cat complex_message_body >expected &&
+ printf "Bug #42\nFixes: \nAcked-by= \nAcked-by= Peff\nReviewed-by: \nSigned-off-by: \n" >>expected &&
+ git interpret-trailers --infile complex_message "ack: Peff" "review:" "bug: 42" "ack: Peff" >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'using "ifExist = addIfDifferentNeighbor"' '
+ git config trailer.ack.ifExist "addIfDifferentNeighbor" &&
+ cat complex_message_body >expected &&
+ printf "Bug #42\nFixes: \nAcked-by= \nAcked-by= Peff\nAcked-by= Junio\nAcked-by= Peff\nReviewed-by: \nSigned-off-by: \n" >>expected &&
+ git interpret-trailers --infile complex_message "ack: Peff" "review:" "ack: Junio" "bug: 42" "ack: Peff" >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'using "ifExist = addIfDifferentNeighbor" and --trim-empty' '
+ git config trailer.ack.ifExist "addIfDifferentNeighbor" &&
+ cat complex_message_body >expected &&
+ printf "Bug #42\nAcked-by= Peff\nAcked-by= Junio\nAcked-by= Peff\n" >>expected &&
+ git interpret-trailers --infile complex_message --trim-empty "ack: Peff" "Acked-by= Peff" "review:" "ack: Junio" "bug: 42" "ack: Peff" >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'using "ifExist = add"' '
+ git config trailer.ack.ifExist "add" &&
+ cat complex_message_body >expected &&
+ printf "Bug #42\nFixes: \nAcked-by= \nAcked-by= Peff\nAcked-by= Peff\nAcked-by= Junio\nAcked-by= Peff\nReviewed-by: \nSigned-off-by: \n" >>expected &&
+ git interpret-trailers --infile complex_message "ack: Peff" "Acked-by= Peff" "review:" "ack: Junio" "bug: 42" "ack: Peff" >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'using "ifExist = overwrite"' '
+ git config trailer.fix.key "Fixes:" &&
+ git config trailer.fix.ifExist "overwrite" &&
+ cat complex_message_body >expected &&
+ printf "Bug #42\nFixes: 22\nAcked-by= \nAcked-by= Junio\nAcked-by= Peff\nReviewed-by: \nSigned-off-by: \n" >>expected &&
+ git interpret-trailers --infile complex_message "review:" "fix=53" "ack: Junio" "fix=22" "bug: 42" "ack: Peff" >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'using "ifExist = doNothing"' '
+ git config trailer.fix.ifExist "doNothing" &&
+ cat complex_message_body >expected &&
+ printf "Bug #42\nFixes: \nAcked-by= \nAcked-by= Junio\nAcked-by= Peff\nReviewed-by: \nSigned-off-by: \n" >>expected &&
+ git interpret-trailers --infile complex_message "review:" "fix=53" "ack: Junio" "fix=22" "bug: 42" "ack: Peff" >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'the default is "ifMissing = add"' '
+ git config trailer.cc.key "Cc: " &&
+ git config trailer.Cc.where "before" &&
+ cat complex_message_body >expected &&
+ printf "Bug #42\nCc: Linus\nFixes: \nAcked-by= \nAcked-by= Junio\nAcked-by= Peff\nReviewed-by: \nSigned-off-by: \n" >>expected &&
+ git interpret-trailers --infile complex_message "review:" "fix=53" "cc=Linus" "ack: Junio" "fix=22" "bug: 42" "ack: Peff" >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'using "ifMissing = add"' '
+ git config trailer.Cc.ifMissing "add" &&
+ cat complex_message_body >expected &&
+ printf "Cc: Linus\nBug #42\nFixes: \nAcked-by= \nAcked-by= Junio\nAcked-by= Peff\nReviewed-by: \nSigned-off-by: \n" >>expected &&
+ git interpret-trailers --infile complex_message "review:" "fix=53" "ack: Junio" "fix=22" "bug: 42" "cc=Linus" "ack: Peff" >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'using "ifMissing = doNothing"' '
+ git config trailer.Cc.ifMissing "doNothing" &&
+ cat complex_message_body >expected &&
+ printf "Bug #42\nFixes: \nAcked-by= \nAcked-by= Junio\nAcked-by= Peff\nReviewed-by: \nSigned-off-by: \n" >>expected &&
+ git interpret-trailers --infile complex_message "review:" "fix=53" "cc=Linus" "ack: Junio" "fix=22" "bug: 42" "ack: Peff" >actual &&
+ test_cmp expected actual
+'
+
+test_done
--
1.8.5.2.201.gacc5987
next prev parent reply other threads:[~2014-01-30 7:38 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-30 6:49 [PATCH v4 00/17] Add interpret-trailers builtin Christian Couder
2014-01-30 6:49 ` [PATCH v4 01/17] Add data structures and basic functions for commit trailers Christian Couder
2014-01-30 9:10 ` Eric Sunshine
2014-01-30 6:49 ` [PATCH v4 02/17] trailer: process trailers from file and arguments Christian Couder
2014-01-31 4:02 ` Eric Sunshine
2014-01-30 6:49 ` [PATCH v4 03/17] trailer: read and process config information Christian Couder
2014-01-31 15:43 ` Eric Sunshine
2014-01-30 6:49 ` [PATCH v4 04/17] trailer: process command line trailer arguments Christian Couder
2014-01-31 16:30 ` Eric Sunshine
2014-01-30 6:49 ` [PATCH v4 05/17] strbuf: add strbuf_isspace() Christian Couder
2014-01-31 2:51 ` Eric Sunshine
2014-01-31 3:09 ` Eric Sunshine
2014-01-30 6:49 ` [PATCH v4 06/17] trailer: parse trailers from input file Christian Couder
2014-01-31 16:45 ` Eric Sunshine
2014-01-30 6:49 ` [PATCH v4 07/17] trailer: put all the processing together and print Christian Couder
2014-01-30 6:49 ` [PATCH v4 08/17] trailer: add interpret-trailers command Christian Couder
2014-01-31 16:10 ` Eric Sunshine
2014-02-06 20:12 ` Christian Couder
2014-01-30 6:49 ` Christian Couder [this message]
2014-01-30 6:49 ` [PATCH v4 10/17] trailer: if no input file is passed, read from stdin Christian Couder
2014-02-02 9:50 ` Eric Sunshine
2014-02-06 20:16 ` Christian Couder
2014-02-06 21:51 ` Junio C Hamano
2014-02-09 13:55 ` Christian Couder
2014-01-30 6:49 ` [PATCH v4 11/17] trailer: add new_trailer_item() function Christian Couder
2014-02-02 10:10 ` Eric Sunshine
2014-01-30 6:49 ` [PATCH v4 12/17] strbuf: add strbuf_replace() Christian Couder
2014-01-31 3:11 ` Eric Sunshine
2014-01-30 6:49 ` [PATCH v4 13/17] trailer: execute command from 'trailer.<name>.command' Christian Couder
2014-01-30 6:49 ` [PATCH v4 14/17] trailer: add tests for trailer command Christian Couder
2014-01-30 6:49 ` [PATCH v4 15/17] trailer: set author and committer env variables Christian Couder
2014-01-30 6:49 ` [PATCH v4 16/17] trailer: add tests for commands using " Christian Couder
2014-01-30 6:49 ` [PATCH v4 17/17] Documentation: add documentation for 'git interpret-trailers' Christian Couder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140130064921.7504.21063.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=dan.carpenter@oracle.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=greg@kroah.com \
--cc=johan@herland.net \
--cc=josh@joshtriplett.org \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
--cc=tr@thomasrast.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).