org.eclipse.jgit.merge

Class SimpleMergeTest

java.lang.Object

org.eclipse.jgit.junit.LocalDiskRepositoryTestCase

org.eclipse.jgit.junit.RepositoryTestCase

org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase

org.eclipse.jgit.merge.SimpleMergeTest

public class SimpleMergeTest
extends SampleDataRepositoryTestCase

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

Method Summary

Methods

Modifier and Type	Method and Description
void	testOurs()
void	testTheirs()
void	testTrivialTwoWay_concurrentSubtreeChange()
void	testTrivialTwoWay_conflict()
void	testTrivialTwoWay_conflictSubtreeChange()
void	testTrivialTwoWay_disjointhistories()
void	testTrivialTwoWay_leftDFconflict1()
void	testTrivialTwoWay_leftDFconflict2()
void	testTrivialTwoWay_ok()
void	testTrivialTwoWay_rightDFconflict1()
void	testTrivialTwoWay_rightDFconflict2()
void	testTrivialTwoWay_validSubtreeSort()
void	testTrivialTwoWay()

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

setUp

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

SimpleMergeTest

public SimpleMergeTest()

Method Detail

testOurs

public void testOurs()
              throws IOException

Throws:

IOException

testTheirs

public void testTheirs()
                throws IOException

Throws:

IOException

testTrivialTwoWay

public void testTrivialTwoWay()
                       throws IOException

Throws:

IOException

testTrivialTwoWay_disjointhistories

public void testTrivialTwoWay_disjointhistories()
                                         throws IOException

Throws:

IOException

testTrivialTwoWay_ok

public void testTrivialTwoWay_ok()
                          throws IOException

Throws:

IOException

testTrivialTwoWay_conflict

public void testTrivialTwoWay_conflict()
                                throws IOException

Throws:

IOException

testTrivialTwoWay_validSubtreeSort

public void testTrivialTwoWay_validSubtreeSort()
                                        throws Exception

Throws:

Exception

testTrivialTwoWay_concurrentSubtreeChange

public void testTrivialTwoWay_concurrentSubtreeChange()
                                               throws Exception

Throws:

Exception

testTrivialTwoWay_conflictSubtreeChange

public void testTrivialTwoWay_conflictSubtreeChange()
                                             throws Exception

Throws:

Exception

testTrivialTwoWay_leftDFconflict1

public void testTrivialTwoWay_leftDFconflict1()
                                       throws Exception

Throws:

Exception

testTrivialTwoWay_rightDFconflict1

public void testTrivialTwoWay_rightDFconflict1()
                                        throws Exception

Throws:

Exception

testTrivialTwoWay_leftDFconflict2

public void testTrivialTwoWay_leftDFconflict2()
                                       throws Exception

Throws:

Exception

testTrivialTwoWay_rightDFconflict2

public void testTrivialTwoWay_rightDFconflict2()
                                        throws Exception

Throws:

Exception