org.eclipse.jgit.merge

Class RecursiveMergerTest

java.lang.Object

org.eclipse.jgit.junit.LocalDiskRepositoryTestCase

org.eclipse.jgit.junit.RepositoryTestCase

org.eclipse.jgit.merge.RecursiveMergerTest

public class RecursiveMergerTest
extends RepositoryTestCase

Nested Class Summary

Nested Classes

Modifier and Type	Class and Description
static class	RecursiveMergerTest.IndexState
static class	RecursiveMergerTest.WorktreeState

Field Summary

Fields

Modifier and Type	Field and Description
static RecursiveMergerTest.IndexState[]	indexStates
static MergeStrategy[]	strategiesUnderTest
static RecursiveMergerTest.WorktreeState[]	worktreeStates

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

Method Summary

Modifier and Type	Method and Description
void	crissCrossMerge_checkOtherFiles(MergeStrategy strategy, RecursiveMergerTest.IndexState indexState, RecursiveMergerTest.WorktreeState worktreeState)
void	crissCrossMerge_mergeable(MergeStrategy strategy, RecursiveMergerTest.IndexState indexState, RecursiveMergerTest.WorktreeState worktreeState)
void	crissCrossMerge_mergeable2(MergeStrategy strategy, RecursiveMergerTest.IndexState indexState, RecursiveMergerTest.WorktreeState worktreeState)
void	crissCrossMerge_nonmergeable(MergeStrategy strategy, RecursiveMergerTest.IndexState indexState, RecursiveMergerTest.WorktreeState worktreeState)
void	crissCrossMerge_ParentsNotMergeable(MergeStrategy strategy, RecursiveMergerTest.IndexState indexState, RecursiveMergerTest.WorktreeState worktreeState)
void	crissCrossMerge_ThreeCommonPredecessors(MergeStrategy strategy, RecursiveMergerTest.IndexState indexState, RecursiveMergerTest.WorktreeState worktreeState)
void	crissCrossMerge_twoRoots(MergeStrategy strategy, RecursiveMergerTest.IndexState indexState, RecursiveMergerTest.WorktreeState worktreeState)
void	crissCrossMerge(MergeStrategy strategy, RecursiveMergerTest.IndexState indexState, RecursiveMergerTest.WorktreeState worktreeState)
void	setUp()

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

strategiesUnderTest

public static MergeStrategy[] strategiesUnderTest

indexStates

public static RecursiveMergerTest.IndexState[] indexStates

worktreeStates

public static RecursiveMergerTest.WorktreeState[] worktreeStates

Constructor Detail

RecursiveMergerTest

public RecursiveMergerTest()

Method Detail

setUp

public void setUp()
           throws Exception

Overrides:

setUp in class RepositoryTestCase

Throws:

Exception

crissCrossMerge

public void crissCrossMerge(MergeStrategy strategy,
                            RecursiveMergerTest.IndexState indexState,
                            RecursiveMergerTest.WorktreeState worktreeState)
                     throws Exception

Throws:

Exception

crissCrossMerge_twoRoots

public void crissCrossMerge_twoRoots(MergeStrategy strategy,
                                     RecursiveMergerTest.IndexState indexState,
                                     RecursiveMergerTest.WorktreeState worktreeState)
                              throws Exception

Throws:

Exception

crissCrossMerge_mergeable

public void crissCrossMerge_mergeable(MergeStrategy strategy,
                                      RecursiveMergerTest.IndexState indexState,
                                      RecursiveMergerTest.WorktreeState worktreeState)
                               throws Exception

Throws:

Exception

crissCrossMerge_mergeable2

public void crissCrossMerge_mergeable2(MergeStrategy strategy,
                                       RecursiveMergerTest.IndexState indexState,
                                       RecursiveMergerTest.WorktreeState worktreeState)
                                throws Exception

Throws:

Exception

crissCrossMerge_ParentsNotMergeable

public void crissCrossMerge_ParentsNotMergeable(MergeStrategy strategy,
                                                RecursiveMergerTest.IndexState indexState,
                                                RecursiveMergerTest.WorktreeState worktreeState)
                                         throws Exception

Throws:

Exception

crissCrossMerge_checkOtherFiles

public void crissCrossMerge_checkOtherFiles(MergeStrategy strategy,
                                            RecursiveMergerTest.IndexState indexState,
                                            RecursiveMergerTest.WorktreeState worktreeState)
                                     throws Exception

Throws:

Exception

crissCrossMerge_nonmergeable

public void crissCrossMerge_nonmergeable(MergeStrategy strategy,
                                         RecursiveMergerTest.IndexState indexState,
                                         RecursiveMergerTest.WorktreeState worktreeState)
                                  throws Exception

Throws:

Exception

crissCrossMerge_ThreeCommonPredecessors

public void crissCrossMerge_ThreeCommonPredecessors(MergeStrategy strategy,
                                                    RecursiveMergerTest.IndexState indexState,
                                                    RecursiveMergerTest.WorktreeState worktreeState)
                                             throws Exception

Throws:

Exception