org.eclipse.jgit.merge

Class ResolveMergerTest

java.lang.Object

org.eclipse.jgit.junit.LocalDiskRepositoryTestCase

org.eclipse.jgit.junit.RepositoryTestCase

org.eclipse.jgit.merge.ResolveMergerTest

public class ResolveMergerTest
extends RepositoryTestCase

Field Summary

Fields

Modifier and Type	Field and Description
static MergeStrategy	recursive
static MergeStrategy	resolve

Fields inherited from class org.eclipse.jgit.junit.RepositoryTestCase

db, trash

Fields inherited from class org.eclipse.jgit.junit.LocalDiskRepositoryTestCase

ASSUME_UNCHANGED, author, committer, CONTENT, CONTENT_ID, LENGTH, mockSystemReader, MOD_TIME, SMUDGE

Constructor Summary

Constructors

Constructor and Description
ResolveMergerTest()

Method Summary

Modifier and Type	Method and Description
void	checkFileReplacedByFolderInOurs(MergeStrategy strategy) A tracked file is replaced by a folder in OURS.
void	checkFileReplacedByFolderInTheirs(MergeStrategy strategy) A tracked file is replaced by a folder in THEIRS.
void	checkForCorrectIndex(MergeStrategy strategy)
void	checkLockedFilesToBeDeleted(MergeStrategy strategy)
void	checkMergeConflictingFilesWithTreeInIndex(MergeStrategy strategy) Merging two conflicting files when the index contains a tree for that path should lead to a failed state.
void	checkMergeConflictingNewTrees(MergeStrategy strategy) Merging two conflicting subtrees when the index and HEAD does not contain any file in that subtree should lead to a conflicting state.
void	checkMergeConflictingTreesWithoutIndex(MergeStrategy strategy) Merging two conflicting subtrees when the index does not contain any file in that subtree should lead to a conflicting state.
void	checkMergeCrissCross(MergeStrategy strategy) Merging after criss-cross merges.
void	checkMergeEqualNewTrees(MergeStrategy strategy) Merging two equal subtrees when the index and HEAD does not contain any file in that subtree should lead to a merged state.
void	checkMergeEqualTreesInCore(MergeStrategy strategy) Merging two equal subtrees with an incore merger should lead to a merged state (The 'Gerrit' use case).
void	checkMergeEqualTreesWithoutIndex(MergeStrategy strategy) Merging two equal subtrees when the index does not contain any file in that subtree should lead to a merged state.
void	checkMergeMergeableFilesWithTreeInIndex(MergeStrategy strategy) Merging two equal files when the index contains a tree for that path should lead to a failed state.
void	checkMergeMergeableTreesWithoutIndex(MergeStrategy strategy) Merging two different but mergeable subtrees when the index does not contain any file in that subtree should lead to a merged state.
void	checkUntrackedEmpytFolderIsNotAConflictWithFile(MergeStrategy strategy) An existing directory without tracked content should not prevent merging a file with that name.
void	checkUntrackedFolderIsNotAConflict(MergeStrategy strategy) An existing directory without tracked content should not prevent merging a tree where that directory exists.
void	failingDeleteOfDirectoryWithUntrackedContent(MergeStrategy strategy)
void	mergeWithCrlfInWT(MergeStrategy strategy)

Methods inherited from class org.eclipse.jgit.junit.RepositoryTestCase

assertEqualsFile, check, checkFile, checkoutBranch, commitFile, copyFile, createBranch, createEntry, createEntry, createEntry, deleteTrashFile, fsTick, indexState, lookup, read, resetIndex, setUp, slashify, writeLink, writeTrashFile, writeTrashFile, writeTrashFiles

Methods inherited from class org.eclipse.jgit.junit.LocalDiskRepositoryTestCase

addRepoToClose, createBareRepository, createRepository, createTempDirectory, createTempFile, createUniqueTestGitDir, createWorkRepository, getCeilings, getTemporaryDirectory, indexState, read, recursiveDelete, runHook, tearDown, tick, write, write

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Field Detail

resolve

public static MergeStrategy resolve

recursive

public static MergeStrategy recursive

Constructor Detail

ResolveMergerTest

public ResolveMergerTest()

Method Detail

failingDeleteOfDirectoryWithUntrackedContent

