org.eclipse.jgit.api

Class CherryPickCommandTest

java.lang.Object

org.eclipse.jgit.junit.LocalDiskRepositoryTestCase

org.eclipse.jgit.junit.RepositoryTestCase

org.eclipse.jgit.api.CherryPickCommandTest

public class CherryPickCommandTest
extends RepositoryTestCase

Test cherry-pick command

Field Summary

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

ASSUME_UNCHANGED, CONTENT, CONTENT_ID, db, LENGTH, MOD_TIME, SMUDGE, trash

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

author, committer

Constructor Summary

Constructors

Constructor and Description
CherryPickCommandTest()

Method Summary

Methods

Modifier and Type	Method and Description
void	testCherryPick()
void	testCherryPickConflictMarkers()
void	testCherryPickConflictReset()
void	testCherryPickConflictResolution()
void	testCherryPickConflictResolutionNoCOmmit()
void	testCherryPickDirtyIndex()
void	testCherryPickDirtyWorktree()
void	testCherryPickMerge() Cherry-picking merge commit M onto T
void	testCherryPickNoCommit()
void	testCherryPickOurCommitName()
void	testCherryPickOverExecutableChangeOnNonExectuableFileSystem()
void	testSequentialCherryPick()

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

assertEqualsFile, check, checkFile, checkoutBranch, commitFile, copyFile, createBranch, createEntry, createEntry, createEntry, deleteTrashFile, fsTick, indexState, indexState, lookup, read, resetIndex, setUp, writeTrashFile, writeTrashFile, writeTrashFiles

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

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

CherryPickCommandTest

public CherryPickCommandTest()

Method Detail

testCherryPick

public void testCherryPick()
                    throws IOException,
                           JGitInternalException,
                           GitAPIException

Throws:

IOException

JGitInternalException

GitAPIException

testCherryPickNoCommit

public void testCherryPickNoCommit()
                            throws IOException,
                                   JGitInternalException,
                                   GitAPIException

Throws:

IOException

JGitInternalException

GitAPIException

testSequentialCherryPick

public void testSequentialCherryPick()
                              throws IOException,
                                     JGitInternalException,
                                     GitAPIException

Throws:

IOException

JGitInternalException

GitAPIException

testCherryPickDirtyIndex

public void testCherryPickDirtyIndex()
                              throws Exception

Throws:

Exception

testCherryPickDirtyWorktree

public void testCherryPickDirtyWorktree()
                                 throws Exception

Throws:

Exception

testCherryPickConflictResolution

public void testCherryPickConflictResolution()
                                      throws Exception

Throws:

Exception

testCherryPickConflictResolutionNoCOmmit

public void testCherryPickConflictResolutionNoCOmmit()
                                              throws Exception

Throws:

Exception

testCherryPickConflictReset

public void testCherryPickConflictReset()
                                 throws Exception

Throws:

Exception

testCherryPickOverExecutableChangeOnNonExectuableFileSystem

public void testCherryPickOverExecutableChangeOnNonExectuableFileSystem()
                                                                 throws Exception

Throws:

Exception

testCherryPickConflictMarkers

public void testCherryPickConflictMarkers()
                                   throws Exception

Throws:

Exception

testCherryPickOurCommitName

public void testCherryPickOurCommitName()
                                 throws Exception

Throws:

Exception

testCherryPickMerge

public void testCherryPickMerge()
                         throws Exception

Cherry-picking merge commit M onto T

    M
    |\
    C D
    |/
 T  B
 | /
 A
 

Throws:

Exception