git-commit-vandalism/t
Junio C Hamano 036d51cc55 [PATCH] read-tree: loosen too strict index requirements
This patch teaches read-tree 3-way merge that, when only "the
other tree" changed a path, and if the index file already has
the same change, we are not in a situation that would clobber
the index and the work tree, and lets the merge succeed; this is
case #14ALT in t1000 test.  It does not change the result of the
merge, but prevents it from failing when it does not have to.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-12 20:40:20 -07:00
..
diff-lib.sh [PATCH] diff: consolidate test helper script pieces. 2005-05-31 16:17:27 -07:00
lib-read-tree-m-3way.sh [PATCH] Add read-tree -m 3-way merge tests. 2005-06-08 15:56:09 -07:00
Makefile t/Makefile: OPTS -> GIT_TEST_OPTS 2005-05-14 17:58:22 +02:00
README [PATCH 4/4] Trivial test harness fixes. 2005-05-16 00:22:10 +02:00
t0000-basic.sh [PATCH] Make ls-* output consistent with diff-* output format. 2005-05-26 15:18:55 -07:00
t0100-environment-names.sh [PATCH 2/2] The core GIT tests: recent additions and fixes. 2005-05-14 17:41:01 +02:00
t0110-environment-names-old.sh [PATCH] Test case portability fix. 2005-05-25 19:37:10 -07:00
t1000-read-tree-m-3way.sh [PATCH] read-tree: loosen too strict index requirements 2005-06-12 20:40:20 -07:00
t1001-read-tree-m-2way.sh [PATCH] Clean up read-tree two-way tests. 2005-06-12 20:40:20 -07:00
t1002-read-tree-m-u-2way.sh [PATCH] Tests: read-tree -m test updates. 2005-06-08 10:19:53 -07:00
t1005-read-tree-m-2way-emu23.sh [PATCH] Finish making --emu23 equivalent to pure 2-way merge. 2005-06-12 20:40:20 -07:00
t1100-commit-tree-options.sh [PATCH] fix and testcase for git-commit-tree option 2005-05-26 16:21:13 -07:00
t2000-checkout-cache-clash.sh Rename some test scripts and describe the naming convention 2005-05-15 01:34:22 +02:00
t2001-checkout-cache-clash.sh Rename some test scripts and describe the naming convention 2005-05-15 01:34:22 +02:00
t2002-checkout-cache-u.sh Fix up previous commit 2005-05-19 22:39:27 -07:00
t2003-checkout-cache-mkdir.sh [PATCH] Allow symlinks in the leading path in checkout-cache --prefix= 2005-05-24 17:47:05 -07:00
t2100-update-cache-badpath.sh Fixed misnamed t/t2010-update-cache-badpath.sh 2005-05-15 01:42:31 +02:00
t3000-ls-files-others.sh [PATCH] Adjust show-files test for dotfiles. 2005-05-25 15:21:57 -07:00
t3010-ls-files-killed.sh Rename some test scripts and describe the naming convention 2005-05-15 01:34:22 +02:00
t3100-ls-tree-restrict.sh [PATCH] ls-tree: handle trailing slashes in the pathspec properly. 2005-05-31 20:32:27 -07:00
t4000-diff-format.sh Fix up previous commit 2005-05-19 22:39:27 -07:00
t4001-diff-rename.sh diff 'rename' format change. 2005-06-05 15:31:52 -07:00
t4002-diff-basic.sh [PATCH] diff-raw format update take #2. 2005-05-23 16:23:10 -07:00
t4003-diff-rename-1.sh diff 'rename' format change. 2005-06-05 15:31:52 -07:00
t4004-diff-rename-symlink.sh diff 'rename' format change. 2005-06-05 15:31:52 -07:00
t4005-diff-rename-2.sh diff 'rename' format change. 2005-06-05 15:31:52 -07:00
t4006-diff-mode.sh [PATCH] Mode only changes from diff. 2005-05-25 16:06:24 -07:00
t4007-rename-3.sh [PATCH] diff: consolidate test helper script pieces. 2005-05-31 16:17:27 -07:00
t4008-diff-break-rewrite.sh [PATCH] diff: consolidate test helper script pieces. 2005-05-31 16:17:27 -07:00
t4009-diff-rename-4.sh diff 'rename' format change. 2005-06-05 15:31:52 -07:00
t4010-diff-pathspec.sh [PATCH] ls-tree: handle trailing slashes in the pathspec properly. 2005-05-31 20:32:27 -07:00
t5000-tar-tree.sh [PATCH] git-tar-tree: do only basic tests in t/t5000-git-tar-tree.sh 2005-06-03 09:51:01 -07:00
t5100-delta-pull.sh [PATCH] pull: gracefully recover from delta retrieval failure. 2005-06-05 14:18:00 -07:00
t6001-rev-list-merge-order.sh [PATCH] three --merge-order bug fixes 2005-06-08 09:37:10 -07:00
test-lib.sh [PATCH 1/2] Test suite fixup. 2005-05-14 18:06:21 +02:00

Core GIT Tests
==============

This directory holds many test scripts for core GIT tools.  The
first part of this short document describes how to run the tests
and read their output.

