org.eclipse.jgit.pgm

Class MergeTest

java.lang.Object

org.eclipse.jgit.junit.LocalDiskRepositoryTestCase

org.eclipse.jgit.lib.CLIRepositoryTestCase

org.eclipse.jgit.pgm.MergeTest

public class MergeTest
extends CLIRepositoryTestCase

Field Summary

Fields inherited from class org.eclipse.jgit.lib.CLIRepositoryTestCase

db, trash

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

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

Constructor Summary

Constructors

Constructor and Description
MergeTest()

Method Summary

Methods

Modifier and Type	Method and Description
void	setUp()
void	testFastForward()
void	testFastForwardOnly()
void	testMerge()
void	testMergeNoCommit()
void	testMergeNoCommitSquash()
void	testMergeSelf()
void	testMergeWithUserMessage()
void	testNoFastForward()
void	testNoFastForwardAndSquash()
void	testSquash()
void	testSquashSelf()

Methods inherited from class org.eclipse.jgit.lib.CLIRepositoryTestCase

assertArrayOfLinesEquals, cmdString, deleteTrashFile, escapeJava, execute, executeAndPrint, executeAndPrintTestCode, read, writeTrashFile

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

addRepoToClose, createBareRepository, createTempDirectory, createTempFile, createUniqueTestGitDir, createWorkRepository, getCeilings, getTemporaryDirectory, indexState, 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

MergeTest

public MergeTest()

Method Detail

setUp

public void setUp()
           throws Exception

Overrides:

setUp in class CLIRepositoryTestCase

Throws:

Exception

testMergeSelf

public void testMergeSelf()
                   throws Exception

Throws:

Exception

testSquashSelf

public void testSquashSelf()
                    throws Exception

Throws:

Exception

testFastForward

public void testFastForward()
                     throws Exception

Throws:

Exception

testMerge

public void testMerge()
               throws Exception

Throws:

Exception

testMergeNoCommit

public void testMergeNoCommit()
                       throws Exception

Throws:

Exception

testMergeNoCommitSquash

public void testMergeNoCommitSquash()
                             throws Exception

Throws:

Exception

testSquash

public void testSquash()
                throws Exception

Throws:

Exception

testNoFastForward

public void testNoFastForward()
                       throws Exception

Throws:

Exception

testNoFastForwardAndSquash

public void testNoFastForwardAndSquash()
                                throws Exception

Throws:

Exception

testFastForwardOnly

public void testFastForwardOnly()
                         throws Exception

Throws:

Exception

testMergeWithUserMessage

public void testMergeWithUserMessage()
                              throws Exception

Throws:

Exception