org.eclipse.jgit.api

Class PullCommandTest

java.lang.Object

org.eclipse.jgit.junit.LocalDiskRepositoryTestCase

org.eclipse.jgit.junit.RepositoryTestCase

org.eclipse.jgit.api.PullCommandTest

public class PullCommandTest
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, mockSystemReader, MOD_TIME, SMUDGE

Constructor Summary

Constructors

Constructor and Description
PullCommandTest()

Method Summary

Modifier and Type	Method and Description
void	setUp()
void	testPullConflict()
void	testPullEmptyRepository()
void	testPullFastForward()
void	testPullLocalConflict()
void	testPullMerge()
void	testPullMergeProgrammaticConfiguration()
void	testPullMergeProgrammaticConfigurationImpliedTargetBranch()
void	testPullWithMergeConfig()
void	testPullWithMergeConfig2()
void	testPullWithoutConfig()
void	testPullWithRebaseConfig1()
void	testPullWithRebaseConfig2()
void	testPullWithRebaseConfig3()
void	testPullWithRebasePreserve1Config()
void	testPullWithRebasePreserveConfig2()
void	testPullWithRebasePreserveConfig3()
void	testPullWithUntrackedStash()

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

Field Detail

dbTarget

protected Repository dbTarget

Second Test repository

Constructor Detail

PullCommandTest

public PullCommandTest()

Method Detail

testPullFastForward

public void testPullFastForward()
                         throws Exception

Throws:

Exception

testPullMerge

public void testPullMerge()
                   throws Exception

Throws:

Exception

testPullConflict

public void testPullConflict()
                      throws Exception

Throws:

Exception

testPullWithUntrackedStash

public void testPullWithUntrackedStash()
                                throws Exception

Throws:

Exception

testPullLocalConflict

public void testPullLocalConflict()
                           throws Exception

Throws:

Exception

testPullEmptyRepository

public void testPullEmptyRepository()
                             throws Exception

Throws:

Exception

testPullMergeProgrammaticConfiguration

public void testPullMergeProgrammaticConfiguration()
                                            throws Exception

Throws:

Exception

testPullMergeProgrammaticConfigurationImpliedTargetBranch

public void testPullMergeProgrammaticConfigurationImpliedTargetBranch()
                                                               throws Exception

Throws:

Exception

testPullWithRebasePreserve1Config

public void testPullWithRebasePreserve1Config()
                                       throws Exception

Throws:

Exception

testPullWithRebasePreserveConfig2

public void testPullWithRebasePreserveConfig2()
                                       throws Exception

Throws:

Exception

testPullWithRebasePreserveConfig3

public void testPullWithRebasePreserveConfig3()
                                       throws Exception

Throws:

Exception

testPullWithRebaseConfig1

public void testPullWithRebaseConfig1()
                               throws Exception

Throws:

Exception

testPullWithRebaseConfig2

public void testPullWithRebaseConfig2()
                               throws Exception

Throws:

Exception

testPullWithRebaseConfig3

public void testPullWithRebaseConfig3()
                               throws Exception

Throws:

Exception

testPullWithoutConfig

public void testPullWithoutConfig()
                           throws Exception

Throws:

Exception

testPullWithMergeConfig

public void testPullWithMergeConfig()
                             throws Exception

Throws:

Exception

testPullWithMergeConfig2

public void testPullWithMergeConfig2()
                              throws Exception

Throws:

Exception

setUp

public void setUp()
           throws Exception

Overrides:

setUp in class RepositoryTestCase

Throws:

Exception