public void failingDeleteOfDirectoryWithUntrackedContent(MergeStrategy strategy)
                                                  throws Exception

Throws:

Exception

checkMergeConflictingTreesWithoutIndex

public void checkMergeConflictingTreesWithoutIndex(MergeStrategy strategy)
                                            throws Exception

Merging two conflicting subtrees when the index does not contain any file in that subtree should lead to a conflicting state.

Parameters:

strategy -

Throws:

Exception

checkMergeMergeableTreesWithoutIndex

public void checkMergeMergeableTreesWithoutIndex(MergeStrategy strategy)
                                          throws Exception

Merging two different but mergeable subtrees when the index does not contain any file in that subtree should lead to a merged state.

Parameters:

strategy -

Throws:

Exception

checkUntrackedFolderIsNotAConflict

public void checkUntrackedFolderIsNotAConflict(MergeStrategy strategy)
                                        throws Exception

An existing directory without tracked content should not prevent merging a tree where that directory exists.

Parameters:

strategy -

Throws:

Exception

checkFileReplacedByFolderInTheirs

public void checkFileReplacedByFolderInTheirs(MergeStrategy strategy)
                                       throws Exception

A tracked file is replaced by a folder in THEIRS.

Parameters:

strategy -

Throws:

Exception

checkFileReplacedByFolderInOurs

public void checkFileReplacedByFolderInOurs(MergeStrategy strategy)
                                     throws Exception

A tracked file is replaced by a folder in OURS.

Parameters:

strategy -

Throws:

Exception

checkUntrackedEmpytFolderIsNotAConflictWithFile

public void checkUntrackedEmpytFolderIsNotAConflictWithFile(MergeStrategy strategy)
                                                     throws Exception

An existing directory without tracked content should not prevent merging a file with that name.

Parameters:

strategy -

Throws:

Exception

mergeWithCrlfInWT

public void mergeWithCrlfInWT(MergeStrategy strategy)
                       throws IOException,
                              GitAPIException

Throws:

IOException

GitAPIException

checkMergeEqualTreesWithoutIndex

public void checkMergeEqualTreesWithoutIndex(MergeStrategy strategy)
                                      throws Exception

Merging two equal subtrees when the index does not contain any file in that subtree should lead to a merged state.

Parameters:

strategy -

Throws:

Exception

checkMergeEqualTreesInCore

public void checkMergeEqualTreesInCore(MergeStrategy strategy)
                                throws Exception

Merging two equal subtrees with an incore merger should lead to a merged state (The 'Gerrit' use case).

Parameters:

strategy -

Throws:

Exception

checkMergeEqualNewTrees

public void checkMergeEqualNewTrees(MergeStrategy strategy)
                             throws Exception

Merging two equal subtrees when the index and HEAD does not contain any file in that subtree should lead to a merged state.

Parameters:

strategy -

Throws:

Exception

checkMergeConflictingNewTrees

public void checkMergeConflictingNewTrees(MergeStrategy strategy)
                                   throws Exception

Merging two conflicting subtrees when the index and HEAD does not contain any file in that subtree should lead to a conflicting state.

Parameters:

strategy -

Throws:

Exception

checkMergeConflictingFilesWithTreeInIndex

public void checkMergeConflictingFilesWithTreeInIndex(MergeStrategy strategy)
                                               throws Exception

Merging two conflicting files when the index contains a tree for that path should lead to a failed state.

Parameters:

strategy -

Throws:

Exception

checkMergeMergeableFilesWithTreeInIndex

public void checkMergeMergeableFilesWithTreeInIndex(MergeStrategy strategy)
                                             throws Exception

Merging two equal files when the index contains a tree for that path should lead to a failed state.

Parameters:

strategy -

Throws:

Exception

checkMergeCrissCross

public void checkMergeCrissCross(MergeStrategy strategy)
                          throws Exception

Merging after criss-cross merges. In this case we merge together two commits which have two equally good common ancestors

Parameters:

strategy -

Throws:

Exception

checkLockedFilesToBeDeleted

public void checkLockedFilesToBeDeleted(MergeStrategy strategy)
                                 throws Exception

Throws:

Exception

checkForCorrectIndex

public void checkForCorrectIndex(MergeStrategy strategy)
                          throws Exception

Throws:

Exception