org.eclipse.jgit.api

Class PullCommandWithRebaseTest

java.lang.Object

org.eclipse.jgit.junit.LocalDiskRepositoryTestCase

org.eclipse.jgit.junit.RepositoryTestCase

org.eclipse.jgit.api.PullCommandWithRebaseTest

public class PullCommandWithRebaseTest
extends RepositoryTestCase

Field Summary

Fields

Modifier and Type	Field and Description
protected Repository	dbTarget Second Test repository

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

Constructor Summary

Constructors

Constructor and Description
PullCommandWithRebaseTest()

Method Summary

Methods

Modifier and Type	Method and Description
void	setUp()
void	testPullConflict()
void	testPullFastForward()
void	testPullFastForwardWithBranchInSource()
void	testPullFastForwardWithLocalCommitAndRebaseFlagSet()
void	testPullLocalConflict()

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

dbTarget

protected Repository dbTarget

Second Test repository

Constructor Detail

PullCommandWithRebaseTest

public PullCommandWithRebaseTest()

Method Detail

testPullFastForward

public void testPullFastForward()
                         throws Exception

Throws:

Exception

testPullFastForwardWithBranchInSource

public void testPullFastForwardWithBranchInSource()
                                           throws Exception

Throws:

Exception

testPullConflict

public void testPullConflict()
                      throws Exception

Throws:

Exception

testPullLocalConflict

public void testPullLocalConflict()
                           throws Exception

Throws:

Exception

testPullFastForwardWithLocalCommitAndRebaseFlagSet

public void testPullFastForwardWithLocalCommitAndRebaseFlagSet()
                                                        throws Exception

Throws:

Exception

setUp

public void setUp()
           throws Exception

Overrides:

setUp in class RepositoryTestCase

Throws:

Exception