org.eclipse.jgit.api

Class MergeCommandTest

java.lang.Object

org.eclipse.jgit.junit.LocalDiskRepositoryTestCase

org.eclipse.jgit.junit.RepositoryTestCase

org.eclipse.jgit.api.MergeCommandTest

public class MergeCommandTest
extends RepositoryTestCase

Field Summary

Fields

Modifier and Type	Field and Description
static MergeStrategy[]	mergeStrategies

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
MergeCommandTest()

Method Summary

Modifier and Type	Method and Description
void	setUp()
void	testAlreadyUpToDate()
void	testConflictingMergeFailsDueToDirtyIndex()
void	testConflictingMergeFailsDueToDirtyWorktree()
void	testContentMerge()
void	testDeletionAndConflict()
void	testDeletionOnMasterConflict()
void	testDeletionOnSideConflict()
void	testFastForward()
void	testFastForwardNoCommit()
void	testFastForwardOnly()
void	testFastForwardOnlyNotPossible()
void	testFastForwardWithFiles()
void	testFileModeMerge()
void	testFileModeMergeWithDirtyWorkTree()
void	testMergeConflictFileFolder()
void	testMergeConflictWithMessageOption()
void	testMergeFailingWithDirtyWorkingTree()
void	testMergeInItself()
void	testMergeMessage()
void	testMergeNonVersionedPaths()
void	testMergeRemovingFolders()
void	testMergeRemovingFoldersWithoutFastForward()
void	testMergeSuccessAllStrategies(MergeStrategy mergeStrategy)
void	testMergeSuccessAllStrategiesNoCommit(MergeStrategy mergeStrategy)
void	testMergeTag()
void	testMergeWithMessageOption()
void	testModifiedAndRenamed()
void	testMultipleCreations()
void	testMultipleCreationsSameContent()
void	testMultipleDeletions()
void	testMultipleHeads()
void	testNoFastForward()
void	testNoFastForwardNoCommit()
void	testRecursiveMergeWithConflict()
void	testSingleDeletion()
void	testSquashFastForward()
void	testSquashMerge()
void	testSquashMergeConflict()
void	testSuccessfulContentMerge()
void	testSuccessfulContentMergeAndDirtyworkingTree()
void	testSuccessfulContentMergeNoCommit()
void	testSuccessfulMergeFailsDueToDirtyIndex()
void	testSuccessfulMergeFailsDueToDirtyWorktree()

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, 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

mergeStrategies

public static MergeStrategy[] mergeStrategies

Constructor Detail

MergeCommandTest

public MergeCommandTest()

Method Detail

setUp

public void setUp()
           throws Exception

Overrides:

setUp in class RepositoryTestCase

Throws:

Exception

testMergeInItself

public void testMergeInItself()
                       throws Exception

Throws:

Exception

testAlreadyUpToDate

public void testAlreadyUpToDate()
                         throws Exception

Throws:

Exception

testFastForward

public void testFastForward()
                     throws Exception

Throws:

Exception

testFastForwardNoCommit

public void testFastForwardNoCommit()
                             throws Exception

Throws:

Exception

testFastForwardWithFiles

public void testFastForwardWithFiles()
                              throws Exception

Throws:

Exception

testMultipleHeads

public void testMultipleHeads()
                       throws Exception

Throws:

Exception

testMergeSuccessAllStrategies

public void testMergeSuccessAllStrategies(MergeStrategy mergeStrategy)
                                   throws Exception

Throws:

Exception

testMergeSuccessAllStrategiesNoCommit

public void testMergeSuccessAllStrategiesNoCommit(MergeStrategy mergeStrategy)
                                           throws Exception

Throws:

Exception

testContentMerge

public void testContentMerge()
                      throws Exception

Throws:

Exception

testMergeTag

public void testMergeTag()
                  throws Exception

Throws:

Exception

testMergeMessage

public void testMergeMessage()
                      throws Exception

Throws:

Exception

testMergeNonVersionedPaths

