org.eclipse.jgit.merge

Class MergeAlgorithmTest

java.lang.Object

org.eclipse.jgit.merge.MergeAlgorithmTest

public class MergeAlgorithmTest
extends Object

Constructor Summary

Constructors

Constructor and Description
MergeAlgorithmTest()

Method Summary

Methods

Modifier and Type	Method and Description
static String	t(String text)
static RawText	T(String text)
void	testAdjacentModifications()
void	testConflictAtEnd() Test a conflicting region at the very end of the text.
void	testConflictAtStart() Test a conflicting region at the very start of the text.
void	testDeleteVsModify() Check that a deleted vs.
void	testEmptyTexts() Test situations where (at least) one input value is the empty text
void	testInsertVsModify()
void	testNoAgainstOneModification() Test a merge where only the second text contains modifications.
void	testOneAgainstTwoConflictingModifications() Test a case where we have three consecutive chunks.
void	testSameModification() Check for a conflict where the second text was changed similar to the first one, but the second texts modification covers one more line.
void	testSeperateModifications()
void	testTwoComplicatedModifications() Merge two complicated modifications.
void	testTwoConflictingModifications() Check for a conflict where the second text was changed similar to the first one, but the second texts modification covers one more line.
void	testTwoNonConflictingModifications() Both texts contain modifications but not on the same chunks.
void	testTwoSimilarModsAndOneInsert() Test merging two contents which do one similar modification and one insertion is only done by one side.

Methods inherited from class java.lang.Object

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

Constructor Detail

MergeAlgorithmTest

public MergeAlgorithmTest()

Method Detail

testTwoConflictingModifications

public void testTwoConflictingModifications()
                                     throws IOException

Check for a conflict where the second text was changed similar to the first one, but the second texts modification covers one more line.

Throws:

IOException

testOneAgainstTwoConflictingModifications

public void testOneAgainstTwoConflictingModifications()
                                               throws IOException

Test a case where we have three consecutive chunks. The first text modifies all three chunks. The second text modifies the first and the last chunk. This should be reported as one conflicting region.

Throws:

IOException

testNoAgainstOneModification

public void testNoAgainstOneModification()
                                  throws IOException

Test a merge where only the second text contains modifications. Expect as merge result the second text.

Throws:

IOException

testTwoNonConflictingModifications

public void testTwoNonConflictingModifications()
                                        throws IOException

Both texts contain modifications but not on the same chunks. Expect a non-conflict merge result.

Throws:

IOException

testTwoComplicatedModifications

public void testTwoComplicatedModifications()
                                     throws IOException

Merge two complicated modifications. The merge algorithm has to extend and combine conflicting regions to get to the expected merge result.

Throws:

IOException

testConflictAtStart

public void testConflictAtStart()
                         throws IOException

Test a conflicting region at the very start of the text.

Throws:

IOException

testConflictAtEnd

public void testConflictAtEnd()
                       throws IOException

Test a conflicting region at the very end of the text.

Throws:

IOException

testSameModification

public void testSameModification()
                          throws IOException

Check for a conflict where the second text was changed similar to the first one, but the second texts modification covers one more line.

Throws:

IOException

testDeleteVsModify

public void testDeleteVsModify()
                        throws IOException

Check that a deleted vs. a modified line shows up as conflict (see Bug 328551)

Throws:

IOException

testInsertVsModify

public void testInsertVsModify()
                        throws IOException

Throws:

IOException

testAdjacentModifications

public void testAdjacentModifications()
                               throws IOException

Throws:

IOException

testSeperateModifications

public void testSeperateModifications()
                               throws IOException

Throws:

IOException

testTwoSimilarModsAndOneInsert

public void testTwoSimilarModsAndOneInsert()
                                    throws IOException

Test merging two contents which do one similar modification and one insertion is only done by one side. Between modification and insertion is a block which is common between the two contents and the common base

Throws:

IOException

testEmptyTexts

public void testEmptyTexts()
                    throws IOException

Test situations where (at least) one input value is the empty text

Throws:

IOException

t

public static String t(String text)

T

public static RawText T(String text)