Skip to content

Commit

Permalink
[PATCH] Add tests for diff-tree
Browse files Browse the repository at this point in the history 
This adds and reorganizes some tests for diff-tree

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Junio C Hamano authored and Linus Torvalds committed May 20, 2005
1 parent e46091d commit 6371302
Show file tree
Hide file tree
Showing 3 changed files with 332 additions and 170 deletions.
144 changes: 144 additions & 0 deletions t/lib-read-tree-m-3way.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
: Included from t1000-read-tree-m-3way.sh and others
# Original tree.
mkdir Z
for a in N D M
do
for b in N D M
do
p=$a$b
echo This is $p from the original tree. >$p
echo This is Z/$p from the original tree. >Z/$p
test_expect_success \
"adding test file $p and Z/$p" \
'git-update-cache --add $p &&
git-update-cache --add Z/$p'
done
done
echo This is SS from the original tree. >SS
test_expect_success \
'adding test file SS' \
'git-update-cache --add SS'
cat >TT <<\EOF
This is a trivial merge sample text.
Branch A is expected to upcase this word, here.
There are some filler lines to avoid diff context
conflicts here,
like this one,
and this one,
and this one is yet another one of them.
At the very end, here comes another line, that is
the word, expected to be upcased by Branch B.
This concludes the trivial merge sample file.
EOF
test_expect_success \
'adding test file TT' \
'git-update-cache --add TT'
test_expect_success \
'prepare initial tree' \
'tree_O=$(git-write-tree)'

################################################################
# Branch A and B makes the changes according to the above matrix.

################################################################
# Branch A

to_remove=$(echo D? Z/D?)
rm -f $to_remove
test_expect_success \
'change in branch A (removal)' \
'git-update-cache --remove $to_remove'

for p in M? Z/M?
do
echo This is modified $p in the branch A. >$p
test_expect_success \
'change in branch A (modification)' \
"git-update-cache $p"
done

for p in AN AA Z/AN Z/AA
do
echo This is added $p in the branch A. >$p
test_expect_success \
'change in branch A (addition)' \
"git-update-cache --add $p"
done

echo This is SS from the modified tree. >SS
echo This is LL from the modified tree. >LL
test_expect_success \
'change in branch A (addition)' \
'git-update-cache --add LL &&
git-update-cache SS'
mv TT TT-
sed -e '/Branch A/s/word/WORD/g' <TT- >TT
rm -f TT-
test_expect_success \
'change in branch A (edit)' \
'git-update-cache TT'

mkdir DF
echo Branch A makes a file at DF/DF, creating a directory DF. >DF/DF
test_expect_success \
'change in branch A (change file to directory)' \
'git-update-cache --add DF/DF'

test_expect_success \
'recording branch A tree' \
'tree_A=$(git-write-tree)'

################################################################
# Branch B
# Start from O

rm -rf [NDMASLT][NDMASLT] Z DF
mkdir Z
test_expect_success \
'reading original tree and checking out' \
'git-read-tree $tree_O &&
git-checkout-cache -a'

to_remove=$(echo ?D Z/?D)
rm -f $to_remove
test_expect_success \
'change in branch B (removal)' \
"git-update-cache --remove $to_remove"

for p in ?M Z/?M
do
echo This is modified $p in the branch B. >$p
test_expect_success \
'change in branch B (modification)' \
"git-update-cache $p"
done

for p in NA AA Z/NA Z/AA
do
echo This is added $p in the branch B. >$p
test_expect_success \
'change in branch B (addition)' \
"git-update-cache --add $p"
done
echo This is SS from the modified tree. >SS
echo This is LL from the modified tree. >LL
test_expect_success \
'change in branch B (addition and modification)' \
'git-update-cache --add LL &&
git-update-cache SS'
mv TT TT-
sed -e '/Branch B/s/word/WORD/g' <TT- >TT
rm -f TT-
test_expect_success \
'change in branch B (modification)' \
'git-update-cache TT'

echo Branch B makes a file at DF. >DF
test_expect_success \
'change in branch B (addition of a file to conflict with directory)' \
'git-update-cache --add DF'

test_expect_success \
'recording branch B tree' \
'tree_B=$(git-write-tree)'

171 changes: 1 addition & 170 deletions t/t1000-read-tree-m-3way.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,177 +71,8 @@ In addition:
DF: a special case, where A makes a directory and B makes a file.
'

. ./test-lib.sh