When fixing the tools or adding enhancements, you are strongly
encouraged to add tests in this directory to cover what you are
trying to fix or enhance.  The later part of this short document
describes how your test scripts should be organized.


Running Tests
-------------

The easiest way to run tests is to say "make".  This runs all
the tests.

    *** t0000-basic.sh ***
    *   ok 1: .git/objects should be empty after git-init-db in an empty repo.
    *   ok 2: .git/objects should have 256 subdirectories.
    *   ok 3: git-update-cache without --add should fail adding.
    ...
    *   ok 23: no diff after checkout and git-update-cache --refresh.
    * passed all 23 test(s)
    *** t0100-environment-names.sh ***
    *   ok 1: using old names should issue warnings.
    *   ok 2: using old names but having new names should not issue warnings.
    ...

Or you can run each test individually from command line, like
this:

    $ sh ./t3001-ls-files-killed.sh
    *   ok 1: git-update-cache --add to add various paths.
    *   ok 2: git-ls-files -k to show killed files.
    *   ok 3: validate git-ls-files -k output.
    * passed all 3 test(s)

You can pass --verbose (or -v), --debug (or -d), and --immediate
(or -i) command line argument to the test.

--verbose::
	This makes the test more verbose.  Specifically, the
	command being run and their output if any are also
	output.

--debug::
	This may help the person who is developing a new test.
	It causes the command defined with test_debug to run.

--immediate::
	This causes the test to immediately exit upon the first
	failed test.


Naming Tests
------------

The test files are named as:

	tNNNN-commandname-details.sh

where N is a decimal digit.

First digit tells the family:

	0 - the absolute basics and global stuff
	1 - the basic commands concerning database
	2 - the basic commands concerning the working tree
	3 - the other basic commands (e.g. ls-files)
	4 - the diff commands
	5 - the pull and exporting commands
	6 - the revision tree commands (even e.g. merge-base)

Second digit tells the particular command we are testing.

Third digit (optionally) tells the particular switch or group of switches
we are testing.


Writing Tests
-------------

The test script is written as a shell script.  It should start
with the standard "#!/bin/sh" with copyright notices, and an
assignment to variable 'test_description', like this:

	#!/bin/sh
	#
	# Copyright (c) 2005 Junio C Hamano
	#

	test_description='xxx test (option --frotz)

	This test registers the following structure in the cache
	and tries to run git-ls-files with option --frotz.'


Source 'test-lib.sh'
--------------------

After assigning test_description, the test script should source
test-lib.sh like this:

	. ./test-lib.sh

This test harness library does the following things:

 - If the script is invoked with command line argument --help
   (or -h), it shows the test_description and exits.

 - Creates an empty test directory with an empty .git/objects
   database and chdir(2) into it.  This directory is 't/trash'
   if you must know, but I do not think you care.

 - Defines standard test helper functions for your scripts to
   use.  These functions are designed to make all scripts behave
   consistently when command line arguments --verbose (or -v),
   --debug (or -d), and --immediate (or -i) is given.


End with test_done
------------------

Your script will be a sequence of tests, using helper functions
from the test harness library.  At the end of the script, call
'test_done'.


Test harness library
--------------------

There are a handful helper functions defined in the test harness
library for your script to use.

 - test_expect_success <message> <script>

   This takes two strings as parameter, and evaluates the
   <script>.  If it yields success, test is considered
   successful.  <message> should state what it is testing.

   Example:

	test_expect_success \
	    'git-write-tree should be able to write an empty tree.' \
	    'tree=$(git-write-tree)'

 - test_expect_failure <message> <script>

   This is the opposite of test_expect_success.  If <script>
   yields success, test is considered a failure.

   Example:

	test_expect_failure \
	    'git-update-cache without --add should fail adding.' \
	    'git-update-cache should-be-empty'

 - test_debug <script>

   This takes a single argument, <script>, and evaluates it only
   when the test script is started with --debug command line
   argument.  This is primarily meant for use during the
   development of a new test script.

 - test_done

   Your test script must have test_done at the end.  Its purpose
   is to summarize successes and failures in the test script and
   exit with an appropriate error code.


Tips for Writing Tests
----------------------

As with any programming projects, existing programs are the best
source of the information.  However, do _not_ emulate
t0000-basic.sh when writing your tests.  The test is special in
that it tries to validate the very core of GIT.  For example, it
knows that there will be 256 subdirectories under .git/objects/,
and it knows that the object ID of an empty tree is a certain
40-byte string.  This is deliberately done so in t0000-basic.sh
because the things the very basic core test tries to achieve is
to serve as a basis for people who are changing the GIT internal
drastically.  For these people, after making certain changes,
not seeing failures from the basic test _is_ a failure.  And
such drastic changes to the core GIT that even changes these
otherwise supposedly stable object IDs should be accompanied by
an update to t0000-basic.sh.

However, other tests that simply rely on basic parts of the core
GIT working properly should not have that level of intimate
knowledge of the core GIT internals.  If all the test scripts
hardcoded the object IDs like t0000-basic.sh does, that defeats
the purpose of t0000-basic.sh, which is to isolate that level of
validation in one place.  Your test also ends up needing
updating when such a change to the internal happens, so do _not_
do it and leave the low level of validation to t0000-basic.sh.