From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
SZEDER Gabor <szeder@ira.uka.de>,
Matthieu Moy <matthieu.moy@grenoble-inp.fr>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v5 2/3] tests: use __gitcompadd to simplify completion tests
Date: Sun, 14 Oct 2012 17:52:50 +0200 [thread overview]
Message-ID: <1350229971-9343-3-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1350229971-9343-1-git-send-email-felipe.contreras@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
t/t9902-completion.sh | 29 +++++++++--------------------
1 file changed, 9 insertions(+), 20 deletions(-)
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 92d7eb4..49c6eb4 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -39,19 +39,18 @@ _get_comp_words_by_ref ()
done
}
-print_comp ()
+__gitcompadd ()
{
- local IFS=$'\n'
- echo "${COMPREPLY[*]}" > out
+ compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}" > out
}
run_completion ()
{
- local -a COMPREPLY _words
+ local -a _words
local _cword
_words=( $1 )
(( _cword = ${#_words[@]} - 1 ))
- __git_wrap__git_main && print_comp
+ __git_wrap__git_main
}
test_completion ()
@@ -70,12 +69,10 @@ test_expect_success '__gitcomp - trailing space - options' '
--reset-author Z
EOF
(
- local -a COMPREPLY &&
cur="--re" &&
__gitcomp "--dry-run --reuse-message= --reedit-message=
--reset-author" &&
- IFS="$newline" &&
- echo "${COMPREPLY[*]}" > out
+ IFS="$newline"
) &&
test_cmp expected out
'
@@ -88,12 +85,10 @@ test_expect_success '__gitcomp - trailing space - config keys' '
browser.Z
EOF
(
- local -a COMPREPLY &&
cur="br" &&
__gitcomp "branch. branch.autosetupmerge
branch.autosetuprebase browser." &&
- IFS="$newline" &&
- echo "${COMPREPLY[*]}" > out
+ IFS="$newline"
) &&
test_cmp expected out
'
@@ -104,12 +99,10 @@ test_expect_success '__gitcomp - option parameter' '
resolve Z
EOF
(
- local -a COMPREPLY &&
cur="--strategy=re" &&
__gitcomp "octopus ours recursive resolve subtree
" "" "re" &&
- IFS="$newline" &&
- echo "${COMPREPLY[*]}" > out
+ IFS="$newline"
) &&
test_cmp expected out
'
@@ -120,12 +113,10 @@ test_expect_success '__gitcomp - prefix' '
branch.maint.mergeoptions Z
EOF
(
- local -a COMPREPLY &&
cur="branch.me" &&
__gitcomp "remote merge mergeoptions rebase
" "branch.maint." "me" &&
- IFS="$newline" &&
- echo "${COMPREPLY[*]}" > out
+ IFS="$newline"
) &&
test_cmp expected out
'
@@ -136,12 +127,10 @@ test_expect_success '__gitcomp - suffix' '
branch.maint.Z
EOF
(
- local -a COMPREPLY &&
cur="branch.me" &&
__gitcomp "master maint next pu
" "branch." "ma" "." &&
- IFS="$newline" &&
- echo "${COMPREPLY[*]}" > out
+ IFS="$newline"
) &&
test_cmp expected out
'
--
1.7.12.1
next prev parent reply other threads:[~2012-10-14 15:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-14 15:52 [PATCH v5 0/3] completion: refactor and zsh wrapper Felipe Contreras
2012-10-14 15:52 ` [PATCH v5 1/3] completion: add new __gitcompadd helper Felipe Contreras
2012-10-17 17:28 ` SZEDER Gábor
2012-10-22 0:41 ` Felipe Contreras
2012-10-30 23:18 ` SZEDER Gábor
2012-10-14 15:52 ` Felipe Contreras [this message]
2012-10-16 0:24 ` [PATCH v5 2/3] tests: use __gitcompadd to simplify completion tests Felipe Contreras
2012-10-17 17:50 ` SZEDER Gábor
2012-10-17 17:54 ` [PATCH] completion: clean up __gitcomp() tests SZEDER Gábor
2012-10-17 18:21 ` Felipe Contreras
2012-10-17 18:26 ` [PATCH v5 2/3] tests: use __gitcompadd to simplify completion tests Felipe Contreras
2012-10-14 15:52 ` [PATCH v5 3/3] completion: add new zsh completion Felipe Contreras
2012-10-15 6:38 ` Felipe Contreras
2012-10-15 16:45 ` [PATCH v5 0/3] completion: refactor and zsh wrapper Matthieu Moy
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1350229971-9343-3-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=matthieu.moy@grenoble-inp.fr \
--cc=szeder@ira.uka.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).