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>,
Dan Carpenter <dan.carpenter@oracle.com>,
Greg Kroah-Hartman <greg@kroah.com>, Jeff King <peff@peff.net>
Subject: [PATCH 9/9] trailer: add tests for "git interpret-trailers"
Date: Tue, 24 Dec 2013 07:37:25 +0100 [thread overview]
Message-ID: <20131224063726.19560.61859.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20131224061541.19560.17773.chriscool@tuxfamily.org>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
t/t7513-interpret-trailers.sh | 206 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 206 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..beb58fe
--- /dev/null
+++ b/t/t7513-interpret-trailers.sh
@@ -0,0 +1,206 @@
+#!/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
+
+# Do not remove trailing spaces below!
+cat >complex_message_trailers <<'EOF'
+Fixes:
+Acked-by:
+Reviewed-by:
+Signed-off-by:
+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.4.1.616.g07f5c81
next prev parent reply other threads:[~2013-12-24 6:39 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-24 6:37 [PATCH 0/9] Add interpret-trailers builtin Christian Couder
2013-12-24 6:37 ` [PATCH 1/9] Add data structures and basic functions for commit trailers Christian Couder
2013-12-24 6:37 ` [PATCH 2/9] trailer: process trailers from file and arguments Christian Couder
2013-12-24 6:37 ` [PATCH 3/9] trailer: read and process config information Christian Couder
2013-12-24 13:47 ` Christian Couder
2013-12-24 6:37 ` [PATCH 4/9] trailer: process command line trailer arguments Christian Couder
2013-12-24 6:37 ` [PATCH 5/9] strbuf: add strbuf_isspace() Christian Couder
2013-12-24 6:37 ` [PATCH 6/9] trailer: parse trailers from input file Christian Couder
2013-12-24 6:37 ` [PATCH 7/9] trailer: put all the processing together and print Christian Couder
2013-12-24 6:37 ` [PATCH 8/9] trailer: add interpret-trailers command Christian Couder
2013-12-24 6:37 ` Christian Couder [this message]
2013-12-30 17:19 ` [PATCH 9/9] trailer: add tests for "git interpret-trailers" Junio C Hamano
2013-12-30 20:20 ` Josh Triplett
2013-12-30 20:46 ` Junio C Hamano
2013-12-30 20:52 ` Josh Triplett
2013-12-30 21:05 ` Junio C Hamano
2013-12-30 22:27 ` Josh Triplett
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=20131224063726.19560.61859.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=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.