From: Tom Grennan <tmgrennan@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Carlos Rica <jasampler@gmail.com>,
Andy Parkins <andyparkins@gmail.com>,
"Shawn O. Pearce" <spearce@spearce.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: [PATCHv2-w 104/105] t0040 (parse-options): modernize style
Date: Fri, 2 Mar 2012 18:15:41 -0800 [thread overview]
Message-ID: <1330740942-25130-10-git-send-email-tmgrennan@gmail.com> (raw)
In-Reply-To: <1330740942-25130-1-git-send-email-tmgrennan@gmail.com>
In-Reply-To: <1330566326-26075-1-git-send-email-tmgrennan@gmail.com>
- Guard setup with test_expect_success
Signed-off-by: Tom Grennan <tmgrennan@gmail.com>
---
t/t0040-parse-options.sh | 96 +++++++++++++++++++--------------------------
1 files changed, 41 insertions(+), 55 deletions(-)
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index a1e4616..4a0b991 100755
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -7,7 +7,8 @@ test_description='our own option parser'
. ./test-lib.sh
-cat > expect << EOF
+test_expect_success 'test help' '
+ cat >expect <<-EOF &&
usage: test-parse-options <options>
-b, --boolean get a boolean
@@ -23,7 +24,7 @@ usage: test-parse-options <options>
String options
-s, --string <string>
- get a string
+ '' get a string
--string2 <str> get another string
--st <st> get another string (pervert ordering)
-o <str> get another string
@@ -44,16 +45,14 @@ Standard options
-q, --quiet be quiet
EOF
-
-test_expect_success 'test help' '
+ cp expect expect.err &&
test_must_fail test-parse-options -h > output 2> output.err &&
test ! -s output.err &&
test_cmp expect output
'
-mv expect expect.err
-
-cat > expect << EOF
+test_expect_success 'short options' '
+ cat >expect <<-\EOF &&
boolean: 2
integer: 1729
timestamp: 0
@@ -64,15 +63,14 @@ quiet: no
dry run: yes
file: prefix/my.file
EOF
-
-test_expect_success 'short options' '
test-parse-options -s123 -b -i 1729 -b -vv -n -F my.file \
> output 2> output.err &&
test_cmp expect output &&
test ! -s output.err
'
-cat > expect << EOF
+test_expect_success 'long options' '
+ cat >expect <<-\EOF &&
boolean: 2
integer: 1729
timestamp: 0
@@ -83,8 +81,6 @@ quiet: no
dry run: no
file: prefix/fi.le
EOF
-
-test_expect_success 'long options' '
test-parse-options --boolean --integer 1729 --boolean --string2=321 \
--verbose --verbose --no-dry-run --abbrev=10 --file fi.le\
--obsolete > output 2> output.err &&
@@ -101,7 +97,8 @@ test_expect_success 'missing required value' '
test $? = 129
'
-cat > expect << EOF
+test_expect_success 'intermingled arguments' '
+ cat >expect <<-\EOF &&
boolean: 1
integer: 13
timestamp: 0
@@ -115,15 +112,14 @@ arg 00: a1
arg 01: b1
arg 02: --boolean
EOF
-
-test_expect_success 'intermingled arguments' '
test-parse-options a1 --string 123 b1 --boolean -j 13 -- --boolean \
> output 2> output.err &&
test ! -s output.err &&
test_cmp expect output
'
-cat > expect << EOF
+test_expect_success 'unambiguously abbreviated option' '
+ cat >expect <<-\EOF &&
boolean: 0
integer: 2
timestamp: 0
@@ -134,8 +130,6 @@ quiet: no
dry run: no
file: (not set)
EOF
-
-test_expect_success 'unambiguously abbreviated option' '
test-parse-options --int 2 --boolean --no-bo > output 2> output.err &&
test ! -s output.err &&
test_cmp expect output
@@ -152,7 +146,8 @@ test_expect_success 'ambiguously abbreviated option' '
test $? = 129
'
-cat > expect << EOF
+test_expect_success 'non ambiguous option (after two options it abbreviates)' '
+ cat >expect <<-\EOF &&
boolean: 0
integer: 0
timestamp: 0
@@ -163,24 +158,23 @@ quiet: no
dry run: no
file: (not set)
EOF
-
-test_expect_success 'non ambiguous option (after two options it abbreviates)' '
test-parse-options --st 123 > output 2> output.err &&
test ! -s output.err &&
test_cmp expect output
'
-cat > typo.err << EOF
-error: did you mean \`--boolean\` (with two dashes ?)
-EOF
-
test_expect_success 'detect possible typos' '
+ cat >typo.err <<-\EOF &&
+ error: did you mean `--boolean` (with two dashes ?)
+ EOF
+ >expect
test_must_fail test-parse-options -boolean > output 2> output.err &&
- test ! -s output &&
- test_cmp typo.err output.err
+ test_cmp typo.err output.err &&
+ test_cmp expect output
'
-cat > expect <<EOF
+test_expect_success 'keep some options as arguments' '
+ cat >expect <<-\EOF &&
boolean: 0
integer: 0
timestamp: 0
@@ -192,14 +186,13 @@ dry run: no
file: (not set)
arg 00: --quux
EOF
-
-test_expect_success 'keep some options as arguments' '
test-parse-options --quux > output 2> output.err &&
test ! -s output.err &&
test_cmp expect output
'
-cat > expect <<EOF
+test_expect_success 'OPT_DATE() and OPT_SET_PTR() work' '
+ cat >expect <<-\EOF &&
boolean: 0
integer: 0
timestamp: 1
@@ -211,15 +204,14 @@ dry run: no
file: (not set)
arg 00: foo
EOF
-
-test_expect_success 'OPT_DATE() and OPT_SET_PTR() work' '
- test-parse-options -t "1970-01-01 00:00:01 +0000" --default-string \
- foo -q > output 2> output.err &&
+ test-parse-options -t "1970-01-01 00:00:01 +0000" \
+ --default-string foo -q >output 2>output.err &&
test ! -s output.err &&
test_cmp expect output
'
-cat > expect <<EOF
+test_expect_success 'OPT_CALLBACK() and OPT_BIT() work' '
+ cat >expect <<-\EOF &&
Callback: "four", 0
boolean: 5
integer: 4
@@ -231,24 +223,22 @@ quiet: no
dry run: no
file: (not set)
EOF
-
-test_expect_success 'OPT_CALLBACK() and OPT_BIT() work' '
test-parse-options --length=four -b -4 > output 2> output.err &&
test ! -s output.err &&
test_cmp expect output
'
-cat > expect <<EOF
+test_expect_success 'OPT_CALLBACK() and callback errors work' '
+ cat >expect <<-\EOF &&
Callback: "not set", 1
EOF
-
-test_expect_success 'OPT_CALLBACK() and callback errors work' '
test_must_fail test-parse-options --no-length > output 2> output.err &&
test_cmp expect output &&
test_cmp expect.err output.err
'
-cat > expect <<EOF
+test_expect_success 'OPT_BIT() and OPT_SET_INT() work' '
+ cat >expect <<-\EOF &&
boolean: 1
integer: 23
timestamp: 0
@@ -259,8 +249,6 @@ quiet: no
dry run: no
file: (not set)
EOF
-
-test_expect_success 'OPT_BIT() and OPT_SET_INT() work' '
test-parse-options --set23 -bbbbb --no-or4 > output 2> output.err &&
test ! -s output.err &&
test_cmp expect output
@@ -272,7 +260,8 @@ test_expect_success 'OPT_NEGBIT() and OPT_SET_INT() work' '
test_cmp expect output
'
-cat > expect <<EOF
+test_expect_success 'OPT_BIT() works' '
+ cat >expect <<-\EOF &&
boolean: 6
integer: 0
timestamp: 0
@@ -283,8 +272,6 @@ quiet: no
dry run: no
file: (not set)
EOF
-
-test_expect_success 'OPT_BIT() works' '
test-parse-options -bb --or4 > output 2> output.err &&
test ! -s output.err &&
test_cmp expect output
@@ -302,7 +289,9 @@ test_expect_success 'OPT_BOOLEAN() with PARSE_OPT_NODASH works' '
test_cmp expect output
'
-cat > expect <<EOF
+
+test_expect_success 'OPT_NUMBER_CALLBACK() works' '
+ cat >expect <<-\EOF &&
boolean: 0
integer: 12345
timestamp: 0
@@ -313,14 +302,13 @@ quiet: no
dry run: no
file: (not set)
EOF
-
-test_expect_success 'OPT_NUMBER_CALLBACK() works' '
test-parse-options -12345 > output 2> output.err &&
test ! -s output.err &&
test_cmp expect output
'
-cat >expect <<EOF
+test_expect_success 'negation of OPT_NONEG flags is not ambiguous' '
+ cat >expect <<-\EOF &&
boolean: 0
integer: 0
timestamp: 0
@@ -331,19 +319,17 @@ quiet: no
dry run: no
file: (not set)
EOF
-
-test_expect_success 'negation of OPT_NONEG flags is not ambiguous' '
test-parse-options --no-ambig >output 2>output.err &&
test ! -s output.err &&
test_cmp expect output
'
-cat >>expect <<'EOF'
+test_expect_success '--list keeps list of strings' '
+ cat >>expect <<-\EOF &&
list: foo
list: bar
list: baz
EOF
-test_expect_success '--list keeps list of strings' '
test-parse-options --list foo --list=bar --list=baz >output &&
test_cmp expect output
'
--
1.7.8
next prev parent reply other threads:[~2012-03-03 2:16 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-09 19:43 [RFC/PATCH] tag: make list exclude !<pattern> Tom Grennan
2012-02-09 19:43 ` Tom Grennan
2012-02-10 0:00 ` Tom Grennan
2012-02-10 6:34 ` Nguyen Thai Ngoc Duy
2012-02-10 18:55 ` Tom Grennan
2012-02-11 2:16 ` Tom Grennan
2012-02-11 3:06 ` Junio C Hamano
2012-02-11 7:50 ` Junio C Hamano
2012-02-11 10:13 ` Jakub Narebski
2012-02-11 14:06 ` Nguyen Thai Ngoc Duy
2012-02-11 18:31 ` Junio C Hamano
2012-02-11 19:47 ` Tom Grennan
2012-02-11 7:50 ` Michael Haggerty
2012-02-11 8:13 ` Junio C Hamano
2012-02-13 5:29 ` Michael Haggerty
2012-02-13 6:37 ` Junio C Hamano
2012-02-13 9:37 ` Michael Haggerty
2012-02-13 10:23 ` Junio C Hamano
2012-02-13 14:34 ` Michael Haggerty
2012-02-13 20:29 ` Junio C Hamano
2012-02-11 19:08 ` Tom Grennan
2012-02-22 1:28 ` [PATCHv3 0/5] " Tom Grennan
2012-02-22 1:28 ` [PATCHv3 1/5] refs: add match_pattern() Tom Grennan
2012-02-22 6:33 ` Junio C Hamano
2012-02-22 23:47 ` Tom Grennan
2012-02-23 0:17 ` Junio C Hamano
2012-02-23 0:59 ` Tom Grennan
2012-02-22 1:28 ` [PATCHv3 2/5] tag --points-at option wrapper Tom Grennan
2012-02-22 1:28 ` [PATCHv3 3/5] tag --exclude option Tom Grennan
2012-02-22 6:33 ` Junio C Hamano
2012-02-23 0:22 ` Tom Grennan
2012-02-23 1:00 ` Junio C Hamano
2012-03-01 1:45 ` [PATCH 0/5] modernize test style Tom Grennan
2012-03-03 2:15 ` [PATCHv2 " Tom Grennan
2012-03-03 8:04 ` Junio C Hamano
2012-03-03 17:42 ` Tom Grennan
2012-03-03 2:15 ` [PATCHv2 1/5] t7004 (tag): modernize style Tom Grennan
2012-03-03 21:31 ` Johannes Sixt
2012-03-03 2:15 ` [PATCHv2 2/5] t5512 (ls-remote): " Tom Grennan
2012-03-03 8:05 ` Junio C Hamano
2012-03-03 17:33 ` Tom Grennan
2012-03-03 2:15 ` [PATCHv2 3/5] t3200 (branch): " Tom Grennan
2012-03-03 2:15 ` [PATCHv2 4/5] t0040 (parse-options): " Tom Grennan
2012-03-03 2:15 ` [PATCHv2 5/5] t6300 (for-each-ref): " Tom Grennan
2012-03-03 2:15 ` [PATCHv2-w 101/105] t7004 (tag): " Tom Grennan
2012-03-03 2:15 ` [PATCHv2-w 102/105] t5512 (ls-remote): " Tom Grennan
2012-03-03 2:15 ` [PATCHv2-w 103/105] t3200 (branch): " Tom Grennan
2012-03-03 2:15 ` Tom Grennan [this message]
2012-03-03 2:15 ` [PATCHv2-w 105/105] t6300 (for-each-ref): " Tom Grennan
2012-03-01 1:45 ` [PATCH 1/5] " Tom Grennan
2012-03-01 6:53 ` Johannes Sixt
2012-03-01 15:58 ` Tom Grennan
2012-03-01 1:45 ` [PATCH 2/5] t5512 (ls-remote): " Tom Grennan
2012-03-01 8:36 ` Thomas Rast
2012-03-01 1:45 ` [PATCH 3/5] t3200 (branch): " Tom Grennan
2012-03-01 1:45 ` [PATCH 4/5] t0040 (parse-options): " Tom Grennan
2012-03-01 1:45 ` [PATCH 5/5] t7004 (tag): " Tom Grennan
2012-03-01 1:45 ` [PATCH-w 101/105] t6300 (for-each-ref): " Tom Grennan
2012-03-01 2:13 ` Junio C Hamano
2012-03-01 3:20 ` Tom Grennan
2012-03-01 3:26 ` Junio C Hamano
2012-03-01 5:10 ` Tom Grennan
2012-03-01 5:57 ` Tom Grennan
2012-03-01 8:42 ` Thomas Rast
2012-03-01 15:48 ` Tom Grennan
2012-03-01 1:45 ` [PATCH-w 102/105] t5512 (ls-remote): " Tom Grennan
2012-03-01 1:45 ` [PATCH-w 103/105] t3200 (branch): " Tom Grennan
2012-03-01 1:45 ` [PATCH-w 104/105] t0040 (parse-options): " Tom Grennan
2012-03-01 1:45 ` [PATCH-w 105/105] t7004 (tag): " Tom Grennan
2012-02-22 1:28 ` [PATCHv3 4/5] branch --exclude option Tom Grennan
2012-02-22 1:28 ` [PATCHv3 5/5] for-each-ref " Tom Grennan
2012-02-11 2:16 ` [PATCHv2 1/4] refs: add common refname_match_patterns() Tom Grennan
2012-02-11 7:12 ` Michael Haggerty
2012-02-11 19:17 ` Tom Grennan
2012-02-13 5:00 ` Michael Haggerty
2012-02-13 17:27 ` Tom Grennan
2012-02-11 8:06 ` Junio C Hamano
2012-02-11 19:37 ` Tom Grennan
2012-02-11 23:43 ` Junio C Hamano
2012-02-13 16:29 ` Tom Grennan
2012-02-11 2:16 ` [PATCHv2 2/4] tag: use refs.c:refname_match_patterns() Tom Grennan
2012-02-11 2:16 ` [PATCHv2 3/4] branch: " Tom Grennan
2012-02-11 2:16 ` [PATCHv2 4/4] for-each-ref: " Tom Grennan
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=1330740942-25130-10-git-send-email-tmgrennan@gmail.com \
--to=tmgrennan@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=andyparkins@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jasampler@gmail.com \
--cc=peff@peff.net \
--cc=spearce@spearce.org \
/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).