# Original tree.
mkdir Z
for a in N D M
do
for b in N D M
do
p=$a$b
echo This is $p from the original tree. >$p
echo This is Z/$p from the original tree. >Z/$p
test_expect_success \
"adding test file $p and Z/$p" \
'git-update-cache --add $p &&
git-update-cache --add Z/$p'
done
done
echo This is SS from the original tree. >SS
test_expect_success \
'adding test file SS' \
'git-update-cache --add SS'
cat >TT <<\EOF
This is a trivial merge sample text.
Branch A is expected to upcase this word, here.
There are some filler lines to avoid diff context
conflicts here,
like this one,
and this one,
and this one is yet another one of them.
At the very end, here comes another line, that is
the word, expected to be upcased by Branch B.
This concludes the trivial merge sample file.
EOF
test_expect_success \
'adding test file TT' \
'git-update-cache --add TT'
test_expect_success \
'prepare initial tree' \
'tree_O=$(git-write-tree)'

test_expect_success \
'commit initial tree' \
'commit_O=$(echo "Original tree for the merge test." |
git-commit-tree $tree_O)'
echo $commit_O >.git/HEAD-O

################################################################
# Branch A and B makes the changes according to the above matrix.

################################################################
# Branch A

to_remove=$(echo D? Z/D?)
rm -f $to_remove
test_expect_success \
'change in branch A (removal)' \
'git-update-cache --remove $to_remove'

for p in M? Z/M?
do
echo This is modified $p in the branch A. >$p
test_expect_success \
'change in branch A (modification)' \
"git-update-cache $p"
done

for p in AN AA Z/AN Z/AA
do
echo This is added $p in the branch A. >$p
test_expect_success \
'change in branch A (addition)' \
"git-update-cache --add $p"
done

echo This is SS from the modified tree. >SS
echo This is LL from the modified tree. >LL
test_expect_success \
'change in branch A (addition)' \
'git-update-cache --add LL &&
git-update-cache SS'
mv TT TT-
sed -e '/Branch A/s/word/WORD/g' <TT- >TT
rm -f TT-
test_expect_success \
'change in branch A (edit)' \
'git-update-cache TT'

mkdir DF
echo Branch A makes a file at DF/DF, creating a directory DF. >DF/DF
test_expect_success \
'change in branch A (change file to directory)' \
'git-update-cache --add DF/DF'

test_expect_success \
'recording branch A tree' \
'tree_A=$(git-write-tree)'
test_expect_success \
'committing branch A changes' \
'commit_A=$(echo "Branch A for the merge test." |
git-commit-tree $tree_A -p $commit_O)'
echo $commit_A >.git/HEAD-A

################################################################
# Branch B
# Start from O

rm -rf [NDMASLT][NDMASLT] Z DF
mkdir Z
test_expect_success \
'reading original tree and checking out' \
'git-read-tree $tree_O &&
git-checkout-cache -a'

to_remove=$(echo ?D Z/?D)
rm -f $to_remove
test_expect_success \
'change in branch B (removal)' \
"git-update-cache --remove $to_remove"

for p in ?M Z/?M
do
echo This is modified $p in the branch B. >$p
test_expect_success \
'change in branch B (modification)' \
"git-update-cache $p"
done

for p in NA AA Z/NA Z/AA
do
echo This is added $p in the branch B. >$p
test_expect_success \
'change in branch B (addition)' \
"git-update-cache --add $p"
done
echo This is SS from the modified tree. >SS
echo This is LL from the modified tree. >LL
test_expect_success \
'change in branch B (addition and modification)' \
'git-update-cache --add LL &&
git-update-cache SS'
mv TT TT-
sed -e '/Branch B/s/word/WORD/g' <TT- >TT
rm -f TT-
test_expect_success \
'change in branch B (modification)' \
'git-update-cache TT'

echo Branch B makes a file at DF. >DF
test_expect_success \
'change in branch B (addition of a file to conflict with directory)' \
'git-update-cache --add DF'

test_expect_success \
'recording branch B tree' \
'tree_B=$(git-write-tree)'
test_expect_success \
'committing branch B changes' \
'commit_B=$(echo "Branch B for the merge test." |
git-commit-tree $tree_B -p $commit_O)'
echo $commit_B >.git/HEAD-B

################################################################
# Done preparation.

test_debug '
for T in O A B
do
echo "# $T $(eval git-cat-file commit \$commit_$T | sed -e 1q)"
done
'
. ../lib-read-tree-m-3way.sh

################################################################
# Try merging and showing the various diffs
Expand Down
Loading

0 comments on commit 6371302

Please sign in to comment.