public void testMergeNonVersionedPaths()
                                throws Exception

Throws:

Exception

testMultipleCreations

public void testMultipleCreations()
                           throws Exception

Throws:

Exception

testMultipleCreationsSameContent

public void testMultipleCreationsSameContent()
                                      throws Exception

Throws:

Exception

testSuccessfulContentMerge

public void testSuccessfulContentMerge()
                                throws Exception

Throws:

Exception

testSuccessfulContentMergeNoCommit

public void testSuccessfulContentMergeNoCommit()
                                        throws Exception

Throws:

Exception

testSuccessfulContentMergeAndDirtyworkingTree

public void testSuccessfulContentMergeAndDirtyworkingTree()
                                                   throws Exception

Throws:

Exception

testSingleDeletion

public void testSingleDeletion()
                        throws Exception

Throws:

Exception

testMultipleDeletions

public void testMultipleDeletions()
                           throws Exception

Throws:

Exception

testDeletionAndConflict

public void testDeletionAndConflict()
                             throws Exception

Throws:

Exception

testDeletionOnMasterConflict

public void testDeletionOnMasterConflict()
                                  throws Exception

Throws:

Exception

testDeletionOnSideConflict

public void testDeletionOnSideConflict()
                                throws Exception

Throws:

Exception

testModifiedAndRenamed

public void testModifiedAndRenamed()
                            throws Exception

Throws:

Exception

testMergeFailingWithDirtyWorkingTree

public void testMergeFailingWithDirtyWorkingTree()
                                          throws Exception

Throws:

Exception

testMergeConflictFileFolder

public void testMergeConflictFileFolder()
                                 throws Exception

Throws:

Exception

testSuccessfulMergeFailsDueToDirtyIndex

public void testSuccessfulMergeFailsDueToDirtyIndex()
                                             throws Exception

Throws:

Exception

testConflictingMergeFailsDueToDirtyIndex

public void testConflictingMergeFailsDueToDirtyIndex()
                                              throws Exception

Throws:

Exception

testSuccessfulMergeFailsDueToDirtyWorktree

public void testSuccessfulMergeFailsDueToDirtyWorktree()
                                                throws Exception

Throws:

Exception

testConflictingMergeFailsDueToDirtyWorktree

public void testConflictingMergeFailsDueToDirtyWorktree()
                                                 throws Exception

Throws:

Exception

testMergeRemovingFolders

public void testMergeRemovingFolders()
                              throws Exception

Throws:

Exception

testMergeRemovingFoldersWithoutFastForward

public void testMergeRemovingFoldersWithoutFastForward()
                                                throws Exception

Throws:

Exception

testFileModeMerge

public void testFileModeMerge()
                       throws Exception

Throws:

Exception

testFileModeMergeWithDirtyWorkTree

public void testFileModeMergeWithDirtyWorkTree()
                                        throws Exception

Throws:

Exception

testSquashFastForward

public void testSquashFastForward()
                           throws Exception

Throws:

Exception

testSquashMerge

public void testSquashMerge()
                     throws Exception

Throws:

Exception

testSquashMergeConflict

public void testSquashMergeConflict()
                             throws Exception

Throws:

Exception

testFastForwardOnly

public void testFastForwardOnly()
                         throws Exception

Throws:

Exception

testNoFastForward

public void testNoFastForward()
                       throws Exception

Throws:

Exception

testNoFastForwardNoCommit

public void testNoFastForwardNoCommit()
                               throws Exception

Throws:

Exception

testFastForwardOnlyNotPossible

public void testFastForwardOnlyNotPossible()
                                    throws Exception

Throws:

Exception

testRecursiveMergeWithConflict

public void testRecursiveMergeWithConflict()
                                    throws Exception

Throws:

Exception

testMergeWithMessageOption

public void testMergeWithMessageOption()
                                throws Exception

Throws:

Exception

testMergeConflictWithMessageOption

public void testMergeConflictWithMessageOption()
                                        throws Exception

Throws:

Exception