org.eclipse.jgit.notes

Class NoteMapMergerTest

java.lang.Object

org.eclipse.jgit.junit.LocalDiskRepositoryTestCase

org.eclipse.jgit.junit.RepositoryTestCase

org.eclipse.jgit.notes.NoteMapMergerTest

public class NoteMapMergerTest
extends RepositoryTestCase

Field Summary

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

Method Summary

Modifier and Type	Method and Description
void	setUp()
void	tearDown()
void	testAddDifferentNotes()
void	testAddSameNoteDifferentContent()
void	testBaseEqualsOurs()
void	testBaseEqualsTheirs()
void	testCollapseFanoutAfterMerge()
void	testDeleteDifferentNotes()
void	testEditDeleteConflict()
void	testEditDifferentNotes()
void	testEditSameNoteDifferentContent()
void	testFanoutAndLeafWitConflict()
void	testFanoutAndLeafWithoutConflict()
void	testLargeTreesWithConflict()
void	testLargeTreesWithoutConflict()
void	testNoChange()
void	testNonNotesWithNonNoteConflict()
void	testNonNotesWithoutNonNoteConflict()
void	testOursEqualsTheirs()

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

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Detail

NoteMapMergerTest

public NoteMapMergerTest()

Method Detail

setUp

public void setUp()
           throws Exception

Overrides:

setUp in class RepositoryTestCase

Throws:

Exception

tearDown

public void tearDown()
              throws Exception

Overrides:

tearDown in class LocalDiskRepositoryTestCase

Throws:

Exception

testNoChange

public void testNoChange()
                  throws IOException

Throws:

IOException

testOursEqualsTheirs

public void testOursEqualsTheirs()
                          throws Exception

Throws:

Exception

testBaseEqualsOurs

public void testBaseEqualsOurs()
                        throws Exception

Throws:

Exception

testBaseEqualsTheirs

public void testBaseEqualsTheirs()
                          throws Exception

Throws:

Exception

testAddDifferentNotes

public void testAddDifferentNotes()
                           throws Exception

Throws:

Exception

testAddSameNoteDifferentContent

public void testAddSameNoteDifferentContent()
                                     throws Exception

Throws:

Exception

testEditSameNoteDifferentContent

public void testEditSameNoteDifferentContent()
                                      throws Exception

Throws:

Exception

testEditDifferentNotes

public void testEditDifferentNotes()
                            throws Exception

Throws:

Exception

testDeleteDifferentNotes

public void testDeleteDifferentNotes()
                              throws Exception

Throws:

Exception

testEditDeleteConflict

public void testEditDeleteConflict()
                            throws Exception

Throws:

Exception

testLargeTreesWithoutConflict

public void testLargeTreesWithoutConflict()
                                   throws Exception

Throws:

Exception

testLargeTreesWithConflict

public void testLargeTreesWithConflict()
                                throws Exception

Throws:

Exception

testFanoutAndLeafWithoutConflict

public void testFanoutAndLeafWithoutConflict()
                                      throws Exception

Throws:

Exception

testFanoutAndLeafWitConflict

public void testFanoutAndLeafWitConflict()
                                  throws Exception

Throws:

Exception

testCollapseFanoutAfterMerge

public void testCollapseFanoutAfterMerge()
                                  throws Exception

Throws:

Exception

testNonNotesWithoutNonNoteConflict

public void testNonNotesWithoutNonNoteConflict()
                                        throws Exception

Throws:

Exception

testNonNotesWithNonNoteConflict

public void testNonNotesWithNonNoteConflict()
                                     throws Exception

Throws:

Exception