org.eclipse.jgit.merge

Class MergeMessageFormatterTest

java.lang.Object

org.eclipse.jgit.junit.LocalDiskRepositoryTestCase

org.eclipse.jgit.junit.RepositoryTestCase

org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase

org.eclipse.jgit.merge.MergeMessageFormatterTest

public class MergeMessageFormatterTest
extends SampleDataRepositoryTestCase

Test construction of merge message by MergeMessageFormatter.

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

Method Summary

Modifier and Type	Method and Description
void	setUp()
void	testCommit()
void	testFormatWithConflictsNoFooter()
void	testFormatWithConflictsNoFooterNoLineBreak()
void	testFormatWithConflictsWithFooterlikeLineInBody()
void	testFormatWithConflictsWithFooters()
void	testIntoHeadOtherThanMaster()
void	testIntoOtherThanMaster()
void	testIntoSymbolicRefHeadPointingToMaster()
void	testMixed()
void	testOneBranch()
void	testPullWithUri()
void	testRemoteBranch()
void	testTag()
void	testThreeBranches()
void	testTwoBranches()

Methods inherited from class org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase

copyCGitTestPacks

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

Constructor Detail

MergeMessageFormatterTest

public MergeMessageFormatterTest()

Method Detail

setUp

public void setUp()
           throws Exception

Overrides:

setUp in class SampleDataRepositoryTestCase

Throws:

Exception

testOneBranch

public void testOneBranch()
                   throws IOException

Throws:

IOException

testTwoBranches

public void testTwoBranches()
                     throws IOException

Throws:

IOException

testThreeBranches

public void testThreeBranches()
                       throws IOException

Throws:

IOException

testRemoteBranch

public void testRemoteBranch()
                      throws Exception

Throws:

Exception

testMixed

public void testMixed()
               throws IOException

Throws:

IOException

testTag

public void testTag()
             throws IOException

Throws:

IOException

testCommit

public void testCommit()
                throws IOException

Throws:

IOException

testPullWithUri

public void testPullWithUri()
                     throws IOException

Throws:

IOException

testIntoOtherThanMaster

public void testIntoOtherThanMaster()
                             throws IOException

Throws:

IOException

testIntoHeadOtherThanMaster

public void testIntoHeadOtherThanMaster()
                                 throws IOException

Throws:

IOException

testIntoSymbolicRefHeadPointingToMaster

public void testIntoSymbolicRefHeadPointingToMaster()
                                             throws IOException

Throws:

IOException

testFormatWithConflictsNoFooter

public void testFormatWithConflictsNoFooter()

testFormatWithConflictsNoFooterNoLineBreak

public void testFormatWithConflictsNoFooterNoLineBreak()

testFormatWithConflictsWithFooters

public void testFormatWithConflictsWithFooters()

testFormatWithConflictsWithFooterlikeLineInBody

public void testFormatWithConflictsWithFooterlikeLineInBody()