org.eclipse.jgit.attributes.merge

Class MergeGitAttributeTest

java.lang.Object

org.eclipse.jgit.junit.LocalDiskRepositoryTestCase

org.eclipse.jgit.junit.RepositoryTestCase

org.eclipse.jgit.attributes.merge.MergeGitAttributeTest

public class MergeGitAttributeTest
extends RepositoryTestCase

Field Summary

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

Method Summary

Modifier and Type	Method and Description
Git	createRepositoryBinaryConflict(Consumer<Git> initialCommit, Consumer<Git> leftCommit, Consumer<Git> rightCommit)
void	mergeBinaryFile_NoAttr_Conflict()
void	mergeBinaryFile_SetMerge_Conflict()
void	mergeBinaryFile_UnsetMerge_Conflict()
void	mergeTextualFile_NoAttr()
void	mergeTextualFile_SetBinaryMerge_Conflict()
void	mergeTextualFile_UnsetMerge_Conflict()
void	mergeTextualFile_UnsetMerge_NoConflict()

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

Constructor Detail

MergeGitAttributeTest

public MergeGitAttributeTest()

Method Detail

createRepositoryBinaryConflict

public Git createRepositoryBinaryConflict(Consumer<Git> initialCommit,
                                          Consumer<Git> leftCommit,
                                          Consumer<Git> rightCommit)
                                   throws NoFilepatternException,
                                          GitAPIException,
                                          NoWorkTreeException,
                                          IOException

Throws:

NoFilepatternException

GitAPIException

NoWorkTreeException

IOException

mergeTextualFile_NoAttr

public void mergeTextualFile_NoAttr()
                             throws NoWorkTreeException,
                                    NoFilepatternException,
                                    GitAPIException,
                                    IOException

Throws:

NoWorkTreeException

NoFilepatternException

GitAPIException

IOException

mergeTextualFile_UnsetMerge_Conflict

public void mergeTextualFile_UnsetMerge_Conflict()
                                          throws NoWorkTreeException,
                                                 NoFilepatternException,
                                                 GitAPIException,
                                                 IOException

Throws:

NoWorkTreeException

NoFilepatternException

GitAPIException

IOException

mergeTextualFile_UnsetMerge_NoConflict

public void mergeTextualFile_UnsetMerge_NoConflict()
                                            throws NoWorkTreeException,
                                                   NoFilepatternException,
                                                   GitAPIException,
                                                   IOException

Throws:

NoWorkTreeException

NoFilepatternException

GitAPIException

IOException

mergeTextualFile_SetBinaryMerge_Conflict

public void mergeTextualFile_SetBinaryMerge_Conflict()
                                              throws NoWorkTreeException,
                                                     NoFilepatternException,
                                                     GitAPIException,
                                                     IOException

Throws:

NoWorkTreeException

NoFilepatternException

GitAPIException

IOException

mergeBinaryFile_NoAttr_Conflict

public void mergeBinaryFile_NoAttr_Conflict()
                                     throws IllegalStateException,
                                            IOException,
                                            NoHeadException,
                                            ConcurrentRefUpdateException,
                                            CheckoutConflictException,
                                            InvalidMergeHeadsException,
                                            WrongRepositoryStateException,
                                            NoMessageException,
                                            GitAPIException

Throws:

IllegalStateException

IOException

NoHeadException

ConcurrentRefUpdateException

CheckoutConflictException

InvalidMergeHeadsException

WrongRepositoryStateException

NoMessageException

GitAPIException

mergeBinaryFile_UnsetMerge_Conflict

public void mergeBinaryFile_UnsetMerge_Conflict()
                                         throws IllegalStateException,
                                                IOException,
                                                NoHeadException,
                                                ConcurrentRefUpdateException,
                                                CheckoutConflictException,
                                                InvalidMergeHeadsException,
                                                WrongRepositoryStateException,
                                                NoMessageException,
                                                GitAPIException

Throws:

IllegalStateException

IOException

NoHeadException

ConcurrentRefUpdateException

CheckoutConflictException

InvalidMergeHeadsException

WrongRepositoryStateException

NoMessageException

GitAPIException

mergeBinaryFile_SetMerge_Conflict

public void mergeBinaryFile_SetMerge_Conflict()
                                       throws IllegalStateException,
                                              IOException,
                                              NoHeadException,
                                              ConcurrentRefUpdateException,
                                              CheckoutConflictException,
                                              InvalidMergeHeadsException,
                                              WrongRepositoryStateException,
                                              NoMessageException,
                                              GitAPIException

Throws:

IllegalStateException

IOException

NoHeadException

ConcurrentRefUpdateException

CheckoutConflictException

InvalidMergeHeadsException

WrongRepositoryStateException

NoMessageException

GitAPIException