From: Carlos Rica <jasampler@gmail.com>
To: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: [PATCH 1/2] t0030: Remove repeated instructions and add missing &&
Date: Tue, 10 Jul 2007 23:53:45 +0200 [thread overview]
Message-ID: <4693FFE9.3070508@gmail.com> (raw)
Moved some tests to another test_expect_success block.
Many tests now reuse the same "expect" file. Also replacing
many printf "" >expect with one >expect instruction.
Added missing && which concatenated tests in some
test_expect_success blocks.
Signed-off-by: Carlos Rica <jasampler@gmail.com>
---
t/t0030-stripspace.sh | 37 +++++++++++++------------------------
1 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/t/t0030-stripspace.sh b/t/t0030-stripspace.sh
index fdc9fdc..4a2980c 100755
--- a/t/t0030-stripspace.sh
+++ b/t/t0030-stripspace.sh
@@ -85,39 +85,36 @@ test_expect_success \
'
test_expect_success \
- 'consecutive blank lines at the beginning should be removed' '
- printf "" > expect &&
+ 'only consecutive blank lines should be completely removed' '
+ > expect &&
+
printf "\n" | git stripspace >actual &&
git diff expect actual &&
- printf "" > expect &&
printf "\n\n\n" | git stripspace >actual &&
git diff expect actual &&
- printf "" > expect &&
printf "$sss\n$sss\n$sss\n" | git stripspace >actual &&
git diff expect actual &&
- printf "" > expect &&
printf "$sss$sss\n$sss\n\n" | git stripspace >actual &&
git diff expect actual &&
- printf "" > expect &&
printf "\n$sss\n$sss$sss\n" | git stripspace >actual &&
git diff expect actual &&
- printf "" > expect &&
printf "$sss$sss$sss$sss\n\n\n" | git stripspace >actual &&
git diff expect actual &&
- printf "" > expect &&
printf "\n$sss$sss$sss$sss\n\n" | git stripspace >actual &&
git diff expect actual &&
- printf "" > expect &&
printf "\n\n$sss$sss$sss$sss\n" | git stripspace >actual &&
- git diff expect actual &&
+ git diff expect actual
+'
+test_expect_success \
+ 'consecutive blank lines at the beginning should be removed' '
printf "$ttt\n" > expect &&
printf "\n$ttt\n" | git stripspace >actual &&
git diff expect actual &&
@@ -139,26 +136,22 @@ test_expect_success \
git diff expect actual &&
printf "$ttt\n" > expect &&
+
printf "$sss\n$sss\n$sss\n$ttt\n" | git stripspace >actual &&
git diff expect actual &&
- printf "$ttt\n" > expect &&
printf "\n$sss\n$sss$sss\n$ttt\n" | git stripspace >actual &&
git diff expect actual &&
- printf "$ttt\n" > expect &&
printf "$sss$sss\n$sss\n\n$ttt\n" | git stripspace >actual &&
git diff expect actual &&
- printf "$ttt\n" > expect &&
printf "$sss$sss$sss\n\n\n$ttt\n" | git stripspace >actual &&
git diff expect actual &&
- printf "$ttt\n" > expect &&
printf "\n$sss$sss$sss\n\n$ttt\n" | git stripspace >actual &&
git diff expect actual &&
- printf "$ttt\n" > expect &&
printf "\n\n$sss$sss$sss\n$ttt\n" | git stripspace >actual &&
git diff expect actual
'
@@ -186,26 +179,22 @@ test_expect_success \
git diff expect actual &&
printf "$ttt\n" > expect &&
+
printf "$ttt\n$sss\n$sss\n$sss\n" | git stripspace >actual &&
git diff expect actual &&
- printf "$ttt\n" > expect &&
printf "$ttt\n\n$sss\n$sss$sss\n" | git stripspace >actual &&
git diff expect actual &&
- printf "$ttt\n" > expect &&
printf "$ttt\n$sss$sss\n$sss\n\n" | git stripspace >actual &&
git diff expect actual &&
- printf "$ttt\n" > expect &&
printf "$ttt\n$sss$sss$sss\n\n\n" | git stripspace >actual &&
git diff expect actual &&
- printf "$ttt\n" > expect &&
printf "$ttt\n\n$sss$sss$sss\n\n" | git stripspace >actual &&
git diff expect actual &&
- printf "$ttt\n" > expect &&
printf "$ttt\n\n\n$sss$sss$sss\n" | git stripspace >actual &&
git diff expect actual
'
@@ -224,7 +213,7 @@ test_expect_success \
'text plus spaces without newline at end should end with newline' '
test `printf "$ttt$sss" | git stripspace | wc -l` -gt 0 &&
test `printf "$ttt$ttt$sss" | git stripspace | wc -l` -gt 0 &&
- test `printf "$ttt$ttt$ttt$sss" | git stripspace | wc -l` -gt 0
+ test `printf "$ttt$ttt$ttt$sss" | git stripspace | wc -l` -gt 0 &&
test `printf "$ttt$sss$sss" | git stripspace | wc -l` -gt 0 &&
test `printf "$ttt$ttt$sss$sss" | git stripspace | wc -l` -gt 0 &&
test `printf "$ttt$sss$sss$sss" | git stripspace | wc -l` -gt 0
@@ -340,13 +329,13 @@ test_expect_success \
printf "" >expect &&
printf "" | git stripspace >actual &&
- git diff expect actual
+ git diff expect actual &&
printf "$sss$sss" | git stripspace >actual &&
- git diff expect actual
+ git diff expect actual &&
printf "$sss$sss$sss" | git stripspace >actual &&
- git diff expect actual
+ git diff expect actual &&
printf "$sss$sss$sss$sss" | git stripspace >actual &&
git diff expect actual
--
1.5.0
reply other threads:[~2007-07-10 21:54 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=4693FFE9.3070508@gmail.com \
--to=jasampler@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).